summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/usermanager/groupdialog.cpp2
-rw-r--r--noncore/settings/usermanager/userdialog.cpp9
-rw-r--r--noncore/settings/usermanager/usermanager.cpp1
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
@@ -8,18 +8,16 @@
8 ***************************************************************************/ 8 ***************************************************************************/
9 9
10#include "groupdialog.h" 10#include "groupdialog.h"
11 11
12#include <qlabel.h> 12#include <qlabel.h>
13#include <qlayout.h> 13#include <qlayout.h>
14#include <qmessagebox.h> 14#include <qmessagebox.h>
15 15
16#include <stdlib.h>
17
18#include "passwd.h" 16#include "passwd.h"
19 17
20GroupDialog::GroupDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) { 18GroupDialog::GroupDialog(QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) {
21 // GID 19 // GID
22 QLabel *gidLabel=new QLabel(this,"gid: "); 20 QLabel *gidLabel=new QLabel(this,"gid: ");
23 gidLabel->setText("GroupID: "); 21 gidLabel->setText("GroupID: ");
24 gidLineEdit=new QLineEdit(this,"gid: "); 22 gidLineEdit=new QLineEdit(this,"gid: ");
25 gidLineEdit->setEnabled(false); 23 gidLineEdit->setEnabled(false);
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
@@ -9,19 +9,16 @@
9 9
10#include "userdialog.h" 10#include "userdialog.h"
11 11
12#include <qlayout.h> 12#include <qlayout.h>
13#include <qlabel.h> 13#include <qlabel.h>
14#include <qmessagebox.h> 14#include <qmessagebox.h>
15#include <qfile.h> 15#include <qfile.h>
16 16
17#include <stdlib.h>
18
19#include <stdio.h>
20#include <sys/types.h> 17#include <sys/types.h>
21#include <sys/wait.h> 18#include <sys/wait.h>
22#include <unistd.h> 19#include <unistd.h>
23#include <signal.h> 20#include <signal.h>
24 21
25#include "passwd.h" 22#include "passwd.h"
26 23
27#include <opie/odevice.h> 24#include <opie/odevice.h>
@@ -70,17 +67,17 @@ void UserDialog::setupTab1() {
70 layout->setMargin(5); 67 layout->setMargin(5);
71 68
72 // Picture 69 // Picture
73 picturePushButton = new QPushButton(tabpage,"Label"); 70 picturePushButton = new QPushButton(tabpage,"Label");
74 picturePushButton->setMinimumSize(48,48); 71 picturePushButton->setMinimumSize(48,48);
75 picturePushButton->setMaximumSize(48,48); 72 picturePushButton->setMaximumSize(48,48);
76 picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon. 73 picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));// Load default usericon.
77 connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector. 74 connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));// Clicking the picture should invoke pictureselector.
78 75
79 // Login 76 // Login
80 QLabel *loginLabel=new QLabel(tabpage,"Login: "); 77 QLabel *loginLabel=new QLabel(tabpage,"Login: ");
81 loginLabel->setText("Login: "); 78 loginLabel->setText("Login: ");
82 loginLineEdit=new QLineEdit(tabpage,"Login: "); 79 loginLineEdit=new QLineEdit(tabpage,"Login: ");
83 80
84 // UID 81 // UID
85 QLabel *uidLabel=new QLabel(tabpage,"uid: "); 82 QLabel *uidLabel=new QLabel(tabpage,"uid: ");
86 uidLabel->setText("UserID: "); 83 uidLabel->setText("UserID: ");
@@ -101,30 +98,30 @@ void UserDialog::setupTab1() {
101 // Shell 98 // Shell
102 QLabel *shellLabel=new QLabel(tabpage,"shell"); 99 QLabel *shellLabel=new QLabel(tabpage,"shell");
103 shellLabel->setText("Shell: "); 100 shellLabel->setText("Shell: ");
104 shellComboBox=new QComboBox(tabpage,"shell"); 101 shellComboBox=new QComboBox(tabpage,"shell");
105 shellComboBox->setEditable(true); 102 shellComboBox->setEditable(true);
106 shellComboBox->insertItem("/bin/sh"); 103 shellComboBox->insertItem("/bin/sh");
107 shellComboBox->insertItem("/bin/ash"); 104 shellComboBox->insertItem("/bin/ash");
108 shellComboBox->insertItem("/bin/false"); 105 shellComboBox->insertItem("/bin/false");
109 106
110 // Primary Group 107 // Primary Group
111 QLabel *groupLabel=new QLabel(tabpage,"group"); 108 QLabel *groupLabel=new QLabel(tabpage,"group");
112 groupLabel->setText("Primary group: "); 109 groupLabel->setText("Primary group: ");
113 groupComboBox=new QComboBox(tabpage,"PrimaryGroup"); 110 groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
114 111
115 if(vm==VIEWMODE_NEW) { 112 if(vm==VIEWMODE_NEW) {
116 // Copy /etc/skel 113 // Copy /etc/skel
117 skelLabel=new QLabel(tabpage,"skel"); 114 skelLabel=new QLabel(tabpage,"skel");
118 skelLabel->setText("Copy /etc/skel: "); 115 skelLabel->setText("Copy /etc/skel: ");
119 skelCheckBox=new QCheckBox(tabpage); 116 skelCheckBox=new QCheckBox(tabpage);
120 skelCheckBox->setChecked(true); 117 skelCheckBox->setChecked(true);
121 } 118 }
122 119
123 // Widget layout 120 // Widget layout
124 QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout"); 121 QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
125 layout->addWidget(picturePushButton); 122 layout->addWidget(picturePushButton);
126 layout->addSpacing(5); 123 layout->addSpacing(5);
127 layout->addLayout(hlayout); 124 layout->addLayout(hlayout);
128 QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1"); 125 QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
129 QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2"); 126 QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
130 // First column, labels 127 // First column, labels
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
@@ -5,17 +5,16 @@
5 * the Free Software Foundation; either version 2 of the License, or * 5 * the Free Software Foundation; either version 2 of the License, or *
6 * (at your option) any later version. * 6 * (at your option) any later version. *
7 * * 7 * *
8 ***************************************************************************/ 8 ***************************************************************************/
9 9
10#include "usermanager.h" 10#include "usermanager.h"
11 11
12#include <qlayout.h> 12#include <qlayout.h>
13#include <stdio.h>
14 13
15#include <qmessagebox.h> 14#include <qmessagebox.h>
16#include <qfile.h> 15#include <qfile.h>
17#include <qpe/resource.h> 16#include <qpe/resource.h>
18 17
19#include <qregexp.h> 18#include <qregexp.h>
20 19
21/** 20/**