Skip to content

Commit 76d4eef

Browse files
clefebvreclefebvre
committed
Switch to XApp symbolic icons
1 parent 51007ad commit 76d4eef

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ Depends:
2727
mint-mirrors,
2828
mint-upgrade-info,
2929
gir1.2-notify-0.7,
30-
gir1.2-xapp-1.0
30+
gir1.2-xapp-1.0 (>= 3.0.0)
3131
Description: The Linux Mint Update Manager
3232
Helps installing security updates and new versions of packages.

‎usr/lib/linuxmint/mintUpdate/mintUpdate.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -317,19 +317,19 @@ def __init__(self):
317317

318318
# Tray icon menu
319319
menu = Gtk.Menu()
320-
image = Gtk.Image.new_from_icon_name("view-refresh-symbolic", Gtk.IconSize.MENU)
320+
image = Gtk.Image.new_from_icon_name("xapp-view-refresh-symbolic", Gtk.IconSize.MENU)
321321
menuItem3 = Gtk.ImageMenuItem(label=_("Refresh"), image=image)
322322
menuItem3.connect('activate', self.manual_refresh)
323323
menu.append(menuItem3)
324-
image = Gtk.Image.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU)
324+
image = Gtk.Image.new_from_icon_name("xapp-dialog-information-symbolic", Gtk.IconSize.MENU)
325325
menuItem2 = Gtk.ImageMenuItem(label=_("Information"), image=image)
326326
menuItem2.connect('activate', self.open_information)
327327
menu.append(menuItem2)
328-
image = Gtk.Image.new_from_icon_name("preferences-other-symbolic", Gtk.IconSize.MENU)
328+
image = Gtk.Image.new_from_icon_name("xapp-toolbox-symbolic", Gtk.IconSize.MENU)
329329
menuItem4 = Gtk.ImageMenuItem(label=_("Preferences"), image=image)
330330
menuItem4.connect('activate', self.open_preferences)
331331
menu.append(menuItem4)
332-
image = Gtk.Image.new_from_icon_name("application-exit-symbolic", Gtk.IconSize.MENU)
332+
image = Gtk.Image.new_from_icon_name("xapp-exit-symbolic", Gtk.IconSize.MENU)
333333
menuItem = Gtk.ImageMenuItem(label=_("Quit"), image=image)
334334
menuItem.connect('activate', self.quit)
335335
menu.append(menuItem)
@@ -342,14 +342,14 @@ def __init__(self):
342342
fileMenu = Gtk.MenuItem.new_with_mnemonic(_("_File"))
343343
fileSubmenu = Gtk.Menu()
344344
fileMenu.set_submenu(fileSubmenu)
345-
image = Gtk.Image.new_from_icon_name("window-close-symbolic", Gtk.IconSize.MENU)
345+
image = Gtk.Image.new_from_icon_name("xapp-window-close-symbolic", Gtk.IconSize.MENU)
346346
closeMenuItem = Gtk.ImageMenuItem(label=_("Close window"), image=image)
347347
closeMenuItem.connect("activate", self.hide_window)
348348
key, mod = Gtk.accelerator_parse("<Control>W")
349349
closeMenuItem.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
350350
fileSubmenu.append(closeMenuItem)
351351
fileSubmenu.append(Gtk.SeparatorMenuItem())
352-
image = Gtk.Image.new_from_icon_name("application-exit-symbolic", Gtk.IconSize.MENU)
352+
image = Gtk.Image.new_from_icon_name("xapp-exit-symbolic", Gtk.IconSize.MENU)
353353
quitMenuItem = Gtk.ImageMenuItem(label=_("Quit"), image=image)
354354
quitMenuItem.connect('activate', self.quit)
355355
key, mod = Gtk.accelerator_parse("<Control>Q")
@@ -359,17 +359,17 @@ def __init__(self):
359359
editMenu = Gtk.MenuItem.new_with_mnemonic(_("_Edit"))
360360
editSubmenu = Gtk.Menu()
361361
editMenu.set_submenu(editSubmenu)
362-
image = Gtk.Image.new_from_icon_name("preferences-other-symbolic", Gtk.IconSize.MENU)
362+
image = Gtk.Image.new_from_icon_name("xapp-toolbox-symbolic", Gtk.IconSize.MENU)
363363
prefsMenuItem = Gtk.ImageMenuItem(label=_("Preferences"), image=image)
364364
prefsMenuItem.connect("activate", self.open_preferences)
365365
editSubmenu.append(prefsMenuItem)
366366
if os.path.exists("/usr/bin/timeshift-gtk"):
367-
image = Gtk.Image.new_from_icon_name("document-open-recent-symbolic", Gtk.IconSize.MENU)
367+
image = Gtk.Image.new_from_icon_name("xapp-document-open-recent-symbolic", Gtk.IconSize.MENU)
368368
sourcesMenuItem = Gtk.ImageMenuItem(label=_("System Snapshots"), image=image)
369369
sourcesMenuItem.connect("activate", self.open_timeshift)
370370
editSubmenu.append(sourcesMenuItem)
371371
if os.path.exists("/usr/bin/mintsources"):
372-
image = Gtk.Image.new_from_icon_name("system-software-install-symbolic", Gtk.IconSize.MENU)
372+
image = Gtk.Image.new_from_icon_name("xapp-software-install-symbolic", Gtk.IconSize.MENU)
373373
sourcesMenuItem = Gtk.ImageMenuItem(label=_("Software Sources"), image=image)
374374
sourcesMenuItem.connect("activate", self.open_repositories)
375375
editSubmenu.append(sourcesMenuItem)
@@ -399,16 +399,16 @@ def __init__(self):
399399
viewMenu = Gtk.MenuItem.new_with_mnemonic(_("_View"))
400400
viewSubmenu = Gtk.Menu()
401401
viewMenu.set_submenu(viewSubmenu)
402-
image = Gtk.Image.new_from_icon_name("document-open-recent-symbolic", Gtk.IconSize.MENU)
402+
image = Gtk.Image.new_from_icon_name("xapp-document-open-recent-symbolic", Gtk.IconSize.MENU)
403403
historyMenuItem = Gtk.ImageMenuItem(label=_("History of Updates"), image=image )
404404
historyMenuItem.connect("activate", self.open_history)
405-
image = Gtk.Image.new_from_icon_name("system-run-symbolic", Gtk.IconSize.MENU)
405+
image = Gtk.Image.new_from_icon_name("xapp-run-symbolic", Gtk.IconSize.MENU)
406406
kernelMenuItem = Gtk.ImageMenuItem(label=_("Linux Kernels"), image=image)
407407
kernelMenuItem.connect("activate", self.on_kernel_menu_activated)
408-
image = Gtk.Image.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU)
408+
image = Gtk.Image.new_from_icon_name("xapp-dialog-information-symbolic", Gtk.IconSize.MENU)
409409
infoMenuItem = Gtk.ImageMenuItem(label=_("Information"), image=image)
410410
infoMenuItem.connect("activate", self.open_information)
411-
image = Gtk.Image.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU)
411+
image = Gtk.Image.new_from_icon_name("xapp-dialog-information-symbolic", Gtk.IconSize.MENU)
412412
visibleColumnsMenuItem = Gtk.ImageMenuItem(label=_("Visible Columns"), image=image)
413413
visibleColumnsMenu = Gtk.Menu()
414414
visibleColumnsMenuItem.set_submenu(visibleColumnsMenu)
@@ -472,22 +472,22 @@ def __init__(self):
472472
helpSubmenu = Gtk.Menu()
473473
helpMenu.set_submenu(helpSubmenu)
474474

475-
image = Gtk.Image.new_from_icon_name("security-high-symbolic", Gtk.IconSize.MENU)
475+
image = Gtk.Image.new_from_icon_name("xapp-security-high-symbolic", Gtk.IconSize.MENU)
476476
helpMenuItem = Gtk.ImageMenuItem(label=_("Welcome Screen"), image=image)
477477
helpMenuItem.connect("activate", self.show_welcome_page)
478478
helpSubmenu.append(helpMenuItem)
479479
if (Gtk.check_version(3,20,0) is None):
480-
image = Gtk.Image.new_from_icon_name("preferences-desktop-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU)
480+
image = Gtk.Image.new_from_icon_name("xapp-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU)
481481
shortcutsMenuItem = Gtk.ImageMenuItem(label=_("Keyboard Shortcuts"), image=image)
482482
shortcutsMenuItem.connect("activate", self.open_shortcuts)
483483
helpSubmenu.append(shortcutsMenuItem)
484-
image = Gtk.Image.new_from_icon_name("help-contents-symbolic", Gtk.IconSize.MENU)
484+
image = Gtk.Image.new_from_icon_name("xapp-help-contents-symbolic", Gtk.IconSize.MENU)
485485
helpMenuItem = Gtk.ImageMenuItem(label=_("Contents"), image=image)
486486
helpMenuItem.connect("activate", self.open_help)
487487
key, mod = Gtk.accelerator_parse("F1")
488488
helpMenuItem.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
489489
helpSubmenu.append(helpMenuItem)
490-
image = Gtk.Image.new_from_icon_name("help-about-symbolic", Gtk.IconSize.MENU)
490+
image = Gtk.Image.new_from_icon_name("xapp-help-about-symbolic", Gtk.IconSize.MENU)
491491
aboutMenuItem = Gtk.ImageMenuItem(label=_("About"), image=image)
492492
aboutMenuItem.connect("activate", self.open_about)
493493
helpSubmenu.append(aboutMenuItem)
@@ -604,15 +604,15 @@ def show_infobar(self, title, msg, msg_type, icon, callback, ok_label=None):
604604
infobar.set_message_type(msg_type)
605605
if not icon:
606606
if msg_type == Gtk.MessageType.WARNING:
607-
icon = "dialog-warning-symbolic"
607+
icon = "xapp-dialog-warning-symbolic"
608608
elif msg_type == Gtk.MessageType.ERROR:
609-
icon = "dialog-error-symbolic"
609+
icon = "xapp-dialog-error-symbolic"
610610
elif msg_type == Gtk.MessageType.QUESTION:
611-
icon = "dialog-information-symbolic"
611+
icon = "xapp-dialog-information-symbolic"
612612
if icon:
613613
img = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.LARGE_TOOLBAR)
614614
else:
615-
img = Gtk.Image.new_from_icon_name("dialog-warning-symbolic", Gtk.IconSize.LARGE_TOOLBAR)
615+
img = Gtk.Image.new_from_icon_name("xapp-dialog-warning-symbolic", Gtk.IconSize.LARGE_TOOLBAR)
616616
infobar.get_content_area().pack_start(img, False, False, 0)
617617

618618
info_label = Gtk.Label()
@@ -2088,7 +2088,7 @@ def refresh(self, refresh_cache):
20882088
self.show_infobar(_("Reboot required"),
20892089
_("You have installed updates that require a reboot to take effect. Please reboot your system as soon as possible."),
20902090
Gtk.MessageType.WARNING,
2091-
"system-reboot-symbolic",
2091+
"xapp-reboot-symbolic",
20922092
self._on_infobar_reboot,
20932093
_("Reboot"))
20942094

‎usr/share/linuxmint/mintupdate/main.ui‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<property name="visible">True</property>
3333
<property name="can-focus">False</property>
3434
<property name="label" translatable="yes">Clear</property>
35-
<property name="icon-name">edit-clear-symbolic</property>
35+
<property name="icon-name">xapp-edit-clear-symbolic</property>
3636
</object>
3737
<packing>
3838
<property name="expand">False</property>
@@ -44,7 +44,7 @@
4444
<property name="visible">True</property>
4545
<property name="can-focus">False</property>
4646
<property name="label" translatable="yes">Select All</property>
47-
<property name="icon-name">edit-select-all-symbolic</property>
47+
<property name="icon-name">xapp-edit-select-all-symbolic</property>
4848
</object>
4949
<packing>
5050
<property name="expand">False</property>
@@ -67,7 +67,7 @@
6767
<property name="can-focus">False</property>
6868
<property name="label" translatable="yes">Refresh</property>
6969
<property name="use-underline">True</property>
70-
<property name="icon-name">view-refresh-symbolic</property>
70+
<property name="icon-name">xapp-view-refresh-symbolic</property>
7171
</object>
7272
<packing>
7373
<property name="expand">False</property>
@@ -224,7 +224,7 @@
224224
<object class="GtkImage">
225225
<property name="visible">True</property>
226226
<property name="can-focus">False</property>
227-
<property name="icon-name">security-high-symbolic</property>
227+
<property name="icon-name">xapp-security-high-symbolic</property>
228228
<property name="icon_size">5</property>
229229
</object>
230230
<packing>
@@ -293,7 +293,7 @@
293293
<object class="GtkImage">
294294
<property name="visible">True</property>
295295
<property name="can-focus">False</property>
296-
<property name="icon-name">software-update-available-symbolic</property>
296+
<property name="icon-name">xapp-software-update-available-symbolic</property>
297297
<property name="icon_size">5</property>
298298
</object>
299299
<packing>
@@ -362,7 +362,7 @@
362362
<object class="GtkImage">
363363
<property name="visible">True</property>
364364
<property name="can-focus">False</property>
365-
<property name="icon-name">document-open-recent-symbolic</property>
365+
<property name="icon-name">xapp-document-open-recent-symbolic</property>
366366
<property name="icon_size">5</property>
367367
</object>
368368
<packing>
@@ -524,7 +524,7 @@
524524
<property name="visible">True</property>
525525
<property name="can-focus">False</property>
526526
<property name="pixel-size">96</property>
527-
<property name="icon-name">emblem-important-symbolic</property>
527+
<property name="icon-name">xapp-emblem-important-symbolic</property>
528528
<property name="icon_size">6</property>
529529
</object>
530530
<packing>
@@ -682,7 +682,7 @@
682682
<property name="visible">True</property>
683683
<property name="can-focus">False</property>
684684
<property name="pixel-size">96</property>
685-
<property name="icon-name">object-select-symbolic</property>
685+
<property name="icon-name">xapp-object-select-symbolic</property>
686686
<property name="icon_size">6</property>
687687
</object>
688688
<packing>

‎usr/share/linuxmint/mintupdate/preferences.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<object class="GtkImage" id="image6">
3636
<property name="visible">True</property>
3737
<property name="can-focus">False</property>
38-
<property name="icon-name">list-remove-symbolic</property>
38+
<property name="icon-name">xapp-list-remove-symbolic</property>
3939
<property name="icon_size">1</property>
4040
</object>
4141
<object class="GtkImage" id="image7">
4242
<property name="visible">True</property>
4343
<property name="can-focus">False</property>
44-
<property name="icon-name">list-add-symbolic</property>
44+
<property name="icon-name">xapp-list-add-symbolic</property>
4545
<property name="icon_size">1</property>
4646
</object>
4747
<object class="GtkBox" id="page_blacklist">

0 commit comments

Comments
 (0)