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

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/dialogs

Files:

• ownereditdlg.cpp (modified) (5 diffs)
• ownereditdlg.h (modified) (1 diff)
• ownermanagerdlg.cpp (modified) (2 diffs)
• securitydlg.cpp (modified) (7 diffs)
• securitydlg.h (modified) (2 diffs)

branches/qt-gui_qt4/src/dialogs/ownereditdlg.cpp

@@ -42 +42 @@
 /* TRANSLATOR LicqQtGui::OwnerEditDlg */
 
-OwnerEditDlg::OwnerEditDlg(QString id, unsigned long ppid, QWidget* parent)
+OwnerEditDlg::OwnerEditDlg(unsigned long ppid, QWidget* parent)
   : QDialog(parent)
 {
@@ -76 +76 @@
   lay->addWidget(chkSave, 3, 0, 1, 3);
 
+  QString id;
   // Fill the combo list now
   FOR_EACH_PROTO_PLUGIN_START(gLicqDaemon)
@@ -81 +82 @@
     if (ppid != 0) // Modifying a user
     {
+      ICQOwner* o = gUserManager.FetchOwner(curPpid, LOCK_R);
+      if (o == NULL)
+        id = QString::null;
+      else
+      {
+        id = o->IdString();
+        gUserManager.DropOwner(curPpid);
+      }
+
       cmbProtocol->addItem(
-          iconman->iconForStatus(ICQ_STATUS_ONLINE, id.toLatin1(), ppid),
-          (*_ppit)->Name(), QString::number(ppid));
+          iconman->iconForStatus(ICQ_STATUS_ONLINE, id.toLatin1(), curPpid),
+          (*_ppit)->Name(), QString::number(curPpid));
 
       // Check if this is the current protocol
@@ -102 +112 @@
 
   // Set the fields
-  if (!id.isEmpty() && ppid != 0)
+  if (ppid != 0)
   {
-    edtId->setText(id);
     ICQOwner* o = gUserManager.FetchOwner(ppid, LOCK_R);
     if (o)
     {
+      edtId->setText(o->IdString());
       edtPassword->setText(o->Password());
       chkSave->setChecked(o->SavePassword());
@@ -146 +156 @@
   setTabOrder(cmbProtocol, btnOk);
   setTabOrder(btnOk, btnCancel);
+
+  show();
 }
 

branches/qt-gui_qt4/src/dialogs/ownereditdlg.h

@@ -34 +34 @@
   Q_OBJECT
 public:
-  OwnerEditDlg(QString id, unsigned long ppid, QWidget* parent = NULL);
+  OwnerEditDlg(unsigned long ppid = 0, QWidget* parent = NULL);
 
 private slots:

branches/qt-gui_qt4/src/dialogs/ownermanagerdlg.cpp

@@ -163 +163 @@
 void OwnerManagerDlg::addOwner()
 {
-  OwnerEditDlg* d = new OwnerEditDlg(0, 0, this);
-  d->show();
+  OwnerEditDlg* d = new OwnerEditDlg(0, this);
   connect(d, SIGNAL(destroyed()), SLOT(updateOwners()));
 }
@@ -213 +212 @@
     return;
 
-  OwnerEditDlg* editDlg = new OwnerEditDlg(item->text(1),
+  OwnerEditDlg* editDlg = new OwnerEditDlg(
       item->data(0, Qt::UserRole).toString().toULong(), this);
-  editDlg->show();
   connect(editDlg, SIGNAL(destroyed()), SLOT(updateOwners()));
 }

branches/qt-gui_qt4/src/dialogs/securitydlg.cpp

@@ -23 +23 @@
 #include "config.h"
 
-#include <climits>
-
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
 #include <QPushButton>
 #include <QVBoxLayout>
@@ -48 +44 @@
 SecurityDlg::SecurityDlg(QWidget* parent)
   : QDialog(parent),
-    eSecurityInfo(0),
-    ePasswordChange(0)
+    title(tr("ICQ Security")),
+    eSecurityInfo(0)
 {
   Support::setWidgetProps(this, "SecurityDialog");
   setAttribute(Qt::WA_DeleteOnClose, true);
-
-  title = tr("ICQ Security Options");
   setWindowTitle(title);
 
-  // Main dialog layout
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+  if (o == NULL)
+  {
+    InformUser(this, tr("No ICQ owner found.\nPlease create one first."));
+    close();
+    return;
+  }
+
   QVBoxLayout* top_lay = new QVBoxLayout(this);
 
-  // Options box
   QGroupBox* boxOptions = new QGroupBox(tr("Options"));
   QVBoxLayout* layOptions = new QVBoxLayout(boxOptions);
 
-#define ADD_CHECK(var, name, tip) \
+#define ADD_CHECK(var, name, tip, status) \
   (var) = new QCheckBox((name)); \
+  (var)->setChecked((status)); \
   (var)->setToolTip((tip)); \
   layOptions->addWidget((var));
@@ -71 +72 @@
   ADD_CHECK(chkAuthorization, tr("&Authorization Required"), tr("Determines "
         "whether regular ICQ clients require\nyour authorization to add you to "
-        "their contact list."));
+        "their contact list."), o->GetAuthorization());
   ADD_CHECK(chkWebAware, tr("&Web Presence"), tr("Web Presence allows users to"
-        " see\nif you are online through your web indicator."));
+        " see\nif you are online through your web indicator."), o->WebAware());
   ADD_CHECK(chkHideIp, tr("&Hide IP"), tr("Hide IP stops users from seeing your"
-        " IP address.\nIt doesn't guarantee it will be hidden though."));
+        " IP address.\nIt doesn't guarantee it will be hidden though."),
+      o->HideIp());
 #undef ADD_CHECK
+
+  gUserManager.DropOwner();
 
   top_lay->addWidget(boxOptions);
 
-  // Password box
-  QGroupBox* boxPassword = new QGroupBox(tr("Password/UIN settings"));
-  QGridLayout* layPassword = new QGridLayout(boxPassword);
-
-  unsigned short row = 0;
-  QLabel* label;
-
-#define ADD_LINE(var, name, tip) \
-  label = new QLabel((name)); \
-  (var) = new QLineEdit(); \
-  label->setBuddy((var)); \
-  (var)->setToolTip((tip)); \
-  layPassword->addWidget(label, row, 0); \
-  layPassword->addWidget((var), row++, 1);
-
-  ADD_LINE(edtUin, tr("&Uin:"), tr("Enter the UIN which you want to use.\n"
-        "Only available if \"Local changes only\" is checked."));
-  ADD_LINE(edtFirst, tr("&Password:"), tr("Enter your ICQ password here."));
-  ADD_LINE(edtSecond, tr("&Verify:"), tr("Verify your ICQ password here."));
-#undef ADD_LINE
-
-  chkOnlyLocal = new QCheckBox(tr("&Local changes only"));
-  chkOnlyLocal->setToolTip(tr("If checked, password/UIN changes will apply only"
-        " on your local computer.\nUseful if your password is incorrectly saved"
-        " in Licq."));
-  connect(chkOnlyLocal, SIGNAL(toggled(bool)), SLOT(chkOnlyLocalToggled(bool)));
-  layPassword->addWidget(chkOnlyLocal, row++, 0, 1, 2);
-
-  // UIN
-  edtUin->setEnabled(false);
-  edtUin->setValidator(new QIntValidator(10000, INT_MAX, edtUin));
-
-  // Owner password
-  edtFirst->setEchoMode(QLineEdit::Password);
-  edtSecond->setEchoMode(QLineEdit::Password);
-
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
-  if (o != NULL)
-  {
-    edtUin->setText(o->IdString());
-    edtFirst->setText(o->Password());
-    edtSecond->setText(o->Password());
-  }
-  else
-  {
-    edtFirst->setEnabled(false);
-    edtSecond->setEnabled(false);
-  }
-
-  // do some magic ;)
-  // if we are offline, we enable the checkbox "Only local changes"
-  // this saves one click :)
-  if (o != NULL)  // Make sure we exist
-  {
-    chkOnlyLocal->setChecked(o->Status() == ICQ_STATUS_OFFLINE);
-    chkAuthorization->setChecked(o->GetAuthorization());
-    chkWebAware->setChecked(o->WebAware());
-    chkHideIp->setChecked(o->HideIp());
-    gUserManager.DropOwner();
-  }
-  else
-  {
-    chkOnlyLocal->setChecked(true);
-    chkOnlyLocal->setEnabled(false);
-    chkAuthorization->setChecked(false);
-    chkWebAware->setChecked(false);
-    chkHideIp->setChecked(false);
-  }
-
-  // remember the initial values
-  // later we use these to apply only what has been changed by the user
-  initAuthorization = chkAuthorization->isChecked();
-  initWebAware      = chkWebAware->isChecked();
-  initHideIp        = chkHideIp->isChecked();
-  initEdtUin        = edtUin->text();
-  initEdtFirst      = edtFirst->text();
-  initEdtSecond     = edtSecond->text();
-
-  top_lay->addWidget(boxPassword);
-
-  // Buttons
   QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Cancel);
 
@@ -176 +99 @@
 void SecurityDlg::ok()
 {
-  ICQOwner* o = gUserManager.FetchOwner(LOCK_R);
+  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
 
   if (o == NULL)
-    return;
-
-  unsigned short status = o->Status();
-  gUserManager.DropOwner();
-
-  // validate password
-  if ((edtFirst->text().isEmpty() && !chkOnlyLocal->isChecked()) ||
-       edtFirst->text().length() > 8)
   {
-    InformUser(this, tr("Invalid password, must be between 1 and 8 characters."));
+    // Even though we protected from this in constructor,
+    // it's never too bad to persuade
+    close();
     return;
   }
 
-  if (edtFirst->text() != edtSecond->text())
+  if (o->Status() == ICQ_STATUS_OFFLINE)
   {
-    InformUser(this, tr("Passwords do not match, try again."));
+    gUserManager.DropOwner(LICQ_PPID);
+    InformUser(this, tr("You need to be connected to the\n"
+          "ICQ Network to change the settings."));
     return;
   }
 
-  if (status == ICQ_STATUS_OFFLINE && !chkOnlyLocal->isChecked())
+  bool auth = chkAuthorization->isChecked();
+  bool web = chkWebAware->isChecked();
+  bool ip = chkHideIp->isChecked();
+
+  if (auth != o->GetAuthorization() ||
+      web != o->WebAware() ||
+      ip != o->HideIp())
   {
-    InformUser(this, tr("You need to be connected to the\n"
-                        "ICQ Network to change the settings."));
-    return;
+    gUserManager.DropOwner(LICQ_PPID);
+    btnUpdate->setEnabled(false);
+
+    connect(LicqGui::instance()->signalManager(),
+        SIGNAL(doneUserFcn(ICQEvent*)), SLOT(doneUserFcn(ICQEvent*)));
+
+    setWindowTitle(title + " [" + tr("Setting...") + "]");
+
+    eSecurityInfo = gLicqDaemon->icqSetSecurityInfo(auth, ip, web);
+
+    return; // prevents the dialog from closing
   }
 
-  // test if we really need to update anything
-  bool secUpdateNeeded = false;
-  bool pasUpdateNeeded = false;
-
-  if (chkAuthorization->isChecked() != initAuthorization ||
-      chkWebAware->isChecked() != initWebAware ||
-      chkHideIp->isChecked() != initHideIp)
-  {
-    secUpdateNeeded = true;
-    initAuthorization = chkAuthorization->isChecked();
-    initWebAware = chkWebAware->isChecked();
-    initHideIp = chkHideIp->isChecked();
-  }
-
-  if (edtUin->text() != initEdtUin ||
-      edtFirst->text() != initEdtFirst ||
-      edtSecond->text() != initEdtSecond)
-  {
-    pasUpdateNeeded = true;
-    initEdtUin = edtUin->text();
-    initEdtFirst = edtFirst->text();
-    initEdtSecond = edtSecond->text();
-  }
-
-  if (secUpdateNeeded || pasUpdateNeeded)
-  {
-    btnUpdate->setEnabled(false);
-
-    if (chkOnlyLocal->isChecked())
-    {
-      o = gUserManager.FetchOwner(LOCK_W);
-      if (o == NULL)
-        InformUser(this, tr("Failed to change the settings."));
-      else
-      {
-        o->SetId(edtUin->text().toLatin1());
-        o->SetPassword(edtFirst->text().toLatin1());
-        gUserManager.DropOwner();
-      }
-    }
-    else
-    {
-      connect(LicqGui::instance()->signalManager(),
-          SIGNAL(doneUserFcn(ICQEvent*)),
-          SLOT(doneUserFcn(ICQEvent*)));
-
-      // eSecurityInfo and ePasswordChange contain the event numbers.
-      // These are used in doneUserFcn to compare if we received
-      // what we expected :)
-      if (secUpdateNeeded)
-        eSecurityInfo = gLicqDaemon->icqSetSecurityInfo(
-            chkAuthorization->isChecked(),
-            chkHideIp->isChecked(),
-            chkWebAware->isChecked());
-
-      if (pasUpdateNeeded)
-        ePasswordChange = gLicqDaemon->icqSetPassword(
-            edtFirst->text().toLatin1());
-
-      setWindowTitle(title + " [" + tr("Setting...") + "]");
-      return; // prevents the dialog from closing
-    }
-  }
+  gUserManager.DropOwner(LICQ_PPID);
 
   close();
@@ -274 +145 @@
 void SecurityDlg::doneUserFcn(ICQEvent* e)
 {
-  // Checking if the received events correspond to one of
-  // our sent events.
-  bool bSec  = e->Equals(eSecurityInfo);
-  bool bPass = e->Equals(ePasswordChange);
-
-  if (!bSec && !bPass)
+  if (!e->Equals(eSecurityInfo))
     return;
 
-  QString result;
+  eSecurityInfo = 0;
+  QString result = QString::null;
+  btnUpdate->setEnabled(true);
+
+  disconnect(LicqGui::instance()->signalManager(),
+      SIGNAL(doneUserFcn(ICQEvent*)), this, SLOT(doneUserFcn(ICQEvent*)));
 
   switch (e->Result())
@@ -288 +159 @@
     case EVENT_FAILED:
       result = tr("failed");
-      if (bSec)
-        InformUser(this, tr("Setting security options failed."));
-      else if (bPass)
-        InformUser(this, tr("Changing password failed."));
+      InformUser(this, tr("Setting security options failed."));
       break;
 
     case EVENT_TIMEDOUT:
       result = tr("timed out");
-      if (bSec)
-        InformUser(this, tr("Timeout while setting security options."));
-      else if (bPass)
-        InformUser(this, tr("Timeout while changing password."));
+      InformUser(this, tr("Timeout while setting security options."));
       break;
 
     case EVENT_ERROR:
       result = tr("error");
-      if (bSec)
-        InformUser(this, tr("Internal error while setting security options."));
-      else if (bPass)
-        InformUser(this, tr("Internal error while changing password."));
+      InformUser(this, tr("Internal error while setting security options."));
       break;
 
@@ -314 +176 @@
   }
 
-  if (bSec)
-    eSecurityInfo = 0;
-  else if (bPass)
-    ePasswordChange = 0;
-
-  if (eSecurityInfo == 0 && ePasswordChange == 0)
-    btnUpdate->setEnabled(true);
-
-  if (!result.isEmpty())
+  if (result.isEmpty())
+    close();
+  else
     setWindowTitle(title + " [" + tr("Setting...") + " " + result + "]");
-  else
-  {
-    if ((eSecurityInfo == 0) && (ePasswordChange == 0))
-    {
-      setWindowTitle(tr("ICQ Security Options"));
-      close();
-    }
-  }
 }
-
-void SecurityDlg::chkOnlyLocalToggled(bool b)
-{
-  edtUin->setEnabled(b);
-  chkAuthorization->setEnabled(!b);
-  chkWebAware->setEnabled(!b);
-  chkHideIp->setEnabled(!b);
-}

branches/qt-gui_qt4/src/dialogs/securitydlg.h

@@ -24 +24 @@
 
 class QCheckBox;
-class QLineEdit;
 class QPushButton;
 
@@ -44 +43 @@
   QCheckBox* chkAuthorization;
   QCheckBox* chkHideIp;
-  QCheckBox* chkOnlyLocal;
-
-  QLineEdit* edtUin;
-  QLineEdit* edtFirst;
-  QLineEdit* edtSecond;
 
   QString title;
 
-  // Event tags
   unsigned long eSecurityInfo;
-  unsigned long ePasswordChange;
-
-  // For saving initial values
-  bool initAuthorization, initWebAware, initHideIp;
-  QString initEdtUin, initEdtFirst, initEdtSecond;
 
 private slots:
   void ok();
   void doneUserFcn(ICQEvent* e);
-  void chkOnlyLocalToggled(bool b);
 };