Changeset 6219

Timestamp:

05/26/08 05:28:02 (6 months ago)

Author:

eugene

Message:

Cleaned up and revised GPG key management classes.

Location:

trunk/qt4-gui/src/dialogs

Files:

• gpgkeymanager.cpp (modified) (15 diffs)
• gpgkeymanager.h (modified) (4 diffs)

trunk/qt4-gui/src/dialogs/gpgkeymanager.cpp

@@ -23 +23 @@
 
 #include <QDialogButtonBox>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QLabel>
 #include <QMenu>
-#include <QMessageBox>
 #include <QPushButton>
 #include <QVBoxLayout>
@@ -37 +33 @@
 
 #include "core/mainwin.h"
+#include "core/messagebox.h"
 
 #include "helpers/support.h"
@@ -55 +52 @@
 bool compare_luser(const struct luser& left, const struct luser& right)
 {
-  return left.alias < right.alias;
+  return QString::compare(left.alias, right.alias, Qt::CaseInsensitive) <= 0;
 }
 
@@ -67 +64 @@
   QVBoxLayout* lay_main = new QVBoxLayout(this);
 
-  // GPG Passphrase box
-  QGroupBox* box_passphrase = new QGroupBox(tr("GPG Passphrase"));
-  lay_main->addWidget( box_passphrase );
-
-  QHBoxLayout* lay_passphrase = new QHBoxLayout(box_passphrase);
-
-  lbl_passphrase = new QLabel(tr("No passphrase set"));
-  lay_passphrase->addWidget(lbl_passphrase);
-  QPushButton* btn_setPass = new QPushButton(tr("&Set GPG Passphrase"));
-  connect(btn_setPass, SIGNAL(clicked()), SLOT(slot_setPassphrase()));
-  lay_passphrase->addWidget(btn_setPass);
-
-  // GPG User/Key list
-  QHBoxLayout* lay_hbox = new QHBoxLayout();
-  lay_main->addLayout(lay_hbox);
-  QGroupBox* box_keys = new QGroupBox(tr("User Keys"));
-  lay_hbox->addWidget(box_keys, 1);
-  QVBoxLayout* lay_keys = new QVBoxLayout(box_keys);
-
-  QVBoxLayout* lay_buttonBox = new QVBoxLayout();
-  lay_hbox->addLayout(lay_buttonBox, 0);
-  QPushButton* btn_add = new QPushButton(tr("&Add"));
-  QPushButton* btn_edit = new QPushButton(tr("&Edit"));
-  QPushButton* btn_remove = new QPushButton(tr("&Remove"));
-  connect(btn_add, SIGNAL(clicked()), SLOT(slot_add()));
-  connect(btn_edit, SIGNAL(clicked()), SLOT(slot_edit()));
-  connect(btn_remove, SIGNAL(clicked()), SLOT(slot_remove()));
-  lbl_dragndrop = new QLabel(tr("Drag&Drop user to add to list."));
-  lbl_dragndrop->setWordWrap(true);
-
-  // create the keylist
-  lst_keyList = new KeyList(this);
+  lst_keyList = new KeyList();
   lst_keyList->setAllColumnsShowFocus(true);
   QStringList headers;
@@ -105 +71 @@
   connect(lst_keyList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
       SLOT(slot_doubleClicked(QTreeWidgetItem*)));
-  lay_keys->addWidget(lst_keyList);
-
-  lay_buttonBox->addWidget(btn_add);
-  lay_buttonBox->addWidget(btn_edit);
-  lay_buttonBox->addWidget(btn_remove);
-  lay_buttonBox->addWidget(lbl_dragndrop);
-  lay_buttonBox->addStretch();
-
-  // Close
+  lay_main->addWidget(lst_keyList);
+
   QDialogButtonBox* buttons = new QDialogButtonBox();
   lay_main->addWidget(buttons);
 
-  QPushButton* btn_close = buttons->addButton(QDialogButtonBox::Close);
-  btn_close->setText(tr("&Close"));
-  connect(btn_close, SIGNAL(clicked()), SLOT(slot_close()));
+  QPushButton* btn;
+#define BUTTON(role, name, slot) \
+  btn = buttons->addButton(name, QDialogButtonBox::role); \
+  connect(btn, SIGNAL(clicked()), SLOT(slot()))
+
+  BUTTON(ActionRole, tr("&Add"), slot_add);
+  BUTTON(ActionRole, tr("&Edit"), slot_edit);
+  BUTTON(ActionRole, tr("&Remove"), slot_remove);
+
+#undef BUTTON
+  buttons->addButton(QDialogButtonBox::Close);
+  connect(buttons, SIGNAL(rejected()), SLOT(close()));
 
   initKeyList();
@@ -126 +94 @@
 }
 
-GPGKeyManager::~GPGKeyManager()
-{}
-
-void GPGKeyManager::slot_setPassphrase()
-{
-  QMessageBox::information( this, tr("Set Passphrase"), tr("Not yet implemented. Use licq_gpg.conf.") );
-}
-
-void GPGKeyManager::slot_close()
-{
-  close();
-}
-
 void GPGKeyManager::slot_edit()
 {
-  QTreeWidgetItem* item = lst_keyList->currentItem();
-  if (item )
-    ( (KeyListItem*)item )->edit();
+  slot_doubleClicked(lst_keyList->currentItem());
 }
 
 void GPGKeyManager::slot_doubleClicked(QTreeWidgetItem* item)
 {
-  if (item )
-    ( (KeyListItem*)item )->edit();
+  if (item != NULL)
+    dynamic_cast<KeyListItem*>(item)->edit();
 }
 
@@ -159 +112 @@
   FOR_EACH_USER_START(LOCK_R)
   {
-    if (strcmp( pUser->GPGKey(), "") == 0)
+    if (strcmp(pUser->GPGKey(), "") == 0)
     {
       luser tmp;
@@ -182 +135 @@
     return;
 
-  editUser(tmp->szId, tmp->nPPID);
-}
-
-void GPGKeyManager::editUser(QString id, unsigned long ppid)
+  lst_keyList->editUser(tmp->szId, tmp->nPPID);
+}
+
+void GPGKeyManager::slot_remove()
+{
+  KeyListItem* item = (KeyListItem*)lst_keyList->currentItem();
+  if (item != NULL)
+  {
+    if (QueryYesNo(this, tr("Do you want to remove the GPG key binding for the user %1?\n"
+            "The key isn't deleted from your keyring.")
+          .arg(item->text(0))))
+    {
+      item->unsetKey();
+      delete item;
+      lst_keyList->resizeColumnsToContents();
+    }
+  }
+}
+
+void GPGKeyManager::initKeyList()
+{
+  FOR_EACH_USER_START(LOCK_R)
+  {
+    if (strcmp(pUser->GPGKey(), "") != 0)
+    {
+      new KeyListItem(lst_keyList, pUser);
+    }
+  }
+  FOR_EACH_USER_END
+
+  lst_keyList->resizeColumnsToContents();
+}
+
+// THE KEYLIST
+KeyList::KeyList(QWidget* parent)
+  : QTreeWidget(parent)
+{
+  setAcceptDrops(true);
+  setRootIsDecorated(false);
+}
+
+void KeyList::editUser(QString id, unsigned long ppid)
 {
   KeyListItem* item = NULL;
   bool found = false;
 
-  for (int i = 0; i < lst_keyList->topLevelItemCount(); ++i)
-  {
-    item = dynamic_cast<KeyListItem*>(lst_keyList->topLevelItem(i));
+  for (int i = 0; i < topLevelItemCount(); ++i)
+  {
+    item = dynamic_cast<KeyListItem*>(topLevelItem(i));
 
     if (item->getszId() == id && item->getnPPID() == ppid)
@@ -206 +197 @@
     if (u == NULL)
       return;
-    item = new KeyListItem(lst_keyList, u);
+    item = new KeyListItem(this, u);
     gUserManager.DropUser(u);
+    resizeColumnsToContents();
   }
 
@@ -213 +205 @@
 };
 
-void GPGKeyManager::slot_remove()
-{
-  KeyListItem* item = (KeyListItem*)lst_keyList->currentItem();
-  if ( item )
-  {
-    if ( QMessageBox::question( this, tr("Remove GPG key"), tr("Do you want to remove the GPG key? The key isn't deleted from your keyring."), QMessageBox::Yes, QMessageBox::No )==QMessageBox::Yes )
-    {
-      item->unsetKey();
-      delete item;
-    };
-  }
-}
-
-void GPGKeyManager::initKeyList()
-{
-  FOR_EACH_USER_START(LOCK_R)
-  {
-    if ( strcmp( pUser->GPGKey(), "" )!= 0 )
-    {
-      new KeyListItem( lst_keyList, pUser );
-    }
-  }
-  FOR_EACH_USER_END
-}
-
-
-
-// THE KEYLIST
-KeyList::KeyList(QWidget* parent)
-  : QTreeWidget(parent)
-{
-  setAcceptDrops(true);
-  setRootIsDecorated(false);
-}
-
-KeyList::~KeyList()
-{
-}
-
 void KeyList::dragEnterEvent(QDragEnterEvent* event)
 {
@@ -258 +211 @@
 }
 
-void KeyList::dragMoveEvent(QDragMoveEvent* /* event */)
-{
-  // Do nothing, just overload function so base class won't interfere
-}
-
 void KeyList::dropEvent(QDropEvent* event)
 {
   if (!event->mimeData()->hasText())
     return;
+
   QString text = event->mimeData()->text();
+
+  if (text.length() <= 4)
+    return;
 
   unsigned long nPPID = 0;
@@ -280 +232 @@
   FOR_EACH_PROTO_PLUGIN_END;
 
-  if (nPPID == 0 || text.length() <= 4)
-    return;
-
-  QString szId = text.mid(4);
-
-  GPGKeyManager* km = dynamic_cast<GPGKeyManager*>(nativeParentWidget());
-  if (km != NULL)
-    km->editUser(szId, nPPID);
+  if (nPPID == 0)
+    return;
+
+  editUser(text.mid(4), nPPID);
 }
 
@@ -310 +258 @@
     setColumnWidth(0, newWidth);
   }
+}
+
+void KeyList::resizeColumnsToContents()
+{
+  for (int i = 0; i < columnCount(); i++)
+    resizeColumnToContents(i);
 }
 
@@ -319 +273 @@
     keySelect(NULL)
 {
-  updateText( u );
-}
-
-KeyListItem::~KeyListItem()
-{
+  updateText(u);
 }
 
 void KeyListItem::updateText(ICQUser* u)
 {
-  setText( 0, QString::fromUtf8(u->GetAlias()) );
-  setText( 1, u->UseGPG() ? tr("Yes") : tr("No") );
-  setText( 2, u->GPGKey() );
+  setText(0, QString::fromUtf8(u->GetAlias()));
+  setText(1, u->UseGPG() ? tr("Yes") : tr("No"));
+  setText(2, u->GPGKey());
 }
 
 void KeyListItem::edit()
 {
-  if ( !keySelect )
+  if (keySelect == NULL)
   {
     keySelect = new GPGKeySelect(szId, nPPID);
@@ -347 +297 @@
   keySelect = NULL;
 
-  if ( u )
-  {
-    if ( strcmp(u->GPGKey(),"")==0 )
+  if (u != NULL)
+  {
+    if (strcmp(u->GPGKey(), "") == 0)
       delete this;
     else
-      updateText( u );
+      updateText(u);
     gUserManager.DropUser(u);
+    dynamic_cast<KeyList*>(treeWidget())->resizeColumnsToContents();
   }
 }

trunk/qt4-gui/src/dialogs/gpgkeymanager.h

@@ -24 +24 @@
 #include <QTreeWidget>
 
-class QLabel;
-
 class ICQUser;
 
@@ -39 +37 @@
 public:
   GPGKeyManager(QWidget* parent = 0);
-  ~GPGKeyManager();
 
 private:
   KeyList* lst_keyList;
-  QLabel* lbl_passphrase;
-  QLabel* lbl_dragndrop;
-  void editUser(QString id, unsigned long ppid);
   void initKeyList();
 
 private slots:
-  void slot_setPassphrase();
-  void slot_close();
   void slot_add();
   void slot_edit();
   void slot_remove();
   void slot_doubleClicked(QTreeWidgetItem* item);
-
-  friend class KeyList;
 };
 
@@ -65 +55 @@
 public:
   KeyList(QWidget* parent = 0);
-  ~KeyList();
+
+  void editUser(QString id, unsigned long ppid);
+  void resizeColumnsToContents();
 
 private:
   void dragEnterEvent(QDragEnterEvent* event);
-  void dragMoveEvent(QDragMoveEvent* event);
+  void dragMoveEvent(QDragMoveEvent* /* event */) {};
   void dropEvent(QDropEvent* event);
-  virtual void resizeEvent(QResizeEvent* e);
+  virtual void resizeEvent(QResizeEvent* event);
 };
 
@@ -80 +72 @@
 public:
   KeyListItem(QTreeWidget* parent, ICQUser* u);
-  ~KeyListItem();
 
   void edit();