[glom] Edit Field Definition Dialog adjustments.



commit 5b0282d565f583165870bd3cf7af9cfd6408d647
Author: Daniel Borgmann <danielb openismus com>
Date:   Mon Mar 29 12:16:48 2010 +0100

    	Edit Field Definition Dialog adjustments.
    
    	* glom/glom_developer.glade: Update alignment and spacings, add mnemonics.
    	* glom/mode_design/fields/box_db_table_definition.cc: Set window icon.

 ChangeLog                                          |    7 +
 glom/glom_developer.glade                          |  158 +++++++++++---------
 glom/mode_design/fields/box_db_table_definition.cc |    2 +
 3 files changed, 94 insertions(+), 73 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b43c98a..5a36c10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-03-29  Daniel Borgmann  <danielb openismus com>
 
+	Edit Field Definition Dialog adjustments.
+
+	* glom/glom_developer.glade: Update alignment and spacings, add mnemonics.
+	* glom/mode_design/fields/box_db_table_definition.cc: Set window icon.
+
+2010-03-29  Daniel Borgmann  <danielb openismus com>
+
 	Export Format dialog adjustments.
 
 	* glom/filechooser_export.cc: Set icon name for export format dialog.
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index 75c577a..ccbc5cf 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -214,6 +214,7 @@
   </object>
   <object class="GtkWindow" id="window_field_definition_edit">
     <property name="title" translatable="yes">Field Definition</property>
+    <property name="window_position">center-on-parent</property>
     <child>
       <object class="GtkVBox" id="vbox11">
         <property name="visible">True</property>
@@ -227,6 +228,7 @@
             <child>
               <object class="GtkVBox" id="vbox13">
                 <property name="visible">True</property>
+                <property name="border_width">6</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -235,7 +237,7 @@
                     <property name="border_width">6</property>
                     <property name="n_rows">3</property>
                     <property name="n_columns">2</property>
-                    <property name="column_spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkEntry" id="entry_name">
@@ -251,8 +253,11 @@
                     <child>
                       <object class="GtkLabel" id="label34">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Name:</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Name:</property>
+                        <property name="use_underline">True</property>
                         <property name="justify">right</property>
+                        <property name="mnemonic_widget">entry_name</property>
                       </object>
                       <packing>
                         <property name="x_options">GTK_FILL</property>
@@ -290,10 +295,12 @@
                         <property name="visible">True</property>
                         <property name="xalign">1</property>
                         <child>
-                          <object class="GtkLabel" id="label35">
+                          <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Type:</property>
-                            <property name="justify">right</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Typ_e:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">combobox_type</property>
                           </object>
                         </child>
                       </object>
@@ -311,8 +318,11 @@
                         <child>
                           <object class="GtkLabel" id="label37">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">Title:</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Title:</property>
+                            <property name="use_underline">True</property>
                             <property name="justify">right</property>
+                            <property name="mnemonic_widget">entry_title</property>
                           </object>
                         </child>
                       </object>
@@ -338,7 +348,7 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_primarykey">
-                        <property name="label" translatable="yes">Primary Key</property>
+                        <property name="label" translatable="yes">_Primary Key</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -353,7 +363,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_unique">
-                        <property name="label" translatable="yes">Unique</property>
+                        <property name="label" translatable="yes">_Unique</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -368,7 +378,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="checkbutton_autoincrement">
-                        <property name="label" translatable="yes">Auto-increment</property>
+                        <property name="label" translatable="yes">_Auto-increment</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -392,6 +402,7 @@
               <object class="GtkLabel" id="label30">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Field</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="tab_fill">False</property>
@@ -400,9 +411,9 @@
             <child>
               <object class="GtkVBox" id="box_default_value">
                 <property name="visible">True</property>
-                <property name="border_width">6</property>
+                <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
+                <property name="spacing">18</property>
                 <child>
                   <object class="GtkFrame" id="frame39">
                     <property name="visible">True</property>
@@ -411,6 +422,7 @@
                     <child>
                       <object class="GtkAlignment" id="alignment_userentry">
                         <property name="visible">True</property>
+                        <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox96">
@@ -420,7 +432,7 @@
                             <child>
                               <object class="GtkHBox" id="hbox_default_value_simple">
                                 <property name="visible">True</property>
-                                <property name="spacing">6</property>
+                                <property name="spacing">12</property>
                                 <child>
                                   <placeholder/>
                                 </child>
@@ -434,7 +446,7 @@
                             </child>
                             <child>
                               <object class="GtkCheckButton" id="checkbutton_lookup">
-                                <property name="label" translatable="yes">Lookup value when a field changes.</property>
+                                <property name="label" translatable="yes">_Lookup value when a field changes.</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -448,72 +460,69 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="alignment14">
+                              <object class="GtkTable" id="table_lookup">
                                 <property name="visible">True</property>
-                                <property name="left_padding">12</property>
+                                <property name="n_rows">2</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
                                 <child>
-                                  <object class="GtkTable" id="table_lookup">
+                                  <object class="GtkComboBox" id="combobox_lookup_field">
                                     <property name="visible">True</property>
-                                    <property name="border_width">6</property>
-                                    <property name="n_rows">2</property>
-                                    <property name="n_columns">2</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">6</property>
-                                    <child>
-                                      <object class="GtkComboBox" id="combobox_lookup_field">
-                                        <property name="visible">True</property>
-                                      </object>
-                                      <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>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="combobox_lookup_relationship">
-                                        <property name="visible">True</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">GTK_FILL</property>
-                                      </packing>
-                                    </child>
+                                  </object>
+                                  <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>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkComboBox" id="combobox_lookup_relationship">
+                                    <property name="visible">True</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">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label53">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">_Relationship:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="justify">right</property>
+                                  </object>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment15">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">1</property>
                                     <child>
-                                      <object class="GtkLabel" id="label53">
+                                      <object class="GtkLabel" id="label51">
                                         <property name="visible">True</property>
-                                        <property name="label" translatable="yes">Relationship</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">_Field:</property>
+                                        <property name="use_underline">True</property>
                                         <property name="justify">right</property>
                                       </object>
-                                      <packing>
-                                        <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment15">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label51">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes">Field</property>
-                                            <property name="justify">right</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <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>
-                                      </packing>
                                     </child>
                                   </object>
+                                  <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>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
@@ -526,7 +535,7 @@
                     </child>
                     <child type="label">
                       <object class="GtkRadioButton" id="radiobutton_userentry">
-                        <property name="label" translatable="yes">User Entry</property>
+                        <property name="label" translatable="yes">_User Entry</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -549,6 +558,7 @@
                     <child>
                       <object class="GtkAlignment" id="alignment_calculate">
                         <property name="visible">True</property>
+                        <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" id="hbox16">
@@ -578,7 +588,7 @@
                                 <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkButton" id="button_edit_calculation">
-                                    <property name="label" translatable="yes">Edit</property>
+                                    <property name="label" translatable="yes">_Edit</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -603,7 +613,7 @@
                     </child>
                     <child type="label">
                       <object class="GtkRadioButton" id="radiobutton_calculate">
-                        <property name="label" translatable="yes">Calculate Value</property>
+                        <property name="label" translatable="yes">_Calculate Value</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -626,6 +636,7 @@
               <object class="GtkLabel" id="label31">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Value</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -649,6 +660,7 @@
               <object class="GtkLabel" id="label188">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Default Formatting</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/glom/mode_design/fields/box_db_table_definition.cc b/glom/mode_design/fields/box_db_table_definition.cc
index 3dd85c7..78cec56 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -47,6 +47,8 @@ void Box_DB_Table_Definition::init()
   if(refXml)
     refXml->get_widget_derived("window_field_definition_edit", m_pDialog);
 
+  m_pDialog->set_icon_name("glom");
+
   add_view(m_pDialog); //Give it access to the document.
 
   pack_start(m_AddDel);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]