mirror of https://github.com/GNOME/gimp.git
properly align the toggle button columns by packing their containers
2003-10-23 Michael Natterer <mitch@gimp.org> * app/gui/preferences-dialog.c (prefs_display_options_frame_add): properly align the toggle button columns by packing their containers expanding, removed ascii art, cleanup.
This commit is contained in:
Michael Natterer
Michael Natterer
parent
879d2c2864
commit
507b19bc91
|
|
@ -1,3 +1,9 @@
|
||||||
|
2003-10-23 Michael Natterer <mitch@gimp.org>
|
||||||
|
|
||||||
|
* app/gui/preferences-dialog.c (prefs_display_options_frame_add):
|
||||||
|
properly align the toggle button columns by packing their
|
||||||
|
containers expanding, removed ascii art, cleanup.
|
||||||
|
|
||||||
2003-10-23 Henrik Brix Andersen <brix@gimp.org>
|
2003-10-23 Henrik Brix Andersen <brix@gimp.org>
|
||||||
|
|
||||||
* gimp/app/display/gimpdisplayoptions.[ch]: changed
|
* gimp/app/display/gimpdisplayoptions.[ch]: changed
|
||||||
|
|
|
||||||
|
|
@ -818,68 +818,53 @@ prefs_display_options_frame_add (Gimp *gimp,
|
||||||
const gchar *label,
|
const gchar *label,
|
||||||
GtkContainer *parent)
|
GtkContainer *parent)
|
||||||
{
|
{
|
||||||
/* General sketch:
|
GtkWidget *vbox;
|
||||||
+ Frame VBox +
|
GtkWidget *hbox;
|
||||||
+ Checkbox HBox +
|
|
||||||
+ Checks VBox + + Checks VBox +
|
|
||||||
Menubar Selection
|
|
||||||
Rulers Active layer
|
|
||||||
Scrollbars Guides
|
|
||||||
Statusbar Grid
|
|
||||||
+ + + +
|
|
||||||
+ +
|
|
||||||
Canvas padding
|
|
||||||
Custom color
|
|
||||||
+ +
|
|
||||||
*/
|
|
||||||
|
|
||||||
GtkBox *box;
|
|
||||||
GtkWidget *checks_hbox;
|
|
||||||
GtkWidget *checks_vbox;
|
GtkWidget *checks_vbox;
|
||||||
GtkWidget *table;
|
GtkWidget *table;
|
||||||
GtkWidget *button;
|
GtkWidget *button;
|
||||||
|
|
||||||
box = GTK_BOX (prefs_frame_new (label, parent, FALSE));
|
vbox = prefs_frame_new (label, parent, FALSE);
|
||||||
|
|
||||||
checks_hbox = gtk_hbox_new (FALSE, 4);
|
|
||||||
gtk_box_pack_start (box, checks_hbox, FALSE, FALSE, 0);
|
|
||||||
gtk_widget_show (checks_hbox);
|
|
||||||
|
|
||||||
checks_vbox = gtk_vbox_new (FALSE, 4);
|
hbox = gtk_hbox_new (FALSE, 4);
|
||||||
gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||||
|
gtk_widget_show (hbox);
|
||||||
|
|
||||||
|
checks_vbox = gtk_vbox_new (FALSE, 2);
|
||||||
|
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
|
||||||
gtk_widget_show (checks_vbox);
|
gtk_widget_show (checks_vbox);
|
||||||
|
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-menubar",
|
||||||
"show-menubar", _("Show _Menubar"),
|
_("Show _Menubar"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-rulers",
|
||||||
"show-rulers", _("Show _Rulers"),
|
_("Show _Rulers"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-scrollbars",
|
||||||
"show-scrollbars", _("Show Scroll_bars"),
|
_("Show Scroll_bars"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-statusbar",
|
||||||
"show-statusbar", _("Show S_tatusbar"),
|
_("Show S_tatusbar"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
|
|
||||||
checks_vbox = gtk_vbox_new (FALSE, 4);
|
checks_vbox = gtk_vbox_new (FALSE, 2);
|
||||||
gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
|
||||||
gtk_widget_show (checks_vbox);
|
gtk_widget_show (checks_vbox);
|
||||||
|
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-selection",
|
||||||
"show-selection", _("Show S_election"),
|
_("Show S_election"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-layer-boundary",
|
||||||
"show-layer-boundary", _("Show _Layer Boundary"),
|
_("Show _Layer Boundary"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-guides",
|
||||||
"show-guides", _("Show _Guides"),
|
_("Show _Guides"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-grid",
|
||||||
"show-grid", _("Show Gri_d"),
|
_("Show Gri_d"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
|
|
||||||
table = prefs_table_new (2, GTK_CONTAINER (box), FALSE);
|
table = prefs_table_new (2, GTK_CONTAINER (vbox), FALSE);
|
||||||
|
|
||||||
prefs_enum_option_menu_add (object, "padding-mode", 0, 0,
|
prefs_enum_option_menu_add (object, "padding-mode", 0, 0,
|
||||||
_("Canvas Padding Mode:"), GTK_TABLE (table), 0);
|
_("Canvas Padding Mode:"), GTK_TABLE (table), 0);
|
||||||
|
|
@ -890,7 +875,6 @@ prefs_display_options_frame_add (Gimp *gimp,
|
||||||
GTK_TABLE (table), 1);
|
GTK_TABLE (table), 1);
|
||||||
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
||||||
gimp_get_user_context (gimp));
|
gimp_get_user_context (gimp));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
||||||
|
|
@ -818,68 +818,53 @@ prefs_display_options_frame_add (Gimp *gimp,
|
||||||
const gchar *label,
|
const gchar *label,
|
||||||
GtkContainer *parent)
|
GtkContainer *parent)
|
||||||
{
|
{
|
||||||
/* General sketch:
|
GtkWidget *vbox;
|
||||||
+ Frame VBox +
|
GtkWidget *hbox;
|
||||||
+ Checkbox HBox +
|
|
||||||
+ Checks VBox + + Checks VBox +
|
|
||||||
Menubar Selection
|
|
||||||
Rulers Active layer
|
|
||||||
Scrollbars Guides
|
|
||||||
Statusbar Grid
|
|
||||||
+ + + +
|
|
||||||
+ +
|
|
||||||
Canvas padding
|
|
||||||
Custom color
|
|
||||||
+ +
|
|
||||||
*/
|
|
||||||
|
|
||||||
GtkBox *box;
|
|
||||||
GtkWidget *checks_hbox;
|
|
||||||
GtkWidget *checks_vbox;
|
GtkWidget *checks_vbox;
|
||||||
GtkWidget *table;
|
GtkWidget *table;
|
||||||
GtkWidget *button;
|
GtkWidget *button;
|
||||||
|
|
||||||
box = GTK_BOX (prefs_frame_new (label, parent, FALSE));
|
vbox = prefs_frame_new (label, parent, FALSE);
|
||||||
|
|
||||||
checks_hbox = gtk_hbox_new (FALSE, 4);
|
|
||||||
gtk_box_pack_start (box, checks_hbox, FALSE, FALSE, 0);
|
|
||||||
gtk_widget_show (checks_hbox);
|
|
||||||
|
|
||||||
checks_vbox = gtk_vbox_new (FALSE, 4);
|
hbox = gtk_hbox_new (FALSE, 4);
|
||||||
gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
|
||||||
|
gtk_widget_show (hbox);
|
||||||
|
|
||||||
|
checks_vbox = gtk_vbox_new (FALSE, 2);
|
||||||
|
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
|
||||||
gtk_widget_show (checks_vbox);
|
gtk_widget_show (checks_vbox);
|
||||||
|
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-menubar",
|
||||||
"show-menubar", _("Show _Menubar"),
|
_("Show _Menubar"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-rulers",
|
||||||
"show-rulers", _("Show _Rulers"),
|
_("Show _Rulers"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-scrollbars",
|
||||||
"show-scrollbars", _("Show Scroll_bars"),
|
_("Show Scroll_bars"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-statusbar",
|
||||||
"show-statusbar", _("Show S_tatusbar"),
|
_("Show S_tatusbar"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
|
|
||||||
checks_vbox = gtk_vbox_new (FALSE, 4);
|
checks_vbox = gtk_vbox_new (FALSE, 2);
|
||||||
gtk_box_pack_start (GTK_BOX (checks_hbox), checks_vbox, TRUE, FALSE, 0);
|
gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
|
||||||
gtk_widget_show (checks_vbox);
|
gtk_widget_show (checks_vbox);
|
||||||
|
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-selection",
|
||||||
"show-selection", _("Show S_election"),
|
_("Show S_election"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-layer-boundary",
|
||||||
"show-layer-boundary", _("Show _Layer Boundary"),
|
_("Show _Layer Boundary"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-guides",
|
||||||
"show-guides", _("Show _Guides"),
|
_("Show _Guides"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
prefs_check_button_add (object,
|
prefs_check_button_add (object, "show-grid",
|
||||||
"show-grid", _("Show Gri_d"),
|
_("Show Gri_d"),
|
||||||
GTK_BOX (checks_vbox));
|
GTK_BOX (checks_vbox));
|
||||||
|
|
||||||
table = prefs_table_new (2, GTK_CONTAINER (box), FALSE);
|
table = prefs_table_new (2, GTK_CONTAINER (vbox), FALSE);
|
||||||
|
|
||||||
prefs_enum_option_menu_add (object, "padding-mode", 0, 0,
|
prefs_enum_option_menu_add (object, "padding-mode", 0, 0,
|
||||||
_("Canvas Padding Mode:"), GTK_TABLE (table), 0);
|
_("Canvas Padding Mode:"), GTK_TABLE (table), 0);
|
||||||
|
|
@ -890,7 +875,6 @@ prefs_display_options_frame_add (Gimp *gimp,
|
||||||
GTK_TABLE (table), 1);
|
GTK_TABLE (table), 1);
|
||||||
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
|
||||||
gimp_get_user_context (gimp));
|
gimp_get_user_context (gimp));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue