From e4d0f0e6383bdf8f654177fd0036537de88cd021 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Thu, 2 Aug 2007 22:27:51 +0000 Subject: [PATCH] Remove mountpoint entry line from installation form and use config setting instead. Add some nice tango icons. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14151 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/configurefrm.ui | 12 ++++++ rbutil/rbutilqt/icons/edit-find.png | Bin 0 -> 617 bytes rbutil/rbutilqt/icons/network-idle.png | Bin 0 -> 393 bytes .../icons/preferences-desktop-locale.png | Bin 0 -> 567 bytes rbutil/rbutilqt/install.cpp | 38 ++---------------- rbutil/rbutilqt/install.h | 3 -- rbutil/rbutilqt/installfrm.ui | 36 ++++------------- rbutil/rbutilqt/rbutilqt.cpp | 1 - rbutil/rbutilqt/rbutilqt.qrc | 4 +- rbutil/rbutilqt/rbutilqtfrm.ui | 3 ++ 10 files changed, 30 insertions(+), 67 deletions(-) create mode 100644 rbutil/rbutilqt/icons/edit-find.png create mode 100644 rbutil/rbutilqt/icons/network-idle.png create mode 100644 rbutil/rbutilqt/icons/preferences-desktop-locale.png diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui index da0a1c1574..006661ba08 100644 --- a/rbutil/rbutilqt/configurefrm.ui +++ b/rbutil/rbutilqt/configurefrm.ui @@ -62,6 +62,9 @@ &Device + + :/icons/icons/rbutil.xpm + @@ -127,6 +130,9 @@ &Autodetect + + :/icons/icons/edit-find.png + @@ -135,6 +141,9 @@ &Proxy + + :/icons/icons/network-idle.png + @@ -248,6 +257,9 @@ &Language + + :/icons/icons/preferences-desktop-locale.png + diff --git a/rbutil/rbutilqt/icons/edit-find.png b/rbutil/rbutilqt/icons/edit-find.png new file mode 100644 index 0000000000000000000000000000000000000000..d072d3cbe2dadb1494f77e950952123813613677 GIT binary patch literal 617 zcmV-v0+#)WP)4+SOttuFuo0rp8m zK~y-)osvy!6Hyq2pF7DUO`2wgN>U06wOwc$MHIn>xD*Oicj6|$z;CJaABeUjK|~aE zS$9RDeGK5zq#vnP18H_P9en3BbiKg914X(U4?fX zv=3%78D?M10+5(X0MN8+cL(3TuaZiqIeKc0ZN-aeE4XBZ)ck8EZr_Z=qW7OQ{wVDZ zG+iT=PIKtw7@rGX1_uI+90*bpKD5zs{F**C6zm9u?EJ zQ5_2JmL<2Flg761XDbP7v)0}Ku5Shi%_G^x}q%2kVgpPOH0wIvBfN{N(qOE7M? z3xuFtwW!u4n_D&9s)POg9;6U0U2p=nX__rgY-58pql(|7qW8J5Es5XbtmWcc6+03YVxryf3dbXat2*wyQorvicCWHaaM z^${Ko^E;cZ_ht1ff`3FT9+eG|{}KR{SUhS0lnsNw28{O8e>3MU00000NkvXXu0mjf D_c;L2 literal 0 HcmV?d00001 diff --git a/rbutil/rbutilqt/icons/network-idle.png b/rbutil/rbutilqt/icons/network-idle.png new file mode 100644 index 0000000000000000000000000000000000000000..0efee57e5980b961fefdb22df1b2bf1d29994763 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE%y{W;-5;PJdx@v7EBiGj0WlV)4U4tf85kJFJY5_^EKbjzw9)H`gNUpDBth=| z%F(}AHC;vCZ2Q98qtLM+K~XT=T3h`3UHJf>wp`ZNf0;IJ*=X=?0q3F>7nL@0EHX4s z{!n(f_We2Q{9{gw&)q9y*`*8md1BISJPKh^`gNSU&bAI-9L}kE-f$I#o1tZ zV3Q7mO}>;y!zUZ5*h$YTB@>ctZLAUw&VF)u(jArHJ^S{4{xc~w%f&fNPVV$=SwlvL zK#}_#z7dlv)_iddzV`WX@2!-rs#bkxfBf@2dFyp~C^O5{hSjgFHLk2V?X5l4@AkHr zUw6xX+^n&4>MeEO%OU%jHB);(nrBy(E#j4MIeg*&T_}J k1-uG<$^WzyA7wA{f0tJw7x1}k4=6-EUHx3vIVCg!01URBUjP6A literal 0 HcmV?d00001 diff --git a/rbutil/rbutilqt/icons/preferences-desktop-locale.png b/rbutil/rbutilqt/icons/preferences-desktop-locale.png new file mode 100644 index 0000000000000000000000000000000000000000..5b9e46112df6f706919f44af8a22f42ea1e85c18 GIT binary patch literal 567 zcmV-70?7S|P)(R5*>5 zkxOe+Q51#0v(LG&+<0%Bkdg{UP$@X*q%%1u(Wid ze?h^=!2XA7?nIFIAX3{T+rc%4OZuP-7H6H!KI^Qrk6FAwzXy1n0GsPuW~iMp#$3Mj z_`t>+**ioBh1%0k9}0Un6fZVDju}kM*QrjXBuPRPMKl@>ILzQ6OtxCsL60ub1=3b) ztmjCB&dN$5L3&(*x#%sb`k${}=c^bQH5pjAcSiw4%)SG7c=IBc&Rd?XzTw>23uIYF zyWJ+sGCG|OaU2sx5kU~(2LaYvJO`)GOy|~L*Vg#fY##NRLm>cD%gfAeZv)^-k-mU$ za|RXyQ9@Bdr=uCXpP2!`zjlR3VTmsYZG;TrJ3>W;RE0!^GL{HSxm4yk;8ay#UcZ_f z04`0B&ut7rtpXFX;Hm2!3ag#oVb758T@(;KJOI2abSh&?K0ijK7)22 z&HBVY`c$iZCeobAsUC63kWN+M$qrIXW-yWhf-!cCc?=82VZGXDh(o9X45&;uaq%xI z^`Gqi*`*YDgrP?mSbX2&`+{mOzf|*60Nh<#P)-Eh{|j+xfjKw=zB>Q_002ovPDHLk FV1lon^AZ36 literal 0 HcmV?d00001 diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 2818d1af61..6a240f4807 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -28,7 +28,6 @@ Install::Install(QWidget *parent) : QDialog(parent) connect(ui.radioStable, SIGNAL(toggled(bool)), this, SLOT(setDetailsStable(bool))); connect(ui.radioCurrent, SIGNAL(toggled(bool)), this, SLOT(setDetailsCurrent(bool))); connect(ui.radioArchived, SIGNAL(toggled(bool)), this, SLOT(setDetailsArchived(bool))); - connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); } @@ -68,43 +67,14 @@ void Install::setProxy(QUrl proxy_url) } -void Install::setMountPoint(QString mount) -{ - QFileInfo m(mount); - if(m.isDir()) - ui.lineMountPoint->setText(mount); -} - - -void Install::browseFolder() -{ - QFileDialog browser(this); - if(QFileInfo(ui.lineMountPoint->text()).isDir()) - browser.setDirectory(ui.lineMountPoint->text()); - else - browser.setDirectory("/media"); - browser.setReadOnly(true); - browser.setFileMode(QFileDialog::DirectoryOnly); - browser.setAcceptMode(QFileDialog::AcceptOpen); - if(browser.exec()) { - qDebug() << browser.directory(); - QStringList files = browser.selectedFiles(); - setMountPoint(files.at(0)); - } -} - - void Install::accept() { logger = new ProgressLoggerGui(this); logger->show(); - + QString mountPoint = userSettings->value("defaults/mountpoint").toString(); + qDebug() << "mountpoint:" << userSettings->value("defaults/mountpoint").toString(); // show dialog with error if mount point is wrong - if(QFileInfo(ui.lineMountPoint->text()).isDir()) { - mountPoint = ui.lineMountPoint->text(); - userSettings->setValue("defaults/mountpoint", mountPoint); - } - else { + if(!QFileInfo(mountPoint).isDir()) { logger->addItem(tr("Mount point is wrong!"),LOGERROR); logger->abort(); return; @@ -147,7 +117,7 @@ void Install::accept() installer->setMountPoint(mountPoint); installer->install(logger); - connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); + connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); } diff --git a/rbutil/rbutilqt/install.h b/rbutil/rbutilqt/install.h index 002963f75a..ec60601e70 100644 --- a/rbutil/rbutilqt/install.h +++ b/rbutil/rbutilqt/install.h @@ -35,7 +35,6 @@ class Install : public QDialog Install(QWidget *parent = 0); void setProxy(QUrl); void setReleased(QString); - void setMountPoint(QString); void setUserSettings(QSettings*); void setDeviceSettings(QSettings*); void setArchivedString(QString); @@ -54,13 +53,11 @@ class Install : public QDialog QFile *target; QString file; QString fileName; - QString mountPoint; QString archived; ZipInstaller* installer; private slots: void setCached(bool); - void browseFolder(void); void setDetailsCurrent(bool); void setDetailsStable(bool); void setDetailsArchived(bool); diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui index 5edb5bb09c..2a2c99daa9 100644 --- a/rbutil/rbutilqt/installfrm.ui +++ b/rbutil/rbutilqt/installfrm.ui @@ -16,7 +16,7 @@ Install Rockbox - + @@ -29,27 +29,7 @@ - - - - Select your device in the filesystem - - - - - - - - - - &Browse - - - :/icons/icons/system-search.png - - - - + Please select the Rockbox version you want to install on your player: @@ -59,7 +39,7 @@ - + Version @@ -89,7 +69,7 @@ - + Details @@ -118,7 +98,7 @@ - + Rockbox Utility stores copies of Rockbox it has downloaded on the local hard disk to save network traffic. If your local copy is no longer working, tick this box to download a fresh copy. @@ -128,7 +108,7 @@ - + Qt::Vertical @@ -141,7 +121,7 @@ - + Qt::Horizontal @@ -154,7 +134,7 @@ - + diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 2e82b31335..d709b66acd 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -253,7 +253,6 @@ void RbUtilQt::install() else if(userSettings->value("defaults/proxytype") == "system") installWindow->setProxy(QUrl(getenv("http_proxy"))); #endif - installWindow->setMountPoint(userSettings->value("defaults/mountpoint").toString()); buildInfo.open(); QSettings info(buildInfo.fileName(), QSettings::IniFormat, this); diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc index 862d7df20c..e1ba2a2093 100644 --- a/rbutil/rbutilqt/rbutilqt.qrc +++ b/rbutil/rbutilqt/rbutilqt.qrc @@ -9,8 +9,11 @@ icons/dialog-information.png icons/dialog-warning.png icons/doom_btn.png + icons/edit-find.png icons/font_btn.png icons/go-next.png + icons/network-idle.png + icons/preferences-desktop-locale.png icons/process-stop.png icons/rbinstall_btn.png icons/rblogo.xpm @@ -24,5 +27,4 @@ rbutil.ini - diff --git a/rbutil/rbutilqt/rbutilqtfrm.ui b/rbutil/rbutilqt/rbutilqtfrm.ui index 0d4cf7f7fe..c8135de184 100644 --- a/rbutil/rbutilqt/rbutilqtfrm.ui +++ b/rbutil/rbutilqt/rbutilqtfrm.ui @@ -119,6 +119,9 @@ p, li { white-space: pre-wrap; } &Change + + :/icons/icons/edit-find.png +