3 files changed, 3 insertions, 9 deletions

diff --git a/noncore/settings/usermanager/groupdialog.cpp b/noncore/settings/usermanager/groupdialog.cpp
index b595d31..76810be 100644
--- a/noncore/settings/usermanager/groupdialog.cpp
+++ b/noncore/settings/usermanager/groupdialog.cpp
@@ -1,106 +1,104 @@
 /***************************************************************************
  *                                                                         *
  *   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 "groupdialog.h"
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 
-#include <stdlib.h>
-
 #include "passwd.h"
 
 GroupDialog::GroupDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
         // GID
         QLabel *gidLabel=new QLabel(this,"gid: ");
         gidLabel->setText("GroupID: ");
         gidLineEdit=new QLineEdit(this,"gid: ");
         gidLineEdit->setEnabled(false);
 
         // Groupname
         QLabel *groupnameLabel=new QLabel(this,"groupname");
         groupnameLabel->setText("Groupname: ");
         groupnameLineEdit=new QLineEdit(this,"groupname");
 
                 // Widget layout
         QVBoxLayout *layout=new QVBoxLayout(this);
         layout->setMargin(5);
         QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
         layout->addLayout(hlayout);
         QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
         QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
                 // First column, labels
                 vlayout1->addWidget(gidLabel);
                 vlayout1->addWidget(groupnameLabel);
                 // Second column, data
                 vlayout2->addWidget(gidLineEdit);
                 vlayout2->addWidget(groupnameLineEdit);
         hlayout->addLayout(vlayout1);
         hlayout->addLayout(vlayout2);
         layout->addSpacing(5);
         
         //showMaximized();
 }
 
 GroupDialog::~GroupDialog() {
 }
 
 bool GroupDialog::addGroup(int gid) {
                 GroupDialog *addgroupDialog=new GroupDialog();// Make a groupinfo dialog.
                 addgroupDialog->setCaption(tr("Add Group"));// Set the caption.
                 addgroupDialog->gidLineEdit->setText(QString::number(gid));// Set the next available gid.
                 if(!(addgroupDialog->exec())) return false;// View the dialog, and only continue if 'ok' was pressed.
                 if(!(accounts->addGroup(addgroupDialog->groupnameLineEdit->text(),addgroupDialog->gidLineEdit->text().toInt()))) {// Try to add the group.
                 QMessageBox::information(0,"Ooops!","Something went wrong.\nUnable to add group.");
                 return false;
         }
         return true;
 }
 
 bool GroupDialog::editGroup(int gid) {
                 GroupDialog *addgroupDialog=new GroupDialog();// Create the groupinfo dialog.
                 accounts->findGroup(gid);// Locate the group in the database, and fill out the variables in 'accounts'.
         // Fill out the widgets with previous data for this group.
         addgroupDialog->setCaption(tr("Edit Group"));
         addgroupDialog->gidLineEdit->setText(QString::number(accounts->gr_gid));
         addgroupDialog->groupnameLineEdit->setText(accounts->gr_name);
                 if(!(addgroupDialog->exec())) return false;// View the dialog, and only continue if 'ok' was pressed.
                 accounts->findGroup(gid);// Locate the group, and fill out the variables in 'accounts' with all info about the group.
                 accounts->gr_name=addgroupDialog->groupnameLineEdit->text();// Change the name
                 accounts->gr_gid=addgroupDialog->gidLineEdit->text().toInt();// Change the GID. (Unneeded as its disabled right now.)
                 accounts->updateGroup(gid);// Update the database with the variables (gr_name,gr_gid,gr_mem) in 'accounts'.
         return true;
 }
 
 bool GroupDialog::delGroup(const char *groupname) {
                 if((accounts->findGroup(groupname))) {// Does this group exist?
                         if(!(accounts->delGroup(groupname))) {// Try to delete it.
                         QMessageBox::information(0,"Ooops!","Something went wrong\nUnable to delete group: "+QString(groupname)+".");
                 }
         } else {
                 QMessageBox::information(0,"Invalid Groupname","That groupname ("+QString(groupname)+")does not exist.");
                 return false;
         }
         return true;
 }
 
 void GroupDialog::accept() {
         // Check if gid is already taken.
         //if((accounts->findGroup(gidLineEdit->text().toInt()))) {
         //      QMessageBox::information(this,"GroupID taken","That GroupID is already taken.");
         //      return;
         //}
         // Check if groupname is already taken.
         if((accounts->findGroup(groupnameLineEdit->text()))) {
                 QMessageBox::information(0,"Groupname taken","That groupname is already taken.");
                         return;// Don't close the dialog.
         }
         QDialog::accept();
 }
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 19b0e84..d87a005 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -1,250 +1,247 @@
 /***************************************************************************
  *                                                                         *
  *   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 <qfile.h>
 
-#include <stdlib.h>
-
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
 
 #include "passwd.h"
 
 #include <opie/odevice.h>
 using namespace Opie;
 
 
 /**
  * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
  *
  */
 UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
         vm=viewmode;
         QVBoxLayout *layout = new QVBoxLayout(this);
         myTabWidget=new QTabWidget(this,"User Tab Widget");
         layout->addWidget(myTabWidget);
         setupTab1();
         setupTab2();
 
         accounts->groupStringList.sort();
         // 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);
                         if(accounts->gr_name.find(QRegExp("^#"),0)) {// Skip commented lines.
                         new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
                         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("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");
 
         if(vm==VIEWMODE_NEW) {
                 // Copy /etc/skel
                 skelLabel=new QLabel(tabpage,"skel");
                 skelLabel->setText("Copy /etc/skel: ");
                 skelCheckBox=new QCheckBox(tabpage);
                 skelCheckBox->setChecked(true);
         }
-        
+
         // 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);
                 if(vm==VIEWMODE_NEW) {
                         vlayout1->addSpacing(5);
                         vlayout1->addWidget(skelLabel);
                 }
                 // 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);
                 if(vm==VIEWMODE_NEW) {
                         vlayout2->addSpacing(5);
                         vlayout2->addWidget(skelCheckBox);
                 }
         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(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. 
  *
  * @param uid This is a suggested available UID.
  * @param gid This is a suggested available GID.
  *
  * @return <code>true</code> if the user was successfully added, otherwise <code>false</code>.
  *
  */
 bool UserDialog::addUser(int uid, int gid) {
         QCheckListItem *temp;
         QFile ozTest;
         int oz=false;
         if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
         // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating adduserDialog's widgets here.
         UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
         adduserDialog->setCaption(tr("Add User"));
                 adduserDialog->userID=uid;// Set next available UID as default uid.
                 adduserDialog->groupID=gid;// Set next available GID as default gid.
         // Insert default group into groupComboBox
         adduserDialog->groupComboBox->insertItem("<create new group>",0);
         adduserDialog->uidLineEdit->setText(QString::number(uid));
         // If we're running on OZ, add new users to some default groups.
         if(oz) {
                 QListViewItemIterator iter( adduserDialog->groupsListView );
                 for ( ; iter.current(); ++iter ) {
                         temp=(QCheckListItem*)iter.current();
                         if (temp->text()=="video") temp->setOn(true);
                         if (temp->text()=="audio") temp->setOn(true);
                         if (temp->text()=="time") temp->setOn(true);
                         if (temp->text()=="power") temp->setOn(true);
                         if (temp->text()=="input") temp->setOn(true);
                         if (temp->text()=="sharp") temp->setOn(true);
                         if (temp->text()=="tty") temp->setOn(true);
                 }
         }
         // Show the dialog! 
         if(!(adduserDialog->exec())) return false;
         if((adduserDialog->groupComboBox->currentItem()!=0)) {
                 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.
         QListViewItemIterator it( adduserDialog->groupsListView );
         for ( ; it.current(); ++it ) {
                 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())) {
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp
index 5c90525..5411995 100644
--- a/noncore/settings/usermanager/usermanager.cpp
+++ b/noncore/settings/usermanager/usermanager.cpp
@@ -1,141 +1,140 @@
 /***************************************************************************
  *                                                                         *
  *   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 "usermanager.h"
 
 #include <qlayout.h>
-#include <stdio.h>
 
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qpe/resource.h>
 
 #include <qregexp.h>
 
 /**
  * The mainwindow constructor.
  *
  * @param QWidget *parent
  * @param const char *name
  * @ param WFlags fl
  *
  */
 UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) {
         setCaption(tr("Opie User Manager"));
         
         // Create an instance of the global object 'accounts'. This holds all user/group info, and functions to modify them.
         accounts=new Passwd();
                 accounts->open();// This actually loads the files /etc/passwd & /etc/group into memory.
 
         // Create the toolbar.
         QToolBar *toolbar = new QToolBar(this,"Toolbar");
         toolbar->setHorizontalStretchable(1); // Is there any other way to get the toolbar to stretch of the full screen!?
         adduserToolButton = new QToolButton(Resource::loadPixmap("usermanager/adduser"),"Add User",0,this,SLOT(addUser()),toolbar,"Add User");
         edituserToolButton = new QToolButton(Resource::loadPixmap("usermanager/edituser"),"Edit User",0,this,SLOT(editUser()),toolbar,"Edit User");
         deleteuserToolButton = new QToolButton(Resource::loadPixmap("usermanager/deleteuser"),"Delete User",0,this,SLOT(delUser()),toolbar,"Delete User");
         QToolButton *userstext = new QToolButton(0,"User",0,0,0,toolbar,"User");
         userstext->setUsesTextLabel(true);
         toolbar->addSeparator();
         addgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/addgroup"),"Add Group",0,this,SLOT(addGroup()),toolbar,"Add Group");
         editgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/editgroup"),"Edit Group",0,this,SLOT(editGroup()),toolbar,"Edit Group");
         deletegroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/deletegroup"),"Delete Group",0,this,SLOT(delGroup()),toolbar,"Delete Group");
         QToolButton *groupstext = new QToolButton(0,"Group",0,0,0,toolbar,"Group");
         groupstext->setUsesTextLabel(true);
         addToolBar(toolbar,"myToolBar");
 
         // Add a tabwidget and all the tabs.
         myTabWidget = new QTabWidget(this,"My Tab Widget");
         setupTabAccounts();
         setupTabAllUsers();
         setupTabAllGroups();
         userPopupMenu.insertItem("Copy",0);
         
         getUsers(); // Fill out the iconview & listview with all users.
         getGroups(); // Fill out the group listview with all groups.
         
         setCentralWidget(myTabWidget);
 }
 
 UserConfig::~UserConfig() {
         accounts->close();
         delete accounts;
 }
 
 void UserConfig::setupTabAccounts() {
         QWidget *tabpage = new QWidget(this);
         QVBoxLayout *layout = new QVBoxLayout(tabpage);
         layout->setMargin(5);
         
         usersIconView=new QListView(tabpage,"users");
         usersIconView->addColumn("Icon");
         usersIconView->addColumn("Username");
         usersIconView->setAllColumnsShowFocus(true);
         layout->addWidget(usersIconView);
         
         connect(usersIconView,SIGNAL(returnPressed(QListViewItem *)),this,SLOT(showUserMenu(QListViewItem *)));
         
         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");
         usersListView->addColumn("Login");
         usersListView->addColumn("Username");
         layout->addWidget(usersListView);
         usersListView->setSorting(1,1);
         usersListView->setAllColumnsShowFocus(true);
 
         myTabWidget->addTab(tabpage,"All Users");
 }
 
 void UserConfig::setupTabAllGroups() {
         QWidget *tabpage = new QWidget(this);
         QVBoxLayout *layout = new QVBoxLayout(tabpage);
         layout->setMargin(5);
 
         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.)
                         if(accounts->pw_name.find(QRegExp("^#"),0)) {// Skip commented lines.
                         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.
                                 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.
                                 }
                                         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.
                 }
         }