Kaydet (Commit) 43edaa1b authored tarafından Caolán McNamara's avatar Caolán McNamara

consistent padding around various format->character pages

Change-Id: I8c8ed2db29d1175ba2187509482cdaf858ed660c
üst b6eed859
...@@ -200,8 +200,6 @@ private: ...@@ -200,8 +200,6 @@ private:
CheckBox* m_pIndividualWordsBtn; CheckBox* m_pIndividualWordsBtn;
FixedLine* m_pAsianLine;
FixedText* m_pEmphasisFT; FixedText* m_pEmphasisFT;
ListBox* m_pEmphasisLB; ListBox* m_pEmphasisLB;
......
...@@ -1309,7 +1309,6 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe ...@@ -1309,7 +1309,6 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe
get(m_pUnderlineColorFT, "underlinecolorft"); get(m_pUnderlineColorFT, "underlinecolorft");
get(m_pUnderlineColorLB, "underlinecolorlb"); get(m_pUnderlineColorLB, "underlinecolorlb");
get(m_pIndividualWordsBtn, "individualwordscb"); get(m_pIndividualWordsBtn, "individualwordscb");
get(m_pAsianLine, "asianfl");
get(m_pEmphasisFT, "emphasisft"); get(m_pEmphasisFT, "emphasisft");
get(m_pEmphasisLB, "emphasislb"); get(m_pEmphasisLB, "emphasislb");
get(m_pPositionFT, "positionft"); get(m_pPositionFT, "positionft");
...@@ -1414,7 +1413,6 @@ void SvxCharEffectsPage::Initialize() ...@@ -1414,7 +1413,6 @@ void SvxCharEffectsPage::Initialize()
if ( !SvtLanguageOptions().IsAsianTypographyEnabled() ) if ( !SvtLanguageOptions().IsAsianTypographyEnabled() )
{ {
m_pAsianLine->Hide();
m_pEmphasisFT->Hide(); m_pEmphasisFT->Hide();
m_pEmphasisLB->Hide(); m_pEmphasisLB->Hide();
m_pPositionFT->Hide(); m_pPositionFT->Hide();
......
...@@ -9,12 +9,9 @@ ...@@ -9,12 +9,9 @@
<object class="GtkGrid" id="BackgroundPage"> <object class="GtkGrid" id="BackgroundPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child> <child>
<object class="GtkGrid" id="grid2"> <object class="GtkGrid" id="grid2">
...@@ -139,6 +136,7 @@ ...@@ -139,6 +136,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkGrid" id="grid3"> <object class="GtkGrid" id="grid3">
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
<object class="GtkBox" id="CharNamePage"> <object class="GtkBox" id="CharNamePage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="simple"> <object class="GtkFrame" id="simple">
<property name="can_focus">False</property> <property name="can_focus">False</property>
......
This diff is collapsed.
...@@ -40,10 +40,7 @@ ...@@ -40,10 +40,7 @@
<object class="GtkBox" id="PositionPage"> <object class="GtkBox" id="PositionPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">6</property> <property name="border_width">6</property>
<property name="margin_right">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
...@@ -72,11 +69,9 @@ ...@@ -72,11 +69,9 @@
<child> <child>
<object class="GtkRadioButton" id="superscript"> <object class="GtkRadioButton" id="superscript">
<property name="label" translatable="yes">Superscript</property> <property name="label" translatable="yes">Superscript</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">normal</property> <property name="group">normal</property>
...@@ -90,11 +85,9 @@ ...@@ -90,11 +85,9 @@
<child> <child>
<object class="GtkRadioButton" id="normal"> <object class="GtkRadioButton" id="normal">
<property name="label" translatable="yes">Normal</property> <property name="label" translatable="yes">Normal</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">subscript</property> <property name="group">subscript</property>
...@@ -108,11 +101,9 @@ ...@@ -108,11 +101,9 @@
<child> <child>
<object class="GtkRadioButton" id="subscript"> <object class="GtkRadioButton" id="subscript">
<property name="label" translatable="yes">Subscript</property> <property name="label" translatable="yes">Subscript</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
...@@ -184,11 +175,9 @@ ...@@ -184,11 +175,9 @@
<child> <child>
<object class="GtkCheckButton" id="automatic"> <object class="GtkCheckButton" id="automatic">
<property name="label" translatable="yes">Automatic</property> <property name="label" translatable="yes">Automatic</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
...@@ -216,15 +205,6 @@ ...@@ -216,15 +205,6 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -279,11 +259,9 @@ ...@@ -279,11 +259,9 @@
<child> <child>
<object class="GtkRadioButton" id="0deg"> <object class="GtkRadioButton" id="0deg">
<property name="label" translatable="yes">0 degrees</property> <property name="label" translatable="yes">0 degrees</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">90deg</property> <property name="group">90deg</property>
...@@ -297,11 +275,9 @@ ...@@ -297,11 +275,9 @@
<child> <child>
<object class="GtkRadioButton" id="90deg"> <object class="GtkRadioButton" id="90deg">
<property name="label" translatable="yes">90 degrees</property> <property name="label" translatable="yes">90 degrees</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">270deg</property> <property name="group">270deg</property>
...@@ -315,11 +291,9 @@ ...@@ -315,11 +291,9 @@
<child> <child>
<object class="GtkRadioButton" id="270deg"> <object class="GtkRadioButton" id="270deg">
<property name="label" translatable="yes">270 degrees</property> <property name="label" translatable="yes">270 degrees</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">0deg</property> <property name="group">0deg</property>
...@@ -333,11 +307,9 @@ ...@@ -333,11 +307,9 @@
<child> <child>
<object class="GtkCheckButton" id="fittoline"> <object class="GtkCheckButton" id="fittoline">
<property name="label" translatable="yes">Fit to line</property> <property name="label" translatable="yes">Fit to line</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
...@@ -501,11 +473,9 @@ ...@@ -501,11 +473,9 @@
<child> <child>
<object class="GtkCheckButton" id="pairkerning"> <object class="GtkCheckButton" id="pairkerning">
<property name="label" translatable="yes">Pair kerning</property> <property name="label" translatable="yes">Pair kerning</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<object class="GtkBox" id="TwoLinesPage"> <object class="GtkBox" id="TwoLinesPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="frame8"> <object class="GtkFrame" id="frame8">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -15,15 +17,14 @@ ...@@ -15,15 +17,14 @@
<object class="GtkAlignment" id="alignment8"> <object class="GtkAlignment" id="alignment8">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkCheckButton" id="twolines"> <object class="GtkCheckButton" id="twolines">
<property name="label" translatable="yes">Write in double lines</property> <property name="label" translatable="yes">Write in double lines</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
<object class="GtkAlignment" id="alignment9"> <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkGrid" id="grid5"> <object class="GtkGrid" id="grid5">
...@@ -155,6 +157,7 @@ ...@@ -155,6 +157,7 @@
<object class="GtkAlignment" id="alignment14"> <object class="GtkAlignment" id="alignment14">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="svxlo:SvxFontPrevWindow" id="preview"> <object class="svxlo:SvxFontPrevWindow" id="preview">
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
<object class="GtkBox" id="CharURLPage"> <object class="GtkBox" id="CharURLPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="frame10"> <object class="GtkFrame" id="frame10">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -22,7 +24,8 @@ ...@@ -22,7 +24,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</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> <property name="row_homogeneous">True</property>
<child> <child>
<object class="GtkLabel" id="label36"> <object class="GtkLabel" id="label36">
...@@ -83,12 +86,10 @@ ...@@ -83,12 +86,10 @@
<child> <child>
<object class="GtkButton" id="eventpb"> <object class="GtkButton" id="eventpb">
<property name="label" translatable="yes">Events...</property> <property name="label" translatable="yes">Events...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="use_action_appearance">False</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -146,12 +147,10 @@ ...@@ -146,12 +147,10 @@
<child> <child>
<object class="GtkButton" id="urlpb"> <object class="GtkButton" id="urlpb">
<property name="label" translatable="yes">Browse...</property> <property name="label" translatable="yes">Browse...</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="use_action_appearance">False</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
...@@ -232,7 +231,8 @@ ...@@ -232,7 +231,8 @@
<object class="GtkGrid" id="grid6"> <object class="GtkGrid" id="grid6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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> <child>
<object class="GtkLabel" id="label34"> <object class="GtkLabel" id="label34">
<property name="visible">True</property> <property name="visible">True</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment