Summary Files Commits Branches @commit @diff @stats
path: root / downloads.c
diff options
context:
space:
mode:
Commitacde5dfc614ee549b5c1f0119c7e3c8c777c4a82 (patch)
Author
 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-07-08 07:42:06 +0200
Committer
 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-07-08 07:42:06 +0200
Files7a84d999ef7e84a8dc40293f7affb068ba01a2b6 /downloads.c
goodwolf-1.0.1.tar
goodwolf-1.0.1.tar.gz
goodwolf-1.0.1.zip
Parenta49df8ad9869a47a10138738b38fd0ffdb95e402 (diff)
Parentdf18b8d0a3a0634e18b518e9cfc21fd8f4ea7908 (diff)
Merge branch 'release-1.0' into missy for 1.0.1 v1.0.1
Fixes ------- - Support for relative paths as command line arguments - Downloads tab: no longer resizes the main window - Manpage: Syntax is now correct, unbreaking GNU groff formatting. Changes ------- - When an user requests as new tab (ctrl-t, new tab button), switch to it - Downloads tab: A scrollable list view is used instead of a stack of labels
1 files changed, 11 insertions, 7 deletions
-rw-r--r--downloads.c18
diff --git a/downloads.c b/downloads.c
index 1a21ada..09b7bb0 100644
--- a/downloads.c
+++ b/downloads.c
@@ -42,6 +42,7 @@ download_new_entry(WebKitDownload *webkit_download, struct Download *download)
download->stop_icon = gtk_button_new_from_icon_name("process-stop", GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(download->progress), TRUE);
+ gtk_label_set_ellipsize(GTK_LABEL(download->file_path), BADWOLF_DOWNLOAD_FILE_PATH_ELLIPSIZE);
g_signal_connect(
download->stop_icon, "clicked", G_CALLBACK(download_stop_iconCb_clicked), webkit_download);
@@ -52,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);
}
@@ -179,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");
@@ -210,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);
}