Icon selection now works. User listing lists 1 user per row now. (moved from qiconlist to qlistview)

3 files changed, 25 insertions, 19 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
@@ -146,25 +146,25 @@ void UserDialog::setupTab1() {
  *  Creates the second tab containing additional groups for the user.
  *
  */
 void UserDialog::setupTab2() {
 	QWidget *tabpage = new QWidget(myTabWidget,"page2");
 	QVBoxLayout *layout = new QVBoxLayout(tabpage);
 	layout->setMargin(5);
 
 	// Additional groups
 	groupsListView=new QListView(tabpage,"groups");
 	groupsListView->addColumn("Additional groups");
 	groupsListView->setColumnWidthMode(0,QListView::Maximum);
-	groupsListView->setMultiSelection(true);
+	groupsListView->setMultiSelection(false);
 	groupsListView->setAllColumnsShowFocus(false);
 	
 	layout->addSpacing(5);
 		// Grouplist
 		layout->addWidget(groupsListView);
 	
 	myTabWidget->addTab(tabpage,"User Groups");
 }
 
 /**
  * Static function that creates the userinfo dialog.
  * The user will be prompted to add a user. 
@@ -189,37 +189,39 @@ bool UserDialog::addUser(int uid, int gid) {
 		accounts->findGroup(adduserDialog->groupComboBox->currentText());
 		adduserDialog->groupID=accounts->gr_gid;
 		qWarning(QString::number(accounts->gr_gid));
 	}
 	if(!(accounts->addUser(adduserDialog->loginLineEdit->text(), adduserDialog->passwordLineEdit->text(), 
 							adduserDialog->uidLineEdit->text().toInt(), adduserDialog->groupID, adduserDialog->gecosLineEdit->text(), 
 							QString("/home/")+adduserDialog->loginLineEdit->text() , adduserDialog->shellComboBox->currentText()))) {
 		QMessageBox::information(0,"Ooops!","Something went wrong!\nUnable to add user.");
 		return false;
 	}
     
 	// Add User to additional groups.
+	QCheckListItem *temp;
 	QListViewItemIterator it( adduserDialog->groupsListView );
 	for ( ; it.current(); ++it ) {
-	if ( it.current()->isSelected() )
+	temp=(QCheckListItem*)it.current();
+	if (temp->isOn() )
 		accounts->addGroupMember(it.current()->text(0),adduserDialog->loginLineEdit->text());
 	}
 	// Copy image to pics/users/
 	if(!(adduserDialog->userImage.isNull())) {
 		QDir d;
 		if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
 			d.mkdir("/opt/QtPalmtop/pics/users");
 		}
 		QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
-		adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
+//		adduserDialog->userImage=adduserDialog->userImage.smoothScale(48,48);
 		adduserDialog->userImage.save(filename,"PNG");
 	}
 	return true;
 }
 
 /**
  * Deletes the user account.
  *
  * @param username User to be deleted.
  *
  * @return <code>true</code> if the user was successfully deleted, otherwise <code>false</code>.
  *
@@ -259,31 +261,33 @@ bool UserDialog::editUser(const char *username) {
 	// If this user is not using /bin/sh,/bin/ash or /bin/false as shell, add that entry to the shell-combobox.
 	if(accounts->pw_shell!="/bin/sh" && accounts->pw_shell!="/bin/ash" && accounts->pw_shell!="/bin/false") {
 		edituserDialog->shellComboBox->insertItem(accounts->pw_shell,0);
 		edituserDialog->shellComboBox->setCurrentItem(0);
 	}
 	// Select the primary group for this user.
 	for(int i=0;i<edituserDialog->groupComboBox->count();++i) {
 		if(accounts->gr_name==edituserDialog->groupComboBox->text(i)) {
 			edituserDialog->groupComboBox->setCurrentItem(i);
 		}
 	}
 	// Select the groups in the listview, to which the user belongs.
+	QCheckListItem *temp;
 	QRegExp userRegExp(QString("[:\\s]%1\\s").arg(username));
 	QStringList tempList=accounts->groupStringList.grep(userRegExp);	// Find all entries in the group database, that the user is a member of.
 	for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {	// Iterate over all of them.
 		QListViewItemIterator lvit( edituserDialog->groupsListView );	// Compare to all groups.
 		for ( ; lvit.current(); ++lvit ) {
 			if(lvit.current()->text(0)==(*it).left((*it).find(":"))) {
-				lvit.current()->setSelected(true);	// If we find a line with that groupname, select it.;
+				temp=(QCheckListItem*)lvit.current();
+				temp->setOn(true);	// If we find a line with that groupname, select it.;
 			}
 		}
 	}
 	
 	if(!(edituserDialog->exec())) return false;	// SHOW THE DIALOG!
 	
 	accounts->findUser(username);	// Fill user variables in 'acccounts' object.
 	accounts->pw_name=edituserDialog->loginLineEdit->text();
 	// Has the password been changed ? Make a new "crypt":ed password.
 	if(edituserDialog->passwordLineEdit->text()!="........") accounts->pw_passwd=crypt(edituserDialog->passwordLineEdit->text(), accounts->crypt_make_salt());
 	
 	// Set all variables in accounts object, that will be used when calling 'updateUser()'
@@ -294,36 +298,37 @@ bool UserDialog::editUser(const char *username) {
 	accounts->pw_shell=edituserDialog->shellComboBox->currentText();
 	// Update userinfo, using the information stored in the user variables stored in the accounts object.
 	accounts->updateUser(username);
 	
 	// Remove user from all groups he/she is a member of. (could be done in a better way I guess, this was simple though.)
 	for(QStringList::Iterator it=tempList.begin(); it!=tempList.end(); ++it) {
 		accounts->delGroupMember((*it).left((*it).find(":")),username);
 	}
 	
 	// Add User to additional groups that he/she is a member of.
 	QListViewItemIterator it( edituserDialog->groupsListView );
 	for ( ; it.current(); ++it ) {
-	if ( it.current()->isSelected() )
+	temp=(QCheckListItem*)it.current();
+	if ( temp->isOn() )
 		accounts->addGroupMember(it.current()->text(0),edituserDialog->loginLineEdit->text());
 	}
 	
 	// Copy image to pics/users/
 	if(!(edituserDialog->userImage.isNull())) {
 		QDir d;
 		if(!(d.exists("/opt/QtPalmtop/pics/users"))) {
 			d.mkdir("/opt/QtPalmtop/pics/users");
 		}
 		QString filename="/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png";
-		edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
+//		edituserDialog->userImage=edituserDialog->userImage.smoothScale(48,48);
 		edituserDialog->userImage.save(filename,"PNG");
 	}
 	return true;
 }
 
 /**
  * "OK" has been clicked. Verify some information before closing the dialog.
  *
  */
 void UserDialog::accept() {
 	// Add checking... valid username? username taken? 
 	if(loginLineEdit->text().isEmpty()) {
@@ -335,20 +340,20 @@ void UserDialog::accept() {
 
 /**
  * This slot is called when the usericon is clicked, this loads (should) the iconselector.
  *
  */
 void UserDialog::clickedPicture() {
 	QString filename=OFileDialog::getOpenFileName(OFileSelector::EXTENDED,"/opt/QtPalmtop/pics");
 	if(!(filename.isEmpty())) {
 		userImage.reset();
 		if(!(userImage.load(filename))) {
 			QMessageBox::information(0,"Sorry!","That icon could not be loaded.\nLoading failed on: "+filename);
 		} else {
-			userImage=userImage.smoothScale(48,48);
+//			userImage=userImage.smoothScale(48,48);
 			QPixmap *picture;
 			picture=(QPixmap *)picturePushButton->pixmap();
 			picture->convertFromImage(userImage,0);
 			picturePushButton->update();
 		}
 	}
 }
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp
index ed18b7f..2735e6a 100644
--- a/noncore/settings/usermanager/usermanager.cpp
+++ b/noncore/settings/usermanager/usermanager.cpp
@@ -62,27 +62,28 @@ UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWind
 }
 
 UserConfig::~UserConfig() {
 	accounts->close();
 	delete accounts;
 }
 
 void UserConfig::setupTabAccounts() {
 	QWidget *tabpage = new QWidget(this);
 	QVBoxLayout *layout = new QVBoxLayout(tabpage);
 	layout->setMargin(5);
 	
-	usersIconView=new QIconView(tabpage,"users");
-	usersIconView->setItemTextPos(QIconView::Right);
-	usersIconView->setArrangement(QIconView::LeftToRight);
+	usersIconView=new QListView(tabpage,"users");
+	usersIconView->addColumn("Icon");
+	usersIconView->addColumn("Username");
+	usersIconView->setAllColumnsShowFocus(true);
 	layout->addWidget(usersIconView);
 	
 	myTabWidget->addTab(tabpage,"Users");
 }
 
 void UserConfig::setupTabAllUsers() {
 	QWidget *tabpage = new QWidget(this);
 	QVBoxLayout *layout = new QVBoxLayout(tabpage);
 	layout->setMargin(5);
 	
 	usersListView=new QListView(tabpage,"allusers");
 	usersListView->addColumn("UID");
@@ -103,60 +104,60 @@ void UserConfig::setupTabAllGroups() {
 	groupsListView=new QListView(tabpage,"groups");
 	groupsListView->addColumn("GID");
 	groupsListView->addColumn("Groupname");
 	layout->addWidget(groupsListView);
 	groupsListView->setSorting(1,1);
 	groupsListView->setAllColumnsShowFocus(true);
 	
 	myTabWidget->addTab(tabpage,"All Groups");
 }
 void UserConfig::getUsers() {
 	QString mytext;
 	QPixmap mypixmap;
-		
+	QListViewItem *listviewitem;
+			
 	// Empty the iconview & the listview.
 	usersIconView->clear();
 	usersListView->clear();
 	
 	// availableUID is used as a deposite for the next available UID on the system, this should start at an ID over 500.
 	availableUID=500;
 	for(QStringList::Iterator it=accounts->passwdStringList.begin(); it!=accounts->passwdStringList.end(); ++it) {
 		accounts->splitPasswdEntry(*it); // Split the string into it's components and store in variables in the accounts object. ("pr_name" and so on.)
 		new QListViewItem(usersListView,QString::number(accounts->pw_uid),accounts->pw_name,accounts->pw_gecos);
 		if((accounts->pw_uid>=500) && (accounts->pw_uid<65000)) {	// Is this user a "normal" user ?
 			mytext=QString(accounts->pw_name)+" - ("+QString(accounts->pw_gecos)+")"; // The string displayed next to the icon.
-//			mypixmap=Resource::loadPixmap(QString("users/"+accounts->pw_name));	// Is there an icon for this user? Resource::loadPixmap is caching, doesn't work.
-			if(!(mypixmap.load("/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"))) {
-//			if(mypixmap.isNull()) {
+			if(!(mypixmap.load("/opt/QtPalmtop/pics/users/"+accounts->pw_name+".png"))) { //  Is there an icon for this user? Resource::loadPixmap is caching, doesn't work.
 				mypixmap=Resource::loadPixmap(QString("usermanager/usericon"));	// If this user has no icon, load the default icon.
 			}
-			new QIconViewItem(usersIconView,mytext,mypixmap);	// Add the icon+text to the qiconview.
+			listviewitem=new QListViewItem(usersIconView,"",mytext);	// Add the icon+text to the qiconview.
+			listviewitem->setPixmap(0,mypixmap);
 		}
 		if((accounts->pw_uid>=availableUID) && (accounts->pw_uid<65000)) availableUID=accounts->pw_uid+1; // Increase 1 to the latest know UID to get a free uid. 
 	}
 	usersIconView->sort();
 }
 
 void UserConfig::addUser() {
 	if(UserDialog::addUser(availableUID,availableGID)) {	// Add the user to the system, also send next available UID and GID.
 		getUsers(); // Update users views.
 		getGroups(); // Update groups view.
 	}
 }
 
 void UserConfig::editUser() {
 	QString username;
 	if(myTabWidget->currentPageIndex()==0) {	// Users
 		if(usersIconView->currentItem()) {	// Any icon selected?
-			username=usersIconView->currentItem()->text();	// Get the text associated with the icon.
+			username=usersIconView->currentItem()->text(1);	// Get the text associated with the icon.
 			username=username.left(username.find(" - (",0,true));	// Strip out the username.
 			if(UserDialog::editUser(username)) {	// Bring up the userinfo dialog.
 				// If there were any changed also update the views.
 				getUsers();
 				getGroups();
 			}
 		} else {
 			QMessageBox::information(this,"No selection.","No user has been selected.");
 		}
 	}
 	if(myTabWidget->currentPageIndex()==1) {	// All users
 		if(usersListView->currentItem()) {	// Anything changed!?
@@ -168,25 +169,25 @@ void UserConfig::editUser() {
 			}
 		} else  {
 			QMessageBox::information(this,"No selection.","No user has been selected.");
 		}
 	}
 }
 
 void UserConfig::delUser() {
 	QString username;
 	
 	if(myTabWidget->currentPageIndex()==0) {	// Users, Iconview.
 		if(usersIconView->currentItem()) {	// Anything selected?
-			username=usersIconView->currentItem()->text();	// Get string associated with icon.
+			username=usersIconView->currentItem()->text(1);	// Get string associated with icon.
 			username=username.left(username.find(" - (",0,true));	// Strip out the username.
 			if(QMessageBox::warning(this,"Delete user","Are you sure you want to\ndelete this user? \""+QString(username)+"\" ?","&No","&Yes",0,0,1)) {
 				if(UserDialog::delUser(username)) {	// Delete the user if possible.
 					// Update views.
 					getUsers();
 					getGroups();
 				}
 			}
 		} else  {
 			QMessageBox::information(this,"No selection","No user has been selected.");
 		}
 	}
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h
index bb5d04f..9909242 100644
--- a/noncore/settings/usermanager/usermanager.h
+++ b/noncore/settings/usermanager/usermanager.h
@@ -4,25 +4,25 @@
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef USERCONFIG_H
 #define USERCONFIG_H
 
 #include <qmainwindow.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
-#include <qiconview.h>
+//#include <qiconview.h>
 
 #include <qpe/qpemenubar.h>
 #include <qpopupmenu.h>                       
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
 
 #include "userdialog.h"
 #include "groupdialog.h"
 #include "passwd.h"
 
 class UserConfig : public QMainWindow
 {
@@ -31,25 +31,25 @@ class UserConfig : public QMainWindow
 public:
 	UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
 	~UserConfig();
 
 private:
 	QToolButton *adduserToolButton;
 	QToolButton *edituserToolButton;
 	QToolButton *deleteuserToolButton;
 	QToolButton *addgroupToolButton;
 	QToolButton *editgroupToolButton;
 	QToolButton *deletegroupToolButton;
 	QTabWidget *myTabWidget;
-	QIconView *usersIconView;
+	QListView *usersIconView;
 	QListView *usersListView;
 	QListView *groupsListView;
 	int availableUID;
 	int availableGID;
 	void setupTabAccounts();
 	void setupTabAllUsers();
 	void setupTabAllGroups();
 	void setupTabPrefs();
 	void setupTabAbout();
 	void getUsers();
 	void getGroups();