r20632 - gnucash/trunk/src - Rename owner.ui to owner.glade
Geert Janssens
gjanssens at code.gnucash.org
Thu May 12 12:11:09 EDT 2011
Author: gjanssens
Date: 2011-05-12 12:11:09 -0400 (Thu, 12 May 2011)
New Revision: 20632
Trac: http://svn.gnucash.org/trac/changeset/20632
Added:
gnucash/trunk/src/gnome/gtkbuilder/owner.glade
Removed:
gnucash/trunk/src/gnome/gtkbuilder/owner.ui
Modified:
gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c
gnucash/trunk/src/gnome/gtkbuilder/Makefile.am
Log:
Rename owner.ui to owner.glade
I read that .ui should be the devault extension for gtkbuilder files,
but it turns out that would conflict with qt designer files. On Fedora
(at least) only .glade is recognized as a file editable by glade-3.
Modified: gnucash/trunk/src/gnome/gtkbuilder/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/Makefile.am 2011-05-11 22:17:56 UTC (rev 20631)
+++ gnucash/trunk/src/gnome/gtkbuilder/Makefile.am 2011-05-12 16:11:09 UTC (rev 20632)
@@ -8,7 +8,7 @@
fincalc.glade \
lots.glade \
newuser.glade \
- owner.ui \
+ owner.glade \
price.glade \
print.glade \
progress.glade \
Copied: gnucash/trunk/src/gnome/gtkbuilder/owner.glade (from rev 20630, gnucash/trunk/src/gnome/gtkbuilder/owner.ui)
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/owner.glade (rev 0)
+++ gnucash/trunk/src/gnome/gtkbuilder/owner.glade 2011-05-12 16:11:09 UTC (rev 20632)
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object 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="gppot_filter_response_cb"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox13">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="show_hidden">
+ <property name="label" translatable="yes">Only show _active owners</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="gppot_filter_show_inactive_toggled_cb"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="show_zero">
+ <property name="label" translatable="yes">Show _zero balance owners</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="gppot_filter_show_zero_toggled_cb"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area13">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancelbutton1</action-widget>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Deleted: gnucash/trunk/src/gnome/gtkbuilder/owner.ui
===================================================================
--- gnucash/trunk/src/gnome/gtkbuilder/owner.ui 2011-05-11 22:17:56 UTC (rev 20631)
+++ gnucash/trunk/src/gnome/gtkbuilder/owner.ui 2011-05-12 16:11:09 UTC (rev 20632)
@@ -1,96 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
- <object 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="gppot_filter_response_cb"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox13">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="show_hidden">
- <property name="label" translatable="yes">Only show _active owners</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="gppot_filter_show_inactive_toggled_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show_zero">
- <property name="label" translatable="yes">Show _zero balance owners</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="gppot_filter_show_zero_toggled_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area13">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="cancelbutton1">
- <property name="label">gtk-cancel</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="okbutton1">
- <property name="label">gtk-ok</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">cancelbutton1</action-widget>
- <action-widget response="-5">okbutton1</action-widget>
- </action-widgets>
- </object>
-</interface>
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c 2011-05-11 22:17:56 UTC (rev 20631)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-owner.c 2011-05-12 16:11:09 UTC (rev 20632)
@@ -1451,7 +1451,7 @@
/* Create the dialog */
builder = gtk_builder_new();
- gnc_builder_add_from_file (builder, "owner.ui", "Filter By");
+ gnc_builder_add_from_file (builder, "owner.glade", "Filter By");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Filter By"));
fd->dialog = dialog;
gtk_window_set_transient_for(GTK_WINDOW(dialog),
More information about the gnucash-changes
mailing list