[Gnucash-changes] r13884 - gnucash/trunk - Eliminate some gtk
warning messages. Stop the contents of the Bill
David Hampton
hampton at cvs.gnucash.org
Sat Apr 29 21:27:25 EDT 2006
Author: hampton
Date: 2006-04-29 21:27:24 -0400 (Sat, 29 Apr 2006)
New Revision: 13884
Trac: http://svn.gnucash.org/trac/changeset/13884
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/business/business-gnome/dialog-billterms.c
gnucash/trunk/src/business/business-gnome/glade/billterms.glade
Log:
Eliminate some gtk warning messages. Stop the contents of the Bill
Terms dialog from shifting around when the first/last term is
created/destroyed.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-04-30 00:43:45 UTC (rev 13883)
+++ gnucash/trunk/ChangeLog 2006-04-30 01:27:24 UTC (rev 13884)
@@ -1,3 +1,11 @@
+2006-04-29 David Hampton <hampton at employees.org>
+
+ * src/business/business-gnome/dialog-billterms.c:
+ * src/business/business-gnome/glade/billterms.glade: Eliminate
+ some gtk warning messages. Stop the contents of the Bill Terms
+ dialog from shifting around when the first/last term is
+ created/destroyed.
+
2006-04-30 Andreas Köhler <andi5.py at gmx.net>
* configure.in:
Modified: gnucash/trunk/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2006-04-30 00:43:45 UTC (rev 13883)
+++ gnucash/trunk/src/business/business-gnome/dialog-billterms.c 2006-04-30 01:27:24 UTC (rev 13884)
@@ -396,9 +396,10 @@
GncBillTerm *created_term = NULL;
NewBillTerm *nbt;
GladeXML *xml;
- GtkWidget *box, *widget;
+ GtkWidget *box;
gint response;
gboolean done;
+ const gchar *dialog_name;
if (!btw) return NULL;
@@ -407,8 +408,9 @@
nbt->this_term = term;
/* Open and read the XML */
- xml = gnc_glade_xml_new ("billterms.glade", "New Term Dialog");
- nbt->dialog = glade_xml_get_widget (xml, "New Term Dialog");
+ dialog_name = term ? "Edit Term Dialog" : "New Term Dialog";
+ xml = gnc_glade_xml_new ("billterms.glade", dialog_name);
+ nbt->dialog = glade_xml_get_widget (xml, dialog_name);
nbt->name_entry = glade_xml_get_widget (xml, "name_entry");
nbt->desc_entry = glade_xml_get_widget (xml, "desc_entry");
if (name)
@@ -446,8 +448,6 @@
/* Show what we should */
gtk_widget_show_all (nbt->dialog);
if (term) {
- widget = glade_xml_get_widget (xml, "term_frame");
- gtk_widget_hide_all (widget);
gtk_widget_grab_focus (nbt->desc_entry);
} else
gtk_widget_grab_focus (nbt->name_entry);
Modified: gnucash/trunk/src/business/business-gnome/glade/billterms.glade
===================================================================
--- gnucash/trunk/src/business/business-gnome/glade/billterms.glade 2006-04-30 00:43:45 UTC (rev 13883)
+++ gnucash/trunk/src/business/business-gnome/glade/billterms.glade 2006-04-30 01:27:24 UTC (rev 13884)
@@ -198,7 +198,7 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
@@ -344,7 +344,7 @@
<child>
<widget class="GtkLabel" id="type_label">
<property name="visible">True</property>
- <property name="label" translatable="no">(type)</property>
+ <property name="label">(type)</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -809,6 +809,262 @@
</child>
</widget>
+<widget class="GtkDialog" id="Edit Term Dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes"></property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">True</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_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="has_separator">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Cancel your changes</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="ok_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Commit this Billing Term</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Term Definition</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">De_scription:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">desc_entry</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="desc_entry">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The description of the Billing Term, printed on invoices</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">True</property>
+ </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"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Type:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">type_menu</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkOptionMenu" id="type_menu">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Choose the type of Billing Term</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget3">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="convertwidget4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Type Menu</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="notebook_box">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</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>
+
<widget class="GtkMenu" id="Term Type Popup">
<property name="visible">True</property>
More information about the gnucash-changes
mailing list