[Gnucash-changes] Run through the FC3 version of glade (2.6.0).
David Hampton
hampton at cvs.gnucash.org
Sat May 21 01:56:21 EDT 2005
Log Message:
-----------
Run through the FC3 version of glade (2.6.0). Additional properties
added and minor reordering of properties. This file also has major
indentation changes.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash/src/gnome/glade:
merge.glade
Revision Data
-------------
Index: merge.glade
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/glade/merge.glade,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome/glade/merge.glade -Lsrc/gnome/glade/merge.glade -u -r1.1.2.1 -r1.1.2.2
--- src/gnome/glade/merge.glade
+++ src/gnome/glade/merge.glade
@@ -1,29 +1,36 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
- <requires lib="gnome" />
+<requires lib="gnome"/>
- <widget class="GtkWindow" id="Merge Druid">
- <property name="title" translatable="yes">Merge Account Hierarchy Setup</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">no</property>
- <property name="allow_shrink">no</property>
- <property name="allow_grow">yes</property>
- <property name="height-request">560</property>
- <property name="window-position">GTK_WIN_POS_CENTER</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GnomeDruid" id="merge_druid">
- <property name="visible">yes</property>
-
- <signal name="cancel" handler="on_cancel" />
-
- <child>
- <widget class="GnomeDruidPageEdge" id="start_page">
- <property name="title" translatable="yes">Merge Account Hierarchy Setup</property>
- <property name="text" translatable="yes">This druid will merge your new hierarchy into the currently open
+<widget class="GtkWindow" id="Merge Druid">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Merge Account Hierarchy Setup</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+
+ <child>
+ <widget class="GnomeDruid" id="merge_druid">
+ <property name="border_width">4</property>
+ <property name="visible">True</property>
+ <property name="show_help">False</property>
+ <signal name="cancel" handler="on_cancel"/>
+
+ <child>
+ <widget class="GnomeDruidPageEdge" id="start_page">
+ <property name="visible">True</property>
+ <property name="position">GNOME_EDGE_START</property>
+ <property name="title" translatable="yes">Merge Account Hierarchy Setup</property>
+ <property name="text" translatable="yes">This druid will merge your new hierarchy into the currently open
GnuCash file.
You will be asked how to proceed if some accounts clash with the
@@ -41,273 +48,266 @@
Click 'Cancel' if you do not wish to merge your new
account types now.</property>
- <property name="position">GNOME_EDGE_START</property>
- <property name="visible">yes</property>
- <property name="title_color">#ffffff</property>
- <property name="text_color">#000000</property>
- <property name="background_color">#191970</property>
- <property name="logo_background_color">#ffffff</property>
- <property name="textbox_color">#ffffff</property>
-
- <signal name="next" handler="on_start_page_next" />
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageStandard" id="summary_page">
- <property name="title" translatable="yes">Your new accounts are ready to merge</property>
- <property name="visible">yes</property>
- <property name="title_foreground">#ffffff</property>
- <property name="background">#191970</property>
- <property name="logo_background">#ffffff</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox7">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="label" translatable="yes">The next screen will allow you to resolve
+ <property name="title_color">#ffffffffffff</property>
+ <property name="text_color">#000000000000</property>
+ <property name="background_color">#191919197070</property>
+ <property name="logo_background_color">#ffffffffffff</property>
+ <property name="textbox_color">#ffffffffffff</property>
+ <signal name="next" handler="on_start_page_next"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GnomeDruidPageStandard" id="summary_page">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Your new accounts are ready to merge</property>
+ <property name="title_foreground">#ffffffffffff</property>
+ <property name="background">#191919197070</property>
+ <property name="logo_background">#ffffffffffff</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="druid-vbox7">
+ <property name="border_width">16</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">The next screen will allow you to resolve
any conflicts in merging your new account
tree into your current GnuCash file.</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="visible">yes</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">no</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageStandard" id="qof_book_merge">
- <property name="title" translatable="yes">Please resolve any conflicts in the merge</property>
- <property name="visible">yes</property>
- <property name="title_foreground">#ffffff</property>
- <property name="background">#191970</property>
- <property name="logo_background">#ffffff</property>
-
- <signal name="prepare" handler="on_qof_book_merge_prepare" />
- <signal name="next" handler="on_qof_book_merge_next" />
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox6">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkHBox" id="hbox105">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkVBox" id="vbox121">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkLabel" id="ResultsBox">
- <property name="label" translatable="yes">Number of reports still to be reconciled.</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="visible">yes</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox106">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow27">
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="border_width">5</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkLabel" id="OutPut">
- <property name="label" translatable="yes"></property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">no</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">MergeUpdate</property>
- <property name="visible">yes</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child internal-child="hscrollbar">
- <widget class="GtkHScrollbar" id="convertwidget1">
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child internal-child="vscrollbar">
- <widget class="GtkVScrollbar" id="convertwidget2">
- <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
- <property name="visible">yes</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="Static">
- <property name="label" translatable="yes">You have three choices for each collision.
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GnomeDruidPageStandard" id="qof_book_merge">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Please resolve any conflicts in the merge</property>
+ <property name="title_foreground">#ffffffffffff</property>
+ <property name="background">#191919197070</property>
+ <property name="logo_background">#ffffffffffff</property>
+ <signal name="prepare" handler="on_qof_book_merge_prepare"/>
+ <signal name="next" handler="on_qof_book_merge_next"/>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="druid-vbox6">
+ <property name="border_width">16</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox105">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox121">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="ResultsBox">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Number of reports still to be reconciled.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox106">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow27">
+ <property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkViewport" id="viewport1">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkLabel" id="OutPut">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">MergeUpdate</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="Static">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">You have three choices for each collision.
The import object can be allowed to overwrite the target - use this to update your existing book.
The import object can be ignored - use this if the import is a duplicate of an object in the existing book.
The import object can be created as a new object in the existing book.</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="visible">yes</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeUpdate">
- <property name="border_width">5</property>
- <property name="tooltip" translatable="yes">overwrite the original with the import data</property>
- <property name="can_focus">yes</property>
- <property name="has_focus">yes</property>
- <property name="label" translatable="yes">1. Update your existing book with the import data</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="visible">yes</property>
-
- <signal name="clicked" handler="on_MergeUpdate_clicked" />
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeDuplicate">
- <property name="border_width">5</property>
- <property name="tooltip" translatable="yes">ignore the import, leave the original untouched</property>
- <property name="can_focus">yes</property>
- <property name="label" translatable="yes">2. Ignore the import data, leave original unchanged</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="visible">yes</property>
-
- <signal name="clicked" handler="on_MergeDuplicate_clicked" />
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="MergeNew">
- <property name="border_width">5</property>
- <property name="tooltip" translatable="yes">Add the import as a new object, leave original in place</property>
- <property name="can_focus">yes</property>
- <property name="label" translatable="yes">3. Import the data as a NEW object</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="visible">yes</property>
-
- <signal name="clicked" handler="on_MergeNew_clicked" />
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">no</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GnomeDruidPageEdge" id="MergeDruidFinishPage">
- <property name="title" translatable="yes">Commit Merged Account Hierachy to data file</property>
- <property name="text" translatable="yes">Press `Finish' to merge your new accounts into the current GnuCash file.
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="MergeUpdate">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">overwrite the original with the import data</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="label" translatable="yes">1. Update your existing book with the import data</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_MergeUpdate_clicked"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="MergeDuplicate">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">ignore the import, leave the original untouched</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">2. Ignore the import data, leave original unchanged</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_MergeDuplicate_clicked"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="MergeNew">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add the import as a new object, leave original in place</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">3. Import the data as a NEW object</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_MergeNew_clicked"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GnomeDruidPageEdge" id="MergeDruidFinishPage">
+ <property name="visible">True</property>
+ <property name="position">GNOME_EDGE_FINISH</property>
+ <property name="title" translatable="yes">Commit Merged Account Hierachy to data file</property>
+ <property name="text" translatable="yes">Press `Finish' to merge your new accounts into the current GnuCash file.
Press `Back' to review your selections.
@@ -315,18 +315,16 @@
REMEMBER: There is no way to undo this final operation!
Make sure you have a backup before clicking Finish.</property>
- <property name="position">GNOME_EDGE_FINISH</property>
- <property name="visible">yes</property>
- <property name="title_color">#ffffff</property>
- <property name="text_color">#000000</property>
- <property name="background_color">#191970</property>
- <property name="logo_background_color">#ffffff</property>
- <property name="textbox_color">#ffffff</property>
-
- <signal name="finish" handler="on_finish" />
- </widget>
- </child>
- </widget>
- </child>
- </widget>
+ <property name="title_color">#ffffffffffff</property>
+ <property name="text_color">#000000000000</property>
+ <property name="background_color">#191919197070</property>
+ <property name="logo_background_color">#ffffffffffff</property>
+ <property name="textbox_color">#ffffffffffff</property>
+ <signal name="finish" handler="on_finish"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
More information about the gnucash-changes
mailing list