Merge branch 'master' of git.calculate.ru:calculate-install-gui

resources/cl-install-gui.desktop

@@ -2,8 +2,8 @@
 Categories=System;
 Exec=sudo cl-install-gui
 Icon=cl-install-gui
-Name=calculate-install-gui
+Name=Calculate Linux Install
 Comment=GUI-Frontend for Calculate Linux installer
-Terminal=true
+Terminal=false
 Type=Application
-Version=0.1
+Version=0.1

src/pagecfdisk.cpp

@@ -12,7 +12,8 @@ PageCfdisk::PageCfdisk( const QString& command, const QString& disk) :
 	InstallerPage(),
 	m_Cmd(command),
 	m_Disk(disk),
-	m_Lang("C")
+	m_Lang("C"),
+	m_envTerm("xterm")
 {
 	setupUi();
 
@@ -60,7 +61,7 @@ void PageCfdisk::retranslateUi()
 
 void PageCfdisk::show()
 {
-	QString	cmd = QString("LANGUAGE='%1' %2 %3").arg(m_Lang).arg(m_Cmd).arg(m_Disk) + "; exit \r\n";
+	QString	cmd = QString("TERM='%1' LANGUAGE='%2' %3 %4").arg(m_envTerm).arg(m_Lang).arg(m_Cmd).arg(m_Disk) + "; exit \r\n";
 	m_Term->sendText( cmd );
 	m_Term->setFocus();
 }

src/pagecfdisk.h

@@ -29,6 +29,7 @@ private:
 	const QString	m_Cmd;
 	const QString	m_Disk;
 	const QString	m_Lang;
+	const QString	m_envTerm;
 	QWidget*		m_widgetTerm;
 	QLabel*			m_labelHelp;