author | zecke <zecke> | 2002-10-21 22:35:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-21 22:35:37 (UTC) |
commit | d6a40efdb9d81d39972a1304bd62ac60bb45e996 (patch) (unidiff) | |
tree | 47cc96d6457e809621f40610737407532f04f98c | |
parent | 151729eb3e4e4cfbb69db1f027e74188cf55c328 (diff) | |
download | opie-d6a40efdb9d81d39972a1304bd62ac60bb45e996.zip opie-d6a40efdb9d81d39972a1304bd62ac60bb45e996.tar.gz opie-d6a40efdb9d81d39972a1304bd62ac60bb45e996.tar.bz2 |
Fix scriptiong Open the file before reading from it
Add text/all to the mimetypes this makes recording, saving and
running work
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/script.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index afac542..7ffeca7 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -291,30 +291,32 @@ void MainWindow::slotRecordScript() { | |||
291 | } | 291 | } |
292 | } | 292 | } |
293 | 293 | ||
294 | void MainWindow::slotSaveScript() { | 294 | void MainWindow::slotSaveScript() { |
295 | if (currentSession() && currentSession()->emulationHandler()->isRecording()) { | 295 | if (currentSession() && currentSession()->emulationHandler()->isRecording()) { |
296 | MimeTypes types; | 296 | MimeTypes types; |
297 | QStringList script; | 297 | QStringList script; |
298 | script << "text/plain"; | 298 | script << "text/plain"; |
299 | script << "text/all"; | ||
299 | types.insert("Script", script); | 300 | types.insert("Script", script); |
300 | QString filename = OFileDialog::getSaveFileName(2, "/", QString::null, types); | 301 | QString filename = OFileDialog::getSaveFileName(2, "/", QString::null, types); |
301 | if (!filename.isEmpty()) { | 302 | if (!filename.isEmpty()) { |
302 | currentSession()->emulationHandler()->script()->saveTo(filename); | 303 | currentSession()->emulationHandler()->script()->saveTo(filename); |
303 | currentSession()->emulationHandler()->clearScript(); | 304 | currentSession()->emulationHandler()->clearScript(); |
304 | } | 305 | } |
305 | } | 306 | } |
306 | } | 307 | } |
307 | 308 | ||
308 | void MainWindow::slotRunScript() { | 309 | void MainWindow::slotRunScript() { |
309 | if (currentSession()) { | 310 | if (currentSession()) { |
310 | MimeTypes types; | 311 | MimeTypes types; |
311 | QStringList script; | 312 | QStringList script; |
312 | script << "text/plain"; | 313 | script << "text/plain"; |
314 | script << "text/all"; | ||
313 | types.insert("Script", script); | 315 | types.insert("Script", script); |
314 | QString filename = OFileDialog::getOpenFileName(2, "/", QString::null, types); | 316 | QString filename = OFileDialog::getOpenFileName(2, "/", QString::null, types); |
315 | if (!filename.isEmpty()) { | 317 | if (!filename.isEmpty()) { |
316 | Script script(DocLnk(filename).file()); | 318 | Script script(DocLnk(filename).file()); |
317 | currentSession()->emulationHandler()->runScript(&script); | 319 | currentSession()->emulationHandler()->runScript(&script); |
318 | } | 320 | } |
319 | } | 321 | } |
320 | } | 322 | } |
diff --git a/noncore/apps/opie-console/script.cpp b/noncore/apps/opie-console/script.cpp index 9cb1cd3..e6e9d6d 100644 --- a/noncore/apps/opie-console/script.cpp +++ b/noncore/apps/opie-console/script.cpp | |||
@@ -2,16 +2,17 @@ | |||
2 | #include <qtextstream.h> | 2 | #include <qtextstream.h> |
3 | #include "script.h" | 3 | #include "script.h" |
4 | 4 | ||
5 | Script::Script() { | 5 | Script::Script() { |
6 | } | 6 | } |
7 | 7 | ||
8 | Script::Script(const QString fileName) { | 8 | Script::Script(const QString fileName) { |
9 | QFile file(fileName); | 9 | QFile file(fileName); |
10 | file.open(IO_ReadOnly ); | ||
10 | m_script = file.readAll(); | 11 | m_script = file.readAll(); |
11 | } | 12 | } |
12 | 13 | ||
13 | void Script::saveTo(const QString fileName) const { | 14 | void Script::saveTo(const QString fileName) const { |
14 | QFile file(fileName); | 15 | QFile file(fileName); |
15 | file.open(IO_WriteOnly); | 16 | file.open(IO_WriteOnly); |
16 | file.writeBlock(m_script); | 17 | file.writeBlock(m_script); |
17 | file.close(); | 18 | file.close(); |