python/console/console.py

@@ -612,21 +612,22 @@ def uncommentCode(self):
     def openScriptFile(self):
         lastDirPath = self.settings.value("pythonConsole/lastDirPath").toString()
         openFileTr = QCoreApplication.translate("PythonConsole", "Open File")
-        filename = QFileDialog.getOpenFileName(
+        fileList = QFileDialog.getOpenFileNames(
                         self, openFileTr, lastDirPath, "Script file (*.py)")
-        if not filename.isEmpty():
-            for i in range(self.tabEditorWidget.count()):
-                tabWidget = self.tabEditorWidget.widget(i)
-                if tabWidget.path == filename:
-                    self.tabEditorWidget.setCurrentWidget(tabWidget)
-                    break
-            else:
-                tabName = filename.split('/')[-1]
-                self.tabEditorWidget.newTabEditor(tabName, filename)
-
-        lastDirPath = QFileInfo(filename).path()
-        self.settings.setValue("pythonConsole/lastDirPath", QVariant(filename))
-        self.updateTabListScript(filename, action='append')
+        if not fileList.isEmpty():
+            for pyFile in fileList:
+                for i in range(self.tabEditorWidget.count()):
+                    tabWidget = self.tabEditorWidget.widget(i)
+                    if tabWidget.path == pyFile:
+                        self.tabEditorWidget.setCurrentWidget(tabWidget)
+                        break
+                else:
+                    tabName = QFileInfo(pyFile).fileName()
+                    self.tabEditorWidget.newTabEditor(tabName, pyFile)
+
+                    lastDirPath = QFileInfo(pyFile).path()
+                    self.settings.setValue("pythonConsole/lastDirPath", QVariant(pyFile))
+                    self.updateTabListScript(pyFile, action='append')
 
     def saveScriptFile(self):
         tabWidget = self.tabEditorWidget.currentWidget()
@@ -639,8 +640,10 @@ def saveScriptFile(self):
                                                  .arg(unicode(tabWidget.path)).arg(error.strerror)
             self.callWidgetMessageBarEditor(msgText, 2, False)
 
-    def saveAsScriptFile(self):
+    def saveAsScriptFile(self, index=None):
         tabWidget = self.tabEditorWidget.currentWidget()
+        if index:
+            tabWidget = self.tabEditorWidget.widget(index)
         index = self.tabEditorWidget.currentIndex()
         if tabWidget is None:
             return

python/console/console_editor.py

@@ -742,10 +742,10 @@ def loadFile(self, filename, modified):
         self.newEditor.recolor()
 
     def save(self, fileName=None):
+        index = self.tw.indexOf(self)
         if fileName:
             self.path = fileName
         if self.path is None:
-            index = self.tw.currentIndex()
             saveTr = QCoreApplication.translate('PythonConsole',
                                                 'Python Console: Save file')
             self.path = str(QFileDialog().getSaveFileName(self,
@@ -756,6 +756,7 @@ def save(self, fileName=None):
             if len(self.path) == 0:
                 self.path = None
                 return
+            self.tw.setCurrentWidget(self)
             msgText = QCoreApplication.translate('PythonConsole',
                                                  'Script was correctly saved.')
             self.pc.callWidgetMessageBarEditor(msgText, 0, True)
@@ -782,8 +783,8 @@ def save(self, fileName=None):
         if self.newEditor.isReadOnly():
             self.newEditor.setReadOnly(False)
         fN = path.split('/')[-1]
-        self.tw.setTabTitle(self.tw.currentIndex(), fN)
-        self.tw.setTabToolTip(self.tw.currentIndex(), path)
+        self.tw.setTabTitle(index, fN)
+        self.tw.setTabToolTip(index, path)
         self.newEditor.setModified(False)
         self.pc.saveFileButton.setEnabled(False)
         self.newEditor.lastModified = QFileInfo(path).lastModified()
@@ -931,7 +932,7 @@ def contextMenuEvent(self, e):
             saveAction = menu.addAction("Save",
                                         cW.save)
             saveAsAction = menu.addAction("Save As",
-                                          self.parent.saveAsScriptFile)
+                                          self.saveAs)
             closeTabAction.setEnabled(False)
             closeAllTabAction.setEnabled(False)
             closeOthersTabAction.setEnabled(False)
@@ -957,7 +958,11 @@ def closeAll(self):
             self._removeTab(i)
         self.newTabEditor(tabName='Untitled-0')
         self._removeTab(0)
-
+
+    def saveAs(self):
+        idx = self.idx
+        self.parent.saveAsScriptFile(idx)
+
     def enableSaveIfModified(self, tab):
         tabWidget = self.widget(tab)
         if tabWidget: