diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2007-08-09 16:44:27 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2007-08-09 16:44:27 +0000 |
commit | 36b150e5dc62a4c46aa8fd34a1c9ce828ae2bd28 (patch) | |
tree | 85f751ad394046059f5c78c26adf99c44db1bd88 /rbutil/rbutilqt | |
parent | c3bf746f832eac87301d0d692e1f415cbf6fc079 (diff) | |
download | rockbox-36b150e5dc62a4c46aa8fd34a1c9ce828ae2bd28.tar.gz rockbox-36b150e5dc62a4c46aa8fd34a1c9ce828ae2bd28.zip |
rbutilQt: renamed installbl to installbootloaderwindow.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14259 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r-- | rbutil/rbutilqt/installbootloaderwindow.cpp (renamed from rbutil/rbutilqt/installbl.cpp) | 24 | ||||
-rw-r--r-- | rbutil/rbutilqt/installbootloaderwindow.h (renamed from rbutil/rbutilqt/installbl.h) | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/rbutil/rbutilqt/installbl.cpp b/rbutil/rbutilqt/installbootloaderwindow.cpp index 9d9dba4760..95084e87f7 100644 --- a/rbutil/rbutilqt/installbl.cpp +++ b/rbutil/rbutilqt/installbootloaderwindow.cpp | |||
@@ -7,7 +7,7 @@ | |||
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: installbootloaderwindow.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. |
@@ -17,11 +17,11 @@ | |||
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "installbl.h" | 20 | #include "installbootloaderwindow.h" |
21 | #include "ui_installprogressfrm.h" | 21 | #include "ui_installprogressfrm.h" |
22 | 22 | ||
23 | 23 | ||
24 | InstallBl::InstallBl(QWidget *parent) : QDialog(parent) | 24 | InstallBootloaderWindow::InstallBootloaderWindow(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())); |
@@ -29,13 +29,13 @@ InstallBl::InstallBl(QWidget *parent) : QDialog(parent) | |||
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | void InstallBl::setProxy(QUrl proxy_url) | 32 | void InstallBootloaderWindow::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 InstallBootloaderWindow::setMountPoint(QString mount) |
39 | { | 39 | { |
40 | QFileInfo m(mount); | 40 | QFileInfo m(mount); |
41 | if(m.isDir()) { | 41 | if(m.isDir()) { |
@@ -44,7 +44,7 @@ void InstallBl::setMountPoint(QString mount) | |||
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | void InstallBl::setOFPath(QString path) | 47 | void InstallBootloaderWindow::setOFPath(QString path) |
48 | { | 48 | { |
49 | QFileInfo m(path); | 49 | QFileInfo m(path); |
50 | if(m.exists()) { | 50 | if(m.exists()) { |
@@ -53,7 +53,7 @@ void InstallBl::setOFPath(QString path) | |||
53 | } | 53 | } |
54 | } | 54 | } |
55 | 55 | ||
56 | void InstallBl::browseFolder() | 56 | void InstallBootloaderWindow::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()) |
@@ -70,7 +70,7 @@ void InstallBl::browseFolder() | |||
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
73 | void InstallBl::browseOF() | 73 | void InstallBootloaderWindow::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()) |
@@ -86,7 +86,7 @@ void InstallBl::browseOF() | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | void InstallBl::accept() | 89 | void InstallBootloaderWindow::accept() |
90 | { | 90 | { |
91 | // create logger | 91 | // create logger |
92 | logger = new ProgressLoggerGui(this); | 92 | logger = new ProgressLoggerGui(this); |
@@ -134,7 +134,7 @@ void InstallBl::accept() | |||
134 | } | 134 | } |
135 | 135 | ||
136 | 136 | ||
137 | void InstallBl::done(bool error) | 137 | void InstallBootloaderWindow::done(bool error) |
138 | { | 138 | { |
139 | qDebug() << "Install::done, error:" << error; | 139 | qDebug() << "Install::done, error:" << error; |
140 | 140 | ||
@@ -149,13 +149,13 @@ void InstallBl::done(bool error) | |||
149 | 149 | ||
150 | } | 150 | } |
151 | 151 | ||
152 | void InstallBl::setDeviceSettings(QSettings *dev) | 152 | void InstallBootloaderWindow::setDeviceSettings(QSettings *dev) |
153 | { | 153 | { |
154 | devices = dev; | 154 | devices = dev; |
155 | qDebug() << "Install::setDeviceSettings:" << devices; | 155 | qDebug() << "Install::setDeviceSettings:" << devices; |
156 | } | 156 | } |
157 | 157 | ||
158 | void InstallBl::setUserSettings(QSettings *user) | 158 | void InstallBootloaderWindow::setUserSettings(QSettings *user) |
159 | { | 159 | { |
160 | userSettings = user; | 160 | userSettings = user; |
161 | if(userSettings->value("defaults/platform").toString() == "h100" || | 161 | if(userSettings->value("defaults/platform").toString() == "h100" || |
diff --git a/rbutil/rbutilqt/installbl.h b/rbutil/rbutilqt/installbootloaderwindow.h index 09e3492e43..6baafd0bf1 100644 --- a/rbutil/rbutilqt/installbl.h +++ b/rbutil/rbutilqt/installbootloaderwindow.h | |||
@@ -7,7 +7,7 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * | 8 | * |
9 | * Copyright (C) 2007 by Dominik Wenger | 9 | * Copyright (C) 2007 by Dominik Wenger |
10 | * $Id: installbl.h 14027 2007-07-27 17:42:49Z domonoky $ | 10 | * $Id: installbootloaderwindow.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. |
@@ -30,11 +30,11 @@ | |||
30 | #include "installbootloader.h" | 30 | #include "installbootloader.h" |
31 | #include "irivertools/irivertools.h" | 31 | #include "irivertools/irivertools.h" |
32 | 32 | ||
33 | class InstallBl : public QDialog | 33 | class InstallBootloaderWindow : public QDialog |
34 | { | 34 | { |
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | public: | 36 | public: |
37 | InstallBl(QWidget *parent = 0); | 37 | InstallBootloaderWindow(QWidget *parent = 0); |
38 | void setProxy(QUrl); | 38 | void setProxy(QUrl); |
39 | void setMountPoint(QString); | 39 | void setMountPoint(QString); |
40 | void setOFPath(QString); | 40 | void setOFPath(QString); |
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 @@ | |||
25 | #include "ui_aboutbox.h" | 25 | #include "ui_aboutbox.h" |
26 | #include "configure.h" | 26 | #include "configure.h" |
27 | #include "install.h" | 27 | #include "install.h" |
28 | #include "installbl.h" | 28 | #include "installbootloaderwindow.h" |
29 | #include "installtalkwindow.h" | 29 | #include "installtalkwindow.h" |
30 | #include "httpget.h" | 30 | #include "httpget.h" |
31 | #include "installbootloader.h" | 31 | #include "installbootloader.h" |
@@ -279,7 +279,7 @@ void RbUtilQt::install() | |||
279 | 279 | ||
280 | void RbUtilQt::installBl() | 280 | void RbUtilQt::installBl() |
281 | { | 281 | { |
282 | InstallBl *installWindow = new InstallBl(this); | 282 | InstallBootloaderWindow *installWindow = new InstallBootloaderWindow(this); |
283 | installWindow->setUserSettings(userSettings); | 283 | installWindow->setUserSettings(userSettings); |
284 | installWindow->setDeviceSettings(devices); | 284 | installWindow->setDeviceSettings(devices); |
285 | if(userSettings->value("defaults/proxytype") == "manual") | 285 | 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 \ | |||
21 | zip/unzip.cpp \ | 21 | zip/unzip.cpp \ |
22 | installzip.cpp \ | 22 | installzip.cpp \ |
23 | installbootloader.cpp \ | 23 | installbootloader.cpp \ |
24 | installbl.cpp \ | 24 | installbootloaderwindow.cpp \ |
25 | progressloggergui.cpp \ | 25 | progressloggergui.cpp \ |
26 | installtalkwindow.cpp \ | 26 | installtalkwindow.cpp \ |
27 | talkfile.cpp \ | 27 | talkfile.cpp \ |
@@ -45,7 +45,7 @@ HEADERS += rbutilqt.h \ | |||
45 | version.h \ | 45 | version.h \ |
46 | installzip.h \ | 46 | installzip.h \ |
47 | installbootloader.h \ | 47 | installbootloader.h \ |
48 | installbl.h \ | 48 | installbootloaderwindow.h \ |
49 | installtalkwindow.h \ | 49 | installtalkwindow.h \ |
50 | talkfile.h \ | 50 | talkfile.h \ |
51 | autodetection.h \ | 51 | autodetection.h \ |