summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-03-07 08:30:37 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-03-07 08:30:37 +0200
commit237ea3e1a66b792c2258eebd39e7771002c5584b (patch)
tree4c9744b6bdbae597a6d860880c7b46ecdb4dbf5a /src
parentcc957625c6b718ce6c934665b5944880b933827f (diff)
Added more menu icons
Diffstat (limited to 'src')
-rw-r--r--src/defs.h1
-rw-r--r--src/ui/window.c34
2 files changed, 18 insertions, 17 deletions
diff --git a/src/defs.h b/src/defs.h
index e34a2ce3..c309950d 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -68,3 +68,4 @@ enum iFileVersion {
68#define page_Icon "\U00010117" // "\U0001d363" // "\U0001f5b9" 68#define page_Icon "\U00010117" // "\U0001d363" // "\U0001f5b9"
69#define circle_Icon "\u25cf" 69#define circle_Icon "\u25cf"
70#define circleWhite_Icon "\u25cb" 70#define circleWhite_Icon "\u25cb"
71#define gear_Icon "\u2699"
diff --git a/src/ui/window.c b/src/ui/window.c
index b6465727..19290ee5 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -166,7 +166,7 @@ static const iMenuItem navMenuItems_[] = {
166 { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" }, 166 { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
167 { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" }, 167 { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
168 { "---", 0, 0, NULL }, 168 { "---", 0, 0, NULL },
169 { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" }, 169 { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
170 { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" }, 170 { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
171 { "---", 0, 0, NULL }, 171 { "---", 0, 0, NULL },
172 { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, 172 { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
@@ -175,13 +175,13 @@ static const iMenuItem navMenuItems_[] = {
175 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, 175 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
176 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, 176 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
177 { "---", 0, 0, NULL }, 177 { "---", 0, 0, NULL },
178 { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" }, 178 { book_Icon " List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
179 { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" }, 179 { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
180 { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" }, 180 { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" },
181 { "---", 0, 0, NULL }, 181 { "---", 0, 0, NULL },
182 { "Show Feed Entries", 0, 0, "!open url:about:feeds" }, 182 { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
183 { "---", 0, 0, NULL }, 183 { "---", 0, 0, NULL },
184 { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, 184 { gear_Icon " Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
185 { "Help", SDLK_F1, 0, "!open url:about:help" }, 185 { "Help", SDLK_F1, 0, "!open url:about:help" },
186 { "Release Notes", 0, 0, "!open url:about:version" }, 186 { "Release Notes", 0, 0, "!open url:about:version" },
187 { "---", 0, 0, NULL }, 187 { "---", 0, 0, NULL },
@@ -190,10 +190,10 @@ static const iMenuItem navMenuItems_[] = {
190#else 190#else
191/* Tablet menu. */ 191/* Tablet menu. */
192static const iMenuItem tabletNavMenuItems_[] = { 192static const iMenuItem tabletNavMenuItems_[] = {
193 { "New Tab", 't', KMOD_PRIMARY, "tabs.new" }, 193 { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
194 { "Close Tab", 'w', KMOD_PRIMARY, "tabs.close" }, 194 { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
195 { "---", 0, 0, NULL }, 195 { "---", 0, 0, NULL },
196 { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" }, 196 { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
197 { "---", 0, 0, NULL }, 197 { "---", 0, 0, NULL },
198 { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, 198 { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
199 { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" }, 199 { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
@@ -201,30 +201,30 @@ static const iMenuItem tabletNavMenuItems_[] = {
201 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, 201 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
202 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, 202 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
203 { "---", 0, 0, NULL }, 203 { "---", 0, 0, NULL },
204 { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" }, 204 { book_Icon " List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
205 { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" }, 205 { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
206 { "List Feed Entries", 0, 0, "!open url:about:feeds" }, 206 { "List Feed Entries", 0, 0, "!open url:about:feeds" },
207 { "---", 0, 0, NULL }, 207 { "---", 0, 0, NULL },
208 { "Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, 208 { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
209 { "Help", SDLK_F1, 0, "!open url:about:help" }, 209 { "Help", SDLK_F1, 0, "!open url:about:help" },
210 { "Release Notes", 0, 0, "!open url:about:version" }, 210 { "Release Notes", 0, 0, "!open url:about:version" },
211}; 211};
212 212
213/* Phone menu. */ 213/* Phone menu. */
214static const iMenuItem phoneNavMenuItems_[] = { 214static const iMenuItem phoneNavMenuItems_[] = {
215 { "New Tab", 't', KMOD_PRIMARY, "tabs.new" }, 215 { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
216 { "Close Tab", 'w', KMOD_PRIMARY, "tabs.close" }, 216 { close_Icon " Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
217 { "---", 0, 0, NULL }, 217 { "---", 0, 0, NULL },
218 { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" }, 218 { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
219 { "---", 0, 0, NULL }, 219 { "---", 0, 0, NULL },
220 { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" }, 220 { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
221 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, 221 { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
222 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, 222 { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
223 { "---", 0, 0, NULL }, 223 { "---", 0, 0, NULL },
224 { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" }, 224 { book_Icon " List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
225 { "List Feed Entries", 0, 0, "!open url:about:feeds" }, 225 { "List Feed Entries", 0, 0, "!open url:about:feeds" },
226 { "---", 0, 0, NULL }, 226 { "---", 0, 0, NULL },
227 { "Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, 227 { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
228 { "Help", SDLK_F1, 0, "!open url:about:help" }, 228 { "Help", SDLK_F1, 0, "!open url:about:help" },
229 { "Release Notes", 0, 0, "!open url:about:version" }, 229 { "Release Notes", 0, 0, "!open url:about:version" },
230}; 230};
@@ -300,20 +300,20 @@ static const iMenuItem helpMenuItems_[] = {
300static const iMenuItem identityButtonMenuItems_[] = { 300static const iMenuItem identityButtonMenuItems_[] = {
301 { "No Active Identity", 0, 0, "ident.showactive" }, 301 { "No Active Identity", 0, 0, "ident.showactive" },
302 { "---", 0, 0, NULL }, 302 { "---", 0, 0, NULL },
303 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" }, 303 { add_Icon " New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
304 { "Import...", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, 304 { "Import...", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
305 { "---", 0, 0, NULL }, 305 { "---", 0, 0, NULL },
306 { "Show Identities", 0, 0, "toolbar.showident" }, 306 { person_Icon " Show Identities", 0, 0, "toolbar.showident" },
307}; 307};
308#else /* desktop */ 308#else /* desktop */
309static const iMenuItem identityButtonMenuItems_[] = { 309static const iMenuItem identityButtonMenuItems_[] = {
310 { "No Active Identity", 0, 0, "ident.showactive" }, 310 { "No Active Identity", 0, 0, "ident.showactive" },
311 { "---", 0, 0, NULL }, 311 { "---", 0, 0, NULL },
312# if !defined (iHaveNativeMenus) 312# if !defined (iHaveNativeMenus)
313 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" }, 313 { add_Icon " New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
314 { "Import...", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, 314 { "Import...", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
315 { "---", 0, 0, NULL }, 315 { "---", 0, 0, NULL },
316 { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" }, 316 { person_Icon " Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
317# else 317# else
318 { add_Icon " New Identity...", 0, 0, "ident.new" }, 318 { add_Icon " New Identity...", 0, 0, "ident.new" },
319 { "---", 0, 0, NULL }, 319 { "---", 0, 0, NULL },