summaryrefslogtreecommitdiff
authorzecke <zecke>2002-10-21 22:35:37 (UTC)
committer zecke <zecke>2002-10-21 22:35:37 (UTC)
commitd6a40efdb9d81d39972a1304bd62ac60bb45e996 (patch) (unidiff)
tree47cc96d6457e809621f40610737407532f04f98c
parent151729eb3e4e4cfbb69db1f027e74188cf55c328 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp2
-rw-r--r--noncore/apps/opie-console/script.cpp1
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
@@ -275,62 +275,64 @@ QList<Session> MainWindow::sessions() {
275 return m_sessions; 275 return m_sessions;
276} 276}
277 277
278void MainWindow::slotNew() { 278void MainWindow::slotNew() {
279 ProfileEditorDialog dlg(factory() ); 279 ProfileEditorDialog dlg(factory() );
280 dlg.showMaximized(); 280 dlg.showMaximized();
281 int ret = dlg.exec(); 281 int ret = dlg.exec();
282 282
283 if ( ret == QDialog::Accepted ) { 283 if ( ret == QDialog::Accepted ) {
284 create( dlg.profile() ); 284 create( dlg.profile() );
285 } 285 }
286} 286}
287 287
288void MainWindow::slotRecordScript() { 288void MainWindow::slotRecordScript() {
289 if (currentSession()) { 289 if (currentSession()) {
290 currentSession()->emulationHandler()->startRecording(); 290 currentSession()->emulationHandler()->startRecording();
291 } 291 }
292} 292}
293 293
294void MainWindow::slotSaveScript() { 294void 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
308void MainWindow::slotRunScript() { 309void 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}
321 323
322void MainWindow::slotConnect() { 324void MainWindow::slotConnect() {
323 if ( currentSession() ) { 325 if ( currentSession() ) {
324 bool ret = currentSession()->layer()->open(); 326 bool ret = currentSession()->layer()->open();
325 if(!ret) QMessageBox::warning(currentSession()->widgetStack(), 327 if(!ret) QMessageBox::warning(currentSession()->widgetStack(),
326 QObject::tr("Failed"), 328 QObject::tr("Failed"),
327 QObject::tr("Connecting failed for this session.")); 329 QObject::tr("Connecting failed for this session."));
328 else { 330 else {
329 m_connect->setEnabled( false ); 331 m_connect->setEnabled( false );
330 m_disconnect->setEnabled( true ); 332 m_disconnect->setEnabled( true );
331 } 333 }
332 } 334 }
333} 335}
334 336
335void MainWindow::slotDisconnect() { 337void MainWindow::slotDisconnect() {
336 if ( currentSession() ) { 338 if ( currentSession() ) {
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
@@ -1,29 +1,30 @@
1#include <qfile.h> 1#include <qfile.h>
2#include <qtextstream.h> 2#include <qtextstream.h>
3#include "script.h" 3#include "script.h"
4 4
5Script::Script() { 5Script::Script() {
6} 6}
7 7
8Script::Script(const QString fileName) { 8Script::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
13void Script::saveTo(const QString fileName) const { 14void 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();
18} 19}
19 20
20 21
21void Script::append(const QByteArray &data) { 22void Script::append(const QByteArray &data) {
22 int size = m_script.size(); 23 int size = m_script.size();
23 m_script.resize(size + data.size()); 24 m_script.resize(size + data.size());
24 memcpy(m_script.data() + size, data.data(), data.size()); 25 memcpy(m_script.data() + size, data.data(), data.size());
25} 26}
26 27
27QByteArray Script::script() const { 28QByteArray Script::script() const {
28 return m_script; 29 return m_script;
29} 30}