Changeset 3354 for trunk/jons-gtk2-gui

Timestamp:

03/12/03 06:20:53 (6 years ago)

Author:

bostjanlah

Message:

Allow for buttons to be made insensitive (Matias Aguirre)
Fix a problem when only a single user was found and not displayed
A few simplifications

Files:

• trunk/jons-gtk2-gui/src/search_user_window.cpp (modified) (7 diffs)

trunk/jons-gtk2-gui/src/search_user_window.cpp

@@ -53 +53 @@
     GtkWidget *uin;
     GtkWidget *list;
-    GtkWidget *clear;
+    GtkWidget *clearBtn;
+    GtkWidget *doneBtn;
+    GtkWidget *searchBtn;
     GtkWidget *statusbar;
     unsigned long e_tag;
@@ -63 +65 @@
 void search_callback(GtkWidget *, gpointer);
 void search_list_double_click(GtkWidget *, GdkEventButton *, gpointer);
-void search_done(bool);
 void search_found(CSearchAck *);
-void search_failed();
 void search_close(GtkWidget *, gpointer);
 void clear_callback(GtkWidget *, gpointer);
@@ -234 +234 @@
 
     /* The "Search" button */
-    GtkWidget *search = gtk_button_new_with_mnemonic("_Search");
-    g_signal_connect(G_OBJECT(search), "clicked",
+    su->searchBtn = gtk_button_new_with_mnemonic("_Search");
+    g_signal_connect(G_OBJECT(su->searchBtn), "clicked",
             G_CALLBACK(search_callback), 0);
 
     /* The "Clear List" button */
-    su->clear = gtk_button_new_with_mnemonic("     _Clear List     ");
-    g_signal_connect(G_OBJECT(su->clear), "clicked",
+    su->clearBtn = gtk_button_new_with_mnemonic("     _Clear List     ");
+    g_signal_connect(G_OBJECT(su->clearBtn), "clicked",
             G_CALLBACK(clear_callback), 0);
     // disabled until there's something to clear
-    gtk_widget_set_sensitive(su->clear, FALSE);
+    gtk_widget_set_sensitive(su->clearBtn, FALSE);
     
     /* The "Done" button */
-    GtkWidget *done = gtk_button_new_with_mnemonic("_Done");
-    g_signal_connect(G_OBJECT(done), "clicked",
+    su->doneBtn = gtk_button_new_with_mnemonic("_Done");
+    g_signal_connect(G_OBJECT(su->doneBtn), "clicked",
             G_CALLBACK(search_close), 0);
     
     /* we want these at the bottom */
-    gtk_box_pack_end(GTK_BOX(vbox), done, FALSE, FALSE, 0);
-    gtk_box_pack_end(GTK_BOX(vbox), su->clear, FALSE, FALSE, 0);
-    gtk_box_pack_end(GTK_BOX(vbox), search, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(vbox), su->doneBtn, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(vbox), su->clearBtn, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(vbox), su->searchBtn, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(top_hbox), vbox, TRUE, TRUE, 5);
@@ -318 +318 @@
             GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(su->list)));
     gtk_list_store_clear(store);
-    gtk_widget_set_sensitive(su->clear, FALSE);
+    gtk_widget_set_sensitive(su->clearBtn, FALSE);
     status_change(su->statusbar, "sta", "");
 }
@@ -364 +364 @@
                 get_text(su->keyword),
                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(su->online_only)));
+    gtk_widget_set_sensitive(su->searchBtn, FALSE);
 }
 
@@ -405 +406 @@
     CSearchAck *search_ack = event->SearchAck();
 
-    if (event->Result() == EVENT_SUCCESS)
-        search_done(search_ack->More());
-    else if (event->Result() == EVENT_ACKED)
+    if (search_ack != NULL && search_ack->Uin() != 0)
         search_found(search_ack);
-    else
-        search_failed();
-}
-
-void 
-search_done(bool more)
-{
-    if (more)
-        status_change(su->statusbar, "sta",
-            "More users found, narrow your search and try again.");
-    else
-        status_change(su->statusbar, "sta",
-            "Search complete, double click user to add her/him.");
+
+    if (event->Result() == EVENT_SUCCESS) {
+        if (search_ack->More())
+            status_change(su->statusbar, "sta",
+                "More users found, narrow your search and try again.");
+        else
+            status_change(su->statusbar, "sta",
+                "Search complete, double click user to add her/him.");
+        gtk_widget_set_sensitive(su->searchBtn, TRUE);
+    }
+    else if (event->Result() != EVENT_ACKED) {
+        status_change(su->statusbar, "sta", "Search failed.");
+        gtk_widget_set_sensitive(su->searchBtn, TRUE);
+    }
 }
 
@@ -474 +474 @@
     
     num_found_users++;
-    gtk_widget_set_sensitive(su->clear, TRUE);
-}
-
-void search_failed()
-{
-    status_change(su->statusbar, "sta", "Search failed.");
+    gtk_widget_set_sensitive(su->clearBtn, TRUE);
 }