forked from len0rd/rockbox
small simplification, whitespace cleanup and dos2unix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14059 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling
parent
57fbb39ce2
commit
c414f46971
4 changed files with 379 additions and 381 deletions
|
|
@ -73,10 +73,8 @@ void Install::setProxy(QUrl proxy_url)
|
|||
void Install::setMountPoint(QString mount)
|
||||
{
|
||||
QFileInfo m(mount);
|
||||
if(m.isDir()) {
|
||||
ui.lineMountPoint->clear();
|
||||
ui.lineMountPoint->insert(mount);
|
||||
}
|
||||
if(m.isDir())
|
||||
ui.lineMountPoint->setText(mount);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -150,9 +148,9 @@ void Install::accept()
|
|||
installer->setLogSection("rockboxbase");
|
||||
installer->setMountPoint(mountPoint);
|
||||
installer->install(&dp);
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
downloadProgress->show();
|
||||
}
|
||||
|
||||
|
|
@ -166,9 +164,9 @@ void Install::done(bool error)
|
|||
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,176 +1,176 @@
|
|||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* 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()
|
||||
{
|
||||
downloadProgress = new QDialog(this);
|
||||
dp.setupUi(downloadProgress);
|
||||
// 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 {
|
||||
dp.listProgress->addItem(tr("Mount point is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
return;
|
||||
}
|
||||
|
||||
if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
|
||||
{
|
||||
m_OrigFirmware = ui.lineOriginalFirmware->text();
|
||||
}
|
||||
else
|
||||
{
|
||||
dp.listProgress->addItem(tr("Original Firmware Path is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
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(&dp);
|
||||
|
||||
connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
downloadProgress->show();
|
||||
}
|
||||
|
||||
|
||||
void InstallBl::done(bool error)
|
||||
{
|
||||
qDebug() << "Install::done, error:" << error;
|
||||
|
||||
if(error)
|
||||
{
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
|
||||
return;
|
||||
}
|
||||
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
}
|
||||
|
||||
void InstallBl::setDeviceSettings(QSettings *dev)
|
||||
{
|
||||
devices = dev;
|
||||
|
||||
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();
|
||||
}
|
||||
else
|
||||
{
|
||||
ui.buttonBrowseOF->hide();
|
||||
ui.lineOriginalFirmware->hide();
|
||||
ui.label_3->hide();
|
||||
}
|
||||
qDebug() << "Install::setDeviceSettings:" << devices;
|
||||
}
|
||||
|
||||
void InstallBl::setUserSettings(QSettings *user)
|
||||
{
|
||||
userSettings = user;
|
||||
}
|
||||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* 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()
|
||||
{
|
||||
downloadProgress = new QDialog(this);
|
||||
dp.setupUi(downloadProgress);
|
||||
// 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 {
|
||||
dp.listProgress->addItem(tr("Mount point is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
return;
|
||||
}
|
||||
|
||||
if(QFileInfo(ui.lineOriginalFirmware->text()).exists())
|
||||
{
|
||||
m_OrigFirmware = ui.lineOriginalFirmware->text();
|
||||
}
|
||||
else
|
||||
{
|
||||
dp.listProgress->addItem(tr("Original Firmware Path is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
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(&dp);
|
||||
|
||||
connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
downloadProgress->show();
|
||||
}
|
||||
|
||||
|
||||
void InstallBl::done(bool error)
|
||||
{
|
||||
qDebug() << "Install::done, error:" << error;
|
||||
|
||||
if(error)
|
||||
{
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
|
||||
return;
|
||||
}
|
||||
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
}
|
||||
|
||||
void InstallBl::setDeviceSettings(QSettings *dev)
|
||||
{
|
||||
devices = dev;
|
||||
|
||||
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();
|
||||
}
|
||||
else
|
||||
{
|
||||
ui.buttonBrowseOF->hide();
|
||||
ui.lineOriginalFirmware->hide();
|
||||
ui.label_3->hide();
|
||||
}
|
||||
qDebug() << "Install::setDeviceSettings:" << devices;
|
||||
}
|
||||
|
||||
void InstallBl::setUserSettings(QSettings *user)
|
||||
{
|
||||
userSettings = user;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,128 +1,128 @@
|
|||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
*
|
||||
* Copyright (C) 2007 by Dominik Wenger
|
||||
* $Id: installzipwindow.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 "installzipwindow.h"
|
||||
#include "ui_installprogressfrm.h"
|
||||
|
||||
|
||||
InstallZipWindow::InstallZipWindow(QWidget *parent) : QDialog(parent)
|
||||
{
|
||||
ui.setupUi(this);
|
||||
connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder()));
|
||||
}
|
||||
|
||||
void InstallZipWindow::setProxy(QUrl proxy_url)
|
||||
{
|
||||
proxy = proxy_url;
|
||||
qDebug() << "Install::setProxy" << proxy;
|
||||
}
|
||||
|
||||
void InstallZipWindow::setMountPoint(QString mount)
|
||||
{
|
||||
QFileInfo m(mount);
|
||||
if(m.isDir()) {
|
||||
ui.lineMountPoint->clear();
|
||||
ui.lineMountPoint->insert(mount);
|
||||
}
|
||||
}
|
||||
|
||||
void InstallZipWindow::setUrl(QString path)
|
||||
{
|
||||
url = path;
|
||||
}
|
||||
|
||||
void InstallZipWindow::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 InstallZipWindow::accept()
|
||||
{
|
||||
downloadProgress = new QDialog(this);
|
||||
dp.setupUi(downloadProgress);
|
||||
|
||||
// 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 {
|
||||
dp.listProgress->addItem(tr("Mount point is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
return;
|
||||
}
|
||||
|
||||
userSettings->sync();
|
||||
|
||||
installer = new ZipInstaller(this);
|
||||
|
||||
QString fileName = url.section('/', -1);
|
||||
|
||||
installer->setFilename(fileName);
|
||||
installer->setUrl(url);
|
||||
installer->setProxy(proxy);
|
||||
installer->setLogSection(logsection);
|
||||
installer->setMountPoint(mountPoint);
|
||||
installer->install(&dp);
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
downloadProgress->show();
|
||||
|
||||
}
|
||||
|
||||
|
||||
void InstallZipWindow::done(bool error)
|
||||
{
|
||||
qDebug() << "Install::done, error:" << error;
|
||||
|
||||
if(error)
|
||||
{
|
||||
// connect close button now as it's needed if we break upon an error
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
|
||||
return;
|
||||
}
|
||||
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
}
|
||||
|
||||
void InstallZipWindow::setDeviceSettings(QSettings *dev)
|
||||
{
|
||||
devices = dev;
|
||||
qDebug() << "Install::setDeviceSettings:" << devices;
|
||||
}
|
||||
|
||||
void InstallZipWindow::setUserSettings(QSettings *user)
|
||||
{
|
||||
userSettings = user;
|
||||
}
|
||||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
*
|
||||
* Copyright (C) 2007 by Dominik Wenger
|
||||
* $Id: installzipwindow.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 "installzipwindow.h"
|
||||
#include "ui_installprogressfrm.h"
|
||||
|
||||
|
||||
InstallZipWindow::InstallZipWindow(QWidget *parent) : QDialog(parent)
|
||||
{
|
||||
ui.setupUi(this);
|
||||
connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder()));
|
||||
}
|
||||
|
||||
void InstallZipWindow::setProxy(QUrl proxy_url)
|
||||
{
|
||||
proxy = proxy_url;
|
||||
qDebug() << "Install::setProxy" << proxy;
|
||||
}
|
||||
|
||||
void InstallZipWindow::setMountPoint(QString mount)
|
||||
{
|
||||
QFileInfo m(mount);
|
||||
if(m.isDir()) {
|
||||
ui.lineMountPoint->clear();
|
||||
ui.lineMountPoint->insert(mount);
|
||||
}
|
||||
}
|
||||
|
||||
void InstallZipWindow::setUrl(QString path)
|
||||
{
|
||||
url = path;
|
||||
}
|
||||
|
||||
void InstallZipWindow::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 InstallZipWindow::accept()
|
||||
{
|
||||
downloadProgress = new QDialog(this);
|
||||
dp.setupUi(downloadProgress);
|
||||
|
||||
// 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 {
|
||||
dp.listProgress->addItem(tr("Mount point is wrong!"));
|
||||
dp.buttonAbort->setText(tr("&Ok"));
|
||||
downloadProgress->show();
|
||||
return;
|
||||
}
|
||||
|
||||
userSettings->sync();
|
||||
|
||||
installer = new ZipInstaller(this);
|
||||
|
||||
QString fileName = url.section('/', -1);
|
||||
|
||||
installer->setFilename(fileName);
|
||||
installer->setUrl(url);
|
||||
installer->setProxy(proxy);
|
||||
installer->setLogSection(logsection);
|
||||
installer->setMountPoint(mountPoint);
|
||||
installer->install(&dp);
|
||||
|
||||
connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool)));
|
||||
|
||||
downloadProgress->show();
|
||||
|
||||
}
|
||||
|
||||
|
||||
void InstallZipWindow::done(bool error)
|
||||
{
|
||||
qDebug() << "Install::done, error:" << error;
|
||||
|
||||
if(error)
|
||||
{
|
||||
// connect close button now as it's needed if we break upon an error
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close()));
|
||||
return;
|
||||
}
|
||||
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close()));
|
||||
connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close()));
|
||||
}
|
||||
|
||||
void InstallZipWindow::setDeviceSettings(QSettings *dev)
|
||||
{
|
||||
devices = dev;
|
||||
qDebug() << "Install::setDeviceSettings:" << devices;
|
||||
}
|
||||
|
||||
void InstallZipWindow::setUserSettings(QSettings *user)
|
||||
{
|
||||
userSettings = user;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,68 +1,68 @@
|
|||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
*
|
||||
* Copyright (C) 2007 by Dominik Wenger
|
||||
* $Id: installzipwindow.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 INSTALLZIPWINDOW_H
|
||||
#define INSTALLZIPWINDOW_H
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
#include "ui_installzipfrm.h"
|
||||
#include "ui_installprogressfrm.h"
|
||||
#include "installzip.h"
|
||||
|
||||
|
||||
class InstallZipWindow : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
InstallZipWindow(QWidget *parent = 0);
|
||||
void setProxy(QUrl);
|
||||
void setMountPoint(QString);
|
||||
void setUrl(QString);
|
||||
void setLogSection(QString name){logsection = name; }
|
||||
void setUserSettings(QSettings*);
|
||||
void setDeviceSettings(QSettings*);
|
||||
|
||||
public slots:
|
||||
void accept(void);
|
||||
|
||||
private:
|
||||
Ui::InstallZipFrm ui;
|
||||
Ui::InstallProgressFrm dp;
|
||||
QUrl proxy;
|
||||
QSettings *devices;
|
||||
QSettings *userSettings;
|
||||
QDialog *downloadProgress;
|
||||
QString file;
|
||||
QString fileName;
|
||||
QString mountPoint;
|
||||
QString url;
|
||||
QString logsection;
|
||||
ZipInstaller* installer;
|
||||
|
||||
private slots:
|
||||
void browseFolder(void);
|
||||
void done(bool);
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
*
|
||||
* Copyright (C) 2007 by Dominik Wenger
|
||||
* $Id: installzipwindow.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 INSTALLZIPWINDOW_H
|
||||
#define INSTALLZIPWINDOW_H
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
#include "ui_installzipfrm.h"
|
||||
#include "ui_installprogressfrm.h"
|
||||
#include "installzip.h"
|
||||
|
||||
|
||||
class InstallZipWindow : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
InstallZipWindow(QWidget *parent = 0);
|
||||
void setProxy(QUrl);
|
||||
void setMountPoint(QString);
|
||||
void setUrl(QString);
|
||||
void setLogSection(QString name){logsection = name; }
|
||||
void setUserSettings(QSettings*);
|
||||
void setDeviceSettings(QSettings*);
|
||||
|
||||
public slots:
|
||||
void accept(void);
|
||||
|
||||
private:
|
||||
Ui::InstallZipFrm ui;
|
||||
Ui::InstallProgressFrm dp;
|
||||
QUrl proxy;
|
||||
QSettings *devices;
|
||||
QSettings *userSettings;
|
||||
QDialog *downloadProgress;
|
||||
QString file;
|
||||
QString fileName;
|
||||
QString mountPoint;
|
||||
QString url;
|
||||
QString logsection;
|
||||
ZipInstaller* installer;
|
||||
|
||||
private slots:
|
||||
void browseFolder(void);
|
||||
void done(bool);
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue