diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-16 18:30:24 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-16 18:30:24 +0000 |
commit | e5b63c61aba1c35edd67b8024da80cbaa23aff89 (patch) | |
tree | 7cf6c8711900ef86a492829c800e1ebdd839e287 | |
parent | 4d6b1b6eb37b2e2dd0ecc89bd7fa8c055c1f440c (diff) | |
download | rockbox-e5b63c61aba1c35edd67b8024da80cbaa23aff89.tar.gz rockbox-e5b63c61aba1c35edd67b8024da80cbaa23aff89.zip |
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
-rw-r--r-- | rbutil/rbutilqt/installwindow.cpp | 11 | ||||
-rw-r--r-- | rbutil/rbutilqt/installwindow.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installwindowfrm.ui (renamed from rbutil/rbutilqt/installfrm.ui) | 8 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 2 |
4 files changed, 14 insertions, 11 deletions
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 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installwindow.h" | 20 | #include "installwindow.h" |
21 | #include "ui_installfrm.h" | 21 | #include "ui_installwindowfrm.h" |
22 | #include "rbzip.h" | 22 | #include "rbzip.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "rbsettings.h" | 24 | #include "rbsettings.h" |
@@ -149,7 +149,8 @@ void InstallWindow::accept() | |||
149 | else if(ui.radioArchived->isChecked()) { | 149 | else if(ui.radioArchived->isChecked()) { |
150 | file = SystemInfo::value(SystemInfo::DailyUrl).toString(); | 150 | file = SystemInfo::value(SystemInfo::DailyUrl).toString(); |
151 | RbSettings::setValue(RbSettings::Build, "archived"); | 151 | RbSettings::setValue(RbSettings::Build, "archived"); |
152 | myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString() + "-" + ServerInfo::value(ServerInfo::DailyDate).toString(); | 152 | myversion = "r" + ServerInfo::value(ServerInfo::DailyRevision).toString() |
153 | + "-" + ServerInfo::value(ServerInfo::DailyDate).toString(); | ||
153 | } | 154 | } |
154 | else if(ui.radioCurrent->isChecked()) { | 155 | else if(ui.radioCurrent->isChecked()) { |
155 | file = SystemInfo::value(SystemInfo::BleedingUrl).toString(); | 156 | file = SystemInfo::value(SystemInfo::BleedingUrl).toString(); |
@@ -270,7 +271,8 @@ void InstallWindow::setDetailsCurrent(bool show) | |||
270 | ui.labelDetails->setText(tr("This is the absolute up to the minute " | 271 | ui.labelDetails->setText(tr("This is the absolute up to the minute " |
271 | "Rockbox built. A current build will get updated every time " | 272 | "Rockbox built. A current build will get updated every time " |
272 | "a change is made. Latest version is r%1 (%2).") | 273 | "a change is made. Latest version is r%1 (%2).") |
273 | .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(),ServerInfo::value(ServerInfo::BleedingDate).toString())); | 274 | .arg(ServerInfo::value(ServerInfo::BleedingRevision).toString(), |
275 | ServerInfo::value(ServerInfo::BleedingDate).toString())); | ||
274 | if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) | 276 | if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty()) |
275 | ui.labelNote->setText(tr("<b>This is the recommended version.</b>")); | 277 | ui.labelNote->setText(tr("<b>This is the recommended version.</b>")); |
276 | else | 278 | else |
@@ -303,7 +305,8 @@ void InstallWindow::setDetailsArchived(bool show) | |||
303 | "features than the last stable release but may be much less stable. " | 305 | "features than the last stable release but may be much less stable. " |
304 | "Features may change regularly.")); | 306 | "Features may change regularly.")); |
305 | ui.labelNote->setText(tr("<b>Note:</b> archived version is r%1 (%2).") | 307 | ui.labelNote->setText(tr("<b>Note:</b> archived version is r%1 (%2).") |
306 | .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(),ServerInfo::value(ServerInfo::DailyDate).toString())); | 308 | .arg(ServerInfo::value(ServerInfo::DailyRevision).toString(), |
309 | ServerInfo::value(ServerInfo::DailyDate).toString())); | ||
307 | } | 310 | } |
308 | } | 311 | } |
309 | 312 | ||
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 @@ | |||
24 | 24 | ||
25 | #include <QtGui> | 25 | #include <QtGui> |
26 | 26 | ||
27 | #include "ui_installfrm.h" | 27 | #include "ui_installwindowfrm.h" |
28 | #include "zipinstaller.h" | 28 | #include "zipinstaller.h" |
29 | #include "progressloggergui.h" | 29 | #include "progressloggergui.h" |
30 | 30 | ||
@@ -38,7 +38,7 @@ class InstallWindow : public QDialog | |||
38 | void accept(void); | 38 | void accept(void); |
39 | 39 | ||
40 | private: | 40 | private: |
41 | Ui::InstallFrm ui; | 41 | Ui::InstallWindowFrm ui; |
42 | ProgressLoggerGui* logger; | 42 | ProgressLoggerGui* logger; |
43 | QHttp *download; | 43 | QHttp *download; |
44 | QFile *target; | 44 | QFile *target; |
diff --git a/rbutil/rbutilqt/installfrm.ui b/rbutil/rbutilqt/installwindowfrm.ui index 040eca68d2..3fa309202c 100644 --- a/rbutil/rbutilqt/installfrm.ui +++ b/rbutil/rbutilqt/installwindowfrm.ui | |||
@@ -1,6 +1,6 @@ | |||
1 | <ui version="4.0" > | 1 | <ui version="4.0" > |
2 | <class>InstallFrm</class> | 2 | <class>InstallWindowFrm</class> |
3 | <widget class="QDialog" name="InstallFrm" > | 3 | <widget class="QDialog" name="InstallWindowFrm" > |
4 | <property name="windowModality" > | 4 | <property name="windowModality" > |
5 | <enum>Qt::WindowModal</enum> | 5 | <enum>Qt::WindowModal</enum> |
6 | </property> | 6 | </property> |
@@ -211,7 +211,7 @@ | |||
211 | <connection> | 211 | <connection> |
212 | <sender>buttonOk</sender> | 212 | <sender>buttonOk</sender> |
213 | <signal>clicked()</signal> | 213 | <signal>clicked()</signal> |
214 | <receiver>InstallFrm</receiver> | 214 | <receiver>InstallWindowFrm</receiver> |
215 | <slot>accept()</slot> | 215 | <slot>accept()</slot> |
216 | <hints> | 216 | <hints> |
217 | <hint type="sourcelabel" > | 217 | <hint type="sourcelabel" > |
@@ -227,7 +227,7 @@ | |||
227 | <connection> | 227 | <connection> |
228 | <sender>buttonCancel</sender> | 228 | <sender>buttonCancel</sender> |
229 | <signal>clicked()</signal> | 229 | <signal>clicked()</signal> |
230 | <receiver>InstallFrm</receiver> | 230 | <receiver>InstallWindowFrm</receiver> |
231 | <slot>reject()</slot> | 231 | <slot>reject()</slot> |
232 | <hints> | 232 | <hints> |
233 | <hint type="sourcelabel" > | 233 | <hint type="sourcelabel" > |
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 | |||
204 | 204 | ||
205 | FORMS += rbutilqtfrm.ui \ | 205 | FORMS += rbutilqtfrm.ui \ |
206 | aboutbox.ui \ | 206 | aboutbox.ui \ |
207 | installfrm.ui \ | 207 | installwindowfrm.ui \ |
208 | progressloggerfrm.ui \ | 208 | progressloggerfrm.ui \ |
209 | configurefrm.ui \ | 209 | configurefrm.ui \ |
210 | browsedirtreefrm.ui \ | 210 | browsedirtreefrm.ui \ |