jgrewe/blipblop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[help] store size settings, flake8

Browse Source
This commit is contained in:
Jan Grewe 2021-03-12 13:42:22 +01:00
parent 464e5421ae
commit 43d7b9a620
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blipblop/main.py
View File

@ -14,7 +14,6 @@ except ImportError:
pass pass
def main(): def main():
print("executing main.main")
app = QApplication(sys.argv) app = QApplication(sys.argv)
app.setApplicationName(cnst.application_name) app.setApplicationName(cnst.application_name)
app.setApplicationVersion(str(cnst.application_version)) app.setApplicationVersion(str(cnst.application_version))
@ -33,7 +32,6 @@ def main():
window.show() window.show()
code = app.exec_() code = app.exec_()
print("Application exit!")
pos = window.pos() pos = window.pos()
settings.setValue("app/width", window.width()) settings.setValue("app/width", window.width())
settings.setValue("app/height", window.height()) settings.setValue("app/height", window.height())

45
blipblop/ui/help.py
View File

@ -1,30 +1,39 @@
from PyQt5.QtGui import QIcon from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFrame, QHBoxLayout, QPushButton, QSizePolicy, QTextBrowser, QVBoxLayout, QWidget from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFrame, QHBoxLayout
from PyQt5.QtCore import QUrl from PyQt5.QtWidgets import QPushButton, QSizePolicy, QTextBrowser, QVBoxLayout, QWidget
from PyQt5.QtCore import QSettings, QUrl
import blipblop.constants as cnst import blipblop.constants as cnst
class HelpDialog(QDialog): class HelpDialog(QDialog):
def __init__(self, parent = None) -> None: def __init__(self, parent=None) -> None:
super().__init__(parent=parent) super().__init__(parent=parent)
self._settings = QSettings()
self.setModal(True) width = int(self._settings.value("help/width", 640))
self.setMinimumSize(500, 750) height = int(self._settings.value("help/height", 480))
x = int(self._settings.value("help/pos_x", 100))
y = int(self._settings.value("help/pos_y", 100))
self.setModal(True)
self.setMinimumSize(640, 480)
self.resize(width, height)
self.move(x, y)
self.finished.connect(self.on_finished)
self.help = HelpBrowser() self.help = HelpBrowser()
self.help._edit.historyChanged.connect(self._on_history_changed) self.help._edit.historyChanged.connect(self._on_history_changed)
self.back_btn = QPushButton(QIcon(":/icons/docs_back"), "back") self.back_btn = QPushButton(QIcon(":/icons/docs_back"), "back")
self.back_btn.setEnabled(False) self.back_btn.setEnabled(False)
self.back_btn.clicked.connect(self.help._edit.backward) self.back_btn.clicked.connect(self.help._edit.backward)
self.home_btn = QPushButton(QIcon(":/icons/docs_home"),"home") self.home_btn = QPushButton(QIcon(":/icons/docs_home"), "home")
self.home_btn.clicked.connect(self.help._edit.home) self.home_btn.clicked.connect(self.help._edit.home)
self.fwd_btn = QPushButton(QIcon(":/icons/docs_fwd"),"forward") self.fwd_btn = QPushButton(QIcon(":/icons/docs_fwd"), "forward")
self.fwd_btn.setEnabled(False) self.fwd_btn.setEnabled(False)
self.fwd_btn.clicked.connect(self.help._edit.forward) self.fwd_btn.clicked.connect(self.help._edit.forward)
empty = QWidget() empty = QWidget()
empty.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) empty.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
@ -32,8 +41,8 @@ class HelpDialog(QDialog):
hbox.addWidget(self.back_btn) hbox.addWidget(self.back_btn)
hbox.addWidget(self.home_btn) hbox.addWidget(self.home_btn)
hbox.addWidget(self.fwd_btn) hbox.addWidget(self.fwd_btn)
hbox.addWidget(empty) hbox.addWidget(empty)
bbox = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok) bbox = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok)
bbox.accepted.connect(self.accept) bbox.accepted.connect(self.accept)
layout = QVBoxLayout() layout = QVBoxLayout()
@ -42,17 +51,23 @@ class HelpDialog(QDialog):
layout.addWidget(self.help) layout.addWidget(self.help)
layout.addWidget(bbox) layout.addWidget(bbox)
self.setLayout(layout) self.setLayout(layout)
def _on_history_changed(self): def _on_history_changed(self):
self.back_btn.setEnabled(self.help._edit.isBackwardAvailable()) self.back_btn.setEnabled(self.help._edit.isBackwardAvailable())
self.fwd_btn.setEnabled(self.help._edit.isForwardAvailable()) self.fwd_btn.setEnabled(self.help._edit.isForwardAvailable())
def on_finished(self):
self._settings.setValue("help/width", self.width())
self._settings.setValue("help/height", self.height())
self._settings.setValue("help/pos_x", self.x())
self._settings.setValue("help/pos_y", self.y())
class HelpBrowser(QWidget): class HelpBrowser(QWidget):
def __init__(self, parent=None) -> None: def __init__(self, parent=None) -> None:
super().__init__(parent=parent) super().__init__(parent=parent)
self.setLayout(QVBoxLayout()) self.setLayout(QVBoxLayout())
# FIXME https://stackoverflow.com/a/43217828 about loading from resource files
doc_url = QUrl.fromLocalFile(cnst.DOCS_ROOT_FILE) doc_url = QUrl.fromLocalFile(cnst.DOCS_ROOT_FILE)
self._edit = QTextBrowser() self._edit = QTextBrowser()
self._edit.setOpenLinks(True) self._edit.setOpenLinks(True)