Changeset 6308 for trunk/qt-gui

Timestamp:

06/14/08 21:32:59 (6 months ago)

Author:

eugene

Message:

Fixed compilation after my daemon cleanup.

Location:

trunk/qt-gui/src

Files:

• editgrp.cpp (modified) (6 diffs)
• editgrp.h (modified) (3 diffs)
• mainwin.cpp (modified) (3 diffs)

trunk/qt-gui/src/editgrp.cpp

@@ -58 +58 @@
   btnEdit = new QPushButton(tr("Edit Name"), grpGroups);
   QWhatsThis::add(btnEdit, tr("Edit group name (hit enter to save)."));
-  btnDefault = new QPushButton(tr("Set Default"), grpGroups);
-  QString defaultWhatsThis = tr("The default group to start up in.");
-  QWhatsThis::add(btnDefault, defaultWhatsThis);
-  btnNewUser = new QPushButton(tr("Set New Users"), grpGroups);
-  QString newUserWhatsThis
-      = 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.");
-  QWhatsThis::add(btnNewUser, newUserWhatsThis);
   vlay->addWidget(btnAdd);
   vlay->addWidget(btnRemove);
@@ -73 +63 @@
   vlay->addWidget(btnDown);
   vlay->addWidget(btnEdit);
-  vlay->addWidget(btnDefault);
-  vlay->addWidget(btnNewUser);
-
-  glay->addWidget(new QLabel(tr("Default:"), grpGroups), 1, 0);
-  nfoDefault = new CInfoField(grpGroups, true);
-  QWhatsThis::add(nfoDefault, defaultWhatsThis);
-  glay->addMultiCellWidget(nfoDefault, 1, 1, 1, 2);
-  glay->addWidget(new QLabel(tr("New User:"), grpGroups), 2, 0);
-  nfoNewUser = new CInfoField(grpGroups, true);
-  QWhatsThis::add(nfoNewUser, newUserWhatsThis);
-  glay->addMultiCellWidget(nfoNewUser, 2, 2, 1, 2);
 
   edtName = new QLineEdit(grpGroups);
@@ -110 +89 @@
   connect(btnUp, SIGNAL(clicked()), this, SLOT(slot_up()));
   connect(btnDown, SIGNAL(clicked()), this, SLOT(slot_down()));
-  connect(btnDefault, SIGNAL(clicked()), this, SLOT(slot_default()));
-  connect(btnNewUser, SIGNAL(clicked()), this, SLOT(slot_newuser()));
   connect(btnEdit, SIGNAL(clicked()), this, SLOT(slot_edit()));
   connect(btnDone, SIGNAL(clicked()), this, SLOT(close()));
@@ -142 +119 @@
   myGroupIds.clear();
 
-  const QString allUsers = Strings::getSystemGroupName(GROUP_ALL_USERS);
-
-  lstGroups->insertItem(allUsers);
-  myGroupIds.push_back(0);
-
-  if (gUserManager.DefaultGroup() == GROUP_ALL_USERS)
-    nfoDefault->setText(allUsers);
-  if (gUserManager.NewUserGroup() == GROUP_ALL_USERS)
-    nfoNewUser->setText(allUsers);
-
   FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
@@ -157 +124 @@
     lstGroups->insertItem(name);
     myGroupIds.push_back(pGroup->id());
-
-    if (gUserManager.DefaultGroup() == pGroup->id())
-      nfoDefault->setText(name);
-
-    if (gUserManager.NewUserGroup() == pGroup->id())
-      nfoNewUser->setText(name);
   }
   FOR_EACH_GROUP_END
@@ -248 +209 @@
 }
 
-void EditGrpDlg::slot_default()
-{
-  gUserManager.SetDefaultGroup(currentGroupId());
-  RefreshList();
-}
-
-void EditGrpDlg::slot_newuser()
-{
-  gUserManager.SetNewUserGroup(currentGroupId());
-  RefreshList();
-}
-
 void EditGrpDlg::slot_edit()
 {

trunk/qt-gui/src/editgrp.h

@@ -29 +29 @@
 class QPushButton;
 
-class CInfoField;
 class CSignalManager;
 
@@ -41 +40 @@
   QGroupBox *grpGroups;
   QPushButton *btnAdd, *btnRemove, *btnUp, *btnDown, *btnDone, *btnEdit,
-              *btnDefault, *btnNewUser, *btnSave;
+              *btnSave;
 
   QLineEdit *edtName;
-  CInfoField *nfoDefault, *nfoNewUser;
 
   void RefreshList();
@@ -56 +54 @@
   void slot_editok();
   void slot_editcancel();
-  void slot_default();
-  void slot_newuser();
 signals:
   void signal_updateGroups();

trunk/qt-gui/src/mainwin.cpp

@@ -529 +529 @@
   licqConf.ReadNum("AutoNAMess", autoNAMess, 0);
 
+  unsigned short groupType;
+  licqConf.ReadNum("GroupId", m_nCurrentGroup, 0);
+  licqConf.ReadNum("GroupType", groupType, GROUPS_USER);
+  m_nGroupType = static_cast<GroupType>(groupType);
+
   licqConf.SetSection("functions");
   licqConf.ReadBool("AutoClose", m_bAutoClose, true);
@@ -540 +545 @@
        gLog.Error("%sUnknown popup key: %s\n", L_INITxSTR, szTemp);
   }
-
-  m_nCurrentGroup = gUserManager.DefaultGroup();
-  m_nGroupType = GROUPS_USER;
 
   // load up position and size from file
@@ -3427 +3429 @@
   licqConf.WriteNum("AutoAwayMess", autoAwayMess);
   licqConf.WriteNum("AutoNAMess", autoNAMess);
+  licqConf.WriteNum("GroupId", m_nCurrentGroup);
+  licqConf.WriteNum("GroupType", static_cast<unsigned short>(m_nGroupType));
 
   licqConf.SetSection("functions");