callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make collate check button insensitive

Browse Source
This commit is contained in:
Matthias Clasen
2006-05-24 19:03:52 +00:00
parent b86d879e22
commit d6f2aadab7
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2006-05-24 Matthias Clasen <mclasen@redhat.com> 2006-05-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c (create_main_page): Make
the range entry insensitive if another range option
is selected. (#342783, Caolan McNamara)
(update_dialog_from_capabilities): Make the collate
check button insensitive unless multiple copies are
printed (#342781, Caolan McNamara)
* gtk/gtkwidget.c: Remove style properties when a widget * gtk/gtkwidget.c: Remove style properties when a widget
class gets finalized, to make style properties work in class gets finalized, to make style properties work in
dynamic types. (#342513, Christian Persch) dynamic types. (#342513, Christian Persch)

7
ChangeLog.pre-2-10
View File

@ -1,5 +1,12 @@
2006-05-24 Matthias Clasen <mclasen@redhat.com> 2006-05-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c (create_main_page): Make
the range entry insensitive if another range option
is selected. (#342783, Caolan McNamara)
(update_dialog_from_capabilities): Make the collate
check button insensitive unless multiple copies are
printed (#342781, Caolan McNamara)
* gtk/gtkwidget.c: Remove style properties when a widget * gtk/gtkwidget.c: Remove style properties when a widget
class gets finalized, to make style properties work in class gets finalized, to make style properties work in
dynamic types. (#342513, Christian Persch) dynamic types. (#342513, Christian Persch)

18
gtk/gtkprintunixdialog.c
View File

@ -1015,6 +1015,9 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog)
{ {
GtkPrintCapabilities caps; GtkPrintCapabilities caps;
GtkPrintUnixDialogPrivate *priv = dialog->priv; GtkPrintUnixDialogPrivate *priv = dialog->priv;
gboolean can_collate;
can_collate = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (priv->copies_spin)) > 1;
caps = priv->manual_capabilities | priv->printer_capabilities; caps = priv->manual_capabilities | priv->printer_capabilities;
@ -1023,7 +1026,8 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog)
gtk_widget_set_sensitive (priv->copies_spin, gtk_widget_set_sensitive (priv->copies_spin,
caps & GTK_PRINT_CAPABILITY_COPIES); caps & GTK_PRINT_CAPABILITY_COPIES);
gtk_widget_set_sensitive (priv->collate_check, gtk_widget_set_sensitive (priv->collate_check,
caps & GTK_PRINT_CAPABILITY_COLLATE); can_collate &&
(caps & GTK_PRINT_CAPABILITY_COLLATE));
gtk_widget_set_sensitive (priv->reverse_check, gtk_widget_set_sensitive (priv->reverse_check,
caps & GTK_PRINT_CAPABILITY_REVERSE); caps & GTK_PRINT_CAPABILITY_REVERSE);
gtk_widget_set_sensitive (priv->scale_spin, gtk_widget_set_sensitive (priv->scale_spin,
@ -1379,8 +1383,11 @@ static void
update_range_sensitivity (GtkWidget *button, update_range_sensitivity (GtkWidget *button,
GtkWidget *range) GtkWidget *range)
{ {
gtk_widget_set_sensitive (range, gboolean active;
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
gtk_widget_set_sensitive (range, active);
} }
static void static void
@ -1514,7 +1521,7 @@ create_main_page (GtkPrintUnixDialog *dialog)
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (table); gtk_widget_show (table);
/* FIXMEchpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns */ /* FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns */
label = gtk_label_new_with_mnemonic (_("Copie_s:")); label = gtk_label_new_with_mnemonic (_("Copie_s:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label); gtk_widget_show (label);
@ -1528,6 +1535,8 @@ create_main_page (GtkPrintUnixDialog *dialog)
1, 2, 0, 1, GTK_FILL, 0, 1, 2, 0, 1, GTK_FILL, 0,
0, 0); 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton); gtk_label_set_mnemonic_widget (GTK_LABEL (label), spinbutton);
g_signal_connect_swapped (spinbutton, "value-changed",
G_CALLBACK (update_dialog_from_capabilities), dialog);
check = gtk_check_button_new_with_mnemonic (_("C_ollate")); check = gtk_check_button_new_with_mnemonic (_("C_ollate"));
priv->collate_check = check; priv->collate_check = check;
@ -1536,6 +1545,7 @@ create_main_page (GtkPrintUnixDialog *dialog)
gtk_table_attach (GTK_TABLE (table), check, gtk_table_attach (GTK_TABLE (table), check,
0, 1, 1, 2, GTK_FILL, 0, 0, 1, 1, 2, GTK_FILL, 0,
0, 0); 0, 0);
check = gtk_check_button_new_with_mnemonic (_("_Reverse")); check = gtk_check_button_new_with_mnemonic (_("_Reverse"));
g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog); g_signal_connect (check, "toggled", G_CALLBACK (update_collate_icon), dialog);
priv->reverse_check = check; priv->reverse_check = check;