Skip to content

Commit a2b3e8e

Browse files
johanmalmjohanmalm
committed
Support directory icons
1 parent ee3d8d0 commit a2b3e8e

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ print_menu(GList *dirs, GList *apps)
197197
if (!submenu->len) {
198198
continue;
199199
}
200-
printf(" <menu id=\"%s\" label=\"%s\">\n",
201-
dir->name, dir->name_localized ? : dir->name);
200+
printf(" <menu id=\"%s\" label=\"%s\" icon=\"%s\">\n",
201+
dir->name, dir->name_localized ? : dir->name, dir->icon);
202202
printf("%s", submenu->str);
203203
printf(" </menu> <!-- %s -->\n", dir->name);
204204
}

‎t/t1000/menu.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<openbox_menu>
33
<menu id="root-menu" label="root-menu">
4-
<menu id="Accessories" label="Accessories">
4+
<menu id="Accessories" label="Accessories" icon="applications-accessories">
55
<item label="File Manager PCManFM" icon="system-file-manager">
66
<action name="Execute"><command>pcmanfm</command></action>
77
</item>
@@ -30,7 +30,7 @@
3030
<action name="Execute"><command>vim</command></action>
3131
</item>
3232
</menu> <!-- Accessories -->
33-
<menu id="Development" label="Development">
33+
<menu id="Development" label="Development" icon="applications-development">
3434
<item label="CMake" icon="CMakeSetup">
3535
<action name="Execute"><command>cmake-gui</command></action>
3636
</item>
@@ -53,7 +53,7 @@
5353
<action name="Execute"><command>gtk4-widget-factory</command></action>
5454
</item>
5555
</menu> <!-- Development -->
56-
<menu id="Graphics" label="Graphics">
56+
<menu id="Graphics" label="Graphics" icon="applications-graphics">
5757
<item label="Document Viewer" icon="org.gnome.Evince">
5858
<action name="Execute"><command>evince</command></action>
5959
</item>
@@ -76,7 +76,7 @@
7676
<action name="Execute"><command>mtpaint</command></action>
7777
</item>
7878
</menu> <!-- Graphics -->
79-
<menu id="Internet" label="Internet">
79+
<menu id="Internet" label="Internet" icon="applications-internet">
8080
<item label="Avahi SSH Server Browser" icon="network-wired">
8181
<action name="Execute"><command>/usr/bin/bssh</command></action>
8282
</item>
@@ -102,7 +102,7 @@
102102
<action name="Execute"><command>/usr/bin/vivaldi-stable</command></action>
103103
</item>
104104
</menu> <!-- Internet -->
105-
<menu id="Multimedia" label="Multimedia">
105+
<menu id="Multimedia" label="Multimedia" icon="applications-multimedia">
106106
<item label="Audacious" icon="audacious">
107107
<action name="Execute"><command>audacious</command></action>
108108
</item>
@@ -119,15 +119,15 @@
119119
<action name="Execute"><command>/usr/bin/vlc --started-from-file</command></action>
120120
</item>
121121
</menu> <!-- Multimedia -->
122-
<menu id="Office" label="Office">
122+
<menu id="Office" label="Office" icon="applications-office">
123123
<item label="Document Viewer" icon="org.gnome.Evince">
124124
<action name="Execute"><command>evince</command></action>
125125
</item>
126126
<item label="Gnumeric" icon="gnumeric">
127127
<action name="Execute"><command>gnumeric</command></action>
128128
</item>
129129
</menu> <!-- Office -->
130-
<menu id="Settings" label="Settings">
130+
<menu id="Settings" label="Settings" icon="preferences-desktop">
131131
<item label="Desktop Preferences" icon="user-desktop">
132132
<action name="Execute"><command>pcmanfm --desktop-pref</command></action>
133133
</item>
@@ -147,7 +147,7 @@
147147
<action name="Execute"><command>wdisplays</command></action>
148148
</item>
149149
</menu> <!-- Settings -->
150-
<menu id="System" label="System">
150+
<menu id="System" label="System" icon="applications-system">
151151
<item label="Alacritty" icon="Alacritty">
152152
<action name="Execute"><command>alacritty</command></action>
153153
</item>

‎t/t1001/menu-sv.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<openbox_menu>
33
<menu id="root-menu" label="root-menu">
4-
<menu id="Graphics" label="Grafik">
4+
<menu id="Graphics" label="Grafik" icon="applications-graphics">
55
<item label="Bildvisare" icon="gpicview">
66
<action name="Execute"><command>gpicview</command></action>
77
</item>
@@ -24,7 +24,7 @@
2424
<action name="Execute"><command>mtpaint</command></action>
2525
</item>
2626
</menu> <!-- Graphics -->
27-
<menu id="Settings" label="Inställningar">
27+
<menu id="Settings" label="Inställningar" icon="preferences-desktop">
2828
<item label="nitrogen" icon="nitrogen">
2929
<action name="Execute"><command>nitrogen</command></action>
3030
</item>
@@ -44,7 +44,7 @@
4444
<action name="Execute"><command>wdisplays</command></action>
4545
</item>
4646
</menu> <!-- Settings -->
47-
<menu id="Internet" label="Internet">
47+
<menu id="Internet" label="Internet" icon="applications-internet">
4848
<item label="Avahi SSH-serverbläddrare" icon="network-wired">
4949
<action name="Execute"><command>/usr/bin/bssh</command></action>
5050
</item>
@@ -70,15 +70,15 @@
7070
<action name="Execute"><command>/usr/bin/vivaldi-stable</command></action>
7171
</item>
7272
</menu> <!-- Internet -->
73-
<menu id="Office" label="Kontorsprogram">
73+
<menu id="Office" label="Kontorsprogram" icon="applications-office">
7474
<item label="Dokumentvisare" icon="org.gnome.Evince">
7575
<action name="Execute"><command>evince</command></action>
7676
</item>
7777
<item label="Gnumeric" icon="gnumeric">
7878
<action name="Execute"><command>gnumeric</command></action>
7979
</item>
8080
</menu> <!-- Office -->
81-
<menu id="Multimedia" label="Multimedia">
81+
<menu id="Multimedia" label="Multimedia" icon="applications-multimedia">
8282
<item label="Audacious" icon="audacious">
8383
<action name="Execute"><command>audacious</command></action>
8484
</item>
@@ -95,7 +95,7 @@
9595
<action name="Execute"><command>/usr/bin/vlc --started-from-file</command></action>
9696
</item>
9797
</menu> <!-- Multimedia -->
98-
<menu id="System" label="System">
98+
<menu id="System" label="System" icon="applications-system">
9999
<item label="Alacritty" icon="Alacritty">
100100
<action name="Execute"><command>alacritty</command></action>
101101
</item>
@@ -148,7 +148,7 @@
148148
<action name="Execute"><command>xterm</command></action>
149149
</item>
150150
</menu> <!-- System -->
151-
<menu id="Accessories" label="Tillbehör">
151+
<menu id="Accessories" label="Tillbehör" icon="applications-accessories">
152152
<item label="Bildvisare" icon="gpicview">
153153
<action name="Execute"><command>gpicview</command></action>
154154
</item>
@@ -177,7 +177,7 @@
177177
<action name="Execute"><command>vim</command></action>
178178
</item>
179179
</menu> <!-- Accessories -->
180-
<menu id="Development" label="Utveckling">
180+
<menu id="Development" label="Utveckling" icon="applications-development">
181181
<item label="CMake" icon="CMakeSetup">
182182
<action name="Execute"><command>cmake-gui</command></action>
183183
</item>

0 commit comments

Comments
 (0)