# HG changeset patch
# User masneyb
# Date 1099359206 0
# Node ID 5df5eac28f47c72e81279bb938b2cc029a2f05cd
# Parent  76d372913c71382e8807b6f0d3b04bc7cb34a7fe
2004-11-1 Brian Masney <masneyb@gftp.org>

        * src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - added a
        tooltip to the button on the top left of the GUI

        * src/gtk/gtkui.c (gftpui_disconnect) - call update_window_info()
        instead of update_window() so that the toolbar tooltip is updated
        properly

diff -r 76d372913c71 -r 5df5eac28f47 ChangeLog
--- a/ChangeLog	Tue Nov 02 01:02:04 2004 +0000
+++ b/ChangeLog	Tue Nov 02 01:33:26 2004 +0000
@@ -1,4 +1,11 @@
 2004-11-1 Brian Masney <masneyb@gftp.org>
+	* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - added a
+	tooltip to the button on the top left of the GUI
+
+	* src/gtk/gtkui.c (gftpui_disconnect) - call update_window_info()
+	instead of update_window() so that the toolbar tooltip is updated
+	properly
+
 	* src/gtk/bookmarks.c - don't allow the main bookmarks dialog to be
 	closed if a child entry is being edited. Fixes for a toplevel folder
 	that has no children
@@ -2989,7 +2996,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.353 2004/11/02 01:02:04 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.354 2004/11/02 01:33:26 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r 76d372913c71 -r 5df5eac28f47 src/gtk/gftp-gtk.c
--- a/src/gtk/gftp-gtk.c	Tue Nov 02 01:02:04 2004 +0000
+++ b/src/gtk/gftp-gtk.c	Tue Nov 02 01:33:26 2004 +0000
@@ -22,12 +22,13 @@
 
 static GtkItemFactory *log_factory, *dl_factory;
 static GtkWidget * local_frame, * remote_frame, * log_table, * transfer_scroll,
-                 * openurl_btn, * gftpui_command_toolbar;
+                 * gftpui_command_toolbar;
 
 gftp_window_data window1, window2, *other_wdata, *current_wdata;
 GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw,
           * dlwdw, * protocol_menu, * optionmenu, * gftpui_command_widget,
-          * download_left_arrow, * upload_right_arrow;
+          * download_left_arrow, * upload_right_arrow, * openurl_btn;
+GtkTooltips * openurl_tooltip;
 GtkAdjustment * logwdw_vadj;
 #if GTK_MAJOR_VERSION > 1
 GtkTextMark * logwdw_textmark;
@@ -429,6 +430,8 @@
   gtk_container_add (GTK_CONTAINER (toolbar), box);
   gtk_container_border_width (GTK_CONTAINER (box), 5);
 
+  openurl_tooltip = gtk_tooltips_new ();
+
   tempwid = toolbar_pixmap (parent, "connect.xpm");
   openurl_btn = gtk_button_new ();
   gtk_container_add (GTK_CONTAINER (openurl_btn), tempwid);
@@ -540,6 +543,7 @@
 #endif
 
   stop_btn = gtk_button_new ();
+
   gtk_container_add (GTK_CONTAINER (stop_btn), tempwid);
   gtk_widget_set_sensitive (stop_btn, 0);
   gtk_signal_connect_object (GTK_OBJECT (stop_btn), "clicked",
diff -r 76d372913c71 -r 5df5eac28f47 src/gtk/gftp-gtk.h
--- a/src/gtk/gftp-gtk.h	Tue Nov 02 01:02:04 2004 +0000
+++ b/src/gtk/gftp-gtk.h	Tue Nov 02 01:33:26 2004 +0000
@@ -180,7 +180,8 @@
 extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit,
                  * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu,
                  * gftpui_command_widget, * download_left_arrow,
-                 * upload_right_arrow;
+                 * upload_right_arrow, * openurl_btn;
+extern GtkTooltips * openurl_tooltip;
 extern GtkAdjustment * logwdw_vadj;
 #if GTK_MAJOR_VERSION > 1
 extern GtkTextMark * logwdw_textmark;
diff -r 76d372913c71 -r 5df5eac28f47 src/gtk/gtkui.c
--- a/src/gtk/gtkui.c	Tue Nov 02 01:02:04 2004 +0000
+++ b/src/gtk/gtkui.c	Tue Nov 02 01:33:26 2004 +0000
@@ -440,7 +440,7 @@
   gftp_delete_cache_entry (wdata->request, NULL, 1);
   gftp_disconnect (wdata->request);
   remove_files_window (wdata);
-  update_window (wdata);
+  update_window_info ();
 }
 
 
diff -r 76d372913c71 -r 5df5eac28f47 src/gtk/misc-gtk.c
--- a/src/gtk/misc-gtk.c	Tue Nov 02 01:02:04 2004 +0000
+++ b/src/gtk/misc-gtk.c	Tue Nov 02 01:33:26 2004 +0000
@@ -246,6 +246,13 @@
               break;
             }
         }
+
+      if (GFTP_IS_CONNECTED (current_wdata->request))
+        gtk_tooltips_set_tip (GTK_TOOLTIPS(openurl_tooltip), openurl_btn,
+                              _("Disconnect from the remote server"), NULL);
+      else
+        gtk_tooltips_set_tip (GTK_TOOLTIPS(openurl_tooltip), openurl_btn,
+                              _("Connect to the site specified in the host entry. If the host entry is blank, then a dialog is presented that will allow you to enter a URL."), NULL);
     }
 
   update_window (&window1);