From e894e38c37e8565c3672b1a9bde42fb5e0648aeb Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sat, 26 Jul 2008 17:30:26 +0000 Subject: 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 --- gtk/dialogs/gtk_about.c | 7 +++---- gtk/dialogs/gtk_options.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'gtk/dialogs') diff --git a/gtk/dialogs/gtk_about.c b/gtk/dialogs/gtk_about.c index 81d22cea8..e39af1cc2 100644 --- a/gtk/dialogs/gtk_about.c +++ b/gtk/dialogs/gtk_about.c @@ -52,10 +52,9 @@ void nsgtk_about_dialog_init(GtkWindow *parent, struct browser_window *bw, const gtk_about_dialog_set_url_hook (launch_url, (gpointer) bw, NULL); gtk_show_about_dialog(parent, "artists", artists, "authors", authors, - "comments", description,"copyright", copyright, "documenters", documenters, - "license", licence, - "program-name", name, "translator-credits", translators, - "version", version, "website", url, "website-label", url_label, + "comments", description,"copyright", copyright, + "documenters", documenters, "license", licence, "program-name", name, + "translator-credits", translators, "version", version, "website", url, "wrap-license", FALSE, NULL); } diff --git a/gtk/dialogs/gtk_options.c b/gtk/dialogs/gtk_options.c index a40e49e2d..d3ce5669d 100644 --- a/gtk/dialogs/gtk_options.c +++ b/gtk/dialogs/gtk_options.c @@ -317,7 +317,7 @@ COMBO_CHANGED(comboProxyType, proxy_type) option_http_proxy_auth = OPTION_HTTP_PROXY_AUTH_NTLM; break; } - gboolean sensitive = (!proxy_type == 0); + gboolean sensitive = (option_http_proxy_auth); gtk_widget_set_sensitive (entryProxyHost, sensitive); gtk_widget_set_sensitive (entryProxyPort, sensitive); gtk_widget_set_sensitive (entryProxyUser, sensitive); -- cgit v1.2.3