Skip to content

C
core
Kaydet (Commit) 63ced8e5 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Related: fdo#67395 drop 'Font' frame title 

+ promote the family, style, size to frame titles and drop
the surrounding 'Font' one
+ bottom align the previews again
+ drop empty spacing labels in favour of 6pixel spacing

Change-Id: I2c0b78163894c5283162c37bd71fa1bbc3c341c7
üst 1193dc78
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 247 deletions
cui/uiconfig/ui/charnamepage.ui
Dosyayı görüntüle @ 63ced8e5
...@@ -9,212 +9,203 @@ ...@@ -9,212 +9,203 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="simple"> <object class="GtkGrid" id="simple">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="label_xalign">0</property> <property name="hexpand">True</property>
<property name="shadow_type">none</property> <property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child> <child>
<object class="GtkAlignment" id="alignment5"> <object class="GtkLabel" id="westfontinfo-nocjk">
<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="margin_top">6</property>
<property name="left_padding">12</property> <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkGrid" id="grid4"> <object class="GtkLabel" id="westlangft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Language</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westlanglb-nocjk</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="svxcorelo-SvxLanguageBox" id="westlanglb-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment6">
<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="vexpand">True</property> <property name="vexpand">True</property>
<property name="row_spacing">6</property> <property name="top_padding">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="westfontnameft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Family </property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westfontnamelb-nocjk</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="weststyleft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Style</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">weststylelb-nocjk</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westsizeft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Size</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westsizelb-nocjk</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child> <child>
<object class="svtlo-FontNameBox" id="westfontnamelb-nocjk"> <object class="svtlo-FontNameBox" id="westfontnamelb-nocjk">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="dropdown">False</property> <property name="dropdown">False</property>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="westfontnameft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Family</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<child> <child>
<object class="svtlo-FontStyleBox" id="weststylelb-nocjk"> <object class="svtlo-FontStyleBox" id="weststylelb-nocjk">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="dropdown">False</property> <property name="dropdown">False</property>
</object> </object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child> </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="weststyleft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Style</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<child> <child>
<object class="svtlo-FontSizeBox" id="westsizelb-nocjk"> <object class="svtlo-FontSizeBox" id="westsizelb-nocjk">
<property name="height_request">150</property> <property name="height_request">150</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="hexpand">True</property>
<property name="vexpand">True</property>
<property name="dropdown">False</property> <property name="dropdown">False</property>
</object> </object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="height_request">6</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="height_request">6</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="westfontinfo-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="westlangft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Language</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">westlanglb-nocjk</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="svxcorelo-SvxLanguageBox" id="westlanglb-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
<child type="label">
<object class="GtkLabel" id="westsizeft-nocjk">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Size</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object> </object>
</child> <packing>
<child type="label"> <property name="left_attach">2</property>
<object class="GtkLabel" id="label21"> <property name="top_attach">0</property>
<property name="visible">True</property> <property name="width">1</property>
<property name="can_focus">False</property> <property name="height">1</property>
<property name="label" translatable="yes">Font</property> </packing>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child> </child>
</object> </object>
<packing> <packing>
...@@ -363,28 +354,16 @@ ...@@ -363,28 +354,16 @@
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label3">
<property name="height_request">6</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
<property name="height">1</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="westfontinfo-cjk"> <object class="GtkLabel" id="westfontinfo-cjk">
<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_top">6</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="width">4</property> <property name="width">4</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
...@@ -550,19 +529,6 @@ ...@@ -550,19 +529,6 @@
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label7">
<property name="height_request">6</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
<property name="height">1</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="eastfontinfo"> <object class="GtkLabel" id="eastfontinfo">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -571,7 +537,7 @@ ...@@ -571,7 +537,7 @@
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="width">4</property> <property name="width">4</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
...@@ -737,28 +703,16 @@ ...@@ -737,28 +703,16 @@
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label8">
<property name="height_request">6</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">4</property>
<property name="height">1</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="ctlfontinfo"> <object class="GtkLabel" id="ctlfontinfo">
<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_top">6</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">3</property> <property name="top_attach">2</property>
<property name="width">4</property> <property name="width">4</property>
<property name="height">1</property> <property name="height">1</property>
</packing> </packing>
...@@ -788,6 +742,7 @@ ...@@ -788,6 +742,7 @@
<object class="GtkAlignment" id="alignment4"> <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
...@@ -806,6 +761,7 @@ ...@@ -806,6 +761,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">4</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
......
cui/uiconfig/ui/effectspage.ui
Dosyayı görüntüle @ 63ced8e5
...@@ -659,6 +659,7 @@ ...@@ -659,6 +659,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
......
cui/uiconfig/ui/positionpage.ui
Dosyayı görüntüle @ 63ced8e5
...@@ -493,6 +493,7 @@ ...@@ -493,6 +493,7 @@
<object class="GtkAlignment" id="alignment13"> <object class="GtkAlignment" id="alignment13">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">end</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
...@@ -513,6 +514,7 @@ ...@@ -513,6 +514,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
......
cui/uiconfig/ui/twolinespage.ui
Dosyayı görüntüle @ 63ced8e5
...@@ -2,40 +2,6 @@ ...@@ -2,40 +2,6 @@
<interface> <interface>
<!-- interface-requires gtk+ 3.0 --> <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 --> <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gint1 -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">(None)</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes">)</col>
<col id="1">1</col>
</row>
<row>
<col id="0" translatable="yes">]</col>
<col id="1">2</col>
</row>
<row>
<col id="0" translatable="yes">&gt;</col>
<col id="1">3</col>
</row>
<row>
<col id="0" translatable="yes">}</col>
<col id="1">4</col>
</row>
<row>
<col id="0" translatable="yes">Other Characters...</col>
<col id="1">5</col>
</row>
</data>
</object>
<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>
...@@ -186,6 +152,7 @@ ...@@ -186,6 +152,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="valign">end</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
...@@ -204,6 +171,7 @@ ...@@ -204,6 +171,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
...@@ -242,4 +210,38 @@ ...@@ -242,4 +210,38 @@
</row> </row>
</data> </data>
</object> </object>
<object class="GtkListStore" id="liststore2">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
<!-- column-name gint1 -->
<column type="gint"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">(None)</col>
<col id="1">0</col>
</row>
<row>
<col id="0" translatable="yes">)</col>
<col id="1">1</col>
</row>
<row>
<col id="0" translatable="yes">]</col>
<col id="1">2</col>
</row>
<row>
<col id="0" translatable="yes">&gt;</col>
<col id="1">3</col>
</row>
<row>
<col id="0" translatable="yes">}</col>
<col id="1">4</col>
</row>
<row>
<col id="0" translatable="yes">Other Characters...</col>
<col id="1">5</col>
</row>
</data>
</object>
</interface> </interface>
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