AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printdialog: Replace some combo boxes with drop downs

Browse Source 
These are just the simple cases.
This commit is contained in:
Matthias Clasen 2020-06-11 18:10:42 -04:00
parent c3b43f2ad2
commit ed9941ec2c
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkprintunixdialog.c
View File

@ -1580,8 +1580,8 @@ set_paper_size (GtkPrintUnixDialog *dialog,
{
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->paper_size_combo),
&iter);
gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->orientation_combo),
gtk_page_setup_get_orientation (page_setup));
gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->orientation_combo),
gtk_page_setup_get_orientation (page_setup));
g_object_unref (list_page_setup);
return TRUE;
}
@ -1603,8 +1603,8 @@ set_paper_size (GtkPrintUnixDialog *dialog,
-1);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->paper_size_combo),
&iter);
gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->orientation_combo),
gtk_page_setup_get_orientation (page_setup));
gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->orientation_combo),
gtk_page_setup_get_orientation (page_setup));
return TRUE;
}
@ -2218,7 +2218,7 @@ static GtkPageSet
dialog_get_page_set (GtkPrintUnixDialog *dialog)
{
if (gtk_widget_is_sensitive (dialog->page_set_combo))
return (GtkPageSet)gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->page_set_combo));
return (GtkPageSet)gtk_drop_down_get_selected (GTK_DROP_DOWN (dialog->page_set_combo));
else
return GTK_PAGE_SET_ALL;
}
@ -2227,7 +2227,7 @@ static void
dialog_set_page_set (GtkPrintUnixDialog *dialog,
GtkPageSet val)
{
gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->page_set_combo), (int)val);
gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->page_set_combo), (guint)val);
}
static gint
@ -2949,16 +2949,17 @@ custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
}
static void
orientation_changed (GtkComboBox *combo_box,
orientation_changed (GObject *object,
GParamSpec *pspec,
GtkPrintUnixDialog *dialog)
{
GtkPageOrientation orientation;
GtkPageSetup *page_setup;
GtkPageOrientation orientation;
GtkPageSetup *page_setup;
if (dialog->internal_page_setup_change)
return;
orientation = (GtkPageOrientation) gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->orientation_combo));
orientation = (GtkPageOrientation) gtk_drop_down_get_selected (GTK_DROP_DOWN (dialog->orientation_combo));
if (dialog->page_setup)
{
@ -3548,7 +3549,7 @@ gtk_print_unix_dialog_set_embed_page_setup (GtkPrintUnixDialog *dialog,
g_signal_connect (dialog->paper_size_combo, "changed", G_CALLBACK (paper_size_changed), dialog);
if (dialog->orientation_combo)
g_signal_connect (dialog->orientation_combo, "changed", G_CALLBACK (orientation_changed), dialog);
g_signal_connect (dialog->orientation_combo, "notify::selected", G_CALLBACK (orientation_changed), dialog);
}
else
{

12
gtk/ui/gtkprintunixdialog.ui
View File

@ -519,11 +519,9 @@
</object>
</child>
<child>
<object class="GtkComboBoxText" id="page_set_combo">
<object class="GtkDropDown" id="page_set_combo">
<property name="valign">baseline</property>
<property name="active">0</property>
<property name="entry-text-column">0</property>
<property name="id-column">1</property>
<property name="selected">0</property>
<items>
<item translatable="yes">All sheets</item>
<item translatable="yes">Even sheets</item>
@ -708,12 +706,10 @@
</object>
</child>
<child>
<object class="GtkComboBoxText" id="orientation_combo">
<object class="GtkDropDown" id="orientation_combo">
<property name="sensitive">0</property>
<property name="active">0</property>
<property name="entry-text-column">0</property>
<property name="selected">0</property>
<property name="valign">baseline</property>
<property name="id-column">1</property>
<items>
<item translatable="yes">Portrait</item>
<item translatable="yes">Landscape</item>