Remove "Install All" button from themes install window and replace it with a note on how to select multiple themes for installation.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18514 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 16 insertions, 26 deletions

diff --git a/rbutil/rbutilqt/installthemes.cpp b/rbutil/rbutilqt/installthemes.cpp
index decfe5334f..fe225b81b4 100644
--- a/rbutil/rbutilqt/installthemes.cpp
+++ b/rbutil/rbutilqt/installthemes.cpp
@@ -35,7 +35,6 @@ ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent)
 
     connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(close()));
     connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept()));
-    connect(ui.buttonOkAll, SIGNAL(clicked()), this, SLOT(acceptAll()));
 }
 
 ThemesInstallWindow::~ThemesInstallWindow()
@@ -193,6 +192,7 @@ void ThemesInstallWindow::updateDetails(int row)
 void ThemesInstallWindow::updateImage(bool error)
 {
     qDebug() << "updateImage(bool) =" << error;
+
     if(error) return;
 
     QPixmap p;
@@ -250,12 +250,6 @@ void ThemesInstallWindow::abort()
 }
 
 
-void ThemesInstallWindow::acceptAll()
-{
-    ui.listThemes->selectAll();
-    accept();
-}
-
 void ThemesInstallWindow::accept()
 {
     if(ui.listThemes->selectedItems().size() == 0) {
diff --git a/rbutil/rbutilqt/installthemes.h b/rbutil/rbutilqt/installthemes.h
index 13337a8578..036647f224 100644
--- a/rbutil/rbutilqt/installthemes.h
+++ b/rbutil/rbutilqt/installthemes.h
@@ -44,7 +44,6 @@ class ThemesInstallWindow : public QDialog
 
     public slots:
         void accept(void);
-        void acceptAll(void);
 
     private:
         Ui::ThemeInstallFrm ui;
diff --git a/rbutil/rbutilqt/installthemesfrm.ui b/rbutil/rbutilqt/installthemesfrm.ui
index c67f2c6ca2..4033f1eda7 100644
--- a/rbutil/rbutilqt/installthemesfrm.ui
+++ b/rbutil/rbutilqt/installthemesfrm.ui
@@ -36,7 +36,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2" colspan="2" >
+   <item row="0" column="2" colspan="3" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -48,7 +48,7 @@
       <string>Selected Theme</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="0" column="0" >
+      <item row="0" column="0" colspan="3" >
        <widget class="PreviewLabel" name="themePreview" >
         <property name="sizePolicy" >
          <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
@@ -67,17 +67,17 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
+      <item row="2" column="0" colspan="3" >
        <widget class="QLabel" name="label_3" >
         <property name="text" >
          <string>Description</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
+      <item row="3" column="0" colspan="3" >
        <widget class="QTextBrowser" name="themeDescription" />
       </item>
-      <item row="3" column="0" >
+      <item row="4" column="0" colspan="3" >
        <widget class="QLabel" name="labelSize" >
         <property name="text" >
          <string>Download size:</string>
@@ -88,19 +88,26 @@
     </widget>
    </item>
    <item row="1" column="1" colspan="2" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Hold Ctrl to select multiple item, Shift for a range</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>261</width>
-       <height>34</height>
+       <width>241</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="1" column="3" >
+   <item row="1" column="4" >
     <layout class="QHBoxLayout" >
      <item>
       <widget class="QPushButton" name="buttonOk" >
@@ -113,16 +120,6 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonOkAll" >
-       <property name="text" >
-        <string>Install &amp;All</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >:/icons/go-next.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
       <widget class="QPushButton" name="buttonCancel" >
        <property name="text" >
         <string>&amp;Cancel</string>