summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-09-08 07:48:51 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-09-08 07:48:51 +0300
commit92efe35c6b1ef4bea6aa1e43faf42610c1597340 (patch)
treed9c708a0b0e30a2a1cf3196b41d8613dee96d341
parent0307e115093af01c4d8ef6142a804f29200379d0 (diff)
Cleanup
-rw-r--r--src/ui/util.c4
-rw-r--r--src/ui/window.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ui/util.c b/src/ui/util.c
index 7ca065b1..6969599b 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -765,10 +765,10 @@ iWidget *makePreferences_Widget(void) {
765 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(8))), "prefs.uiscale"); 765 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(8))), "prefs.uiscale");
766 addChild_Widget(headings, iClob(makeHeading_Widget(uiHeading_ColorEscape "Proxies"))); 766 addChild_Widget(headings, iClob(makeHeading_Widget(uiHeading_ColorEscape "Proxies")));
767 addChild_Widget(values, iClob(makeHeading_Widget(""))); 767 addChild_Widget(values, iClob(makeHeading_Widget("")));
768 addChild_Widget(headings, iClob(makeHeading_Widget("HTTP proxy:")));
769 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.http");
770 addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:"))); 768 addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:")));
771 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.gopher"); 769 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.gopher");
770 addChild_Widget(headings, iClob(makeHeading_Widget("HTTP proxy:")));
771 setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.http");
772 arrange_Widget(dlg); 772 arrange_Widget(dlg);
773 /* Text input widths. */ { 773 /* Text input widths. */ {
774 const int inputWidth = width_Rect(page->rect) - width_Rect(headings->rect); 774 const int inputWidth = width_Rect(page->rect) - width_Rect(headings->rect);
diff --git a/src/ui/window.c b/src/ui/window.c
index 310e828a..c49e9d4e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -121,6 +121,8 @@ static const iMenuItem editMenuItems[] = {
121 { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" }, 121 { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
122 { "Copy Link to Page", SDLK_c, KMOD_PRIMARY | KMOD_SHIFT, "document.copylink" }, 122 { "Copy Link to Page", SDLK_c, KMOD_PRIMARY | KMOD_SHIFT, "document.copylink" },
123 { "---", 0, 0, NULL }, 123 { "---", 0, 0, NULL },
124 { "Find", SDLK_f, KMOD_PRIMARY, "focus.set id:find.input" },
125 { "---", 0, 0, NULL },
124 { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" }, 126 { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
125}; 127};
126 128
@@ -434,7 +436,9 @@ static void setupUserInterface_Window(iWindow *d) {
434 addAction_Widget(d->root, SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.prev"); 436 addAction_Widget(d->root, SDLK_LEFTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.prev");
435 addAction_Widget(d->root, SDLK_RIGHTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.next"); 437 addAction_Widget(d->root, SDLK_RIGHTBRACKET, KMOD_SHIFT | KMOD_PRIMARY, "tabs.next");
436 addAction_Widget(d->root, 'l', KMOD_PRIMARY, "focus.set id:url"); 438 addAction_Widget(d->root, 'l', KMOD_PRIMARY, "focus.set id:url");
439#if !defined (iHaveNativeMenus)
437 addAction_Widget(d->root, 'f', KMOD_PRIMARY, "focus.set id:find.input"); 440 addAction_Widget(d->root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
441#endif
438 } 442 }
439} 443}
440 444