Changeset 2130 for trunk/jons-gtk-gui

Timestamp:

07/12/00 12:31:56 (8 years ago)

Author:

emojon

Message:

Added 3 icons.. Secure On, Birthday, and the two put together due to a
limitation of having more than one pixmap in a gtk_clist_set_pixtext(...);

Location:

trunk/jons-gtk-gui/src

Files:

• contact_list.cpp (modified) (3 diffs)
• extras.cpp (modified) (2 diffs)
• licq_gtk.h (modified) (1 diff)
• pixmaps/birthday.xpm (added)
• pixmaps/securebday.xpm (added)
• pixmaps/secure_on.xpm (added)

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

@@ -30 +30 @@
 GdkColor *red, *blue, *online_color, *offline_color, *away_color;
 struct status_icon *online, *offline, *away, *na, *dnd, *occ, *ffc,
-    *invisible, *message_icon, *file_icon, *chat_icon, *url_icon;
+    *invisible, *message_icon, *file_icon, *chat_icon, *url_icon,
+    *secure_icon, *birthday_icon, *securebday_icon;
 
 GtkWidget *contact_list_new(gint height, gint width)
@@ -68 +69 @@
     /* Don't update the clist window, so we can update all the users */
     gtk_clist_freeze(GTK_CLIST(contact_list));
-
-//  do_colors();    /* Make the colors */
-//  do_pixmaps();   /* Make the pixmap */
 
     blah[0] = "";
@@ -230 +228 @@
         } // else
 
-        gtk_clist_set_text(GTK_CLIST(contact_list), num_users,
+        if(pUser->Secure() && (pUser->Birthday() == 0))
+        {
+            gtk_clist_set_pixtext(GTK_CLIST(contact_list),
+                num_users, 2, pUser->GetAlias(), 4,
+                securebday_icon->pm, securebday_icon->bm);
+        }
+        else if(pUser->Secure())
+        {
+            gtk_clist_set_pixtext(GTK_CLIST(contact_list),
+                num_users, 2, pUser->GetAlias(), 4,
+                secure_icon->pm, secure_icon->bm);
+        }
+        else if(pUser->Birthday() == 0)
+        {
+            gtk_clist_set_pixtext(GTK_CLIST(contact_list),
+                num_users, 2, pUser->GetAlias(), 4,
+                birthday_icon->pm, birthday_icon->bm);
+        }
+        else
+        {
+            gtk_clist_set_text(GTK_CLIST(contact_list), num_users,
                       2, pUser->GetAlias());
+        }
 
         gtk_clist_set_row_data(GTK_CLIST(contact_list), 

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

@@ -33 +33 @@
 #include "pixmaps/chat.xpm"
 #include "pixmaps/url.xpm"
+#include "pixmaps/secure_on.xpm"
+#include "pixmaps/birthday.xpm"
+#include "pixmaps/securebday.xpm"
 
 #include "licq_countrycodes.h"
@@ -73 +76 @@
     file_icon = make_pixmap(file_icon, (gchar **)file_xpm);
     chat_icon = make_pixmap(chat_icon, (gchar **)chat_xpm);
+    secure_icon = make_pixmap(secure_icon, (gchar **)secure_on_xpm);
+    birthday_icon = make_pixmap(birthday_icon, (gchar **)birthday_xpm);
+    securebday_icon = make_pixmap(securebday_icon, (gchar **)securebday_xpm);
 }
 

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

@@ -384 +384 @@
 extern GdkColor *red, *blue, *online_color, *offline_color, *away_color;
 extern struct status_icon *online, *away, *na, *dnd, *occ, *offline, *ffc,
-    *invisible, *message_icon, *file_icon, *chat_icon, *url_icon;
+    *invisible, *message_icon, *file_icon, *chat_icon, *url_icon,
+    *secure_icon, *birthday_icon, *securebday_icon;
 
 /* Globals in chat_window.cpp */