Tweak UI for diff

CHANGELOG.md

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

README.md

@@ -22,6 +22,7 @@ There is deliberately no network connectivity or syncing intended.
  * Data is encrypted at rest
  * Encryption key is prompted for and never stored, unless user chooses to via Settings
  * 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
  * Search
  * Automatic periodic saving (or explicitly save)

bouquin/history_dialog.py

@@ -77,14 +77,14 @@ class HistoryDialog(QDialog):
         self.list.currentItemChanged.connect(self._on_select)
         top.addWidget(self.list, 1)
 
-        # Right: tabs (Preview / Diff vs current)
+        # Right: tabs (Preview / Diff)
         self.tabs = QTabWidget()
         self.preview = QTextBrowser()
         self.preview.setOpenExternalLinks(True)
         self.diff = QTextBrowser()
         self.diff.setOpenExternalLinks(False)
         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)
         top.addWidget(self.tabs, 2)
 

bouquin/main_window.py

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

pyproject.toml

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