Mercurial > gftp.yaz
changeset 587:7937ade77c22
2004-10-5 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - disable the
upload/download buttons whenever the user is not connected to the
server (closes #153374)
| author | masneyb |
|---|---|
| date | Wed, 06 Oct 2004 02:07:58 +0000 |
| parents | 4b7f208dd6ee |
| children | 2366865be140 |
| files | ChangeLog src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c |
| diffstat | 4 files changed, 21 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 06 01:45:37 2004 +0000 +++ b/ChangeLog Wed Oct 06 02:07:58 2004 +0000 @@ -1,4 +1,8 @@ 2004-10-5 Brian Masney <masneyb@gftp.org> + * src/gtk/gftp-gtk.c src/gtk/gftp-gtk.h src/gtk/misc-gtk.c - disable the + upload/download buttons whenever the user is not connected to the + server (closes #153374) + * src/gtk/misc-gtk.c src/gtk/gftp-gtk.c - disable the items in the transfer menu when the user is not connected. (Patch partially from Frank Anderson <fanson@gmail.com>) @@ -2935,7 +2939,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.342 2004/10/06 01:45:37 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.343 2004/10/06 02:07:58 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/gftp-gtk.c Wed Oct 06 01:45:37 2004 +0000 +++ b/src/gtk/gftp-gtk.c Wed Oct 06 02:07:58 2004 +0000 @@ -26,7 +26,8 @@ gftp_window_data window1, window2, *other_wdata, *current_wdata; GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw, - * dlwdw, * protocol_menu, * optionmenu, * gftpui_command_widget; + * dlwdw, * protocol_menu, * optionmenu, * gftpui_command_widget, + * download_left_arrow, * upload_right_arrow; GtkAdjustment * logwdw_vadj; #if GTK_MAJOR_VERSION > 1 GtkTextMark * logwdw_textmark; @@ -824,8 +825,7 @@ static GtkWidget * CreateFTPWindows (GtkWidget * ui) { - GtkWidget *box, *dlbox, *winpane, *dlpane, *logpane, *mainvbox, *tempwid, - *button; + GtkWidget *box, *dlbox, *winpane, *dlpane, *logpane, *mainvbox, *tempwid; gftp_config_list_vars * tmplistvar; char *dltitles[2]; intptr_t tmplookup; @@ -877,11 +877,11 @@ GTK_ICON_SIZE_SMALL_TOOLBAR); #endif - button = gtk_button_new (); - gtk_box_pack_start (GTK_BOX (dlbox), button, TRUE, FALSE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", + upload_right_arrow = gtk_button_new (); + gtk_box_pack_start (GTK_BOX (dlbox), upload_right_arrow, TRUE, FALSE, 0); + gtk_signal_connect_object (GTK_OBJECT (upload_right_arrow), "clicked", GTK_SIGNAL_FUNC (put_files), NULL); - gtk_container_add (GTK_CONTAINER (button), tempwid); + gtk_container_add (GTK_CONTAINER (upload_right_arrow), tempwid); #if GTK_MAJOR_VERSION == 1 tempwid = toolbar_pixmap (ui, "left.xpm"); @@ -890,11 +890,11 @@ GTK_ICON_SIZE_SMALL_TOOLBAR); #endif - button = gtk_button_new (); - gtk_box_pack_start (GTK_BOX (dlbox), button, TRUE, FALSE, 0); - gtk_signal_connect_object (GTK_OBJECT (button), "clicked", + download_left_arrow = gtk_button_new (); + gtk_box_pack_start (GTK_BOX (dlbox), download_left_arrow, TRUE, FALSE, 0); + gtk_signal_connect_object (GTK_OBJECT (download_left_arrow), "clicked", GTK_SIGNAL_FUNC (get_files), NULL); - gtk_container_add (GTK_CONTAINER (button), tempwid); + gtk_container_add (GTK_CONTAINER (download_left_arrow), tempwid); gtk_paned_pack1 (GTK_PANED (winpane), box, 1, 1);
--- a/src/gtk/gftp-gtk.h Wed Oct 06 01:45:37 2004 +0000 +++ b/src/gtk/gftp-gtk.h Wed Oct 06 02:07:58 2004 +0000 @@ -179,7 +179,8 @@ extern gftp_window_data window1, window2, * other_wdata, * current_wdata; extern GtkWidget * stop_btn, * hostedit, * useredit, * passedit, * portedit, * logwdw, * dlwdw, * protocol_menu, * optionmenu, - * gftpui_command_widget; + * gftpui_command_widget, * download_left_arrow, + * upload_right_arrow; extern GtkAdjustment * logwdw_vadj; #if GTK_MAJOR_VERSION > 1 extern GtkTextMark * logwdw_textmark;
--- a/src/gtk/misc-gtk.c Wed Oct 06 01:45:37 2004 +0000 +++ b/src/gtk/misc-gtk.c Wed Oct 06 02:07:58 2004 +0000 @@ -376,6 +376,9 @@ set_menu_sensitive (NULL, menus[start + 10].path, connected); set_menu_sensitive (NULL, menus[start + 11].path, connected); + + gtk_widget_set_sensitive (download_left_arrow, connected); + gtk_widget_set_sensitive (upload_right_arrow, connected); }