Changeset 6296

Timestamp:

06/14/08 09:12:16 (3 months ago)

Author:

eugene

Message:

Revised edit group dialog c-tor, removed default group setting.

Location:

trunk/qt4-gui/src/dialogs

Files:

• editgrpdlg.cpp (modified) (6 diffs)
• editgrpdlg.h (modified) (2 diffs)

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

@@ -41 +41 @@
 
 #include "helpers/licqstrings.h"
+#include "helpers/support.h"
 
 #include "widgets/infofield.h"
@@ -50 +51 @@
   : QDialog(parent)
 {
+  Support::setWidgetProps(this, "EditGroupDialog");
   setWindowTitle(tr("Licq - Edit Groups"));
-  setObjectName("EditGroupDialog");
 
   QVBoxLayout* lay = new QVBoxLayout(this);
@@ -62 +63 @@
 
   QVBoxLayout* vlay = new QVBoxLayout();
-  btnAdd = new QPushButton(tr("Add"), grpGroups);
-  btnRemove = new QPushButton(tr("Remove"), grpGroups);
-  btnUp = new QPushButton(tr("Shift Up"), grpGroups);
-  btnDown = new QPushButton(tr("Shift Down"), grpGroups);
-  btnEdit = new QPushButton(tr("Edit Name"), grpGroups);
+#define BUTTON(var, name, slot) \
+  var = new QPushButton(name, grpGroups); \
+  connect(var, SIGNAL(clicked()), SLOT(slot())); \
+  vlay->addWidget(var)
+
+  BUTTON(btnAdd, tr("Add"), slot_add);
+  BUTTON(btnRemove, tr("Remove"), slot_remove);
+  BUTTON(btnUp, tr("Shift Up"), slot_up);
+  BUTTON(btnDown, tr("Shift Down"), slot_down);
+  BUTTON(btnEdit, tr("Edit Name"), slot_edit);
+  BUTTON(btnNewUser, tr("Set New Users"), slot_newuser);
+#undef BUTTON
+
   btnEdit->setToolTip(tr("Edit group name (hit enter to save)."));
-  btnDefault = new QPushButton(tr("Set Default"), grpGroups);
-  btnDefault->setToolTip(tr("The default group to start up in."));
-  btnNewUser = new QPushButton(tr("Set New Users"), grpGroups);
   btnNewUser->setToolTip(
-        tr("The group to which new users will be automatically added.  "
-           "All new users will be in the local system group New Users "
-           "but for server side storage will also be stored in the "
-           "specified group."));
-  vlay->addWidget(btnAdd);
-  vlay->addWidget(btnRemove);
-  vlay->addWidget(btnUp);
-  vlay->addWidget(btnDown);
-  vlay->addWidget(btnEdit);
-  vlay->addWidget(btnDefault);
-  vlay->addWidget(btnNewUser);
+      tr("The group to which new users will be automatically added.\n"
+        "All new users will be in the local system group New Users,\n"
+        "but for server side storage will also be stored in the specified group."));
+
   glay->addLayout(vlay, 0, 2);
 
-  glay->addWidget(new QLabel(tr("Default:"), grpGroups), 1, 0);
-  nfoDefault = new InfoField(true);
-  nfoDefault->setToolTip(btnDefault->toolTip());
-  glay->addWidget(nfoDefault, 1, 1, 1, 2);
-  glay->addWidget(new QLabel(tr("New User:"), grpGroups), 2, 0);
+  glay->addWidget(new QLabel(tr("New User:"), grpGroups), 1, 0);
   nfoNewUser = new InfoField(true);
   nfoNewUser->setToolTip(btnNewUser->toolTip());
-  glay->addWidget(nfoNewUser, 2, 1, 1, 2);
+  glay->addWidget(nfoNewUser, 1, 1, 1, 2);
 
   edtName = new QLineEdit(grpGroups);
   edtName->setEnabled(false);
-  glay->addWidget(edtName, 3, 0, 1, 2);
+  connect(edtName, SIGNAL(returnPressed()), SLOT(slot_editok()));
+  glay->addWidget(edtName, 2, 0, 1, 2);
 
   btnSave = new QPushButton(tr("&Save"));
   btnSave->setEnabled(false);
   btnSave->setToolTip(tr("Save the name of a group being modified."));
-  glay->addWidget(btnSave, 3, 2);
+  connect(btnSave, SIGNAL(clicked()), SLOT(slot_editok()));
+  glay->addWidget(btnSave, 2, 2);
 
   QDialogButtonBox* buttons = new QDialogButtonBox();
-  lay->addWidget(buttons);
-
+  connect(buttons, SIGNAL(rejected()), SLOT(close()));
   btnDone = buttons->addButton(QDialogButtonBox::Close);
   btnDone->setText(tr("&Done"));
+  lay->addWidget(buttons);
 
   RefreshList();
   connect(LicqGui::instance()->signalManager(),
       SIGNAL(updatedList(CICQSignal*)), SLOT(listUpdated(CICQSignal*)));
-
-  connect(btnAdd, SIGNAL(clicked()), SLOT(slot_add()));
-  connect(btnRemove, SIGNAL(clicked()), SLOT(slot_remove()));
-  connect(btnUp, SIGNAL(clicked()), SLOT(slot_up()));
-  connect(btnDown, SIGNAL(clicked()), SLOT(slot_down()));
-  connect(btnDefault, SIGNAL(clicked()), SLOT(slot_default()));
-  connect(btnNewUser, SIGNAL(clicked()), SLOT(slot_newuser()));
-  connect(btnEdit, SIGNAL(clicked()), SLOT(slot_edit()));
-  connect(btnDone, SIGNAL(clicked()), SLOT(close()));
-  connect(edtName, SIGNAL(returnPressed()), SLOT(slot_editok()));
-  connect(btnSave, SIGNAL(clicked()), SLOT(slot_editok()));
 
   show();
@@ -152 +138 @@
 
   const QString allUsers = LicqStrings::getSystemGroupName(GROUP_ALL_USERS);
-  QListWidgetItem* item = new QListWidgetItem(allUsers);
+  QListWidgetItem* item = new QListWidgetItem(allUsers, lstGroups);
   item->setData(Qt::UserRole, 0);
-  lstGroups->addItem(item);
-
-  if (gUserManager.DefaultGroup() == GROUP_ALL_USERS)
-    nfoDefault->setText(allUsers);
 
   if (gUserManager.NewUserGroup() == GROUP_ALL_USERS)
@@ -165 +147 @@
   {
     QString name = QString::fromLocal8Bit(pGroup->name().c_str());
-    item = new QListWidgetItem(name);
+    item = new QListWidgetItem(name, lstGroups);
     item->setData(Qt::UserRole, pGroup->id());
-    lstGroups->addItem(item);
-
-    if (gUserManager.DefaultGroup() == pGroup->id())
-      nfoDefault->setText(name);
 
     if (gUserManager.NewUserGroup() == pGroup->id())
@@ -259 +237 @@
 {
   moveGroup(1);
-}
-
-void EditGrpDlg::slot_default()
-{
-  gUserManager.SetDefaultGroup(currentGroupId());
-  RefreshList();
 }
 

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

@@ -71 +71 @@
   QPushButton* btnDone;
   QPushButton* btnEdit;
-  QPushButton* btnDefault;
   QPushButton* btnNewUser;
   QPushButton* btnSave;
 
   QLineEdit* edtName;
-  InfoField* nfoDefault;
   InfoField* nfoNewUser;
 
@@ -92 +90 @@
   void slot_editok();
   void slot_editcancel();
-  void slot_default();
   void slot_newuser();
 };