Files linked to dialog-options.glade

This commit is contained in:
Robert Fewell 2017-06-18 16:13:27 +01:00
parent cb25078ef8
commit 4a421af57f
2 changed files with 24 additions and 24 deletions

View File

@ -1724,8 +1724,8 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title)
retval = g_new0(GNCOptionWin, 1);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-options.glade", "GnuCash Options");
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "GnuCash Options"));
gnc_builder_add_from_file (builder, "dialog-options.glade", "gnucash_options_dialog");
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "gnucash_options_dialog"));
retval->page_list = GTK_WIDGET(gtk_builder_get_object (builder, "page_list_scroll"));
/* Page List */
@ -1773,7 +1773,7 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title)
}
/* glade doesn't support a notebook with zero pages */
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook placeholder"));
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook_placeholder"));
retval->notebook = gtk_notebook_new();
gtk_widget_show(retval->notebook);
gtk_box_pack_start(GTK_BOX(hbox), retval->notebook, TRUE, TRUE, 5);
@ -2301,7 +2301,7 @@ gnc_option_set_ui_widget_color (GNCOption *option, GtkBox *page_box,
value = gtk_color_button_new();
gtk_color_button_set_title(GTK_COLOR_BUTTON(value), name);
gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(value), use_alpha);
gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(value), use_alpha);
gnc_option_set_widget (option, value);
gnc_option_set_ui_value(option, FALSE);

View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="GnuCash Options">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="gnucash_options_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">GnuCash Options</property>
<property name="default_width">400</property>
@ -10,23 +10,23 @@
<property name="type_hint">dialog</property>
<signal name="response" handler="gnc_options_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton1">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -36,13 +36,12 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -52,13 +51,12 @@
</child>
<child>
<object class="GtkButton" id="applybutton">
<property name="label">gtk-apply</property>
<property name="label" translatable="yes">_Apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -68,13 +66,12 @@
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -91,7 +88,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -104,6 +101,9 @@
<object class="GtkTreeView" id="page_list_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child>
</object>
@ -114,7 +114,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="notebook placeholder">
<object class="GtkBox" id="notebook_placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>