1 files changed, 21 insertions, 14 deletions

diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index 36bcf86..c82cc9d 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -29,13 +29,14 @@ using namespace Opie;
 
 
 /**
  * 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) {
+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();
 
@@ -106,19 +107,19 @@ void UserDialog::setupTab1() {
         
         // Primary Group
         QLabel *groupLabel=new QLabel(tabpage,"group");
         groupLabel->setText("Primary group: ");
         groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
 
-        // Copy /etc/skel
-        QLabel *skelLabel=new QLabel(tabpage,"skel");
-        skelLabel->setText("Copy /etc/skel: ");
-        skelCheckBox=new QCheckBox(tabpage);
-        skelCheckBox->setChecked(true);
-        //skelLabel->setDisabled(true);
-        //skelCheckBox->setDisabled(true);
+        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);
@@ -133,28 +134,32 @@ void UserDialog::setupTab1() {
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(passwordLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(shellLabel);
                 vlayout1->addSpacing(5);
                 vlayout1->addWidget(groupLabel);
-                vlayout1->addSpacing(5);
-                vlayout1->addWidget(skelLabel);
+                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);
-                vlayout2->addSpacing(5);
-                vlayout2->addWidget(skelCheckBox);
+                if(vm==VIEWMODE_NEW) {
+                        vlayout2->addSpacing(5);
+                        vlayout2->addWidget(skelCheckBox);
+                }
         hlayout->addLayout(vlayout1);
         hlayout->addLayout(vlayout2);
         
         myTabWidget->addTab(tabpage,"User Info");
 }
 
@@ -193,13 +198,14 @@ void UserDialog::setupTab2() {
  */
 bool UserDialog::addUser(int uid, int gid) {
         QCheckListItem *temp;
         QFile ozTest;
         int oz=false;
         if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
-        UserDialog *adduserDialog=new UserDialog();
+        // 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));
@@ -295,13 +301,14 @@ bool UserDialog::delUser(const char *username) {
  *
  * @return <code>true</code> if the user was successfully deleted, otherwise <code>false</code>.
  *
  */
 bool UserDialog::editUser(const char *username) {
         int invalid_group=0;
-                UserDialog *edituserDialog=new UserDialog();// Create Dialog
+        // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating edituserDialog's widgets here.
+                UserDialog *edituserDialog=new UserDialog(VIEWMODE_EDIT);// Create Dialog
         edituserDialog->setCaption(tr("Edit User"));
                 accounts->findUser(username);// Locate user in database and fill variables in 'accounts' object.
                 if(!(accounts->findGroup(accounts->pw_gid))) {// Locate the user's primary group, and fill group variables in 'accounts' object.
                 invalid_group=1;
         }
         // Fill widgets with userinfo.