author | umopapisdn <umopapisdn> | 2002-09-30 18:11:33 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2002-09-30 18:11:33 (UTC) |
commit | d49bd63f3b15795a1ee2497960f00eb3fb075e69 (patch) (unidiff) | |
tree | 44459a473faadc66288822f43146af817bac124e /noncore/settings/usermanager/userdialog.cpp | |
parent | 096eb52cfbb50fefbe6679fb91e926346ff3c9d7 (diff) | |
download | opie-d49bd63f3b15795a1ee2497960f00eb3fb075e69.zip opie-d49bd63f3b15795a1ee2497960f00eb3fb075e69.tar.gz opie-d49bd63f3b15795a1ee2497960f00eb3fb075e69.tar.bz2 |
Primary group combobox is sorted.
Deleting a primary group for a user sets the primarygroup combobox to <Undefined group> not an arbitrary group.
Diffstat (limited to 'noncore/settings/usermanager/userdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/usermanager/userdialog.cpp | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp index b7827a4..90e27d5 100644 --- a/noncore/settings/usermanager/userdialog.cpp +++ b/noncore/settings/usermanager/userdialog.cpp | |||
@@ -34,14 +34,13 @@ UserDialog::UserDialog(QWidget* parent, const char* name, bool modal, WFlags fl) | |||
34 | setupTab1(); | 34 | setupTab1(); |
35 | setupTab2(); | 35 | setupTab2(); |
36 | 36 | ||
37 | accounts->groupStringList.sort(); | ||
37 | // And also fill the listview & the combobox with all available groups. | 38 | // And also fill the listview & the combobox with all available groups. |
38 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { | 39 | for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) { |
39 | accounts->splitGroupEntry(*it); | 40 | accounts->splitGroupEntry(*it); |
40 | //new QListViewItem(groupsListView,accounts->gr_name); | ||
41 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); | 41 | new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox); |
42 | groupComboBox->insertItem(accounts->gr_name); | 42 | groupComboBox->insertItem(accounts->gr_name); |
43 | } | 43 | } |
44 | |||
45 | showMaximized(); | 44 | showMaximized(); |
46 | } | 45 | } |
47 | 46 | ||
@@ -105,6 +104,14 @@ void UserDialog::setupTab1() { | |||
105 | groupLabel->setText("Primary group: "); | 104 | groupLabel->setText("Primary group: "); |
106 | groupComboBox=new QComboBox(tabpage,"PrimaryGroup"); | 105 | groupComboBox=new QComboBox(tabpage,"PrimaryGroup"); |
107 | 106 | ||
107 | // Copy /etc/skel | ||
108 | QLabel *skelLabel=new QLabel(tabpage,"skel"); | ||
109 | skelLabel->setText("Copy /etc/skel: "); | ||
110 | skelCheckBox=new QCheckBox(tabpage); | ||
111 | skelCheckBox->setChecked(true); | ||
112 | skelLabel->setDisabled(true); | ||
113 | skelCheckBox->setDisabled(true); | ||
114 | |||
108 | // Widget layout | 115 | // Widget layout |
109 | QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout"); | 116 | QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout"); |
110 | layout->addWidget(picturePushButton); | 117 | layout->addWidget(picturePushButton); |
@@ -124,6 +131,8 @@ void UserDialog::setupTab1() { | |||
124 | vlayout1->addWidget(shellLabel); | 131 | vlayout1->addWidget(shellLabel); |
125 | vlayout1->addSpacing(5); | 132 | vlayout1->addSpacing(5); |
126 | vlayout1->addWidget(groupLabel); | 133 | vlayout1->addWidget(groupLabel); |
134 | vlayout1->addSpacing(5); | ||
135 | vlayout1->addWidget(skelLabel); | ||
127 | // Second column, data | 136 | // Second column, data |
128 | vlayout2->addWidget(loginLineEdit); | 137 | vlayout2->addWidget(loginLineEdit); |
129 | vlayout2->addSpacing(5); | 138 | vlayout2->addSpacing(5); |
@@ -136,6 +145,8 @@ void UserDialog::setupTab1() { | |||
136 | vlayout2->addWidget(shellComboBox); | 145 | vlayout2->addWidget(shellComboBox); |
137 | vlayout2->addSpacing(5); | 146 | vlayout2->addSpacing(5); |
138 | vlayout2->addWidget(groupComboBox); | 147 | vlayout2->addWidget(groupComboBox); |
148 | vlayout2->addSpacing(5); | ||
149 | vlayout2->addWidget(skelCheckBox); | ||
139 | hlayout->addLayout(vlayout1); | 150 | hlayout->addLayout(vlayout1); |
140 | hlayout->addLayout(vlayout2); | 151 | hlayout->addLayout(vlayout2); |
141 | 152 | ||
@@ -248,10 +259,13 @@ bool UserDialog::delUser(const char *username) { | |||
248 | * | 259 | * |
249 | */ | 260 | */ |
250 | bool UserDialog::editUser(const char *username) { | 261 | bool UserDialog::editUser(const char *username) { |
262 | int invalid_group=0; | ||
251 | UserDialog *edituserDialog=new UserDialog();// Create Dialog | 263 | UserDialog *edituserDialog=new UserDialog();// Create Dialog |
252 | edituserDialog->setCaption(tr("Edit User")); | 264 | edituserDialog->setCaption(tr("Edit User")); |
253 | accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object. | 265 | accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object. |
254 | accounts->findGroup(accounts->pw_gid);// Locate the user's primary group, and fill group variables in 'accounts' object. | 266 | if(!(accounts->findGroup(accounts->pw_gid))) {// Locate the user's primary group, and fill group variables in 'accounts' object. |
267 | invalid_group=1; | ||
268 | } | ||
255 | // Fill widgets with userinfo. | 269 | // Fill widgets with userinfo. |
256 | edituserDialog->loginLineEdit->setText(accounts->pw_name); | 270 | edituserDialog->loginLineEdit->setText(accounts->pw_name); |
257 | edituserDialog->uidLineEdit->setText(QString::number(accounts->pw_uid)); | 271 | edituserDialog->uidLineEdit->setText(QString::number(accounts->pw_uid)); |
@@ -267,7 +281,12 @@ bool UserDialog::editUser(const char *username) { | |||
267 | for(int i=0;i<edituserDialog->groupComboBox->count();++i) { | 281 | for(int i=0;i<edituserDialog->groupComboBox->count();++i) { |
268 | if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) { | 282 | if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) { |
269 | edituserDialog->groupComboBox->setCurrentItem(i); | 283 | edituserDialog->groupComboBox->setCurrentItem(i); |
284 | break; | ||
285 | } | ||
270 | } | 286 | } |
287 | if(invalid_group) { | ||
288 | edituserDialog->groupComboBox->insertItem("<Undefined group>",0); | ||
289 | edituserDialog->groupComboBox->setCurrentItem(0); | ||
271 | } | 290 | } |
272 | // Select the groups in the listview, to which the user belongs. | 291 | // Select the groups in the listview, to which the user belongs. |
273 | QCheckListItem *temp; | 292 | QCheckListItem *temp; |
@@ -292,8 +311,9 @@ bool UserDialog::editUser(const char *username) { | |||
292 | 311 | ||
293 | // Set all variables in accounts object, that will be used when calling 'updateUser()' | 312 | // Set all variables in accounts object, that will be used when calling 'updateUser()' |
294 | accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt(); | 313 | accounts->pw_uid=edituserDialog->uidLineEdit->text().toInt(); |
295 | accounts->findGroup(edituserDialog->groupComboBox->currentText());// Fill all group variables in 'accounts' object. | 314 | if(accounts->findGroup(edituserDialog->groupComboBox->currentText())) {// Fill all group variables in 'accounts' object. |
296 | accounts->pw_gid=accounts->gr_gid; | 315 | accounts->pw_gid=accounts->gr_gid;// Only do this if the group is a valid group (ie. "<Undefined group>"), otherwise keep the old group. |
316 | } | ||
297 | accounts->pw_gecos=edituserDialog->gecosLineEdit->text(); | 317 | accounts->pw_gecos=edituserDialog->gecosLineEdit->text(); |
298 | accounts->pw_shell=edituserDialog->shellComboBox->currentText(); | 318 | accounts->pw_shell=edituserDialog->shellComboBox->currentText(); |
299 | // Update userinfo, using the information stored in the user variables stored in the accounts object. | 319 | // Update userinfo, using the information stored in the user variables stored in the accounts object. |