Changeset 4552

Timestamp:

08/08/06 05:33:04 (2 years ago)

Author:

erijo

Message:

Added patch from Philipp Kolmann to have alias and/or name displayed
in the user popup.

Location:

trunk/qt-gui/src

Files:

• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (1 diff)
• optionsdlg.cpp (modified) (3 diffs)
• optionsdlg.h (modified) (1 diff)
• userbox.cpp (modified) (1 diff)

trunk/qt-gui/src/mainwin.cpp

@@ -470 +470 @@
   m_colorChatBkg = QColor(szTemp);
 
-  licqConf.ReadBool("showPopEmail",m_bPopEmail, false);
-  licqConf.ReadBool("showPopPhone",m_bPopPhone, true);
-  licqConf.ReadBool("showPopFax",m_bPopFax, false);
-  licqConf.ReadBool("showPopCellular",m_bPopCellular, true);
-  licqConf.ReadBool("showPopIP",m_bPopIP, false);
-  licqConf.ReadBool("showPopLastOnelin",m_bPopLastOnline, false);
+  licqConf.ReadBool("showPopAlias", m_bPopAlias, false);
+  licqConf.ReadBool("showPopName", m_bPopName, false);
+  licqConf.ReadBool("showPopEmail", m_bPopEmail, false);
+  licqConf.ReadBool("showPopPhone", m_bPopPhone, true);
+  licqConf.ReadBool("showPopFax", m_bPopFax, false);
+  licqConf.ReadBool("showPopCellular", m_bPopCellular, true);
+  licqConf.ReadBool("showPopIP", m_bPopIP, false);
+  licqConf.ReadBool("showPopLastOnelin", m_bPopLastOnline, false);
   licqConf.ReadBool("showPopOnlineSince", m_bPopOnlineSince, false);
   licqConf.ReadBool("showPopIdleTime", m_bPopIdleTime, true);
@@ -3676 +3678 @@
   licqConf.WriteStr("ChatBackground", m_colorChatBkg.name());
   
-  licqConf.WriteBool("showPopEmail",m_bPopEmail);
-  licqConf.WriteBool("showPopPhone",m_bPopPhone);
-  licqConf.WriteBool("showPopFax",m_bPopFax);
-  licqConf.WriteBool("showPopCellular",m_bPopCellular);
-  licqConf.WriteBool("showPopIP",m_bPopIP);
-  licqConf.WriteBool("showPopLastOnelin",m_bPopLastOnline);
+  licqConf.WriteBool("showPopAlias", m_bPopAlias);
+  licqConf.WriteBool("showPopName", m_bPopName);
+  licqConf.WriteBool("showPopEmail", m_bPopEmail);
+  licqConf.WriteBool("showPopPhone", m_bPopPhone);
+  licqConf.WriteBool("showPopFax", m_bPopFax);
+  licqConf.WriteBool("showPopCellular", m_bPopCellular);
+  licqConf.WriteBool("showPopIP", m_bPopIP);
+  licqConf.WriteBool("showPopLastOnelin", m_bPopLastOnline);
   licqConf.WriteBool("showPopOnlineSince", m_bPopOnlineSince);
   licqConf.WriteBool("showPopIdleTime", m_bPopIdleTime);

trunk/qt-gui/src/mainwin.h

@@ -138 +138 @@
        m_bAutoSendThroughServer,
        m_bEnableMainwinMouseMovement,
+       m_bPopAlias,
+       m_bPopName,
        m_bPopEmail,
        m_bPopPhone,

trunk/qt-gui/src/optionsdlg.cpp

@@ -244 +244 @@
   chkMsgWinSticky->setChecked(mainwin->m_bMsgWinSticky);
   chkSingleLineChatMode->setChecked(mainwin->m_bSingleLineChatMode);
+  popAlias->setChecked(mainwin->m_bPopAlias);
+  popName->setChecked(mainwin->m_bPopName);
   popEmail->setChecked(mainwin->m_bPopEmail);
   popPhone->setChecked(mainwin->m_bPopPhone);
@@ -544 +546 @@
   mainwin->m_bSingleLineChatMode = chkSingleLineChatMode->isChecked();
 
-  mainwin->m_bPopEmail= popEmail->isChecked();
-  mainwin->m_bPopPhone= popPhone->isChecked();
-  mainwin->m_bPopFax= popFax->isChecked();
-  mainwin->m_bPopCellular= popCellular->isChecked();
-  mainwin->m_bPopIP= popIP->isChecked();
-  mainwin->m_bPopLastOnline= popLastOnline->isChecked();
+  mainwin->m_bPopAlias = popAlias->isChecked();
+  mainwin->m_bPopName = popName->isChecked();
+  mainwin->m_bPopEmail = popEmail->isChecked();
+  mainwin->m_bPopPhone = popPhone->isChecked();
+  mainwin->m_bPopFax = popFax->isChecked();
+  mainwin->m_bPopCellular = popCellular->isChecked();
+  mainwin->m_bPopIP = popIP->isChecked();
+  mainwin->m_bPopLastOnline = popLastOnline->isChecked();
   mainwin->m_bPopOnlineSince = popOnlineSince->isChecked();
   mainwin->m_bPopIdleTime = popIdleTime->isChecked();
@@ -1457 +1461 @@
   boxPopWin = new QGroupBox(1, Horizontal, tr("Popup info"), w);
 
+  popAlias  = new QCheckBox(tr("Alias"), boxPopWin);
+  popName   = new QCheckBox(tr("Name"),  boxPopWin);
   popEmail  = new QCheckBox(tr("Email"), boxPopWin);
   popPhone  = new QCheckBox(tr("Phone"), boxPopWin);

trunk/qt-gui/src/optionsdlg.h

@@ -136 +136 @@
    QWidget* new_popup_options();
    QGroupBox *boxPopWin;
-   QCheckBox *popEmail, *popPhone, *popFax, *popCellular, *popIP,
-    *popLastOnline, *popOnlineSince, *popIdleTime, *popID;
+   QCheckBox *popAlias, *popName, *popEmail, *popPhone,
+             *popFax, *popCellular, *popIP,
+             *popLastOnline, *popOnlineSince, *popIdleTime, *popID;
 
    QWidget* new_chat_options();

trunk/qt-gui/src/userbox.cpp

@@ -1584 +1584 @@
     QString s = strFileName + QString("<nobr>") + QString(ICQUser::StatusToStatusStr(item->m_nStatus, item->m_bStatusInvisible))
       + QString("</nobr>");
+    
+    if (*u->GetAlias() && gMainWindow->m_bPopAlias)
+      s += tr("<br><nobr>") + codec->toUnicode(u->GetAlias()) + tr("</nobr>");
+
+    if ((*u->GetFirstName() || *u->GetLastName()) && gMainWindow->m_bPopName)
+    {
+      s += tr("<br><nobr>");
+      if (*u->GetFirstName())
+        s += codec->toUnicode(u->GetFirstName());
+      if (*u->GetFirstName() && *u->GetLastName())
+        s += " ";
+      if (*u->GetLastName())
+        s += codec->toUnicode(u->GetLastName());
+      s += tr("</nobr>");
+    }
 
     if (item->m_nStatusFull & ICQ_STATUS_FxBIRTHDAY)