From aad3e6d02eb65bccc720fdd1f10f60471e138906 Mon Sep 17 00:00:00 2001
From: Muhammet Kara <muhammet.kara@pardus.org.tr>
Date: Tue, 29 Aug 2017 09:13:59 +0300
Subject: Polish the Customize dialog

with some padding, filling etc. on the .ui file,
and some size modifications on the .cxx file

Change-Id: I8fdfc298c06162fd847b338a523542bb1ce7ada9
Reviewed-on: https://gerrit.libreoffice.org/41923
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
---
 cui/source/customize/cfg.cxx      |  6 ++++++
 cui/uiconfig/ui/menuassignpage.ui | 28 ++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'cui')

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d4e7d6ea5eea..f7c6d6ce0774 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1174,6 +1174,12 @@ SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet)
     m_pFunctions->set_height_request(aSize.Height());
     m_pFunctions->set_width_request(aSize.Width());
 
+    // Make the middle buttons bigger
+    m_pAddCommandButton->set_height_request( m_pAddCommandButton->GetOptimalSize().Height() * 1.5 );
+    m_pAddCommandButton->set_width_request( m_pAddCommandButton->GetOptimalSize().Width() * 1.5 );
+    m_pRemoveCommandButton->set_height_request( m_pRemoveCommandButton->GetOptimalSize().Height() * 1.5 );
+    m_pRemoveCommandButton->set_width_request( m_pRemoveCommandButton->GetOptimalSize().Width() * 1.5 );
+
     m_pDescriptionField->SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     m_pDescriptionField->EnableCursor( false );
 
diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui
index 928e78d6ce7a..4567c25d1fe1 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -215,7 +215,6 @@
                           <object class="GtkComboBoxText" id="savein">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="halign">start</property>
                             <property name="margin_right">5</property>
                             <property name="hexpand">True</property>
                           </object>
@@ -227,11 +226,10 @@
                         <child>
                           <object class="GtkButton">
                             <property name="label" translatable="yes">Function</property>
-                            <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="halign">start</property>
                             <property name="hexpand">True</property>
+                            <property name="image_position">right</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -253,7 +251,6 @@
                           <object class="GtkComboBoxText" id="toplevellist">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin_right">36</property>
                             <property name="hexpand">True</property>
                           </object>
                           <packing>
@@ -267,6 +264,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
+                            <property name="margin_left">5</property>
+                            <property name="margin_right">5</property>
                             <property name="hexpand">True</property>
                             <property name="always_show_image">True</property>
                           </object>
@@ -364,13 +363,19 @@
                           <object class="GtkGrid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_bottom">5</property>
                             <child>
                               <object class="GtkButton" id="add">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="halign">center</property>
+                                <property name="valign">start</property>
+                                <property name="margin_bottom">5</property>
                                 <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
                                 <property name="image">image3</property>
+                                <property name="always_show_image">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -398,13 +403,19 @@
                           <object class="GtkGrid">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_top">5</property>
                             <child>
                               <object class="GtkButton" id="remove">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="halign">center</property>
+                                <property name="valign">end</property>
+                                <property name="margin_bottom">5</property>
                                 <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
                                 <property name="image">image4</property>
+                                <property name="always_show_image">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -545,7 +556,7 @@
         <child type="label">
           <object class="GtkLabel">
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">label</property>
+            <property name="label" translatable="yes">Label</property>
           </object>
         </child>
       </object>
@@ -556,6 +567,12 @@
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <widgets>
+      <widget name="grid4"/>
+      <widget name="grid6"/>
+    </widgets>
+  </object>
   <object class="GtkMenu" id="insertmenu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -612,6 +629,5 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1"/>
   <object class="GtkSizeGroup" id="sizegroup2"/>
 </interface>
-- 
cgit