mirror of
https://github.com/olivierkes/manuskript.git
synced 2024-06-13 16:34:34 +12:00
Improves cheat-sheet usability
This commit is contained in:
parent
a5aa2fdd07
commit
d10fc7d4d2
|
@ -28,10 +28,12 @@ class cheatSheet(QWidget, Ui_cheatSheet):
|
||||||
self.listDelegate = listCompleterDelegate(self)
|
self.listDelegate = listCompleterDelegate(self)
|
||||||
self.list.setItemDelegate(self.listDelegate)
|
self.list.setItemDelegate(self.listDelegate)
|
||||||
self.list.itemActivated.connect(self.showInfos)
|
self.list.itemActivated.connect(self.showInfos)
|
||||||
self.list.hide()
|
self.hideList()
|
||||||
self.list.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
|
self.list.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
|
||||||
self.view.linkActivated.connect(self.openLink)
|
self.view.linkActivated.connect(self.openLink)
|
||||||
self.view.linkHovered.connect(self.linkHovered)
|
self.view.linkHovered.connect(self.linkHovered)
|
||||||
|
self.btnShowList.toggled.connect(self.list.setVisible)
|
||||||
|
self.line.hide()
|
||||||
|
|
||||||
self.outlineModel = None
|
self.outlineModel = None
|
||||||
self.persoModel = None
|
self.persoModel = None
|
||||||
|
@ -64,10 +66,14 @@ class cheatSheet(QWidget, Ui_cheatSheet):
|
||||||
|
|
||||||
def textChanged(self, text):
|
def textChanged(self, text):
|
||||||
if not text:
|
if not text:
|
||||||
self.list.hide()
|
self.hideList()
|
||||||
else:
|
else:
|
||||||
self.list.show()
|
self.list.show()
|
||||||
|
|
||||||
|
def hideList(self):
|
||||||
|
if not self.btnShowList.isChecked():
|
||||||
|
self.list.hide()
|
||||||
|
|
||||||
def populate(self):
|
def populate(self):
|
||||||
if self.persoModel:
|
if self.persoModel:
|
||||||
d = []
|
d = []
|
||||||
|
@ -125,7 +131,8 @@ class cheatSheet(QWidget, Ui_cheatSheet):
|
||||||
def updateListFromData(self):
|
def updateListFromData(self):
|
||||||
self.list.clear()
|
self.list.clear()
|
||||||
for cat in self.data:
|
for cat in self.data:
|
||||||
filtered = [i for i in self.data[cat] if self.txtFilter.text().lower() in i[0].lower()]
|
filtered = [i for i in self.data[cat] if self.txtFilter.text().lower() in i[0].lower() or
|
||||||
|
self.txtFilter.text().lower() in cat[0].lower()]
|
||||||
if filtered:
|
if filtered:
|
||||||
self.addCategory(cat[0])
|
self.addCategory(cat[0])
|
||||||
for item in filtered:
|
for item in filtered:
|
||||||
|
@ -137,7 +144,7 @@ class cheatSheet(QWidget, Ui_cheatSheet):
|
||||||
self.list.setCurrentRow(1)
|
self.list.setCurrentRow(1)
|
||||||
|
|
||||||
def showInfos(self):
|
def showInfos(self):
|
||||||
self.list.hide()
|
self.hideList()
|
||||||
i = self.list.currentItem()
|
i = self.list.currentItem()
|
||||||
ref = i.data(Qt.UserRole)
|
ref = i.data(Qt.UserRole)
|
||||||
if ref:
|
if ref:
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'manuskript/ui/cheatSheet_ui.ui'
|
# Form implementation generated from reading ui file 'manuskript/ui/cheatSheet_ui.ui'
|
||||||
#
|
#
|
||||||
# Created: Mon Feb 8 10:48:00 2016
|
# Created by: PyQt5 UI code generator 5.4.2
|
||||||
# by: PyQt5 UI code generator 5.2.1
|
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
@ -14,19 +13,30 @@ class Ui_cheatSheet(object):
|
||||||
cheatSheet.setObjectName("cheatSheet")
|
cheatSheet.setObjectName("cheatSheet")
|
||||||
cheatSheet.resize(400, 344)
|
cheatSheet.resize(400, 344)
|
||||||
self.verticalLayout_2 = QtWidgets.QVBoxLayout(cheatSheet)
|
self.verticalLayout_2 = QtWidgets.QVBoxLayout(cheatSheet)
|
||||||
self.verticalLayout_2.setSpacing(0)
|
|
||||||
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
|
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.verticalLayout_2.setSpacing(0)
|
||||||
self.verticalLayout_2.setObjectName("verticalLayout_2")
|
self.verticalLayout_2.setObjectName("verticalLayout_2")
|
||||||
|
self.horizontalLayout = QtWidgets.QHBoxLayout()
|
||||||
|
self.horizontalLayout.setSpacing(0)
|
||||||
|
self.horizontalLayout.setObjectName("horizontalLayout")
|
||||||
self.txtFilter = QtWidgets.QLineEdit(cheatSheet)
|
self.txtFilter = QtWidgets.QLineEdit(cheatSheet)
|
||||||
self.txtFilter.setFrame(False)
|
self.txtFilter.setFrame(False)
|
||||||
self.txtFilter.setClearButtonEnabled(True)
|
self.txtFilter.setClearButtonEnabled(True)
|
||||||
self.txtFilter.setObjectName("txtFilter")
|
self.txtFilter.setObjectName("txtFilter")
|
||||||
self.verticalLayout_2.addWidget(self.txtFilter)
|
self.horizontalLayout.addWidget(self.txtFilter)
|
||||||
|
self.btnShowList = QtWidgets.QPushButton(cheatSheet)
|
||||||
|
self.btnShowList.setText("")
|
||||||
|
icon = QtGui.QIcon.fromTheme("go-bottom")
|
||||||
|
self.btnShowList.setIcon(icon)
|
||||||
|
self.btnShowList.setCheckable(True)
|
||||||
|
self.btnShowList.setFlat(True)
|
||||||
|
self.btnShowList.setObjectName("btnShowList")
|
||||||
|
self.horizontalLayout.addWidget(self.btnShowList)
|
||||||
|
self.verticalLayout_2.addLayout(self.horizontalLayout)
|
||||||
self.line = QtWidgets.QFrame(cheatSheet)
|
self.line = QtWidgets.QFrame(cheatSheet)
|
||||||
self.line.setFrameShadow(QtWidgets.QFrame.Plain)
|
self.line.setFrameShadow(QtWidgets.QFrame.Plain)
|
||||||
self.line.setLineWidth(0)
|
self.line.setLineWidth(0)
|
||||||
self.line.setFrameShape(QtWidgets.QFrame.HLine)
|
self.line.setFrameShape(QtWidgets.QFrame.HLine)
|
||||||
self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
|
|
||||||
self.line.setObjectName("line")
|
self.line.setObjectName("line")
|
||||||
self.verticalLayout_2.addWidget(self.line)
|
self.verticalLayout_2.addWidget(self.line)
|
||||||
self.splitter = QtWidgets.QSplitter(cheatSheet)
|
self.splitter = QtWidgets.QSplitter(cheatSheet)
|
||||||
|
@ -46,11 +56,11 @@ class Ui_cheatSheet(object):
|
||||||
self.scrollArea.setWidgetResizable(True)
|
self.scrollArea.setWidgetResizable(True)
|
||||||
self.scrollArea.setObjectName("scrollArea")
|
self.scrollArea.setObjectName("scrollArea")
|
||||||
self.scrollAreaWidgetContents = QtWidgets.QWidget()
|
self.scrollAreaWidgetContents = QtWidgets.QWidget()
|
||||||
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 68))
|
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 400, 70))
|
||||||
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
|
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
|
||||||
self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
|
self.verticalLayout = QtWidgets.QVBoxLayout(self.scrollAreaWidgetContents)
|
||||||
self.verticalLayout.setSpacing(0)
|
|
||||||
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
|
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.verticalLayout.setSpacing(0)
|
||||||
self.verticalLayout.setObjectName("verticalLayout")
|
self.verticalLayout.setObjectName("verticalLayout")
|
||||||
self.view = QtWidgets.QLabel(self.scrollAreaWidgetContents)
|
self.view = QtWidgets.QLabel(self.scrollAreaWidgetContents)
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
|
||||||
|
|
|
@ -30,17 +30,40 @@
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="txtFilter">
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<property name="frame">
|
<property name="spacing">
|
||||||
<bool>false</bool>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="placeholderText">
|
<item>
|
||||||
<string>Filter (type the name of anything in your project)</string>
|
<widget class="QLineEdit" name="txtFilter">
|
||||||
</property>
|
<property name="frame">
|
||||||
<property name="clearButtonEnabled">
|
<bool>false</bool>
|
||||||
<bool>true</bool>
|
</property>
|
||||||
</property>
|
<property name="placeholderText">
|
||||||
</widget>
|
<string>Filter (type the name of anything in your project)</string>
|
||||||
|
</property>
|
||||||
|
<property name="clearButtonEnabled">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="btnShowList">
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset theme="go-bottom"/>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="flat">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="Line" name="line">
|
<widget class="Line" name="line">
|
||||||
|
@ -87,7 +110,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>400</width>
|
<width>400</width>
|
||||||
<height>68</height>
|
<height>70</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
|
|
Loading…
Reference in a new issue