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
This commit is contained in:
parent
4d6b1b6eb3
commit
e5b63c61ab
4 changed files with 14 additions and 11 deletions
|
@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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" >
|
|
@ -204,7 +204,7 @@ TARGET = rbutilqt
|
|||
|
||||
FORMS += rbutilqtfrm.ui \
|
||||
aboutbox.ui \
|
||||
installfrm.ui \
|
||||
installwindowfrm.ui \
|
||||
progressloggerfrm.ui \
|
||||
configurefrm.ui \
|
||||
browsedirtreefrm.ui \
|
||||
|
|
Loading…
Reference in a new issue