From e5b63c61aba1c35edd67b8024da80cbaa23aff89 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Tue, 16 Feb 2010 18:30:24 +0000
Subject: Rename InstallFrm to InstallWindowFrm.

The Install class has been renamed recently to InstallWindow. Rename the
form too so it uses the same class basename again.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24698 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/installfrm.ui       | 244 ------------------------------------
 rbutil/rbutilqt/installwindow.cpp   |  11 +-
 rbutil/rbutilqt/installwindow.h     |   4 +-
 rbutil/rbutilqt/installwindowfrm.ui | 244 ++++++++++++++++++++++++++++++++++++
 rbutil/rbutilqt/rbutilqt.pro        |   2 +-
 5 files changed, 254 insertions(+), 251 deletions(-)
 delete mode 100644 rbutil/rbutilqt/installfrm.ui
 create mode 100644 rbutil/rbutilqt/installwindowfrm.ui

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installfrm.ui
deleted file mode 100644
index 040eca68d2..0000000000
--- a/rbutil/rbutilqt/installfrm.ui
+++ /dev/null
@@ -1,244 +0,0 @@
-<ui version="4.0" >
- <class>InstallFrm</class>
- <widget class="QDialog" name="InstallFrm" >
-  <property name="windowModality" >
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>644</width>
-    <height>500</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Install Rockbox</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <item rowspan="9" row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string/>
-     </property>
-     <property name="pixmap" >
-      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>Please select the Rockbox version you want to install on your player:</string>
-     </property>
-     <property name="wordWrap" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="3" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Version</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="QRadioButton" name="radioStable" >
-        <property name="text" >
-         <string>Rockbox &amp;stable</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioArchived" >
-        <property name="text" >
-         <string>&amp;Archived Build</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioCurrent" >
-        <property name="text" >
-         <string>&amp;Current Build</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="1" colspan="3" >
-    <widget class="QGroupBox" name="groupBox_2" >
-     <property name="title" >
-      <string>Details</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_3" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="labelDetails" >
-        <property name="text" >
-         <string>Details about the selected version</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="labelNote" >
-        <property name="text" >
-         <string>Note</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="8" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="8" column="2" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QPushButton" name="buttonOk" >
-       <property name="text" >
-        <string>&amp;Install</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >
-         <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCancel" >
-       <property name="text" >
-        <string>&amp;Cancel</string>
-       </property>
-       <property name="icon" >
-        <iconset resource="rbutilqt.qrc" >
-         <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="7" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="1" colspan="3" >
-    <widget class="QGroupBox" name="Backupgroup" >
-     <property name="title" >
-      <string>Backup</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" colspan="2" >
-       <widget class="QCheckBox" name="backup" >
-        <property name="text" >
-         <string>Backup before installing</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QLabel" name="backupLocation" >
-        <property name="text" >
-         <string>Backup location</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="changeBackup" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>60</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string>Change</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="5" column="1" >
-    <widget class="QCheckBox" name="checkBoxCache" >
-     <property name="toolTip" >
-      <string>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.</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Don't use locally cached copy</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="rbutilqt.qrc" />
- </resources>
- <connections>
-  <connection>
-   <sender>buttonOk</sender>
-   <signal>clicked()</signal>
-   <receiver>InstallFrm</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>562</x>
-     <y>420</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>500</x>
-     <y>352</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonCancel</sender>
-   <signal>clicked()</signal>
-   <receiver>InstallFrm</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>658</x>
-     <y>429</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>611</x>
-     <y>360</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/rbutil/rbutilqt/installwindow.cpp b/rbutil/rbutilqt/installwindow.cpp
index 8aefeb0bac..9eae0ce09f 100644
--- a/rbutil/rbutilqt/installwindow.cpp
+++ b/rbutil/rbutilqt/installwindow.cpp
@@ -18,7 +18,7 @@
  ****************************************************************************/
 
 #include "installwindow.h"
-#include "ui_installfrm.h"
+#include "ui_installwindowfrm.h"
 #include "rbzip.h"
 #include "system.h"
 #include "rbsettings.h"
@@ -149,7 +149,8 @@ void InstallWindow::accept()
     else if(ui.radioArchived->isChecked()) {
         file = SystemInfo::value(SystemInfo::DailyUrl).toString();
         RbSettings::setValue(RbSettings::Build, "archived");
-        myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString() + "-" + ServerInfo::value(ServerInfo::DailyDate).toString();
+        myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString()
+            + "-" + ServerInfo::value(ServerInfo::DailyDate).toString();
     }
     else if(ui.radioCurrent->isChecked()) {
         file = SystemInfo::value(SystemInfo::BleedingUrl).toString();
@@ -270,7 +271,8 @@ void InstallWindow::setDetailsCurrent(bool show)
         ui.labelDetails->setText(tr("This is the absolute up to the minute "
                 "Rockbox built. A current build will get updated every time "
                 "a change is made. Latest version is r%1 (%2).")
-                .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(),ServerInfo::value(ServerInfo::BleedingDate).toString()));
+                .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(),
+                    ServerInfo::value(ServerInfo::BleedingDate).toString()));
         if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty())
             ui.labelNote->setText(tr("<b>This is the recommended version.</b>"));
         else
@@ -303,7 +305,8 @@ void InstallWindow::setDetailsArchived(bool show)
         "features than the last stable release but may be much less stable. "
         "Features may change regularly."));
         ui.labelNote->setText(tr("<b>Note:</b> archived version is r%1 (%2).")
-            .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(),ServerInfo::value(ServerInfo::DailyDate).toString()));
+            .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(),
+                ServerInfo::value(ServerInfo::DailyDate).toString()));
     }
 }
 
diff --git a/rbutil/rbutilqt/installwindow.h b/rbutil/rbutilqt/installwindow.h
index e1a347099e..9fae7b5b4e 100644
--- a/rbutil/rbutilqt/installwindow.h
+++ b/rbutil/rbutilqt/installwindow.h
@@ -24,7 +24,7 @@
 
 #include <QtGui>
 
-#include "ui_installfrm.h"
+#include "ui_installwindowfrm.h"
 #include "zipinstaller.h"
 #include "progressloggergui.h"
 
@@ -38,7 +38,7 @@ class InstallWindow : public QDialog
         void accept(void);
 
     private:
-        Ui::InstallFrm ui;
+        Ui::InstallWindowFrm ui;
         ProgressLoggerGui* logger;
         QHttp *download;
         QFile *target;
diff --git a/rbutil/rbutilqt/installwindowfrm.ui b/rbutil/rbutilqt/installwindowfrm.ui
new file mode 100644
index 0000000000..3fa309202c
--- /dev/null
+++ b/rbutil/rbutilqt/installwindowfrm.ui
@@ -0,0 +1,244 @@
+<ui version="4.0" >
+ <class>InstallWindowFrm</class>
+ <widget class="QDialog" name="InstallWindowFrm" >
+  <property name="windowModality" >
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>644</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Install Rockbox</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2" >
+   <item rowspan="9" row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="pixmap" >
+      <pixmap resource="rbutilqt.qrc" >:/icons/wizard.xpm</pixmap>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>Please select the Rockbox version you want to install on your player:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="3" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Version</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <item>
+       <widget class="QRadioButton" name="radioStable" >
+        <property name="text" >
+         <string>Rockbox &amp;stable</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioArchived" >
+        <property name="text" >
+         <string>&amp;Archived Build</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioCurrent" >
+        <property name="text" >
+         <string>&amp;Current Build</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="3" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Details</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="labelDetails" >
+        <property name="text" >
+         <string>Details about the selected version</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="labelNote" >
+        <property name="text" >
+         <string>Note</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="8" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="8" column="2" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QPushButton" name="buttonOk" >
+       <property name="text" >
+        <string>&amp;Install</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >
+         <normaloff>:/icons/go-next.png</normaloff>:/icons/go-next.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonCancel" >
+       <property name="text" >
+        <string>&amp;Cancel</string>
+       </property>
+       <property name="icon" >
+        <iconset resource="rbutilqt.qrc" >
+         <normaloff>:/icons/process-stop.png</normaloff>:/icons/process-stop.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="7" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="1" colspan="3" >
+    <widget class="QGroupBox" name="Backupgroup" >
+     <property name="title" >
+      <string>Backup</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QCheckBox" name="backup" >
+        <property name="text" >
+         <string>Backup before installing</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QLabel" name="backupLocation" >
+        <property name="text" >
+         <string>Backup location</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="QPushButton" name="changeBackup" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>60</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text" >
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QCheckBox" name="checkBoxCache" >
+     <property name="toolTip" >
+      <string>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.</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Don't use locally cached copy</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="rbutilqt.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonOk</sender>
+   <signal>clicked()</signal>
+   <receiver>InstallWindowFrm</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>562</x>
+     <y>420</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>500</x>
+     <y>352</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonCancel</sender>
+   <signal>clicked()</signal>
+   <receiver>InstallWindowFrm</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>658</x>
+     <y>429</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>611</x>
+     <y>360</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index f2f96e70d8..95c00c04a3 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -204,7 +204,7 @@ TARGET = rbutilqt
 
 FORMS += rbutilqtfrm.ui \
  aboutbox.ui \
- installfrm.ui \
+ installwindowfrm.ui \
  progressloggerfrm.ui \
  configurefrm.ui \
  browsedirtreefrm.ui \
-- 
cgit