sw/uiconfig/swriter/ui/dropdownfielddialog.ui | 24 ++++++++----------------
sw/uiconfig/swriter/ui/inputfielddialog.ui | 26 +++++++++-----------------
2 files changed, 17 insertions(+), 33 deletions(-)
New commits:
commit 1188bebbc53d0519733cfe98cfab4d83474e8ddf
Author: heiko tietze <tietze.he...@gmail.com>
AuthorDate: Thu Jul 26 16:39:18 2018 +0200
Commit: Heiko Tietze <tietze.he...@gmail.com>
CommitDate: Tue Aug 21 08:10:19 2018 +0200
tdf#118742 - Input field dialog workflow
Buttons reverted to gtk-media-previous and gtk-media-next
Dialog title changed to "Review Fields"
Change-Id: If2bac95ccd36fc14a4c0b4e7789a3cf81db3bc0f
Reviewed-on: https://gerrit.libreoffice.org/58132
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index dcc60a36a026..de07077e4efa 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -1,17 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
- </object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- </object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name text -->
@@ -26,6 +16,9 @@
<property name="title" translatable="yes"
context="dropdownfielddialog|DropdownFieldDialog">Choose Item: </property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -43,9 +36,10 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="prev">
+ <property name="label">gtk-media-previous</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image1</property>
+ <property name="use_stock">True</property>
<property name="image_position">right</property>
</object>
<packing>
@@ -55,9 +49,10 @@
</child>
<child>
<object class="GtkButton" id="next">
+ <property name="label">gtk-media-next</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image2</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -230,8 +225,5 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui
b/sw/uiconfig/swriter/ui/inputfielddialog.ui
index c5c41ade7a76..eae47fd16955 100644
--- a/sw/uiconfig/swriter/ui/inputfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui
@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.0"/>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
- </object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- </object>
<object class="GtkDialog" id="InputFieldDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes"
context="inputfielddialog|InputFieldDialog">Input Field</property>
+ <property name="title" translatable="yes"
context="inputfielddialog|InputFieldDialog">Review Fields</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -37,10 +30,11 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="prev">
+ <property name="label">gtk-media-previous</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image1</property>
+ <property name="use_stock">True</property>
<property name="image_position">right</property>
</object>
<packing>
@@ -50,10 +44,11 @@
</child>
<child>
<object class="GtkButton" id="next">
+ <property name="label">gtk-media-next</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="image">image2</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -194,8 +189,5 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
