mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-11-10 21:52:28 -05:00
rbutilQt: renamed installbl to installbootloaderwindow.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14259 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
c3bf746f83
commit
36b150e5dc
4 changed files with 19 additions and 19 deletions
|
|
@ -7,7 +7,7 @@
|
||||||
* \/ \/ \/ \/ \/
|
* \/ \/ \/ \/ \/
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007 by Dominik Wenger
|
* Copyright (C) 2007 by Dominik Wenger
|
||||||
* $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $
|
* $Id: installbootloaderwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $
|
||||||
*
|
*
|
||||||
* All files in this archive are subject to the GNU General Public License.
|
* All files in this archive are subject to the GNU General Public License.
|
||||||
* See the file COPYING in the source tree root for full license agreement.
|
* See the file COPYING in the source tree root for full license agreement.
|
||||||
|
|
@ -17,11 +17,11 @@
|
||||||
*
|
*
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "installbl.h"
|
#include "installbootloaderwindow.h"
|
||||||
#include "ui_installprogressfrm.h"
|
#include "ui_installprogressfrm.h"
|
||||||
|
|
||||||
|
|
||||||
InstallBl::InstallBl(QWidget *parent) : QDialog(parent)
|
InstallBootloaderWindow::InstallBootloaderWindow(QWidget *parent) : QDialog(parent)
|
||||||
{
|
{
|
||||||
ui.setupUi(this);
|
ui.setupUi(this);
|
||||||
connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder()));
|
connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder()));
|
||||||
|
|
@ -29,13 +29,13 @@ InstallBl::InstallBl(QWidget *parent) : QDialog(parent)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::setProxy(QUrl proxy_url)
|
void InstallBootloaderWindow::setProxy(QUrl proxy_url)
|
||||||
{
|
{
|
||||||
proxy = proxy_url;
|
proxy = proxy_url;
|
||||||
qDebug() << "Install::setProxy" << proxy;
|
qDebug() << "Install::setProxy" << proxy;
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::setMountPoint(QString mount)
|
void InstallBootloaderWindow::setMountPoint(QString mount)
|
||||||
{
|
{
|
||||||
QFileInfo m(mount);
|
QFileInfo m(mount);
|
||||||
if(m.isDir()) {
|
if(m.isDir()) {
|
||||||
|
|
@ -44,7 +44,7 @@ void InstallBl::setMountPoint(QString mount)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::setOFPath(QString path)
|
void InstallBootloaderWindow::setOFPath(QString path)
|
||||||
{
|
{
|
||||||
QFileInfo m(path);
|
QFileInfo m(path);
|
||||||
if(m.exists()) {
|
if(m.exists()) {
|
||||||
|
|
@ -53,7 +53,7 @@ void InstallBl::setOFPath(QString path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::browseFolder()
|
void InstallBootloaderWindow::browseFolder()
|
||||||
{
|
{
|
||||||
QFileDialog browser(this);
|
QFileDialog browser(this);
|
||||||
if(QFileInfo(ui.lineMountPoint->text()).isDir())
|
if(QFileInfo(ui.lineMountPoint->text()).isDir())
|
||||||
|
|
@ -70,7 +70,7 @@ void InstallBl::browseFolder()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::browseOF()
|
void InstallBootloaderWindow::browseOF()
|
||||||
{
|
{
|
||||||
QFileDialog browser(this);
|
QFileDialog browser(this);
|
||||||
if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
|
if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
|
||||||
|
|
@ -86,7 +86,7 @@ void InstallBl::browseOF()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::accept()
|
void InstallBootloaderWindow::accept()
|
||||||
{
|
{
|
||||||
// create logger
|
// create logger
|
||||||
logger = new ProgressLoggerGui(this);
|
logger = new ProgressLoggerGui(this);
|
||||||
|
|
@ -134,7 +134,7 @@ void InstallBl::accept()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void InstallBl::done(bool error)
|
void InstallBootloaderWindow::done(bool error)
|
||||||
{
|
{
|
||||||
qDebug() << "Install::done, error:" << error;
|
qDebug() << "Install::done, error:" << error;
|
||||||
|
|
||||||
|
|
@ -149,13 +149,13 @@ void InstallBl::done(bool error)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::setDeviceSettings(QSettings *dev)
|
void InstallBootloaderWindow::setDeviceSettings(QSettings *dev)
|
||||||
{
|
{
|
||||||
devices = dev;
|
devices = dev;
|
||||||
qDebug() << "Install::setDeviceSettings:" << devices;
|
qDebug() << "Install::setDeviceSettings:" << devices;
|
||||||
}
|
}
|
||||||
|
|
||||||
void InstallBl::setUserSettings(QSettings *user)
|
void InstallBootloaderWindow::setUserSettings(QSettings *user)
|
||||||
{
|
{
|
||||||
userSettings = user;
|
userSettings = user;
|
||||||
if(userSettings->value("defaults/platform").toString() == "h100" ||
|
if(userSettings->value("defaults/platform").toString() == "h100" ||
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
* \/ \/ \/ \/ \/
|
* \/ \/ \/ \/ \/
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007 by Dominik Wenger
|
* Copyright (C) 2007 by Dominik Wenger
|
||||||
* $Id: installbl.h 14027 2007-07-27 17:42:49Z domonoky $
|
* $Id: installbootloaderwindow.h 14027 2007-07-27 17:42:49Z domonoky $
|
||||||
*
|
*
|
||||||
* All files in this archive are subject to the GNU General Public License.
|
* All files in this archive are subject to the GNU General Public License.
|
||||||
* See the file COPYING in the source tree root for full license agreement.
|
* See the file COPYING in the source tree root for full license agreement.
|
||||||
|
|
@ -30,11 +30,11 @@
|
||||||
#include "installbootloader.h"
|
#include "installbootloader.h"
|
||||||
#include "irivertools/irivertools.h"
|
#include "irivertools/irivertools.h"
|
||||||
|
|
||||||
class InstallBl : public QDialog
|
class InstallBootloaderWindow : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
InstallBl(QWidget *parent = 0);
|
InstallBootloaderWindow(QWidget *parent = 0);
|
||||||
void setProxy(QUrl);
|
void setProxy(QUrl);
|
||||||
void setMountPoint(QString);
|
void setMountPoint(QString);
|
||||||
void setOFPath(QString);
|
void setOFPath(QString);
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#include "ui_aboutbox.h"
|
#include "ui_aboutbox.h"
|
||||||
#include "configure.h"
|
#include "configure.h"
|
||||||
#include "install.h"
|
#include "install.h"
|
||||||
#include "installbl.h"
|
#include "installbootloaderwindow.h"
|
||||||
#include "installtalkwindow.h"
|
#include "installtalkwindow.h"
|
||||||
#include "httpget.h"
|
#include "httpget.h"
|
||||||
#include "installbootloader.h"
|
#include "installbootloader.h"
|
||||||
|
|
@ -279,7 +279,7 @@ void RbUtilQt::install()
|
||||||
|
|
||||||
void RbUtilQt::installBl()
|
void RbUtilQt::installBl()
|
||||||
{
|
{
|
||||||
InstallBl *installWindow = new InstallBl(this);
|
InstallBootloaderWindow *installWindow = new InstallBootloaderWindow(this);
|
||||||
installWindow->setUserSettings(userSettings);
|
installWindow->setUserSettings(userSettings);
|
||||||
installWindow->setDeviceSettings(devices);
|
installWindow->setDeviceSettings(devices);
|
||||||
if(userSettings->value("defaults/proxytype") == "manual")
|
if(userSettings->value("defaults/proxytype") == "manual")
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ SOURCES += rbutilqt.cpp \
|
||||||
zip/unzip.cpp \
|
zip/unzip.cpp \
|
||||||
installzip.cpp \
|
installzip.cpp \
|
||||||
installbootloader.cpp \
|
installbootloader.cpp \
|
||||||
installbl.cpp \
|
installbootloaderwindow.cpp \
|
||||||
progressloggergui.cpp \
|
progressloggergui.cpp \
|
||||||
installtalkwindow.cpp \
|
installtalkwindow.cpp \
|
||||||
talkfile.cpp \
|
talkfile.cpp \
|
||||||
|
|
@ -45,7 +45,7 @@ HEADERS += rbutilqt.h \
|
||||||
version.h \
|
version.h \
|
||||||
installzip.h \
|
installzip.h \
|
||||||
installbootloader.h \
|
installbootloader.h \
|
||||||
installbl.h \
|
installbootloaderwindow.h \
|
||||||
installtalkwindow.h \
|
installtalkwindow.h \
|
||||||
talkfile.h \
|
talkfile.h \
|
||||||
autodetection.h \
|
autodetection.h \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue