diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallmpio.cpp | 24 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/encoderlame.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/talkfile.cpp | 7 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/talkgenerator.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/ttssapi.cpp | 2 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/uninstall.cpp | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/installtalkwindow.cpp | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/progressloggergui.cpp | 24 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 8 |
10 files changed, 39 insertions, 38 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp index 97e96678c9..52a6f351f1 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallmpio.cpp | |||
@@ -45,31 +45,31 @@ bool BootloaderInstallMpio::install(void) | |||
45 | { | 45 | { |
46 | if(m_offile.isEmpty()) | 46 | if(m_offile.isEmpty()) |
47 | return false; | 47 | return false; |
48 | 48 | ||
49 | qDebug() << "[BootloaderInstallMpio] installing bootloader"; | 49 | qDebug() << "[BootloaderInstallMpio] installing bootloader"; |
50 | 50 | ||
51 | // download firmware from server | 51 | // download firmware from server |
52 | emit logItem(tr("Downloading bootloader file"), LOGINFO); | 52 | emit logItem(tr("Downloading bootloader file"), LOGINFO); |
53 | 53 | ||
54 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); | 54 | connect(this, SIGNAL(downloadDone()), this, SLOT(installStage2())); |
55 | downloadBlStart(m_blurl); | 55 | downloadBlStart(m_blurl); |
56 | 56 | ||
57 | return true; | 57 | return true; |
58 | } | 58 | } |
59 | 59 | ||
60 | void BootloaderInstallMpio::installStage2(void) | 60 | void BootloaderInstallMpio::installStage2(void) |
61 | { | 61 | { |
62 | qDebug() << "[BootloaderInstallMpio] installStage2"; | 62 | qDebug() << "[BootloaderInstallMpio] installStage2"; |
63 | 63 | ||
64 | int origin = 0xe0000; /* MPIO HD200 bootloader address */ | 64 | int origin = 0xe0000; /* MPIO HD200 bootloader address */ |
65 | 65 | ||
66 | m_tempfile.open(); | 66 | m_tempfile.open(); |
67 | QString bootfile = m_tempfile.fileName(); | 67 | QString bootfile = m_tempfile.fileName(); |
68 | m_tempfile.close(); | 68 | m_tempfile.close(); |
69 | 69 | ||
70 | int ret = mkmpioboot(m_offile.toLocal8Bit().data(), | 70 | int ret = mkmpioboot(m_offile.toLocal8Bit().data(), |
71 | bootfile.toLocal8Bit().data(), m_blfile.toLocal8Bit().data(), origin); | 71 | bootfile.toLocal8Bit().data(), m_blfile.toLocal8Bit().data(), origin); |
72 | 72 | ||
73 | if(ret != 0) | 73 | if(ret != 0) |
74 | { | 74 | { |
75 | QString error; | 75 | QString error; |
@@ -106,13 +106,13 @@ void BootloaderInstallMpio::installStage2(void) | |||
106 | error = tr("Unknown error number: %1").arg(ret); | 106 | error = tr("Unknown error number: %1").arg(ret); |
107 | break; | 107 | break; |
108 | } | 108 | } |
109 | 109 | ||
110 | qDebug() << tr("Patching original firmware failed: %1").arg(error); | 110 | qDebug() << "[BootloaderInstallMpio] Patching original firmware failed:" << error; |
111 | emit logItem(tr("Patching original firmware failed: %1").arg(error), LOGERROR); | 111 | emit logItem(tr("Patching original firmware failed: %1").arg(error), LOGERROR); |
112 | emit done(true); | 112 | emit done(true); |
113 | return; | 113 | return; |
114 | } | 114 | } |
115 | 115 | ||
116 | //end of install | 116 | //end of install |
117 | qDebug() << "[BootloaderInstallMpio] install successful"; | 117 | qDebug() << "[BootloaderInstallMpio] install successful"; |
118 | emit logItem(tr("Success: modified firmware file created"), LOGINFO); | 118 | emit logItem(tr("Success: modified firmware file created"), LOGINFO); |
diff --git a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp index ae46df273d..b05839e297 100644 --- a/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp +++ b/rbutil/rbutilqt/base/bootloaderinstallsansa.cpp | |||
@@ -166,7 +166,7 @@ void BootloaderInstallSansa::installStage3(bool mounted) | |||
166 | emit logItem(tr("Writing log aborted"), LOGERROR); | 166 | emit logItem(tr("Writing log aborted"), LOGERROR); |
167 | emit done(true); | 167 | emit done(true); |
168 | } | 168 | } |
169 | qDebug() << "version installed:" << m_blversion.toString(Qt::ISODate); | 169 | qDebug() << "[BootloaderInstallSansa] version installed:" << m_blversion.toString(Qt::ISODate); |
170 | } | 170 | } |
171 | 171 | ||
172 | 172 | ||
diff --git a/rbutil/rbutilqt/base/encoderlame.cpp b/rbutil/rbutilqt/base/encoderlame.cpp index 6cc93ff742..d545559656 100644 --- a/rbutil/rbutilqt/base/encoderlame.cpp +++ b/rbutil/rbutilqt/base/encoderlame.cpp | |||
@@ -178,7 +178,7 @@ bool EncoderLame::encode(QString input,QString output) | |||
178 | // input format used should be known. In case some TTS uses a | 178 | // input format used should be known. In case some TTS uses a |
179 | // different wave encoding some time this needs to get adjusted. | 179 | // different wave encoding some time this needs to get adjusted. |
180 | if(chunkdatalen < 16) { | 180 | if(chunkdatalen < 16) { |
181 | qDebug() << "fmt chunk too small!"; | 181 | qDebug() << "[EncoderLame] fmt chunk too small!"; |
182 | } | 182 | } |
183 | else { | 183 | else { |
184 | unsigned char *buf = new unsigned char[chunkdatalen]; | 184 | unsigned char *buf = new unsigned char[chunkdatalen]; |
diff --git a/rbutil/rbutilqt/base/talkfile.cpp b/rbutil/rbutilqt/base/talkfile.cpp index d7d0e5be75..b7d080de01 100644 --- a/rbutil/rbutilqt/base/talkfile.cpp +++ b/rbutil/rbutilqt/base/talkfile.cpp | |||
@@ -160,7 +160,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
160 | entry.target = dir.path() + "/_dirname.talk"; | 160 | entry.target = dir.path() + "/_dirname.talk"; |
161 | entry.voiced = false; | 161 | entry.voiced = false; |
162 | entry.encoded = false; | 162 | entry.encoded = false; |
163 | qDebug() << "toSpeak:" << entry.toSpeak | 163 | qDebug() << "[TalkFileCreator] toSpeak:" << entry.toSpeak |
164 | << "target:" << entry.target | 164 | << "target:" << entry.target |
165 | << "intermediates:" << entry.wavfilename << entry.talkfilename; | 165 | << "intermediates:" << entry.wavfilename << entry.talkfilename; |
166 | m_talkList.append(entry); | 166 | m_talkList.append(entry); |
@@ -204,7 +204,7 @@ bool TalkFileCreator::createTalkList(QDir startDir) | |||
204 | entry.target = fileInf.path() + "/" + fileInf.fileName() + ".talk"; | 204 | entry.target = fileInf.path() + "/" + fileInf.fileName() + ".talk"; |
205 | entry.voiced = false; | 205 | entry.voiced = false; |
206 | entry.encoded = false; | 206 | entry.encoded = false; |
207 | qDebug() << "toSpeak:" << entry.toSpeak | 207 | qDebug() << "[TalkFileCreator] toSpeak:" << entry.toSpeak |
208 | << "target:" << entry.target | 208 | << "target:" << entry.target |
209 | << "intermediates:" << | 209 | << "intermediates:" << |
210 | entry.wavfilename << entry.talkfilename; | 210 | entry.wavfilename << entry.talkfilename; |
@@ -249,7 +249,8 @@ bool TalkFileCreator::copyTalkFiles(QString* errString) | |||
249 | QFile::remove(m_talkList[i].target); | 249 | QFile::remove(m_talkList[i].target); |
250 | 250 | ||
251 | // copying | 251 | // copying |
252 | qDebug() << "copying " << m_talkList[i].talkfilename << "to" << m_talkList[i].target; | 252 | qDebug() << "[TalkFileCreator] copying" << m_talkList[i].talkfilename |
253 | << "to" << m_talkList[i].target; | ||
253 | if(!QFile::copy(m_talkList[i].talkfilename,m_talkList[i].target)) | 254 | if(!QFile::copy(m_talkList[i].talkfilename,m_talkList[i].target)) |
254 | { | 255 | { |
255 | *errString = tr("Copying of %1 to %2 failed").arg(m_talkList[i].talkfilename).arg(m_talkList[i].target); | 256 | *errString = tr("Copying of %1 to %2 failed").arg(m_talkList[i].talkfilename).arg(m_talkList[i].target); |
diff --git a/rbutil/rbutilqt/base/talkgenerator.cpp b/rbutil/rbutilqt/base/talkgenerator.cpp index ecb39cad2f..16e1b15184 100644 --- a/rbutil/rbutilqt/base/talkgenerator.cpp +++ b/rbutil/rbutilqt/base/talkgenerator.cpp | |||
@@ -207,7 +207,8 @@ TalkGenerator::Status TalkGenerator::encodeList(QList<TalkEntry>* list) | |||
207 | //skip non-voiced entrys | 207 | //skip non-voiced entrys |
208 | if(list->at(i).voiced == false) | 208 | if(list->at(i).voiced == false) |
209 | { | 209 | { |
210 | qDebug() << "non voiced entry" << list->at(i).toSpeak <<"detected"; | 210 | qDebug() << "[TalkGenerator] non voiced entry detected:" |
211 | << list->at(i).toSpeak; | ||
211 | emit logProgress(++m_progress,progressMax); | 212 | emit logProgress(++m_progress,progressMax); |
212 | continue; | 213 | continue; |
213 | } | 214 | } |
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp index 09c1dd0588..f726dcf8da 100644 --- a/rbutil/rbutilqt/base/ttssapi.cpp +++ b/rbutil/rbutilqt/base/ttssapi.cpp | |||
@@ -84,7 +84,7 @@ void TTSSapi::saveSettings() | |||
84 | 84 | ||
85 | void TTSSapi::updateVoiceList() | 85 | void TTSSapi::updateVoiceList() |
86 | { | 86 | { |
87 | qDebug() << "update voiceList"; | 87 | qDebug() << "[TTSSapi] updating voicelist"; |
88 | QStringList voiceList = getVoiceList(getSetting(eLANGUAGE)->current().toString()); | 88 | QStringList voiceList = getVoiceList(getSetting(eLANGUAGE)->current().toString()); |
89 | getSetting(eVOICE)->setList(voiceList); | 89 | getSetting(eVOICE)->setList(voiceList); |
90 | if(voiceList.size() > 0) getSetting(eVOICE)->setCurrent(voiceList.at(0)); | 90 | if(voiceList.size() > 0) getSetting(eVOICE)->setCurrent(voiceList.at(0)); |
diff --git a/rbutil/rbutilqt/base/uninstall.cpp b/rbutil/rbutilqt/base/uninstall.cpp index cea0f4da57..ef6eb61ca5 100644 --- a/rbutil/rbutilqt/base/uninstall.cpp +++ b/rbutil/rbutilqt/base/uninstall.cpp | |||
@@ -66,7 +66,7 @@ void Uninstaller::uninstall(void) | |||
66 | if(installlog.contains(toDeleteList.at(j))) | 66 | if(installlog.contains(toDeleteList.at(j))) |
67 | { | 67 | { |
68 | deleteFile = false; | 68 | deleteFile = false; |
69 | qDebug() << "file still in use:" << toDeleteList.at(j); | 69 | qDebug() << "[Uninstaller] file still in use:" << toDeleteList.at(j); |
70 | } | 70 | } |
71 | installlog.endGroup(); | 71 | installlog.endGroup(); |
72 | } | 72 | } |
@@ -79,7 +79,7 @@ void Uninstaller::uninstall(void) | |||
79 | emit logItem(tr("Could not delete %1") | 79 | emit logItem(tr("Could not delete %1") |
80 | .arg(toDelete.filePath()), LOGWARNING); | 80 | .arg(toDelete.filePath()), LOGWARNING); |
81 | installlog.remove(toDeleteList.at(j)); | 81 | installlog.remove(toDeleteList.at(j)); |
82 | qDebug() << "deleted: " << toDelete.filePath() ; | 82 | qDebug() << "[Uninstaller] deleted:" << toDelete.filePath(); |
83 | } | 83 | } |
84 | else // if it is a dir, remember it for later deletion | 84 | else // if it is a dir, remember it for later deletion |
85 | { | 85 | { |
diff --git a/rbutil/rbutilqt/installtalkwindow.cpp b/rbutil/rbutilqt/installtalkwindow.cpp index 521cd0db7a..94ed68b87e 100644 --- a/rbutil/rbutilqt/installtalkwindow.cpp +++ b/rbutil/rbutilqt/installtalkwindow.cpp | |||
@@ -40,7 +40,6 @@ InstallTalkWindow::InstallTalkWindow(QWidget *parent) : QDialog(parent) | |||
40 | ui.treeView->setModel(fsm); | 40 | ui.treeView->setModel(fsm); |
41 | ui.treeView->setSelectionMode(QAbstractItemView::ExtendedSelection); | 41 | ui.treeView->setSelectionMode(QAbstractItemView::ExtendedSelection); |
42 | ui.treeView->setRootIndex(fsm->index(mp)); | 42 | ui.treeView->setRootIndex(fsm->index(mp)); |
43 | qDebug() << fsm->columnCount(); | ||
44 | fsm->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot); | 43 | fsm->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot); |
45 | for(int i = 1; i < fsm->columnCount(); i++) | 44 | for(int i = 1; i < fsm->columnCount(); i++) |
46 | ui.treeView->setColumnHidden(i, true); | 45 | ui.treeView->setColumnHidden(i, true); |
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp index f6b33bc11e..2e4953222d 100644 --- a/rbutil/rbutilqt/progressloggergui.cpp +++ b/rbutil/rbutilqt/progressloggergui.cpp | |||
@@ -145,20 +145,20 @@ void ProgressLoggerGui::saveErrorLog() | |||
145 | QDir::homePath(), "*.log"); | 145 | QDir::homePath(), "*.log"); |
146 | if(filename == "") | 146 | if(filename == "") |
147 | return; | 147 | return; |
148 | 148 | ||
149 | QFile file(filename); | 149 | QFile file(filename); |
150 | if(!file.open(QIODevice::WriteOnly)) | 150 | if(!file.open(QIODevice::WriteOnly)) |
151 | return; | 151 | return; |
152 | 152 | ||
153 | //Logger texts | 153 | //Logger texts |
154 | QString loggerTexts = "\n*********************************************\n" | 154 | QString loggerTexts = "\n*********************************************\n" |
155 | "*************** Logger *******************\n" | 155 | "*************** Logger *******************\n" |
156 | "*********************************************\n"; | 156 | "*********************************************\n"; |
157 | file.write(loggerTexts.toUtf8(), loggerTexts.size()); | 157 | file.write(loggerTexts.toUtf8(), loggerTexts.size()); |
158 | |||
158 | 159 | ||
159 | |||
160 | int i=0; | 160 | int i=0; |
161 | loggerTexts = ""; | 161 | loggerTexts = ""; |
162 | while(dp.listProgress->item(i) != NULL) | 162 | while(dp.listProgress->item(i) != NULL) |
163 | { | 163 | { |
164 | loggerTexts.append(dp.listProgress->item(i)->text()); | 164 | loggerTexts.append(dp.listProgress->item(i)->text()); |
@@ -166,27 +166,25 @@ void ProgressLoggerGui::saveErrorLog() | |||
166 | i++; | 166 | i++; |
167 | } | 167 | } |
168 | file.write(loggerTexts.toUtf8(), loggerTexts.size()); | 168 | file.write(loggerTexts.toUtf8(), loggerTexts.size()); |
169 | 169 | ||
170 | //systeminfo | 170 | //systeminfo |
171 | QString info = "\n*********************************************\n" | 171 | QString info = "\n*********************************************\n" |
172 | "************ SYSTEMINFO *******************\n" | 172 | "************ SYSTEMINFO *******************\n" |
173 | "*********************************************\n"; | 173 | "*********************************************\n"; |
174 | 174 | ||
175 | file.write(info.toUtf8(), info.size()); | 175 | file.write(info.toUtf8(), info.size()); |
176 | info = Sysinfo::getInfo(); | 176 | info = Sysinfo::getInfo(); |
177 | info.replace(QRegExp("(<[^>]+>)+"),"\n"); | 177 | info.replace(QRegExp("(<[^>]+>)+"),"\n"); |
178 | file.write(info.toUtf8(), info.size()); | 178 | file.write(info.toUtf8(), info.size()); |
179 | 179 | ||
180 | // trace | 180 | // trace |
181 | QString trace = "\n*********************************************\n" | 181 | QString trace = "\n*********************************************\n" |
182 | "*********** TRACE **************************\n" | 182 | "*********** TRACE **************************\n" |
183 | "*********************************************\n"; | 183 | "*********************************************\n"; |
184 | file.write(trace.toUtf8(), trace.size()); | 184 | file.write(trace.toUtf8(), trace.size()); |
185 | trace = SysTrace::getTrace(); | 185 | trace = SysTrace::getTrace(); |
186 | file.write(trace.toUtf8(), trace.size()); | 186 | file.write(trace.toUtf8(), trace.size()); |
187 | 187 | ||
188 | file.close(); | 188 | file.close(); |
189 | } | 189 | } |
190 | 190 | ||
191 | |||
192 | |||
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 726c4f4d36..031fd70193 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -1117,11 +1117,13 @@ void RbUtilQt::installPortable(void) | |||
1117 | QUrl RbUtilQt::proxy() | 1117 | QUrl RbUtilQt::proxy() |
1118 | { | 1118 | { |
1119 | QUrl proxy; | 1119 | QUrl proxy; |
1120 | if(RbSettings::value(RbSettings::ProxyType) == "manual") | 1120 | QString proxytype = RbSettings::value(RbSettings::ProxyType).toString(); |
1121 | if(proxytype == "manual") | ||
1121 | proxy.setEncodedUrl(RbSettings::value(RbSettings::Proxy).toByteArray()); | 1122 | proxy.setEncodedUrl(RbSettings::value(RbSettings::Proxy).toByteArray()); |
1122 | else if(RbSettings::value(RbSettings::ProxyType) == "system") | 1123 | else if(proxytype == "system") |
1123 | proxy = System::systemProxy(); | 1124 | proxy = System::systemProxy(); |
1124 | qDebug() << proxy.userName() << proxy.password() << proxy.host() << proxy.port(); | 1125 | |
1126 | qDebug() << "[RbUtilQt] Proxy is" << proxy; | ||
1125 | return proxy; | 1127 | return proxy; |
1126 | } | 1128 | } |
1127 | 1129 | ||