mig5/bouquin
1
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

Tweak UI for diff

Browse source
This commit is contained in:
Miguel Jacq 2025-11-02 19:15:55 +11:00
parent 82069053be
commit b71e7ea1e3
Signed by: mig5
GPG key ID: 59B3F0C24135C6A9
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,3 +1,7 @@
# 0.1.6
* Fix shortcuts for next/previous day to not collide with Normal text (Ctrl+N)
# 0.1.5 # 0.1.5
* Refactor schema to support versioning of pages. Add HistoryDialog and diff with ability to revert. * Refactor schema to support versioning of pages. Add HistoryDialog and diff with ability to revert.

1
README.md
View file

@ -22,6 +22,7 @@ There is deliberately no network connectivity or syncing intended.
* Data is encrypted at rest * Data is encrypted at rest
* Encryption key is prompted for and never stored, unless user chooses to via Settings * Encryption key is prompted for and never stored, unless user chooses to via Settings
* Every 'page' is linked to the calendar day * Every 'page' is linked to the calendar day
* All changes are version controlled, with ability to view/diff versions and revert
* Text is HTML with basic styling * Text is HTML with basic styling
* Search * Search
* Automatic periodic saving (or explicitly save) * Automatic periodic saving (or explicitly save)

4
bouquin/history_dialog.py
View file

@ -77,14 +77,14 @@ class HistoryDialog(QDialog):
self.list.currentItemChanged.connect(self._on_select) self.list.currentItemChanged.connect(self._on_select)
top.addWidget(self.list, 1) top.addWidget(self.list, 1)
# Right: tabs (Preview / Diff vs current) # Right: tabs (Preview / Diff)
self.tabs = QTabWidget() self.tabs = QTabWidget()
self.preview = QTextBrowser() self.preview = QTextBrowser()
self.preview.setOpenExternalLinks(True) self.preview.setOpenExternalLinks(True)
self.diff = QTextBrowser() self.diff = QTextBrowser()
self.diff.setOpenExternalLinks(False) self.diff.setOpenExternalLinks(False)
self.tabs.addTab(self.preview, "Preview") self.tabs.addTab(self.preview, "Preview")
self.tabs.addTab(self.diff, "Diff vs current") self.tabs.addTab(self.diff, "Diff")
self.tabs.setMinimumSize(500, 650) self.tabs.setMinimumSize(500, 650)
top.addWidget(self.tabs, 2) top.addWidget(self.tabs, 2)

4
bouquin/main_window.py
View file

@ -210,14 +210,14 @@ class MainWindow(QMainWindow):
# Navigate menu with next/previous/today # Navigate menu with next/previous/today
nav_menu = mb.addMenu("&Navigate") nav_menu = mb.addMenu("&Navigate")
act_prev = QAction("Previous Day", self) act_prev = QAction("Previous Day", self)
act_prev.setShortcut("Ctrl+P") act_prev.setShortcut("Ctrl+<")
act_prev.setShortcutContext(Qt.ApplicationShortcut) act_prev.setShortcutContext(Qt.ApplicationShortcut)
act_prev.triggered.connect(lambda: self._adjust_day(-1)) act_prev.triggered.connect(lambda: self._adjust_day(-1))
nav_menu.addAction(act_prev) nav_menu.addAction(act_prev)
self.addAction(act_prev) self.addAction(act_prev)
act_next = QAction("Next Day", self) act_next = QAction("Next Day", self)
act_next.setShortcut("Ctrl+N") act_next.setShortcut("Ctrl+>")
act_next.setShortcutContext(Qt.ApplicationShortcut) act_next.setShortcutContext(Qt.ApplicationShortcut)
act_next.triggered.connect(lambda: self._adjust_day(1)) act_next.triggered.connect(lambda: self._adjust_day(1))
nav_menu.addAction(act_next) nav_menu.addAction(act_next)

2
pyproject.toml
View file

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "bouquin" name = "bouquin"
version = "0.1.5" version = "0.1.6"
description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher." description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher."
authors = ["Miguel Jacq <mig@mig5.net>"] authors = ["Miguel Jacq <mig@mig5.net>"]
readme = "README.md" readme = "README.md"