diff --git a/src/ui/editors/editorWidget.py b/src/ui/editors/editorWidget.py index c27e4b09..2bcd7048 100644 --- a/src/ui/editors/editorWidget.py +++ b/src/ui/editors/editorWidget.py @@ -143,8 +143,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui): self.setParent(None) mainWindow().hide() self.move(qApp.desktop().screenGeometry(currentScreen).topLeft()) - #print(str((qApp.desktop().screenGeometry(currentScreen).width() - 800) / 2)) - print(str((qApp.desktop().screenGeometry(currentScreen).width() - 800) / 2)) + self.stack.setStyleSheet(""" QTextEdit {{ margin-left: {m}px; @@ -158,7 +157,7 @@ class editorWidget(QWidget, Ui_editorWidget_ui): def keyPressEvent(self, event): - if event.key() == Qt.Key_Escape and self._fullscreen: + if event.key() in [Qt.Key_Escape, Qt.Key_F11] and self._fullscreen: mainWindow().show() self.stack.setStyleSheet("") self.setGeometry(self._geometry) diff --git a/src/ui/mainWindow.py b/src/ui/mainWindow.py index f2bceb2f..ce4288b7 100644 --- a/src/ui/mainWindow.py +++ b/src/ui/mainWindow.py @@ -1253,6 +1253,7 @@ class Ui_MainWindow(object): self.txtPlanSummarySentance.setPlaceholderText(_translate("MainWindow", "Résumé de la scène en une ligne")) self.label_9.setText(_translate("MainWindow", "Résumé en quelques phrases:")) self.tabMain.setTabText(self.tabMain.indexOf(self.lytTabOutline), _translate("MainWindow", "Plan")) + self.btnRedacFullscreen.setShortcut(_translate("MainWindow", "F11")) self.groupBox_4.setTitle(_translate("MainWindow", "Propriétés")) self.lblRedacPOV.setText(_translate("MainWindow", "POV")) self.label_30.setText(_translate("MainWindow", "Status")) @@ -1306,9 +1307,9 @@ class Ui_MainWindow(object): self.actSpellcheck.setShortcut(_translate("MainWindow", "F8")) self.actSpellcheckDict.setText(_translate("MainWindow", "Dictionnaire")) -from ui.cmbOutlineStatusChoser import cmbOutlineStatusChoser from ui.cmbOutlinePersoChoser import cmbOutlinePersoChoser -from ui.editors.editorWidget import editorWidget -from ui.chkOutlineCompile import chkOutlineCompile -from ui.collapsibleGroupBox2 import collapsibleGroupBox2 +from ui.cmbOutlineStatusChoser import cmbOutlineStatusChoser from ui.sldImportance import sldImportance +from ui.chkOutlineCompile import chkOutlineCompile +from ui.editors.editorWidget import editorWidget +from ui.collapsibleGroupBox2 import collapsibleGroupBox2 diff --git a/src/ui/mainWindow.ui b/src/ui/mainWindow.ui index af1467b9..2006d070 100644 --- a/src/ui/mainWindow.ui +++ b/src/ui/mainWindow.ui @@ -1710,6 +1710,9 @@ + + F11 + diff --git a/test_project/outline.xml b/test_project/outline.xml index 760a6115..f873ab22 100644 --- a/test_project/outline.xml +++ b/test_project/outline.xml @@ -1,5 +1,5 @@ - + @@ -19,7 +19,7 @@ - +