From d33f14b70a11a42381e4ccb7f7363c97f5f2fa81 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Mon, 11 Feb 2013 13:44:03 +0100 Subject: [PATCH] printers: Move dialog names to their titles https://bugzilla.gnome.org/show_bug.cgi?id=690447 --- panels/printers/jobs-dialog.ui | 169 ++++++++------------ panels/printers/new-printer-dialog.ui | 202 ++++++++++-------------- panels/printers/options-dialog.ui | 75 +++------ panels/printers/pp-jobs-dialog.c | 4 +- panels/printers/pp-options-dialog.c | 5 +- panels/printers/ppd-selection-dialog.ui | 84 +++------- 6 files changed, 199 insertions(+), 340 deletions(-) diff --git a/panels/printers/jobs-dialog.ui b/panels/printers/jobs-dialog.ui index af6c408dc..b6c094112 100644 --- a/panels/printers/jobs-dialog.ui +++ b/panels/printers/jobs-dialog.ui @@ -6,11 +6,11 @@ 350 False 5 - + Active Jobs + False True True dialog - False True @@ -25,11 +25,9 @@ Close - False True True True - False False @@ -50,120 +48,85 @@ True False - + True False vertical - 10 - + True - False - 0 - Active Jobs - - - - - - False - False - 0 - - - - - True - False - vertical + True + in - + True True - in - - - True - True - - - - + + - - True - True - 0 - - - - - True - False - 1 - - - - False - True - False - False - False - Resume Printing - True - media-playback-start-symbolic - - - False - True - - - - - False - True - False - False - False - Pause Printing - True - media-playback-pause-symbolic - - - False - True - - - - - False - True - False - False - False - Cancel Print Job - True - media-playback-stop-symbolic - - - False - True - - - - - False - True - 1 - True True + 0 + + + + + True + False + 1 + + + + True + False + False + Resume Printing + True + media-playback-start-symbolic + + + False + True + + + + + True + False + False + Pause Printing + True + media-playback-pause-symbolic + + + False + True + + + + + True + False + False + Cancel Print Job + True + media-playback-stop-symbolic + + + False + True + + + + + False + True 1 diff --git a/panels/printers/new-printer-dialog.ui b/panels/printers/new-printer-dialog.ui index 931fe0fee..6a1ef29d4 100644 --- a/panels/printers/new-printer-dialog.ui +++ b/panels/printers/new-printer-dialog.ui @@ -6,9 +6,9 @@ 350 False 5 + Add a New Printer False True - True dialog @@ -24,11 +24,9 @@ _Cancel - False True True True - False True @@ -40,12 +38,10 @@ _Add - False True False True True - False True @@ -67,146 +63,116 @@ True False - + True False - 10 + vertical - + True - False - 0 - Add a New Printer - - - + True + in + + + True + True + False + + + + + - False + True True 0 - + True False - vertical + icons + 1 + - + True - True - in + False - + True - True - False - - + False + + + 24 + 24 + True + False + + + + + + False + True + 10 + 0 + + + + + True + True + True + ● + True + True + Search for network printers or filter result + Search for network printers or filter result + Enter address of a printer or a text to filter results + + + True + True + 1 + + + + + 24 + 24 + True + False + + + True + False + True + + + + + False + True + 10 + 2 + True - True - 0 - - - - - True - False - icons - 1 - - - - False - True - False - False - - - True - False - - - 24 - 24 - True - False - - - - - - False - True - 10 - 0 - - - - - True - True - True - ● - True - True - Search for network printers or filter result - Search for network printers or filter result - Enter address of a printer or a text to filter results - - - True - True - 1 - - - - - 24 - 24 - True - False - - - True - False - True - - - - - False - True - 10 - 2 - - - - - - - True - True - - - - - False - True - 1 + True - True + False True 1 diff --git a/panels/printers/options-dialog.ui b/panels/printers/options-dialog.ui index 4d62b138d..a5b9baa49 100644 --- a/panels/printers/options-dialog.ui +++ b/panels/printers/options-dialog.ui @@ -6,7 +6,7 @@ 400 False 5 - + True True dialog @@ -21,73 +21,44 @@ True False - + True False - vertical - 10 - + + 120 True - False - 0 - Options - - - + True + never + in + + + True + True + False + + + + + False - False + True 0 - + True False - - - 120 - True - True - never - in - - - True - True - False - - - - - - - - False - True - 0 - - - - - True - False - left - False - - - True - True - end - 1 - - + left + False True True + end 1 @@ -152,11 +123,9 @@ Close - False True True True - False False diff --git a/panels/printers/pp-jobs-dialog.c b/panels/printers/pp-jobs-dialog.c index 917a88583..b9f291cb0 100644 --- a/panels/printers/pp-jobs-dialog.c +++ b/panels/printers/pp-jobs-dialog.c @@ -493,10 +493,8 @@ pp_jobs_dialog_new (GtkWindow *parent, gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); - widget = (GtkWidget*) - gtk_builder_get_object (dialog->builder, "jobs-title"); title = g_strdup_printf (_("%s Active Jobs"), printer_name); - gtk_label_set_label (GTK_LABEL (widget), title); + gtk_window_set_title (GTK_WINDOW (dialog->dialog), title); g_free (title); populate_jobs_list (dialog); diff --git a/panels/printers/pp-options-dialog.c b/panels/printers/pp-options-dialog.c index d6e23dd3e..06c1e2b9f 100644 --- a/panels/printers/pp-options-dialog.c +++ b/panels/printers/pp-options-dialog.c @@ -883,7 +883,6 @@ pp_options_dialog_new (GtkWindow *parent, gboolean sensitive) { PpOptionsDialog *dialog; - GtkWidget *widget; GError *error = NULL; gchar *objects[] = { "options-dialog", NULL }; guint builder_result; @@ -930,11 +929,9 @@ pp_options_dialog_new (GtkWindow *parent, g_signal_connect (dialog->dialog, "response", G_CALLBACK (options_dialog_response_cb), dialog); g_signal_connect (dialog->dialog, "size-allocate", G_CALLBACK (update_alignment_padding), dialog); - widget = (GtkWidget*) - gtk_builder_get_object (dialog->builder, "options-title"); /* Translators: Options of given printer (e.g. "MyPrinter Options") */ title = g_strdup_printf (_("%s Options"), printer_name); - gtk_label_set_label (GTK_LABEL (widget), title); + gtk_window_set_title (GTK_WINDOW (dialog->dialog), title); g_free (title); gtk_widget_show_all (GTK_WIDGET (dialog->dialog)); diff --git a/panels/printers/ppd-selection-dialog.ui b/panels/printers/ppd-selection-dialog.ui index 120c94a73..c6e04e355 100644 --- a/panels/printers/ppd-selection-dialog.ui +++ b/panels/printers/ppd-selection-dialog.ui @@ -6,7 +6,7 @@ 400 False 5 - + Select Printer Driver True True dialog @@ -24,11 +24,9 @@ Cancel - False True True True - False False @@ -39,12 +37,10 @@ Select - False True False True True - False False @@ -109,80 +105,50 @@ True False - + True False - vertical - 10 - + + 140 True - False + True + never + in - - 140 + True True - never - in - - - True - True - - - - + + - - False - True - 0 - + + + False + True + 0 + + + + + True + True + in - + True True - in - - - True - True - - - - + + - - True - True - 1 - True True - end - 0 - - - - - True - False - 0 - Select Printer Driver - - - - - - False - False 1