Added icons for buttons. Modifying output help string with run command. Added tool tips for users operations

resources/systeminstaller.qrc

@@ -2,5 +2,9 @@
     <qresource prefix="/">
         <file>img/calculate-logo.png</file>
 		<file>img/calculate-icon.png</file>
+		<file>img/dialog-cancel.png</file>
+		<file>img/dialog-ok-apply.png</file>
+		<file>img/list-add-user.png</file>
+		<file>img/list-remove-user.png</file>
     </qresource>
 </RCC>

src/calculateconfig.cpp

@@ -74,8 +74,19 @@ bool CalculateConfig::getDefaultConfig()
 	m_Config["os_device_dev"] = devs;
 
 	m_Config["gui_os_device_dev"] = m_Config["os_device_dev"].toStringList().at(0);
-
+	m_Config["gui_os_device_dev_def"] = m_Config["gui_os_device_dev"];
-	//CalculateConfig::instance()->getValue("os_device_dev").toStringList()
+
+	// copy default values
+	m_Config["gui_os_install_net_hostname"] = m_Config["os_install_net_hostname"];
+	m_Config["gui_os_install_net_domain"] = m_Config["os_install_net_domain"];
+	m_Config["gui_os_install_net_domain"] = m_Config["os_install_net_domain"];
+	m_Config["gui_os_install_clock_timezone"] = m_Config["os_install_clock_timezone"];
+	m_Config["gui_os_install_x11_video_drv"] = m_Config["os_install_x11_video_drv"];
+	m_Config["gui_os_install_x11_composite"] = m_Config["os_install_x11_composite"];
+	m_Config["gui_os_install_makeopts"] = m_Config["os_install_makeopts"];
+	m_Config["gui_os_install_proxy"] = m_Config["os_install_proxy"];
+	m_Config["gui_os_install_ntp"] = m_Config["os_install_ntp"];
+	m_Config["gui_os_install_clock_type"] = m_Config["os_install_clock_type"];
 
 	return true;
 }
@@ -257,52 +268,61 @@ QStringList CalculateConfig::getInstallParameters()
 		params << QString("--swap ") + m_Config["--swap"].toString();
 
 	// mbr
-	if ( !m_Config["gui_os_device_dev"].toString().isEmpty() )
+	QString mbr_dev = m_Config["gui_os_device_dev"].toString();
-		params << QString("--mbr ") + m_Config["gui_os_device_dev"].toString();
+	if ( !mbr_dev.isEmpty() && (mbr_dev != m_Config["gui_os_device_dev_def"].toString()) )
+		params << QString("--mbr ") + mbr_dev;
 
 	// config
-	if ( !m_Config["os_install_net_hostname"].toString().isEmpty() )
+	QString hostname = m_Config["gui_os_install_net_hostname"].toString();
-		params << "--set os_install_net_hostname=" + m_Config["os_install_net_hostname"].toString();
+	if ( !hostname.isEmpty() && (hostname != m_Config["os_install_net_hostname"].toString()) )
+		params << "--set os_install_net_hostname=" + hostname;
 
-	if ( !m_Config["os_install_net_domain"].toString().isEmpty() )
+	QString domain = m_Config["gui_os_install_net_domain"].toString();
-		params << "--set os_install_net_domain=" + m_Config["os_install_net_domain"].toString();
+	if ( !domain.isEmpty() && (domain != m_Config["os_install_net_domain"].toString()) )
+		params << "--set os_install_net_domain=" + domain;
 
-	if ( !m_Config["os_install_clock_timezone"].toString().isEmpty() )
+	QString timezone = m_Config["gui_os_install_clock_timezone"].toString();
-		params << "--set os_install_clock_timezone=" + m_Config["os_install_clock_timezone"].toString();
+	if ( !timezone.isEmpty() && (timezone != m_Config["os_install_clock_timezone"].toString()) )
+		params << "--set os_install_clock_timezone=" + timezone;
 
-	if ( !m_Config["os_install_x11_video_drv"].toString().isEmpty() )
+	QString video_drv = m_Config["gui_os_install_x11_video_drv"].toString();
-		params << "--set os_install_x11_video_drv=" + m_Config["os_install_x11_video_drv"].toString();
+	if ( !video_drv.isEmpty() && (video_drv != m_Config["os_install_x11_video_drv"].toString()) )
+		params << "--set os_install_x11_video_drv=" + video_drv;
 
-	if ( !m_Config["os_install_x11_composite"].toString().isEmpty() )
+	QString composite = m_Config["gui_os_install_x11_composite"].toString();
-		params << "--set os_install_x11_composite=" + m_Config["os_install_x11_composite"].toString();
+	if ( !composite.isEmpty() && (composite != m_Config["os_install_x11_composite"].toString()) )
+		params << "--set os_install_x11_composite=" + composite;
 
 	if ( m_Config["gui_expert_mode"].toString() == "on" )
 	{
-		if ( !m_Config["os_install_makeopts"].toString().isEmpty() )
+		QString	makeopts = m_Config["gui_os_install_makeopts"].toString();
-			params << "--set os_install_makeopts=" + m_Config["os_install_makeopts"].toString();
+		if ( !makeopts.isEmpty() && (makeopts != m_Config["os_install_makeopts"].toString()) )
+			params << "--set os_install_makeopts=" + makeopts;
 
-		if ( !m_Config["os_install_proxy"].toString().isEmpty() )
+		QString proxy = m_Config["gui_os_install_proxy"].toString();
-			params << "--set os_install_proxy=" + m_Config["os_install_proxy"].toString();
+		if ( !proxy.isEmpty() && (proxy != m_Config["os_install_proxy"].toString()) )
+			params << "--set os_install_proxy=" + proxy;
 
-		if ( !m_Config["os_install_ntp"].toString().isEmpty() )
+		QString ntp = m_Config["gui_os_install_ntp"].toString();
-			params << "--set os_install_ntp=" + m_Config["os_install_ntp"].toString();
+		if ( !ntp.isEmpty() && (ntp != m_Config["os_install_ntp"].toString()) )
+			params << "--set os_install_ntp=" + ntp;
 
-		if ( !m_Config["os_install_clock_type"].toString().isEmpty() )
+		QString clock_type = m_Config["gui_os_install_clock_type"].toString();
-			params << "--set os_install_clock_type=" + m_Config["os_install_clock_type"].toString();
+		if ( !clock_type.isEmpty() && (clock_type != m_Config["os_install_clock_type"].toString()) )
+			params << "--set os_install_clock_type=" + clock_type;
 	}
 
 	// lang
-	if ( !m_Config["gui_install_language"].toString().isEmpty() )
+	QString lang = m_Config["gui_install_language"].toString();
-		params << "--lang " + m_Config["gui_install_language"].toString();
+	if ( !lang.isEmpty() && ( lang != m_Config["os_locale_lang"].toString()))
+		params << "--lang " + lang;
 
 	// users
 	if ( m_Config["gui_users"].toStringList().count() > 0 )
 	{
 		foreach(const QString& user, m_Config["gui_users"].toStringList())
-		{
 			params << QString("--user ") + user;
 	}
-	}
 
 	return params;
 }

src/main.cpp

@@ -9,6 +9,8 @@
 
 #include <QDebug>
 
+#include <QProcess>
+
 #include "systeminstaller.h"
 
 static QFile	debugLog;
@@ -24,7 +26,7 @@ int main(int argc, char** argv)
 
 	QApplication	app(argc, argv);
 
-	qInstallMsgHandler( MsgHandler );
+	//qInstallMsgHandler( MsgHandler );
 
 	debugLog.setFileName("/var/log/calculate/cl-install-gui-debug.log");
 	if ( debugLog.open(QIODevice::Append | QIODevice::WriteOnly | QIODevice::Text | QIODevice::Unbuffered) )
@@ -34,6 +36,9 @@ int main(int argc, char** argv)
 
 	SystemInstaller	installer;
 
+	QProcess::execute("export QT_PLUGIN_PATH=/home/ivan/.kde4/lib64/kde4/plugins/:/usr/lib64/kde4/plugins/" );
+	//qDebug() << app.libraryPaths().join(" ");
+
 	if ( getuid() != 0)
 	{
 		QMessageBox::critical(
@@ -44,6 +49,8 @@ int main(int argc, char** argv)
 		return -1;
 	}
 
+	//app.addLibraryPath("/usr");
+
 	installer.show();
 
 	return app.exec();

src/pageconfiguration.cpp

@@ -237,17 +237,7 @@ void PageConfiguration::retranslateUi()
 		else
 			qDebug() << "Unsupported language " << lang;
 	}
-/*
+
-	m_cmbboxLanguage->addItem( tr("English"), QVariant("en_US") );
-	m_cmbboxLanguage->addItem( tr("German"), QVariant("de_DE") );
-	m_cmbboxLanguage->addItem( tr("Spanish"), QVariant("es_ES") );
-	m_cmbboxLanguage->addItem( tr("French"), QVariant("fr_FR") );
-	m_cmbboxLanguage->addItem( tr("Italian"), QVariant("it_IT") );
-	m_cmbboxLanguage->addItem( tr("Polish"), QVariant("pl_PL") );
-	m_cmbboxLanguage->addItem( tr("Brazilian Portugal"), QVariant("pt_BR") );
-	m_cmbboxLanguage->addItem( tr("Russian"), QVariant("ru_RU") );
-	m_cmbboxLanguage->addItem( tr("Ukraine"), QVariant("uk_UA") );
-*/
 	m_labelTimezone->setText( tr("Timezone:") );
 	setupTimezones();
 
@@ -277,8 +267,8 @@ void PageConfiguration::retranslateUi()
 
 	m_labelClockType->setText( tr("Clock type:") );
 	m_cmbboxClockType->clear();
-	m_cmbboxClockType->addItem( tr("Local") );
+	m_cmbboxClockType->addItem( tr("Local"), QVariant("local") );
-	m_cmbboxClockType->addItem( tr("UTC") );
+	m_cmbboxClockType->addItem( tr("UTC"), QVariant("UTC") );
 
 }
 
@@ -300,9 +290,9 @@ void PageConfiguration::show()
 {
 	CalculateConfig*	clConf = CalculateConfig::instance();
 
-	m_editHostName->setText( clConf->getValue("os_install_net_hostname").toString() );
+	m_editHostName->setText( clConf->getValue("gui_os_install_net_hostname").toString() );
 
-	m_editDomainName->setText( clConf->getValue("os_install_net_domain").toString() );
+	m_editDomainName->setText( clConf->getValue("gui_os_install_net_domain").toString() );
 
 	//qDebug() << "cfg language: " << clConf->getValue("gui_install_language");
 	int langIndex = m_cmbboxLanguage->findData( clConf->getValue("gui_install_language") );
@@ -311,7 +301,7 @@ void PageConfiguration::show()
 
 	//qDebug() << "cfg timezone: " << clConf->getValue("os_install_clock_timezone");
 	int timezoneIndex = m_cmbboxTimezone->findText(
-		clConf->getValue("os_install_clock_timezone").toString()
+		clConf->getValue("gui_os_install_clock_timezone").toString()
 	);
 	if (timezoneIndex >= 0)
 		m_cmbboxTimezone->setCurrentIndex( timezoneIndex );
@@ -323,23 +313,23 @@ void PageConfiguration::show()
 		m_cmbboxMbrDevice->setCurrentIndex( bootdevIndex );
 
 	int videodrvIndex = m_cmbboxVideoDrv->findText(
-		clConf->getValue("os_install_x11_video_drv").toString()
+		clConf->getValue("gui_os_install_x11_video_drv").toString()
 	);
 	if (videodrvIndex >= 0)
 		m_cmbboxVideoDrv->setCurrentIndex( videodrvIndex );
 
 	m_chkboxComposite->setChecked(
-		clConf->getValue("os_install_x11_composite").toString() == "on"
+		clConf->getValue("gui_os_install_x11_composite").toString() == "on"
 	);
 
-	m_editMakeOpts->setText( clConf->getValue("os_install_makeopts").toString() );
+	m_editMakeOpts->setText( clConf->getValue("gui_os_install_makeopts").toString() );
 
-	m_editProxy->setText( clConf->getValue("os_install_proxy").toString() );
+	m_editProxy->setText( clConf->getValue("gui_os_install_proxy").toString() );
 
-	m_editNtp->setText( clConf->getValue("os_install_ntp").toString() );
+	m_editNtp->setText( clConf->getValue("gui_os_install_ntp").toString() );
 
-	int clocktypeIndex = m_cmbboxClockType->findText(
+	int clocktypeIndex = m_cmbboxClockType->findData(
-		clConf->getValue("os_install_clock_type").toString()
+		clConf->getValue("gui_os_install_clock_type").toString()
 	);
 	if (clocktypeIndex >= 0)
 		m_cmbboxClockType->setCurrentIndex( clocktypeIndex );
@@ -351,20 +341,20 @@ void PageConfiguration::updateData()
 {
 	CalculateConfig*	clConf = CalculateConfig::instance();
 
-	clConf->setValue("os_install_net_hostname", m_editHostName->text() );
+	clConf->setValue("gui_os_install_net_hostname", m_editHostName->text() );
-	clConf->setValue("os_install_net_domain", m_editDomainName->text() );
+	clConf->setValue("gui_os_install_net_domain", m_editDomainName->text() );
 	//qDebug() << "store cfg gui_install_language" << m_cmbboxLanguage->itemData( m_cmbboxLanguage->currentIndex() ) ;
 	clConf->setValue("gui_install_language", m_cmbboxLanguage->itemData( m_cmbboxLanguage->currentIndex() ) );
-	clConf->setValue("os_install_clock_timezone", m_cmbboxTimezone->currentText() );
+	clConf->setValue("gui_os_install_clock_timezone", m_cmbboxTimezone->currentText() );
 	clConf->setValue("gui_os_device_dev", m_cmbboxMbrDevice->currentText() );
-	clConf->setValue("os_install_x11_video_drv", m_cmbboxVideoDrv->currentText() );
+	clConf->setValue("gui_os_install_x11_video_drv", m_cmbboxVideoDrv->currentText() );
-	clConf->setValue("os_install_x11_composite", m_chkboxComposite->isChecked() ? "on" : "off" );
+	clConf->setValue("gui_os_install_x11_composite", m_chkboxComposite->isChecked() ? "on" : "off" );
 
 	clConf->setValue("gui_expert_mode", m_chkboxExtParameters->isChecked() ? "on" : "off" );
-	clConf->setValue("os_install_makeopts", m_editMakeOpts->text() );
+	clConf->setValue("gui_os_install_makeopts", m_editMakeOpts->text() );
-	clConf->setValue("os_install_proxy", m_editProxy->text() );
+	clConf->setValue("gui_os_install_proxy", m_editProxy->text() );
-	clConf->setValue("os_install_ntp", m_editNtp->text() );
+	clConf->setValue("gui_os_install_ntp", m_editNtp->text() );
-	clConf->setValue("os_install_clock_type", m_cmbboxClockType->currentText() );
+	clConf->setValue("gui_os_install_clock_type", m_cmbboxClockType->itemData( m_cmbboxClockType->currentIndex() ) );
 
 	clConf->showInstallParameters();
 }

src/pageusers.cpp

@@ -74,10 +74,10 @@ void PageUsers::setupUi()
 	hbox_users->addStretch();
 
 	m_butAddUser = new QToolButton;
-	m_butAddUser->setIcon( QIcon::fromTheme("list-add-user") );
+	m_butAddUser->setIcon( QIcon(":/img/list-add-user.png") );
 
 	m_butDelUser = new QToolButton;
-	m_butDelUser->setIcon( QIcon::fromTheme("list-remove-user") );
+	m_butDelUser->setIcon( QIcon(":/img/list-remove-user.png") );
 
 	QHBoxLayout* hbox_but = new QHBoxLayout;
 	hbox_but->addWidget( m_butAddUser );
@@ -110,6 +110,11 @@ void PageUsers::retranslateUi()
 	m_labRootPsw->setText( tr("Password") );
 	m_labRootPswRep->setText( tr("Confirm Password") );
 
+	m_butAddUser->setToolTip( tr("Add user") );
+	m_butDelUser->setToolTip( tr("Remove selected user") );
+
+	m_lstUsers->setToolTip( tr("Added users.\nFor modifying user - double click it.") );
+
 	m_labUsers->setText( tr("Create users:") );
 }