summaryrefslogtreecommitdiff
path: root/noncore/settings/usermanager/userdialog.cpp
Unidiff
Diffstat (limited to 'noncore/settings/usermanager/userdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/usermanager/userdialog.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 719dd1e..b7827a4 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -152,13 +152,13 @@ void UserDialog::setupTab2() {
152 layout->setMargin(5); 152 layout->setMargin(5);
153 153
154 // Additional groups 154 // Additional groups
155 groupsListView=new QListView(tabpage,"groups"); 155 groupsListView=new QListView(tabpage,"groups");
156 groupsListView->addColumn("Additional groups"); 156 groupsListView->addColumn("Additional groups");
157 groupsListView->setColumnWidthMode(0,QListView::Maximum); 157 groupsListView->setColumnWidthMode(0,QListView::Maximum);
158 groupsListView->setMultiSelection(true); 158 groupsListView->setMultiSelection(false);
159 groupsListView->setAllColumnsShowFocus(false); 159 groupsListView->setAllColumnsShowFocus(false);
160 160
161 layout->addSpacing(5); 161 layout->addSpacing(5);
162 // Grouplist 162 // Grouplist
163 layout->addWidget(groupsListView); 163 layout->addWidget(groupsListView);
164 164
@@ -195,25 +195,27 @@ bool UserDialog::addUser(int uid, int gid) {
195 QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) { 195 QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) {
196 QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user."); 196 QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user.");
197 return false; 197 return false;
198 } 198 }
199 199
200 // Add User to additional groups. 200 // Add User to additional groups.
201 QCheckListItem *temp;
201 QListViewItemIterator it( adduserDialog->groupsListView ); 202 QListViewItemIterator it( adduserDialog->groupsListView );
202 for ( ; it.current(); ++it ) { 203 for ( ; it.current(); ++it ) {
203 if ( it.current()->isSelected() ) 204 temp=(QCheckListItem*)it.current();
205 if (temp->isOn() )
204 accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text()); 206 accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text());
205 } 207 }
206 // Copy image to pics/users/ 208 // Copy image to pics/users/
207 if(!(adduserDialog->userImage.isNull())) { 209 if(!(adduserDialog->userImage.isNull())) {
208 QDir d; 210 QDir d;
209 if(!(d.exists("/opt/QtPalmtop/pics/users"))) { 211 if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
210 d.mkdir("/opt/QtPalmtop/pics/users"); 212 d.mkdir("/opt/QtPalmtop/pics/users");
211 } 213 }
212 QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; 214 QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
213 adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48); 215 // adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
214 adduserDialog->userImage.save(filename,"PNG"); 216 adduserDialog->userImage.save(filename,"PNG");
215 } 217 }
216 return true; 218 return true;
217} 219}
218 220
219/** 221/**
@@ -265,19 +267,21 @@ bool UserDialog::editUser(const char *username) {
265 for(int i=0;i<edituserDialog->groupComboBox->count();++i) { 267 for(int i=0;i<edituserDialog->groupComboBox->count();++i) {
266 if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) { 268 if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) {
267 edituserDialog->groupComboBox->setCurrentItem(i); 269 edituserDialog->groupComboBox->setCurrentItem(i);
268 } 270 }
269 } 271 }
270 // Select the groups in the listview, to which the user belongs. 272 // Select the groups in the listview, to which the user belongs.
273 QCheckListItem *temp;
271 QRegExp userRegExp(QString("[:\\s]%1\\s").arg(username)); 274 QRegExp userRegExp(QString("[:\\s]%1\\s").arg(username));
272 QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of. 275 QStringList tempList=accounts->groupStringList.grep(userRegExp);// Find all entries in the group database, that the user is a member of.
273 for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them. 276 for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {// Iterate over all of them.
274 QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups. 277 QListViewItemIterator lvit( edituserDialog->groupsListView );// Compare to all groups.
275 for ( ; lvit.current(); ++lvit ) { 278 for ( ; lvit.current(); ++lvit ) {
276 if(lvit.current()->text(0)==(*it).left((*it).find(":"))) { 279 if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
277 lvit.current()->setSelected(true);// If we find a line with that groupname, select it.; 280 temp=(QCheckListItem*)lvit.current();
281 temp->setOn(true);// If we find a line with that groupname, select it.;
278 } 282 }
279 } 283 }
280 } 284 }
281 285
282 if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG! 286 if(!(edituserDialog->exec())) return false;// SHOW THE DIALOG!
283 287
@@ -300,24 +304,25 @@ bool UserDialog::editUser(const char *username) {
300 accounts->delGroupMember((*it).left((*it).find(":")),username); 304 accounts->delGroupMember((*it).left((*it).find(":")),username);
301 } 305 }
302 306
303 // Add User to additional groups that he/she is a member of. 307 // Add User to additional groups that he/she is a member of.
304 QListViewItemIterator it( edituserDialog->groupsListView ); 308 QListViewItemIterator it( edituserDialog->groupsListView );
305 for ( ; it.current(); ++it ) { 309 for ( ; it.current(); ++it ) {
306 if ( it.current()->isSelected() ) 310 temp=(QCheckListItem*)it.current();
311 if ( temp->isOn() )
307 accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text()); 312 accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text());
308 } 313 }
309 314
310 // Copy image to pics/users/ 315 // Copy image to pics/users/
311 if(!(edituserDialog->userImage.isNull())) { 316 if(!(edituserDialog->userImage.isNull())) {
312 QDir d; 317 QDir d;
313 if(!(d.exists("/opt/QtPalmtop/pics/users"))) { 318 if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
314 d.mkdir("/opt/QtPalmtop/pics/users"); 319 d.mkdir("/opt/QtPalmtop/pics/users");
315 } 320 }
316 QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"; 321 QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
317 edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48); 322 // edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
318 edituserDialog->userImage.save(filename,"PNG"); 323 edituserDialog->userImage.save(filename,"PNG");
319 } 324 }
320 return true; 325 return true;
321} 326}
322 327
323/** 328/**
@@ -341,13 +346,13 @@ void UserDialog::clickedPicture() {
341 QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED,"/opt/QtPalmtop/pics"); 346 QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED,"/opt/QtPalmtop/pics");
342 if(!(filename.isEmpty())) { 347 if(!(filename.isEmpty())) {
343 userImage.reset(); 348 userImage.reset();
344 if(!(userImage.load(filename))) { 349 if(!(userImage.load(filename))) {
345 QMessageBox::information(0,"Sorry!","That icon could not be loaded.\nLoading failed on: "+filename); 350 QMessageBox::information(0,"Sorry!","That icon could not be loaded.\nLoading failed on: "+filename);
346 } else { 351 } else {
347 userImage=userImage.smoothScale(48,48); 352 // userImage=userImage.smoothScale(48,48);
348 QPixmap *picture; 353 QPixmap *picture;
349 picture=(QPixmap *)picturePushButton->pixmap(); 354 picture=(QPixmap *)picturePushButton->pixmap();
350 picture->convertFromImage(userImage,0); 355 picture->convertFromImage(userImage,0);
351 picturePushButton->update(); 356 picturePushButton->update();
352 } 357 }
353 } 358 }