[glom] Print Layout: Layout: Fix alignment/expansion of the line options.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Print Layout: Layout: Fix alignment/expansion of the line options.
- Date: Tue, 20 Sep 2011 10:10:19 +0000 (UTC)
commit 4e8f1b7c201f59312b52dd1e581e2d62f88bb43e
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Sep 20 12:10:14 2011 +0200
Print Layout: Layout: Fix alignment/expansion of the line options.
* ui/developer/window_data_layout.glade: Remove some horizontal expand=true.
ChangeLog | 6 +++
ui/developer/window_data_layout.glade | 55 ++++++++++++++++-----------------
2 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8e70cfc..2572347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-09-20 Murray Cumming <murrayc murrayc com>
+ Print Layout: Layout: Fix alignment/expansion of the line options.
+
+ * ui/developer/window_data_layout.glade: Remove some horizontal expand=true.
+
+2011-09-20 Murray Cumming <murrayc murrayc com>
+
Print Layout: Related Records: Do not show editing formatting options.
* glom/mode_design/layout/dialog_layout.[h|cc]: Add m_editable_layout,
diff --git a/ui/developer/window_data_layout.glade b/ui/developer/window_data_layout.glade
index 4579340..e0cc0e8 100644
--- a/ui/developer/window_data_layout.glade
+++ b/ui/developer/window_data_layout.glade
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment_column_line_width">
<property name="upper">100</property>
<property name="step_increment">0.5</property>
@@ -126,8 +125,6 @@
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -180,13 +177,14 @@
<object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
@@ -471,26 +469,26 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_image">
+ <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 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 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="alignment86">
+ <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="hbox110">
+ <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="image47">
+ <object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -502,10 +500,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label240">
+ <object class="GtkLabel" id="label56">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add Image</property>
+ <property name="label" translatable="yes">Add _Group</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -526,26 +524,26 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="button_add_group">
+ <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 group which can contain other layout items. Use this to group items together, such as fields.</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="alignment17">
+ <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="hbox17">
+ <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="image8">
+ <object class="GtkImage" id="image47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
@@ -557,10 +555,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label56">
+ <object class="GtkLabel" id="label240">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Add _Group</property>
+ <property name="label">Add Image</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -1091,8 +1089,6 @@
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1138,6 +1134,7 @@
<property name="label" translatable="yes">Row Line Width:</property>
</object>
<packing>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1148,18 +1145,18 @@
<property name="invisible_char">â</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_row_line_width</property>
<property name="digits">3</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="spinbutton_line_column_width">
+ <object class="GtkLabel" id="label_line_column_width">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1168,6 +1165,7 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1179,8 +1177,6 @@
<property name="invisible_char_set">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment_column_line_width</property>
<property name="digits">3</property>
</object>
@@ -1189,6 +1185,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1203,6 +1200,7 @@
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1219,6 +1217,7 @@
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -1243,8 +1242,8 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
