Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More HIGy layout.

Browse Source 
2006-03-28  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkpagesetupunixdialog.c:
	* gtk/gtkprintunixdialog.c:
	More HIGy layout.
This commit is contained in:
Alexander Larsson
2006-03-28 16:32:29 +00:00
committed by Alexander Larsson
parent f384721830
commit 4acfb870ac
5 changed files with 120 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2006-03-28 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:
* gtk/gtkprintunixdialog.c:
More HIGy layout.
2006-03-28 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
2006-03-28 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:
* gtk/gtkprintunixdialog.c:
More HIGy layout.
2006-03-28 Alexander Larsson <alexl@redhat.com>
* gtk/gtkpagesetupunixdialog.c:

2
TODO.printing
View File

@@ -41,9 +41,11 @@ General:
* don't enforce paper size in portrait mode
* use filechooserentry => J5
* print DPI from settings object?
* errors on alex laptop
Page setting dialog:
* HIG spacing
* insensitive from-printer if list is empty
* sort paper lists
* nicer unit editor than spinbutton

38
gtk/gtkpagesetupunixdialog.c
View File

@@ -1286,14 +1286,23 @@ gtk_page_setup_unix_dialog_get_print_settings (GtkPageSetupUnixDialog *dialog)
static GtkWidget *
wrap_in_frame (const char *label, GtkWidget *child)
{
GtkWidget *frame, *alignment;
GtkWidget *frame, *alignment, *label_widget;
char *bold_text;
label_widget = gtk_label_new ("");
gtk_widget_show (label_widget);
frame = gtk_frame_new (label);
bold_text = g_markup_printf_escaped ("<b>%s</b>", label);
gtk_label_set_markup (GTK_LABEL (label_widget), bold_text);
g_free (bold_text);
frame = gtk_frame_new ("");
gtk_frame_set_label_widget (GTK_FRAME (frame), label_widget);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
0, 0, 12, 0);
12, 0, 12, 0);
gtk_container_add (GTK_CONTAINER (frame), alignment);
gtk_container_add (GTK_CONTAINER (alignment), child);
@@ -1735,6 +1744,17 @@ custom_name_func (GtkTreeViewColumn *tree_column,
}
}
static void
set_dialog_hig_spacing (GtkWidget *widget,
GtkStyle *previous_style,
GtkDialog *dialog)
{
gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12);
gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24);
gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0);
gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
}
static void
run_custom_paper_dialog (GtkPageSetupUnixDialog *dialog)
{
@@ -1753,15 +1773,17 @@ run_custom_paper_dialog (GtkPageSetupUnixDialog *dialog)
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
NULL);
g_signal_connect (custom_dialog, "style-set", G_CALLBACK (set_dialog_hig_spacing), custom_dialog);
data = g_new0 (CustomPaperDialog, 1);
data->dialog = dialog;
g_object_set_data_full (G_OBJECT (custom_dialog), "custom-dialog", data, custom_paper_dialog_free);
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_hbox_new (FALSE, 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (custom_dialog)->vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
vbox = gtk_vbox_new (FALSE, 0);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
@@ -1797,7 +1819,7 @@ run_custom_paper_dialog (GtkPageSetupUnixDialog *dialog)
gtk_container_add (GTK_CONTAINER (scrolled), treeview);
gtk_widget_show (treeview);
button_box = gtk_hbox_new (FALSE, 0);
button_box = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
gtk_widget_show (button_box);
@@ -1828,6 +1850,8 @@ run_custom_paper_dialog (GtkPageSetupUnixDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
label = gtk_label_new (_("Width:"));
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 0, 1, 0, 0, 0, 0);
@@ -1856,6 +1880,8 @@ run_custom_paper_dialog (GtkPageSetupUnixDialog *dialog)
table = gtk_table_new (3, 5, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 0);
widget = new_unit_widget (data, user_units);
data->top_widget = widget;

119
gtk/gtkprintunixdialog.c
View File

@@ -731,14 +731,23 @@ create_printer_list_model (GtkPrintUnixDialog *dialog)
static GtkWidget *
wrap_in_frame (const char *label, GtkWidget *child)
{
GtkWidget *frame, *alignment;
GtkWidget *frame, *alignment, *label_widget;
char *bold_text;
label_widget = gtk_label_new ("");
gtk_widget_show (label_widget);
frame = gtk_frame_new (label);
bold_text = g_markup_printf_escaped ("<b>%s</b>", label);
gtk_label_set_markup (GTK_LABEL (label_widget), bold_text);
g_free (bold_text);
frame = gtk_frame_new ("");
gtk_frame_set_label_widget (GTK_FRAME (frame), label_widget);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
0, 0, 12, 0);
12, 0, 12, 0);
gtk_container_add (GTK_CONTAINER (frame), alignment);
gtk_container_add (GTK_CONTAINER (alignment), child);
@@ -930,6 +939,8 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog)
}
table = gtk_table_new (1, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_printer_option_set_foreach_in_group (dialog->priv->options,
group,
@@ -1288,6 +1299,8 @@ create_main_page (GtkPrintUnixDialog *dialog)
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 6);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Print Pages"), table);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6);
gtk_widget_show (table);
@@ -1322,6 +1335,8 @@ create_main_page (GtkPrintUnixDialog *dialog)
0, 0);
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Copies"), table);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6);
gtk_widget_show (table);
@@ -1652,10 +1667,7 @@ draw_page_cb (GtkWidget *widget,
cairo_restore (cr);
}
}
return TRUE;
}
@@ -1677,13 +1689,16 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
priv = dialog->priv;
main_vbox = gtk_vbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_widget_show (main_vbox);
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE, TRUE, 6);
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE, TRUE, 0);
table = gtk_table_new (5, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Layout"), table);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6);
gtk_widget_show (table);
@@ -1717,17 +1732,36 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
1, 2, 1, 2, GTK_FILL, 0,
0, 0);
label = gtk_label_new (_("Scale:"));
label = gtk_label_new (_("Only Print:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 2, 3, GTK_FILL, 0,
0, 0);
combo = gtk_combo_box_new_text ();
priv->page_set_combo = combo;
gtk_widget_show (combo);
gtk_table_attach (GTK_TABLE (table), combo,
1, 2, 2, 3, GTK_FILL, 0,
0, 0);
/* In enum order */
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("All pages"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Even pages"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Odd pages"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
label = gtk_label_new (_("Scale:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 3, 4, GTK_FILL, 0,
0, 0);
hbox2 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox2);
gtk_table_attach (GTK_TABLE (table), hbox2,
1, 2, 2, 3, GTK_FILL, 0,
1, 2, 3, 4, GTK_FILL, 0,
0, 0);
spinbutton = gtk_spin_button_new_with_range (1.0, 1000.0, 1.0);
@@ -1740,26 +1774,10 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
label = gtk_label_new (_("Only Print:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 4, 5, GTK_FILL, 0,
0, 0);
combo = gtk_combo_box_new_text ();
priv->page_set_combo = combo;
gtk_widget_show (combo);
gtk_table_attach (GTK_TABLE (table), combo,
1, 2, 4, 5, GTK_FILL, 0,
0, 0);
/* In enum order */
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("All pages"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Even pages"));
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Odd pages"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
table = gtk_table_new (4, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Paper"), table);
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 6);
gtk_widget_show (table);
@@ -1768,42 +1786,42 @@ create_page_setup_page (GtkPrintUnixDialog *dialog)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 1, 2, GTK_FILL, 0,
0, 1, 0, 1, GTK_FILL, 0,
0, 0);
widget = gtk_printer_option_widget_new (NULL);
priv->paper_type = GTK_PRINTER_OPTION_WIDGET (widget);
gtk_widget_show (widget);
gtk_table_attach (GTK_TABLE (table), widget,
1, 2, 1, 2, GTK_FILL, 0,
1, 2, 0, 1, GTK_FILL, 0,
0, 0);
label = gtk_label_new (_("Paper Source:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 1, 2, GTK_FILL, 0,
0, 0);
widget = gtk_printer_option_widget_new (NULL);
priv->paper_source = GTK_PRINTER_OPTION_WIDGET (widget);
gtk_widget_show (widget);
gtk_table_attach (GTK_TABLE (table), widget,
1, 2, 1, 2, GTK_FILL, 0,
0, 0);
label = gtk_label_new (_("Output Tray:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 2, 3, GTK_FILL, 0,
0, 0);
widget = gtk_printer_option_widget_new (NULL);
priv->paper_source = GTK_PRINTER_OPTION_WIDGET (widget);
gtk_widget_show (widget);
gtk_table_attach (GTK_TABLE (table), widget,
1, 2, 2, 3, GTK_FILL, 0,
0, 0);
label = gtk_label_new (_("Output Tray:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
gtk_table_attach (GTK_TABLE (table), label,
0, 1, 3, 4, GTK_FILL, 0,
0, 0);
widget = gtk_printer_option_widget_new (NULL);
priv->output_tray = GTK_PRINTER_OPTION_WIDGET (widget);
gtk_widget_show (widget);
gtk_table_attach (GTK_TABLE (table), widget,
1, 2, 3, 4, GTK_FILL, 0,
1, 2, 2, 3, GTK_FILL, 0,
0, 0);
hbox2 = gtk_hbox_new (FALSE, 0);
@@ -1837,8 +1855,11 @@ create_job_page (GtkPrintUnixDialog *dialog)
priv = dialog->priv;
main_table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (main_table), 6);
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Job Details"), table);
gtk_table_attach (GTK_TABLE (main_table), frame,
0, 1, 0, 1, 0, 0,
@@ -1875,6 +1896,8 @@ create_job_page (GtkPrintUnixDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Print Document"), table);
gtk_table_attach (GTK_TABLE (main_table), frame,
0, 1, 1, 2, 0, 0,
@@ -1906,6 +1929,8 @@ create_job_page (GtkPrintUnixDialog *dialog)
table = gtk_table_new (2, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
frame = wrap_in_frame (_("Add Cover Page"), table);
gtk_table_attach (GTK_TABLE (main_table), frame,
1, 2, 0, 1, 0, 0,
@@ -1965,6 +1990,9 @@ create_optional_page (GtkPrintUnixDialog *dialog,
GTK_POLICY_AUTOMATIC);
table = gtk_table_new (1, 2, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
gtk_container_set_border_width (GTK_CONTAINER (table), 6);
gtk_widget_show (table);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled),
@@ -1997,6 +2025,7 @@ create_advanced_page (GtkPrintUnixDialog *dialog)
GTK_POLICY_AUTOMATIC);
main_vbox = gtk_vbox_new (FALSE, 8);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_widget_show (main_vbox);
gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled),