Tools/ChangeLog

 12012-04-26 Carlos Garcia Campos <cgarcia@igalia.com>
 2
 3 [GTK] Add downloads support to MiniBrowser
 4 https://bugs.webkit.org/show_bug.cgi?id=73662
 5
 6 Reviewed by NOBODY (OOPS!).
 7
 8 * MiniBrowser/gtk/BrowserDownloadsBar.c: Added.
 9 (browserDownloadsBarChildRemoved): Close the downloads bar if
 10 there aren't active downloads.
 11 (browserDownloadsBarResponse): Destroy the downloads bar when
 12 closed.
 13 (browser_downloads_bar_init):
 14 (browser_downloads_bar_class_init):
 15 (browser_downloads_bar_new): Create a new downloads bar.
 16 (actionButtonClicked): Cancel the download if cancel button was
 17 clicked, or open the downloaded file if the download finished.
 18 (browserDownloadFinalize):
 19 (browser_download_init):
 20 (browser_download_class_init):
 21 (downloadReceivedResponse): Update download message using the
 22 response URI.
 23 (remainingTime): Helper function to get human readable remaining
 24 time.
 25 (downloadProgress): Update downloads progress.
 26 (downloadReceivedData):
 27 (downloadFinished): Update download message and turn download
 28 button into open.
 29 (downloadFailed): Show error message or destroy the download UI if
 30 it was cancelled.
 31 (browserDownloadNew): Create a new download widget for the given
 32 WebKitDownload.
 33 (browser_downloads_bar_add_download): Add download widget to the
 34 downloads bar.
 35 * MiniBrowser/gtk/BrowserDownloadsBar.h: Added.
 36 * MiniBrowser/gtk/BrowserWindow.c:
 37 (downloadStarted): Create a download widget and add it to the
 38 downloads bar when a new download is started.
 39 (browserWindowConstructed): Connect to
 40 WebKitWebContext::download-started signal.
 41 * MiniBrowser/gtk/GNUmakefile.am: Add new files to compilation.
 42
1432012-04-25 Maciej Stachowiak <mjs@apple.com>
244
345 Teach LayoutTestHelper to correctly restore the color profile when it's a factory profile

Tools/MiniBrowser/gtk/BrowserDownloadsBar.c

 1/*
 2 * Copyright (C) 2011 Igalia S.L.
 3 *
 4 * Redistribution and use in source and binary forms, with or without
 5 * modification, are permitted provided that the following conditions
 6 * are met:
 7 * 1. Redistributions of source code must retain the above copyright
 8 * notice, this list of conditions and the following disclaimer.
 9 * 2. Redistributions in binary form must reproduce the above copyright
 10 * notice, this list of conditions and the following disclaimer in the
 11 * documentation and/or other materials provided with the distribution.
 12 *
 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 23 * THE POSSIBILITY OF SUCH DAMAGE.
 24 */
 25
 26#include "BrowserDownloadsBar.h"
 27
 28#include <glib/gi18n.h>
 29
 30#define BROWSER_TYPE_DOWNLOAD (browser_download_get_type())
 31#define BROWSER_DOWNLOAD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), BROWSER_TYPE_DOWNLOAD, BrowserDownload))
 32
 33typedef struct _BrowserDownload BrowserDownload;
 34typedef struct _BrowserDownloadClass BrowserDownloadClass;
 35
 36static GType browser_download_get_type();
 37
 38struct _BrowserDownloadsBar {
 39 GtkInfoBar parent;
 40};
 41
 42struct _BrowserDownloadsBarClass {
 43 GtkInfoBarClass parentClass;
 44};
 45
 46G_DEFINE_TYPE(BrowserDownloadsBar, browser_downloads_bar, GTK_TYPE_INFO_BAR)
 47
 48static void
 49browserDownloadsBarChildRemoved(GtkContainer *infoBar, GtkWidget *widget, BrowserDownloadsBar *downloadsBar)
 50{
 51 GList *children = gtk_container_get_children(infoBar);
 52 if (g_list_length(children) == 1)
 53 gtk_info_bar_response(GTK_INFO_BAR(downloadsBar), GTK_RESPONSE_CLOSE);
 54 g_list_free(children);
 55}
 56
 57static void browserDownloadsBarResponse(GtkInfoBar *infoBar, gint responseId)
 58{
 59 gtk_widget_destroy(GTK_WIDGET(infoBar));
 60}
 61
 62static void browser_downloads_bar_init(BrowserDownloadsBar *downloadsBar)
 63{
 64 GtkWidget *contentBox = gtk_info_bar_get_content_area(GTK_INFO_BAR(downloadsBar));
 65 g_signal_connect_after(contentBox, "remove", G_CALLBACK(browserDownloadsBarChildRemoved), downloadsBar);
 66 gtk_orientable_set_orientation(GTK_ORIENTABLE(contentBox), GTK_ORIENTATION_VERTICAL);
 67
 68 GtkWidget *title = gtk_label_new(NULL);
 69 gtk_label_set_markup(GTK_LABEL(title), "<span size='xx-large' weight='bold'>Downloads</span>");
 70 gtk_misc_set_alignment(GTK_MISC(title), 0., 0.5);
 71 gtk_box_pack_start(GTK_BOX(contentBox), title, FALSE, FALSE, 12);
 72 gtk_widget_show(title);
 73}
 74
 75static void browser_downloads_bar_class_init(BrowserDownloadsBarClass *klass)
 76{
 77 GtkInfoBarClass *infoBarClass = GTK_INFO_BAR_CLASS(klass);
 78 infoBarClass->response = browserDownloadsBarResponse;
 79}
 80
 81GtkWidget *browser_downloads_bar_new()
 82{
 83 GtkInfoBar *downloadsBar = GTK_INFO_BAR(g_object_new(BROWSER_TYPE_DOWNLOADS_BAR, NULL));
 84 gtk_info_bar_add_buttons(downloadsBar, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 85 return GTK_WIDGET(downloadsBar);
 86}
 87
 88struct _BrowserDownload {
 89 GtkBox parent;
 90
 91 WebKitDownload *download;
 92 guint64 contentLength;
 93 guint64 downloadedSize;
 94 gboolean finished;
 95
 96 GtkWidget *statusLabel;
 97 GtkWidget *remainingLabel;
 98 GtkWidget *progressBar;
 99 GtkWidget *actionButton;
 100};
 101
 102struct _BrowserDownloadClass {
 103 GtkBoxClass parentClass;
 104};
 105
 106G_DEFINE_TYPE(BrowserDownload, browser_download, GTK_TYPE_BOX)
 107
 108static void actionButtonClicked(GtkButton *button, BrowserDownload *browserDownload)
 109{
 110 if (!browserDownload->finished) {
 111 webkit_download_cancel(browserDownload->download);
 112 return;
 113 }
 114
 115 gtk_show_uri(gtk_widget_get_screen(GTK_WIDGET(browserDownload)),
 116 webkit_download_get_destination(browserDownload->download),
 117 gtk_get_current_event_time(), NULL);
 118 gtk_widget_destroy(GTK_WIDGET(browserDownload));
 119}
 120
 121static void browserDownloadFinalize(GObject *object)
 122{
 123 BrowserDownload *browserDownload = BROWSER_DOWNLOAD(object);
 124
 125 if (browserDownload->download) {
 126 g_object_unref(browserDownload->download);
 127 browserDownload->download = NULL;
 128 }
 129
 130 G_OBJECT_CLASS(browser_download_parent_class)->finalize(object);
 131}
 132
 133static void browser_download_init(BrowserDownload *download)
 134{
 135 GtkWidget *mainBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
 136 gtk_box_pack_start(GTK_BOX(download), mainBox, FALSE, FALSE, 0);
 137 gtk_widget_show(mainBox);
 138
 139 GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 140 gtk_box_pack_start(GTK_BOX(mainBox), vbox, TRUE, TRUE, 0);
 141 gtk_widget_show(vbox);
 142
 143 GtkWidget *statusBox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 144 gtk_box_pack_start(GTK_BOX(vbox), statusBox, TRUE, TRUE, 0);
 145 gtk_widget_show(statusBox);
 146
 147 download->statusLabel = gtk_label_new("Starting Download");
 148 gtk_label_set_ellipsize(GTK_LABEL(download->statusLabel), PANGO_ELLIPSIZE_END);
 149 gtk_misc_set_alignment(GTK_MISC(download->statusLabel), 0., 0.5);
 150 gtk_box_pack_start(GTK_BOX(statusBox), download->statusLabel, TRUE, TRUE, 0);
 151 gtk_widget_show(download->statusLabel);
 152
 153 download->remainingLabel = gtk_label_new(NULL);
 154 gtk_misc_set_alignment(GTK_MISC(download->remainingLabel), 1., 0.5);
 155 gtk_box_pack_end(GTK_BOX(statusBox), download->remainingLabel, TRUE, TRUE, 0);
 156 gtk_widget_show(download->remainingLabel);
 157
 158 download->progressBar = gtk_progress_bar_new();
 159 gtk_box_pack_start(GTK_BOX(vbox), download->progressBar, FALSE, FALSE, 0);
 160 gtk_widget_show(download->progressBar);
 161
 162 download->actionButton = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 163 g_signal_connect(download->actionButton, "clicked", G_CALLBACK(actionButtonClicked), download);
 164 gtk_box_pack_end(GTK_BOX(mainBox), download->actionButton, FALSE, FALSE, 0);
 165 gtk_widget_show(download->actionButton);
 166}
 167
 168static void browser_download_class_init(BrowserDownloadClass *klass)
 169{
 170 GObjectClass *objectClass = G_OBJECT_CLASS(klass);
 171
 172 objectClass->finalize = browserDownloadFinalize;
 173}
 174
 175static void downloadReceivedResponse(WebKitDownload *download, GParamSpec *paramSpec, BrowserDownload *browserDownload)
 176{
 177 WebKitURIResponse *response = webkit_download_get_response(download);
 178 browserDownload->contentLength = webkit_uri_response_get_content_length(response);
 179 char *text = g_strdup_printf("Downloading %s", webkit_uri_response_get_uri(response));
 180 gtk_label_set_text(GTK_LABEL(browserDownload->statusLabel), text);
 181 g_free(text);
 182}
 183
 184static gchar *remainingTime(BrowserDownload *browserDownload)
 185{
 186 guint64 total = browserDownload->contentLength;
 187 guint64 current = browserDownload->downloadedSize;
 188 gdouble elapsedTime = webkit_download_get_elapsed_time(browserDownload->download);
 189
 190 if (current <= 0)
 191 return NULL;
 192
 193 gdouble perByteTime = elapsedTime / current;
 194 gdouble interval = perByteTime * (total - current);
 195
 196 int hours = (int) (interval / 3600);
 197 interval -= hours * 3600;
 198 int mins = (int) (interval / 60);
 199 interval -= mins * 60;
 200 int secs = (int) interval;
 201
 202 if (hours > 0) {
 203 if (mins > 0)
 204 return g_strdup_printf (ngettext ("%u:%02u hour left", "%u:%02u hours left", hours), hours, mins);
 205 return g_strdup_printf (ngettext ("%u hour left", "%u hours left", hours), hours);
 206 }
 207
 208 if (mins > 0)
 209 return g_strdup_printf (ngettext ("%u:%02u minute left", "%u:%02u minutes left", mins), mins, secs);
 210 return g_strdup_printf (ngettext ("%u second left", "%u seconds left", secs), secs);
 211}
 212
 213static void downloadProgress(WebKitDownload *download, GParamSpec *paramSpec, BrowserDownload *browserDownload)
 214{
 215 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(browserDownload->progressBar),
 216 webkit_download_get_estimated_progress(download));
 217 char *remaining = remainingTime(browserDownload);
 218 gtk_label_set_text(GTK_LABEL(browserDownload->remainingLabel), remaining);
 219 g_free(remaining);
 220}
 221
 222static void downloadReceivedData(WebKitDownload *download, guint64 dataLength, BrowserDownload *browserDownload)
 223{
 224 browserDownload->downloadedSize += dataLength;
 225}
 226
 227static void downloadFinished(WebKitDownload *download, BrowserDownload *browserDownload)
 228{
 229 gchar *text = g_strdup_printf("Download completed: %s", webkit_download_get_destination(download));
 230 gtk_label_set_text(GTK_LABEL(browserDownload->statusLabel), text);
 231 g_free(text);
 232 gtk_label_set_text(GTK_LABEL(browserDownload->remainingLabel), NULL);
 233 gtk_button_set_image(GTK_BUTTON(browserDownload->actionButton),
 234 gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON));
 235 gtk_button_set_label(GTK_BUTTON(browserDownload->actionButton), "Open ...");
 236 browserDownload->finished = TRUE;
 237}
 238
 239static void downloadFailed(WebKitDownload *download, GError *error, BrowserDownload *browserDownload)
 240{
 241 g_signal_handlers_disconnect_by_func(browserDownload->download, downloadFinished, browserDownload);
 242 if (g_error_matches(error, WEBKIT_DOWNLOAD_ERROR, WEBKIT_DOWNLOAD_ERROR_CANCELLED_BY_USER)) {
 243 gtk_widget_destroy(GTK_WIDGET(browserDownload));
 244 return;
 245 }
 246
 247 char *errorMessage = g_strdup_printf("Download failed: %s", error->message);
 248 gtk_label_set_text(GTK_LABEL(browserDownload->statusLabel), errorMessage);
 249 g_free(errorMessage);
 250 gtk_label_set_text(GTK_LABEL(browserDownload->remainingLabel), NULL);
 251 gtk_widget_set_sensitive(browserDownload->actionButton, FALSE);
 252}
 253
 254GtkWidget *browserDownloadNew(WebKitDownload *download)
 255{
 256 BrowserDownload *browserDownload = BROWSER_DOWNLOAD(g_object_new(BROWSER_TYPE_DOWNLOAD,
 257 "orientation", GTK_ORIENTATION_VERTICAL,
 258 NULL));
 259
 260 browserDownload->download = g_object_ref(download);
 261 g_signal_connect(browserDownload->download, "notify::response", G_CALLBACK(downloadReceivedResponse), browserDownload);
 262 g_signal_connect(browserDownload->download, "notify::estimated-progress", G_CALLBACK(downloadProgress), browserDownload);
 263 g_signal_connect(browserDownload->download, "received-data", G_CALLBACK(downloadReceivedData), browserDownload);
 264 g_signal_connect(browserDownload->download, "finished", G_CALLBACK(downloadFinished), browserDownload);
 265 g_signal_connect(browserDownload->download, "failed", G_CALLBACK(downloadFailed), browserDownload);
 266
 267 return GTK_WIDGET(browserDownload);
 268}
 269
 270void browser_downloads_bar_add_download(BrowserDownloadsBar *downloadsBar, WebKitDownload *download)
 271{
 272 GtkWidget *browserDownload = browserDownloadNew(download);
 273 GtkWidget *contentBox = gtk_info_bar_get_content_area(GTK_INFO_BAR(downloadsBar));
 274 gtk_box_pack_start(GTK_BOX(contentBox), browserDownload, FALSE, TRUE, 0);
 275 gtk_widget_show(browserDownload);
 276}

Tools/MiniBrowser/gtk/BrowserDownloadsBar.h

 1/*
 2 * Copyright (C) 2011 Igalia S.L.
 3 *
 4 * Redistribution and use in source and binary forms, with or without
 5 * modification, are permitted provided that the following conditions
 6 * are met:
 7 * 1. Redistributions of source code must retain the above copyright
 8 * notice, this list of conditions and the following disclaimer.
 9 * 2. Redistributions in binary form must reproduce the above copyright
 10 * notice, this list of conditions and the following disclaimer in the
 11 * documentation and/or other materials provided with the distribution.
 12 *
 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 23 * THE POSSIBILITY OF SUCH DAMAGE.
 24 */
 25
 26#ifndef BrowserDownloadsBar_h
 27#define BrowserDownloadsBar_h
 28
 29#include <gtk/gtk.h>
 30#include <webkit2/webkit2.h>
 31
 32G_BEGIN_DECLS
 33
 34#define BROWSER_TYPE_DOWNLOADS_BAR (browser_downloads_bar_get_type())
 35#define BROWSER_DOWNLOADS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), BROWSER_TYPE_DOWNLOADS_BAR, BrowserDownloadsBar))
 36#define BROWSER_IS_DOWNLOADS_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), BROWSER_TYPE_DOWNLOADS_BAR))
 37#define BROWSER_DOWNLOADS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), BROWSER_TYPE_DOWNLOADS_BAR, BrowserDownloadsBarClass))
 38#define BROWSER_IS_DOWNLOADS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), BROWSER_TYPE_DOWNLOADS_BAR))
 39#define BROWSER_DOWNLOADS_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), BROWSER_TYPE_DOWNLOADS_BAR, BrowserDownloadsBarClass))
 40
 41typedef struct _BrowserDownloadsBar BrowserDownloadsBar;
 42typedef struct _BrowserDownloadsBarClass BrowserDownloadsBarClass;
 43
 44GType browser_downloads_bar_get_type(void);
 45
 46GtkWidget *browser_downloads_bar_new(void);
 47void browser_downloads_bar_add_download(BrowserDownloadsBar *, WebKitDownload *);
 48
 49G_END_DECLS
 50
 51#endif

Tools/MiniBrowser/gtk/BrowserWindow.c

2626 */
2727
2828#include "BrowserWindow.h"
 29
 30#include "BrowserDownloadsBar.h"
2931#include "BrowserSettingsDialog.h"
3032#include <string.h>
3133

@@struct _BrowserWindow {
4850 GtkWidget *statusLabel;
4951 GtkWidget *settingsDialog;
5052 WebKitWebView *webView;
51 
 53 GtkWidget *downloadsBar;
5254};
5355
5456struct _BrowserWindowClass {

@@static void webViewLoadProgressChanged(WebKitWebView *webView, GParamSpec *pspec
134136 g_timeout_add(500, (GSourceFunc)resetEntryProgress, window->uriEntry);
135137}
136138
 139static void downloadStarted(WebKitWebContext *webContext, WebKitDownload *download, BrowserWindow *window)
 140{
 141 if (!window->downloadsBar) {
 142 window->downloadsBar = browser_downloads_bar_new();
 143 gtk_box_pack_start(GTK_BOX(window->mainBox), window->downloadsBar, FALSE, FALSE, 0);
 144 gtk_box_reorder_child(GTK_BOX(window->mainBox), window->downloadsBar, 0);
 145 g_object_add_weak_pointer(G_OBJECT(window->downloadsBar), (gpointer *)&(window->downloadsBar));
 146 gtk_widget_show(window->downloadsBar);
 147 }
 148 browser_downloads_bar_add_download(BROWSER_DOWNLOADS_BAR(window->downloadsBar), download);
 149}
 150
137151static void browserWindowHistoryItemSelected(BrowserWindow *window, GtkMenuItem *item)
138152{
139153 GtkAction *action = gtk_activatable_get_related_action(GTK_ACTIVATABLE(item));

@@static void browserWindowConstructed(GObject *gObject)
423437 g_signal_connect(window->webView, "mouse-target-changed", G_CALLBACK(webViewMouseTargetChanged), window);
424438 g_signal_connect(window->webView, "notify::zoom-level", G_CALLBACK(webViewZoomLevelChanged), window);
425439
 440 g_signal_connect(webkit_web_view_get_context(window->webView), "download-started", G_CALLBACK(downloadStarted), window);
 441
426442 WebKitBackForwardList *backForwadlist = webkit_web_view_get_back_forward_list(window->webView);
427443 g_signal_connect(backForwadlist, "changed", G_CALLBACK(backForwadlistChanged), window);
428444

Tools/MiniBrowser/gtk/GNUmakefile.am

@@Programs_MiniBrowser_CPPFLAGS = \
1717Programs_MiniBrowser_SOURCES = \
1818 Tools/MiniBrowser/gtk/BrowserCellRendererVariant.h \
1919 Tools/MiniBrowser/gtk/BrowserCellRendererVariant.c \
 20 Tools/MiniBrowser/gtk/BrowserDownloadsBar.h \
 21 Tools/MiniBrowser/gtk/BrowserDownloadsBar.c \
2022 Tools/MiniBrowser/gtk/BrowserSettingsDialog.h \
2123 Tools/MiniBrowser/gtk/BrowserSettingsDialog.c \
2224 Tools/MiniBrowser/gtk/BrowserWindow.h \