summaryrefslogtreecommitdiff
path: root/svtools/uiconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-02-19 16:33:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-02-22 22:07:38 +0100
commit6a4c464b49dbfa2801818ead1b50bc9580824d00 (patch)
tree3d6381b6b13576bc536670992b36784436486e95 /svtools/uiconfig
parentf7733528e88a6619f82b54b59e92a9bca72c0a89 (diff)
weld native message dialogs
just the straight-forward MessageDialog cases first a) remove border_width from message dialog .ui so as to take the default border width b) retain 12 as default message dialog border for vcl widget case c) remove layour_style from message dialog button boxes so as to take the default mode (a no-op for vcl widget case) d) use gtk response ids (vcl builder will converts to vcl ones) Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154 Reviewed-on: https://gerrit.libreoffice.org/50143 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/uiconfig')
-rw-r--r--svtools/uiconfig/ui/javadisableddialog.ui10
-rw-r--r--svtools/uiconfig/ui/querydeletedialog.ui8
2 files changed, 7 insertions, 11 deletions
diff --git a/svtools/uiconfig/ui/javadisableddialog.ui b/svtools/uiconfig/ui/javadisableddialog.ui
index bc2d7b250207..a60d6aa74ded 100644
--- a/svtools/uiconfig/ui/javadisableddialog.ui
+++ b/svtools/uiconfig/ui/javadisableddialog.ui
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
<interface domain="svt">
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="JavaDisabledDialog">
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="title" translatable="yes" context="javadisableddialog|JavaDisabledDialog">Enable JRE?</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
@@ -19,7 +18,6 @@
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="no">
<property name="label">gtk-no</property>
@@ -77,9 +75,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="3">no</action-widget>
- <action-widget response="2">yes</action-widget>
- <action-widget response="0">cancel</action-widget>
+ <action-widget response="-9">no</action-widget>
+ <action-widget response="-8">yes</action-widget>
+ <action-widget response="-6">cancel</action-widget>
</action-widgets>
</object>
</interface>
diff --git a/svtools/uiconfig/ui/querydeletedialog.ui b/svtools/uiconfig/ui/querydeletedialog.ui
index de2e3d102235..71ee4c7af917 100644
--- a/svtools/uiconfig/ui/querydeletedialog.ui
+++ b/svtools/uiconfig/ui/querydeletedialog.ui
@@ -4,7 +4,6 @@
<requires lib="gtk+" version="3.0"/>
<object class="GtkMessageDialog" id="QueryDeleteDialog">
<property name="can_focus">False</property>
- <property name="border_width">6</property>
<property name="title" translatable="yes" context="querydeletedialog|QueryDeleteDialog">Confirm Delete</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
@@ -20,7 +19,6 @@
<child internal-child="action_area">
<object class="GtkButtonBox" id="messagedialog-action_area">
<property name="can_focus">False</property>
- <property name="layout_style">center</property>
<child>
<object class="GtkButton" id="yes">
<property name="label" translatable="yes" context="querydeletedialog|yes">_Delete</property>
@@ -91,10 +89,10 @@
</object>
</child>
<action-widgets>
- <action-widget response="2">yes</action-widget>
+ <action-widget response="-8">yes</action-widget>
<action-widget response="101">all</action-widget>
- <action-widget response="3">no</action-widget>
- <action-widget response="0">cancel</action-widget>
+ <action-widget response="-9">no</action-widget>
+ <action-widget response="-6">cancel</action-widget>
</action-widgets>
</object>
</interface>