[glom] Layout window: Correct the vertical order of Add buttons.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Layout window: Correct the vertical order of Add buttons.
- Date: Thu, 22 Sep 2011 07:52:51 +0000 (UTC)
commit 8ec82b692c41571e683ec31fe9fdb859701ed972
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Sep 22 09:52:41 2011 +0200
Layout window: Correct the vertical order of Add buttons.
* ui/developer/window_data_layout.glade: This has been mixed up since some
time recently, probably due to Glade changes.
ChangeLog | 7 ++
ui/developer/window_data_layout.glade | 158 ++++++++++++++++++---------------
2 files changed, 94 insertions(+), 71 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6527bea..1349eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-22 Murray Cumming <murrayc murrayc com>
+
+ Layout window: Correct the vertical order of Add buttons.
+
+ * ui/developer/window_data_layout.glade: This has been mixed up since some
+ time recently, probably due to Glade changes.
+
2011-09-21 Murray Cumming <murrayc murrayc com>
Print Layout: Show contents of System Preferences in Fields.
diff --git a/ui/developer/window_data_layout.glade b/ui/developer/window_data_layout.glade
index e0cc0e8..b3ec220 100644
--- a/ui/developer/window_data_layout.glade
+++ b/ui/developer/window_data_layout.glade
@@ -195,26 +195,28 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkButton" id="button_add_text">
+ <object class="GtkButton" id="button_add_field">
<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="tooltip_text" translatable="yes">Add text to a layout, such as an explanation or a warning. The text will be the same for every record viewed.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a layout item that shows the data from a field in the record, and allows the user to edit that value.</property>
+ <property name="tooltip_text" translatable="yes">Add a layout item that shows the data from a field in the record, and allows the user to edit that value.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment81">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox103">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image43">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -226,10 +228,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label231">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Text</property>
+ <property name="label" translatable="yes">Add Field</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -246,30 +248,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_button">
+ <object class="GtkButton" id="button_add_text">
<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="tooltip_text" translatable="yes">Add a button. Edit the button to define the script that will be run when the button is clicked.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add text to a layout, such as an explanation or a warning. The text will be the same for every record viewed.</property>
+ <property name="tooltip_text" translatable="yes">Add text to a layout, such as an explanation or a warning. The text will be the same for every record viewed.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment78">
+ <object class="GtkAlignment" id="alignment81">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox100">
+ <object class="GtkHBox" id="hbox103">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image42">
+ <object class="GtkImage" id="image43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -281,10 +285,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label228">
+ <object class="GtkLabel" id="label231">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Button</property>
+ <property name="label" translatable="yes">Add Text</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -301,29 +305,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_notebook">
+ <object class="GtkButton" id="button_add_image">
+ <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="tooltip_text" translatable="yes">Add a tabbed notebook. Each page of the notebook may contain several other layout items, but only one page will be visible at one time.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add an image to the layout, such as a logo. The image will be the same for every record viewed. To show an image field from a record, to show different images for each field, use the field layout item.</property>
+ <property name="tooltip_text" translatable="yes">Add an image to the layout, such as a logo. The image will be the same for every record viewed. To show an image field from a record, to show different images for each field, use the field layout item.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment85">
+ <object class="GtkAlignment" id="alignment86">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox109">
+ <object class="GtkHBox" id="hbox110">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image46">
+ <object class="GtkImage" id="image47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -335,10 +342,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label236">
+ <object class="GtkLabel" id="label240">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Notebook</property>
+ <property name="label">Add Image</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -355,30 +362,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_related_calendar">
+ <object class="GtkButton" id="button_add_button">
<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="tooltip_text" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a button. Edit the button to define the script that will be run when the button is clicked.</property>
+ <property name="tooltip_text" translatable="yes">Add a button. Edit the button to define the script that will be run when the button is clicked.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment78">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox100">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image1">
+ <object class="GtkImage" id="image42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -390,10 +399,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label228">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Related Calendar</property>
+ <property name="label" translatable="yes">Add Button</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -410,30 +419,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_related">
+ <object class="GtkButton" id="button_add_group">
<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="tooltip_text" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
+ <property name="tooltip_text" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment22">
+ <object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox29">
+ <object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image19">
+ <object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -445,10 +456,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label74">
+ <object class="GtkLabel" id="label56">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add Related Records</property>
+ <property name="label" translatable="yes">Add _Group</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -469,26 +480,27 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_group">
- <property name="visible">True</property>
+ <object class="GtkButton" id="button_add_notebook">
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a tabbed notebook. Each page of the notebook may contain several other layout items, but only one page will be visible at one time.</property>
+ <property name="tooltip_text" translatable="yes">Add a tabbed notebook. Each page of the notebook may contain several other layout items, but only one page will be visible at one time.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment17">
+ <object class="GtkAlignment" id="alignment85">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox17">
+ <object class="GtkHBox" id="hbox109">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image8">
+ <object class="GtkImage" id="image46">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -500,10 +512,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label56">
+ <object class="GtkLabel" id="label236">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add _Group</property>
+ <property name="label" translatable="yes">Add Notebook</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -524,26 +536,28 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_image">
+ <object class="GtkButton" id="button_add_related">
<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="tooltip_text" translatable="yes">Add an image to the layout, such as a logo. The image will be the same for every record viewed. To show an image field from a record, to show different images for each field, use the field layout item.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment86">
+ <object class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox110">
+ <object class="GtkHBox" id="hbox29">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image47">
+ <object class="GtkImage" id="image19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -555,10 +569,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label240">
+ <object class="GtkLabel" id="label74">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add Image</property>
+ <property name="label" translatable="yes">Add Related Records</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -575,30 +589,32 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_field">
+ <object class="GtkButton" id="button_add_related_calendar">
<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="tooltip_text" translatable="yes">Add a layout item that shows the data from a field in the record, and allows the user to edit that value.</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<property name="use_action_appearance">False</property>
<child>
- <object class="GtkAlignment" id="alignment77">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <object class="GtkHBox" id="hbox99">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image41">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -610,10 +626,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label227">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add Field</property>
+ <property name="label" translatable="yes">Add Related Calendar</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -630,7 +646,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
