badwolf

commit: 5ab0fb26069bba04612cb7b99baf6d47ea56b29d
parent: 1e5642adbb35dd225e1d9acb497d56fd6c51ff5f
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Mon, 11 May 2020 03:30:10 +0200

location bar at end of toolbar, still default focus

Diffstat:
M
badwolf.c
13
++++++++-----
M
badwolf.h
2
+-
M
po/messages.pot
20
++++++++++----------

3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/badwolf.c b/badwolf.c
@@ -597,11 +597,6 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat
 	gtk_widget_set_tooltip_text(browser->auto_load_images, _("Toggle loading images automatically"));
 
 	gtk_box_pack_start(GTK_BOX(browser->toolbar),
-	                   GTK_WIDGET(browser->location),
-	                   TRUE,
-	                   TRUE,
-	                   BADWOLF_TOOLBAR_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->toolbar),
 	                   GTK_WIDGET(browser->javascript),
 	                   FALSE,
 	                   FALSE,
@@ -611,6 +606,14 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat
 	                   FALSE,
 	                   FALSE,
 	                   BADWOLF_TOOLBAR_PADDING);
+	gtk_box_pack_start(GTK_BOX(browser->toolbar),
+	                   GTK_WIDGET(browser->location),
+	                   TRUE,
+	                   TRUE,
+	                   BADWOLF_TOOLBAR_PADDING);
+
+	gtk_container_set_focus_child(GTK_CONTAINER(browser->box), browser->toolbar);
+	gtk_container_set_focus_child(GTK_CONTAINER(browser->toolbar), browser->location);
 
 	gtk_box_pack_start(
 	    GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING);
diff --git a/badwolf.h b/badwolf.h
@@ -20,9 +20,9 @@ struct Client
 	GtkWidget *box;
 
 	GtkWidget *toolbar;
-	GtkWidget *location;
 	GtkWidget *javascript;
 	GtkWidget *auto_load_images;
+	GtkWidget *location;
 
 	WebKitWebView *webView;
 	struct Window *window;
diff --git a/po/messages.pot b/po/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Badwolf 0.5.1+g06b30dc.develop\n"
+"Project-Id-Version: Badwolf 0.5.1+g1e5642a.develop\n"
 "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n"
-"POT-Creation-Date: 2020-05-11 02:47+0200\n"
+"POT-Creation-Date: 2020-05-11 03:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,7 +41,7 @@ msgstr ""
 msgid "Badwolf Downloads"
 msgstr ""
 
-#: badwolf.c:790
+#: badwolf.c:793
 #, c-format
 msgid "Buildtime WebKit version: %d.%d.%d\n"
 msgstr ""
@@ -108,11 +108,11 @@ msgid ""
 "Runtime WebKit version: %d.%d.%d"
 msgstr ""
 
-#: badwolf.c:719
+#: badwolf.c:722
 msgid "New tab"
 msgstr ""
 
-#: badwolf.c:839
+#: badwolf.c:842
 msgid "Open new tab"
 msgstr ""
 
@@ -120,12 +120,12 @@ msgstr ""
 msgid "Out of Memory"
 msgstr ""
 
-#: badwolf.c:788
+#: badwolf.c:791
 #, c-format
 msgid "Running Badwolf version: %s\n"
 msgstr ""
 
-#: badwolf.c:795
+#: badwolf.c:798
 #, c-format
 msgid "Runtime WebKit version: %d.%d.%d\n"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 msgid "Unknown Crash"
 msgstr ""
 
-#: badwolf.c:642
+#: badwolf.c:645
 msgid "search in current page"
 msgstr ""
 
@@ -167,12 +167,12 @@ msgstr ""
 msgid "the web process terminated for an unknown reason.\n"
 msgstr ""
 
-#: badwolf.c:802
+#: badwolf.c:805
 #, c-format
 msgid "webkit-web-extension directory set to: %s\n"
 msgstr ""
 
 #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext.
-#: badwolf.c:873
+#: badwolf.c:876
 msgid "ø"
 msgstr ""