diff --git a/src/groupconfigbase.ui b/src/groupconfigbase.ui
index 87bb1b5..fdf4c67 100644
--- a/src/groupconfigbase.ui
+++ b/src/groupconfigbase.ui
@@ -38,6 +38,14 @@
detailsIcon
+
+
+ 4
+ 5
+ 1
+ 0
+
+
diff --git a/src/groupconfigdlg.cpp b/src/groupconfigdlg.cpp
index 5629d2e..3621977 100644
--- a/src/groupconfigdlg.cpp
+++ b/src/groupconfigdlg.cpp
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include "ldapmgr.h"
#include "groupconfigdlg.h"
@@ -49,6 +50,8 @@ GroupConfigDialog::GroupConfigDialog(LDAPGroupInfo group, LDAPConfig* parent, co
m_base->groupName->setEnabled(false);
}
+ m_base->detailsIcon->setPixmap(SmallIcon("kdmconfig.png"));
+
connect(m_base->addToGroup, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSelectedUserToGroup()));
connect(m_base->removeFromGroup, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelectedUserFromGroup()));
connect(m_base->groupName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
diff --git a/src/ldapmgr.cpp b/src/ldapmgr.cpp
index 26007dc..4c153e3 100644
--- a/src/ldapmgr.cpp
+++ b/src/ldapmgr.cpp
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
@@ -84,6 +85,10 @@ LDAPConfig::LDAPConfig(TQWidget *parent, const char *name, const TQStringList&)
base->machine_name->setEnabled(false);
base->machine_author->setEnabled(false);
+ base->user_icon->setPixmap(SmallIcon("personal.png"));
+ base->group_icon->setPixmap(SmallIcon("kdmconfig.png"));
+ base->machine_icon->setPixmap(SmallIcon("system.png"));
+
connect(base->user_ldapRealm, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(connectToRealm(const TQString&)));
connect(base->group_ldapRealm, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(connectToRealm(const TQString&)));
connect(base->machine_ldapRealm, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(connectToRealm(const TQString&)));
@@ -457,7 +462,9 @@ void LDAPConfig::groupHighlighted() {
base->group_memberList->clear();
for ( TQStringList::Iterator it = group.userlist.begin(); it != group.userlist.end(); ++it ) {
LDAPUserInfo user = findUserByDistinguishedName(*it);
- (void)new TQListViewItem(base->group_memberList, user.name, user.commonName, TQString("%1").arg(user.uid));
+ if (user.name != "") {
+ (void)new TQListViewItem(base->group_memberList, user.name, user.commonName, TQString("%1").arg(user.uid));
+ }
}
processLockouts();
diff --git a/src/userconfigbase.ui b/src/userconfigbase.ui
index f76d243..9417722 100644
--- a/src/userconfigbase.ui
+++ b/src/userconfigbase.ui
@@ -38,6 +38,14 @@
detailsIcon
+
+
+ 4
+ 5
+ 0
+ 0
+
+
@@ -54,7 +62,7 @@
5
- 4
+ 5
0
0
@@ -90,6 +98,14 @@
enabledIcon
+
+
+ 4
+ 5
+ 0
+ 0
+
+
@@ -103,6 +119,14 @@
disabledIcon
+
+
+ 4
+ 5
+ 0
+ 0
+
+
@@ -141,7 +165,7 @@
unnamed
- Real Name*
+ Display Name*
@@ -149,7 +173,24 @@
realName
-
+
+
+ unnamed_separator
+
+
+ unnamed_separator
+
+
+ 25
+
+
+ HLine
+
+
+ Sunken
+
+
+
unnamed
@@ -157,7 +198,7 @@
User ID
-
+
UID
@@ -168,7 +209,7 @@
99999
-
+
unnamed
@@ -176,12 +217,12 @@
Primary Group
-
+
primaryGroup
-
+
unnamed
@@ -189,7 +230,7 @@
Home Directory*
-
+
homeDirectory
@@ -197,15 +238,15 @@
18
-
+
unnamed
- Shell*
+ Shell
-
+
shell
@@ -244,31 +285,160 @@
unnamed
+
+ userIcon
+
+
+
+ 4
+ 5
+ 0
+ 0
+
+
+
+
unnamed
- Given Name
+ Detailed User Information
-
+
+
+ unnamed
+
+
+ First Name
+
+
+
givenName
-
+
unnamed
- Surname*
+ Initials
-
+
+
+ initials
+
+
+
+
+ unnamed
+
+
+ Last Name*
+
+
+
surName
+
+
+ unnamed
+
+
+ Title
+
+
+
+
+ title
+
+
+
+
+ unnamed
+
+
+ Description
+
+
+
+
+ description
+
+
+
+
+ unnamed
+
+
+ Office
+
+
+
+
+ office
+
+
+
+
+ unnamed_separator
+
+
+ unnamed_separator
+
+
+ 25
+
+
+ HLine
+
+
+ Sunken
+
+
+
+
+ unnamed
+
+
+ Telephone Number
+
+
+
+
+ telephoneNumber
+
+
+
+
+ unnamed
+
+
+ Facsimile Number
+
+
+
+
+ faxNumber
+
+
+
+
+ unnamed
+
+
+ Email Address
+
+
+
+
+ email
+
+
Spacer20
@@ -303,6 +473,14 @@
groupsIcon
+
+
+ 4
+ 5
+ 0
+ 0
+
+
@@ -382,6 +560,14 @@
passwordIcon
+
+
+ 4
+ 5
+ 0
+ 0
+
+
@@ -430,7 +616,7 @@
5
- 4
+ 5
0
0
@@ -528,6 +714,14 @@
Require new password after:
+
+
+ 5
+ 5
+ 1
+ 0
+
+
diff --git a/src/userconfigdlg.cpp b/src/userconfigdlg.cpp
index c49c8ae..a246aab 100644
--- a/src/userconfigdlg.cpp
+++ b/src/userconfigdlg.cpp
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include "ldapmgr.h"
#include "userconfigdlg.h"
@@ -53,6 +54,13 @@ UserConfigDialog::UserConfigDialog(LDAPUserInfo user, LDAPConfig* parent, const
}
m_base->lastChanged->setEnabled(false);
+ m_base->detailsIcon->setPixmap(SmallIcon("personal.png"));
+ m_base->enabledIcon->setPixmap(SmallIcon("decrypted.png"));
+ m_base->disabledIcon->setPixmap(SmallIcon("encrypted.png"));
+ m_base->userIcon->setPixmap(SmallIcon("personal.png"));
+ m_base->groupsIcon->setPixmap(SmallIcon("kdmconfig.png"));
+ m_base->passwordIcon->setPixmap(SmallIcon("password.png"));
+
connect(m_base->loginName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
connect(m_base->realName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
connect(m_base->surName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts()));
@@ -63,9 +71,6 @@ UserConfigDialog::UserConfigDialog(LDAPUserInfo user, LDAPConfig* parent, const
connect(m_base->requirePasswordMinAge, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts()));
connect(m_base->primaryGroup, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(processLockouts()));
- // Update fields
-// KPasswordEdit* passwordEntry;
-
if (m_user.status == KRB5_DISABLED_ACCOUNT) {
m_base->userStatusEnabled->setChecked(false);
m_base->userStatusDisabled->setChecked(true);
@@ -95,7 +100,6 @@ UserConfigDialog::UserConfigDialog(LDAPUserInfo user, LDAPConfig* parent, const
item->setOn(group.userlist.contains(m_user.distinguishedName));
}
-// m_base->passwordEntry;
m_base->lastChanged->setText(m_user.password_last_changed.toString(TQt::TextDate));
if (m_user.password_expires) {
m_base->passwordExpireEnabled->setChecked(true);
@@ -116,6 +120,13 @@ UserConfigDialog::UserConfigDialog(LDAPUserInfo user, LDAPConfig* parent, const
// User information
m_base->givenName->setText(m_user.givenName);
m_base->surName->setText(m_user.surName);
+ m_base->initials->setText(m_user.initials);
+ m_base->title->setText(m_user.title);
+ m_base->description->setText(m_user.description);
+ m_base->office->setText(m_user.deliveryOffice);
+ m_base->telephoneNumber->setText(m_user.telephoneNumber);
+ m_base->faxNumber->setText(m_user.faxNumber);
+ m_base->email->setText(m_user.email);
processLockouts();
}
@@ -167,6 +178,13 @@ void UserConfigDialog::slotOk() {
// User information
m_user.givenName = m_base->givenName->text();
m_user.surName = m_base->surName->text();
+ m_user.initials = m_base->initials->text();
+ m_user.title = m_base->title->text();
+ m_user.description = m_base->description->text();
+ m_user.deliveryOffice = m_base->office->text();
+ m_user.telephoneNumber = m_base->telephoneNumber->text();
+ m_user.faxNumber = m_base->faxNumber->text();
+ m_user.email = m_base->email->text();
// Special handler for new group
if (m_user.distinguishedName == "") {