Imported Upstream version 2.4.0~rc1
This commit is contained in:
@ -250,14 +250,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
|
||||
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
|
||||
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
|
||||
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
||||
INTLTOOL_ICONV = @INTLTOOL_ICONV@
|
||||
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
|
||||
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
|
||||
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
||||
INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
|
||||
INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
|
||||
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
|
||||
INTLTOOL_PERL = @INTLTOOL_PERL@
|
||||
INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
|
||||
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
|
||||
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
|
||||
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
|
||||
@ -269,7 +267,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
|
||||
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
|
||||
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
||||
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
|
||||
INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
|
||||
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
|
||||
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
|
||||
JPEG = @JPEG@
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
|
||||
#undef GIMP_DISABLE_DEPRECATED
|
||||
|
||||
#include "libgimpbase/gimpbase.h"
|
||||
#include "libgimpconfig/gimpconfig.h"
|
||||
#include "libgimpcolor/gimpcolor.h"
|
||||
#include "libgimpwidgets/gimpwidgets.h"
|
||||
@ -303,6 +304,28 @@ create_color_hex_entry (void)
|
||||
return new_widget_info ("gimp-color-hex-entry", vbox, SMALL);
|
||||
}
|
||||
|
||||
static WidgetInfo *
|
||||
create_color_profile_combo_box (void)
|
||||
{
|
||||
GtkWidget *vbox;
|
||||
GtkWidget *combo;
|
||||
GtkWidget *align;
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 6);
|
||||
align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
|
||||
combo = gimp_color_profile_combo_box_new (gtk_dialog_new (), NULL);
|
||||
gimp_color_profile_combo_box_add (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
|
||||
NULL, "sRGB");
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
|
||||
gtk_container_add (GTK_CONTAINER (align), combo);
|
||||
gtk_box_pack_start_defaults (GTK_BOX (vbox), align);
|
||||
gtk_box_pack_start (GTK_BOX (vbox),
|
||||
gtk_label_new ("Color Profile Combo Box"),
|
||||
FALSE, FALSE, 0);
|
||||
|
||||
return new_widget_info ("gimp-color-profile-combo-box", vbox, SMALL);
|
||||
}
|
||||
|
||||
static WidgetInfo *
|
||||
create_color_scale (void)
|
||||
{
|
||||
@ -456,6 +479,25 @@ create_hint_box (void)
|
||||
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 *
|
||||
create_int_combo_box (void)
|
||||
{
|
||||
@ -629,25 +671,6 @@ create_preview_area (void)
|
||||
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 *
|
||||
create_string_combo_box (void)
|
||||
{
|
||||
@ -702,6 +725,7 @@ get_all_widgets (void)
|
||||
retval = g_list_append (retval, create_color_area ());
|
||||
retval = g_list_append (retval, create_color_button ());
|
||||
retval = g_list_append (retval, create_color_hex_entry ());
|
||||
retval = g_list_append (retval, create_color_profile_combo_box ());
|
||||
retval = g_list_append (retval, create_color_scale ());
|
||||
retval = g_list_append (retval, create_color_selection ());
|
||||
retval = g_list_append (retval, create_dialog ());
|
||||
@ -712,12 +736,12 @@ get_all_widgets (void)
|
||||
retval = g_list_append (retval, create_hint_box ());
|
||||
retval = g_list_append (retval, create_int_combo_box ());
|
||||
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_page_selector ());
|
||||
retval = g_list_append (retval, create_path_editor ());
|
||||
retval = g_list_append (retval, create_pick_button ());
|
||||
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_unit_menu ());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user