From: Daniel Carbonell Fraj <bocata@src.gnome.org>
Date: Sat, 14 Jun 2003 14:29:23 +0000 (+0000)
Subject: merged the connect and disconnect buttons
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=7c4b408c1dbe7d1fd44940376e69e6a3aca7535f;p=gtetrinet

merged the connect and disconnect buttons
---

diff --git a/ChangeLog b/ChangeLog
index 91749d3..a6ba13b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-06-14  Dani Carbonell  <bocata@panete.net>
+
+	* src/commands.c (show_connect_button, show_disconnect_button):
+	new functions, to show and hide the connect button in the toolbar.
+	(make_menus): hide the disconnect button at startup.
+
+	* src/commands.h (show_disconnect_button, show_disconnect_button):
+	new functions.
+
+	* src/tetrinet.c (tetrinet_inmessage): added logic to show and
+	hide the connect/disconnect buttons.
+
 2003-06-13  Dani Carbonell  <bocata@panete.net>
 
 	* src/tetrinet.c (tetrinet_key): fixed this keypress signal
diff --git a/src/commands.c b/src/commands.c
index d38fb34..93f9701 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -114,6 +114,7 @@ void make_menus (GnomeApp *app)
 
   gnome_app_create_toolbar (app, toolbar);
   gtk_widget_hide (toolbar[4].widget);
+  gtk_widget_hide (toolbar[1].widget);
 }
 
 /* callbacks */
@@ -148,6 +149,18 @@ void start_command (void)
   client_outmessage (OUT_STARTGAME, buf);
 }
 
+void show_connect_button (void)
+{
+  gtk_widget_hide (toolbar[1].widget);
+  gtk_widget_show (toolbar[0].widget);
+}
+
+void show_disconnect_button (void)
+{
+  gtk_widget_hide (toolbar[0].widget);
+  gtk_widget_show (toolbar[1].widget);
+}
+
 void show_stop_button (void)
 {
   gtk_widget_hide (toolbar[3].widget);
diff --git a/src/commands.h b/src/commands.h
index b4f98df..0aee2fd 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -16,5 +16,7 @@ void preferences_command (void);
 void about_command (void);
 void show_start_button (void);
 void show_stop_button (void);
+void show_connect_button (void);
+void show_disconnect_button (void);
 
 void commands_checkstate (void);
diff --git a/src/tetrinet.c b/src/tetrinet.c
index 50edb72..48c1384 100644
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -187,6 +187,7 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
         up_chan_list_source = g_timeout_add (30000, (GSourceFunc) partyline_update_channel_list, NULL);
         partyline_joining_channel ("");
         show_start_button ();
+        show_disconnect_button ();
         break;
     case IN_DISCONNECT:
         if (!connected) {
@@ -214,6 +215,7 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
                        TETRI_TB_C_DARK_GREEN, TETRI_TB_BOLD);
         partyline_clear_list_channel ();
         partyline_joining_channel (NULL);
+        show_connect_button ();
         break;
     case IN_CONNECTERROR:
     connecterror:
@@ -231,6 +233,7 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
             gtk_dialog_run (GTK_DIALOG(dialog));
             gtk_widget_destroy (dialog);
             g_free (data_utf8);
+            show_connect_button ();
         }
         break;
     case IN_PLAYERNUM: