*** empty log message ***

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 892fc8a..f31775d 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -1,164 +1,164 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "userdialog.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
 
 #include "passwd.h"
 
 /**
  * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
  *
  */
 UserDialog::UserDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
 	QVBoxLayout *layout = new QVBoxLayout(this);
 	myTabWidget=new QTabWidget(this,"User Tab Widget");
 	layout->addWidget(myTabWidget);
 	setupTab1();
 	setupTab2();
 
 	// And also fill the listview & the combobox with all available groups.
 	for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it) {
 		accounts->splitGroupEntry(*it);
 		new QListViewItem(groupsListView,accounts->gr_name);
 		groupComboBox->insertItem(accounts->gr_name);
 	}
 	
 	showMaximized();
 }
 
 /**
  * Empty destructor.
  *
  */
 UserDialog::~UserDialog() {
 }
 
 /**
  *  Creates the first tab, all userinfo is here.
  *
  */
 void UserDialog::setupTab1() {
 	QPixmap mypixmap;
 	QWidget *tabpage = new QWidget(myTabWidget,"page1");
 	QVBoxLayout *layout = new QVBoxLayout(tabpage);
 	layout->setMargin(5);
 
 	// Picture
 	picturePushButton = new QPushButton(tabpage,"Label");
 	picturePushButton->setMinimumSize(48,48);
 	picturePushButton->setMaximumSize(48,48);
-	picturePushButton->setPixmap(Resource::loadPixmap("userconfig/usericon"));	// Load default usericon.
+	picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));	// Load default usericon.
 	connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));	// Clicking the picture should invoke pictureselector.
 	
 	// Login
 	QLabel *loginLabel=new QLabel(tabpage,"Login: ");
 	loginLabel->setText("Login: ");
 	loginLineEdit=new QLineEdit(tabpage,"Login: ");
 
 	// UID
 	QLabel *uidLabel=new QLabel(tabpage,"uid: ");
 	uidLabel->setText("UserID: ");
 	uidLineEdit=new QLineEdit(tabpage,"uid: ");
 	uidLineEdit->setEnabled(false);
 
 	// Username (gecos)
 	QLabel *gecosLabel=new QLabel(tabpage,"gecos");
 	gecosLabel->setText("Username: ");
 	gecosLineEdit=new QLineEdit(tabpage,"gecos");
 
 	// Password
 	QLabel *passwordLabel=new QLabel(tabpage,"password");
 	passwordLabel->setText("Password: ");
 	passwordLineEdit=new QLineEdit(tabpage,"password");
 	passwordLineEdit->setEchoMode(QLineEdit::Password);
 
 	// Shell
 	QLabel *shellLabel=new QLabel(tabpage,"shell");
 	shellLabel->setText("Shell: ");
 	shellComboBox=new QComboBox(tabpage,"shell");
 	shellComboBox->setEditable(true);
 	shellComboBox->insertItem("/bin/sh");
 	shellComboBox->insertItem("/bin/ash");
 	shellComboBox->insertItem("/bin/false");
 	
 	// Primary Group
 	QLabel *groupLabel=new QLabel(tabpage,"group");
 	groupLabel->setText("Primary group: ");
 	groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
 
 		// Widget layout
 	QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
 	layout->addWidget(picturePushButton);
 	layout->addSpacing(5);
 	layout->addLayout(hlayout);
 	QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
 	QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
 		// First column, labels
 		vlayout1->addWidget(loginLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(uidLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(gecosLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(passwordLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(shellLabel);
 		vlayout1->addSpacing(5);
 		vlayout1->addWidget(groupLabel);
 		// Second column, data
 		vlayout2->addWidget(loginLineEdit);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(uidLineEdit);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(gecosLineEdit);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(passwordLineEdit);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(shellComboBox);
 		vlayout2->addSpacing(5);
 		vlayout2->addWidget(groupComboBox);
 	hlayout->addLayout(vlayout1);
 	hlayout->addLayout(vlayout2);
 	
 	myTabWidget->addTab(tabpage,"User Info");
 }
 
 /**
  *  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);
 	
 	layout->addSpacing(5);
 		// Grouplist
 		layout->addWidget(groupsListView);
 	
 	myTabWidget->addTab(tabpage,"User Groups");
 }