CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-14 09:52:27 +12:00
Code Issues Projects Releases Wiki Activity

Adds #259: Focus Mode (poke #234)

Browse source
This commit is contained in:
Olivier Keshavjee 2017-12-05 23:18:32 +01:00
parent 3998ed68d3
commit 826d53933f
8 changed files with 155 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manuskript/settings.py
View file

@ -75,6 +75,7 @@ textEditor = {
"marginsTB": 20,
"backgroundTransparent": False,
"alwaysCenter": False,
"focusMode": False # "line", "paragraph"
}
revisions = {
@ -275,6 +276,7 @@ def load(string, fromString=False, protocol=None):
"marginsTB": 20,
"backgroundTransparent": False, # Added in 0.6.0
"alwaysCenter": False, # Added in 0.7.0
"focusMode": False,
}
for k in added:

9
manuskript/settingsWindow.py
View file

@ -204,6 +204,11 @@ class settingsWindow(QWidget, Ui_Settings):
self.chkEditorNoBlinking.stateChanged.connect(self.setApplicationCursorBlinking)
self.chkEditorTypeWriterMode.setChecked(opt["alwaysCenter"])
self.chkEditorTypeWriterMode.stateChanged.connect(self.updateEditorSettings)
self.cmbEditorFocusMode.setCurrentIndex(
0 if not opt["focusMode"] else
1 if opt["focusMode"] == "line" else
2)
self.cmbEditorFocusMode.currentIndexChanged.connect(self.updateEditorSettings)
# Text areas
self.chkEditorMaxWidth.setChecked(opt["maxWidth"] != 0)
self.chkEditorMaxWidth.stateChanged.connect(self.updateEditorSettings)
@ -497,6 +502,10 @@ class settingsWindow(QWidget, Ui_Settings):
self.spnEditorCursorWidth.value()
self.spnEditorCursorWidth.setEnabled(self.chkEditorCursorWidth.isChecked())
settings.textEditor["alwaysCenter"] = self.chkEditorTypeWriterMode.isChecked()
settings.textEditor["focusMode"] = \
False if self.cmbEditorFocusMode.currentIndex() == 0 else \
"line" if self.cmbEditorFocusMode.currentIndex() == 1 else \
"paragraph"
# Text area
settings.textEditor["maxWidth"] = \

67
manuskript/ui/highlighters/markdownHighlighter.py
View file

@ -68,6 +68,49 @@ class MarkdownHighlighter(BasicHighlighter):
#f.setFamily("monospace")
#self.document().setDefaultFont(f)
def transparentFormat(self, fmt, alpha=75):
"""
Takes a QTextCharFormat and modify it with colors made transparent
using alpha channel. For focus mode
"""
c = fmt.foreground().color()
c.setAlpha(alpha)
fmt.setForeground(QBrush(c))
b = fmt.background()
if b.style() != Qt.NoBrush:
c = b.color()
c.setAlpha(alpha)
fmt.setBackground(QBrush(b))
def unfocusConditions(self):
"""
Returns:
- True if the text is suposed to be unfocused
- (start, end) if block is supposed to be unfocused except for that part.
"""
if self.editor._noFocusMode or not settings.textEditor["focusMode"]:
return False
if settings.textEditor["focusMode"] == "paragraph":
return not self.currentBlock().contains(
self.editor.textCursor().position())
elif settings.textEditor["focusMode"] == "line":
if self.currentBlock().contains(
self.editor.textCursor().position()):
block = self.currentBlock()
# Position of cursor in block
pos = self.editor.textCursor().position() - block.position()
for i in range(block.layout().lineCount()):
line = block.layout().lineAt(i)
start = line.textStart()
end = line.textStart() + line.textLength()
if start <= pos < end:
return (start, end)
else:
return True
return False
def doHighlightBlock(self, text):
"""
Note: Never set the QTextBlockFormat for a QTextBlock from within
@ -85,7 +128,20 @@ class MarkdownHighlighter(BasicHighlighter):
"""
lastState = self.currentBlockState()
self.setFormat(0, len(text), self._defaultCharFormat)
# self.setFormat(0, len(text), self._defaultCharFormat)
# Focus mode
unfocus = self.unfocusConditions()
if unfocus:
fmt = self.format(0)
fmt.setForeground(QBrush(self.defaultTextColor))
self.transparentFormat(fmt)
if type(unfocus) != bool:
start, end = unfocus
self.setFormat(0, start, fmt)
self.setFormat(end, len(text), fmt)
else:
self.setFormat(0, len(text), fmt)
if self.tokenizer != None:
self.tokenizer.clear()
@ -389,6 +445,15 @@ class MarkdownHighlighter(BasicHighlighter):
fmt,
markupFormat)
# Focus mode
unfocus = self.unfocusConditions()
if unfocus:
if (type(unfocus) == bool
or token.position < unfocus[0]
or unfocus[1] < token.position):
self.transparentFormat(fmt)
self.transparentFormat(markupFormat)
# Format openning Markup
self.setFormat(token.position, token.openingMarkupLength,
markupFormat)

32
manuskript/ui/settings_ui.py
View file

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'manuskript/ui/settings_ui.ui'
#
# Created by: PyQt5 UI code generator 5.5.1
# Created by: PyQt5 UI code generator 5.9
#
# WARNING! All changes made in this file will be lost!
@ -1310,6 +1310,23 @@ class Ui_Settings(object):
self.chkEditorTypeWriterMode.setFont(font)
self.chkEditorTypeWriterMode.setObjectName("chkEditorTypeWriterMode")
self.formLayout_10.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.chkEditorTypeWriterMode)
self.label_52 = QtWidgets.QLabel(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.label_52.setFont(font)
self.label_52.setObjectName("label_52")
self.formLayout_10.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_52)
self.cmbEditorFocusMode = QtWidgets.QComboBox(self.groupBox_15)
font = QtGui.QFont()
font.setBold(False)
font.setWeight(50)
self.cmbEditorFocusMode.setFont(font)
self.cmbEditorFocusMode.setObjectName("cmbEditorFocusMode")
self.cmbEditorFocusMode.addItem("")
self.cmbEditorFocusMode.addItem("")
self.cmbEditorFocusMode.addItem("")
self.formLayout_10.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.cmbEditorFocusMode)
self.verticalLayout_22.addWidget(self.groupBox_15)
self.horizontalLayout_4.addLayout(self.verticalLayout_22)
icon = QtGui.QIcon.fromTheme("view-text")
@ -1499,6 +1516,7 @@ class Ui_Settings(object):
self.layoutWidget = QtWidgets.QWidget(self.splitter)
self.layoutWidget.setObjectName("layoutWidget")
self.verticalLayout_14 = QtWidgets.QVBoxLayout(self.layoutWidget)
self.verticalLayout_14.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_14.setObjectName("verticalLayout_14")
self.cmbThemeEdit = QtWidgets.QComboBox(self.layoutWidget)
self.cmbThemeEdit.setObjectName("cmbThemeEdit")
@ -1513,6 +1531,7 @@ class Ui_Settings(object):
self.stackedWidgetPage1_2.setObjectName("stackedWidgetPage1_2")
self.formLayout_4 = QtWidgets.QFormLayout(self.stackedWidgetPage1_2)
self.formLayout_4.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout_4.setContentsMargins(0, 0, 0, 0)
self.formLayout_4.setObjectName("formLayout_4")
self.label_17 = QtWidgets.QLabel(self.stackedWidgetPage1_2)
self.label_17.setObjectName("label_17")
@ -1544,6 +1563,7 @@ class Ui_Settings(object):
self.stackedWidgetPage2_2.setObjectName("stackedWidgetPage2_2")
self.formLayout_5 = QtWidgets.QFormLayout(self.stackedWidgetPage2_2)
self.formLayout_5.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout_5.setContentsMargins(0, 0, 0, 0)
self.formLayout_5.setObjectName("formLayout_5")
self.label_20 = QtWidgets.QLabel(self.stackedWidgetPage2_2)
self.label_20.setObjectName("label_20")
@ -1641,6 +1661,7 @@ class Ui_Settings(object):
self.page_2.setObjectName("page_2")
self.formLayout_7 = QtWidgets.QFormLayout(self.page_2)
self.formLayout_7.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout_7.setContentsMargins(0, 0, 0, 0)
self.formLayout_7.setObjectName("formLayout_7")
self.label_29 = QtWidgets.QLabel(self.page_2)
self.label_29.setObjectName("label_29")
@ -1690,6 +1711,7 @@ class Ui_Settings(object):
self.stackedWidgetPage3_2.setObjectName("stackedWidgetPage3_2")
self.formLayout_6 = QtWidgets.QFormLayout(self.stackedWidgetPage3_2)
self.formLayout_6.setFieldGrowthPolicy(QtWidgets.QFormLayout.AllNonFixedFieldsGrow)
self.formLayout_6.setContentsMargins(0, 0, 0, 0)
self.formLayout_6.setObjectName("formLayout_6")
self.label_26 = QtWidgets.QLabel(self.stackedWidgetPage3_2)
self.label_26.setObjectName("label_26")
@ -1792,7 +1814,7 @@ class Ui_Settings(object):
self.horizontalLayout_8.addWidget(self.stack)
self.retranslateUi(Settings)
self.stack.setCurrentIndex(0)
self.stack.setCurrentIndex(2)
self.tabViews.setCurrentIndex(3)
self.themeStack.setCurrentIndex(1)
self.themeEditStack.setCurrentIndex(3)
@ -1914,7 +1936,7 @@ class Ui_Settings(object):
self.label_16.setText(_translate("Settings", "Image:"))
self.groupBox_11.setTitle(_translate("Settings", "Style"))
self.rdoCorkOldStyle.setText(_translate("Settings", "Old st&yle"))
self.rdoCorkNewStyle.setText(_translate("Settings", "Ne&w style"))
self.rdoCorkNewStyle.setText(_translate("Settings", "&New style"))
self.groupBox_5.setTitle(_translate("Settings", "Item colors"))
self.label_9.setText(_translate("Settings", "Icon color:"))
self.cmbCorkIcon.setItemText(0, _translate("Settings", "Nothing"))
@ -1986,6 +2008,10 @@ class Ui_Settings(object):
self.spnEditorCursorWidth.setSuffix(_translate("Settings", " px"))
self.chkEditorNoBlinking.setText(_translate("Settings", "Disable blinking"))
self.chkEditorTypeWriterMode.setText(_translate("Settings", "Typewriter mode"))
self.label_52.setText(_translate("Settings", "Focus mode"))
self.cmbEditorFocusMode.setItemText(0, _translate("Settings", "None"))
self.cmbEditorFocusMode.setItemText(1, _translate("Settings", "Line"))
self.cmbEditorFocusMode.setItemText(2, _translate("Settings", "Paragraph"))
self.tabViews.setTabText(self.tabViews.indexOf(self.tab_4), _translate("Settings", "Text editor"))
self.lblTitleLabels.setText(_translate("Settings", "Labels"))
self.btnLabelColor.setShortcut(_translate("Settings", "Ctrl+S"))

42
manuskript/ui/settings_ui.ui
View file

@ -54,7 +54,7 @@
<item>
<widget class="QStackedWidget" name="stack">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="stackedWidgetPage1">
<layout class="QVBoxLayout" name="verticalLayout_7">
@ -1697,7 +1697,7 @@
</font>
</property>
<property name="text">
<string>Ne&amp;w style</string>
<string>&amp;New style</string>
</property>
</widget>
</item>
@ -2653,6 +2653,44 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_52">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Focus mode</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="cmbEditorFocusMode">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<item>
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text">
<string>Line</string>
</property>
</item>
<item>
<property name="text">
<string>Paragraph</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>

1
manuskript/ui/views/MDEditCompleter.py
View file

@ -25,6 +25,7 @@ class MDEditCompleter(MDEditView):
self.completer = None
self.setMouseTracking(True)
self.refRects = []
self._noFocusMode = True
self.textChanged.connect(self.getRefRects)
self.document().documentLayoutChanged.connect(self.getRefRects)

1
manuskript/ui/views/MDEditView.py
View file

@ -27,6 +27,7 @@ class MDEditView(textEditView):
# Highlighter
self._textFormat = "md"
self._highlighterClass = MarkdownHighlighter
self._noFocusMode = False
if index:
# We have to setup things anew, for the highlighter notably

7
manuskript/ui/views/textEditView.py
View file

@ -67,6 +67,9 @@ class textEditView(QTextEdit):
# self.document().contentsChanged.connect(lambda: print(self.objectName(), "Contents changed"))
# Focus mode
self.cursorPositionChanged.connect(self.cursorHasMoved)
self.setEnabled(False)
if index:
@ -91,6 +94,10 @@ class textEditView(QTextEdit):
self.highlighter = self._highlighterClass(self)
self.highlighter.setDefaultBlockFormat(self._defaultBlockFormat)
def cursorHasMoved(self):
if self.highlighter:
self.highlighter.rehighlight()
def getDefaultLocale(self):
default_locale = enchant.get_default_language()
if default_locale is None: