summaryrefslogtreecommitdiff
path: root/src/ui/window.c
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-08-26 07:42:09 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-08-26 07:42:09 +0300
commita22e4ecff2260f157bfe9861043eac546be5153e (patch)
tree1dfb0d3491b7cc6fd8521b11ec1c18d59cb5710f /src/ui/window.c
parent9de147d199dc1f4f9fb715de5c544b164f4ae5ea (diff)
Window: Removed redundant menu item
Need a better solution to parallel triggering of commands from native menus and widgets.
Diffstat (limited to 'src/ui/window.c')
-rw-r--r--src/ui/window.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/ui/window.c b/src/ui/window.c
index ef8aea71..b5961f77 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -123,6 +123,10 @@ static const iMenuItem editMenuItems[] = {
123 { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, 123 { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
124}; 124};
125 125
126static const iMenuItem identityMenuItems[] = {
127 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
128};
129
126static const iMenuItem viewMenuItems[] = { 130static const iMenuItem viewMenuItems[] = {
127 { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 show:1" }, 131 { "Show Bookmarks", '1', KMOD_PRIMARY, "sidebar.mode arg:0 show:1" },
128 { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 show:1" }, 132 { "Show History", '2', KMOD_PRIMARY, "sidebar.mode arg:1 show:1" },
@@ -145,12 +149,12 @@ static const iMenuItem helpMenuItems[] = {
145}; 149};
146#endif 150#endif
147 151
148static const iMenuItem identityMenuItems[] = { 152static const iMenuItem identityButtonMenuItems[] = {
149 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
150#if !defined (iHaveNativeMenus) 153#if !defined (iHaveNativeMenus)
154 { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
151 { "---", 0, 0, NULL }, 155 { "---", 0, 0, NULL },
152 { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 show:1" },
153#endif 156#endif
157 { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 show:1" },
154}; 158};
155 159
156static const char *reloadCStr_ = "\U0001f503"; 160static const char *reloadCStr_ = "\U0001f503";
@@ -304,10 +308,9 @@ static void setupUserInterface_Window(iWindow *d) {
304 addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f850", 0, 0, "navigate.back"))); 308 addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f850", 0, 0, "navigate.back")));
305 addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f852", 0, 0, "navigate.forward"))); 309 addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f852", 0, 0, "navigate.forward")));
306 iLabelWidget *idMenu = 310 iLabelWidget *idMenu =
307 makeMenuButton_LabelWidget("\U0001f464", identityMenuItems, iElemCount(identityMenuItems)); 311 makeMenuButton_LabelWidget("\U0001f464", identityButtonMenuItems, iElemCount(identityButtonMenuItems));
308 setAlignVisually_LabelWidget(idMenu, iTrue); 312 setAlignVisually_LabelWidget(idMenu, iTrue);
309 addChild_Widget(navBar, iClob(idMenu)); 313 addChild_Widget(navBar, iClob(idMenu));
310 //addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f464", 0, 0, "cert.client")));
311 iLabelWidget *lock = 314 iLabelWidget *lock =
312 addChildFlags_Widget(navBar, 315 addChildFlags_Widget(navBar,
313 iClob(newIcon_LabelWidget("\U0001f513", 0, 0, "server.showcert")), 316 iClob(newIcon_LabelWidget("\U0001f513", 0, 0, "server.showcert")),