summaryrefslogtreecommitdiff
path: root/rbutil
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2010-01-10 17:13:32 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2010-01-10 17:13:32 +0000
commit294b017cd1beb8b13a691982515e894eb4e2bf1c (patch)
tree459c1a4996deb02da208200ee9c9872df5fa973f /rbutil
parentf5f6af2fee945f3b25bacd2ae5596a4cf2fb2b51 (diff)
downloadrockbox-294b017cd1beb8b13a691982515e894eb4e2bf1c.tar.gz
rockbox-294b017cd1beb8b13a691982515e894eb4e2bf1c.zip
Revert r24174 following the discussion on mailing-list
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24213 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallbase.cpp4
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallipod.cpp2
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallsansa.cpp2
-rw-r--r--rbutil/rbutilqt/base/voicefile.cpp4
-rw-r--r--rbutil/rbutilqt/base/zipinstaller.cpp10
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp6
7 files changed, 15 insertions, 15 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
index f812062713..8672e29a4f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallbase.cpp
@@ -84,9 +84,9 @@ void BootloaderInstallBase::downloadBlFinish(bool error)
84 return; 84 return;
85 } 85 }
86 else if(m_http.isCached()) 86 else if(m_http.isCached())
87 emit logItem(tr("Download finished (cache used)"), LOGOK); 87 emit logItem(tr("Download finished (cache used)."), LOGOK);
88 else 88 else
89 emit logItem(tr("Download finished"), LOGOK); 89 emit logItem(tr("Download finished."), LOGOK);
90 90
91 QCoreApplication::processEvents(); 91 QCoreApplication::processEvents();
92 m_blversion = m_http.timestamp(); 92 m_blversion = m_http.timestamp();
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index 2e6a1c3817..48b35f930f 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -126,7 +126,7 @@ void BootloaderInstallIpod::installStage3(bool mounted)
126{ 126{
127 if(mounted) { 127 if(mounted) {
128 logInstall(LogAdd); 128 logInstall(LogAdd);
129 emit logItem(tr("Bootloader Installation complete"), LOGINFO); 129 emit logItem(tr("Bootloader Installation complete."), LOGINFO);
130 emit done(false); 130 emit done(false);
131 return; 131 return;
132 } 132 }
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
index 68eae6a2f7..48bd0053ee 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp
@@ -157,7 +157,7 @@ void BootloaderInstallSansa::installStage3(bool mounted)
157{ 157{
158 if(mounted) { 158 if(mounted) {
159 logInstall(LogAdd); 159 logInstall(LogAdd);
160 emit logItem(tr("Bootloader Installation complete"), LOGINFO); 160 emit logItem(tr("Bootloader Installation complete."), LOGINFO);
161 emit done(false); 161 emit done(false);
162 return; 162 return;
163 } 163 }
diff --git a/rbutil/rbutilqt/base/voicefile.cpp b/rbutil/rbutilqt/base/voicefile.cpp
index 714f40bf90..4c7a775c72 100644
--- a/rbutil/rbutilqt/base/voicefile.cpp
+++ b/rbutil/rbutilqt/base/voicefile.cpp
@@ -97,7 +97,7 @@ void VoiceFileCreator::downloadDone(bool error)
97 } 97 }
98 98
99 if(getter->isCached()) 99 if(getter->isCached())
100 emit logItem(tr("Cached file used"), LOGINFO); 100 emit logItem(tr("Cached file used."), LOGINFO);
101 if(error) 101 if(error)
102 { 102 {
103 emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR); 103 emit logItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
@@ -105,7 +105,7 @@ void VoiceFileCreator::downloadDone(bool error)
105 return; 105 return;
106 } 106 }
107 else 107 else
108 emit logItem(tr("Download finished"),LOGINFO); 108 emit logItem(tr("Download finished."),LOGINFO);
109 109
110 QCoreApplication::processEvents(); 110 QCoreApplication::processEvents();
111 111
diff --git a/rbutil/rbutilqt/base/zipinstaller.cpp b/rbutil/rbutilqt/base/zipinstaller.cpp
index 36c2cf7215..6a59cdad02 100644
--- a/rbutil/rbutilqt/base/zipinstaller.cpp
+++ b/rbutil/rbutilqt/base/zipinstaller.cpp
@@ -56,7 +56,7 @@ void ZipInstaller::installContinue()
56 runner++; // this gets called when a install finished, so increase first. 56 runner++; // this gets called when a install finished, so increase first.
57 qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size(); 57 qDebug() << "[ZipInstall] runner done:" << runner << "/" << m_urllist.size();
58 if(runner < m_urllist.size()) { 58 if(runner < m_urllist.size()) {
59 emit logItem(tr("Done"), LOGOK); 59 emit logItem(tr("done."), LOGOK);
60 m_url = m_urllist.at(runner); 60 m_url = m_urllist.at(runner);
61 m_logsection = m_loglist.at(runner); 61 m_logsection = m_loglist.at(runner);
62 if(runner < m_verlist.size()) m_logver = m_verlist.at(runner); 62 if(runner < m_verlist.size()) m_logver = m_verlist.at(runner);
@@ -64,7 +64,7 @@ void ZipInstaller::installContinue()
64 installStart(); 64 installStart();
65 } 65 }
66 else { 66 else {
67 emit logItem(tr("Installation finished successfully"), LOGOK); 67 emit logItem(tr("Installation finished successfully."), LOGOK);
68 68
69 emit done(false); 69 emit done(false);
70 return; 70 return;
@@ -117,19 +117,19 @@ void ZipInstaller::downloadDone(bool error)
117 return; 117 return;
118 } 118 }
119 if(getter->isCached()) 119 if(getter->isCached())
120 emit logItem(tr("Cached file used"), LOGINFO); 120 emit logItem(tr("Cached file used."), LOGINFO);
121 if(error) { 121 if(error) {
122 emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR); 122 emit logItem(tr("Download error: %1").arg(getter->errorString()), LOGERROR);
123 emit done(true); 123 emit done(true);
124 return; 124 return;
125 } 125 }
126 else emit logItem(tr("Download finished"),LOGOK); 126 else emit logItem(tr("Download finished."),LOGOK);
127 QCoreApplication::processEvents(); 127 QCoreApplication::processEvents();
128 if(m_unzip) { 128 if(m_unzip) {
129 // unzip downloaded file 129 // unzip downloaded file
130 qDebug() << "[ZipInstall] about to unzip " << m_file << "to" << m_mountpoint; 130 qDebug() << "[ZipInstall] about to unzip " << m_file << "to" << m_mountpoint;
131 131
132 emit logItem(tr("Extracting file"), LOGINFO); 132 emit logItem(tr("Extracting file."), LOGINFO);
133 QCoreApplication::processEvents(); 133 QCoreApplication::processEvents();
134 134
135 UnZip::ErrorCode ec; 135 UnZip::ErrorCode ec;
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index 89ca641e4f..18534029a5 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -1019,7 +1019,7 @@ void RbUtilQt::uninstallBootloader(void)
1019 bl = new BootloaderInstallFile(this); 1019 bl = new BootloaderInstallFile(this);
1020 } 1020 }
1021 else { 1021 else {
1022 logger->addItem(tr("No uninstall method known"), LOGERROR); 1022 logger->addItem(tr("No uninstall method known."), LOGERROR);
1023 logger->setFinished(); 1023 logger->setFinished();
1024 return; 1024 return;
1025 } 1025 }
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index 29f4c5fc10..4717457fdb 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -119,7 +119,7 @@ void ThemesInstallWindow::downloadDone(bool error)
119 connect(logger, SIGNAL(closed()), this, SLOT(close())); 119 connect(logger, SIGNAL(closed()), this, SLOT(close()));
120 return; 120 return;
121 } 121 }
122 logger->addItem(tr("Done"), LOGOK); 122 logger->addItem(tr("done."), LOGOK);
123 logger->setFinished(); 123 logger->setFinished();
124 logger->close(); 124 logger->close();
125 125
@@ -189,7 +189,7 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p
189 ui.themeDescription->setText(tr("fetching details for %1") 189 ui.themeDescription->setText(tr("fetching details for %1")
190 .arg(cur->data(Qt::DisplayRole).toString())); 190 .arg(cur->data(Qt::DisplayRole).toString()));
191 ui.themePreview->clear(); 191 ui.themePreview->clear();
192 ui.themePreview->setText(tr("Fetching preview...")); 192 ui.themePreview->setText(tr("fetching preview ..."));
193 imgData.clear(); 193 imgData.clear();
194 194
195 iniDetails.beginGroup(cur->data(Qt::UserRole).toString()); 195 iniDetails.beginGroup(cur->data(Qt::UserRole).toString());
@@ -281,7 +281,7 @@ void ThemesInstallWindow::show()
281 QDialog::show(); 281 QDialog::show();
282 logger = new ProgressLoggerGui(this); 282 logger = new ProgressLoggerGui(this);
283 logger->show(); 283 logger->show();
284 logger->addItem(tr("Getting themes information..."), LOGINFO); 284 logger->addItem(tr("getting themes information ..."), LOGINFO);
285 285
286 connect(logger, SIGNAL(aborted()), this, SLOT(close())); 286 connect(logger, SIGNAL(aborted()), this, SLOT(close()));
287 287