From: Jim Evins Date: Sun, 16 Dec 2007 04:51:59 +0000 (+0000) Subject: 2007-12-15 Jim Evins X-Git-Tag: glabels-2_3_0~291 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=63153b839d3534ecd8f8761ffa78963a1b9a3918;p=glabels 2007-12-15 Jim Evins * data/glade/object-editor.glade: Removed any GtkTable that contained a GtkComboBox because the size of the combo box was not constrained properly. This sacrifices the nice orderly labels for combo boxes that don't extend beyond the edge of the window. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@709 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 92c23dae..5c9e70ff 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,11 @@ +2007-12-15 Jim Evins + + * data/glade/object-editor.glade: + Removed any GtkTable that contained a GtkComboBox because the size of + the combo box was not constrained properly. This sacrifices the nice + orderly labels for combo boxes that don't extend beyond the edge of the + window. + 2007-12-15 Jim Evins * libglabels/db.c: (lgl_db_lookup_template_from_name): diff --git a/glabels2/data/glade/object-editor.glade b/glabels2/data/glade/object-editor.glade index 46b7cbb6..8ab922df 100644 --- a/glabels2/data/glade/object-editor.glade +++ b/glabels2/data/glade/object-editor.glade @@ -282,16 +282,13 @@ 12 True False - 0 + 12 - + True - 7 - 2 False - 12 - 12 + 12 @@ -312,103 +309,42 @@ 0 - 0 - 1 - 0 - 1 - fill - - - - - - - True - Size: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - Style: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + True - 0 - 1 - 2 - 3 - fill - + 0 + True + True + + + 0 + False + False + + - - - True - Alignment: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - + + + True + False + 12 - + True - Line Spacing: + Size: False False GTK_JUSTIFY_LEFT @@ -424,40 +360,9 @@ 0 - 0 - 1 - 5 - 6 - fill - - - - - - - True - False - 12 - - - - True - False - True - - - 0 - True - True - - - - - 1 - 2 - 0 - 1 - fill + 0 + False + False @@ -487,12 +392,47 @@ - 1 - 2 - 1 - 2 - fill - fill + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 12 + + + + True + Style: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False @@ -559,186 +499,64 @@ - 1 - 2 - 2 - 3 - fill - fill + 0 + True + True + + + 0 + False + False + + + + + + True + False + 12 - + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.140000000596 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + True False - 12 + 6 - + True - True - GTK_RELIEF_NORMAL - True - False - False + False + 6 - - True - gtk-justify-left - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-center - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - False - False - - - - True - gtk-justify-right - 4 - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 1 - 2 - 4 - 5 - fill - fill - - - - - - True - False - 12 - - - - True - True - 0.00999999977648 - 2 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 5 0.01 0.1 0.1 - - - 0 - False - False - - - - - 1 - 2 - 5 - 6 - fill - fill - - - - - - True - True - Allow merge to automatically shrink text - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 6 - 7 - fill - - - - - - - True - False - 6 - - - - True - False - 6 - - - + True True @@ -851,99 +669,29 @@ - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - fill + 0 + True + True 0 - True - True + False + False - - - False - True - - - - - - True - Style - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - + True - 2 - 2 False - 12 - 12 + 12 - + True - Width: + Alignment: False False GTK_JUSTIFY_LEFT @@ -959,32 +707,289 @@ 0 - 0 - 1 - 0 - 1 - fill - + 0 + False + False - + True False 12 - + True True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - False - False - 1 0.25 4 0.25 1 1 + GTK_RELIEF_NORMAL + True + False + False + + + + True + gtk-justify-left + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + False + False + + + + True + gtk-justify-center + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + False + False + + + + True + gtk-justify-right + 4 + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 12 + + + + True + Line Spacing: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + True + 0.00999999977648 + 2 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 5 0.01 0.1 0.1 + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + True + Allow merge to automatically shrink text + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + False + False + + + + + + True + Style + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + 12 + True + False + 12 + + + + True + False + 12 + + + + True + Width: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + True + 0.00999999977648 + 2 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.25 4 0.25 1 1 0 @@ -1019,11 +1024,47 @@ - 1 - 2 - 0 - 1 - fill + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 12 + + + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.140000000596 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False @@ -1153,40 +1194,9 @@ - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - fill + 0 + True + True @@ -1234,13 +1244,35 @@ 0 - + True - 1 - 2 False - 12 - 12 + 12 + + + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.140000000596 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + @@ -1368,46 +1400,16 @@ - 1 - 2 - 0 - 1 - fill - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - fill + 0 + True + True 0 - True - True + False + False @@ -1448,13 +1450,10 @@ 12 - + True - 2 - 2 False - 12 - 6 + 12 @@ -1469,36 +1468,9 @@ True - 0 - 1 - 0 - 1 - fill - - - - - - - True - False - True - Key: - True - GTK_RELIEF_NORMAL - True - False - False - True - img_file_radio - - - 0 - 1 - 1 - 2 - fill - + 0 + False + False @@ -1508,17 +1480,47 @@ Select A File GTK_FILE_CHOOSER_ACTION_OPEN True - False + True False -1 - 1 - 2 - 0 - 1 - fill - fill + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 12 + + + + True + False + True + Key: + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False @@ -1529,18 +1531,16 @@ True - 1 - 2 - 1 - 2 - fill + 0 + True + True 0 - True - True + False + False @@ -1581,13 +1581,10 @@ 12 - + True - 3 - 2 False - 12 - 12 + 12 @@ -1602,14 +1599,43 @@ True - 0 - 1 - 0 - 1 - fill - + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + 0 + False + False + + + + + + True + False + 12 @@ -1622,78 +1648,62 @@ False False True - data_literal_radio - 0 - 1 - 1 - 2 - fill - + 0 + False + False - + True - False - 12 - - - - True - True - True - True - 0 - - True - * - False - - - 0 - False - False - - + False + True - 1 - 2 - 0 - 1 - fill + 0 + True + True + + + 0 + False + False + + + + + + True + False + 12 - + True - False - 12 - - - - True - False - True - - - 0 - True - True - - + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 1 - 2 - fill - fill + 0 + False + False @@ -1826,19 +1836,16 @@ - 1 - 2 - 2 - 3 - fill - fill + 0 + True + True 0 - True - True + False + False @@ -1879,61 +1886,122 @@ 12 - + True - 4 - 2 False - 12 - 12 + 12 - + True - False - 12 - - - - True - False - True - - - 0 - True - True - - + Style: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 0 - 1 - fill - fill + 0 + False + False - + True - True - Text - True - GTK_RELIEF_NORMAL + False True - False - False - True - 0 - 2 - 1 - 2 - + 0 + True + True + + + + + 0 + False + False + + + + + + True + True + Text + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Checksum + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + False + 12 + + + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.140000000596 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False @@ -2063,95 +2131,16 @@ - 1 - 2 - 3 - 4 - fill - - - - - - True - True - Checksum - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 2 - 2 - 3 - - - - - - - True - Style: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - fill + 0 + True + True 0 - True - True + False + False @@ -2925,134 +2914,27 @@ - + True - False - 4 - 2 False - 12 - 12 - - - - True - X Offset: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Y Offset: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Opacity: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - + 12 - + True False 12 - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 10 - - - 0 - False - True - - - - - + True - inches + X Offset: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -3067,52 +2949,87 @@ False - - - 1 - 2 - 1 - 2 - fill - fill - - - - - - True - False - 12 - + True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 + False + 12 + + + + True + True + 0.00999999977648 + 2 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 0.00999999977648 10 10 + + + 0 + False + True + + + + + + True + inches + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + 0 - False + True True + + + 0 + True + True + + + + + + True + False + 12 - + True - % + Y Offset: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -3127,101 +3044,54 @@ False - - - 1 - 2 - 3 - 4 - fill - fill - - - - - - True - Color: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.140000000596 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - fill - - - - - - True - False - 6 - + True False - 6 + 12 - + True True - - True - GTK_RELIEF_NORMAL - True - False - False - True + 0.00999999977648 + 2 + True + GTK_UPDATE_ALWAYS + True + False + 0 0 100 0.00999999977648 10 10 0 False - False + True - + True - False - 12 - - - - True - gl_object_editor_construct_color_combo - 3 - 0 - Sun, 16 Nov 2003 06:52:23 GMT - - - 0 - False - False - - + inches + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 - True - True + False + False @@ -3231,44 +3101,155 @@ True + + + 0 + True + True + + + + + + True + False + 12 + + + + True + Color: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.140000000596 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + - + True False 6 - + True - True - Key: - True - GTK_RELIEF_NORMAL - True - False - False - True - shadow_color_radio + False + 6 + + + + True + True + + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + False + 12 + + + + True + gl_object_editor_construct_color_combo + 3 + 0 + Sun, 16 Nov 2003 06:52:23 GMT + + + 0 + False + False + + + + + 0 + True + True + + 0 - False - False + True + True - + True False - 12 + 6 - + True - False + True + Key: + True + GTK_RELIEF_NORMAL True + False + False + True + shadow_color_radio + + + 0 + False + False + + + + + + True + False + 12 + + + + True + False + True + + + 0 + True + True + + 0 @@ -3292,49 +3273,28 @@ - 1 - 2 - 2 - 3 - fill + 0 + True + True - + True False 12 - - True - True - 0.00999999977648 - 2 - True - GTK_UPDATE_ALWAYS - True - False - 0 0 100 0.00999999977648 10 10 - - - 0 - False - True - - - - - + True - inches + Opacity: False False GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 @@ -3349,21 +3309,75 @@ False + + + + True + False + 12 + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + False + True + + + + + + True + % + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + - 1 - 2 - 0 - 1 - fill - fill + 0 + True + True 0 - True - True + False + False