diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-07-29 17:55:46 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-07-29 17:55:46 +0000 |
commit | c414f46971521b8f431db369cd6d4ccd74334f2c (patch) | |
tree | 710da396ae2818ab99bb2785a7c1ee50ac4049b4 | |
parent | 57fbb39ce2b3e98ceb4c5ef627e49283ef3f7c06 (diff) | |
download | rockbox-c414f46971521b8f431db369cd6d4ccd74334f2c.tar.gz rockbox-c414f46971521b8f431db369cd6d4ccd74334f2c.zip |
small simplification, whitespace cleanup and dos2unix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14059 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/install.cpp | 16 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbl.cpp | 352 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzipwindow.cpp | 256 | ||||
-rw-r--r-- | rbutil/rbutilqt/installzipwindow.h | 136 |
4 files changed, 379 insertions, 381 deletions
diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 2272b4e865..f75765adc1 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp | |||
@@ -73,10 +73,8 @@ void Install::setProxy(QUrl proxy_url) | |||
73 | void Install::setMountPoint(QString mount) | 73 | void Install::setMountPoint(QString mount) |
74 | { | 74 | { |
75 | QFileInfo m(mount); | 75 | QFileInfo m(mount); |
76 | if(m.isDir()) { | 76 | if(m.isDir()) |
77 | ui.lineMountPoint->clear(); | 77 | ui.lineMountPoint->setText(mount); |
78 | ui.lineMountPoint->insert(mount); | ||
79 | } | ||
80 | } | 78 | } |
81 | 79 | ||
82 | 80 | ||
@@ -150,9 +148,9 @@ void Install::accept() | |||
150 | installer->setLogSection("rockboxbase"); | 148 | installer->setLogSection("rockboxbase"); |
151 | installer->setMountPoint(mountPoint); | 149 | installer->setMountPoint(mountPoint); |
152 | installer->install(&dp); | 150 | installer->install(&dp); |
153 | 151 | ||
154 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 152 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
155 | 153 | ||
156 | downloadProgress->show(); | 154 | downloadProgress->show(); |
157 | } | 155 | } |
158 | 156 | ||
@@ -166,9 +164,9 @@ void Install::done(bool error) | |||
166 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); | 164 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); |
167 | return; | 165 | return; |
168 | } | 166 | } |
169 | 167 | ||
170 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); | 168 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); |
171 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); | 169 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); |
172 | 170 | ||
173 | } | 171 | } |
174 | 172 | ||
diff --git a/rbutil/rbutilqt/installbl.cpp b/rbutil/rbutilqt/installbl.cpp index c5f9d9fe86..b36909b8f6 100644 --- a/rbutil/rbutilqt/installbl.cpp +++ b/rbutil/rbutilqt/installbl.cpp | |||
@@ -1,176 +1,176 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * | 8 | * |
9 | * Copyright (C) 2007 by Dominik Wenger | 9 | * Copyright (C) 2007 by Dominik Wenger |
10 | * $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $ | 10 | * $Id: installbl.cpp 14027 2007-07-27 17:42:49Z domonoky $ |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
14 | * | 14 | * |
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installbl.h" | 20 | #include "installbl.h" |
21 | #include "ui_installprogressfrm.h" | 21 | #include "ui_installprogressfrm.h" |
22 | 22 | ||
23 | 23 | ||
24 | InstallBl::InstallBl(QWidget *parent) : QDialog(parent) | 24 | InstallBl::InstallBl(QWidget *parent) : QDialog(parent) |
25 | { | 25 | { |
26 | ui.setupUi(this); | 26 | ui.setupUi(this); |
27 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); | 27 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); |
28 | connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF())); | 28 | connect(ui.buttonBrowseOF, SIGNAL(clicked()), this, SLOT(browseOF())); |
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | void InstallBl::setProxy(QUrl proxy_url) | 32 | void InstallBl::setProxy(QUrl proxy_url) |
33 | { | 33 | { |
34 | proxy = proxy_url; | 34 | proxy = proxy_url; |
35 | qDebug() << "Install::setProxy" << proxy; | 35 | qDebug() << "Install::setProxy" << proxy; |
36 | } | 36 | } |
37 | 37 | ||
38 | void InstallBl::setMountPoint(QString mount) | 38 | void InstallBl::setMountPoint(QString mount) |
39 | { | 39 | { |
40 | QFileInfo m(mount); | 40 | QFileInfo m(mount); |
41 | if(m.isDir()) { | 41 | if(m.isDir()) { |
42 | ui.lineMountPoint->clear(); | 42 | ui.lineMountPoint->clear(); |
43 | ui.lineMountPoint->insert(mount); | 43 | ui.lineMountPoint->insert(mount); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | void InstallBl::setOFPath(QString path) | 47 | void InstallBl::setOFPath(QString path) |
48 | { | 48 | { |
49 | QFileInfo m(path); | 49 | QFileInfo m(path); |
50 | if(m.exists()) { | 50 | if(m.exists()) { |
51 | ui.lineOriginalFirmware->clear(); | 51 | ui.lineOriginalFirmware->clear(); |
52 | ui.lineOriginalFirmware->insert(path); | 52 | ui.lineOriginalFirmware->insert(path); |
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | void InstallBl::browseFolder() | 56 | void InstallBl::browseFolder() |
57 | { | 57 | { |
58 | QFileDialog browser(this); | 58 | QFileDialog browser(this); |
59 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) | 59 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) |
60 | browser.setDirectory(ui.lineMountPoint->text()); | 60 | browser.setDirectory(ui.lineMountPoint->text()); |
61 | else | 61 | else |
62 | browser.setDirectory("/media"); | 62 | browser.setDirectory("/media"); |
63 | browser.setReadOnly(true); | 63 | browser.setReadOnly(true); |
64 | browser.setFileMode(QFileDialog::DirectoryOnly); | 64 | browser.setFileMode(QFileDialog::DirectoryOnly); |
65 | browser.setAcceptMode(QFileDialog::AcceptOpen); | 65 | browser.setAcceptMode(QFileDialog::AcceptOpen); |
66 | if(browser.exec()) { | 66 | if(browser.exec()) { |
67 | qDebug() << browser.directory(); | 67 | qDebug() << browser.directory(); |
68 | QStringList files = browser.selectedFiles(); | 68 | QStringList files = browser.selectedFiles(); |
69 | setMountPoint(files.at(0)); | 69 | setMountPoint(files.at(0)); |
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
73 | void InstallBl::browseOF() | 73 | void InstallBl::browseOF() |
74 | { | 74 | { |
75 | QFileDialog browser(this); | 75 | QFileDialog browser(this); |
76 | if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) | 76 | if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) |
77 | browser.setDirectory(ui.lineOriginalFirmware->text()); | 77 | browser.setDirectory(ui.lineOriginalFirmware->text()); |
78 | else | 78 | else |
79 | browser.setDirectory("/media"); | 79 | browser.setDirectory("/media"); |
80 | browser.setReadOnly(true); | 80 | browser.setReadOnly(true); |
81 | browser.setAcceptMode(QFileDialog::AcceptOpen); | 81 | browser.setAcceptMode(QFileDialog::AcceptOpen); |
82 | if(browser.exec()) { | 82 | if(browser.exec()) { |
83 | qDebug() << browser.directory(); | 83 | qDebug() << browser.directory(); |
84 | QStringList files = browser.selectedFiles(); | 84 | QStringList files = browser.selectedFiles(); |
85 | setOFPath(files.at(0)); | 85 | setOFPath(files.at(0)); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | void InstallBl::accept() | 89 | void InstallBl::accept() |
90 | { | 90 | { |
91 | downloadProgress = new QDialog(this); | 91 | downloadProgress = new QDialog(this); |
92 | dp.setupUi(downloadProgress); | 92 | dp.setupUi(downloadProgress); |
93 | // show dialog with error if mount point is wrong | 93 | // show dialog with error if mount point is wrong |
94 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) { | 94 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) { |
95 | mountPoint = ui.lineMountPoint->text(); | 95 | mountPoint = ui.lineMountPoint->text(); |
96 | userSettings->setValue("defaults/mountpoint", mountPoint); | 96 | userSettings->setValue("defaults/mountpoint", mountPoint); |
97 | } | 97 | } |
98 | else { | 98 | else { |
99 | dp.listProgress->addItem(tr("Mount point is wrong!")); | 99 | dp.listProgress->addItem(tr("Mount point is wrong!")); |
100 | dp.buttonAbort->setText(tr("&Ok")); | 100 | dp.buttonAbort->setText(tr("&Ok")); |
101 | downloadProgress->show(); | 101 | downloadProgress->show(); |
102 | return; | 102 | return; |
103 | } | 103 | } |
104 | 104 | ||
105 | if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) | 105 | if(QFileInfo(ui.lineOriginalFirmware->text()).exists()) |
106 | { | 106 | { |
107 | m_OrigFirmware = ui.lineOriginalFirmware->text(); | 107 | m_OrigFirmware = ui.lineOriginalFirmware->text(); |
108 | } | 108 | } |
109 | else | 109 | else |
110 | { | 110 | { |
111 | dp.listProgress->addItem(tr("Original Firmware Path is wrong!")); | 111 | dp.listProgress->addItem(tr("Original Firmware Path is wrong!")); |
112 | dp.buttonAbort->setText(tr("&Ok")); | 112 | dp.buttonAbort->setText(tr("&Ok")); |
113 | downloadProgress->show(); | 113 | downloadProgress->show(); |
114 | return; | 114 | return; |
115 | } | 115 | } |
116 | userSettings->sync(); | 116 | userSettings->sync(); |
117 | 117 | ||
118 | binstaller = new BootloaderInstaller(this); | 118 | binstaller = new BootloaderInstaller(this); |
119 | 119 | ||
120 | binstaller->setMountPoint(mountPoint); | 120 | binstaller->setMountPoint(mountPoint); |
121 | binstaller->setProxy(proxy); | 121 | binstaller->setProxy(proxy); |
122 | QString plattform = userSettings->value("defaults/platform").toString(); | 122 | QString plattform = userSettings->value("defaults/platform").toString(); |
123 | 123 | ||
124 | binstaller->setDevice(plattform); | 124 | binstaller->setDevice(plattform); |
125 | binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString()); | 125 | binstaller->setBootloaderMethod(devices->value(plattform + "/bootloadermethod").toString()); |
126 | binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString()); | 126 | binstaller->setBootloaderName(devices->value(plattform + "/bootloadername").toString()); |
127 | binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString()); | 127 | binstaller->setBootloaderBaseUrl(devices->value("bootloader_url").toString()); |
128 | binstaller->setOrigFirmwarePath(m_OrigFirmware); | 128 | binstaller->setOrigFirmwarePath(m_OrigFirmware); |
129 | 129 | ||
130 | binstaller->install(&dp); | 130 | binstaller->install(&dp); |
131 | 131 | ||
132 | connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool))); | 132 | connect(binstaller, SIGNAL(done(bool)), this, SLOT(done(bool))); |
133 | 133 | ||
134 | downloadProgress->show(); | 134 | downloadProgress->show(); |
135 | } | 135 | } |
136 | 136 | ||
137 | 137 | ||
138 | void InstallBl::done(bool error) | 138 | void InstallBl::done(bool error) |
139 | { | 139 | { |
140 | qDebug() << "Install::done, error:" << error; | 140 | qDebug() << "Install::done, error:" << error; |
141 | 141 | ||
142 | if(error) | 142 | if(error) |
143 | { | 143 | { |
144 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); | 144 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); |
145 | return; | 145 | return; |
146 | } | 146 | } |
147 | 147 | ||
148 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); | 148 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); |
149 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); | 149 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); |
150 | } | 150 | } |
151 | 151 | ||
152 | void InstallBl::setDeviceSettings(QSettings *dev) | 152 | void InstallBl::setDeviceSettings(QSettings *dev) |
153 | { | 153 | { |
154 | devices = dev; | 154 | devices = dev; |
155 | 155 | ||
156 | if(userSettings->value("defaults/platform").toString() == "h100" || | 156 | if(userSettings->value("defaults/platform").toString() == "h100" || |
157 | userSettings->value("defaults/platform").toString() == "h120" || | 157 | userSettings->value("defaults/platform").toString() == "h120" || |
158 | userSettings->value("defaults/platform").toString() == "h300") | 158 | userSettings->value("defaults/platform").toString() == "h300") |
159 | { | 159 | { |
160 | ui.buttonBrowseOF->show(); | 160 | ui.buttonBrowseOF->show(); |
161 | ui.lineOriginalFirmware->show(); | 161 | ui.lineOriginalFirmware->show(); |
162 | ui.label_3->show(); | 162 | ui.label_3->show(); |
163 | } | 163 | } |
164 | else | 164 | else |
165 | { | 165 | { |
166 | ui.buttonBrowseOF->hide(); | 166 | ui.buttonBrowseOF->hide(); |
167 | ui.lineOriginalFirmware->hide(); | 167 | ui.lineOriginalFirmware->hide(); |
168 | ui.label_3->hide(); | 168 | ui.label_3->hide(); |
169 | } | 169 | } |
170 | qDebug() << "Install::setDeviceSettings:" << devices; | 170 | qDebug() << "Install::setDeviceSettings:" << devices; |
171 | } | 171 | } |
172 | 172 | ||
173 | void InstallBl::setUserSettings(QSettings *user) | 173 | void InstallBl::setUserSettings(QSettings *user) |
174 | { | 174 | { |
175 | userSettings = user; | 175 | userSettings = user; |
176 | } | 176 | } |
diff --git a/rbutil/rbutilqt/installzipwindow.cpp b/rbutil/rbutilqt/installzipwindow.cpp index 00a6a2b1ed..551d1144c7 100644 --- a/rbutil/rbutilqt/installzipwindow.cpp +++ b/rbutil/rbutilqt/installzipwindow.cpp | |||
@@ -1,128 +1,128 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * | 8 | * |
9 | * Copyright (C) 2007 by Dominik Wenger | 9 | * Copyright (C) 2007 by Dominik Wenger |
10 | * $Id: installzipwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $ | 10 | * $Id: installzipwindow.cpp 14027 2007-07-27 17:42:49Z domonoky $ |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
14 | * | 14 | * |
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installzipwindow.h" | 20 | #include "installzipwindow.h" |
21 | #include "ui_installprogressfrm.h" | 21 | #include "ui_installprogressfrm.h" |
22 | 22 | ||
23 | 23 | ||
24 | InstallZipWindow::InstallZipWindow(QWidget *parent) : QDialog(parent) | 24 | InstallZipWindow::InstallZipWindow(QWidget *parent) : QDialog(parent) |
25 | { | 25 | { |
26 | ui.setupUi(this); | 26 | ui.setupUi(this); |
27 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); | 27 | connect(ui.buttonBrowse, SIGNAL(clicked()), this, SLOT(browseFolder())); |
28 | } | 28 | } |
29 | 29 | ||
30 | void InstallZipWindow::setProxy(QUrl proxy_url) | 30 | void InstallZipWindow::setProxy(QUrl proxy_url) |
31 | { | 31 | { |
32 | proxy = proxy_url; | 32 | proxy = proxy_url; |
33 | qDebug() << "Install::setProxy" << proxy; | 33 | qDebug() << "Install::setProxy" << proxy; |
34 | } | 34 | } |
35 | 35 | ||
36 | void InstallZipWindow::setMountPoint(QString mount) | 36 | void InstallZipWindow::setMountPoint(QString mount) |
37 | { | 37 | { |
38 | QFileInfo m(mount); | 38 | QFileInfo m(mount); |
39 | if(m.isDir()) { | 39 | if(m.isDir()) { |
40 | ui.lineMountPoint->clear(); | 40 | ui.lineMountPoint->clear(); |
41 | ui.lineMountPoint->insert(mount); | 41 | ui.lineMountPoint->insert(mount); |
42 | } | 42 | } |
43 | } | 43 | } |
44 | 44 | ||
45 | void InstallZipWindow::setUrl(QString path) | 45 | void InstallZipWindow::setUrl(QString path) |
46 | { | 46 | { |
47 | url = path; | 47 | url = path; |
48 | } | 48 | } |
49 | 49 | ||
50 | void InstallZipWindow::browseFolder() | 50 | void InstallZipWindow::browseFolder() |
51 | { | 51 | { |
52 | QFileDialog browser(this); | 52 | QFileDialog browser(this); |
53 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) | 53 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) |
54 | browser.setDirectory(ui.lineMountPoint->text()); | 54 | browser.setDirectory(ui.lineMountPoint->text()); |
55 | else | 55 | else |
56 | browser.setDirectory("/media"); | 56 | browser.setDirectory("/media"); |
57 | browser.setReadOnly(true); | 57 | browser.setReadOnly(true); |
58 | browser.setFileMode(QFileDialog::DirectoryOnly); | 58 | browser.setFileMode(QFileDialog::DirectoryOnly); |
59 | browser.setAcceptMode(QFileDialog::AcceptOpen); | 59 | browser.setAcceptMode(QFileDialog::AcceptOpen); |
60 | if(browser.exec()) { | 60 | if(browser.exec()) { |
61 | qDebug() << browser.directory(); | 61 | qDebug() << browser.directory(); |
62 | QStringList files = browser.selectedFiles(); | 62 | QStringList files = browser.selectedFiles(); |
63 | setMountPoint(files.at(0)); | 63 | setMountPoint(files.at(0)); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
67 | void InstallZipWindow::accept() | 67 | void InstallZipWindow::accept() |
68 | { | 68 | { |
69 | downloadProgress = new QDialog(this); | 69 | downloadProgress = new QDialog(this); |
70 | dp.setupUi(downloadProgress); | 70 | dp.setupUi(downloadProgress); |
71 | 71 | ||
72 | // show dialog with error if mount point is wrong | 72 | // show dialog with error if mount point is wrong |
73 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) { | 73 | if(QFileInfo(ui.lineMountPoint->text()).isDir()) { |
74 | mountPoint = ui.lineMountPoint->text(); | 74 | mountPoint = ui.lineMountPoint->text(); |
75 | userSettings->setValue("defaults/mountpoint", mountPoint); | 75 | userSettings->setValue("defaults/mountpoint", mountPoint); |
76 | } | 76 | } |
77 | else { | 77 | else { |
78 | dp.listProgress->addItem(tr("Mount point is wrong!")); | 78 | dp.listProgress->addItem(tr("Mount point is wrong!")); |
79 | dp.buttonAbort->setText(tr("&Ok")); | 79 | dp.buttonAbort->setText(tr("&Ok")); |
80 | downloadProgress->show(); | 80 | downloadProgress->show(); |
81 | return; | 81 | return; |
82 | } | 82 | } |
83 | 83 | ||
84 | userSettings->sync(); | 84 | userSettings->sync(); |
85 | 85 | ||
86 | installer = new ZipInstaller(this); | 86 | installer = new ZipInstaller(this); |
87 | 87 | ||
88 | QString fileName = url.section('/', -1); | 88 | QString fileName = url.section('/', -1); |
89 | 89 | ||
90 | installer->setFilename(fileName); | 90 | installer->setFilename(fileName); |
91 | installer->setUrl(url); | 91 | installer->setUrl(url); |
92 | installer->setProxy(proxy); | 92 | installer->setProxy(proxy); |
93 | installer->setLogSection(logsection); | 93 | installer->setLogSection(logsection); |
94 | installer->setMountPoint(mountPoint); | 94 | installer->setMountPoint(mountPoint); |
95 | installer->install(&dp); | 95 | installer->install(&dp); |
96 | 96 | ||
97 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); | 97 | connect(installer, SIGNAL(done(bool)), this, SLOT(done(bool))); |
98 | 98 | ||
99 | downloadProgress->show(); | 99 | downloadProgress->show(); |
100 | 100 | ||
101 | } | 101 | } |
102 | 102 | ||
103 | 103 | ||
104 | void InstallZipWindow::done(bool error) | 104 | void InstallZipWindow::done(bool error) |
105 | { | 105 | { |
106 | qDebug() << "Install::done, error:" << error; | 106 | qDebug() << "Install::done, error:" << error; |
107 | 107 | ||
108 | if(error) | 108 | if(error) |
109 | { | 109 | { |
110 | // connect close button now as it's needed if we break upon an error | 110 | // connect close button now as it's needed if we break upon an error |
111 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); | 111 | connect(dp.buttonAbort, SIGNAL(clicked()), downloadProgress, SLOT(close())); |
112 | return; | 112 | return; |
113 | } | 113 | } |
114 | 114 | ||
115 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); | 115 | connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(close())); |
116 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); | 116 | connect(dp.buttonAbort, SIGNAL(clicked()),downloadProgress, SLOT(close())); |
117 | } | 117 | } |
118 | 118 | ||
119 | void InstallZipWindow::setDeviceSettings(QSettings *dev) | 119 | void InstallZipWindow::setDeviceSettings(QSettings *dev) |
120 | { | 120 | { |
121 | devices = dev; | 121 | devices = dev; |
122 | qDebug() << "Install::setDeviceSettings:" << devices; | 122 | qDebug() << "Install::setDeviceSettings:" << devices; |
123 | } | 123 | } |
124 | 124 | ||
125 | void InstallZipWindow::setUserSettings(QSettings *user) | 125 | void InstallZipWindow::setUserSettings(QSettings *user) |
126 | { | 126 | { |
127 | userSettings = user; | 127 | userSettings = user; |
128 | } | 128 | } |
diff --git a/rbutil/rbutilqt/installzipwindow.h b/rbutil/rbutilqt/installzipwindow.h index 733d40fdc8..7208ff9ffb 100644 --- a/rbutil/rbutilqt/installzipwindow.h +++ b/rbutil/rbutilqt/installzipwindow.h | |||
@@ -1,68 +1,68 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * __________ __ ___. | 2 | * __________ __ ___. |
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | 3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ |
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | 4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / |
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * | 8 | * |
9 | * Copyright (C) 2007 by Dominik Wenger | 9 | * Copyright (C) 2007 by Dominik Wenger |
10 | * $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $ | 10 | * $Id: installzipwindow.h 14027 2007-07-27 17:42:49Z domonoky $ |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
14 | * | 14 | * |
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #ifndef INSTALLZIPWINDOW_H | 20 | #ifndef INSTALLZIPWINDOW_H |
21 | #define INSTALLZIPWINDOW_H | 21 | #define INSTALLZIPWINDOW_H |
22 | 22 | ||
23 | #include <QtGui> | 23 | #include <QtGui> |
24 | 24 | ||
25 | #include <QSettings> | 25 | #include <QSettings> |
26 | 26 | ||
27 | #include "ui_installzipfrm.h" | 27 | #include "ui_installzipfrm.h" |
28 | #include "ui_installprogressfrm.h" | 28 | #include "ui_installprogressfrm.h" |
29 | #include "installzip.h" | 29 | #include "installzip.h" |
30 | 30 | ||
31 | 31 | ||
32 | class InstallZipWindow : public QDialog | 32 | class InstallZipWindow : public QDialog |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
36 | InstallZipWindow(QWidget *parent = 0); | 36 | InstallZipWindow(QWidget *parent = 0); |
37 | void setProxy(QUrl); | 37 | void setProxy(QUrl); |
38 | void setMountPoint(QString); | 38 | void setMountPoint(QString); |
39 | void setUrl(QString); | 39 | void setUrl(QString); |
40 | void setLogSection(QString name){logsection = name; } | 40 | void setLogSection(QString name){logsection = name; } |
41 | void setUserSettings(QSettings*); | 41 | void setUserSettings(QSettings*); |
42 | void setDeviceSettings(QSettings*); | 42 | void setDeviceSettings(QSettings*); |
43 | 43 | ||
44 | public slots: | 44 | public slots: |
45 | void accept(void); | 45 | void accept(void); |
46 | 46 | ||
47 | private: | 47 | private: |
48 | Ui::InstallZipFrm ui; | 48 | Ui::InstallZipFrm ui; |
49 | Ui::InstallProgressFrm dp; | 49 | Ui::InstallProgressFrm dp; |
50 | QUrl proxy; | 50 | QUrl proxy; |
51 | QSettings *devices; | 51 | QSettings *devices; |
52 | QSettings *userSettings; | 52 | QSettings *userSettings; |
53 | QDialog *downloadProgress; | 53 | QDialog *downloadProgress; |
54 | QString file; | 54 | QString file; |
55 | QString fileName; | 55 | QString fileName; |
56 | QString mountPoint; | 56 | QString mountPoint; |
57 | QString url; | 57 | QString url; |
58 | QString logsection; | 58 | QString logsection; |
59 | ZipInstaller* installer; | 59 | ZipInstaller* installer; |
60 | 60 | ||
61 | private slots: | 61 | private slots: |
62 | void browseFolder(void); | 62 | void browseFolder(void); |
63 | void done(bool); | 63 | void done(bool); |
64 | 64 | ||
65 | }; | 65 | }; |
66 | 66 | ||
67 | 67 | ||
68 | #endif | 68 | #endif |