[Libreoffice-commits] core.git: 3 commits - cui/uiconfig sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 22 20:05:21 UTC 2019
cui/uiconfig/ui/paragalignpage.ui | 6 ++
cui/uiconfig/ui/paratabspage.ui | 4 -
sw/uiconfig/swriter/ui/numparapage.ui | 91 ++++++++++++++++------------------
3 files changed, 51 insertions(+), 50 deletions(-)
New commits:
commit 48e68eddb9bc1d8356eaf493cfd4a520f64ce4d1
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Oct 18 22:56:30 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Oct 22 22:04:30 2019 +0200
tdf#128239 Paragraph Dialog: Update Alignment tab
Change-Id: Ia2649902e4ad8c2990ffef5fd0c22df32484fcd7
Reviewed-on: https://gerrit.libreoffice.org/81113
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index ddc3690fffa7..289585fa390c 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -440,4 +440,10 @@
<widget name="label2"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup2">
+ <widgets>
+ <widget name="comboLB_VERTALIGN"/>
+ <widget name="comboLB_TEXTDIRECTION"/>
+ </widgets>
+ </object>
</interface>
commit 5456719e2a2cc4f3d9bfc2f107a054c593cd5480
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Oct 18 22:07:44 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Oct 22 22:04:22 2019 +0200
tdf#128239 Paragraph Dialog: Update Outline tab
Change-Id: Icb22f2a9f24852898ab4550bc0cec32732ad32dd
Reviewed-on: https://gerrit.libreoffice.org/81103
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui
index 0ff72c8eadfd..5339ba2ae8b9 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -17,7 +17,6 @@
<object class="GtkBox" id="NumParaPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
@@ -25,28 +24,23 @@
<object class="GtkFrame" id="frameFL_OUTLINE_START">
<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="alignment1">
<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="GtkBox" id="boxOUTLINE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="labelFT_OUTLINE_LEVEL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
<property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</property>
@@ -62,7 +56,6 @@
<object class="GtkComboBoxText" id="comboLB_OUTLINE_LEVEL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<items>
<item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Text Body</item>
<item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item>
@@ -108,28 +101,24 @@
<object class="GtkFrame" id="frameFL_NEW_START">
<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="alignment2">
<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="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="boxNUMBER_STYLE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="labelFT_NUMBER_STYLE">
@@ -149,13 +138,37 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE">
+ <object class="GtkBox" id="boxSubNumber_Style">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item>
- </items>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">None</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="editnumstyle">
+ <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -163,19 +176,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="editnumstyle">
- <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -206,13 +206,11 @@
<object class="GtkBox" id="boxNEW_START">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START">
@@ -246,8 +244,6 @@
<object class="GtkSpinButton" id="spinNF_NEW_START">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustmentSTART_WITH</property>
</object>
@@ -289,21 +285,18 @@
<object class="GtkFrame" id="frameFL_COUNT_PARA">
<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="alignment3">
<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="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
@@ -347,13 +340,11 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="labelFT_RESTART_NO">
@@ -383,8 +374,6 @@
<object class="GtkSpinButton" id="spinNF_RESTART_PARA">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
<property name="activates_default">True</property>
<property name="adjustment">adjustmentNF_RESTART_PARA</property>
</object>
@@ -423,14 +412,6 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="comboLB_OUTLINE_LEVEL"/>
- <widget name="comboLB_NUMBER_STYLE"/>
- <widget name="spinNF_NEW_START"/>
- <widget name="spinNF_RESTART_PARA"/>
- </widgets>
- </object>
<object class="GtkSizeGroup" id="sizegroup2">
<widgets>
<widget name="labelFT_OUTLINE_LEVEL"/>
@@ -439,4 +420,18 @@
<widget name="box3"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <widgets>
+ <widget name="comboLB_OUTLINE_LEVEL"/>
+ <widget name="boxSubNumber_Style"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <widgets>
+ <widget name="comboLB_NUMBER_STYLE"/>
+ <widget name="spinNF_NEW_START"/>
+ <widget name="spinNF_RESTART_PARA"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1"/>
</interface>
commit d686b7131c1949e1b1e65cee6464cbbfb62bf991
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Oct 18 21:56:08 2019 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Tue Oct 22 22:04:15 2019 +0200
tdf#128239 Paragraph Dialog: Update Tabs tab
Change-Id: I6985c15df7a65bd38b66e50ddee2221bfdff5f01
Reviewed-on: https://gerrit.libreoffice.org/81099
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index a459ea5c01a1..a97576c24e6a 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -167,7 +167,7 @@
<object class="GtkEntry" id="entryED_TABTYPE_DECCHAR">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="width_chars">1</property>
+ <property name="width_chars">3</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -469,7 +469,7 @@
<object class="GtkEntry" id="entryED_FILLCHAR_OTHER">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="width_chars">1</property>
+ <property name="width_chars">3</property>
<accessibility>
<relation type="labelled-by" target="radiobuttonBTN_FILLCHAR_OTHER"/>
</accessibility>
More information about the Libreoffice-commits
mailing list