[Libreoffice-commits] core.git: sfx2/uiconfig
Heiko Tietze (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 5 09:06:12 UTC 2019
sfx2/uiconfig/ui/autoredactdialog.ui | 120 ++++++++++++++---------------------
1 file changed, 49 insertions(+), 71 deletions(-)
New commits:
commit 9d52758d7db507948e1f70f8c6d47b05a1fdefb3
Author: Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Wed Sep 4 11:19:22 2019 +0200
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Thu Sep 5 11:05:13 2019 +0200
Resolves tdf#126431 - Placement of buttons in AutoRedact dialog
Buttons moved to the side
Sizegroups deleted, some some between buttons added
Change-Id: Ie0809c7a26792d2aef9a8ad60c5ad909558d00af
Reviewed-on: https://gerrit.libreoffice.org/78586
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/sfx2/uiconfig/ui/autoredactdialog.ui b/sfx2/uiconfig/ui/autoredactdialog.ui
index ce64d392fb9d..e6602d51c40f 100644
--- a/sfx2/uiconfig/ui/autoredactdialog.ui
+++ b/sfx2/uiconfig/ui/autoredactdialog.ui
@@ -84,6 +84,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">5</property>
</packing>
</child>
@@ -91,6 +92,7 @@
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
@@ -212,7 +214,10 @@
<object class="GtkButtonBox">
<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="orientation">vertical</property>
+ <property name="homogeneous">True</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="btnLoadTargets">
@@ -220,7 +225,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="margin_bottom">3</property>
+ <property name="margin_bottom">1</property>
</object>
<packing>
<property name="expand">True</property>
@@ -235,7 +240,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="margin_top">3</property>
</object>
<packing>
<property name="expand">True</property>
@@ -244,6 +248,48 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label" translatable="yes" context="autoredactdialog|add">Add Target</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit">
+ <property name="label" translatable="yes" context="autoredactdialog|edit">Edit Target</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="margin_bottom">1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delete">
+ <property name="label" translatable="yes" context="autoredactdialog|delete">Delete Target</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -255,62 +301,11 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="add">
- <property name="label" translatable="yes" context="autoredactdialog|add">Add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="edit">
- <property name="label" translatable="yes" context="autoredactdialog|edit">Edit</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="delete">
- <property name="label" translatable="yes" context="autoredactdialog|delete">Delete</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -319,21 +314,4 @@
<action-widget response="-6">cancel</action-widget>
</action-widgets>
</object>
- <object class="GtkSizeGroup" id="TargetButtons">
- <property name="mode">both</property>
- <widgets>
- <widget name="btnLoadTargets"/>
- <widget name="btnSaveTargets"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="otherbuttons">
- <widgets>
- <widget name="add"/>
- <widget name="edit"/>
- <widget name="delete"/>
- <widget name="ok"/>
- <widget name="cancel"/>
- <widget name="help"/>
- </widgets>
- </object>
</interface>
More information about the Libreoffice-commits
mailing list