From f4cac4374475ab04137b132adf0641770106c04a Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu, 1 Aug 2019 00:13:09 +0200
Subject: [PATCH] settings-dialog: Replace GtkStock buttons
Bug: 15768
Currently we don't get translations for the Help and Close buttons in
many dialogs.
Replace the `GtkStock` items with our own label/image.
---
settings-dialogs/xfwm4-dialog.glade | 21 ++++++++++++++++-----
settings-dialogs/xfwm4-tweaks-dialog.glade | 21 ++++++++++++++++-----
2 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/settings-dialogs/xfwm4-dialog.glade b/settings-dialogs/xfwm4-dialog.glade
index c848b2878..30b9a6ad7 100644
--- a/settings-dialogs/xfwm4-dialog.glade
+++ b/settings-dialogs/xfwm4-dialog.glade
@@ -31,6 +31,16 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <object class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">help-browser</property>
+ </object>
<object class="XfceTitledDialog" id="main-dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Window Manager</property>
@@ -47,16 +57,16 @@
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help_button">
- <property name="label">gtk-help</property>
+ <property name="label" translatable="yes">_Help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image8</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -67,12 +77,13 @@
</child>
<child>
<object class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image7</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 0d22cdd2b..38135a7e9 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -39,6 +39,16 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">help-browser</property>
+ </object>
<object class="XfceTitledDialog" id="main-dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Window Manager Tweaks</property>
@@ -56,16 +66,16 @@
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">horizontal</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button2">
- <property name="label">gtk-help</property>
+ <property name="label" translatable="yes">_Help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image2</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -76,12 +86,13 @@
</child>
<child>
<object class="GtkButton" id="button1">
- <property name="label">gtk-close</property>
+ <property name="label" translatable="yes">_Close</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image1</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
--
GitLab