diff options
| -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 @@ ****************************************************************************/ #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/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 @@ <ui version="4.0" > - <class>InstallFrm</class> - <widget class="QDialog" name="InstallFrm" > + <class>InstallWindowFrm</class> + <widget class="QDialog" name="InstallWindowFrm" > <property name="windowModality" > <enum>Qt::WindowModal</enum> </property> @@ -211,7 +211,7 @@ <connection> <sender>buttonOk</sender> <signal>clicked()</signal> - <receiver>InstallFrm</receiver> + <receiver>InstallWindowFrm</receiver> <slot>accept()</slot> <hints> <hint type="sourcelabel" > @@ -227,7 +227,7 @@ <connection> <sender>buttonCancel</sender> <signal>clicked()</signal> - <receiver>InstallFrm</receiver> + <receiver>InstallWindowFrm</receiver> <slot>reject()</slot> <hints> <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 FORMS += rbutilqtfrm.ui \ aboutbox.ui \ - installfrm.ui \ + installwindowfrm.ui \ progressloggerfrm.ui \ configurefrm.ui \ browsedirtreefrm.ui \ |