Changeset 2168 for trunk/jons-gtk-gui

Timestamp:

07/21/00 10:37:20 (8 years ago)

Author:

emojon

Message:

New options: Enable Flashing Events, and Away Color

Location:

trunk/jons-gtk-gui/src

Files:

• contact_list.cpp (modified) (2 diffs)
• convo.cpp (modified) (2 diffs)
• licq_gtk.h (modified) (2 diffs)
• option_window.cpp (modified) (9 diffs)

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

@@ -70 +70 @@
 gint flash_icons(gpointer data)
 {
-    if(nToFlash < 0)
+    // If we aren't supposed to flash or there are no things to flash
+    if(!flash_events || (nToFlash < 0))
         return -1;
-
+        
     list<SFlash *>::iterator it;
     for(it = FlashList.begin(); it != FlashList.end(); it++)
@@ -168 +169 @@
                 0, "!");
 
-/*          nToFlash++;
-            list<SFlash *>::iterator it;
-            for(it = FlashList.begin(); it != FlashList.end(); it++)
+            if(flash_events)
             {
-                if((*it)->nUin != pUser->Uin())
-                    (*it)->nRow++;
+                struct SFlash *flash = g_new0(struct SFlash, 1);
+                flash->nRow = ++nToFlash; 
+                flash->icon = icon;
+                flash->bFlashOn = false;
+                flash->nUin = pUser->Uin();
+
+                FlashList.push_back(flash);
             }
-*/
-            struct SFlash *flash = g_new0(struct SFlash, 1);
-            flash->nRow = ++nToFlash; 
-            flash->icon = icon;
-            flash->bFlashOn = false;
-            flash->nUin = pUser->Uin();
-
-            FlashList.push_back(flash);
 
         } 

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

@@ -219 +219 @@
 
     // Stop the flashing if necessary
-        if(c->user->NewMessages() > 0)
+        if((c->user->NewMessages() > 0) && flash_events)
         {
                 // Stop the flashing for this user
@@ -243 +243 @@
         }
         }
+
+    // Clear the flash list
+    else if((c->user->NewMessages() > 0) && !flash_events)
+    {
+        nToFlash = -1;
+        FlashList.clear();
+    }
 }
 

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

@@ -307 +307 @@
     GtkWidget *show_offline;
     GtkWidget *enter_sends;
+    GtkWidget *flash_events;
 };
 
@@ -444 +445 @@
 extern bool show_ignored_users;
 extern bool enter_sends;
+extern bool flash_events;
 
 /* Globals in random_chat.cpp */

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

@@ -29 +29 @@
 bool show_ignored_users;
 bool enter_sends;
+bool flash_events;
 
 /* The "Options" selection under the menu in the main window */
@@ -75 +76 @@
              GTK_FILL, 3, 3);
 
+    // Flash events
+    ow->flash_events = gtk_check_button_new_with_label("Flash events");
+    gtk_table_attach(GTK_TABLE(table), ow->flash_events, 1, 2, 1, 2,
+        GtkAttachOptions(GTK_FILL | GTK_EXPAND), GTK_FILL, 3, 3);
+
     /* Set the check buttons */
     set_options(ow);
@@ -129 +135 @@
              GTK_FILL, GTK_FILL, 3, 3);
 
+    // Away color label
+    label = gtk_label_new("Away Color");
+    gtk_table_attach(GTK_TABLE(clr_table), label, 0, 1, 2, 3,
+             GTK_FILL, GTK_FILL, 3, 3);
+
+    // Offline color browse button
+    int *chg_away_color = new int;
+    *chg_away_color = 3;
+
+    GtkWidget *away_browse = gtk_button_new_with_label("Browse");
+    gtk_signal_connect(GTK_OBJECT(away_browse), "clicked",
+        GTK_SIGNAL_FUNC(show_on_color_dlg), (gpointer)chg_away_color);
+    gtk_table_attach(GTK_TABLE(clr_table), away_browse, 2, 3, 2, 3,
+        GTK_FILL, GTK_FILL, 3, 3);
+
     label = gtk_label_new("Contact List");
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook), table, label);
@@ -149 +170 @@
 {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->show_ignored),
-                     show_ignored_users);
+        show_ignored_users);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->show_offline),
-                     show_offline_users);
+        show_offline_users);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->enter_sends),
-                     enter_sends);
+        enter_sends);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ow->flash_events),
+        flash_events);
 }
 
@@ -167 +190 @@
         GTK_TOGGLE_BUTTON(ow->show_ignored));
     enter_sends = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ow->enter_sends));
+    flash_events = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+        ow->flash_events));
     
     gtk_widget_destroy(ow->window);
@@ -196 +221 @@
     licqConf.WriteBool("ShowIgnoredUsres", show_ignored_users);
     licqConf.WriteBool("EnterSends", enter_sends);
+    licqConf.WriteBool("FlashEvents", flash_events);
 
     licqConf.FlushFile();
@@ -240 +266 @@
     licqConf.ReadBool("ShowIgnoredUsers", show_ignored_users, false);
     licqConf.ReadBool("EnterSends", enter_sends, true);
+    licqConf.ReadBool("FlashEvents", flash_events, true);
 }
 
@@ -260 +287 @@
         color[2] = (gdouble)offline_color->blue / 65535;
         color[3] = (gdouble)offline_color->pixel / 65535;
+        break;
+    case 3:
+        color[0] = (gdouble)away_color->red / 65535;
+        color[1] = (gdouble)away_color->green / 65535;
+        color[2] = (gdouble)away_color->blue / 65535;
+        color[3] = (gdouble)away_color->pixel / 65535;
         break;
     }
@@ -317 +350 @@
         offline_color->pixel = (gulong)new_color[3];
         break;
+    case 3:
+        away_color->red = (guint16)(new_color[0] * 65535.0);
+        away_color->green = (guint16)(new_color[1] * 65535.0);
+        away_color->blue = (guint16)(new_color[2] * 65535.0);
+        away_color->pixel = (gulong)new_color[3];
+        break;
     }