From acb14d7bb0d1242636e71da6ffbdadb494e40bfc Mon Sep 17 00:00:00 2001 From: Ivan Loskutov Date: Wed, 25 Aug 2010 00:13:49 +0400 Subject: [PATCH] Added icons for buttons. Modifying output help string with run command. Added tool tips for users operations --- resources/img/dialog-cancel.png | Bin 0 -> 2207 bytes resources/img/dialog-ok-apply.png | Bin 0 -> 1218 bytes resources/img/go-next.png | Bin 0 -> 1473 bytes resources/img/go-previous.png | Bin 0 -> 1536 bytes resources/img/list-add-user.png | Bin 0 -> 1715 bytes resources/img/list-remove-user.png | Bin 0 -> 1661 bytes resources/systeminstaller.qrc | 6 ++- src/calculateconfig.cpp | 72 ++++++++++++++++++----------- src/main.cpp | 9 +++- src/pageconfiguration.cpp | 54 +++++++++------------- src/pageusers.cpp | 9 +++- 11 files changed, 88 insertions(+), 62 deletions(-) create mode 100644 resources/img/dialog-cancel.png create mode 100644 resources/img/dialog-ok-apply.png create mode 100644 resources/img/go-next.png create mode 100644 resources/img/go-previous.png create mode 100644 resources/img/list-add-user.png create mode 100644 resources/img/list-remove-user.png diff --git a/resources/img/dialog-cancel.png b/resources/img/dialog-cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..6ce79615464a60d0ed1cfb06124bbdf692f822df GIT binary patch literal 2207 zcmV;Q2w?Y#P);pp9WZz{RzCfQS7jw={Mk|eOhS5t%R z@o-N*KX&Wcvj?YodVaGnne00BX)16(hzDVZ5(qq1zU`j6@aEf)+-}T50n4(S;L2*6 zbFTqcagbd6GGi|sGSWT0&t~8UyI}ki8~79WL-2I;woMOJ?brb(bFizzCfnD7kwvD2 z;w5|W0;7jt9L{C3P3NHH#~;_gA0QNxD zkrW@EXarwf9lm9?fV5ynSOz2e|5}(G9NF_E>_7KW2A%??N|s((@r|Y}MK#N@|DglV zPmVFx(n6}Mr%yMn!v#2=flCHxeuyY=qZ_s>#YK0PY`EDST)Q3+jtR*n7(H}IOC^SP zHo=i44Qv7)fnU|$x9vNnYd^mLpFG>n@M~`jXEgnX$6)_+P~bY+31Ta3FLTQ;mEX5r z@|0CM25?Nk&|mgXPtT-p{ucByFPW?KINVXTX2sJLo3{v~pkwMfqbJ`a(cJd$xMAM) z7__|y221F>uqxrv@Q{5KZega88Lu-sve@-=NbwHs8w+d&q7_ucMb$oZ0{Wf|}8 z%U*)tx3aWapLn9a!iG!n?wB<&j<^Dyhf9`Dvage&3-RYudHr|Ukpz07z|7z<#cS6{ z3VdO~z%5XtM2llu)^H4Dr$?BbRo{36CYCJwV~^FB)x}zjcaB#Z7cM(sY2JWKhT%jP z@y`AOZ^J_w*q@z9qN#bbd>(gM7z;Ko>;VN82Jtf;7=l$Bt$70` zge_S@pWi%%d=3o;uRA5TZmlma4KypACu4MtAkS|$(+;_;g!9RMy58+QbOrtoC;*H> zK36a%F0~!4N~a1arEV-)l$yFF90MAN^h}EUbQgZVA6+;G1lQ>MLaf%t63u0U#N7QU zBq0!PH@IAwJ~thc19Z0c9O{6t{}WW^Wq_pv9?L`mkc5-p_@D(UOsfTz)bM38fUioy zgxEDhW_6JwHLuEy#-yW3^eg2yO=rXDR)LN(Hx~x;FT7*JUjvn^R0LkhE0u}7fdojh zKr^jW9xTVeB=kltkR^d+T6hE)g2qw{rhrGGKIoU5H-tU0(!Ob=Ip@x5r{;9Im-iC6 z!#2FB6;!U#di!$wWDh9~84$8SHR(M+pNDpcSI%l<6{YTSF;PIC)$xVgTeeMUkzyzd z*zk=JZ>%hy#SM7CS!G4y%?gF~c=qtS7ENuSavjOA)9(`K7D#~IfAS7??mZVko5>hQ zrGN_o7`B0EiQ5~3p9YKM=3C0Wv5*aSIpF!Y0Vg4)H2irMkY#}cM6w3qD&^r@D!j4c{wxwWApfA0v-X;1bZqgz58x7EXkbJ5rA0kr|)v^tu{D(-SfaC^aN7+ zs^|?x>jRS-uK7vj^xlS_u&Z;lEB(?Li?5wu0=^S!*9d;QW<}ADZqrQJ7*Wvx?5dqk z>Dffq*m(+umOPSefKaVV9KCC8@r{wr85G092YBrSCxb5DjpzDHs+T`sRbPKx7ot}f zMxi(wjYyWYekyVKUTy5+z3a`ir)nTeHe-+jv`U2&E@5^ja^E}x&wS*ebQ8qNJ<=<8 zH3UCf*PX_bH5?N@Ng&xRNLEKsmo08!p|1o$o{b`;J8z3BpN4y?s_o`aonl(X1)Ox*yBnhu9qYA;eWznM+ z=;)iwjE}1?tMKbf&^7|*f9>J45?mEczCYN{iy hs&A!XI?4Zu{sW}21QM3dqm=*v002ovPDHLkV1g={D=+{6 literal 0 HcmV?d00001 diff --git a/resources/img/dialog-ok-apply.png b/resources/img/dialog-ok-apply.png new file mode 100644 index 0000000000000000000000000000000000000000..0f3153c4b8c3bad6ca9be9a9e3443a340f7b5942 GIT binary patch literal 1218 zcmV;z1U>tSP)U^|__PTIO^ojCBpP2VE}0@`(-6h!L|#k?Lfj-_#>{LYlWbE!TIdS& z;YuIx?3EYd!%COAnHWCFHb19U6BgK;n)?k(M`bef$;QL5NuDo2k2(nuG8p7s~r^# zo24N+4%=In7cI?5gRR9@!LQ{9>I=3g&1MsXNC2U*kdm+%gvT|5&cRNEJfU{!UFkI} z<4+$WU9*l?nN^n_DBPqic9cLQ34|8~^#6QDa!t6K+;6(y!(Xt!WG^$D&BHb8H>xKY3D8>PW&8jtz9d?VUXwJsy1~?OUKWsK2ktE7Rul`4A$0L}CIc6~X<^GGe#c zj^^yo*@I3EG1 zf$&oCuza()08u63zT#rSui-ka&sujO3HLO&p3`z?tBML$T9!sA?w7AkDwJBsDrkJx z*Mmuqt1EImvJcC+<_OeJsGB*?cz8?6-9)3)gHj?X0-^v21yGR~hDOH4S?|^7SsnYv z=CVSyj?*F@mmsFv4v29ePwl|T-aee48vk7A7Iq*Fe+wk^9=e4$84uN#7ZZxfmJKW! zkxe9}SQK&kn@NK!s-eLk^6goJv^U>4uHNLxY;Z&eIuoWxtkBNwRlsRZ; zxmP#Wt|bYYf;;_A}~m5Na}3F6Cz@<7!uJaqR}{_J^`bH3mBhs4f;>`>yQE0 zjAYu~+C#T#`PO^tOz>sTgUUkENKy(4k%WLnQGh7#_ymxMOE5%P%nmX5Y1TF3`@&a= z3`v^_br0*_$usaz71aatS`QSerEw67fB=x!$}`u8^_c#W!H+KY4-35urMM1O45iwK zv>y~0Esx*TNHA}_3PoxZ1RzVBP8ZT+s*A?CU#2hm`g}#WPBKcxOg;0d(`bF<-Y1pt zavr%0DGY)ES31-+tK*YOV literal 0 HcmV?d00001 diff --git a/resources/img/go-next.png b/resources/img/go-next.png new file mode 100644 index 0000000000000000000000000000000000000000..c4da8a9a3d787dcded3a357a062e92ee9f59d71d GIT binary patch literal 1473 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 img/calculate-logo.png - img/calculate-icon.png + img/calculate-icon.png + img/dialog-cancel.png + img/dialog-ok-apply.png + img/list-add-user.png + img/list-remove-user.png diff --git a/src/calculateconfig.cpp b/src/calculateconfig.cpp index 59b1c30..eeab31f 100644 --- a/src/calculateconfig.cpp +++ b/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); - - //CalculateConfig::instance()->getValue("os_device_dev").toStringList() + m_Config["gui_os_device_dev_def"] = m_Config["gui_os_device_dev"]; + + // 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,51 +268,60 @@ QStringList CalculateConfig::getInstallParameters() params << QString("--swap ") + m_Config["--swap"].toString(); // mbr - if ( !m_Config["gui_os_device_dev"].toString().isEmpty() ) - params << QString("--mbr ") + m_Config["gui_os_device_dev"].toString(); + QString mbr_dev = 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() ) - params << "--set os_install_net_hostname=" + m_Config["os_install_net_hostname"].toString(); + QString hostname = m_Config["gui_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() ) - params << "--set os_install_net_domain=" + m_Config["os_install_net_domain"].toString(); + QString domain = m_Config["gui_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() ) - params << "--set os_install_clock_timezone=" + m_Config["os_install_clock_timezone"].toString(); + QString timezone = m_Config["gui_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() ) - params << "--set os_install_x11_video_drv=" + m_Config["os_install_x11_video_drv"].toString(); + QString video_drv = m_Config["gui_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() ) - params << "--set os_install_x11_composite=" + m_Config["os_install_x11_composite"].toString(); + QString composite = m_Config["gui_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() ) - params << "--set os_install_makeopts=" + m_Config["os_install_makeopts"].toString(); + QString makeopts = m_Config["gui_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() ) - params << "--set os_install_proxy=" + m_Config["os_install_proxy"].toString(); + QString proxy = m_Config["gui_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() ) - params << "--set os_install_ntp=" + m_Config["os_install_ntp"].toString(); + QString ntp = m_Config["gui_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() ) - params << "--set os_install_clock_type=" + m_Config["os_install_clock_type"].toString(); + QString clock_type = m_Config["gui_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() ) - params << "--lang " + m_Config["gui_install_language"].toString(); + QString 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; diff --git a/src/main.cpp b/src/main.cpp index cb322f5..35346eb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,6 +9,8 @@ #include +#include + #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(); diff --git a/src/pageconfiguration.cpp b/src/pageconfiguration.cpp index 8704d89..d1a2c9d 100644 --- a/src/pageconfiguration.cpp +++ b/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("UTC") ); + m_cmbboxClockType->addItem( tr("Local"), QVariant("local") ); + 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( - clConf->getValue("os_install_clock_type").toString() + int clocktypeIndex = m_cmbboxClockType->findData( + 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("os_install_net_domain", m_editDomainName->text() ); + clConf->setValue("gui_os_install_net_hostname", m_editHostName->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("os_install_x11_composite", m_chkboxComposite->isChecked() ? "on" : "off" ); + clConf->setValue("gui_os_install_x11_video_drv", m_cmbboxVideoDrv->currentText() ); + 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("os_install_proxy", m_editProxy->text() ); - clConf->setValue("os_install_ntp", m_editNtp->text() ); - clConf->setValue("os_install_clock_type", m_cmbboxClockType->currentText() ); + clConf->setValue("gui_os_install_makeopts", m_editMakeOpts->text() ); + clConf->setValue("gui_os_install_proxy", m_editProxy->text() ); + clConf->setValue("gui_os_install_ntp", m_editNtp->text() ); + clConf->setValue("gui_os_install_clock_type", m_cmbboxClockType->itemData( m_cmbboxClockType->currentIndex() ) ); clConf->showInstallParameters(); } diff --git a/src/pageusers.cpp b/src/pageusers.cpp index e33557c..cd53b61 100644 --- a/src/pageusers.cpp +++ b/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:") ); }