Skip to content

Commit 3b3e794

Browse files
clefebvreclefebvre
committed
Switch to XApp symbolic icons
1 parent 89c1155 commit 3b3e794

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎usr/lib/hypnotix/hypnotix.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -347,29 +347,29 @@ def __init__(self, application):
347347
self.window.add_accel_group(accel_group)
348348
menu = self.builder.get_object("main_menu")
349349
item = Gtk.ImageMenuItem()
350-
item.set_image(Gtk.Image.new_from_icon_name("preferences-desktop-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU))
350+
item.set_image(Gtk.Image.new_from_icon_name("xapp-keyboard-shortcuts-symbolic", Gtk.IconSize.MENU))
351351
item.set_label(_("Keyboard Shortcuts"))
352352
item.connect("activate", self.open_keyboard_shortcuts)
353353
key, mod = Gtk.accelerator_parse("<Control>K")
354354
item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
355355
menu.append(item)
356356
self.info_menu_item = Gtk.ImageMenuItem()
357-
self.info_menu_item.set_image(Gtk.Image.new_from_icon_name("dialog-information-symbolic", Gtk.IconSize.MENU))
357+
self.info_menu_item.set_image(Gtk.Image.new_from_icon_name("xapp-dialog-information-symbolic", Gtk.IconSize.MENU))
358358
self.info_menu_item.set_label(_("Stream Information"))
359359
self.info_menu_item.connect("activate", self.open_info)
360360
key, mod = Gtk.accelerator_parse("F2")
361361
self.info_menu_item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
362362
self.info_menu_item.set_sensitive(False)
363363
menu.append(self.info_menu_item)
364364
item = Gtk.ImageMenuItem()
365-
item.set_image(Gtk.Image.new_from_icon_name("help-about-symbolic", Gtk.IconSize.MENU))
365+
item.set_image(Gtk.Image.new_from_icon_name("xapp-help-about-symbolic", Gtk.IconSize.MENU))
366366
item.set_label(_("About"))
367367
item.connect("activate", self.open_about)
368368
key, mod = Gtk.accelerator_parse("F1")
369369
item.add_accelerator("activate", accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
370370
menu.append(item)
371371
item = Gtk.ImageMenuItem(label=_("Quit"))
372-
image = Gtk.Image.new_from_icon_name("application-exit-symbolic", Gtk.IconSize.MENU)
372+
image = Gtk.Image.new_from_icon_name("xapp-exit-symbolic", Gtk.IconSize.MENU)
373373
item.set_image(image)
374374
item.connect("activate", self.on_menu_quit)
375375
key, mod = Gtk.accelerator_parse("<Control>Q")
@@ -855,7 +855,7 @@ def on_favorite_button_toggled(self, widget):
855855
elif widget.get_active() == False and data in self.favorite_data:
856856
print (f"Removing {name} from favorites")
857857
self.favorite_data.remove(data)
858-
self.favorite_button_image.set_from_icon_name("starred-symbolic" if widget.get_active() else "non-starred-symbolic", Gtk.IconSize.BUTTON)
858+
self.favorite_button_image.set_from_icon_name("xapp-starred-symbolic" if widget.get_active() else "non-xapp-starred-symbolic", Gtk.IconSize.BUTTON)
859859
self.manager.save_favorites(self.favorite_data)
860860

861861
def on_channel_activated(self, box, widget):
@@ -910,11 +910,11 @@ def before_play(self, channel):
910910
data = f"{channel.info}:::{channel.url}"
911911
if data in self.favorite_data:
912912
self.favorite_button.set_active(True)
913-
self.favorite_button_image.set_from_icon_name("starred-symbolic", Gtk.IconSize.BUTTON)
913+
self.favorite_button_image.set_from_icon_name("xapp-starred-symbolic", Gtk.IconSize.BUTTON)
914914
self.favorite_button.set_tooltip_text(_("Remove from favorites"))
915915
else:
916916
self.favorite_button.set_active(False)
917-
self.favorite_button_image.set_from_icon_name("non-starred-symbolic", Gtk.IconSize.BUTTON)
917+
self.favorite_button_image.set_from_icon_name("xapp-non-starred-symbolic", Gtk.IconSize.BUTTON)
918918
self.favorite_button.set_tooltip_text(_("Add to favorites"))
919919
self.page_is_loading = False
920920

@@ -1058,7 +1058,7 @@ def refresh_providers_page(self):
10581058
for provider in self.providers:
10591059
labels_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
10601060
image = Gtk.Image()
1061-
image.set_from_icon_name("tv-symbolic", Gtk.IconSize.BUTTON)
1061+
image.set_from_icon_name("xapp-tv-symbolic", Gtk.IconSize.BUTTON)
10621062
labels_box.pack_start(image, False, False, 0)
10631063
label = Gtk.Label()
10641064
label.set_markup("<b>%s</b>" % provider.name)
@@ -1105,7 +1105,7 @@ def refresh_providers_page(self):
11051105
button.set_relief(Gtk.ReliefStyle.NONE)
11061106
button.connect("clicked", self.on_clear_icon_cache_button_clicked, provider)
11071107
image = Gtk.Image()
1108-
image.set_from_icon_name("edit-clear-symbolic", Gtk.IconSize.BUTTON)
1108+
image.set_from_icon_name("xapp-edit-clear-symbolic", Gtk.IconSize.BUTTON)
11091109
button.set_tooltip_text(_("Clear icon cache"))
11101110
button.add(image)
11111111
box.pack_start(button, False, False, 0)
@@ -1115,7 +1115,7 @@ def refresh_providers_page(self):
11151115
button.set_relief(Gtk.ReliefStyle.NONE)
11161116
button.connect("clicked", self.on_delete_button_clicked, provider)
11171117
image = Gtk.Image()
1118-
image.set_from_icon_name("edit-delete-symbolic", Gtk.IconSize.BUTTON)
1118+
image.set_from_icon_name("xapp-edit-delete-symbolic", Gtk.IconSize.BUTTON)
11191119
button.set_tooltip_text(_("Remove"))
11201120
button.add(image)
11211121
box.pack_start(button, False, False, 0)

‎usr/share/hypnotix/hypnotix.ui‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<object class="GtkImage">
9999
<property name="visible">True</property>
100100
<property name="can-focus">False</property>
101-
<property name="icon-name">list-add-symbolic</property>
101+
<property name="icon-name">xapp-list-add-symbolic</property>
102102
<property name="icon_size">3</property>
103103
</object>
104104
</child>
@@ -120,7 +120,7 @@
120120
<object class="GtkImage">
121121
<property name="visible">True</property>
122122
<property name="can-focus">False</property>
123-
<property name="icon-name">starred-symbolic</property>
123+
<property name="icon-name">xapp-starred-symbolic</property>
124124
<property name="icon_size">3</property>
125125
</object>
126126
</child>
@@ -164,7 +164,7 @@
164164
<object class="GtkImage">
165165
<property name="visible">True</property>
166166
<property name="can-focus">False</property>
167-
<property name="icon-name">tv-symbolic</property>
167+
<property name="icon-name">xapp-tv-symbolic</property>
168168
<property name="icon_size">3</property>
169169
</object>
170170
</child>
@@ -214,7 +214,7 @@
214214
<property name="visible">True</property>
215215
<property name="can-focus">False</property>
216216
<property name="pixel-size">128</property>
217-
<property name="icon-name">tv</property>
217+
<property name="icon-name">xapp-tv-symbolic</property>
218218
<property name="icon_size">3</property>
219219
</object>
220220
<packing>
@@ -263,7 +263,7 @@
263263
<property name="visible">True</property>
264264
<property name="can-focus">False</property>
265265
<property name="pixel-size">128</property>
266-
<property name="icon-name">tv</property>
266+
<property name="icon-name">xapp-tv-symbolic</property>
267267
<property name="icon_size">3</property>
268268
</object>
269269
<packing>
@@ -312,7 +312,7 @@
312312
<property name="visible">True</property>
313313
<property name="can-focus">False</property>
314314
<property name="pixel-size">128</property>
315-
<property name="icon-name">tv</property>
315+
<property name="icon-name">xapp-tv-symbolic</property>
316316
<property name="icon_size">3</property>
317317
</object>
318318
<packing>
@@ -520,7 +520,7 @@
520520
<object class="GtkImage" id="favorite_button_image">
521521
<property name="visible">True</property>
522522
<property name="can-focus">False</property>
523-
<property name="icon-name">starred-symbolic</property>
523+
<property name="icon-name">xapp-starred-symbolic</property>
524524
</object>
525525
</child>
526526
</object>
@@ -831,7 +831,7 @@
831831
</object>
832832
<packing>
833833
<property name="title" translatable="yes">Playback</property>
834-
<property name="icon-name">video-x-generic-symbolic</property>
834+
<property name="icon-name">xapp-video-x-generic-symbolic</property>
835835
</packing>
836836
</child>
837837
<child>
@@ -918,7 +918,7 @@
918918
</object>
919919
<packing>
920920
<property name="title" translatable="yes">Network</property>
921-
<property name="icon-name">preferences-system-network-symbolic</property>
921+
<property name="icon-name">xapp-network-symbolic</property>
922922
<property name="position">1</property>
923923
</packing>
924924
</child>
@@ -1088,7 +1088,7 @@
10881088
</object>
10891089
<packing>
10901090
<property name="title" translatable="yes">Youtube</property>
1091-
<property name="icon-name">tv-symbolic</property>
1091+
<property name="icon-name">xapp-tv-symbolic</property>
10921092
<property name="position">2</property>
10931093
</packing>
10941094
</child>
@@ -1192,7 +1192,7 @@
11921192
<object class="GtkImage">
11931193
<property name="visible">True</property>
11941194
<property name="can-focus">False</property>
1195-
<property name="icon-name">list-add-symbolic</property>
1195+
<property name="icon-name">xapp-list-add-symbolic</property>
11961196
</object>
11971197
<packing>
11981198
<property name="expand">False</property>
@@ -1236,7 +1236,7 @@
12361236
<object class="GtkImage">
12371237
<property name="visible">True</property>
12381238
<property name="can-focus">False</property>
1239-
<property name="icon-name">view-refresh-symbolic</property>
1239+
<property name="icon-name">xapp-view-refresh-symbolic</property>
12401240
</object>
12411241
<packing>
12421242
<property name="expand">False</property>
@@ -1472,7 +1472,7 @@
14721472
<object class="GtkImage">
14731473
<property name="visible">True</property>
14741474
<property name="can-focus">False</property>
1475-
<property name="icon-name">folder-symbolic</property>
1475+
<property name="icon-name">xapp-folder-symbolic</property>
14761476
</object>
14771477
</child>
14781478
</object>
@@ -2049,7 +2049,7 @@
20492049
<object class="GtkImage">
20502050
<property name="visible">True</property>
20512051
<property name="can-focus">False</property>
2052-
<property name="icon-name">view-reveal-symbolic</property>
2052+
<property name="icon-name">xapp-view-reveal-symbolic</property>
20532053
</object>
20542054
</child>
20552055
</object>
@@ -2070,7 +2070,7 @@
20702070
<object class="GtkImage">
20712071
<property name="visible">True</property>
20722072
<property name="can-focus">False</property>
2073-
<property name="icon-name">media-playback-pause-symbolic</property>
2073+
<property name="icon-name">xapp-media-playback-pause-symbolic</property>
20742074
</object>
20752075
</child>
20762076
</object>
@@ -2091,7 +2091,7 @@
20912091
<object class="GtkImage">
20922092
<property name="visible">True</property>
20932093
<property name="can-focus">False</property>
2094-
<property name="icon-name">media-playback-stop-symbolic</property>
2094+
<property name="icon-name">xapp-media-playback-stop-symbolic</property>
20952095
</object>
20962096
</child>
20972097
</object>
@@ -2144,7 +2144,7 @@
21442144
<object class="GtkImage">
21452145
<property name="visible">True</property>
21462146
<property name="can-focus">False</property>
2147-
<property name="icon-name">go-previous-symbolic</property>
2147+
<property name="icon-name">xapp-go-previous-symbolic</property>
21482148
</object>
21492149
</child>
21502150
</object>
@@ -2168,7 +2168,7 @@
21682168
<object class="GtkImage">
21692169
<property name="visible">True</property>
21702170
<property name="can-focus">False</property>
2171-
<property name="icon-name">system-search-symbolic</property>
2171+
<property name="icon-name">xapp-search-symbolic</property>
21722172
</object>
21732173
</child>
21742174
</object>
@@ -2196,7 +2196,7 @@
21962196
<object class="GtkImage">
21972197
<property name="visible">True</property>
21982198
<property name="can-focus">False</property>
2199-
<property name="icon-name">view-fullscreen-symbolic</property>
2199+
<property name="icon-name">xapp-view-fullscreen-symbolic</property>
22002200
<property name="icon_size">2</property>
22012201
</object>
22022202
</child>
@@ -2218,7 +2218,7 @@
22182218
<object class="GtkImage">
22192219
<property name="visible">True</property>
22202220
<property name="can-focus">False</property>
2221-
<property name="icon-name">open-menu-symbolic</property>
2221+
<property name="icon-name">xapp-open-menu-symbolic</property>
22222222
</object>
22232223
</child>
22242224
</object>

0 commit comments

Comments
 (0)