Prepare new branch

resources/cl-install-gui-kde.desktop

@@ -1,8 +1,6 @@
 [Desktop Entry]
 Name=Calculate Linux Install
 Name[ru]=Установка Calculate Linux
-Name[fr]=Installer Calculate Linux
-Name[es]=Instalar Calculate Linux
 Comment=GUI-Frontend for Calculate Linux installer
 Exec=kdesu cl-install-gui %f
 Icon=cl-install-gui

resources/cl-install-gui.desktop

@@ -1,8 +1,6 @@
 [Desktop Entry]
 Name=Calculate Linux Install
 Name[ru]=Установка Calculate Linux
-Name[fr]=Installer Calculate Linux
-Name[es]=Instalar Calculate Linux
 Comment=GUI-Frontend for Calculate Linux installer
 Exec=gksu cl-install-gui %f
 Icon=cl-install-gui

src/calculateconfig.cpp

@@ -31,10 +31,10 @@ bool CalculateConfig::getDefaultConfig()
 	// start cl-install -v and parse out
 	QProcess	cl_install;
 
-	qDebug() << "Start cl-install -v --xml --filter \"os_install|os_locale_lang$|os_disk|os_device|^cl_migrate_user$\"";
+	qDebug() << "Start cl-install -v --xml --filter (os_install*|os_locale_lang|os_disk*|os_device*|cl_migrate_user)";
 
 	cl_install.start(
-		"cl-install -v --xml --filter \"os_install|os_locale_lang|^os_lang$|os_disk|os_device|^cl_migrate_user$\""
+		"cl-install -v --xml --filter \"os_install*|os_locale_lang|*os_disk*|*os_device*|cl_migrate_user\""
 	);
 
 	if ( !cl_install.waitForStarted() )
@@ -45,8 +45,6 @@ bool CalculateConfig::getDefaultConfig()
 
 	QString			outVars = cl_install.readAll();
 
-	qDebug() << endl << outVars;
-
 	QDomDocument	xmlVars;
 	QString			errMsg;
 	int				errLine;
@@ -69,7 +67,7 @@ bool CalculateConfig::getDefaultConfig()
 
 	QStringList	devs = m_Config["os_device_dev"].toStringList();
 	m_Config.remove("os_device_dev");
-	m_Config["os_device_dev"] = devs;
+	m_Config["os_device_dev"] = preparePartitions(devs);
 
 	if ( !m_Config["os_device_dev"].toStringList().isEmpty() )
 		m_Config["gui_os_device_dev"] = m_Config["os_device_dev"].toStringList().at(0);
@@ -93,20 +91,6 @@ bool CalculateConfig::getDefaultConfig()
 
 	m_Config["def_cl_migrate_user"] = m_Config["cl_migrate_user"];
 
-	qDebug() << endl << "Start variables: ";
-	MapConfig::ConstIterator	cfgIt = m_Config.constBegin();
-	while(cfgIt != m_Config.constEnd())
-	{
-		qDebug() <<
-			cfgIt.key() +
-			" = " +
-			(( QString(cfgIt.value().typeName()) == "QStringList") ?
-				("[" + cfgIt.value().toStringList().join(", ") + "]") :
-				( cfgIt.value().toString() ) );
-		++cfgIt;
-	}
-
-
 	return true;
 }
 
@@ -116,8 +100,8 @@ bool CalculateConfig::getNewPartitioning()
 	MapConfig	confDisk;
 	QProcess	cl_install;
 
-	qDebug() << "Start cl-install -v --xml --filter (os_disk|os_device|os_install_disk)";
-	cl_install.start( "cl-install -v --xml --filter \"(os_disk|os_device|os_install_disk)\" " );
+	qDebug() << "Start cl-install -v --xml --filter (os_disk*|os_device*|os_install_disk*)";
+	cl_install.start( "cl-install -v --xml --filter \"(os_disk*|os_device*|os_install_disk*)\" " );
 
 	if ( !cl_install.waitForStarted() )
 		return false;
@@ -146,7 +130,7 @@ bool CalculateConfig::getNewPartitioning()
 	QStringList	devs = confDisk["os_device_dev"].toStringList();
 
 	m_Config.remove("os_device_dev");
-	m_Config["os_device_dev"] = devs;
+	m_Config["os_device_dev"] = preparePartitions(devs);
 
 	m_Config.remove("os_disk_dev");
 	m_Config["os_disk_dev"] = confDisk["os_disk_dev"];
@@ -180,8 +164,8 @@ bool CalculateConfig::getNewMountpoints()
 
 	QStringList	newMpParam = getDisksParameters();
 
-	qDebug() << "Start cl-install " + newMpParam.join(" ") + " -v --xml --filter os_install_disk_";
-	cl_install.start("cl-install " + newMpParam.join(" ") + " --color never -v --xml --filter os_install_disk_" );
+	qDebug() << "Start cl-install " + newMpParam.join(" ") + " -v --xml --filter os_install_disk_*";
+	cl_install.start("cl-install " + newMpParam.join(" ") + " --color never -v --xml --filter os_install_disk_*" );
 
 	if ( !cl_install.waitForStarted() )
 		return false;
@@ -225,6 +209,20 @@ bool CalculateConfig::getNewMountpoints()
 	return true;
 }
 
+QStringList CalculateConfig::preparePartitions(const QStringList& parts)
+{
+	QStringList	devs(parts);
+	QStringList::iterator	dev = devs.begin();
+
+	while ( dev != devs.end() )
+	{
+		*dev = "/dev/"+*dev;
+		++dev;
+	}
+
+	return devs;
+}
+
 QStringList CalculateConfig::getPasswordUsers()
 {
 	QStringList	result;
@@ -240,8 +238,8 @@ QStringList CalculateConfig::getPasswordUsers()
 		usersParam += " --user " + user;
 	}
 
-	qDebug() << "Start cl-install" +  usersParam + " -v --xml --filter migrate";
-	cl_install.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() )
 	{

src/calculateconfig.h

@@ -39,6 +39,8 @@ private:
 	CalculateConfig(const CalculateConfig&);
 	CalculateConfig& operator=(const CalculateConfig&);
 
+	QStringList	preparePartitions(const QStringList& parts);
+
 	void		parseVariables(const QDomNode& node, MapConfig& cfg);
 	void		parseVar(const QDomNode& node, MapConfig& cfg);
 	void		parseVarList(const QDomNode& node, MapConfig& cfg);
@@ -49,4 +51,4 @@ private:
 	static CalculateConfig*	_instance;
 
 	MapConfig	m_Config;
-};
+};

src/mountpointdialog.cpp

@@ -101,12 +101,10 @@ void MountPointDialog::setupUi()
 
 	m_labFS = new QLabel( tr("File system: ") );
 	m_cmbboxFS = new QComboBox;
-	m_cmbboxFS->addItem( "btrfs" );
 	m_cmbboxFS->addItem( "ext2" );
 	m_cmbboxFS->addItem( "ext3" );
 	m_cmbboxFS->addItem( "ext4" );
 	m_cmbboxFS->addItem( "jfs" );
-	m_cmbboxFS->addItem( "nilfs2" );
 	m_cmbboxFS->addItem( "reiserfs" );
 	m_cmbboxFS->addItem( "xfs" );
 	m_cmbboxFS->addItem( "swap" );

src/pageconfiguration.cpp

@@ -251,7 +251,7 @@ void PageConfiguration::retranslateUi()
 
 	m_labelLanguage->setText( tr("Language:") );
 	m_cmbboxLanguage->clear();
-	foreach(QString lang, CalculateConfig::instance()->getValue("os_lang").toStringList() )
+	foreach(QString lang, CalculateConfig::instance()->getValue("os_install_lang").toStringList() )
 	{
 		if ( !m_langMap[lang].isEmpty() )
 			m_cmbboxLanguage->addItem( m_langMap[lang], QVariant(lang) );
@@ -272,7 +272,6 @@ void PageConfiguration::retranslateUi()
 	m_cmbboxVideoDrv->addItem("fglrx");
 	m_cmbboxVideoDrv->addItem("intel");
 	m_cmbboxVideoDrv->addItem("nv");
-	m_cmbboxVideoDrv->addItem("nouveau");
 	m_cmbboxVideoDrv->addItem("nvidia");
 	m_cmbboxVideoDrv->addItem("radeon");
 	m_cmbboxVideoDrv->addItem("vesa");

src/systeminstaller.cpp

@@ -27,7 +27,7 @@
 
 #include "pagecfdisk.h"
 
-const QString	VER_STR = "2.2.28";
+const QString	VER_STR = "2.2.1";
 
 SystemInstaller::SystemInstaller(QWidget *parent) :
 	QMainWindow(parent),