diff options
Diffstat (limited to 'src/ui/root.c')
-rw-r--r-- | src/ui/root.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/ui/root.c b/src/ui/root.c index 0b55d250..eae8e4bb 100644 --- a/src/ui/root.c +++ b/src/ui/root.c | |||
@@ -57,28 +57,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ | |||
57 | static const iMenuItem navMenuItems_[] = { | 57 | static const iMenuItem navMenuItems_[] = { |
58 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, | 58 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, |
59 | { "${menu.openlocation}", SDLK_l, KMOD_PRIMARY, "navigate.focus" }, | 59 | { "${menu.openlocation}", SDLK_l, KMOD_PRIMARY, "navigate.focus" }, |
60 | { "---", 0, 0, NULL }, | 60 | { "---" }, |
61 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" }, | 61 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" }, |
62 | { "${menu.page.copysource}", SDLK_c, KMOD_PRIMARY, "copy" }, | 62 | { "${menu.page.copysource}", SDLK_c, KMOD_PRIMARY, "copy" }, |
63 | { "---", 0, 0, NULL }, | 63 | { "---" }, |
64 | { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, | 64 | { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, |
65 | { rightHalf_Icon " ${menu.sidebar.right}", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" }, | 65 | { rightHalf_Icon " ${menu.sidebar.right}", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" }, |
66 | { "${menu.view.split}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" }, | 66 | { "${menu.view.split}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" }, |
67 | { "${menu.zoom.in}", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" }, | 67 | { "${menu.zoom.in}", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" }, |
68 | { "${menu.zoom.out}", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, | 68 | { "${menu.zoom.out}", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" }, |
69 | { "${menu.zoom.reset}", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, | 69 | { "${menu.zoom.reset}", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" }, |
70 | { "---", 0, 0, NULL }, | 70 | { "---" }, |
71 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, | 71 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, |
72 | { "${menu.bookmarks.bytag}", 0, 0, "!open url:about:bookmarks?tags" }, | 72 | { "${menu.bookmarks.bytag}", 0, 0, "!open url:about:bookmarks?tags" }, |
73 | { "${menu.bookmarks.bytime}", 0, 0, "!open url:about:bookmarks?created" }, | 73 | { "${menu.bookmarks.bytime}", 0, 0, "!open url:about:bookmarks?created" }, |
74 | { "---", 0, 0, NULL }, | 74 | { "---" }, |
75 | { "${menu.downloads}", 0, 0, "downloads.open" }, | 75 | { "${menu.downloads}", 0, 0, "downloads.open" }, |
76 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, | 76 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, |
77 | { "---", 0, 0, NULL }, | 77 | { "---" }, |
78 | { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, | 78 | { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, |
79 | { "${menu.help}", SDLK_F1, 0, "!open url:about:help" }, | 79 | { "${menu.help}", SDLK_F1, 0, "!open url:about:help" }, |
80 | { "${menu.releasenotes}", 0, 0, "!open url:about:version" }, | 80 | { "${menu.releasenotes}", 0, 0, "!open url:about:version" }, |
81 | { "---", 0, 0, NULL }, | 81 | { "---" }, |
82 | { "${menu.quit}", 'q', KMOD_PRIMARY, "quit" } | 82 | { "${menu.quit}", 'q', KMOD_PRIMARY, "quit" } |
83 | }; | 83 | }; |
84 | #endif | 84 | #endif |
@@ -89,17 +89,17 @@ static const iMenuItem tabletNavMenuItems_[] = { | |||
89 | { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" }, | 89 | { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" }, |
90 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, | 90 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, |
91 | { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" }, | 91 | { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" }, |
92 | { "---", 0, 0, NULL }, | 92 | { "---" }, |
93 | { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" }, | 93 | { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" }, |
94 | { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, | 94 | { leftHalf_Icon " ${menu.sidebar.left}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, |
95 | { rightHalf_Icon " ${menu.sidebar.right}", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" }, | 95 | { rightHalf_Icon " ${menu.sidebar.right}", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" }, |
96 | { "${menu.view.split}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" }, | 96 | { "${menu.view.split}", SDLK_j, KMOD_PRIMARY, "splitmenu.open" }, |
97 | { "---", 0, 0, NULL }, | 97 | { "---" }, |
98 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, | 98 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, |
99 | { "${menu.bookmarks.bytag}", 0, 0, "!open url:about:bookmarks?tags" }, | 99 | { "${menu.bookmarks.bytag}", 0, 0, "!open url:about:bookmarks?tags" }, |
100 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, | 100 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, |
101 | { "${menu.downloads}", 0, 0, "downloads.open" }, | 101 | { "${menu.downloads}", 0, 0, "downloads.open" }, |
102 | { "---", 0, 0, NULL }, | 102 | { "---" }, |
103 | { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, | 103 | { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, |
104 | { "${menu.help}", SDLK_F1, 0, "!open url:about:help" }, | 104 | { "${menu.help}", SDLK_F1, 0, "!open url:about:help" }, |
105 | { "${menu.releasenotes}", 0, 0, "!open url:about:version" }, | 105 | { "${menu.releasenotes}", 0, 0, "!open url:about:version" }, |
@@ -110,14 +110,14 @@ static const iMenuItem phoneNavMenuItems_[] = { | |||
110 | { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" }, | 110 | { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" }, |
111 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, | 111 | { add_Icon " ${menu.newtab}", 't', KMOD_PRIMARY, "tabs.new" }, |
112 | { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" }, | 112 | { close_Icon " ${menu.closetab}", 'w', KMOD_PRIMARY, "tabs.close" }, |
113 | { "---", 0, 0, NULL }, | 113 | { "---" }, |
114 | { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" }, | 114 | { magnifyingGlass_Icon " ${menu.find}", 0, 0, "focus.set id:find.input" }, |
115 | { leftHalf_Icon " ${menu.sidebar}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, | 115 | { leftHalf_Icon " ${menu.sidebar}", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" }, |
116 | { "---", 0, 0, NULL }, | 116 | { "---" }, |
117 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, | 117 | { book_Icon " ${menu.bookmarks.list}", 0, 0, "!open url:about:bookmarks" }, |
118 | { "${menu.downloads}", 0, 0, "downloads.open" }, | 118 | { "${menu.downloads}", 0, 0, "downloads.open" }, |
119 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, | 119 | { "${menu.feeds.entrylist}", 0, 0, "!open url:about:feeds" }, |
120 | { "---", 0, 0, NULL }, | 120 | { "---" }, |
121 | { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, | 121 | { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" }, |
122 | }; | 122 | }; |
123 | #endif /* Mobile */ | 123 | #endif /* Mobile */ |
@@ -125,24 +125,24 @@ static const iMenuItem phoneNavMenuItems_[] = { | |||
125 | #if defined (iPlatformMobile) | 125 | #if defined (iPlatformMobile) |
126 | static const iMenuItem identityButtonMenuItems_[] = { | 126 | static const iMenuItem identityButtonMenuItems_[] = { |
127 | { "${menu.identity.notactive}", 0, 0, "ident.showactive" }, | 127 | { "${menu.identity.notactive}", 0, 0, "ident.showactive" }, |
128 | { "---", 0, 0, NULL }, | 128 | { "---" }, |
129 | { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" }, | 129 | { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" }, |
130 | { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, | 130 | { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, |
131 | { "---", 0, 0, NULL }, | 131 | { "---" }, |
132 | { person_Icon " ${menu.show.identities}", 0, 0, "toolbar.showident" }, | 132 | { person_Icon " ${menu.show.identities}", 0, 0, "toolbar.showident" }, |
133 | }; | 133 | }; |
134 | #else /* desktop */ | 134 | #else /* desktop */ |
135 | static const iMenuItem identityButtonMenuItems_[] = { | 135 | static const iMenuItem identityButtonMenuItems_[] = { |
136 | { "${menu.identity.notactive}", 0, 0, "ident.showactive" }, | 136 | { "${menu.identity.notactive}", 0, 0, "ident.showactive" }, |
137 | { "---", 0, 0, NULL }, | 137 | { "---" }, |
138 | # if !defined (iPlatformAppleDesktop) | 138 | # if !defined (iPlatformAppleDesktop) |
139 | { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" }, | 139 | { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" }, |
140 | { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, | 140 | { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" }, |
141 | { "---", 0, 0, NULL }, | 141 | { "---" }, |
142 | { person_Icon " ${menu.show.identities}", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" }, | 142 | { person_Icon " ${menu.show.identities}", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" }, |
143 | # else | 143 | # else |
144 | { add_Icon " ${menu.identity.new}", 0, 0, "ident.new" }, | 144 | { add_Icon " ${menu.identity.new}", 0, 0, "ident.new" }, |
145 | { "---", 0, 0, NULL }, | 145 | { "---" }, |
146 | { person_Icon " ${menu.show.identities}", 0, 0, "sidebar.mode arg:3 show:1" }, | 146 | { person_Icon " ${menu.show.identities}", 0, 0, "sidebar.mode arg:3 show:1" }, |
147 | # endif | 147 | # endif |
148 | }; | 148 | }; |
@@ -1158,20 +1158,20 @@ void createUserInterface_Root(iRoot *d) { | |||
1158 | { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" }, | 1158 | { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" }, |
1159 | { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" }, | 1159 | { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" }, |
1160 | { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" }, | 1160 | { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" }, |
1161 | { "---", 0, 0, NULL }, | 1161 | { "---" }, |
1162 | { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, | 1162 | { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, |
1163 | { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" }, | 1163 | { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" }, |
1164 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, | 1164 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, |
1165 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, | 1165 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, |
1166 | #if defined (iPlatformMobile) | 1166 | #if defined (iPlatformMobile) |
1167 | { "---", 0, 0, NULL }, | 1167 | { "---" }, |
1168 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, | 1168 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, |
1169 | { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" }, | 1169 | { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" }, |
1170 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } }, | 1170 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } }, |
1171 | 11); | 1171 | 11); |
1172 | #else | 1172 | #else |
1173 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, | 1173 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, |
1174 | { "---", 0, 0, NULL }, | 1174 | { "---" }, |
1175 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, | 1175 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, |
1176 | { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" }, | 1176 | { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" }, |
1177 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } }, | 1177 | { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } }, |
@@ -1355,7 +1355,7 @@ void createUserInterface_Root(iRoot *d) { | |||
1355 | (iMenuItem[]){ | 1355 | (iMenuItem[]){ |
1356 | { close_Icon " ${menu.closetab}", 0, 0, "tabs.close" }, | 1356 | { close_Icon " ${menu.closetab}", 0, 0, "tabs.close" }, |
1357 | { copy_Icon " ${menu.duptab}", 0, 0, "tabs.new duplicate:1" }, | 1357 | { copy_Icon " ${menu.duptab}", 0, 0, "tabs.new duplicate:1" }, |
1358 | { "---", 0, 0, NULL }, | 1358 | { "---" }, |
1359 | { "${menu.closetab.other}", 0, 0, "tabs.close toleft:1 toright:1" }, | 1359 | { "${menu.closetab.other}", 0, 0, "tabs.close toleft:1 toright:1" }, |
1360 | { barLeftArrow_Icon " ${menu.closetab.left}", 0, 0, "tabs.close toleft:1" }, | 1360 | { barLeftArrow_Icon " ${menu.closetab.left}", 0, 0, "tabs.close toleft:1" }, |
1361 | { barRightArrow_Icon " ${menu.closetab.right}", 0, 0, "tabs.close toright:1" }, | 1361 | { barRightArrow_Icon " ${menu.closetab.right}", 0, 0, "tabs.close toright:1" }, |
@@ -1372,18 +1372,18 @@ void createUserInterface_Root(iRoot *d) { | |||
1372 | (iMenuItem[]){ | 1372 | (iMenuItem[]){ |
1373 | { scissor_Icon " ${menu.cut}", 0, 0, "input.copy cut:1" }, | 1373 | { scissor_Icon " ${menu.cut}", 0, 0, "input.copy cut:1" }, |
1374 | { clipCopy_Icon " ${menu.copy}", 0, 0, "input.copy" }, | 1374 | { clipCopy_Icon " ${menu.copy}", 0, 0, "input.copy" }, |
1375 | { "---", 0, 0, NULL }, | 1375 | { "---" }, |
1376 | { clipboard_Icon " ${menu.paste}", 0, 0, "input.paste" }, | 1376 | { clipboard_Icon " ${menu.paste}", 0, 0, "input.paste" }, |
1377 | }, | 1377 | }, |
1378 | 4); | 1378 | 4); |
1379 | iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){ | 1379 | iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){ |
1380 | { "${menu.split.merge}", '1', 0, "ui.split arg:0" }, | 1380 | { "${menu.split.merge}", '1', 0, "ui.split arg:0" }, |
1381 | { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" }, | 1381 | { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" }, |
1382 | { "---", 0, 0, NULL }, | 1382 | { "---" }, |
1383 | { "${menu.split.horizontal}", '3', 0, "ui.split arg:3 axis:0" }, | 1383 | { "${menu.split.horizontal}", '3', 0, "ui.split arg:3 axis:0" }, |
1384 | { "${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" }, | 1384 | { "${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" }, |
1385 | { "${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" }, | 1385 | { "${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" }, |
1386 | { "---", 0, 0, NULL }, | 1386 | { "---" }, |
1387 | { "${menu.split.vertical}", '2', 0, "ui.split arg:3 axis:1" }, | 1387 | { "${menu.split.vertical}", '2', 0, "ui.split arg:3 axis:1" }, |
1388 | { "${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" }, | 1388 | { "${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" }, |
1389 | { "${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" }, | 1389 | { "${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" }, |