[Libreoffice-commits] core.git: reportdesign/inc reportdesign/uiconfig

[Caolán McNamara]

 reportdesign/inc/helpids.hrc                          |    1 
 reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui |   36 +++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 145d5ab1cd2b721dccf388884cc824d267fc2986
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 31 23:36:06 2013 +0100

    remove dangling helpids...
    
    and bring the listbox beside its label
    
    Change-Id: I51f7e0b204b8a033f13d132b16444e06e0927e53

diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index 635c4b5..ec0d163 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -41,7 +41,6 @@
 #define HID_RPT_SORTORDER                             "REPORTDESIGN_HID_RPT_SORTORDER"
 #define HID_RPT_GROUPSBRW                             "REPORTDESIGN_HID_RPT_GROUPSBRW"
 #define HID_RPT_GROUPSSORTING_DLG                     "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG"
-#define HID_RPT_PAGENUMBERS_DLG                       "REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG"
 #define HID_RPT_DATETIME_DLG                          "REPORTDESIGN_HID_RPT_DATETIME_DLG"
 #define HID_RPT_CONDFORMAT_DLG                        "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG"
 #define HID_RPT_CONDFORMAT_TB                         "REPORTDESIGN_HID_RPT_CONDFORMAT_TB"
diff --git a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
index 1ffdc8e..6095535 100644
--- a/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/pagenumberdialog.ui
@@ -198,11 +198,13 @@
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
+                    <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkComboBoxText" id="alignment">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="entry_text_column">0</property>
                         <property name="id_column">1</property>
@@ -223,7 +225,6 @@
                       <object class="GtkLabel" id="alignment_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">_Alignment:</property>
                         <property name="use_underline">True</property>
@@ -236,6 +237,22 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="shownumberonfirstpage">
+                        <property name="label" translatable="yes">Show Number on First Page</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -257,21 +274,6 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkCheckButton" id="shownumberonfirstpage">
-            <property name="label" translatable="yes">Show Number on First Page</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="xalign">0</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -327,7 +329,7 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">4</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>