[Libreoffice-commits] core.git: cui/source cui/uiconfig sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Wed Feb 13 01:49:52 PST 2013
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 43edaa1b3a79341a7a9394291954ff0972222042
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 13 09:48:47 2013 +0000
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="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkGrid" id="grid2">
@@ -139,6 +136,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid3">
@@ -418,9 +416,9 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <accessibility>
- <relation type="labelled-by" target="positionrb"/>
- </accessibility>
+ <accessibility>
+ <relation type="labelled-by" target="positionrb"/>
+ </accessibility>
</object>
<packing>
<property name="left_attach">1</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="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="simple">
<property name="can_focus">False</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="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame15">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="fontcolorft">
<property name="visible">True</property>
@@ -266,7 +273,7 @@
<property name="label" translatable="yes">Overlining</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -280,7 +287,7 @@
<property name="label" translatable="yes">Strikethrough</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -294,7 +301,7 @@
<property name="label" translatable="yes">Underlining</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -308,7 +315,7 @@
<property name="label" translatable="yes">Overline color</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -322,7 +329,7 @@
<property name="label" translatable="yes">Underline Color</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">4</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -360,7 +367,7 @@
<property name="model">liststore6</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -386,7 +393,7 @@
<property name="model">liststore6</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -399,7 +406,7 @@
<property name="model">liststore5</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -411,7 +418,7 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">5</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -423,7 +430,7 @@
<property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -447,23 +454,6 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="shadowcb">
- <property name="label" translatable="yes">Shadow</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="inconsistent">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="blinkingcb">
<property name="label" translatable="yes">Blinking</property>
<property name="visible">True</property>
@@ -507,7 +497,7 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">6</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -520,7 +510,7 @@
<property name="model">liststore3</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -533,7 +523,7 @@
<property name="model">liststore4</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">9</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -547,7 +537,7 @@
<property name="label" translatable="yes">Position</property>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">2</property>
<property name="top_attach">8</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -561,36 +551,34 @@
<property name="label" translatable="yes">Emphasis mark</property>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">8</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="separator1">
+ <object class="GtkCheckButton" id="shadowcb">
+ <property name="label" translatable="yes">Shadow</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
<property name="width">1</property>
- <property name="height">10</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSeparator" id="asianfl">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">7</property>
- <property name="width">2</property>
- <property name="height">1</property>
- </packing>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
<placeholder/>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 2248c51..638f8b1 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -40,10 +40,7 @@
<object class="GtkBox" id="PositionPage">
<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_top">6</property>
- <property name="margin_bottom">6</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -72,11 +69,9 @@
<child>
<object class="GtkRadioButton" id="superscript">
<property name="label" translatable="yes">Superscript</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">normal</property>
@@ -90,11 +85,9 @@
<child>
<object class="GtkRadioButton" id="normal">
<property name="label" translatable="yes">Normal</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">subscript</property>
@@ -108,11 +101,9 @@
<child>
<object class="GtkRadioButton" id="subscript">
<property name="label" translatable="yes">Subscript</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -184,11 +175,9 @@
<child>
<object class="GtkCheckButton" id="automatic">
<property name="label" translatable="yes">Automatic</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -216,15 +205,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -279,11 +259,9 @@
<child>
<object class="GtkRadioButton" id="0deg">
<property name="label" translatable="yes">0 degrees</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">90deg</property>
@@ -297,11 +275,9 @@
<child>
<object class="GtkRadioButton" id="90deg">
<property name="label" translatable="yes">90 degrees</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">270deg</property>
@@ -315,11 +291,9 @@
<child>
<object class="GtkRadioButton" id="270deg">
<property name="label" translatable="yes">270 degrees</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">0deg</property>
@@ -333,11 +307,9 @@
<child>
<object class="GtkCheckButton" id="fittoline">
<property name="label" translatable="yes">Fit to line</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -501,11 +473,9 @@
<child>
<object class="GtkCheckButton" id="pairkerning">
<property name="label" translatable="yes">Pair kerning</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index 661d055..b0551b1 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -4,7 +4,9 @@
<object class="GtkBox" id="TwoLinesPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame8">
<property name="visible">True</property>
@@ -15,15 +17,14 @@
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="twolines">
<property name="label" translatable="yes">Write in double lines</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
@@ -57,6 +58,7 @@
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid5">
@@ -155,6 +157,7 @@
<object class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="svxlo:SvxFontPrevWindow" id="preview">
diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui
index f0741b9..c162d0c 100644
--- a/sw/uiconfig/swriter/ui/charurlpage.ui
+++ b/sw/uiconfig/swriter/ui/charurlpage.ui
@@ -4,7 +4,9 @@
<object class="GtkBox" id="CharURLPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame10">
<property name="visible">True</property>
@@ -22,7 +24,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<property name="row_homogeneous">True</property>
<child>
<object class="GtkLabel" id="label36">
@@ -83,12 +86,10 @@
<child>
<object class="GtkButton" id="eventpb">
<property name="label" translatable="yes">Events...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -146,12 +147,10 @@
<child>
<object class="GtkButton" id="urlpb">
<property name="label" translatable="yes">Browse...</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -232,7 +231,8 @@
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
More information about the Libreoffice-commits
mailing list