r20668 - gnucash/trunk/src - Convert Account Filter By dialog to gtkbuilder format
Geert Janssens
gjanssens at code.gnucash.org
Sat May 21 15:37:00 EDT 2011
Author: gjanssens
Date: 2011-05-21 15:37:00 -0400 (Sat, 21 May 2011)
New Revision: 20668
Trac: http://svn.gnucash.org/trac/changeset/20668
Modified:
gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
gnucash/trunk/src/gnome/glade/account.glade
gnucash/trunk/src/gnome/gtkbuilder/account.glade
Log:
Convert Account Filter By dialog to gtkbuilder format
Modified: gnucash/trunk/src/gnome/glade/account.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/account.glade 2011-05-20 23:11:24 UTC (rev 20667)
+++ gnucash/trunk/src/gnome/glade/account.glade 2011-05-21 19:37:00 UTC (rev 20668)
@@ -2,227 +2,6 @@
<glade-interface>
<!-- interface-requires gtk+ 2.10 -->
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="Filter By">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Filter By...</property>
- <property name="type_hint">dialog</property>
- <signal name="response" handler="gppat_filter_response_cb"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox13">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">6</property>
- <child>
- <widget class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkTreeView" id="types_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- </widget>
- <packing>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <property name="layout_style">spread</property>
- <child>
- <widget class="GtkButton" id="select_all">
- <property name="label" translatable="yes">_Select All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gppat_filter_select_all_cb"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="clear_all">
- <property name="label" translatable="yes">C_lear All</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gppat_filter_clear_all_cb"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="default_types">
- <property name="label" translatable="yes">_Default</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="gppat_filter_select_default_cb"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label8477430">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Account Type</property>
- </widget>
- <packing>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox129">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkCheckButton" id="show_hidden">
- <property name="label" translatable="yes">Show _hidden accounts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="gppat_filter_show_hidden_toggled_cb"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="show_zero">
- <property name="label" translatable="yes">Show _zero total accounts</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Hide accounts which have a zero total value.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="gppat_filter_show_zero_toggled_cb"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="Balance">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Other</property>
- </widget>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area13">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="okbutton1">
- <property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkDialog" id="Renumber Accounts">
<property name="visible">True</property>
<property name="border_width">6</property>
Modified: gnucash/trunk/src/gnome/gtkbuilder/account.glade
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/account.glade 2011-05-20 23:11:24 UTC (rev 20667)
+++ gnucash/trunk/src/gnome/gtkbuilder/account.glade 2011-05-21 19:37:00 UTC (rev 20668)
@@ -1311,6 +1311,7 @@
<child>
<object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="layout_style">spread</property>
<child>
<object class="GtkButton" id="select_all">
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c 2011-05-20 23:11:24 UTC (rev 20667)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-account.c 2011-05-21 19:37:00 UTC (rev 20668)
@@ -1960,6 +1960,7 @@
GtkTreeView *view;
GtkCellRenderer *renderer;
GladeXML *xml;
+ GtkBuilder *builder;
gchar *title;
ENTER("(fd %p, page %p)", fd, page);
@@ -1972,8 +1973,9 @@
}
/* Create the dialog */
- xml = gnc_glade_xml_new ("account.glade", "Filter By");
- dialog = glade_xml_get_widget (xml, "Filter By");
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "account.glade", "Filter By");
+ dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog),
GTK_WINDOW(GNC_PLUGIN_PAGE(page)->window));
@@ -1989,15 +1991,15 @@
fd->original_show_zero_total = fd->show_zero_total;
/* Update the dialog widgets for the current state */
- button = glade_xml_get_widget (xml, "show_hidden");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "show_hidden"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
fd->show_hidden);
- button = glade_xml_get_widget (xml, "show_zero");
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "show_zero"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
fd->show_zero_total);
/* Set up the tree view and model */
- view = GTK_TREE_VIEW(glade_xml_get_widget (xml, FILTER_TREE_VIEW));
+ view = GTK_TREE_VIEW(gtk_builder_get_object (builder, FILTER_TREE_VIEW));
fd->model = gnc_tree_model_account_types_filter_using_mask
(~(1 << ACCT_TYPE_ROOT));
@@ -2020,8 +2022,8 @@
"text", GNC_TREE_MODEL_ACCOUNT_TYPES_COL_NAME, NULL);
/* Wire up the rest of the callbacks */
- glade_xml_signal_autoconnect_full(xml, gnc_glade_autoconnect_full_func,
- fd);
+ gtk_builder_connect_signals(builder, fd);
+ g_object_unref(G_OBJECT(builder));
/* Show it */
gtk_widget_show_all(dialog);
More information about the gnucash-changes
mailing list