Changeset 2960 for trunk/jons-gtk-gui

Timestamp:

08/06/02 23:03:58 (6 years ago)

Author:

emostar

Message:

Few fixes for chat and files.
And a patch by Draky Void <draky AT iate.obninsk.ru>

Location:

trunk/jons-gtk-gui/src

Files:

• chat_window.cpp (modified) (2 diffs)
• convo.cpp (modified) (3 diffs)
• extras.cpp (modified) (1 diff)
• file_window.cpp (modified) (2 diffs)
• licq_gtk.h (modified) (1 diff)
• main.cpp (modified) (1 diff)

trunk/jons-gtk-gui/src/chat_window.cpp

@@ -282 +282 @@
                 GTK_COMBO(rc->chat_list)->entry)),
             nPort,
-            send_as);
+            send_as, false);
     }
     
@@ -291 +291 @@
             gtk_editable_get_chars(GTK_EDITABLE(rc->text_box),
                 0, -1),
-            send_as);
+            send_as, false);
     }
 

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

@@ -266 +266 @@
 {
     struct conversation *c = (struct conversation *)data;
-
+    guint state;
+
+    state = eventkey->state;
     if(eventkey->keyval == GDK_Return)
     {
-        if(enter_sends && !(eventkey->state & GDK_SHIFT_MASK))
-        {
+        if(!enter_sends && (state & GDK_SHIFT_MASK))
+            convo_send(0, (gpointer)c);
+        if (enter_sends && !(state & GDK_SHIFT_MASK) &&
+            !(state & GDK_CONTROL_MASK))
+        {
+            gtk_signal_emit_stop_by_name(GTK_OBJECT(entry),
+                    "key_press_event");
             convo_send(0, (gpointer)c);
         }
@@ -284 +291 @@
 
     return TRUE;
+}
+
+void convo_nick_timestamp(GtkWidget *text, const char *nick, time_t message_time, GdkColor *color)
+{
+    // How about their alias and an optional timestamp?
+    if (show_convo_timestamp)
+    {
+        char szTime[26];
+        struct tm *_tm = localtime(&message_time);
+        strftime(szTime, 26, timestamp_format, _tm);
+        szTime[25] = '\0';
+
+        char *szTempStamp = g_strdup_printf("[%s] ", szTime);
+        gtk_text_insert(GTK_TEXT(text), 0, NULL, 0, szTempStamp, -1);
+        g_free(szTempStamp);
+    }
+    
+    gtk_text_insert(GTK_TEXT(text), 0, color, 0, nick, -1);
+    gtk_text_insert(GTK_TEXT(text), 0, color, 0, " : ", -1);
 }
 
@@ -457 +483 @@
     // How about their alias and an optional timestamp?
     gtk_text_freeze(GTK_TEXT(c->text));
-    gtk_text_insert(GTK_TEXT(c->text), 0, red, 0, c->user->GetAlias(), -1);
-
-    if (show_convo_timestamp)
-    {
-        char szTime[26];
-        time_t message_time = u_event->Time();
-        struct tm *_tm = localtime(&message_time);
-        strftime(szTime, 26, timestamp_format, _tm);
-        szTime[25] = '\0';
-    
-        char *szTempStamp = g_strdup_printf(" (%s): ", szTime);
-        gtk_text_insert(GTK_TEXT(c->text), 0, red, 0, szTempStamp, -1);
-        g_free(szTempStamp);
-    }
-    else
-    {
-        gtk_text_insert(GTK_TEXT(c->text), 0, red, 0, " : ", -1);
-    }
+    convo_nick_timestamp(c->text, c->user->GetAlias(), u_event->Time(), red);
 
     switch (u_event->SubCommand())

trunk/jons-gtk-gui/src/extras.cpp

@@ -324 +324 @@
         
         gtk_text_freeze(GTK_TEXT(c->entry));
-        gtk_text_insert(GTK_TEXT(c->text), 0, blue, 0, name, -1);
-        gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, c->for_user, -1);
+        gtk_text_freeze(GTK_TEXT(c->text));
+        convo_nick_timestamp(c->text, name, time(NULL), blue);
+        gtk_text_insert(GTK_TEXT(c->text), 0,
+            0,
+            0,
+            c->for_user, -1);
+        gtk_text_thaw(GTK_TEXT(c->text));
         gtk_text_thaw(GTK_TEXT(c->entry));
     }

trunk/jons-gtk-gui/src/file_window.cpp

@@ -181 +181 @@
     // Actually accept the file
     icq_daemon->icqFileTransferAccept(fw->uin,
-                      fw->ftman->LocalPort(), fw->sequence);
+                      fw->ftman->LocalPort(), fw->sequence,
+                      false);
 }
 
@@ -688 +689 @@
                 gtk_editable_get_chars(GTK_EDITABLE(
                     fs->description), 0, -1),
-                ICQ_TCPxMSG_NORMAL);
+                ICQ_TCPxMSG_NORMAL, false);
 }
 

trunk/jons-gtk-gui/src/licq_gtk.h

@@ -609 +609 @@
 extern struct conversation *convo_find(unsigned long);
 extern void convo_show(struct conversation *);
+extern void convo_nick_timestamp(GtkWidget *, const char *, time_t, GdkColor *);
 extern void convo_send(GtkWidget *, gpointer);
 extern gboolean key_press_convo(GtkWidget *, GdkEventKey *, gpointer);

trunk/jons-gtk-gui/src/main.cpp

@@ -74 +74 @@
 bool LP_Init(int argc, char **argv)
 {
+    gtk_set_locale();
     return( gtk_init_check(&argc, &argv) );
 }