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

small simplification, whitespace cleanup and dos2unix.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14059 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2007-07-29 17:55:46 +00:00
parent 57fbb39ce2
commit c414f46971
4 changed files with 379 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rbutil/rbutilqt/install.cpp
View file

@ -73,10 +73,8 @@ void Install::setProxy(QUrl proxy_url)
void Install::setMountPoint(QString mount) void Install::setMountPoint(QString mount)
{ {
QFileInfo m(mount); QFileInfo m(mount);
if(m.isDir()) { if(m.isDir())
ui.lineMountPoint->clear(); ui.lineMountPoint->setText(mount);
ui.lineMountPoint->insert(mount);
}
} }
@ -150,9 +148,9 @@ void Install::accept()
installer->setLogSection("rockboxbase"); installer->setLogSection("rockboxbase");
installer->setMountPoint(mountPoint); installer->setMountPoint(mountPoint);
installer->install(&dp); installer->install(&dp);
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
downloadProgress->show(); downloadProgress->show();
} }
@ -166,9 +164,9 @@ void Install::done(bool error)
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
return; return;
} }
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
} }

352
rbutil/rbutilqt/installbl.cpp
View file

@ -1,176 +1,176 @@
/*************************************************************************** /***************************************************************************
* __________ __ ___. * __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2007 by Dominik Wenger * Copyright (C) 2007 by Dominik Wenger
* $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $ * $Id: installbl.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.
* *
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "installbl.h" #include "installbl.h"
#include "ui_installprogressfrm.h" #include "ui_installprogressfrm.h"
InstallBl::InstallBl(QWidget *parent) : QDialog(parent) InstallBl::InstallBl(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()));
connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF())); connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF()));
} }
void InstallBl::setProxy(QUrl proxy_url) void InstallBl::setProxy(QUrl proxy_url)
{ {
proxy = proxy_url; proxy = proxy_url;
qDebug() << "Install::setProxy" << proxy; qDebug() << "Install::setProxy" << proxy;
} }
void InstallBl::setMountPoint(QString mount) void InstallBl::setMountPoint(QString mount)
{ {
QFileInfo m(mount); QFileInfo m(mount);
if(m.isDir()) { if(m.isDir()) {
ui.lineMountPoint->clear(); ui.lineMountPoint->clear();
ui.lineMountPoint->insert(mount); ui.lineMountPoint->insert(mount);
} }
} }
void InstallBl::setOFPath(QString path) void InstallBl::setOFPath(QString path)
{ {
QFileInfo m(path); QFileInfo m(path);
if(m.exists()) { if(m.exists()) {
ui.lineOriginalFirmware->clear(); ui.lineOriginalFirmware->clear();
ui.lineOriginalFirmware->insert(path); ui.lineOriginalFirmware->insert(path);
} }
} }
void InstallBl::browseFolder() void InstallBl::browseFolder()
{ {
QFileDialog browser(this); QFileDialog browser(this);
if(QFileInfo(ui.lineMountPoint->text()).isDir()) if(QFileInfo(ui.lineMountPoint->text()).isDir())
browser.setDirectory(ui.lineMountPoint->text()); browser.setDirectory(ui.lineMountPoint->text());
else else
browser.setDirectory("/media"); browser.setDirectory("/media");
browser.setReadOnly(true); browser.setReadOnly(true);
browser.setFileMode(QFileDialog::DirectoryOnly); browser.setFileMode(QFileDialog::DirectoryOnly);
browser.setAcceptMode(QFileDialog::AcceptOpen); browser.setAcceptMode(QFileDialog::AcceptOpen);
if(browser.exec()) { if(browser.exec()) {
qDebug() << browser.directory(); qDebug() << browser.directory();
QStringList files = browser.selectedFiles(); QStringList files = browser.selectedFiles();
setMountPoint(files.at(0)); setMountPoint(files.at(0));
} }
} }
void InstallBl::browseOF() void InstallBl::browseOF()
{ {
QFileDialog browser(this); QFileDialog browser(this);
if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
browser.setDirectory(ui.lineOriginalFirmware->text()); browser.setDirectory(ui.lineOriginalFirmware->text());
else else
browser.setDirectory("/media"); browser.setDirectory("/media");
browser.setReadOnly(true); browser.setReadOnly(true);
browser.setAcceptMode(QFileDialog::AcceptOpen); browser.setAcceptMode(QFileDialog::AcceptOpen);
if(browser.exec()) { if(browser.exec()) {
qDebug() << browser.directory(); qDebug() << browser.directory();
QStringList files = browser.selectedFiles(); QStringList files = browser.selectedFiles();
setOFPath(files.at(0)); setOFPath(files.at(0));
} }
} }
void InstallBl::accept() void InstallBl::accept()
{ {
downloadProgress = new QDialog(this); downloadProgress = new QDialog(this);
dp.setupUi(downloadProgress); dp.setupUi(downloadProgress);
// show dialog with error if mount point is wrong // show dialog with error if mount point is wrong
if(QFileInfo(ui.lineMountPoint->text()).isDir()) { if(QFileInfo(ui.lineMountPoint->text()).isDir()) {
mountPoint = ui.lineMountPoint->text(); mountPoint = ui.lineMountPoint->text();
userSettings->setValue("defaults/mountpoint", mountPoint); userSettings->setValue("defaults/mountpoint", mountPoint);
} }
else { else {
dp.listProgress->addItem(tr("Mount point is wrong!")); dp.listProgress->addItem(tr("Mount point is wrong!"));
dp.buttonAbort->setText(tr("&Ok")); dp.buttonAbort->setText(tr("&Ok"));
downloadProgress->show(); downloadProgress->show();
return; return;
} }
if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
{ {
m_OrigFirmware = ui.lineOriginalFirmware->text(); m_OrigFirmware = ui.lineOriginalFirmware->text();
} }
else else
{ {
dp.listProgress->addItem(tr("Original Firmware Path is wrong!")); dp.listProgress->addItem(tr("Original Firmware Path is wrong!"));
dp.buttonAbort->setText(tr("&Ok")); dp.buttonAbort->setText(tr("&Ok"));
downloadProgress->show(); downloadProgress->show();
return; return;
} }
userSettings->sync(); userSettings->sync();
binstaller = new BootloaderInstaller(this); binstaller = new BootloaderInstaller(this);
binstaller->setMountPoint(mountPoint); binstaller->setMountPoint(mountPoint);
binstaller->setProxy(proxy); binstaller->setProxy(proxy);
QString plattform = userSettings->value("defaults/platform").toString(); QString plattform = userSettings->value("defaults/platform").toString();
binstaller->setDevice(plattform); binstaller->setDevice(plattform);
binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString()); binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString());
binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString()); binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString());
binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString()); binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString());
binstaller->setOrigFirmwarePath(m_OrigFirmware); binstaller->setOrigFirmwarePath(m_OrigFirmware);
binstaller->install(&dp); binstaller->install(&dp);
connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool))); connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool)));
downloadProgress->show(); downloadProgress->show();
} }
void InstallBl::done(bool error) void InstallBl::done(bool error)
{ {
qDebug() << "Install::done, error:" << error; qDebug() << "Install::done, error:" << error;
if(error) if(error)
{ {
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
return; return;
} }
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
} }
void InstallBl::setDeviceSettings(QSettings *dev) void InstallBl::setDeviceSettings(QSettings *dev)
{ {
devices = dev; devices = dev;
if(userSettings->value("defaults/platform").toString() == "h100" || if(userSettings->value("defaults/platform").toString() == "h100" ||
userSettings->value("defaults/platform").toString() == "h120" || userSettings->value("defaults/platform").toString() == "h120" ||
userSettings->value("defaults/platform").toString() == "h300") userSettings->value("defaults/platform").toString() == "h300")
{ {
ui.buttonBrowseOF->show(); ui.buttonBrowseOF->show();
ui.lineOriginalFirmware->show(); ui.lineOriginalFirmware->show();
ui.label_3->show(); ui.label_3->show();
} }
else else
{ {
ui.buttonBrowseOF->hide(); ui.buttonBrowseOF->hide();
ui.lineOriginalFirmware->hide(); ui.lineOriginalFirmware->hide();
ui.label_3->hide(); ui.label_3->hide();
} }
qDebug() << "Install::setDeviceSettings:" << devices; qDebug() << "Install::setDeviceSettings:" << devices;
} }
void InstallBl::setUserSettings(QSettings *user) void InstallBl::setUserSettings(QSettings *user)
{ {
userSettings = user; userSettings = user;
} }

256
rbutil/rbutilqt/installzipwindow.cpp
View file

@ -1,128 +1,128 @@
/*************************************************************************** /***************************************************************************
* __________ __ ___. * __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2007 by Dominik Wenger * Copyright (C) 2007 by Dominik Wenger
* $Id: installzipwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $ * $Id: installzipwindow.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.
* *
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "installzipwindow.h" #include "installzipwindow.h"
#include "ui_installprogressfrm.h" #include "ui_installprogressfrm.h"
InstallZipWindow::InstallZipWindow(QWidget *parent) : QDialog(parent) InstallZipWindow::InstallZipWindow(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()));
} }
void InstallZipWindow::setProxy(QUrl proxy_url) void InstallZipWindow::setProxy(QUrl proxy_url)
{ {
proxy = proxy_url; proxy = proxy_url;
qDebug() << "Install::setProxy" << proxy; qDebug() << "Install::setProxy" << proxy;
} }
void InstallZipWindow::setMountPoint(QString mount) void InstallZipWindow::setMountPoint(QString mount)
{ {
QFileInfo m(mount); QFileInfo m(mount);
if(m.isDir()) { if(m.isDir()) {
ui.lineMountPoint->clear(); ui.lineMountPoint->clear();
ui.lineMountPoint->insert(mount); ui.lineMountPoint->insert(mount);
} }
} }
void InstallZipWindow::setUrl(QString path) void InstallZipWindow::setUrl(QString path)
{ {
url = path; url = path;
} }
void InstallZipWindow::browseFolder() void InstallZipWindow::browseFolder()
{ {
QFileDialog browser(this); QFileDialog browser(this);
if(QFileInfo(ui.lineMountPoint->text()).isDir()) if(QFileInfo(ui.lineMountPoint->text()).isDir())
browser.setDirectory(ui.lineMountPoint->text()); browser.setDirectory(ui.lineMountPoint->text());
else else
browser.setDirectory("/media"); browser.setDirectory("/media");
browser.setReadOnly(true); browser.setReadOnly(true);
browser.setFileMode(QFileDialog::DirectoryOnly); browser.setFileMode(QFileDialog::DirectoryOnly);
browser.setAcceptMode(QFileDialog::AcceptOpen); browser.setAcceptMode(QFileDialog::AcceptOpen);
if(browser.exec()) { if(browser.exec()) {
qDebug() << browser.directory(); qDebug() << browser.directory();
QStringList files = browser.selectedFiles(); QStringList files = browser.selectedFiles();
setMountPoint(files.at(0)); setMountPoint(files.at(0));
} }
} }
void InstallZipWindow::accept() void InstallZipWindow::accept()
{ {
downloadProgress = new QDialog(this); downloadProgress = new QDialog(this);
dp.setupUi(downloadProgress); dp.setupUi(downloadProgress);
// show dialog with error if mount point is wrong // show dialog with error if mount point is wrong
if(QFileInfo(ui.lineMountPoint->text()).isDir()) { if(QFileInfo(ui.lineMountPoint->text()).isDir()) {
mountPoint = ui.lineMountPoint->text(); mountPoint = ui.lineMountPoint->text();
userSettings->setValue("defaults/mountpoint", mountPoint); userSettings->setValue("defaults/mountpoint", mountPoint);
} }
else { else {
dp.listProgress->addItem(tr("Mount point is wrong!")); dp.listProgress->addItem(tr("Mount point is wrong!"));
dp.buttonAbort->setText(tr("&Ok")); dp.buttonAbort->setText(tr("&Ok"));
downloadProgress->show(); downloadProgress->show();
return; return;
} }
userSettings->sync(); userSettings->sync();
installer = new ZipInstaller(this); installer = new ZipInstaller(this);
QString fileName = url.section('/', -1); QString fileName = url.section('/', -1);
installer->setFilename(fileName); installer->setFilename(fileName);
installer->setUrl(url); installer->setUrl(url);
installer->setProxy(proxy); installer->setProxy(proxy);
installer->setLogSection(logsection); installer->setLogSection(logsection);
installer->setMountPoint(mountPoint); installer->setMountPoint(mountPoint);
installer->install(&dp); installer->install(&dp);
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
downloadProgress->show(); downloadProgress->show();
} }
void InstallZipWindow::done(bool error) void InstallZipWindow::done(bool error)
{ {
qDebug() << "Install::done, error:" << error; qDebug() << "Install::done, error:" << error;
if(error) if(error)
{ {
// connect close button now as it's needed if we break upon an error // connect close button now as it's needed if we break upon an error
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
return; return;
} }
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
} }
void InstallZipWindow::setDeviceSettings(QSettings *dev) void InstallZipWindow::setDeviceSettings(QSettings *dev)
{ {
devices = dev; devices = dev;
qDebug() << "Install::setDeviceSettings:" << devices; qDebug() << "Install::setDeviceSettings:" << devices;
} }
void InstallZipWindow::setUserSettings(QSettings *user) void InstallZipWindow::setUserSettings(QSettings *user)
{ {
userSettings = user; userSettings = user;
} }

136
rbutil/rbutilqt/installzipwindow.h
View file

@ -1,68 +1,68 @@
/*************************************************************************** /***************************************************************************
* __________ __ ___. * __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* *
* Copyright (C) 2007 by Dominik Wenger * Copyright (C) 2007 by Dominik Wenger
* $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $ * $Id: installzipwindow.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.
* *
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#ifndef INSTALLZIPWINDOW_H #ifndef INSTALLZIPWINDOW_H
#define INSTALLZIPWINDOW_H #define INSTALLZIPWINDOW_H
#include <QtGui> #include <QtGui>
#include <QSettings> #include <QSettings>
#include "ui_installzipfrm.h" #include "ui_installzipfrm.h"
#include "ui_installprogressfrm.h" #include "ui_installprogressfrm.h"
#include "installzip.h" #include "installzip.h"
class InstallZipWindow : public QDialog class InstallZipWindow : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
InstallZipWindow(QWidget *parent = 0); InstallZipWindow(QWidget *parent = 0);
void setProxy(QUrl); void setProxy(QUrl);
void setMountPoint(QString); void setMountPoint(QString);
void setUrl(QString); void setUrl(QString);
void setLogSection(QString name){logsection = name; } void setLogSection(QString name){logsection = name; }
void setUserSettings(QSettings*); void setUserSettings(QSettings*);
void setDeviceSettings(QSettings*); void setDeviceSettings(QSettings*);
public slots: public slots:
void accept(void); void accept(void);
private: private:
Ui::InstallZipFrm ui; Ui::InstallZipFrm ui;
Ui::InstallProgressFrm dp; Ui::InstallProgressFrm dp;
QUrl proxy; QUrl proxy;
QSettings *devices; QSettings *devices;
QSettings *userSettings; QSettings *userSettings;
QDialog *downloadProgress; QDialog *downloadProgress;
QString file; QString file;
QString fileName; QString fileName;
QString mountPoint; QString mountPoint;
QString url; QString url;
QString logsection; QString logsection;
ZipInstaller* installer; ZipInstaller* installer;
private slots: private slots:
void browseFolder(void); void browseFolder(void);
void done(bool); void done(bool);
}; };
#endif #endif