[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source sfx2/uiconfig

[Jan Holesovsky]

 sfx2/source/dialog/backingwindow.cxx |    6 +++++-
 sfx2/uiconfig/ui/startcenter.ui      |   29 +++++++++++++++--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit f03badfb35e37963412d4e8c28f1d47cc766ac1b
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Dec 13 17:41:04 2013 +0100

    startcenter: Move the 'Create' under the separator & add a colon.
    
    Change-Id: Ie8a1ce8628fa0f31ae6d6a3f1303342c145e33aa

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 8ee2919..f7a66fb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -59,6 +59,7 @@ const char TEMPLATE_URL[] =       "slot:5500";
 const char OPEN_URL[] =           ".uno:Open";
 const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess";
 
+const int nButtonsFontSize = 15;
 const Color aButtonsBackground(114, 168, 84); // TDF green
 const Color aButtonsText(COL_WHITE);
 
@@ -234,6 +235,9 @@ void BackingWindow::initControls()
 
     // setup nice colors
     mpCreateLabel->SetControlForeground(aButtonsText);
+    Font aFont(mpCreateLabel->GetControlFont());
+    aFont.SetHeight(nButtonsFontSize);
+    mpCreateLabel->SetControlFont(aFont);
 
     mpHelpButton->SetControlForeground(aButtonsText);
     mpExtensionsButton->SetControlForeground(aButtonsText);
@@ -261,7 +265,7 @@ void BackingWindow::setupButton( PushButton* pButton )
 {
     // the buttons should have a bit bigger font
     Font aFont(pButton->GetControlFont());
-    aFont.SetHeight(15);
+    aFont.SetHeight(nButtonsFontSize);
     pButton->SetControlFont(aFont);
 
     // color that fits the theme
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index dd175fb..7f60948 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,6 +2,11 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkImage" id="calc_all_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">res/ods_32_8.png</property>
+  </object>
   <object class="GtkBox" id="StartCenter">
     <property name="can_focus">False</property>
     <child>
@@ -23,9 +28,10 @@
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
                 <child>
                   <object class="GtkButton" id="open_all">
-                    <property name="label" translatable="yes">_Open</property>
+                    <property name="label" translatable="yes">_Open File</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -61,13 +67,11 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="create_label">
+                  <object class="GtkSeparator" id="separator1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">12</property>
-                    <property name="margin_top">12</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Create</property>
+                    <property name="margin_left">6</property>
+                    <property name="margin_right">6</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -76,11 +80,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator" id="separator1">
+                  <object class="GtkLabel" id="create_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">6</property>
-                    <property name="margin_right">6</property>
+                    <property name="margin_left">12</property>
+                    <property name="margin_bottom">6</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Create:</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -359,11 +365,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="calc_all_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/ods_32_8.png</property>
-  </object>
   <object class="GtkImage" id="database_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>