[Libreoffice-commits] core.git: cui/source cui/uiconfig sw/uiconfig

2019-06-22 Thread Caolán McNamara (via logerrit) 
 cui/source/options/treeopt.cxx|3 
 cui/uiconfig/ui/optionsdialog.ui  |  119 +-
 sw/uiconfig/swriter/ui/insertsectiondialog.ui |   33 +++
 3 files changed, 82 insertions(+), 73 deletions(-)

New commits:
commit 38f1412294e7d2987072a2e211e1f68c197f16fa
Author: Caolán McNamara 
AuthorDate: Sat Jun 22 18:47:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 22 21:38:35 2019 +0200

Related: tdf#126036 give options dialog consistent button order

its not welded yet, but skip ahead and give it explicit consistent
button order in the meantime

Change-Id: Ia850a024cb5a87b9231b5ffdec701646d7014e08
Reviewed-on: https://gerrit.libreoffice.org/74573
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 93b53e01005c..31c5e0400615 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -490,6 +490,9 @@ struct OptionsGroupInfo
 
 void OfaTreeOptionsDialog::InitWidgets()
 {
+VclButtonBox *pButtonBox = get_action_area();
+pButtonBox->sort_native_button_order();
+
 get(pOkPB, "ok");
 get(pApplyPB, "apply");
 get(pBackPB, "revert");
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 8baa0d609b12..9d7b4ff2df39 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -10,6 +10,9 @@
 6
 Options
 dialog
+
+  
+
 
   
 False
@@ -17,38 +20,32 @@
 True
 vertical
 12
-
-  
-True
+
+  
 False
-True
-True
-6
+end
 
-  
+  
+gtk-help
 True
 True
-True
-
-  
-
+True
+True
   
   
 False
 True
 0
+True
   
 
 
-  
+  
+gtk-revert-to-saved
 True
-False
-True
-True
-vertical
-
-  
-
+True
+True
+True
   
   
 False
@@ -56,50 +53,39 @@
 1
   
 
-  
-  
-False
-True
-0
-  
-
-
-  
-False
-end
 
-  
-gtk-ok
+  
+gtk-apply
 True
 True
-True
-True
 True
 True
   
   
 False
 True
-0
+2
   
 
 
-  
-gtk-cancel
+  
+gtk-ok
 True
 True
+True
+True
 True
 True
   
   
 False
 True
-1
+3
   
 
 
-  
-gtk-help
+  
+gtk-cancel
 True
 True
 True
@@ -108,53 +94,70 @@
   
 False
 True
-2
-True
+4
   
 
+  
+  
+False
+True
+end
+1
+  
+
+
+  
+True
+False
+True
+True
+6
 
-  
-gtk-apply
+  
 True
 True
-True
-True
+True
+
+  
+
   
   
 False
 True
-3
+0
   
 
 
-  
-gtk-revert-to-saved
+  
 True
-True
-True
-True
+False
+True
+True
+vertical
+
+  
+
   
   
 False
 True
-4
+1

[Libreoffice-commits] core.git: cui/source cui/uiconfig sw/uiconfig

2013-02-13 Thread Caolán McNamara 
 cui/source/inc/chardlg.hxx|2 
 cui/source/tabpages/chardlg.cxx   |2 
 cui/uiconfig/ui/backgroundpage.ui |   12 +---
 cui/uiconfig/ui/charnamepage.ui   |3 -
 cui/uiconfig/ui/effectspage.ui|   86 ++
 cui/uiconfig/ui/positionpage.ui   |   32 
 cui/uiconfig/ui/twolinespage.ui   |7 +-
 sw/uiconfig/swriter/ui/charurlpage.ui |   12 ++--
 8 files changed, 56 insertions(+), 100 deletions(-)

New commits:
commit 43edaa1b3a79341a7a9394291954ff097042
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Feb 13 09:48:47 2013 +

consistent padding around various format-character pages

Change-Id: I8c8ed2db29d1175ba2187509482cdaf858ed660c

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index ce08f42..71b5542 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -200,8 +200,6 @@ private:
 
 CheckBox*   m_pIndividualWordsBtn;
 
-FixedLine*  m_pAsianLine;
-
 FixedText*  m_pEmphasisFT;
 ListBox*m_pEmphasisLB;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7622e9d4..7048be1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1309,7 +1309,6 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, 
const SfxItemSet rInSe
 get(m_pUnderlineColorFT, underlinecolorft);
 get(m_pUnderlineColorLB, underlinecolorlb);
 get(m_pIndividualWordsBtn, individualwordscb);
-get(m_pAsianLine, asianfl);
 get(m_pEmphasisFT, emphasisft);
 get(m_pEmphasisLB, emphasislb);
 get(m_pPositionFT, positionft);
@@ -1414,7 +1413,6 @@ void SvxCharEffectsPage::Initialize()
 
 if ( !SvtLanguageOptions().IsAsianTypographyEnabled() )
 {
-m_pAsianLine-Hide();
 m_pEmphasisFT-Hide();
 m_pEmphasisLB-Hide();
 m_pPositionFT-Hide();
diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index d601ca9..d6395a2 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -9,12 +9,9 @@
   object class=GtkGrid id=BackgroundPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_right6/property
-property name=margin_top6/property
-property name=margin_bottom6/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=border_width6/property
 property name=row_spacing6/property
 child
   object class=GtkGrid id=grid2
@@ -139,6 +136,7 @@
 property name=can_focusFalse/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkGrid id=grid3
@@ -418,9 +416,9 @@
 property name=can_focusTrue/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
-  accessibility
-relation type=labelled-by 
target=positionrb/
-  /accessibility
+accessibility
+  relation type=labelled-by 
target=positionrb/
+/accessibility
   /object
   packing
 property name=left_attach1/property
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 9ab5b02..47f5ae8 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -4,8 +4,9 @@
   object class=GtkBox id=CharNamePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 property name=orientationvertical/property
-property name=spacing6/property
+property name=spacing12/property
 child
   object class=GtkFrame id=simple
 property name=can_focusFalse/property
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 9ae0686..2219cb4 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -197,25 +197,32 @@
   object class=GtkBox id=EffectsPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkFrame id=frame15
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property