Changeset 2448 for trunk/jons-gtk-gui

Timestamp:

01/17/01 00:20:32 (8 years ago)

Author:

emojon

Message:

Forgot to add these files.

Location:

trunk/jons-gtk-gui/src

Files:

• convo.cpp (modified) (3 diffs)
• event_description.cpp (added)
• event_description.h (added)
• option_window.cpp (modified) (1 diff)

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

@@ -405 +405 @@
     }
 
+    // Use theme colors if it is black on white
+    bool bIgnoreBW = false;
+
     // Get the color that it was sent in if it's wanted
     if (recv_colors)
@@ -419 +422 @@
 
         CICQColor *pIcqColor = u_event->Color();
-        c->clrFore->red   = pIcqColor->ForeRed() * 257;
-        c->clrFore->green = pIcqColor->ForeGreen() * 257;
-        c->clrFore->blue  = pIcqColor->ForeBlue() * 257;
-        c->clrFore->pixel = 255;
-        c->clrBack->red   = pIcqColor->BackRed() * 257;
-        c->clrBack->green = pIcqColor->BackGreen() * 257;
-        c->clrBack->blue  = pIcqColor->BackBlue() * 257;
-        c->clrBack->pixel = 255;
+
+        if (pIcqColor->Foreground() == 0x00000000 &&
+            pIcqColor->Background() == 0x00FFFFFF)
+        {
+            bIgnoreBW = true;
+        }
+        else
+        {
+            c->clrFore->red   = pIcqColor->ForeRed() * 257;
+            c->clrFore->green = pIcqColor->ForeGreen() * 257;
+            c->clrFore->blue  = pIcqColor->ForeBlue() * 257;
+            c->clrFore->pixel = 255;
+            c->clrBack->red   = pIcqColor->BackRed() * 257;
+            c->clrBack->green = pIcqColor->BackGreen() * 257;
+            c->clrBack->blue  = pIcqColor->BackBlue() * 257;
+            c->clrBack->pixel = 255;
+        }
     }
     else
@@ -464 +476 @@
       case ICQ_CMDxSUB_MSG:
       {
-        gtk_text_insert(GTK_TEXT(c->text), 0, c->clrFore, c->clrBack,
+        gtk_text_insert(GTK_TEXT(c->text), 0,
+                bIgnoreBW ? 0 : c->clrFore,
+                bIgnoreBW ? 0 : c->clrBack,
                         u_event->Text(), -1);
         gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, "\n", -1);

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

@@ -554 +554 @@
     
     // Auto logon
-    licqConf.ReadNum("AutoLogon", auto_logon, 0);
+    licqConf.ReadNum("AutoLogon", auto_logon, ICQ_STATUS_OFFLINE);
 }