Skip to content

Commit 0a5e09a

Browse files
committedMay 12, 2013
[pyqgis-console] minor fixes: followup a60e74a
1 parent a60e74a commit 0a5e09a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed
 

‎python/console/console.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,10 @@ def _textFindChanged(self):
537537
self.findPrevButton.setEnabled(False)
538538

539539
def onClickGoToLine(self, item, column):
540+
tabEditor = self.tabEditorWidget.currentWidget().newEditor
540541
if item.text(1) == 'syntaxError':
541-
check = self.tabEditorWidget.currentWidget().newEditor.syntaxCheck()
542-
if check:
542+
check = self.tabEditorWidget.currentWidget().newEditor.syntaxCheck(fromContextMenu=False)
543+
if check and not tabEditor.isReadOnly():
543544
self.tabEditorWidget.currentWidget().save()
544545
return
545546
linenr = int(item.text(1))
@@ -549,7 +550,7 @@ def onClickGoToLine(self, item, column):
549550
objName = itemName[0:charPos]
550551
else:
551552
objName = itemName
552-
self.tabEditorWidget.currentWidget().newEditor.goToLine(objName, linenr)
553+
tabEditor.goToLine(objName, linenr)
553554

554555
def sextante(self):
555556
self.shell.commandConsole('sextante')

‎python/console/console_editor.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,8 @@ def save(self):
733733
if overwrite:
734734
os.remove(temp_path)
735735
fN = path.split('/')[-1]
736-
self.tw.setTabTitle(self, fN)
736+
if not self.newEditor.isReadOnly():
737+
self.tw.setTabTitle(self, fN)
737738
self.tw.setTabToolTip(self.tw.currentIndex(), path)
738739
self.newEditor.setModified(False)
739740
self.pc.saveFileButton.setEnabled(False)
@@ -979,8 +980,8 @@ def _removeTab(self, tab, tab2index=False):
979980
return
980981
else:
981982
self.parent.updateTabListScript(self.widget(tab).path)
982-
if self.count() <= 1:
983-
self.removeTab(tab)
983+
self.removeTab(tab)
984+
if self.count() <= 1:
984985
self.newTabEditor()
985986
else:
986987
if self.widget(tab).path is not None or \

0 commit comments

Comments
 (0)
Please sign in to comment.