Fixed user management.

src/calculateconfig.cpp

@@ -95,7 +95,7 @@ QStringList CalculateConfig::getPasswordUsers()
 		usersParam += " --user " + user;
 	}
 
-	qDebug() << "Start cl-install" <<  usersParam << " -v --xml --filter *migrate*";
+	qDebug() << "Start cl-install" +  usersParam + " -v --xml --filter *migrate*";
 	cl_install.start("cl-install" + usersParam + " -v --xml --filter *migrate*" );
 
 	if ( !cl_install.waitForStarted() )
@@ -129,15 +129,16 @@ QStringList CalculateConfig::getPasswordUsers()
 	}
 
 	if ( migrateUser["cl_migrate_user"].toStringList().count() !=
-		migrateUser["cl_migrate_user_psw"].toStringList().count()
+		migrateUser["cl_migrate_user_pwd"].toStringList().count()
 	)
 	{
+		qDebug() << "Error result";
 		return QStringList();
 	}
 
 	for ( int i(0); i != migrateUser["cl_migrate_user"].toStringList().count(); ++i )
 	{
-		if ( migrateUser["cl_migrate_user_psw"].toStringList().at(i) == "yes" )
+		if ( migrateUser["cl_migrate_user_pwd"].toStringList().at(i) == "yes" )
 			result << migrateUser["cl_migrate_user"].toStringList().at(i);
 	}
 

src/pageinstall.cpp

@@ -104,7 +104,6 @@ void PageInstall::show()
 		    qDebug() << arg;
 
 		m_clProc->setStandardErrorFile("/var/log/calculate/cl-install-gui-err.log");
-		//m_clProc->setStandardOutputFile("/home/guest/cl-install-gui-out.log");
 
 		m_clProc->start( "cl-install -f --color never -P " +  args.join(" ") );
 
@@ -112,6 +111,7 @@ void PageInstall::show()
 		m_Progress->setMaximum(0);
 
 		m_clProc->write( (passwd.join("\n") + "\n").toLocal8Bit() );
+
 	}
 }
 

src/pageusers.cpp

@@ -119,6 +119,13 @@ void PageUsers::show()
 //	qDebug() << "Theme path: " + QIcon::themeSearchPaths().join(", ");
 //	qDebug() << QString("has list-add-user: ") + QString(QIcon::hasThemeIcon("list-add-user")?"yes":"no");
 //	qDebug() << QString("has list-remove-user: ") + QString(QIcon::hasThemeIcon("list-remove-user")?"yes":"no");
+	if ( !CalculateConfig::instance()->getPasswordUsers().contains("root") )
+	{
+		m_edRootPsw->setEnabled(false);
+		m_edRootPswRep->setEnabled(false);
+		m_pswState = true;
+	}
+
 	emit changeNext( m_pswState );
 }