Changeset 5779 for trunk/qt-gui

Timestamp:

11/08/07 06:27:03 (13 months ago)

Author:

flynd

Message:

Merged some fixes from qt4-gui:

• r5676 - Made sure that network window has proper size.
• r5672 - Fixed mainwin minimum height calculation.
• r5665 - About page shows nothing for msn contacts so only use it as default for aim contacts.
• r5653 - Be more failsafe.
• r5601 - Made notice strings translatable; take the usereventcommon private PPID instead of a constant one to generate the real user id; revised the convo(Join|Leave) logic, which must fix #1392.
• r5591 - Don't let the fetched user remain undropped. Fixes #1558.
• r5540 - Made setMiniMode() more failsafe; Made skin changing in minimode resize the window properly.
• r5538 - Revised setMiniMode logic a bit.
• r5505 - Funny, isn't it?
• r5466 - Don't just hide the dialog, really delete it.
• r5392 - We have a constant for filename length, so let's use it.

Location:

trunk/qt-gui/src

Files:

• adduserdlg.cpp (modified) (1 diff)
• licqgui.cpp (modified) (1 diff)
• mainwin.cpp (modified) (7 diffs)
• outputwin.cpp (modified) (2 diffs)
• support.cpp (modified) (1 diff)
• usereventdlg.cpp (modified) (5 diffs)
• usereventdlg.h (modified) (1 diff)

trunk/qt-gui/src/adduserdlg.cpp

@@ -91 +91 @@
     connect (btnOk, SIGNAL(clicked()), SLOT(ok()) );
     connect (edtUin, SIGNAL(returnPressed()), SLOT(ok()) );
-    connect (btnCancel, SIGNAL(clicked()), SLOT(reject()) );
+  connect (btnCancel, SIGNAL(clicked()), SLOT(close()) );
 
     // Set Tab Order

trunk/qt-gui/src/licqgui.cpp

@@ -274 +274 @@
 
 #ifndef USE_KDE
-  char buf[500];
-  snprintf(buf, sizeof(buf), "%s/licq_qt-gui.style", BASE_DIR);
-  buf[sizeof(buf) - 1] = '\0';
+  char buf[MAX_FILENAME_LEN];
+  snprintf(buf, MAX_FILENAME_LEN, "%s/licq_qt-gui.style", BASE_DIR);
+  buf[MAX_FILENAME_LEN - 1] = '\0';
 
   QStyle *style = SetStyle(styleName);

trunk/qt-gui/src/mainwin.cpp

@@ -604 +604 @@
   pluginDlg = NULL;
   userEventTabDlg = NULL;
-  m_nRealHeight = 0;
+  m_nRealHeight = hVal;
 
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
@@ -954 +954 @@
   }
 
-  
+  unsigned minHeight = skin->frame.border.top + skin->frame.border.bottom;
+  setMinimumHeight(minHeight);
+  setMaximumHeight(m_bInMiniMode ? minHeight : QWIDGETSIZE_MAX);
+
   // Message Label
   delete lblMsg;
@@ -1766 +1769 @@
 }
 
-void CMainWindow::slot_socket(const char *szId, unsigned long nPPID, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+void CMainWindow::slot_socket(const char *szId, unsigned long nPPID, unsigned long convoId)
+{
   QPtrListIterator<UserSendCommon> it(licqUserSend);
 
@@ -1775 +1777 @@
     if (strcmp((*it)->Id(), szId) == 0 && (*it)->PPID() == nPPID)
     {
-      (*it)->SetConvoId(nConvoId);
-      break;
-    }
-  }
-}
-
-void CMainWindow::slot_convoJoin(const char *szId, unsigned long /* nPPID */, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+      (*it)->SetConvoId(convoId);
+      break;
+    }
+  }
+}
+
+void CMainWindow::slot_convoJoin(const char *szId, unsigned long ppid, unsigned long convoId)
+{
   QPtrListIterator<UserSendCommon> it(licqUserSend);
 
   for (; it.current(); ++it)
   {
-    if ((*it)->ConvoId() == nConvoId)
-    {
-      (*it)->convoJoin(szId, nConvoId);
-      return;
-    }
-  }
-  
-  // No conversation shown, so make one
-  
-}
-
-void CMainWindow::slot_convoLeave(const char *szId, unsigned long /* nPPID */, unsigned long nConvoId)
-{
-  // Add the user to an ongoing conversation
+    if ((*it)->PPID() == ppid && (*it)->ConvoId() == convoId)
+    {
+      (*it)->convoJoin(szId, convoId);
+      break;
+    }
+  }
+}
+
+void CMainWindow::slot_convoLeave(const char *szId, unsigned long ppid, unsigned long convoId)
+{
   QPtrListIterator<UserSendCommon> it(licqUserSend);
 
   for (; it.current(); ++it)
   {
-    if ((*it)->ConvoId() == nConvoId)
-    {
-      (*it)->convoLeave(szId, nConvoId);
-      return;
+    if ((*it)->PPID() == ppid && (*it)->ConvoId() == convoId && (*it)->FindUserInConvo(szId))
+    {
+      (*it)->convoLeave(szId, convoId);
+      break;
     }
   }
@@ -2635 +2632 @@
       break;
     case mnuUserGeneral:
-      if (isalpha(szId[0]))
+      if (nPPID == LICQ_PPID && isalpha(szId[0]))
         tab = UserInfoDlg::AboutInfo;
       else
@@ -2665 +2662 @@
       break;
     case mnuUserGeneral:
-      if (isalpha(szId[0]))
+      if (nPPID == LICQ_PPID && isalpha(szId[0]))
         f->showTab(UserInfoDlg::AboutInfo);
       else
@@ -3769 +3766 @@
 void CMainWindow::ToggleMiniMode()
 {
-
-   if (m_bInMiniMode)
-   {
-      userView->show();
-      setMaximumHeight(4096);
-      resize(width(), m_nRealHeight);
-      setMinimumHeight(100);
-   }
-   else
-   {
-      userView->QWidget::hide();
-      m_nRealHeight = height();
-      unsigned short newH = skin->frame.border.top + skin->frame.border.bottom;
-      setMinimumHeight(newH);
-      resize(width(), newH);
-      setMaximumHeight(newH);
-   }
-   m_bInMiniMode = !m_bInMiniMode;
-   mnuSystem->setItemChecked(mnuSystem->idAt(MNUxITEM_MINIxMODE), m_bInMiniMode);
+  m_bInMiniMode = !m_bInMiniMode;
+
+  if (m_bInMiniMode)
+  {
+    m_nRealHeight = height();
+    setMaximumHeight(minimumHeight());
+    userView->QWidget::hide();
+  }
+  else
+  {
+    setMaximumHeight(QWIDGETSIZE_MAX);
+    resize(width(), m_nRealHeight);
+    userView->show();
+  }
+
+  mnuSystem->setItemChecked(mnuSystem->idAt(MNUxITEM_MINIxMODE), m_bInMiniMode);
 }
 

trunk/qt-gui/src/outputwin.cpp

@@ -51 +51 @@
 
   outputBox = new CLogWidget(this);
-  outputBox->setMinimumHeight(outputBox->frameWidth()*2
-                              + 16*outputBox->fontMetrics().lineSpacing());
-  outputBox->setMinimumWidth(outputBox->minimumHeight()*2);
+  outputBox->setMinimumHeight(outputBox->frameWidth() * 2
+      + 16 * outputBox->fontMetrics().lineSpacing());
+  outputBox->setMinimumWidth(outputBox->minimumHeight() * 2);
   top_lay->addWidget(outputBox);
 
@@ -77 +77 @@
   lay->addWidget(btnClear);
   lay->addWidget(btnHide);
+
+  adjustSize();
 
   sn = new QSocketNotifier(Pipe(), QSocketNotifier::Read, this);

trunk/qt-gui/src/support.cpp

@@ -62 +62 @@
 
     if (retFormat != 32 || retNItems != 1 || retMoreBytes != 0)
+    {
       gLog.Info("Error reading current desktop property.");
+      *current = 0UL;
+    }
   }
 

trunk/qt-gui/src/usereventdlg.cpp

@@ -621 +621 @@
 }
 
-bool UserEventCommon::FindUserInConvo(char *szId)
+bool UserEventCommon::FindUserInConvo(const char *szId)
 {
   char *szRealId;
@@ -1818 +1818 @@
     gUserManager.DropUser(u);
 
-    QString strMsg = QString("%1 has joined the conversation.")
+    QString strMsg = QString(tr("%1 has joined the conversation."))
       .arg(userName);
     mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
@@ -1826 +1826 @@
   {
     char *szRealId;
-    //XXX The PPID?
-    ICQUser::MakeRealId(szId, LICQ_PPID, szRealId);
+    ICQUser::MakeRealId(szId, m_nPPID, szRealId);
     m_lUsers.push_back(szRealId);
     delete [] szRealId;
@@ -1852 +1851 @@
       userName = szId;
 
-    QString strMsg = QString("%1 has left the conversation.")
+    QString strMsg = QString(tr("%1 has left the conversation."))
       .arg(userName);
     mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
     
     // Remove the typing notification if active
-    if (u && u->GetTyping() == ICQ_TYPING_ACTIVE)
-    {
-      u->SetTyping(ICQ_TYPING_INACTIVEx0);
-      nfoStatus->unsetPalette();
-      if (mainwin->m_bTabbedChatting && mainwin->userEventTabDlg)
-        mainwin->userEventTabDlg->updateTabLabel(u);  
+    if (u != 0)
+    {
+      if (u->GetTyping() == ICQ_TYPING_ACTIVE)
+      {
+        u->SetTyping(ICQ_TYPING_INACTIVEx0);
+        nfoStatus->unsetPalette();
+        if (mainwin->m_bTabbedChatting && mainwin->userEventTabDlg)
+          mainwin->userEventTabDlg->updateTabLabel(u);  
+      }
     }
     gUserManager.DropUser(u);
@@ -1916 +1918 @@
   QWidget *desktop = qApp->desktop();
   QSize s = p->sizeHint();
-  s = p->sizeHint();
   QPoint pos = QPoint(0, btnEmoticon->height());
   pos = btnEmoticon->mapToGlobal(pos);

trunk/qt-gui/src/usereventdlg.h

@@ -144 +144 @@
   void SetConvoId(unsigned long n)  { m_nConvoId = n; }
   
-  bool FindUserInConvo(char *);
+  bool FindUserInConvo(const char* id);
   void AddEventTag(unsigned long n)  { if (n) m_lnEventTag.push_back(n); }
   void gotTyping(unsigned short);