[Libreoffice-commits] core.git: cui/uiconfig
heiko tietze
tietze.heiko at gmail.com
Sun Jan 8 21:16:31 UTC 2017
cui/uiconfig/ui/numberingoptionspage.ui | 307 +++++++++++++++-----------------
1 file changed, 146 insertions(+), 161 deletions(-)
New commits:
commit 0b791297a0ce1c94031322ac534ba783f6505902
Author: heiko tietze <tietze.heiko at gmail.com>
Date: Sat Jan 7 17:29:31 2017 +0100
tdf#77115 Layout of options tab of bullet dialog
Alignment fixed, 'start at' moved under number
Change-Id: Ib97243e12529bb5e667dea8224b579b91ce60a53
Reviewed-on: https://gerrit.libreoffice.org/32820
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index ae72660..0e18b19 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -2,7 +2,6 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
- <requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">19.989999999999998</property>
<property name="step_increment">0.050000000000000003</property>
@@ -28,26 +27,6 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkMenu" id="bitmapmenu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="fromfile">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">From file...</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="gallery">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Gallery</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
<object class="GtkBox" id="NumberingOptionsPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -128,10 +107,10 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Number:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">numfmtlb</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -139,41 +118,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="charstyleft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Character style:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">charstyle</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="sublevelsft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Show sublevels:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sublevels</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
<object class="GtkComboBox" id="charstyle">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
@@ -186,7 +137,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -198,21 +149,21 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">10</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="startatft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Start at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">startat</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">10</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -229,10 +180,10 @@
<object class="GtkLabel" id="bitmapft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Graphics:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">bitmap:bitmapmenu</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -243,10 +194,10 @@
<object class="GtkLabel" id="widthft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">widthmf:0.00cm</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -270,10 +221,11 @@
<object class="GtkLabel" id="heightft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Height:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">heightmf:0.00cm</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -303,19 +255,18 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">14</property>
- <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="orientft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">Alignment:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">orientlb</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -356,40 +307,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="colorft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Color:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">color</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
<object class="svxcorelo-SvxColorListBox" id="color">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="relsizeft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Relative size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">relsize:0%</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
@@ -402,21 +325,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="numalignft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Alignment:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">numalign</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -431,21 +340,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="bulletft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Character:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">bullet</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -457,7 +352,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -466,13 +361,13 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
- <object class="GtkLabel" id="suffixft">
+ <object class="GtkLabel" id="prefixft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">After:</property>
+ <property name="label" translatable="yes">Before:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">suffix</property>
+ <property name="mnemonic_widget">prefix</property>
+ <property name="xalign">1</property>
</object>
</child>
</object>
@@ -487,13 +382,11 @@
<property name="can_focus">False</property>
<property name="left_padding">20</property>
<child>
- <object class="GtkLabel" id="prefixft">
+ <object class="GtkLabel" id="separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Before:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">prefix</property>
+ <property name="label" translatable="yes">Separator</property>
+ <property name="xalign">1</property>
</object>
</child>
</object>
@@ -503,20 +396,18 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="separator">
+ <object class="GtkEntry" id="suffix">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Separator</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- <property name="width">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">10</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="suffix">
+ <object class="GtkEntry" id="prefix">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -527,16 +418,110 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="prefix">
+ <object class="GtkLabel" id="suffixft">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">After:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">suffix</property>
+ <property name="xalign">1</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sublevelsft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Show sublevels:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">sublevels</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="bulletft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Character:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">bullet</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="relsizeft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Relative size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">relsize:0%</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="colorft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Color:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">color</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="charstyleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Character style:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">charstyle</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="numalignft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Alignment:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">numalign</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -629,24 +614,24 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup">
- <widgets>
- <widget name="label4"/>
- <widget name="charstyleft"/>
- <widget name="sublevelsft"/>
- <widget name="startatft"/>
- <widget name="bitmapft"/>
- <widget name="widthft"/>
- <widget name="heightft"/>
- <widget name="orientft"/>
- <widget name="colorft"/>
- <widget name="relsizeft"/>
- <widget name="numalignft"/>
- <widget name="bulletft"/>
- <widget name="alignment4"/>
- <widget name="alignment3"/>
- <widget name="separator"/>
- <widget name="label2"/>
- </widgets>
+ <object class="GtkMenu" id="bitmapmenu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="fromfile">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">From file...</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkMenuItem" id="gallery">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Gallery</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
</object>
</interface>
More information about the Libreoffice-commits
mailing list