glom r1553 - in trunk: . glom glom/layout_item_dialogs glom/mode_data glom/utility_widgets
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1553 - in trunk: . glom glom/layout_item_dialogs glom/mode_data glom/utility_widgets
- Date: Fri, 11 Apr 2008 09:54:42 +0100 (BST)
Author: jhs
Date: Fri Apr 11 09:54:41 2008
New Revision: 1553
URL: http://svn.gnome.org/viewvc/glom?rev=1553&view=rev
Log:
2008-04-11 Johannes Schmid <jhs gnome org>
* glom/glom_developer.glade:
* glom/layout_item_dialogs/dialog_buttonscript.cc
(Dialog_ButtonScript), (set_script), (get_script),
(get_script):
* glom/layout_item_dialogs/dialog_buttonscript.h
Added new entry for the button title to the dialog
* glom/mode_data/flowtablewithfields.cc
(FlowTableWithFields):
* glom/utility_widgets/buttonglom.cc
(on_menu_properties_activate):
* glom/utility_widgets/buttonglom.h:
* glom/utility_widgets/labelglom.cc:
* glom/utility_widgets/layoutwidgetutils.cc:
* glom/utility_widgets/layoutwidgetutils.h
(m_pPopupMenuUtils) (m_refUtilProperties):
Removed \"Details\" menu item as ButtonGlom has a dialog for all properties now.
Modified:
trunk/ChangeLog
trunk/glom/glom_developer.glade
trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
trunk/glom/layout_item_dialogs/dialog_buttonscript.h
trunk/glom/mode_data/flowtablewithfields.cc
trunk/glom/utility_widgets/buttonglom.cc
trunk/glom/utility_widgets/buttonglom.h
trunk/glom/utility_widgets/labelglom.cc
trunk/glom/utility_widgets/layoutwidgetutils.cc
trunk/glom/utility_widgets/layoutwidgetutils.h
Modified: trunk/glom/glom_developer.glade
==============================================================================
--- trunk/glom/glom_developer.glade (original)
+++ trunk/glom/glom_developer.glade Fri Apr 11 09:54:41 2008
@@ -225,91 +225,91 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment9">
+ <widget class="GtkEntry" id="entry_name">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <child>
- <widget class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Title</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_EXPAND</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment10">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <child>
- <widget class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Type</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
- </child>
+ <property name="label" translatable="yes">Name</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<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>
<child>
- <widget class="GtkComboBox" id="combobox_type">
+ <widget class="GtkEntry" id="entry_title">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</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">GTK_FILL</property>
- <property name="y_options">GTK_EXPAND</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <widget class="GtkComboBox" id="combobox_type">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</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>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
+ <widget class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
- <property name="label" translatable="yes">Name</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="xalign">1</property>
+ <child>
+ <widget class="GtkLabel" id="label35">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Type</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ </child>
</widget>
<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>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">1</property>
+ <child>
+ <widget class="GtkLabel" id="label37">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Title</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
</widget>
@@ -442,57 +442,57 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment15">
+ <widget class="GtkComboBox" id="combobox_lookup_field">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <child>
- <widget class="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Field</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- </widget>
- </child>
</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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_EXPAND</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label53">
+ <widget class="GtkComboBox" id="combobox_lookup_relationship">
<property name="visible">True</property>
- <property name="label" translatable="yes">Relationship</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<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>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_lookup_relationship">
+ <widget class="GtkLabel" id="label53">
<property name="visible">True</property>
+ <property name="label" translatable="yes">Relationship</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_lookup_field">
+ <widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
+ <property name="xalign">1</property>
+ <child>
+ <widget class="GtkLabel" id="label51">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Field</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ </child>
</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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
</widget>
@@ -986,23 +986,10 @@
<property name="visible">True</property>
<child>
<widget class="GtkSourceView" id="textview_calculation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -1133,6 +1120,36 @@
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Title:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_title">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="xalign">0</property>
@@ -1142,6 +1159,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -1156,7 +1174,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1173,32 +1191,19 @@
<child>
<widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <child>
- <widget class="GtkSourceView" id="textview_calculation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkSourceView" id="textview_calculation">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
</child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -1219,7 +1224,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</widget>
@@ -2009,17 +2014,18 @@
<placeholder/>
</child>
<child>
- <widget class="GtkVBox" id="vbox_canvas">
+ <widget class="GtkVRuler" id="vruler">
<property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="upper">10</property>
+ <property name="position">5</property>
+ <property name="max_size">10</property>
+ <property name="metric">GTK_CENTIMETERS</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="x_options">GTK_SHRINK</property>
</packing>
</child>
<child>
@@ -2038,18 +2044,17 @@
</packing>
</child>
<child>
- <widget class="GtkVRuler" id="vruler">
+ <widget class="GtkVBox" id="vbox_canvas">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="upper">10</property>
- <property name="position">5</property>
- <property name="max_size">10</property>
- <property name="metric">GTK_CENTIMETERS</property>
+ <child>
+ <placeholder/>
+ </child>
</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="x_options">GTK_SHRINK</property>
</packing>
</child>
</widget>
@@ -2167,37 +2172,52 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label_password_confirm">
+ <widget class="GtkLabel" id="label65">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Confirm Password</property>
+ <property name="label" translatable="yes">_User</property>
<property name="use_underline">True</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="mnemonic_widget">entry_password_confirm</property>
+ <property name="mnemonic_widget">entry_user</property>
<accessibility>
- <atkrelation target="entry_password_confirm" type="label-for"/>
+ <atkrelation target="entry_user" type="label-for"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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>
<child>
- <widget class="GtkEntry" id="entry_password_confirm">
+ <widget class="GtkEntry" id="entry_user">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
+ <property name="has_focus">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">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">*</property>
+ </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="y_options"></property>
</packing>
</child>
@@ -2221,51 +2241,36 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password">
+ <widget class="GtkEntry" id="entry_password_confirm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</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">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_user">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">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">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label65">
+ <widget class="GtkLabel" id="label_password_confirm">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_User</property>
+ <property name="label" translatable="yes">_Confirm Password</property>
<property name="use_underline">True</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="mnemonic_widget">entry_user</property>
+ <property name="mnemonic_widget">entry_password_confirm</property>
<accessibility>
- <atkrelation target="entry_user" type="label-for"/>
+ <atkrelation target="entry_password_confirm" type="label-for"/>
</accessibility>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@@ -3173,113 +3178,113 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry_user">
+ <widget class="GtkComboBox" id="combobox_group">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label89">
+ <widget class="GtkLabel" id="label97">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">User</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="label" translatable="yes">Group</property>
</widget>
<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>
<child>
- <widget class="GtkEntry" id="entry_password_confirm">
+ <widget class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
<property name="visibility">False</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">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label91">
+ <widget class="GtkLabel" id="label90">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Confirm Password</property>
+ <property name="label" translatable="yes">Password</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</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>
<child>
- <widget class="GtkLabel" id="label90">
+ <widget class="GtkLabel" id="label91">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes">Confirm Password</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password">
+ <widget class="GtkEntry" id="entry_password_confirm">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="has_focus">True</property>
<property name="visibility">False</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">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label97">
+ <widget class="GtkLabel" id="label89">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Group</property>
+ <property name="label" translatable="yes">User</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<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>
<child>
- <widget class="GtkComboBox" id="combobox_group">
+ <widget class="GtkEntry" id="entry_user">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -4059,65 +4064,84 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label139">
+ <widget class="GtkEntry" id="entry_org_address_country">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Street</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</widget>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label140">
+ <widget class="GtkEntry" id="entry_org_address_postcode">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Street (Line 2)</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label141">
+ <widget class="GtkEntry" id="entry_org_address_county">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Town</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
+ </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="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_org_address_town">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label142">
+ <widget class="GtkEntry" id="entry_org_address_street2">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">State/County</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <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="GtkLabel" id="label143">
+ <widget class="GtkEntry" id="entry_org_address_street">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Zip/Postal Code</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
@@ -4135,84 +4159,65 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_street">
+ <widget class="GtkLabel" id="label143">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Zip/Postal Code</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_street2">
+ <widget class="GtkLabel" id="label142">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">State/County</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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_town">
+ <widget class="GtkLabel" id="label141">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Town</property>
</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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_county">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
- </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="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_org_address_postcode">
+ <widget class="GtkLabel" id="label140">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Street (Line 2)</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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>
<child>
- <widget class="GtkEntry" id="entry_org_address_country">
+ <widget class="GtkLabel" id="label139">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">*</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Street</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -6328,25 +6333,39 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="combobox_choices_related_relationship">
+ <widget class="GtkComboBox" id="combobox_choices_related_field_second">
<property name="visible">True</property>
</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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label120">
+ <widget class="GtkComboBox" id="combobox_choices_related_field">
+ <property name="visible">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="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label118">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Also show</property>
+ <property name="label" translatable="yes">Relationship</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
@@ -6366,40 +6385,26 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label118">
+ <widget class="GtkLabel" id="label120">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Relationship</property>
+ <property name="label" translatable="yes">Also show</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_choices_related_field">
+ <widget class="GtkComboBox" id="combobox_choices_related_relationship">
<property name="visible">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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combobox_choices_related_field_second">
- <property name="visible">True</property>
- </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">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
@@ -7944,25 +7949,12 @@
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="left_padding">20</property>
- <child>
- <widget class="GtkSourceView" id="textview_script">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
+ <child>
+ <widget class="GtkSourceView" id="textview_script">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -8357,126 +8349,19 @@
<placeholder/>
</child>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox9">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <child>
- <widget class="GtkButton" id="button_field_up">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button_field_down">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <widget class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="button_field_delete">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Remove the item from the layout. If you remove a field layout item, it will not remove the field from the table itself. It just will not be seen on the layout.</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button_formatting">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="response_id">0</property>
- <child>
- <widget class="GtkAlignment" id="alignment42">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox54">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image28">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label121">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Formatting</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button_edit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-edit</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
</child>
<child>
<widget class="GtkVBox" id="vbox93">
@@ -8533,23 +8418,23 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_add_group">
+ <widget 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="tooltip" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
+ <property name="tooltip" 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="response_id">0</property>
<child>
- <widget class="GtkAlignment" id="alignment17">
+ <widget class="GtkAlignment" id="alignment86">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <widget class="GtkHBox" id="hbox110">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image8">
+ <widget class="GtkImage" id="image47">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
</widget>
@@ -8559,9 +8444,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label56">
+ <widget class="GtkLabel" id="label240">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add _Group</property>
+ <property name="label">Add Image</property>
<property name="use_underline">True</property>
</widget>
<packing>
@@ -8583,23 +8468,23 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_image">
+ <widget class="GtkButton" id="button_field_add_group">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" 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" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
<property name="response_id">0</property>
<child>
- <widget class="GtkAlignment" id="alignment86">
+ <widget class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox110">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image47">
+ <widget class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
</widget>
@@ -8609,9 +8494,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label240">
+ <widget class="GtkLabel" id="label56">
<property name="visible">True</property>
- <property name="label">Add Image</property>
+ <property name="label" translatable="yes">Add _Group</property>
<property name="use_underline">True</property>
</widget>
<packing>
@@ -8839,19 +8724,126 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <widget class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <child>
+ <widget class="GtkButton" id="button_field_up">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-go-up</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_field_down">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-go-down</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
</child>
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="button_field_delete">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="tooltip" translatable="yes">Remove the item from the layout. If you remove a field layout item, it will not remove the field from the table itself. It just will not be seen on the layout.</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_formatting">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="response_id">0</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment42">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox54">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image28">
+ <property name="visible">True</property>
+ <property name="stock">gtk-edit</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label121">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Formatting</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_edit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-edit</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
</child>
</widget>
</child>
@@ -9130,6 +9122,7 @@
</widget>
<widget class="GtkDialog" id="dialog_flowtable">
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Group Properties</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
@@ -9145,23 +9138,17 @@
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Title:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="entry_title">
+ <widget class="GtkSpinButton" id="spin_columns">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="adjustment">0 0 10 1 2 10</property>
+ <property name="numeric">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">GTK_FILL</property>
</packing>
</child>
@@ -9173,22 +9160,28 @@
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spin_columns">
+ <widget class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0 0 10 1 2 10</property>
- <property name="numeric">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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Title:</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.cc Fri Apr 11 09:54:41 2008
@@ -36,6 +36,7 @@
{
refGlade->get_widget("textview_calculation", m_text_view);
refGlade->get_widget("button_test", m_button_test);
+ refGlade->get_widget("entry_title", m_entry_title);
m_button_test->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ButtonScript::on_button_test) );
@@ -72,7 +73,8 @@
m_table_name = table_name; //Used for lookup combo boxes.
m_text_view->get_buffer()->set_text( script->get_script() );
-
+
+ m_entry_title->set_text (script->get_title());
//set_blocked(false);
//Dialog_Properties::set_modified(false);
@@ -82,14 +84,15 @@
{
sharedptr<LayoutItem_Button> result = glom_sharedptr_clone(m_script); //Start with the old details, to preserve anything that is not in our UI.
- result->set_script( m_text_view->get_buffer()->get_text() );
+ get_script (result);
return result;
}
-void Dialog_ButtonScript::get_script (const sharedptr<LayoutItem_Button>& script)
+void Dialog_ButtonScript::get_script (const sharedptr<LayoutItem_Button>& script) const
{
script->set_script (m_text_view->get_buffer()->get_text() );
+ script->set_title (m_entry_title->get_text());
}
void Dialog_ButtonScript::on_button_test()
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.h Fri Apr 11 09:54:41 2008
@@ -41,11 +41,12 @@
void set_script(const sharedptr<const LayoutItem_Button>& script, const Glib::ustring& table_name);
sharedptr<LayoutItem_Button> get_script() const;
- void get_script (const sharedptr<LayoutItem_Button>& script);
+ void get_script (const sharedptr<LayoutItem_Button>& script) const;
protected:
void on_button_test();
+ Gtk::Entry* m_entry_title;
gtksourceview::SourceView* m_text_view;
Gtk::Button* m_button_test;
Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc (original)
+++ trunk/glom/mode_data/flowtablewithfields.cc Fri Apr 11 09:54:41 2008
@@ -58,7 +58,7 @@
m_placeholder(0),
m_table_name(table_name)
{
- m_refUtilDetails->set_visible(false);
+
}
FlowTableWithFields::~FlowTableWithFields()
Modified: trunk/glom/utility_widgets/buttonglom.cc
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.cc (original)
+++ trunk/glom/utility_widgets/buttonglom.cc Fri Apr 11 09:54:41 2008
@@ -62,34 +62,6 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(GLOM_GLADEDIR "glom_developer.glade", "dialog_layoutitem_properties");
-
- Dialog_LayoutItem_Properties* dialog = new Dialog_LayoutItem_Properties (0, refXml);
- refXml->get_widget_derived("dialog_layoutitem_properties", dialog);
-
- if (dialog)
- {
- dialog->set_label (get_label());
- if (dialog->run() == Gtk::RESPONSE_APPLY)
- {
- // We could just set the title of the layout item but than
- // we would need to redraw the whole layout.
- set_label (dialog->get_label());
- m_pLayoutItem->set_title (dialog->get_label());
- }
- delete dialog;
- }
- }
- catch(const Gnome::Glade::XmlError& ex)
- {
- std::cerr << ex.what() << std::endl;
- }
-}
-
-void ButtonGlom::on_menu_details_activate()
-{
- try
- {
Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_button_script");
Dialog_ButtonScript* dialog = 0;
@@ -105,6 +77,7 @@
if(response == Gtk::RESPONSE_OK)
{
dialog->get_script(layout_item);
+ signal_layout_changed().emit();
}
delete dialog;
Modified: trunk/glom/utility_widgets/buttonglom.h
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.h (original)
+++ trunk/glom/utility_widgets/buttonglom.h Fri Apr 11 09:54:41 2008
@@ -46,7 +46,6 @@
virtual App_Glom* get_application();
virtual void on_menu_properties_activate();
- virtual void on_menu_details_activate();
virtual bool on_button_press_event(GdkEventButton *event);
};
Modified: trunk/glom/utility_widgets/labelglom.cc
==============================================================================
--- trunk/glom/utility_widgets/labelglom.cc (original)
+++ trunk/glom/utility_widgets/labelglom.cc Fri Apr 11 09:54:41 2008
@@ -51,7 +51,6 @@
m_label.show();
set_events (Gdk::ALL_EVENTS_MASK);
set_visible_window (false);
- m_refUtilDetails->set_visible(false);
}
App_Glom* LabelGlom::get_application()
Modified: trunk/glom/utility_widgets/layoutwidgetutils.cc
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetutils.cc (original)
+++ trunk/glom/utility_widgets/layoutwidgetutils.cc Fri Apr 11 09:54:41 2008
@@ -35,7 +35,6 @@
m_refActionGroup->add(Gtk::Action::create("UtilMenu", "Utility Menu") );
m_refUtilProperties = Gtk::Action::create("UtilProperties", _("Properties"));
- m_refUtilDetails = Gtk::Action::create("UtilDetails", _("Details"));
m_refUtilDelete = Gtk::Action::create("UtilDelete", _("Delete"));
setup_util_menu();
}
@@ -51,8 +50,6 @@
m_refActionGroup->add(m_refUtilProperties,
sigc::mem_fun(*this, &LayoutWidgetUtils::on_menu_properties_activate) );
- m_refActionGroup->add(m_refUtilDetails,
- sigc::mem_fun(*this, &LayoutWidgetUtils::on_menu_details_activate) );
m_refActionGroup->add(m_refUtilDelete,
sigc::mem_fun(*this, &LayoutWidgetUtils::on_menu_delete_activate) );
@@ -64,7 +61,6 @@
"<ui>"
" <popup name='UtilMenu'>"
" <menuitem action='UtilProperties'/>"
- " <menuitem action='UtilDetails'/>"
" <separator />"
" <menuitem action='UtilDelete' />"
" </popup>"
Modified: trunk/glom/utility_widgets/layoutwidgetutils.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetutils.h (original)
+++ trunk/glom/utility_widgets/layoutwidgetutils.h Fri Apr 11 09:54:41 2008
@@ -43,16 +43,8 @@
// This one is implemented here
virtual void on_menu_delete_activate();
-
- // It's not really important to implement this though you should deactivate
- // the menu item then. TODO: Does something need to be done here? murrayc.
- // Some widgets such as buttons have a title and another detailed dialog
- // in this case to set the script. Others such as labels have no detailed
- // dialog and as such do not need this menu item. jhs
- virtual void on_menu_details_activate() {};
Glib::RefPtr<Gtk::Action> m_refUtilProperties;
- Glib::RefPtr<Gtk::Action> m_refUtilDetails;
Glib::RefPtr<Gtk::Action> m_refUtilDelete;
Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
Glib::RefPtr<Gtk::UIManager> m_refUIManager;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
