Changeset 6303 for trunk/qt4-gui/src/dialogs

Timestamp:

06/14/08 12:18:55 (5 months ago)

Author:

eugene

Message:

Cleaned up edit group dialog.

Location:

trunk/qt4-gui/src/dialogs

Files:

• editgrpdlg.cpp (modified) (9 diffs)
• editgrpdlg.h (modified) (3 diffs)

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

@@ -25 +25 @@
 #include <QGridLayout>
 #include <QGroupBox>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
@@ -36 +35 @@
 
 #include "core/licqgui.h"
-#include "core/mainwin.h"
 #include "core/messagebox.h"
 #include "core/signalmanager.h"
@@ -42 +40 @@
 #include "helpers/licqstrings.h"
 #include "helpers/support.h"
-
-#include "widgets/infofield.h"
 
 using namespace LicqQtGui;
@@ -60 +56 @@
   QGridLayout* glay = new QGridLayout(grpGroups);
   lstGroups = new QListWidget(grpGroups);
-  glay->addWidget(lstGroups, 0, 0, 1, 2);
+  glay->addWidget(lstGroups, 0, 0);
 
   QVBoxLayout* vlay = new QVBoxLayout();
@@ -73 +69 @@
   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)."));
-  btnNewUser->setToolTip(
-      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("New User:"), grpGroups), 1, 0);
-  nfoNewUser = new InfoField(true);
-  nfoNewUser->setToolTip(btnNewUser->toolTip());
-  glay->addWidget(nfoNewUser, 1, 1, 1, 2);
+
+  glay->addLayout(vlay, 0, 1);
 
   edtName = new QLineEdit(grpGroups);
   edtName->setEnabled(false);
   connect(edtName, SIGNAL(returnPressed()), SLOT(slot_editok()));
-  glay->addWidget(edtName, 2, 0, 1, 2);
+  glay->addWidget(edtName, 1, 0);
 
   btnSave = new QPushButton(tr("&Save"));
@@ -98 +84 @@
   btnSave->setToolTip(tr("Save the name of a group being modified."));
   connect(btnSave, SIGNAL(clicked()), SLOT(slot_editok()));
-  glay->addWidget(btnSave, 2, 2);
+  glay->addWidget(btnSave, 1, 1);
 
   QDialogButtonBox* buttons = new QDialogButtonBox();
@@ -137 +123 @@
   lstGroups->clear();
 
-  const QString allUsers = LicqStrings::getSystemGroupName(GROUP_ALL_USERS);
-  QListWidgetItem* item = new QListWidgetItem(allUsers, lstGroups);
-  item->setData(Qt::UserRole, 0);
-
-  if (gUserManager.NewUserGroup() == GROUP_ALL_USERS)
-    nfoNewUser->setText(allUsers);
-
   FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
     QString name = QString::fromLocal8Bit(pGroup->name().c_str());
-    item = new QListWidgetItem(name, lstGroups);
+    QListWidgetItem* item = new QListWidgetItem(name, lstGroups);
     item->setData(Qt::UserRole, pGroup->id());
-
-    if (gUserManager.NewUserGroup() == pGroup->id())
-      nfoNewUser->setText(name);
   }
   FOR_EACH_GROUP_END
@@ -187 +163 @@
   edtName->setText(tr("noname"));
   edtName->setFocus();
+  edtName->selectAll();
   btnEdit->setText(tr("Cancel"));
   disconnect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
@@ -237 +214 @@
 {
   moveGroup(1);
-}
-
-void EditGrpDlg::slot_newuser()
-{
-  gUserManager.SetNewUserGroup(currentGroupId());
-  RefreshList();
 }
 

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

@@ -32 +32 @@
 namespace LicqQtGui
 {
-class InfoField;
-
 class EditGrpDlg : public QDialog
 {
@@ -71 +69 @@
   QPushButton* btnDone;
   QPushButton* btnEdit;
-  QPushButton* btnNewUser;
   QPushButton* btnSave;
 
   QLineEdit* edtName;
-  InfoField* nfoNewUser;
 
   unsigned short myEditGroupId;
@@ -90 +86 @@
   void slot_editok();
   void slot_editcancel();
-  void slot_newuser();
 };