Changeset 6054 for branches/qt-gui_qt4/src/core

Timestamp:

01/18/08 21:18:10 (10 months ago)

Author:

eugene

Message:

• Removed all password-related work from SecurityDlg?;
• Renamed ICQ-related options in system menu to reflect this fact;
• Removed id from OwnerEditDlg? ctor, made ppid optional and fixed some bugs;
• Made SignalManager? invoke OwnerEditDlg? upon logoff for wrong password reason.

Location:

branches/qt-gui_qt4/src/core

Files:

• signalmanager.cpp (modified) (2 diffs)
• systemmenu.cpp (modified) (1 diff)

branches/qt-gui_qt4/src/core/signalmanager.cpp

@@ -27 +27 @@
 #include <licq_log.h>
 
-#include "dialogs/securitydlg.h"
+#include "dialogs/ownereditdlg.h"
 
 using namespace LicqQtGui;
@@ -66 +66 @@
     case SIGNAL_LOGOFF:
       if (sig->SubSignal() == LOGOFF_PASSWORD)
-      {
-        SecurityDlg* secdlg = new SecurityDlg();
-        secdlg->show();
-      }
+        new OwnerEditDlg(sig->PPID());
 
       emit logoff();

branches/qt-gui_qt4/src/core/systemmenu.cpp

@@ -92 +92 @@
   myOwnerAdmSeparator = myOwnerAdmMenu->addSeparator();
   myOwnerAdmMenu->addAction(tr("&Owner Manager..."), this, SLOT(showOwnerManagerDlg()));
-  myOwnerAdmMenu->addAction(tr("&Security/Password Options..."), this, SLOT(showSecurityDlg()));
-  myOwnerAdmMenu->addAction(tr("&Random Chat Group..."), this, SLOT(showRandomChatGroupDlg()));
+  myOwnerAdmMenu->addAction(tr("ICQ &Security Options..."), this, SLOT(showSecurityDlg()));
+  myOwnerAdmMenu->addAction(tr("ICQ &Random Chat Group..."), this, SLOT(showRandomChatGroupDlg()));
   myOwnerAdmMenu->addSeparator();
   myOwnerAdmMenu->addMenu(myDebugMenu);