only use .script files, set DocLnk names correctly

1 files changed, 12 insertions, 4 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 888ab90..ccecdf8 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -9,4 +9,5 @@
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
+#include <qfileinfo.h>
 
 #include <qpe/resource.h>
@@ -142,4 +143,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
     m_manager = new ProfileManager( m_factory );
     m_manager->load();
+    m_scriptsData.setAutoDelete(TRUE);
 
     initUI();
@@ -359,8 +361,11 @@ void MainWindow::populateScripts() {
     for (; dit.current(); ++dit) {
         if (*dit && (*dit)->name().length()>0) {
-            m_scriptsData.append((*dit));
+            QFileInfo info((*dit)->file());
+            if (info.extension(false) == "script") {
+                m_scriptsData.append(new DocLnk(**dit));
             m_scriptsPop->insertItem((*dit)->name());
         }
     }
+    }
 
 }
@@ -409,8 +414,11 @@ void MainWindow::slotSaveScript() {
         QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
         if (!filename.isEmpty()) {
+            QFileInfo info(filename);
+            if (info.extension(FALSE) != "script")
+                filename += ".script";
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile(filename);
-            nf.setName(filename);
+            nf.setName(info.fileName());
             FileManager fm;
             fm.saveFile(nf, currentSession()->emulationHandler()->script()->script());
@@ -425,7 +433,7 @@ void MainWindow::slotSaveScript() {
 void MainWindow::slotRunScript(int id) {
     if (currentSession()) {
-        DocLnk *lnk = m_scriptsData.at(m_scriptsPop->indexOf(id));
+        int index = m_scriptsPop->indexOf(id);
+        DocLnk *lnk = m_scriptsData.at(index);
         QString filePath = lnk->file();
-        printf("path is : %s\n", filePath.latin1());
         Script script(filePath);
         currentSession()->emulationHandler()->runScript(&script);