[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/shell
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-07-26 21:09:27
Message-ID: 20100726210927.6CB7BAC73E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1155072 by aseigo:

better save-as behaviour


 M  +5 -7      interactiveconsole.cpp  
 M  +1 -1      interactiveconsole.h  


--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/interactiveconsole.cpp #1155071:1155072
@@ -219,7 +219,7 @@
     // need to save first!
     const QString path = KStandardDirs::locateLocal("appdata", s_autosaveFileName);
     m_closeWhenCompleted = true;
-    saveScript(path);
+    saveScript(path, true);
 }
 
 void InteractiveConsole::print(const QString &string)
@@ -336,8 +336,7 @@
 void InteractiveConsole::saveScript()
 {
     if (m_editorPart) {
-        const bool success = m_editorPart->documentSaveAs();
-        m_saveAction->setEnabled(!success);
+        m_editorPart->documentSaveAs();
         return;
     }
 
@@ -371,10 +370,10 @@
     saveScript(url);
 }
 
-void InteractiveConsole::saveScript(const KUrl &url)
+void InteractiveConsole::saveScript(const KUrl &url, bool autosave)
 {
     if (m_editorPart) {
-        m_saveAction->setEnabled(!m_editorPart->saveAs(url));
+        m_editorPart->saveAs(url);
     } else {
         m_editor->setEnabled(false);
 
@@ -408,7 +407,6 @@
     }
 
     m_closeWhenCompleted = false;
-    m_saveAction->setEnabled(job->error() != 0);
     m_editor->setEnabled(true);
 }
 
@@ -416,7 +414,7 @@
 {
     //kDebug() << "evaluating" << m_editor->toPlainText();
     const QString path = KStandardDirs::locateLocal("appdata", s_autosaveFileName);
-    saveScript(path);
+    saveScript(path, true);
 
     m_output->moveCursor(QTextCursor::End);
     QTextCursor cursor = m_output->textCursor();
--- trunk/KDE/kdebase/workspace/plasma/desktop/shell/interactiveconsole.h #1155071:1155072
@@ -82,7 +82,7 @@
 
 private:
     void onClose();
-    void saveScript(const KUrl &url);
+    void saveScript(const KUrl &url, bool autosave = false);
 
     Plasma::Corona *m_corona;
     QSplitter *m_splitter;
[prev in list] [next in list] [prev in thread] [next in thread]