cui/uiconfig/ui/spellingdialog.ui | 3 +--
filter/uiconfig/ui/pdfsignpage.ui | 4 ++--
fpicker/uiconfig/ui/explorerfiledialog.ui | 4 ++--
sc/uiconfig/scalc/ui/insertname.ui | 4 ++--
sc/uiconfig/scalc/ui/standardfilterdialog.ui | 4 ++--
sfx2/uiconfig/ui/helpsearchpage.ui | 4 ++--
svx/uiconfig/ui/acceptrejectchangesdialog.ui | 4 ++--
sw/uiconfig/swriter/ui/dropdownfielddialog.ui | 8 ++++----
sw/uiconfig/swriter/ui/findentrydialog.ui | 4 ++--
sw/uiconfig/swriter/ui/inputfielddialog.ui | 8 ++++----
sw/uiconfig/swriter/ui/managechangessidebar.ui | 4 ++--
sw/uiconfig/swriter/ui/testmailsettings.ui | 4 ++--
vcl/inc/strings.hrc | 8 --------
vcl/source/window/builder.cxx | 16 ----------------
14 files changed, 27 insertions(+), 52 deletions(-)
New commits:
commit 80f3c0ce51a7f94b127fe7c4dd4dd1d87ce694d6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 5 20:41:17 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 7 20:16:02 2021 +0100
replace deprecated stock labels used <= twice
replace single use of deprecated gtk-paste
replace single use of deprecated gtk-play
replace single use of deprecated gtk-stop
replace only two uses of deprecated gtk-clear
replace only two uses of deprecated gtk-find
replace only two uses of deprecated gtk-media-next
replace only two uses of deprecated gtk-media-previous
Change-Id: Ia749c03ad5887f7919b1d0dc2facf8ae7e5fb7a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108820
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/spellingdialog.ui
b/cui/uiconfig/ui/spellingdialog.ui
index a12e3a2b6d96..8e5f2621d3f1 100644
--- a/cui/uiconfig/ui/spellingdialog.ui
+++ b/cui/uiconfig/ui/spellingdialog.ui
@@ -77,12 +77,11 @@
</child>
<child>
<object class="GtkButton" id="undo">
- <property name="label">gtk-undo</property>
+ <property name="label" translatable="yes"
context="spellingdialog|undo">_Undo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <property name="use_stock">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="undo-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="spellingdialog|extended_tip|undo">Click to undo the
last change in the current sentence. Click again to undo the previous change in
the same sentence.</property>
diff --git a/filter/uiconfig/ui/pdfsignpage.ui
b/filter/uiconfig/ui/pdfsignpage.ui
index 191f1fe7ca73..61babfb9ad9c 100644
--- a/filter/uiconfig/ui/pdfsignpage.ui
+++ b/filter/uiconfig/ui/pdfsignpage.ui
@@ -84,12 +84,12 @@
</child>
<child>
<object class="GtkButton" id="clear">
- <property name="label">gtk-clear</property>
+ <property name="label" translatable="yes"
context="pdfsignpage|clear">_Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">center</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index d75a4fe6f93e..936bc63f9536 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -545,10 +545,10 @@
</child>
<child>
<object class="GtkButton" id="play">
- <property name="label">gtk-media-play</property>
+ <property name="label" translatable="yes"
context="explorerfiledialog|play">_Play</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sc/uiconfig/scalc/ui/insertname.ui
b/sc/uiconfig/scalc/ui/insertname.ui
index a13b398c5f6d..9991ea247131 100644
--- a/sc/uiconfig/scalc/ui/insertname.ui
+++ b/sc/uiconfig/scalc/ui/insertname.ui
@@ -67,13 +67,13 @@
</child>
<child>
<object class="GtkButton" id="paste">
- <property name="label">gtk-paste</property>
+ <property name="label" translatable="yes"
context="insertname|paste">_Paste</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="paste-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="insertname|extended_tip|paste">Inserts the selected
named area and the corresponding cell reference at the current cursor
position.</property>
diff --git a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
index 940f6948fdf0..c360cf2796cc 100644
--- a/sc/uiconfig/scalc/ui/standardfilterdialog.ui
+++ b/sc/uiconfig/scalc/ui/standardfilterdialog.ui
@@ -43,12 +43,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="clear">
- <property name="label">gtk-clear</property>
+ <property name="label" translatable="yes"
context="standardfilterdialog|clear">_Clear</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sfx2/uiconfig/ui/helpsearchpage.ui
b/sfx2/uiconfig/ui/helpsearchpage.ui
index f83a63aab350..93db9cdf5859 100644
--- a/sfx2/uiconfig/ui/helpsearchpage.ui
+++ b/sfx2/uiconfig/ui/helpsearchpage.ui
@@ -118,11 +118,11 @@
</child>
<child>
<object class="GtkButton" id="find">
- <property name="label">gtk-find</property>
+ <property name="label" translatable="yes"
context="helpsearchpage|find">_Find</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="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index afa98cf1d484..c8fefbf8be29 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -100,11 +100,11 @@
</child>
<child>
<object class="GtkButton" id="undo">
- <property name="label">gtk-undo</property>
+ <property name="label" translatable="yes"
context="acceptrejectchangesdialog|undo">_Undo</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="undo-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes"
context="acceptrejectchangesdialog|extended_tip|undo">Reverse the last Accept
or Reject command.</property>
diff --git a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
index 812fa505dd11..5a6845053315 100644
--- a/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/dropdownfielddialog.ui
@@ -37,10 +37,10 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="prev">
- <property name="label">gtk-media-previous</property>
+ <property name="label" translatable="yes"
context="dropdownfielddialog|prev">_Previous</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<property name="image_position">right</property>
</object>
<packing>
@@ -50,10 +50,10 @@
</child>
<child>
<object class="GtkButton" id="next">
- <property name="label">gtk-media-next</property>
+ <property name="label" translatable="yes"
context="dropdownfielddialog|next">_Next</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="next-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="dropdownfielddialog|extended_tip|next">Closes the
current Input list and displays the next, if available.</property>
diff --git a/sw/uiconfig/swriter/ui/findentrydialog.ui
b/sw/uiconfig/swriter/ui/findentrydialog.ui
index b1bd4529ec97..5c3d655f2812 100644
--- a/sw/uiconfig/swriter/ui/findentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/findentrydialog.ui
@@ -21,13 +21,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="find">
- <property name="label">gtk-find</property>
+ <property name="label" translatable="yes"
context="findentrydialog|find">_Find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="find-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="findentrydialog|extended_tip|find">Displays the
next record that contains the search text.</property>
diff --git a/sw/uiconfig/swriter/ui/inputfielddialog.ui
b/sw/uiconfig/swriter/ui/inputfielddialog.ui
index 1d75c4b2673b..6238c9754fcd 100644
--- a/sw/uiconfig/swriter/ui/inputfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/inputfielddialog.ui
@@ -28,11 +28,11 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="prev">
- <property name="label">gtk-media-previous</property>
+ <property name="label" translatable="yes"
context="inputfielddialog|next">_Previous</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="use_underline">True</property>
<property name="image_position">right</property>
</object>
<packing>
@@ -42,11 +42,11 @@
</child>
<child>
<object class="GtkButton" id="next">
- <property name="label">gtk-media-next</property>
+ <property name="label" translatable="yes"
context="inputfielddialog|next">_Next</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="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="next-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="inputfielddialog|extended_tip|next">Jumps to the
next input field in the document.</property>
diff --git a/sw/uiconfig/swriter/ui/managechangessidebar.ui
b/sw/uiconfig/swriter/ui/managechangessidebar.ui
index 2814f603be89..bdb99548668d 100644
--- a/sw/uiconfig/swriter/ui/managechangessidebar.ui
+++ b/sw/uiconfig/swriter/ui/managechangessidebar.ui
@@ -112,12 +112,12 @@
</child>
<child>
<object class="GtkButton" id="undo">
- <property name="label">gtk-undo</property>
+ <property name="label" translatable="yes"
context="managechangessidebar|undo">_Undo</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui
b/sw/uiconfig/swriter/ui/testmailsettings.ui
index 222446879837..9b94de0a9a96 100644
--- a/sw/uiconfig/swriter/ui/testmailsettings.ui
+++ b/sw/uiconfig/swriter/ui/testmailsettings.ui
@@ -21,13 +21,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="stop">
- <property name="label">gtk-stop</property>
+ <property name="label" translatable="yes"
context="testmailsettings|stop">_Stop</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="stop-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|stop">Click the Stop button to stop a
test session manually.</property>
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index 152e97ab2c50..0907447bfd81 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -67,17 +67,9 @@
#define SV_BUTTONTEXT_EDIT NC_("SV_BUTTONTEXT_EDIT",
"~Edit")
#define SV_BUTTONTEXT_APPLY
NC_("SV_BUTTONTEXT_APPLY", "~Apply")
#define SV_BUTTONTEXT_SAVE NC_("SV_BUTTONTEXT_SAVE",
"~Save")
-#define SV_BUTTONTEXT_UNDO NC_("SV_BUTTONTEXT_UNDO",
"~Undo")
-#define SV_BUTTONTEXT_PASTE
NC_("SV_BUTTONTEXT_PASTE", "~Paste")
-#define SV_BUTTONTEXT_NEXT NC_("SV_BUTTONTEXT_NEXT",
"~Next")
-#define SV_BUTTONTEXT_PREV NC_("SV_BUTTONTEXT_PREV",
"~Previous")
#define SV_BUTTONTEXT_GO_UP
NC_("SV_BUTTONTEXT_GO_UP", "~Up")
#define SV_BUTTONTEXT_GO_DOWN
NC_("SV_BUTTONTEXT_GO_DOWN", "Do~wn")
-#define SV_BUTTONTEXT_CLEAR
NC_("SV_BUTTONTEXT_CLEAR", "~Clear")
#define SV_BUTTONTEXT_OPEN NC_("SV_BUTTONTEXT_OPEN",
"~Open")
-#define SV_BUTTONTEXT_PLAY NC_("SV_BUTTONTEXT_PLAY",
"~Play")
-#define SV_BUTTONTEXT_FIND NC_("SV_BUTTONTEXT_FIND",
"~Find")
-#define SV_BUTTONTEXT_STOP NC_("SV_BUTTONTEXT_STOP",
"~Stop")
#define SV_BUTTONTEXT_SCREENSHOT
NC_("SV_BUTTONTEXT_SCREENSHOT", "~Screenshot")
#define SV_STDTEXT_SERVICENOTAVAILABLE
NC_("SV_STDTEXT_SERVICENOTAVAILABLE", "The component (%s) could not be
loaded.\nPlease start setup with the repair option.")
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7456e4bbfece..cb7ba91796fb 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1117,26 +1117,10 @@ namespace
return VclResId(SV_BUTTONTEXT_SAVE);
else if (rType == "gtk-open")
return VclResId(SV_BUTTONTEXT_OPEN);
- else if (rType == "gtk-undo")
- return VclResId(SV_BUTTONTEXT_UNDO);
- else if (rType == "gtk-paste")
- return VclResId(SV_BUTTONTEXT_PASTE);
- else if (rType == "gtk-media-next")
- return VclResId(SV_BUTTONTEXT_NEXT);
- else if (rType == "gtk-media-previous")
- return VclResId(SV_BUTTONTEXT_PREV);
else if (rType == "gtk-go-up")
return VclResId(SV_BUTTONTEXT_GO_UP);
else if (rType == "gtk-go-down")
return VclResId(SV_BUTTONTEXT_GO_DOWN);
- else if (rType == "gtk-clear")
- return VclResId(SV_BUTTONTEXT_CLEAR);
- else if (rType == "gtk-media-play")
- return VclResId(SV_BUTTONTEXT_PLAY);
- else if (rType == "gtk-find")
- return VclResId(SV_BUTTONTEXT_FIND);
- else if (rType == "gtk-stop")
- return VclResId(SV_BUTTONTEXT_STOP);
else if (rType == "gtk-yes")
return VclResId(SV_BUTTONTEXT_YES);
else if (rType == "gtk-no")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
