diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-07-26 17:30:26 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-07-26 17:30:26 +0000 |
commit | e894e38c37e8565c3672b1a9bde42fb5e0648aeb (patch) | |
tree | 827c4b68934b6eca60cb9fb95d318da91273a89e /gtk/res/downloads.glade | |
parent | 7ae05a60ae7f12774bfea3efc57938c97d6b7c1f (diff) | |
download | netsurf-e894e38c37e8565c3672b1a9bde42fb5e0648aeb.tar.gz netsurf-e894e38c37e8565c3672b1a9bde42fb5e0648aeb.tar.bz2 |
Merged revisions 4282-4285,4288-4293,4297-4298,4307,4309-4313,4322,4324-4431,4434-4494,4500-4508,4515,4517,4525-4545,4548-4555,4558-4572,4574-4576,4579,4582-4615,4618-4628,4630-4634,4636-4641,4643-4654,4656-4675,4677,4679-4685,4687-4750 via svnmerge from
svn://svn.netsurf-browser.org/branches/mikeL/netsurf
........
r4689 | mikeL | 2008-07-17 19:59:20 +0100 (Thu, 17 Jul 2008) | 1 line
Changed the toolbar at the bottom of the downloads dialog to a horizontal button box and added a 'Close' button (Based on a suggestion from the dev list). Internationalized the rest of the strings. Fixed many style errors (thanks rjek). Set authentication fields in the options dialog to be insensitive when proxy type is simple. Namespace'd the rest of download.h
........
r4690 | mikeL | 2008-07-17 21:39:39 +0100 (Thu, 17 Jul 2008) | 1 line
Removed close button. fixed text on resume button
........
r4691 | mikeL | 2008-07-17 22:13:13 +0100 (Thu, 17 Jul 2008) | 1 line
Added gtk downloads section
........
r4715 | mikeL | 2008-07-20 19:41:39 +0100 (Sun, 20 Jul 2008) | 1 line
Downloads are now automatically sorted (Downloading, Error'd, Completed, Canceled). New downloads appear at the beginning of the list. Removed leftover callback for close button. Downloads without a known total size are now handled correctly (bouncing progress block). Fixed bug where shift+click downloads would throw an error (encoding is now always set to binary).
........
r4716 | mikeL | 2008-07-20 19:45:24 +0100 (Sun, 20 Jul 2008) | 1 line
Removed unnecessary wndDownloads section
........
r4717 | mikeL | 2008-07-20 19:53:44 +0100 (Sun, 20 Jul 2008) | 1 line
Removed label on url in about dialog. Removed extra variable from the input callback. These changes should have already been committed a while back but for some reason they were skipped
........
r4718 | mikeL | 2008-07-21 04:56:28 +0100 (Mon, 21 Jul 2008) | 1 line
Total progress bar is now working and acts correctly with downloads of unknown size. All downloads are now stored in a GList (this will later make it possible to implement things like clearing all inactive downloads). Individual downloads no longer update themselves every .5 seconds, the function nsgtk_download_update is called using a g_timeout and cycles through the GList updating the total progress bar and each download. Downloads of unknown size now report their total size upon completion.
........
r4719 | mikeL | 2008-07-21 05:06:17 +0100 (Mon, 21 Jul 2008) | 1 line
Changed names of two functions that change sensitivity and status.
........
r4720 | mikeL | 2008-07-21 16:56:41 +0100 (Mon, 21 Jul 2008) | 1 line
Updated messages file
........
r4722 | mikeL | 2008-07-21 21:44:23 +0100 (Mon, 21 Jul 2008) | 1 line
Clear button now clears all inactive downloads when there is no selection.
........
r4723 | mikeL | 2008-07-21 22:11:00 +0100 (Mon, 21 Jul 2008) | 1 line
Fixed the total progress bar lagging behind events such as cancelations.
........
r4727 | mikeL | 2008-07-23 19:33:53 +0100 (Wed, 23 Jul 2008) | 1 line
Added an overwrite confirmation dialog for the 'save' button
........
r4728 | mikeL | 2008-07-23 19:43:44 +0100 (Wed, 23 Jul 2008) | 1 line
Save as dialog now starts in the default download directory instead of the user's home folder
........
r4729 | mikeL | 2008-07-23 20:02:34 +0100 (Wed, 23 Jul 2008) | 1 line
Updated Copyright information
........
r4734 | mikeL | 2008-07-24 19:30:12 +0100 (Thu, 24 Jul 2008) | 1 line
Fixed Info column not being set to expand
........
svn path=/trunk/netsurf/; revision=4752
Diffstat (limited to 'gtk/res/downloads.glade')
-rw-r--r-- | gtk/res/downloads.glade | 139 |
1 files changed, 90 insertions, 49 deletions
diff --git a/gtk/res/downloads.glade b/gtk/res/downloads.glade index ab12ad8c4..7b99a1a8d 100644 --- a/gtk/res/downloads.glade +++ b/gtk/res/downloads.glade @@ -1,7 +1,6 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.4 on Mon Jul 14 18:30:15 2008 --> +<?xml version="1.0"?> <glade-interface> + <requires-version lib="gtk+" version="2.12"/> <widget class="GtkWindow" id="wndDownloads"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="title" translatable="yes">NetSurf Downloads</property> @@ -14,94 +13,136 @@ <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <child> - <widget class="GtkTreeView" id="treeDownloads"> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="headers_clickable">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <child> + <widget class="GtkTreeView" id="treeDownloads"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="search_column">2</property> + <property name="show_expanders">False</property> + <property name="rubber_banding">True</property> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkHSeparator" id="hseparator1"> + <property name="visible">True</property> </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> </child> <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="border_width">2</property> <child> - <widget class="GtkProgressBar" id="progressBar"> + <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="fraction">0.20999999344348907</property> - <property name="text" translatable="yes">21% of 3 files</property> + <property name="top_padding">2</property> + <property name="bottom_padding">2</property> + <property name="left_padding">2</property> + <property name="right_padding">2</property> + <child> + <widget class="GtkProgressBar" id="progressBar"> + <property name="visible">True</property> + <property name="show_text">True</property> + <property name="text" translatable="yes">0% of 0 files</property> + </widget> + </child> </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> <child> - <widget class="GtkToolbar" id="toolbar2"> + <widget class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> - <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property> - <property name="show_arrow">False</property> - <property name="icon_size">GTK_ICON_SIZE_MENU</property> - <property name="icon_size_set">True</property> + <property name="homogeneous">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkToolButton" id="buttonPause"> + <widget class="GtkButton" id="buttonPause"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="is_important">True</property> - <property name="label"> Pause</property> - <property name="use_underline">True</property> - <property name="stock_id">gtk-media-pause</property> - <signal name="clicked" handler="button_clear_clicked" object="NULL"/> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-media-pause</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> </widget> - <packing> - <property name="expand">False</property> - </packing> </child> <child> - <widget class="GtkToolButton" id="buttonResume"> + <widget class="GtkButton" id="buttonPlay"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="is_important">True</property> - <property name="label"> Resume</property> - <property name="use_underline">True</property> - <property name="stock_id">gtk-media-play</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="response_id">0</property> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-media-play</property> + <property name="icon_size">2</property> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Resume</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> </widget> <packing> - <property name="expand">False</property> + <property name="position">1</property> </packing> </child> <child> - <widget class="GtkToolButton" id="buttonCancel"> + <widget class="GtkButton" id="buttonCancel"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="is_important">True</property> - <property name="label"> Cancel</property> - <property name="use_underline">True</property> - <property name="stock_id">gtk-cancel</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-cancel</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> </widget> <packing> - <property name="expand">False</property> + <property name="position">2</property> </packing> </child> <child> - <widget class="GtkToolButton" id="buttonClear"> + <widget class="GtkButton" id="buttonClear"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="tooltip" translatable="yes">Remove completed or cancelled downloads from the list</property> - <property name="visible_vertical">False</property> - <property name="is_important">True</property> - <property name="label"> Clear</property> - <property name="use_underline">True</property> - <property name="stock_id">gtk-clear</property> - <signal name="clicked" handler="button_clear_clicked"/> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-clear</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> </widget> <packing> - <property name="expand">False</property> + <property name="position">3</property> </packing> </child> </widget> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> <property name="position">1</property> </packing> </child> @@ -109,7 +150,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </widget> |