Changeset 5459

Timestamp:

09/29/07 07:19:48 (14 months ago)

Author:

eugene

Message:

Made focusing the new message popup window configurable.
This is to address the request in #1014.

Location:

branches/qt-gui_qt4/src

Files:

• mainwin.cpp (modified) (7 diffs)
• mainwin.h (modified) (1 diff)
• optionsdlg.cpp (modified) (3 diffs)
• optionsdlg.h (modified) (1 diff)
• userevents/usereventtabdlg.cpp (modified) (1 diff)

branches/qt-gui_qt4/src/mainwin.cpp

@@ -455 +455 @@
   licqConf.ReadBool("AutoClose", m_bAutoClose, true);
   licqConf.ReadBool("AutoPopup", m_bAutoPopup, false);
+  licqConf.ReadBool("AutoFocus", m_bAutoFocus, true);
   licqConf.ReadStr("MsgPopupKey", szTemp, "none");
 
@@ -2234 +2235 @@
         {
           e->show();
-          if(!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon"))
+          if (m_bAutoFocus &&
+              (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
           {
             e->raise();
@@ -2270 +2272 @@
             {
               userEventTabDlg->show();
-              userEventTabDlg->selectTab(e);
-              userEventTabDlg->raise();
-              userEventTabDlg->activateWindow();
+              if (m_bAutoFocus)
+              {
+                userEventTabDlg->selectTab(e);
+                userEventTabDlg->raise();
+                userEventTabDlg->activateWindow();
+              }
             }
             else
             {
               e->show();
-              if (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon"))
+              if (m_bAutoFocus &&
+                  (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")))
               {
                 e->raise();
@@ -2291 +2297 @@
   }
 
+  bool newtabw = false;
   QWidget *parent = NULL;
   if (m_bTabbedChatting)
   {
-    if (userEventTabDlg != NULL) {
-      userEventTabDlg->raise();
-      userEventTabDlg->activateWindow();
+    if (userEventTabDlg != NULL)
+    {
+      if (m_bAutoFocus)
+      {
+        userEventTabDlg->raise();
+        userEventTabDlg->activateWindow();
+      }
     }
     else
@@ -2303 +2314 @@
       userEventTabDlg = new UserEventTabDlg(this, 0, "UserEventTabbedDialog");
       connect(userEventTabDlg, SIGNAL(signal_done()), this, SLOT(slot_doneUserEventTabDlg()));
+      newtabw = true;
     }
     parent = userEventTabDlg;
   }
 
-  UserEventCommon *e = NULL;
+  UserEventCommon* e = NULL;
 
   switch (fcn)
@@ -2357 +2369 @@
     userEventTabDlg->addTab(e);
     userEventTabDlg->show();
-    e->setFocus();
-    userEventTabDlg->raise();
-    userEventTabDlg->activateWindow();
+    if (newtabw)
+      e->setFocus();
+
+    if (m_bAutoFocus)
+    {
+      userEventTabDlg->raise();
+      userEventTabDlg->activateWindow();
+    }
 
     // Check if we want the window sticky
@@ -2699 +2716 @@
   licqConf.WriteBool("AutoClose", m_bAutoClose);
   licqConf.WriteBool("AutoPopup", m_bAutoPopup);
+  licqConf.WriteBool("AutoFocus", m_bAutoFocus);
   licqConf.WriteStr("MsgPopupKey", m_MsgAutopopupKey.isEmpty() ? "none" : m_MsgAutopopupKey.toLatin1());
 

branches/qt-gui_qt4/src/mainwin.h

@@ -144 +144 @@
        m_bAutoClose,
        m_bAutoPopup,
+       m_bAutoFocus,
        m_bShowOffline,
        m_bAlwaysShowONU,

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -190 +190 @@
   chkFlashAll->setChecked(mainwin->m_nFlash == FLASH_ALL);
   chkAutoPopup->setChecked(mainwin->m_bAutoPopup);
+  chkAutoFocus->setChecked(mainwin->m_bAutoFocus);
   chkAutoRaise->setChecked(mainwin->m_bAutoRaise);
   chkHidden->setChecked(mainwin->m_bHidden);
@@ -480 +481 @@
   mainwin->m_bAutoClose = chkAutoClose->isChecked();
   mainwin->m_bAutoPopup = chkAutoPopup->isChecked();
+  mainwin->m_bAutoFocus = chkAutoFocus->isChecked();
   mainwin->m_bAutoRaise = chkAutoRaise->isChecked();
   mainwin->m_bHidden = chkHidden->isChecked();
@@ -1172 +1174 @@
   layNewMsgActions->addWidget(chkAutoPopup);
 
+  chkAutoFocus = new QCheckBox(tr("Auto-focus message"));
+  chkAutoFocus->setToolTip(tr("Automatically focus opened message windows."));
+  layNewMsgActions->addWidget(chkAutoFocus);
+
   chkAutoRaise = new QCheckBox(tr("Auto-raise main window"));
   chkAutoRaise->setToolTip(tr("Raise the main window on incoming messages"));

branches/qt-gui_qt4/src/optionsdlg.h

@@ -282 +282 @@
   QVBoxLayout *layNewMsgActions, *layParanoia;
   QCheckBox *chkOEAway, *chkOENA, *chkOEOccupied, *chkOEDND, *chkAlwaysOnlineNotify,
-             *chkBoldOnMsg, *chkAutoPopup, *chkAutoRaise,
+             *chkBoldOnMsg, *chkAutoPopup, *chkAutoRaise, *chkAutoFocus,
              *chkFlashTaskbar, *chkFlashAll, *chkFlashUrgent;
   QCheckBox *chkIgnoreNewUsers, *chkIgnoreWebPanel, *chkIgnoreMassMsg, *chkIgnoreEmailPager;

branches/qt-gui_qt4/src/userevents/usereventtabdlg.cpp

@@ -78 +78 @@
   updateTabLabel(u);
   gUserManager.DropUser(u);
-  tabw->setCurrentIndex(index);
+  QWidget* fw = tabw->focusWidget();
+  if (gMainWindow->m_bAutoFocus)
+    tabw->setCurrentIndex(index);
+  else
+    if (fw != NULL)
+      fw->setFocus();
 }