[meld/wip/jtojnar/more-icons] Remove remaining stock references
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/wip/jtojnar/more-icons] Remove remaining stock references
- Date: Sat, 21 May 2022 18:38:39 +0000 (UTC)
commit b7c93006bc22e72ac871395049a29a44ab670ea2
Author: Jan Tojnar <jtojnar gmail com>
Date: Sat May 21 20:38:31 2022 +0200
Remove remaining stock references
Those have long been deprecated and are removed in GTK 4.
meld/resources/ui/commit-dialog.ui | 4 ++--
meld/resources/ui/patch-dialog.ui | 4 ++--
meld/resources/ui/push-dialog.ui | 4 ++--
meld/resources/ui/recent-selector.ui | 4 ++--
meld/resources/ui/revert-dialog.ui | 4 ++--
meld/ui/msgarea.py | 8 ++++----
6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/meld/resources/ui/commit-dialog.ui b/meld/resources/ui/commit-dialog.ui
index f37095b4..e9f19b29 100644
--- a/meld/resources/ui/commit-dialog.ui
+++ b/meld/resources/ui/commit-dialog.ui
@@ -241,12 +241,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
- <property name="label">gtk-cancel</property>
+ <property name="label">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/meld/resources/ui/patch-dialog.ui b/meld/resources/ui/patch-dialog.ui
index 732b2373..ec0ff824 100644
--- a/meld/resources/ui/patch-dialog.ui
+++ b/meld/resources/ui/patch-dialog.ui
@@ -38,12 +38,12 @@
</child>
<child>
<object class="GtkButton" id="button9">
- <property name="label">gtk-cancel</property>
+ <property name="label">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<accelerator key="Escape" signal="activate"/>
</object>
<packing>
diff --git a/meld/resources/ui/push-dialog.ui b/meld/resources/ui/push-dialog.ui
index 697b1626..00491005 100644
--- a/meld/resources/ui/push-dialog.ui
+++ b/meld/resources/ui/push-dialog.ui
@@ -21,11 +21,11 @@
<property name="layout_style">expand</property>
<child>
<object class="GtkButton" id="cancelbutton">
- <property name="label">gtk-cancel</property>
+ <property name="label">_Cancel</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="expand">False</property>
diff --git a/meld/resources/ui/recent-selector.ui b/meld/resources/ui/recent-selector.ui
index 32fd36bb..4ac7000c 100644
--- a/meld/resources/ui/recent-selector.ui
+++ b/meld/resources/ui/recent-selector.ui
@@ -40,11 +40,11 @@
</child>
<child>
<object class="GtkButton" id="open_button">
- <property name="label">gtk-open</property>
+ <property name="label">_Open</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="use_stock">True</property>
+ <property name="use_underline">True</property>
<signal name="clicked" handler="on_activate" swapped="no"/>
</object>
<packing>
diff --git a/meld/resources/ui/revert-dialog.ui b/meld/resources/ui/revert-dialog.ui
index 009a974e..0d0ad6da 100644
--- a/meld/resources/ui/revert-dialog.ui
+++ b/meld/resources/ui/revert-dialog.ui
@@ -21,12 +21,12 @@
<property name="layout_style">expand</property>
<child>
<object class="GtkButton" id="cancel_button1">
- <property name="label">gtk-cancel</property>
+ <property name="label">_Cancel</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>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/meld/ui/msgarea.py b/meld/ui/msgarea.py
index 69520d66..f3246ff2 100644
--- a/meld/ui/msgarea.py
+++ b/meld/ui/msgarea.py
@@ -24,8 +24,8 @@ from gi.repository import Gtk, Pango
from meld.conf import _
-def layout_text_and_icon(stockid, primary_text, secondary_text=None):
- image = Gtk.Image.new_from_icon_name(stockid, Gtk.IconSize.DIALOG)
+def layout_text_and_icon(icon_name, primary_text, secondary_text=None):
+ image = Gtk.Image.new_from_icon_name(icon_name, Gtk.IconSize.DIALOG)
image.set_alignment(0.5, 0.5)
vbox = Gtk.VBox(homogeneous=False, spacing=6)
@@ -86,7 +86,7 @@ class MsgAreaController(Gtk.HBox):
self.__msgid = None
def new_from_text_and_icon(
- self, stockid, primary, secondary=None, buttons=None):
+ self, icon_name, primary, secondary=None, buttons=None):
self.clear()
msgarea = self.__msgarea = Gtk.InfoBar()
@@ -94,7 +94,7 @@ class MsgAreaController(Gtk.HBox):
for (text, respid) in buttons:
self.add_button(text, respid)
- content = layout_text_and_icon(stockid, primary, secondary)
+ content = layout_text_and_icon(icon_name, primary, secondary)
content_area = msgarea.get_content_area()
content_area.foreach(content_area.remove, None)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]