include number-pair-entry instead of ratio-entry.

2007-08-08  Sven Neumann  <sven@gimp.org>

	* tools/widgets.c: include number-pair-entry instead of 
ratio-entry.

	* libgimpwidgets/images/gimp-ratio-entry.png
	* libgimpwidgets/images/gimp-number-pair-entry.png: replaced
	screenshots.

	* libgimpwidgets/libgimpwidgets-sections.txt
	* libgimpwidgets/libgimpwidgets.types
	* libgimpwidgets/libgimpwidgets-docs.sgml
	* libgimpwidgets/tmpl/gimpnumberpairentry.sgml
	* libgimpwidgets/tmpl/gimpratioentry.sgml: adopt to change from
	GimpRatioEntry to GimpNumberPairEntry.


svn path=/trunk/; revision=23156
This commit is contained in:
Sven Neumann
2007-08-08 18:55:56 +00:00
committed by Sven Neumann
parent aa51fd4c06
commit 4cba8a2364
9 changed files with 163 additions and 165 deletions

View File

@ -1,3 +1,18 @@
2007-08-08 Sven Neumann <sven@gimp.org>
* tools/widgets.c: include number-pair-entry instead of ratio-entry.
* libgimpwidgets/images/gimp-ratio-entry.png
* libgimpwidgets/images/gimp-number-pair-entry.png: replaced
screenshots.
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/libgimpwidgets.types
* libgimpwidgets/libgimpwidgets-docs.sgml
* libgimpwidgets/tmpl/gimpnumberpairentry.sgml
* libgimpwidgets/tmpl/gimpratioentry.sgml: adopt to change from
GimpRatioEntry to GimpNumberPairEntry.
2007-08-08 Sven Neumann <sven@gimp.org> 2007-08-08 Sven Neumann <sven@gimp.org>
* app/app-sections.txt * app/app-sections.txt

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -41,6 +41,7 @@
<xi:include href="xml/gimpintcombobox.xml" /> <xi:include href="xml/gimpintcombobox.xml" />
<xi:include href="xml/gimpintstore.xml" /> <xi:include href="xml/gimpintstore.xml" />
<xi:include href="xml/gimpmemsizeentry.xml" /> <xi:include href="xml/gimpmemsizeentry.xml" />
<xi:include href="xml/gimpnumberpairentry.xml" />
<xi:include href="xml/gimpoffsetarea.xml" /> <xi:include href="xml/gimpoffsetarea.xml" />
<xi:include href="xml/gimppageselector.xml" /> <xi:include href="xml/gimppageselector.xml" />
<xi:include href="xml/gimppatheditor.xml" /> <xi:include href="xml/gimppatheditor.xml" />
@ -48,7 +49,6 @@
<xi:include href="xml/gimppixmap.xml" /> <xi:include href="xml/gimppixmap.xml" />
<xi:include href="xml/gimppreviewarea.xml" /> <xi:include href="xml/gimppreviewarea.xml" />
<xi:include href="xml/gimppreview.xml" /> <xi:include href="xml/gimppreview.xml" />
<xi:include href="xml/gimpratioentry.xml" />
<xi:include href="xml/gimpscrolledpreview.xml" /> <xi:include href="xml/gimpscrolledpreview.xml" />
<xi:include href="xml/gimpsizeentry.xml" /> <xi:include href="xml/gimpsizeentry.xml" />
<xi:include href="xml/gimpstringcombobox.xml" /> <xi:include href="xml/gimpstringcombobox.xml" />

View File

@ -486,26 +486,23 @@ gimp_size_entry_update_policy_get_type
</SECTION> </SECTION>
<SECTION> <SECTION>
<FILE>gimpratioentry</FILE> <FILE>gimpnumberpairentry</FILE>
<TITLE>GimpRatioEntry</TITLE> <TITLE>GimpNumberPairEntry</TITLE>
GimpRatioEntry GimpNumberPairEntry
GimpAspectType GimpAspectType
gimp_ratio_entry_new gimp_number_pair_entry_new
gimp_ratio_entry_set_fraction gimp_number_pair_entry_set_default_values
gimp_ratio_entry_get_fraction gimp_number_pair_entry_set_values
gimp_ratio_entry_set_ratio gimp_number_pair_entry_get_values
gimp_ratio_entry_get_ratio
gimp_ratio_entry_set_aspect
gimp_ratio_entry_get_aspect
<SUBSECTION Standard> <SUBSECTION Standard>
GIMP_RATIO_ENTRY GIMP_NUMBER_PAIR_ENTRY
GIMP_IS_RATIO_ENTRY GIMP_IS_NUMBER_PAIR_ENTRY
GIMP_TYPE_RATIO_ENTRY GIMP_TYPE_NUMBER_PAIR_ENTRY
gimp_ratio_entry_get_type gimp_number_pair_entry_get_type
GimpRatioEntryClass GimpNumberPairEntryClass
GIMP_RATIO_ENTRY_CLASS GIMP_NUMBER_PAIR_ENTRY_CLASS
GIMP_IS_RATIO_ENTRY_CLASS GIMP_IS_NUMBER_PAIR_ENTRY_CLASS
GIMP_RATIO_ENTRY_GET_CLASS GIMP_NUMBER_PAIR_ENTRY_GET_CLASS
GIMP_TYPE_ASPECT_TYPE GIMP_TYPE_ASPECT_TYPE
gimp_aspect_type_get_type gimp_aspect_type_get_type
</SECTION> </SECTION>

View File

@ -29,6 +29,7 @@ gimp_hint_box_get_type
gimp_int_combo_box_get_type gimp_int_combo_box_get_type
gimp_int_store_get_type gimp_int_store_get_type
gimp_memsize_entry_get_type gimp_memsize_entry_get_type
gimp_number_pair_entry_get_type
gimp_offset_area_get_type gimp_offset_area_get_type
gimp_page_selector_get_type gimp_page_selector_get_type
gimp_path_editor_get_type gimp_path_editor_get_type
@ -36,7 +37,6 @@ gimp_pick_button_get_type
gimp_pixmap_get_type gimp_pixmap_get_type
gimp_preview_area_get_type gimp_preview_area_get_type
gimp_preview_get_type gimp_preview_get_type
gimp_ratio_entry_get_type
gimp_scrolled_preview_get_type gimp_scrolled_preview_get_type
gimp_size_entry_get_type gimp_size_entry_get_type
gimp_string_combo_box_get_type gimp_string_combo_box_get_type

View File

@ -0,0 +1,110 @@
<!-- ##### SECTION Title ##### -->
GimpNumberPairEntry
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### STRUCT GimpNumberPairEntry ##### -->
<para>
</para>
<!-- ##### SIGNAL GimpNumberPairEntry::numbers-changed ##### -->
<para>
</para>
@gimpnumberpairentry: the object which received the signal.
<!-- ##### SIGNAL GimpNumberPairEntry::ratio-changed ##### -->
<para>
</para>
@gimpnumberpairentry: the object which received the signal.
<!-- ##### ARG GimpNumberPairEntry:aspect ##### -->
<para>
</para>
<!-- ##### ARG GimpNumberPairEntry:left-number ##### -->
<para>
</para>
<!-- ##### ARG GimpNumberPairEntry:ratio ##### -->
<para>
</para>
<!-- ##### ARG GimpNumberPairEntry:right-number ##### -->
<para>
</para>
<!-- ##### ENUM GimpAspectType ##### -->
<para>
</para>
@GIMP_ASPECT_SQUARE:
@GIMP_ASPECT_PORTRAIT:
@GIMP_ASPECT_LANDSCAPE:
<!-- ##### FUNCTION gimp_number_pair_entry_new ##### -->
<para>
</para>
@separators:
@allow_simplification:
@min_valid_value:
@max_valid_value:
@Returns:
<!-- ##### FUNCTION gimp_number_pair_entry_set_default_values ##### -->
<para>
</para>
@entry:
@left:
@right:
<!-- ##### FUNCTION gimp_number_pair_entry_set_values ##### -->
<para>
</para>
@entry:
@left:
@right:
<!-- ##### FUNCTION gimp_number_pair_entry_get_values ##### -->
<para>
</para>
@entry:
@left:
@right:

View File

@ -1,125 +0,0 @@
<!-- ##### SECTION Title ##### -->
GimpRatioEntry
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### STRUCT GimpRatioEntry ##### -->
<para>
</para>
<!-- ##### SIGNAL GimpRatioEntry::ratio-changed ##### -->
<para>
</para>
@gimpratioentry: the object which received the signal.
<!-- ##### ARG GimpRatioEntry:aspect ##### -->
<para>
</para>
<!-- ##### ARG GimpRatioEntry:denominator ##### -->
<para>
</para>
<!-- ##### ARG GimpRatioEntry:numerator ##### -->
<para>
</para>
<!-- ##### ARG GimpRatioEntry:ratio ##### -->
<para>
</para>
<!-- ##### ENUM GimpAspectType ##### -->
<para>
</para>
@GIMP_ASPECT_SQUARE:
@GIMP_ASPECT_PORTRAIT:
@GIMP_ASPECT_LANDSCAPE:
<!-- ##### FUNCTION gimp_ratio_entry_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gimp_ratio_entry_set_fraction ##### -->
<para>
</para>
@entry:
@numerator:
@denominator:
<!-- ##### FUNCTION gimp_ratio_entry_get_fraction ##### -->
<para>
</para>
@entry:
@numerator:
@denominator:
<!-- ##### FUNCTION gimp_ratio_entry_set_ratio ##### -->
<para>
</para>
@entry:
@ratio:
<!-- ##### FUNCTION gimp_ratio_entry_get_ratio ##### -->
<para>
</para>
@entry:
@Returns:
<!-- ##### FUNCTION gimp_ratio_entry_set_aspect ##### -->
<para>
</para>
@entry:
@aspect:
<!-- ##### FUNCTION gimp_ratio_entry_get_aspect ##### -->
<para>
</para>
@entry:
@Returns:

View File

@ -6,6 +6,7 @@
#undef GIMP_DISABLE_DEPRECATED #undef GIMP_DISABLE_DEPRECATED
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h" #include "libgimpconfig/gimpconfig.h"
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets.h"
@ -456,6 +457,25 @@ create_hint_box (void)
return new_widget_info ("gimp-hint-box", box, MEDIUM); return new_widget_info ("gimp-hint-box", box, MEDIUM);
} }
static WidgetInfo *
create_number_pair_entry (void)
{
GtkWidget *vbox;
GtkWidget *entry;
GtkWidget *align;
vbox = gtk_vbox_new (FALSE, 6);
align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
entry = gimp_number_pair_entry_new (":/", TRUE, 0.001, GIMP_MAX_IMAGE_SIZE);
gimp_number_pair_entry_set_values (GIMP_NUMBER_PAIR_ENTRY (entry), 4, 3);
gtk_container_add (GTK_CONTAINER (align), entry);
gtk_box_pack_start_defaults (GTK_BOX (vbox), align);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Number Pair Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-number-pair-entry", vbox, SMALL);
}
static WidgetInfo * static WidgetInfo *
create_int_combo_box (void) create_int_combo_box (void)
{ {
@ -629,25 +649,6 @@ create_preview_area (void)
return new_widget_info ("gimp-preview-area", vbox, MEDIUM); return new_widget_info ("gimp-preview-area", vbox, MEDIUM);
} }
static WidgetInfo *
create_ratio_entry (void)
{
GtkWidget *vbox;
GtkWidget *entry;
GtkWidget *align;
vbox = gtk_vbox_new (FALSE, 6);
align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
entry = gimp_ratio_entry_new ();
gimp_ratio_entry_set_fraction (GIMP_RATIO_ENTRY (entry), 4, 3);
gtk_container_add (GTK_CONTAINER (align), entry);
gtk_box_pack_start_defaults (GTK_BOX (vbox), align);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Ratio Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-ratio-entry", vbox, SMALL);
}
static WidgetInfo * static WidgetInfo *
create_string_combo_box (void) create_string_combo_box (void)
{ {
@ -712,12 +713,12 @@ get_all_widgets (void)
retval = g_list_append (retval, create_hint_box ()); retval = g_list_append (retval, create_hint_box ());
retval = g_list_append (retval, create_int_combo_box ()); retval = g_list_append (retval, create_int_combo_box ());
retval = g_list_append (retval, create_memsize_entry ()); retval = g_list_append (retval, create_memsize_entry ());
retval = g_list_append (retval, create_number_pair_entry ());
retval = g_list_append (retval, create_offset_area ()); retval = g_list_append (retval, create_offset_area ());
retval = g_list_append (retval, create_page_selector ()); retval = g_list_append (retval, create_page_selector ());
retval = g_list_append (retval, create_path_editor ()); retval = g_list_append (retval, create_path_editor ());
retval = g_list_append (retval, create_pick_button ()); retval = g_list_append (retval, create_pick_button ());
retval = g_list_append (retval, create_preview_area ()); retval = g_list_append (retval, create_preview_area ());
retval = g_list_append (retval, create_ratio_entry ());
retval = g_list_append (retval, create_string_combo_box ()); retval = g_list_append (retval, create_string_combo_box ());
retval = g_list_append (retval, create_unit_menu ()); retval = g_list_append (retval, create_unit_menu ());