From 36b150e5dc62a4c46aa8fd34a1c9ce828ae2bd28 Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Thu, 9 Aug 2007 16:44:27 +0000 Subject: rbutilQt: renamed installbl to installbootloaderwindow. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14259 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/installbl.cpp | 177 ---------------------------- rbutil/rbutilqt/installbl.h | 70 ----------- rbutil/rbutilqt/installbootloaderwindow.cpp | 177 ++++++++++++++++++++++++++++ rbutil/rbutilqt/installbootloaderwindow.h | 70 +++++++++++ rbutil/rbutilqt/rbutilqt.cpp | 4 +- rbutil/rbutilqt/rbutilqt.pro | 4 +- 6 files changed, 251 insertions(+), 251 deletions(-) delete mode 100644 rbutil/rbutilqt/installbl.cpp delete mode 100644 rbutil/rbutilqt/installbl.h create mode 100644 rbutil/rbutilqt/installbootloaderwindow.cpp create mode 100644 rbutil/rbutilqt/installbootloaderwindow.h (limited to 'rbutil/rbutilqt') diff --git a/rbutil/rbutilqt/installbl.cpp b/rbutil/rbutilqt/installbl.cpp deleted file mode 100644 index 9d9dba4760..0000000000 --- a/rbutil/rbutilqt/installbl.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2007 by Dominik Wenger - * $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $ - * - * 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. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "installbl.h" -#include "ui_installprogressfrm.h" - - -InstallBl::InstallBl(QWidget *parent) : QDialog(parent) -{ - ui.setupUi(this); - connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); - connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF())); - -} - -void InstallBl::setProxy(QUrl proxy_url) -{ - proxy = proxy_url; - qDebug() << "Install::setProxy" << proxy; -} - -void InstallBl::setMountPoint(QString mount) -{ - QFileInfo m(mount); - if(m.isDir()) { - ui.lineMountPoint->clear(); - ui.lineMountPoint->insert(mount); - } -} - -void InstallBl::setOFPath(QString path) -{ - QFileInfo m(path); - if(m.exists()) { - ui.lineOriginalFirmware->clear(); - ui.lineOriginalFirmware->insert(path); - } -} - -void InstallBl::browseFolder() -{ - QFileDialog browser(this); - if(QFileInfo(ui.lineMountPoint->text()).isDir()) - browser.setDirectory(ui.lineMountPoint->text()); - else - browser.setDirectory("/media"); - browser.setReadOnly(true); - browser.setFileMode(QFileDialog::DirectoryOnly); - browser.setAcceptMode(QFileDialog::AcceptOpen); - if(browser.exec()) { - qDebug() << browser.directory(); - QStringList files = browser.selectedFiles(); - setMountPoint(files.at(0)); - } -} - -void InstallBl::browseOF() -{ - QFileDialog browser(this); - if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) - browser.setDirectory(ui.lineOriginalFirmware->text()); - else - browser.setDirectory("/media"); - browser.setReadOnly(true); - browser.setAcceptMode(QFileDialog::AcceptOpen); - if(browser.exec()) { - qDebug() << browser.directory(); - QStringList files = browser.selectedFiles(); - setOFPath(files.at(0)); - } -} - -void InstallBl::accept() -{ - // create logger - logger = new ProgressLoggerGui(this); - logger->show(); - - // show dialog with error if mount point is wrong - if(QFileInfo(ui.lineMountPoint->text()).isDir()) { - mountPoint = ui.lineMountPoint->text(); - userSettings->setValue("defaults/mountpoint", mountPoint); - } - else { - logger->addItem(tr("Mount point is wrong!"),LOGERROR); - logger->abort(); - return; - } - - if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) - { - m_OrigFirmware = ui.lineOriginalFirmware->text(); - } - else if(needextrafile) - { - logger->addItem(tr("Original Firmware Path is wrong!"),LOGERROR); - logger->abort(); - return; - } - userSettings->sync(); - - binstaller = new BootloaderInstaller(this); - - binstaller->setMountPoint(mountPoint); - binstaller->setProxy(proxy); - QString plattform = userSettings->value("defaults/platform").toString(); - - binstaller->setDevice(plattform); - binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString()); - binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString()); - binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString()); - binstaller->setOrigFirmwarePath(m_OrigFirmware); - - binstaller->install(logger); - - connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool))); - -} - - -void InstallBl::done(bool error) -{ - qDebug() << "Install::done, error:" << error; - - if(error) - { - logger->abort(); - return; - } - - // no error, close the window, when the logger is closed - connect(logger,SIGNAL(closed()),this,SLOT(close())); - -} - -void InstallBl::setDeviceSettings(QSettings *dev) -{ - devices = dev; - qDebug() << "Install::setDeviceSettings:" << devices; -} - -void InstallBl::setUserSettings(QSettings *user) -{ - userSettings = user; - if(userSettings->value("defaults/platform").toString() == "h100" || - userSettings->value("defaults/platform").toString() == "h120" || - userSettings->value("defaults/platform").toString() == "h300") - { - ui.buttonBrowseOF->show(); - ui.lineOriginalFirmware->show(); - ui.label_3->show(); - needextrafile = true; - } - else - { - ui.buttonBrowseOF->hide(); - ui.lineOriginalFirmware->hide(); - ui.label_3->hide(); - needextrafile = false; - } -} diff --git a/rbutil/rbutilqt/installbl.h b/rbutil/rbutilqt/installbl.h deleted file mode 100644 index 09e3492e43..0000000000 --- a/rbutil/rbutilqt/installbl.h +++ /dev/null @@ -1,70 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * Copyright (C) 2007 by Dominik Wenger - * $Id: installbl.h 14027 2007-07-27 17:42:49Z domonoky $ - * - * 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. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#ifndef INSTALLBL_H -#define INSTALLBL_H - -#include - -#include - -#include "ui_installbootloaderfrm.h" -#include "progressloggergui.h" - -#include "installbootloader.h" -#include "irivertools/irivertools.h" - -class InstallBl : public QDialog -{ - Q_OBJECT - public: - InstallBl(QWidget *parent = 0); - void setProxy(QUrl); - void setMountPoint(QString); - void setOFPath(QString); - void setUserSettings(QSettings*); - void setDeviceSettings(QSettings*); - - public slots: - void accept(void); - - private: - Ui::InstallBootloaderFrm ui; - ProgressLoggerGui* logger; - QUrl proxy; - QSettings *devices; - QSettings *userSettings; - QHttp *download; - QFile *target; - QString file; - QString fileName; - QString mountPoint; - QString m_OrigFirmware; - BootloaderInstaller* binstaller; - bool needextrafile; - - private slots: - void browseFolder(void); - void browseOF(void); - void done(bool); - -}; - - -#endif diff --git a/rbutil/rbutilqt/installbootloaderwindow.cpp b/rbutil/rbutilqt/installbootloaderwindow.cpp new file mode 100644 index 0000000000..95084e87f7 --- /dev/null +++ b/rbutil/rbutilqt/installbootloaderwindow.cpp @@ -0,0 +1,177 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2007 by Dominik Wenger + * $Id: installbootloaderwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $ + * + * 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. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "installbootloaderwindow.h" +#include "ui_installprogressfrm.h" + + +InstallBootloaderWindow::InstallBootloaderWindow(QWidget *parent) : QDialog(parent) +{ + ui.setupUi(this); + connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); + connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF())); + +} + +void InstallBootloaderWindow::setProxy(QUrl proxy_url) +{ + proxy = proxy_url; + qDebug() << "Install::setProxy" << proxy; +} + +void InstallBootloaderWindow::setMountPoint(QString mount) +{ + QFileInfo m(mount); + if(m.isDir()) { + ui.lineMountPoint->clear(); + ui.lineMountPoint->insert(mount); + } +} + +void InstallBootloaderWindow::setOFPath(QString path) +{ + QFileInfo m(path); + if(m.exists()) { + ui.lineOriginalFirmware->clear(); + ui.lineOriginalFirmware->insert(path); + } +} + +void InstallBootloaderWindow::browseFolder() +{ + QFileDialog browser(this); + if(QFileInfo(ui.lineMountPoint->text()).isDir()) + browser.setDirectory(ui.lineMountPoint->text()); + else + browser.setDirectory("/media"); + browser.setReadOnly(true); + browser.setFileMode(QFileDialog::DirectoryOnly); + browser.setAcceptMode(QFileDialog::AcceptOpen); + if(browser.exec()) { + qDebug() << browser.directory(); + QStringList files = browser.selectedFiles(); + setMountPoint(files.at(0)); + } +} + +void InstallBootloaderWindow::browseOF() +{ + QFileDialog browser(this); + if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) + browser.setDirectory(ui.lineOriginalFirmware->text()); + else + browser.setDirectory("/media"); + browser.setReadOnly(true); + browser.setAcceptMode(QFileDialog::AcceptOpen); + if(browser.exec()) { + qDebug() << browser.directory(); + QStringList files = browser.selectedFiles(); + setOFPath(files.at(0)); + } +} + +void InstallBootloaderWindow::accept() +{ + // create logger + logger = new ProgressLoggerGui(this); + logger->show(); + + // show dialog with error if mount point is wrong + if(QFileInfo(ui.lineMountPoint->text()).isDir()) { + mountPoint = ui.lineMountPoint->text(); + userSettings->setValue("defaults/mountpoint", mountPoint); + } + else { + logger->addItem(tr("Mount point is wrong!"),LOGERROR); + logger->abort(); + return; + } + + if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) + { + m_OrigFirmware = ui.lineOriginalFirmware->text(); + } + else if(needextrafile) + { + logger->addItem(tr("Original Firmware Path is wrong!"),LOGERROR); + logger->abort(); + return; + } + userSettings->sync(); + + binstaller = new BootloaderInstaller(this); + + binstaller->setMountPoint(mountPoint); + binstaller->setProxy(proxy); + QString plattform = userSettings->value("defaults/platform").toString(); + + binstaller->setDevice(plattform); + binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString()); + binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString()); + binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString()); + binstaller->setOrigFirmwarePath(m_OrigFirmware); + + binstaller->install(logger); + + connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool))); + +} + + +void InstallBootloaderWindow::done(bool error) +{ + qDebug() << "Install::done, error:" << error; + + if(error) + { + logger->abort(); + return; + } + + // no error, close the window, when the logger is closed + connect(logger,SIGNAL(closed()),this,SLOT(close())); + +} + +void InstallBootloaderWindow::setDeviceSettings(QSettings *dev) +{ + devices = dev; + qDebug() << "Install::setDeviceSettings:" << devices; +} + +void InstallBootloaderWindow::setUserSettings(QSettings *user) +{ + userSettings = user; + if(userSettings->value("defaults/platform").toString() == "h100" || + userSettings->value("defaults/platform").toString() == "h120" || + userSettings->value("defaults/platform").toString() == "h300") + { + ui.buttonBrowseOF->show(); + ui.lineOriginalFirmware->show(); + ui.label_3->show(); + needextrafile = true; + } + else + { + ui.buttonBrowseOF->hide(); + ui.lineOriginalFirmware->hide(); + ui.label_3->hide(); + needextrafile = false; + } +} diff --git a/rbutil/rbutilqt/installbootloaderwindow.h b/rbutil/rbutilqt/installbootloaderwindow.h new file mode 100644 index 0000000000..6baafd0bf1 --- /dev/null +++ b/rbutil/rbutilqt/installbootloaderwindow.h @@ -0,0 +1,70 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * + * Copyright (C) 2007 by Dominik Wenger + * $Id: installbootloaderwindow.h 14027 2007-07-27 17:42:49Z domonoky $ + * + * 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. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#ifndef INSTALLBL_H +#define INSTALLBL_H + +#include + +#include + +#include "ui_installbootloaderfrm.h" +#include "progressloggergui.h" + +#include "installbootloader.h" +#include "irivertools/irivertools.h" + +class InstallBootloaderWindow : public QDialog +{ + Q_OBJECT + public: + InstallBootloaderWindow(QWidget *parent = 0); + void setProxy(QUrl); + void setMountPoint(QString); + void setOFPath(QString); + void setUserSettings(QSettings*); + void setDeviceSettings(QSettings*); + + public slots: + void accept(void); + + private: + Ui::InstallBootloaderFrm ui; + ProgressLoggerGui* logger; + QUrl proxy; + QSettings *devices; + QSettings *userSettings; + QHttp *download; + QFile *target; + QString file; + QString fileName; + QString mountPoint; + QString m_OrigFirmware; + BootloaderInstaller* binstaller; + bool needextrafile; + + private slots: + void browseFolder(void); + void browseOF(void); + void done(bool); + +}; + + +#endif diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 9532ba1c99..def0e15e47 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -25,7 +25,7 @@ #include "ui_aboutbox.h" #include "configure.h" #include "install.h" -#include "installbl.h" +#include "installbootloaderwindow.h" #include "installtalkwindow.h" #include "httpget.h" #include "installbootloader.h" @@ -279,7 +279,7 @@ void RbUtilQt::install() void RbUtilQt::installBl() { - InstallBl *installWindow = new InstallBl(this); + InstallBootloaderWindow *installWindow = new InstallBootloaderWindow(this); installWindow->setUserSettings(userSettings); installWindow->setDeviceSettings(devices); if(userSettings->value("defaults/proxytype") == "manual") diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 4fa90ff089..ed61288edc 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -21,7 +21,7 @@ SOURCES += rbutilqt.cpp \ zip/unzip.cpp \ installzip.cpp \ installbootloader.cpp \ - installbl.cpp \ + installbootloaderwindow.cpp \ progressloggergui.cpp \ installtalkwindow.cpp \ talkfile.cpp \ @@ -45,7 +45,7 @@ HEADERS += rbutilqt.h \ version.h \ installzip.h \ installbootloader.h \ - installbl.h \ + installbootloaderwindow.h \ installtalkwindow.h \ talkfile.h \ autodetection.h \ -- cgit v1.2.3