From ad8b3dd9b8d29d067d9b2f4babe7aaa70be58c3d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 21 Jan 2020 02:12:30 +0100 Subject: Download progress tab --- badwolf.h | 1 + 1 file changed, 1 insertion(+) (limited to 'badwolf.h') diff --git a/badwolf.h b/badwolf.h index 91c05a4..7ffe965 100644 --- a/badwolf.h +++ b/badwolf.h @@ -12,6 +12,7 @@ struct Window GtkWidget *main_window; GtkWidget *notebook; GtkWidget *new_tab; + GtkWidget *downloads_tab; }; struct Client -- cgit v1.3.1-23-gd82d From 5da95c27a526d62de2d600d949ac4bf1f6179a9d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 11 May 2020 01:31:54 +0200 Subject: Use a toggle-button+icon for js --- badwolf.c | 14 ++++++++------ badwolf.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'badwolf.h') diff --git a/badwolf.c b/badwolf.c index 0afb7ef..00ae8d7 100644 --- a/badwolf.c +++ b/badwolf.c @@ -526,8 +526,10 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_widget_set_name(browser->toolbar, "browser__toolbar"); browser->location = gtk_entry_new(); gtk_widget_set_name(browser->location, "browser__location"); - browser->javascript = gtk_check_button_new(); + browser->javascript = gtk_toggle_button_new(); gtk_widget_set_name(browser->javascript, "browser__javascript"); + gtk_container_add(GTK_CONTAINER(browser->javascript), + gtk_image_new_from_icon_name("text-x-script", GTK_ICON_SIZE_LARGE_TOOLBAR)); browser->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name(browser->statusbar, "browser__statusbar"); @@ -573,16 +575,16 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_widget_set_tooltip_text(browser->javascript, _("Toggle javascript")); - gtk_box_pack_start(GTK_BOX(browser->toolbar), - GTK_WIDGET(browser->javascript), - FALSE, - FALSE, - BADWOLF_TOOLBAR_PADDING); 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, + BADWOLF_TOOLBAR_PADDING); 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 index 7ffe965..ad5e2d1 100644 --- a/badwolf.h +++ b/badwolf.h @@ -20,8 +20,8 @@ struct Client GtkWidget *box; GtkWidget *toolbar; - GtkWidget *javascript; GtkWidget *location; + GtkWidget *javascript; WebKitWebView *webView; struct Window *window; -- cgit v1.3.1-23-gd82d From cb774b19a095701674688a907698882490d6f21e Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 11 May 2020 01:38:57 +0200 Subject: Allow toggling auto_load_images --- badwolf.c | 32 ++++++++++++++++++++++++++++++ badwolf.h | 1 + po/messages.pot | 60 ++++++++++++++++++++++++++++++--------------------------- 3 files changed, 65 insertions(+), 28 deletions(-) (limited to 'badwolf.h') diff --git a/badwolf.c b/badwolf.c index 00ae8d7..f58d5ed 100644 --- a/badwolf.c +++ b/badwolf.c @@ -53,6 +53,7 @@ static void web_contextCb_download_started(WebKitWebContext *web_context, gpointer user_data); static gboolean locationCb_activate(GtkEntry *location, gpointer user_data); static gboolean javascriptCb_toggled(GtkButton *javascript, gpointer user_data); +static gboolean auto_load_imagesCb_toggled(GtkButton *auto_load_images, gpointer user_data); static gboolean SearchEntryCb_next__match(GtkSearchEntry *search, gpointer user_data); static gboolean SearchEntryCb_previous__match(GtkSearchEntry *search, gpointer user_data); static gboolean SearchEntryCb_search__changed(GtkSearchEntry *search, gpointer user_data); @@ -462,6 +463,21 @@ javascriptCb_toggled(GtkButton *javascript, gpointer user_data) return TRUE; } +static gboolean +auto_load_imagesCb_toggled(GtkButton *auto_load_images, gpointer user_data) +{ + struct Client *browser = (struct Client *)user_data; + + WebKitSettings *settings = webkit_web_view_get_settings(browser->webView); + + webkit_settings_set_auto_load_images( + settings, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_load_images))); + + webkit_web_view_set_settings(browser->webView, settings); + + return TRUE; +} + static gboolean SearchEntryCb_next__match(GtkSearchEntry *search, gpointer user_data) { @@ -530,6 +546,10 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_widget_set_name(browser->javascript, "browser__javascript"); gtk_container_add(GTK_CONTAINER(browser->javascript), gtk_image_new_from_icon_name("text-x-script", GTK_ICON_SIZE_LARGE_TOOLBAR)); + browser->auto_load_images = gtk_toggle_button_new(); + gtk_widget_set_name(browser->auto_load_images, "browser__load_images"); + gtk_container_add(GTK_CONTAINER(browser->auto_load_images), + gtk_image_new_from_icon_name("image-x-generic", GTK_ICON_SIZE_LARGE_TOOLBAR)); browser->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name(browser->statusbar, "browser__statusbar"); @@ -562,6 +582,8 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(browser->javascript), webkit_settings_get_enable_javascript_markup(settings)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(browser->auto_load_images), + webkit_settings_get_auto_load_images(settings)); browser->webView = WEBKIT_WEB_VIEW(g_object_new(WEBKIT_TYPE_WEB_VIEW, "web-context", @@ -574,6 +596,7 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_widget_set_name(GTK_WIDGET(browser->webView), "browser__webView"); gtk_widget_set_tooltip_text(browser->javascript, _("Toggle javascript")); + 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), @@ -585,6 +608,11 @@ 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->auto_load_images), + FALSE, + FALSE, + BADWOLF_TOOLBAR_PADDING); gtk_box_pack_start( GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING); @@ -621,6 +649,10 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat /* signals for javacript toggle widget */ g_signal_connect(browser->javascript, "toggled", G_CALLBACK(javascriptCb_toggled), browser); + /* signals for auto_load_images toggle widget */ + g_signal_connect( + browser->auto_load_images, "toggled", G_CALLBACK(auto_load_imagesCb_toggled), browser); + /* signals for WebView widget */ g_signal_connect(browser->webView, "web-process-terminated", diff --git a/badwolf.h b/badwolf.h index ad5e2d1..13cf3fd 100644 --- a/badwolf.h +++ b/badwolf.h @@ -22,6 +22,7 @@ struct Client GtkWidget *toolbar; GtkWidget *location; GtkWidget *javascript; + GtkWidget *auto_load_images; WebKitWebView *webView; struct Window *window; diff --git a/po/messages.pot b/po/messages.pot index ce401ef..cf4a8f7 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.5.1+g226ed40.develop\n" +"Project-Id-Version: Badwolf 0.5.1+g5da95c2.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2020-05-11 00:19+0200\n" +"POT-Creation-Date: 2020-05-11 01:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,23 +41,23 @@ msgstr "" msgid "Badwolf Downloads" msgstr "" -#: badwolf.c:760 +#: badwolf.c:792 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:387 +#: badwolf.c:388 msgid "Continue" msgstr "" -#: badwolf.c:337 +#: badwolf.c:338 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" -#: badwolf.c:94 +#: badwolf.c:95 msgid "Crashed" msgstr "" @@ -65,31 +65,31 @@ msgstr "" msgid "Download starting…" msgstr "" -#: badwolf.c:360 +#: badwolf.c:361 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:341 +#: badwolf.c:342 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:354 +#: badwolf.c:355 msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:351 +#: badwolf.c:352 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:357 +#: badwolf.c:358 msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:348 +#: badwolf.c:349 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:344 +#: badwolf.c:345 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" @@ -100,67 +100,71 @@ msgid "" "Runtime WebKit version: %d.%d.%d" msgstr "" -#: badwolf.c:689 +#: badwolf.c:721 msgid "New tab" msgstr "" -#: badwolf.c:809 +#: badwolf.c:841 msgid "Open new tab" msgstr "" -#: badwolf.c:98 +#: badwolf.c:99 msgid "Out of Memory" msgstr "" -#: badwolf.c:758 +#: badwolf.c:790 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:765 +#: badwolf.c:797 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:384 +#: badwolf.c:385 #, c-format msgid "TLS Error for %s." msgstr "" -#: badwolf.c:387 +#: badwolf.c:388 msgid "Temporarly Add Exception" msgstr "" -#: badwolf.c:574 +#: badwolf.c:598 msgid "Toggle javascript" msgstr "" -#: badwolf.c:102 +#: badwolf.c:599 +msgid "Toggle loading images automatically" +msgstr "" + +#: badwolf.c:103 msgid "Unknown Crash" msgstr "" -#: badwolf.c:615 +#: badwolf.c:644 msgid "search in current page" msgstr "" -#: badwolf.c:93 +#: badwolf.c:94 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:97 +#: badwolf.c:98 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:101 +#: badwolf.c:102 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:772 +#: badwolf.c:804 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:843 +#: badwolf.c:875 msgid "ø" msgstr "" -- cgit v1.3.1-23-gd82d From 5ab0fb26069bba04612cb7b99baf6d47ea56b29d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 11 May 2020 03:30:10 +0200 Subject: location bar at end of toolbar, still default focus --- badwolf.c | 13 ++++++++----- badwolf.h | 2 +- po/messages.pot | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 16 deletions(-) (limited to 'badwolf.h') diff --git a/badwolf.c b/badwolf.c index d03d735..849d6aa 100644 --- a/badwolf.c +++ b/badwolf.c @@ -596,11 +596,6 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_widget_set_tooltip_text(browser->javascript, _("Toggle javascript")); 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, @@ -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 index 13cf3fd..21abac0 100644 --- 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 index ea638ed..9ad9a08 100644 --- 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 \n" "Language-Team: LANGUAGE \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 "" -- cgit v1.3.1-23-gd82d From 372a6d6508e640121a58f6e83d81f1e8fae2ffde Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 11 May 2020 04:35:04 +0200 Subject: Add back/forward buttons --- badwolf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++------ badwolf.h | 2 ++ config.h | 3 +++ po/messages.pot | 62 +++++++++++++++++++++++++++--------------------------- 4 files changed, 95 insertions(+), 37 deletions(-) (limited to 'badwolf.h') diff --git a/badwolf.c b/badwolf.c index 849d6aa..16970c0 100644 --- a/badwolf.c +++ b/badwolf.c @@ -54,6 +54,8 @@ static void web_contextCb_download_started(WebKitWebContext *web_context, static gboolean locationCb_activate(GtkEntry *location, gpointer user_data); static gboolean javascriptCb_toggled(GtkButton *javascript, gpointer user_data); static gboolean auto_load_imagesCb_toggled(GtkButton *auto_load_images, gpointer user_data); +static void backCb_clicked(GtkButton *back, gpointer user_data); +static void forwardCb_clicked(GtkButton *forward, gpointer user_data); static gboolean SearchEntryCb_next__match(GtkSearchEntry *search, gpointer user_data); static gboolean SearchEntryCb_previous__match(GtkSearchEntry *search, gpointer user_data); static gboolean SearchEntryCb_search__changed(GtkSearchEntry *search, gpointer user_data); @@ -478,6 +480,24 @@ auto_load_imagesCb_toggled(GtkButton *auto_load_images, gpointer user_data) return TRUE; } +static void +backCb_clicked(GtkButton *back, gpointer user_data) +{ + (void)back; + struct Client *browser = (struct Client *)user_data; + + webkit_web_view_go_back(browser->webView); +} + +static void +forwardCb_clicked(GtkButton *forward, gpointer user_data) +{ + (void)forward; + struct Client *browser = (struct Client *)user_data; + + webkit_web_view_go_forward(browser->webView); +} + static gboolean SearchEntryCb_next__match(GtkSearchEntry *search, gpointer user_data) { @@ -538,23 +558,39 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat browser->window = window; browser->box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_widget_set_name(browser->box, "browser__box"); + + browser->toolbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name(browser->toolbar, "browser__toolbar"); - browser->location = gtk_entry_new(); - gtk_widget_set_name(browser->location, "browser__location"); + + browser->back = gtk_button_new_from_icon_name("go-previous-symbolic", GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_set_name(browser->back, "browser__back"); + + browser->forward = gtk_button_new_from_icon_name("go-next-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_set_name(browser->forward, "browser__forward"); + + GtkWidget *toolbar_separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL); + browser->javascript = gtk_toggle_button_new_with_label(_("JS")); gtk_widget_set_name(browser->javascript, "browser__javascript"); + gtk_widget_set_tooltip_text(browser->javascript, _("Toggle javascript")); gtk_button_set_relief(GTK_BUTTON(browser->javascript), GTK_RELIEF_NONE); + browser->auto_load_images = gtk_toggle_button_new_with_label(_("IMG")); gtk_widget_set_name(browser->auto_load_images, "browser__load_images"); + gtk_widget_set_tooltip_text(browser->auto_load_images, _("Toggle loading images automatically")); gtk_button_set_relief(GTK_BUTTON(browser->auto_load_images), GTK_RELIEF_NONE); + browser->location = gtk_entry_new(); + gtk_widget_set_name(browser->location, "browser__location"); + + browser->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name(browser->statusbar, "browser__statusbar"); - browser->statuslabel = gtk_label_new(NULL); - gtk_widget_set_name(browser->statuslabel, "browser__statuslabel"); browser->search = gtk_search_entry_new(); gtk_widget_set_name(browser->search, "browser__search"); + browser->statuslabel = gtk_label_new(NULL); + gtk_widget_set_name(browser->statuslabel, "browser__statuslabel"); setenv("GTK_THEME", ":light", 0); @@ -593,9 +629,22 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat NULL)); gtk_widget_set_name(GTK_WIDGET(browser->webView), "browser__webView"); - gtk_widget_set_tooltip_text(browser->javascript, _("Toggle javascript")); - gtk_widget_set_tooltip_text(browser->auto_load_images, _("Toggle loading images automatically")); + gtk_box_pack_start(GTK_BOX(browser->toolbar), + GTK_WIDGET(browser->back), + FALSE, + FALSE, + BADWOLF_TOOLBAR_PADDING); + gtk_box_pack_start(GTK_BOX(browser->toolbar), + GTK_WIDGET(browser->forward), + FALSE, + FALSE, + BADWOLF_TOOLBAR_PADDING); + gtk_box_pack_start(GTK_BOX(browser->toolbar), + toolbar_separator, + FALSE, + FALSE, + BADWOLF_TOOLBAR_SEPARATOR_PADDING); gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->javascript), FALSE, @@ -644,6 +693,10 @@ new_browser(struct Window *window, const gchar *target_url, WebKitWebView *relat gtk_entry_set_placeholder_text(GTK_ENTRY(browser->search), _("search in current page")); + /* signals for back/forward buttons */ + g_signal_connect(browser->back, "clicked", G_CALLBACK(backCb_clicked), browser); + g_signal_connect(browser->forward, "clicked", G_CALLBACK(forwardCb_clicked), browser); + /* signals for location entry widget */ g_signal_connect(browser->location, "activate", G_CALLBACK(locationCb_activate), browser); diff --git a/badwolf.h b/badwolf.h index 21abac0..66df46e 100644 --- a/badwolf.h +++ b/badwolf.h @@ -20,6 +20,8 @@ struct Client GtkWidget *box; GtkWidget *toolbar; + GtkWidget *back; + GtkWidget *forward; GtkWidget *javascript; GtkWidget *auto_load_images; GtkWidget *location; diff --git a/config.h b/config.h index ea728b5..d963cb6 100644 --- a/config.h +++ b/config.h @@ -39,6 +39,9 @@ // BADWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements #define BADWOLF_TOOLBAR_PADDING 0 +// BADWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements +#define BADWOLF_TOOLBAR_SEPARATOR_PADDING 4 + // BADWOLF_STATUSBAR_PADDING: Amount of padding between statusbar elements #define BADWOLF_STATUSBAR_PADDING 0 diff --git a/po/messages.pot b/po/messages.pot index 9ad9a08..8c93da9 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.5.1+g1e5642a.develop\n" +"Project-Id-Version: Badwolf 0.5.1+g1e28a08.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2020-05-11 03:28+0200\n" +"POT-Creation-Date: 2020-05-11 04:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,23 +41,23 @@ msgstr "" msgid "Badwolf Downloads" msgstr "" -#: badwolf.c:793 +#: badwolf.c:846 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:388 +#: badwolf.c:390 msgid "Continue" msgstr "" -#: badwolf.c:338 +#: badwolf.c:340 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" -#: badwolf.c:95 +#: badwolf.c:97 msgid "Crashed" msgstr "" @@ -65,39 +65,39 @@ msgstr "" msgid "Download starting…" msgstr "" -#: badwolf.c:361 +#: badwolf.c:363 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:342 +#: badwolf.c:344 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:355 +#: badwolf.c:357 msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:352 +#: badwolf.c:354 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:358 +#: badwolf.c:360 msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:349 +#: badwolf.c:351 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:345 +#: badwolf.c:347 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" -#: badwolf.c:548 +#: badwolf.c:579 msgid "IMG" msgstr "" -#: badwolf.c:545 +#: badwolf.c:574 msgid "JS" msgstr "" @@ -108,71 +108,71 @@ msgid "" "Runtime WebKit version: %d.%d.%d" msgstr "" -#: badwolf.c:722 +#: badwolf.c:775 msgid "New tab" msgstr "" -#: badwolf.c:842 +#: badwolf.c:895 msgid "Open new tab" msgstr "" -#: badwolf.c:99 +#: badwolf.c:101 msgid "Out of Memory" msgstr "" -#: badwolf.c:791 +#: badwolf.c:844 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:798 +#: badwolf.c:851 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:385 +#: badwolf.c:387 #, c-format msgid "TLS Error for %s." msgstr "" -#: badwolf.c:388 +#: badwolf.c:390 msgid "Temporarly Add Exception" msgstr "" -#: badwolf.c:596 +#: badwolf.c:576 msgid "Toggle javascript" msgstr "" -#: badwolf.c:597 +#: badwolf.c:581 msgid "Toggle loading images automatically" msgstr "" -#: badwolf.c:103 +#: badwolf.c:105 msgid "Unknown Crash" msgstr "" -#: badwolf.c:645 +#: badwolf.c:694 msgid "search in current page" msgstr "" -#: badwolf.c:94 +#: badwolf.c:96 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:98 +#: badwolf.c:100 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:102 +#: badwolf.c:104 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:805 +#: badwolf.c:858 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:876 +#: badwolf.c:929 msgid "ø" msgstr "" -- cgit v1.3.1-23-gd82d From cac1bac24900a80d25b58000f1cbb8dd1ef98fa6 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sun, 17 May 2020 16:11:21 +0200 Subject: badwolf: gcc-10 fix --- badwolf.c | 3 +-- badwolf.h | 4 ++-- po/messages.pot | 62 ++++++++++++++++++++++++++++----------------------------- 3 files changed, 34 insertions(+), 35 deletions(-) (limited to 'badwolf.h') diff --git a/badwolf.c b/badwolf.c index a00840e..31fef7b 100644 --- a/badwolf.c +++ b/badwolf.c @@ -16,11 +16,10 @@ #include /* malloc() */ #include /* access() */ +gchar *web_extensions_directory; const gchar *homepage = "https://hacktivis.me/projects/badwolf"; const gchar *version = VERSION; -gchar *web_extensions_directory; - static gboolean WebViewCb_close(WebKitWebView *webView, gpointer user_data); static gboolean WebViewCb_web_process_terminated(WebKitWebView *webView, WebKitWebProcessTerminationReason reason, diff --git a/badwolf.h b/badwolf.h index 66df46e..7911c33 100644 --- a/badwolf.h +++ b/badwolf.h @@ -4,8 +4,8 @@ #include #include -const gchar *homepage; -const gchar *version; +extern const gchar *homepage; +extern const gchar *version; struct Window { diff --git a/po/messages.pot b/po/messages.pot index 48f4402..7852647 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 0.5.1+gb30f00ef.develop\n" +"Project-Id-Version: Badwolf 0.5.1+g446353a.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2020-05-16 06:59+0200\n" +"POT-Creation-Date: 2020-05-17 16:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,23 +41,23 @@ msgstr "" msgid "Badwolf Downloads" msgstr "" -#: badwolf.c:873 +#: badwolf.c:872 #, c-format msgid "Buildtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:402 +#: badwolf.c:401 msgid "Continue" msgstr "" -#: badwolf.c:352 +#: badwolf.c:351 msgid "" "Couldn't verify the TLS certificate to ensure a better security of the " "connection. You might want to verify your machine and network.\n" "\n" msgstr "" -#: badwolf.c:100 +#: badwolf.c:99 msgid "Crashed" msgstr "" @@ -65,31 +65,31 @@ msgstr "" msgid "Download starting…" msgstr "" -#: badwolf.c:375 +#: badwolf.c:374 msgid "Error: Some unknown error occurred validating the certificate.\n" msgstr "" -#: badwolf.c:356 +#: badwolf.c:355 msgid "Error: The X509 Certificate Authority is unknown.\n" msgstr "" -#: badwolf.c:369 +#: badwolf.c:368 msgid "Error: The certificate has been revoked.\n" msgstr "" -#: badwolf.c:366 +#: badwolf.c:365 msgid "Error: The certificate has expired. Check your system's clock.\n" msgstr "" -#: badwolf.c:372 +#: badwolf.c:371 msgid "Error: The certificate is considered to be insecure.\n" msgstr "" -#: badwolf.c:363 +#: badwolf.c:362 msgid "Error: The certificate isn't valid yet. Check your system's clock.\n" msgstr "" -#: badwolf.c:359 +#: badwolf.c:358 msgid "Error: The given identity doesn't match the expected one.\n" msgstr "" @@ -100,79 +100,79 @@ msgid "" "Runtime WebKit version: %d.%d.%d" msgstr "" -#: badwolf.c:802 +#: badwolf.c:801 msgid "New tab" msgstr "" -#: badwolf.c:922 +#: badwolf.c:921 msgid "Open new tab" msgstr "" -#: badwolf.c:104 +#: badwolf.c:103 msgid "Out of Memory" msgstr "" -#: badwolf.c:871 +#: badwolf.c:870 #, c-format msgid "Running Badwolf version: %s\n" msgstr "" -#: badwolf.c:878 +#: badwolf.c:877 #, c-format msgid "Runtime WebKit version: %d.%d.%d\n" msgstr "" -#: badwolf.c:399 +#: badwolf.c:398 #, c-format msgid "TLS Error for %s." msgstr "" -#: badwolf.c:402 +#: badwolf.c:401 msgid "Temporarily Add Exception" msgstr "" -#: badwolf.c:599 +#: badwolf.c:598 msgid "Toggle javascript" msgstr "" -#: badwolf.c:604 +#: badwolf.c:603 msgid "Toggle loading images automatically" msgstr "" -#: badwolf.c:108 +#: badwolf.c:107 msgid "Unknown Crash" msgstr "" -#: badwolf.c:602 +#: badwolf.c:601 msgid "_IMG" msgstr "" -#: badwolf.c:597 +#: badwolf.c:596 msgid "_JS" msgstr "" -#: badwolf.c:717 +#: badwolf.c:716 msgid "search in current page" msgstr "" -#: badwolf.c:99 +#: badwolf.c:98 msgid "the web process crashed.\n" msgstr "" -#: badwolf.c:103 +#: badwolf.c:102 msgid "the web process exceeded the memory limit.\n" msgstr "" -#: badwolf.c:107 +#: badwolf.c:106 msgid "the web process terminated for an unknown reason.\n" msgstr "" -#: badwolf.c:885 +#: badwolf.c:884 #, c-format msgid "webkit-web-extension directory set to: %s\n" msgstr "" #. TRANSLATOR Ignore this entry. Done for forcing Unicode in xgettext. -#: badwolf.c:956 +#: badwolf.c:955 msgid "ø" msgstr "" -- cgit v1.3.1-23-gd82d