From 828e2e38e092a8ccc11a57b66baa14e2291f59e6 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 12 Jun 2020 01:50:39 +0200 Subject: downloads: Ellipsize destination file path --- config.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'config.h') diff --git a/config.h b/config.h index d963cb6..14b142c 100644 --- a/config.h +++ b/config.h @@ -93,4 +93,16 @@ */ #define BADWOLF_STATUSLABEL_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE +/* BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE: pango ellipsize mode of the download destination path, + * can be one of: + * - PANGO_ELLIPSIZE_NONE + * - PANGO_ELLIPSIZE_START + * - PANGO_ELLIPSIZE_MIDDLE + * - PANGO_ELLIPSIZE_END + * + * See https://developer.gnome.org/pango/stable/pango-Layout-Objects.html#PangoEllipsizeMode + */ +#define BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE + + #endif /* CONFIG_H_INCLUDED */ -- cgit v1.3.1-23-gd82d From 4b85e087dad714f6e969f702e8be7319531afc37 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 12 Jun 2020 02:20:14 +0200 Subject: downloads: Use a ListBox in a ScrollWindow --- config.h | 1 - downloads.c | 17 ++++++++++------- po/messages.pot | 14 +++++++------- 3 files changed, 17 insertions(+), 15 deletions(-) (limited to 'config.h') diff --git a/config.h b/config.h index 14b142c..8426ce3 100644 --- a/config.h +++ b/config.h @@ -104,5 +104,4 @@ */ #define BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE - #endif /* CONFIG_H_INCLUDED */ diff --git a/downloads.c b/downloads.c index 9b83edd..09b7bb0 100644 --- a/downloads.c +++ b/downloads.c @@ -53,8 +53,7 @@ download_new_entry(WebKitDownload *webkit_download, struct Download *download) gtk_box_pack_start(GTK_BOX(download->container), download->status, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(download->container), download->file_path, FALSE, FALSE, 0); - gtk_box_pack_start( - GTK_BOX(download->window->downloads_tab), download->container, FALSE, FALSE, 0); + gtk_list_box_insert(GTK_LIST_BOX(download->window->downloads_tab), download->container, -1); gtk_widget_show_all(download->container); } @@ -180,14 +179,18 @@ downloadCb_received_data(WebKitDownload *webkit_download, guint64 data_lenght, g GtkWidget * badwolf_downloads_tab_new() { - return gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + return gtk_list_box_new(); } void badwolf_downloads_tab_attach(struct Window *window) { - gtk_notebook_insert_page(GTK_NOTEBOOK(window->notebook), window->downloads_tab, NULL, 0); - gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(window->notebook), window->downloads_tab, TRUE); + GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_name(scrolled_window, "browser__scrollwin_downloads"); + gtk_container_add(GTK_CONTAINER(scrolled_window), window->downloads_tab); + gtk_notebook_insert_page(GTK_NOTEBOOK(window->notebook), scrolled_window, NULL, 0); + + gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(window->notebook), scrolled_window, TRUE); GtkWidget *tab_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name(tab_box, "browser__tabbox"); @@ -211,9 +214,9 @@ badwolf_downloads_tab_attach(struct Window *window) gtk_box_pack_start(GTK_BOX(tab_box), label, TRUE, TRUE, 0); gtk_widget_set_tooltip_text(tab_box, _("Badwolf Downloads")); - gtk_notebook_set_tab_label(GTK_NOTEBOOK(window->notebook), window->downloads_tab, tab_box); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(window->notebook), scrolled_window, tab_box); gtk_notebook_set_menu_label_text( - GTK_NOTEBOOK(window->notebook), window->downloads_tab, _("Badwolf Downloads")); + GTK_NOTEBOOK(window->notebook), scrolled_window, _("Badwolf Downloads")); gtk_widget_show_all(tab_box); } diff --git a/po/messages.pot b/po/messages.pot index 45867ee..0d84a9f 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Badwolf 1.0.0+ged40d74.develop\n" +"Project-Id-Version: Badwolf 1.0.0+g828e2e3.develop\n" "Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n" -"POT-Creation-Date: 2020-06-12 01:46+0200\n" +"POT-Creation-Date: 2020-06-12 02:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,27 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: downloads.c:118 +#: downloads.c:117 #, c-format msgid "%02i:%02i:%02i Download cancelled" msgstr "" -#: downloads.c:120 +#: downloads.c:119 #, c-format msgid "%02i:%02i:%02i Download error" msgstr "" -#: downloads.c:142 +#: downloads.c:141 #, c-format msgid "%02i:%02i:%02i Download finished" msgstr "" -#: downloads.c:168 +#: downloads.c:167 #, c-format msgid "%02i:%02i:%02i Downloading…" msgstr "" -#: downloads.c:196 downloads.c:213 downloads.c:216 +#: downloads.c:199 downloads.c:216 downloads.c:218 msgid "Badwolf Downloads" msgstr "" -- cgit v1.3.1-23-gd82d From 41cfd1ccae96dda3378b9666e38e70e547fe87f2 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 4 Nov 2019 20:11:02 +0100 Subject: Show selected completion as a inline-selection --- bookmarks.c | 7 ++++++- config.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'config.h') diff --git a/bookmarks.c b/bookmarks.c index 4bbfb8a..8a69814 100644 --- a/bookmarks.c +++ b/bookmarks.c @@ -1,13 +1,17 @@ #include "bookmarks.h" #include "badwolf.h" +#include "config.h" #include /* g_fprintf() */ #include #include gboolean -location_completion_matches(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer user_data) +location_completion_matches(GtkEntryCompletion *completion, + const gchar *key, + GtkTreeIter *iter, + gpointer user_data) { (void)user_data; gchar *buffer; @@ -30,6 +34,7 @@ location_completion_setup(GtkListStore *list_store) gtk_entry_completion_set_model(location_completion, GTK_TREE_MODEL(list_store)); gtk_entry_completion_set_text_column(location_completion, 0); gtk_entry_completion_set_match_func(location_completion, location_completion_matches, NULL, NULL); + gtk_entry_completion_set_inline_selection(location_completion, BADWOLF_LOCATION_INLINE_SELECTION); } void diff --git a/config.h b/config.h index 8426ce3..6bd76df 100644 --- a/config.h +++ b/config.h @@ -104,4 +104,7 @@ */ #define BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE PANGO_ELLIPSIZE_MIDDLE +// BADWOLF_LOCATION_INLINE_SELECTION: show selected completion as a selection in location entry +#define BADWOLF_LOCATION_INLINE_SELECTION TRUE + #endif /* CONFIG_H_INCLUDED */ -- cgit v1.3.1-23-gd82d