Changeset 3351 for trunk/jons-gtk2-gui

Timestamp:

03/12/03 00:40:52 (6 years ago)

Author:

bostjanlah

Message:

Make status empty after Cancel
A few other minor changes

Files:

• trunk/jons-gtk2-gui/src/convo.cpp (modified) (12 diffs)

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

@@ -40 +40 @@
     GtkWidget *send_urgent;
     GtkWidget *send_list;
-    GtkWidget *progress;
     GdkColor *clrFore;
     GdkColor *clrBack;
-    gchar prog_buf[60];
     gchar *for_user;
     ICQUser *user;
@@ -56 +54 @@
 void convo_show(conversation *);
 void convo_nick_timestamp(GtkWidget *, const char *, time_t, GdkColor *);
-void convo_send(GtkWidget *, gpointer);
+void convo_send(GtkWidget *, conversation *c);
 gboolean key_press_convo(GtkWidget *, GdkEventKey *, gpointer);
 void verify_convo_send(GtkWidget *, guint, gchar *, conversation *);
@@ -206 +204 @@
     button_box = gtk_hbox_new(FALSE, 0);
     /* Progress of message */
-    c->progress = gtk_statusbar_new();
-    g_signal_connect(G_OBJECT(c->progress), "text-pushed",
-               G_CALLBACK(verify_convo_send), c);
-    gtk_widget_set_size_request(c->progress, 300, -1); 
+    c->etag->statusbar = gtk_statusbar_new();
+    gtk_widget_set_size_request(c->etag->statusbar, 300, -1); 
     
     /* Make new buttons with labels */
@@ -219 +215 @@
                G_CALLBACK(convo_close_or_cancel), c);
     g_signal_connect(G_OBJECT(c->send), "clicked",
-               G_CALLBACK(convo_send), (gpointer)c);
-    
-    gtk_box_pack_start(GTK_BOX(button_box), c->progress, TRUE, TRUE, 5);
+               G_CALLBACK(convo_send), c);
+    
+    gtk_box_pack_start(GTK_BOX(button_box), c->etag->statusbar, TRUE, TRUE, 5);
     GtkWidget *bbox = gtk_hbox_new(TRUE, 0);
     gtk_box_pack_start(GTK_BOX(bbox), c->close_or_cancel, TRUE, TRUE, 5);
@@ -251 +247 @@
             G_CALLBACK(convo_delete), c);
     
-    /* More e_tag_data stuff */
-    c->etag->statusbar = c->progress;
-    strcpy(c->etag->buf, c->prog_buf);
-
     gtk_widget_show_all(c->window);
     gtk_button_set_label(GTK_BUTTON(c->close_or_cancel), GTK_STOCK_CLOSE);
-    
 }
 
 gboolean key_press_convo(GtkWidget *entry, GdkEventKey *eventkey, gpointer data)
 {
-    if(eventkey->keyval == GDK_Return)
-    {
+    if (eventkey->keyval == GDK_Return) {
         conversation *c = (conversation *)data;
         guint state = eventkey->state;
@@ -270 +260 @@
         // - enter_sends is true and plain Enter was presses
         // - enter_sends is false and Shift/Ctrl+Enter was pressed
-        if((!enter_sends && (state & GDK_SHIFT_MASK)) ||
-                (enter_sends && !(state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))))
-        {
-            convo_send(0, (gpointer)c);
+        if ((!enter_sends && (state & GDK_SHIFT_MASK)) ||
+                (enter_sends && !(state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)))) {
+            convo_send(0, c);
             return TRUE;
         }
@@ -318 +307 @@
 }
 
-void convo_send(GtkWidget *widget, gpointer _c)
-{
-    conversation *c = (conversation *)_c;
-
+void convo_send(GtkWidget *widget, conversation *c)
+{
     /* Set the 2 button widgets */
     if(GTK_WIDGET_IS_SENSITIVE(c->send))
@@ -349 +336 @@
         urgent = TRUE;
 
-    strcpy(c->prog_buf, "Sending message ");
+    strcpy(c->etag->buf, "Sending message ");
 
     if(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->send_server)))
-        strcat(c->prog_buf, "directly ... ");
+        strcat(c->etag->buf, "directly ... ");
     else
-        strcat(c->prog_buf, "through server ... ");
+        strcat(c->etag->buf, "through server ... ");
 
     /* Send the message */
@@ -380 +367 @@
     }
 
-    guint id = gtk_statusbar_get_context_id(GTK_STATUSBAR(c->progress),
-                        "prog");
-    gtk_statusbar_pop(GTK_STATUSBAR(c->progress), id);
-    gtk_statusbar_push(GTK_STATUSBAR(c->progress), id, c->prog_buf);
-  
     /* Take care of the etd buffer and add it to the slist */
-    memcpy(c->etag->buf, c->prog_buf, 60);
+    status_change(c->etag->statusbar, "sta", c->etag->buf);
     catcher = g_slist_append(catcher, c->etag);
-}
-
-void verify_convo_send(GtkWidget *widget, guint id, gchar *text,
-               conversation *c)
-{
-    gchar temp[60];
-    strcpy(temp, text);
-    g_strreverse(temp);
-
-    if(strncmp(temp, " ...", 4) == 0)
-        return;
-    else
-    {
-        gtk_widget_set_sensitive(c->send, TRUE);
-        toggle_close_cancel(c, 1);
-    }
 }
 
@@ -417 +383 @@
     /* Remove the event from the slist */
     catcher = g_slist_remove(catcher, c->etag);
+
+    c->etag->buf[0] = '\0';
+    status_change(c->etag->statusbar, "sta", c->etag->buf);
 }
 
@@ -601 +570 @@
 
     /* If the window isn't open, there isn't anything left to do */
-    if(c == 0)
+    if (c == 0)
         return;
 
     /* Check to make sure it sent, and if it did, put the text in */
-    g_strreverse(c->etag->buf);
-
-    if(strncmp(c->etag->buf, "en", 2) == 0)
-    {
+    if (event->Result() == EVENT_ACKED || event->Result() == EVENT_SUCCESS) {
         ICQOwner *owner = gUserManager.FetchOwner(LOCK_R);
         const gchar *name = owner->GetAlias();
@@ -623 +589 @@
         gtk_text_buffer_insert(tb, &iter, c->for_user, -1);
         scroll_to_the_end(c->text);
-    }
-}
-
+
+        gtk_widget_set_sensitive(c->send, TRUE);
+        toggle_close_cancel(c, 1);
+    }
+}
+