devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Rename InstallFrm to InstallWindowFrm.

Browse source 
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:
Dominik Riebeling 2010-02-16 18:30:24 +00:00
parent 4d6b1b6eb3
commit e5b63c61ab
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/rbutilqt/installwindow.cpp
View file

@ -18,7 +18,7 @@
****************************************************************************/ ****************************************************************************/
#include "installwindow.h" #include "installwindow.h"
#include "ui_installfrm.h" #include "ui_installwindowfrm.h"
#include "rbzip.h" #include "rbzip.h"
#include "system.h" #include "system.h"
#include "rbsettings.h" #include "rbsettings.h"
@ -149,7 +149,8 @@ void InstallWindow::accept()
else if(ui.radioArchived->isChecked()) { else if(ui.radioArchived->isChecked()) {
file = SystemInfo::value(SystemInfo::DailyUrl).toString(); file = SystemInfo::value(SystemInfo::DailyUrl).toString();
RbSettings::setValue(RbSettings::Build, "archived"); 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()) { else if(ui.radioCurrent->isChecked()) {
file = SystemInfo::value(SystemInfo::BleedingUrl).toString(); 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 " ui.labelDetails->setText(tr("This is the absolute up to the minute "
"Rockbox built. A current build will get updated every time " "Rockbox built. A current build will get updated every time "
"a change is made. Latest version is r%1 (%2).") "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()) if(ServerInfo::value(ServerInfo::CurReleaseVersion).toString().isEmpty())
ui.labelNote->setText(tr("<b>This is the recommended version.</b>")); ui.labelNote->setText(tr("<b>This is the recommended version.</b>"));
else else
@ -303,7 +305,8 @@ void InstallWindow::setDetailsArchived(bool show)
"features than the last stable release but may be much less stable. " "features than the last stable release but may be much less stable. "
"Features may change regularly.")); "Features may change regularly."));
ui.labelNote->setText(tr("<b>Note:</b> archived version is r%1 (%2).") 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()));
} }
} }

4
rbutil/rbutilqt/installwindow.h
View file

@ -24,7 +24,7 @@
#include <QtGui> #include <QtGui>
#include "ui_installfrm.h" #include "ui_installwindowfrm.h"
#include "zipinstaller.h" #include "zipinstaller.h"
#include "progressloggergui.h" #include "progressloggergui.h"
@ -38,7 +38,7 @@ class InstallWindow : public QDialog
void accept(void); void accept(void);
private: private:
Ui::InstallFrm ui; Ui::InstallWindowFrm ui;
ProgressLoggerGui* logger; ProgressLoggerGui* logger;
QHttp *download; QHttp *download;
QFile *target; QFile *target;

8
rbutil/rbutilqt/installfrm.ui → rbutil/rbutilqt/installwindowfrm.ui
View file

@ -1,6 +1,6 @@
<ui version="4.0" > <ui version="4.0" >
<class>InstallFrm</class> <class>InstallWindowFrm</class>
<widget class="QDialog" name="InstallFrm" > <widget class="QDialog" name="InstallWindowFrm" >
<property name="windowModality" > <property name="windowModality" >
<enum>Qt::WindowModal</enum> <enum>Qt::WindowModal</enum>
</property> </property>
@ -211,7 +211,7 @@
<connection> <connection>
<sender>buttonOk</sender> <sender>buttonOk</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>InstallFrm</receiver> <receiver>InstallWindowFrm</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >
@ -227,7 +227,7 @@
<connection> <connection>
<sender>buttonCancel</sender> <sender>buttonCancel</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>InstallFrm</receiver> <receiver>InstallWindowFrm</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel" >

2
rbutil/rbutilqt/rbutilqt.pro
View file

@ -204,7 +204,7 @@ TARGET = rbutilqt
FORMS += rbutilqtfrm.ui \ FORMS += rbutilqtfrm.ui \
aboutbox.ui \ aboutbox.ui \
installfrm.ui \ installwindowfrm.ui \
progressloggerfrm.ui \ progressloggerfrm.ui \
configurefrm.ui \ configurefrm.ui \
browsedirtreefrm.ui \ browsedirtreefrm.ui \