From a17439be4a34d934f0bf4a19dc9bfb2967343b32 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Sun, 11 Apr 2010 00:22:40 -0400 Subject: [PATCH] Remove wasted space in "new label dialog" Modified the layout spacing of widgets in the "new label dialog." This makes the dialog a little more compact and hopefully fits better on small screens such as netbooks. --- data/glade/new-label-dialog.glade | 239 +++++-------- data/glade/wdgt-media-select.glade | 552 +++++++++++------------------ data/glade/wdgt-rotate-label.glade | 97 ++--- src/new-label-dialog.c | 2 +- 4 files changed, 323 insertions(+), 567 deletions(-) diff --git a/data/glade/new-label-dialog.glade b/data/glade/new-label-dialog.glade index b282a365..8633976c 100644 --- a/data/glade/new-label-dialog.glade +++ b/data/glade/new-label-dialog.glade @@ -1,158 +1,85 @@ - - - + - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 12 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Media type</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - - - - - - - - - True - <b>Label orientation</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - + + + + True + window1 + + + True + 3 + vertical + 6 + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Media type</b> + True + + + label_item + + + + + 0 + + + + + True + 0 + none + + + True + 12 + + + True + + + + + + + + + + True + <b>Label orientation</b> + True + + + label_item + + + + + 1 + + + + + diff --git a/data/glade/wdgt-media-select.glade b/data/glade/wdgt-media-select.glade index b4dc6c7c..1696bfaa 100644 --- a/data/glade/wdgt-media-select.glade +++ b/data/glade/wdgt-media-select.glade @@ -1,352 +1,204 @@ - - - + - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - 12 - True - True - True - True - GTK_POS_TOP - False - False - - - - True - False - 0 - - - - 12 - 480 - 320 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Recent templates - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - True - False - 0 - - - - 12 - True - False - 12 - - - - True - False - 6 - - - - True - Brand: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - Page size: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - Category: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - True - - - 0 - False - True - - - - - 0 - False - True - - - - - 0 - False - True - - - - - - 12 - 480 - 320 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - 0 - True - True - - - - - False - True - - - - - - True - Search all templates - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - + + + + True + window1 + + + True + + + True + True + 6 + + + True + + + 480 + 320 + True + True + 12 + automatic + automatic + in + + + True + True + False + + + + + 0 + + + + + + + True + Recent templates + + + False + tab + + + + + True + + + True + 12 + 12 + + + True + 6 + + + True + Brand: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + False + 0 + + + + + True + 6 + + + True + Page size: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + 1 + + + + + True + 6 + + + True + Category: + + + False + False + 0 + + + + + True + + + False + 1 + + + + + False + 2 + + + + + False + 0 + + + + + 480 + 320 + True + True + 12 + automatic + automatic + in + + + True + True + False + + + + + 1 + + + + + 1 + + + + + True + Search all templates + + + 1 + False + tab + + + + + 0 + + + + + diff --git a/data/glade/wdgt-rotate-label.glade b/data/glade/wdgt-rotate-label.glade index 89e24a03..aa48b50a 100644 --- a/data/glade/wdgt-rotate-label.glade +++ b/data/glade/wdgt-rotate-label.glade @@ -1,62 +1,39 @@ - - - + - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 6 - - - - True - True - Rotate - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - - - 0 - True - True - - - - - - + + + + True + window1 + + + True + 6 + 6 + + + Rotate + True + True + False + True + True + + + False + False + 0 + + + + + True + + + 1 + + + + + diff --git a/src/new-label-dialog.c b/src/new-label-dialog.c index 038ed43b..b09de7fd 100644 --- a/src/new-label-dialog.c +++ b/src/new-label-dialog.c @@ -92,7 +92,7 @@ gl_new_label_dialog_init (glNewLabelDialog *dialog) dialog->priv = g_new0 (glNewLabelDialogPrivate, 1); - gtk_container_set_border_width (GTK_CONTAINER(dialog), GL_HIG_PAD2); + gtk_container_set_border_width (GTK_CONTAINER(dialog), GL_HIG_PAD1); gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE); gtk_dialog_add_buttons (GTK_DIALOG(dialog), -- 2.39.5