CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-06-27 02:30:38 +12:00
Code Issues Projects Releases Wiki Activity

Fixing fullscreen button

Browse source
This commit is contained in:
Olivier Keshavjee 2015-06-29 18:46:16 +02:00
parent 21de78c27b
commit e230e2b6cc
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ui/editors/editorWidget.py
View file

@ -226,10 +226,6 @@ class editorWidget(QWidget, Ui_editorWidget_ui):
self.currentDict = dct self.currentDict = dct
self.dictChanged.emit(dct) self.dictChanged.emit(dct)
def showFullscreen(self, index):
self._fullScreen = fullScreenEditor(index)
def keyPressEvent(self, event): def keyPressEvent(self, event):
if event.key() in [Qt.Key_Escape, Qt.Key_F11] and self._fullscreen: if event.key() in [Qt.Key_Escape, Qt.Key_F11] and self._fullscreen:
mainWindow().show() mainWindow().show()

27
src/ui/editors/mainEditor.py
View file

@ -46,14 +46,25 @@ class mainEditor(QWidget, Ui_mainEditor):
index = self.currentEditor().currentIndex index = self.currentEditor().currentIndex
view = self.currentEditor().folderView view = self.currentEditor().folderView
self.updateFolderViewButtons(view) self.updateFolderViewButtons(view)
if index.isValid():
hidden = not index.internalPointer().isFolder()
else:
hidden = False
else: else:
index = QModelIndex() index = QModelIndex()
hidden = False
self._updating = True self._updating = True
self.mw.treeRedacOutline.setCurrentIndex(index) self.mw.treeRedacOutline.setCurrentIndex(index)
self._updating = False self._updating = False
self.updateStats() self.updateStats()
self.btnRedacFolderText.setHidden(hidden)
self.btnRedacFolderCork.setHidden(hidden)
self.btnRedacFolderOutline.setHidden(hidden)
self.sldCorkSizeFactor.setHidden(hidden)
self.btnRedacFullscreen.setVisible(hidden)
def closeTab(self, index): def closeTab(self, index):
#FIXME: submit data if textedit? #FIXME: submit data if textedit?
@ -73,20 +84,9 @@ class mainEditor(QWidget, Ui_mainEditor):
if len(self.mw.treeRedacOutline.selectionModel(). if len(self.mw.treeRedacOutline.selectionModel().
selection().indexes()) == 0: selection().indexes()) == 0:
hidden = False hidden = False
idx = QModelIndex()
else: else:
idx = self.mw.treeRedacOutline.currentIndex() idx = self.mw.treeRedacOutline.currentIndex()
if idx.isValid():
hidden = not idx.internalPointer().isFolder()
else:
hidden = False
self.btnRedacFolderText.setHidden(hidden)
self.btnRedacFolderCork.setHidden(hidden)
self.btnRedacFolderOutline.setHidden(hidden)
self.sldCorkSizeFactor.setHidden(hidden)
self.btnRedacFullscreen.setVisible(hidden)
self.setCurrentModelIndex(idx) self.setCurrentModelIndex(idx)
def openIndexes(self, indexes, newTab=False): def openIndexes(self, indexes, newTab=False):
@ -199,9 +199,8 @@ class mainEditor(QWidget, Ui_mainEditor):
w.corkView.outlineView.viewport().update() w.corkView.outlineView.viewport().update()
def showFullScreen(self): def showFullScreen(self):
pass if self.currentEditor():
#FIXME self._fullScreen = fullScreenEditor(self.currentEditor().currentIndex)
#self.redacEditor.showFullscreen(self.treeRedacOutline.currentIndex()
############################################################################### ###############################################################################
# DICT AND STUFF LIKE THAT # DICT AND STUFF LIKE THAT