bouquin 0.1.10__py3-none-any.whl → 0.2.1.2__py3-none-any.whl

bouquin/save_dialog.py

@@ -18,6 +18,9 @@ class SaveDialog(QDialog):
         title: str = "Enter a name for this version",
         message: str = "Enter a name for this version?",
     ):
+        """
+        Used for explicitly saving a new version of a page.
+        """
         super().__init__(parent)
         self.setWindowTitle(title)
         v = QVBoxLayout(self)

bouquin/search.py

@@ -4,7 +4,6 @@ import re
 from typing import Iterable, Tuple
 
 from PySide6.QtCore import Qt, Signal
-from PySide6.QtGui import QFont, QTextCharFormat, QTextCursor, QTextDocument
 from PySide6.QtWidgets import (
     QFrame,
     QLabel,
@@ -70,7 +69,6 @@ class Search(QWidget):
         try:
             rows: Iterable[Row] = self._db.search_entries(q)
         except Exception:
-            # be quiet on DB errors here; caller can surface if desired
             rows = []
 
         self._populate_results(q, rows)
@@ -150,10 +148,12 @@ class Search(QWidget):
             self.results.setItemWidget(item, container)
 
     # --- Snippet/highlight helpers -----------------------------------------
-    def _make_html_snippet(self, html_src: str, query: str, *, radius=60, maxlen=180):
-        doc = QTextDocument()
-        doc.setHtml(html_src)
-        plain = doc.toPlainText()
+    def _make_html_snippet(
+        self, markdown_src: str, query: str, *, radius=60, maxlen=180
+    ):
+        # For markdown, we can work directly with the text
+        # Strip markdown formatting for display
+        plain = self._strip_markdown(markdown_src)
         if not plain:
             return "", False, False
 
@@ -180,30 +180,45 @@ class Search(QWidget):
             start = max(0, min(idx - radius, max(0, L - maxlen)))
             end = min(L, max(idx + mlen + radius, start + maxlen))
 
-        # Bold all token matches that fall inside [start, end)
+        # Extract snippet and highlight matches
+        snippet = plain[start:end]
+
+        # Escape HTML and bold matches
+        import html as _html
+
+        snippet_html = _html.escape(snippet)
         if tokens:
-            lower = plain.lower()
-            fmt = QTextCharFormat()
-            fmt.setFontWeight(QFont.Weight.Bold)
             for t in tokens:
-                t_low = t.lower()
-                pos = start
-                while True:
-                    k = lower.find(t_low, pos)
-                    if k == -1 or k >= end:
-                        break
-                    c = QTextCursor(doc)
-                    c.setPosition(k)
-                    c.setPosition(k + len(t), QTextCursor.MoveMode.KeepAnchor)
-                    c.mergeCharFormat(fmt)
-                    pos = k + len(t)
-
-        # Select the window and export as HTML fragment
-        c = QTextCursor(doc)
-        c.setPosition(start)
-        c.setPosition(end, QTextCursor.MoveMode.KeepAnchor)
-        fragment_html = (
-            c.selection().toHtml()
-        )  # preserves original styles + our bolding
-
-        return fragment_html, start > 0, end < L
+                # Case-insensitive replacement
+                pattern = re.compile(re.escape(t), re.IGNORECASE)
+                snippet_html = pattern.sub(
+                    lambda m: f"<b>{m.group(0)}</b>", snippet_html
+                )
+
+        return snippet_html, start > 0, end < L
+
+    def _strip_markdown(self, markdown: str) -> str:
+        """Strip markdown formatting for plain text display."""
+        # Remove images
+        text = re.sub(r"!\[.*?\]\(.*?\)", "[Image]", markdown)
+        # Remove links but keep text
+        text = re.sub(r"\[([^\]]+)\]\([^\)]+\)", r"\1", text)
+        # Remove inline code backticks
+        text = re.sub(r"`([^`]+)`", r"\1", text)
+        # Remove bold/italic markers
+        text = re.sub(r"\*\*([^*]+)\*\*", r"\1", text)
+        text = re.sub(r"__([^_]+)__", r"\1", text)
+        text = re.sub(r"\*([^*]+)\*", r"\1", text)
+        text = re.sub(r"_([^_]+)_", r"\1", text)
+        # Remove strikethrough
+        text = re.sub(r"~~([^~]+)~~", r"\1", text)
+        # Remove heading markers
+        text = re.sub(r"^#{1,6}\s+", "", text, flags=re.MULTILINE)
+        # Remove list markers
+        text = re.sub(r"^\s*[-*+]\s+", "", text, flags=re.MULTILINE)
+        text = re.sub(r"^\s*\d+\.\s+", "", text, flags=re.MULTILINE)
+        # Remove checkbox markers
+        text = re.sub(r"^\s*-\s*\[[x ☐☑]\]\s+", "", text, flags=re.MULTILINE)
+        # Remove code block fences
+        text = re.sub(r"```[^\n]*\n", "", text)
+        return text.strip()

bouquin/settings_dialog.py

@@ -246,7 +246,7 @@ class SettingsDialog(QDialog):
         )
 
         save_db_config(self._cfg)
-        self.parent().themes.apply(selected_theme)
+        self.parent().themes.set(selected_theme)
         self.accept()
 
     def _change_key(self):

bouquin/theme.py

@@ -49,7 +49,7 @@ class ThemeManager(QObject):
             scheme = getattr(hints, "colorScheme", None)
             if callable(scheme):
                 scheme = hints.colorScheme()
-            # 0=Light, 1=Dark in newer Qt; fall back to Light
+            # 0=Light, 1=Dark; fall back to Light
             theme = Theme.DARK if scheme == 1 else Theme.LIGHT
 
         # Always use Fusion so palette applies consistently cross-platform
@@ -58,7 +58,6 @@ class ThemeManager(QObject):
         if theme == Theme.DARK:
             pal = self._dark_palette()
             self._app.setPalette(pal)
-            # keep stylesheet empty unless you need widget-specific tweaks
             self._app.setStyleSheet("")
         else:
             pal = self._light_palette()

bouquin/toolbar.py

@@ -8,14 +8,12 @@ from PySide6.QtWidgets import QToolBar
 class ToolBar(QToolBar):
     boldRequested = Signal()
     italicRequested = Signal()
-    underlineRequested = Signal()
     strikeRequested = Signal()
     codeRequested = Signal()
     headingRequested = Signal(int)
     bulletsRequested = Signal()
     numbersRequested = Signal()
     checkboxesRequested = Signal()
-    alignRequested = Signal(Qt.AlignmentFlag)
     historyRequested = Signal()
     insertImageRequested = Signal()
 
@@ -39,12 +37,6 @@ class ToolBar(QToolBar):
         self.actItalic.setShortcut(QKeySequence.Italic)
         self.actItalic.triggered.connect(self.italicRequested)
 
-        self.actUnderline = QAction("U", self)
-        self.actUnderline.setToolTip("Underline")
-        self.actUnderline.setCheckable(True)
-        self.actUnderline.setShortcut(QKeySequence.Underline)
-        self.actUnderline.triggered.connect(self.underlineRequested)
-
         self.actStrike = QAction("S", self)
         self.actStrike.setToolTip("Strikethrough")
         self.actStrike.setCheckable(True)
@@ -97,24 +89,6 @@ class ToolBar(QToolBar):
         self.actInsertImg.setShortcut("Ctrl+Shift+I")
         self.actInsertImg.triggered.connect(self.insertImageRequested)
 
-        # Alignment
-        self.actAlignL = QAction("L", self)
-        self.actAlignL.setToolTip("Align Left")
-        self.actAlignL.setCheckable(True)
-        self.actAlignL.triggered.connect(lambda: self.alignRequested.emit(Qt.AlignLeft))
-        self.actAlignC = QAction("C", self)
-        self.actAlignC.setToolTip("Align Center")
-        self.actAlignC.setCheckable(True)
-        self.actAlignC.triggered.connect(
-            lambda: self.alignRequested.emit(Qt.AlignHCenter)
-        )
-        self.actAlignR = QAction("R", self)
-        self.actAlignR.setToolTip("Align Right")
-        self.actAlignR.setCheckable(True)
-        self.actAlignR.triggered.connect(
-            lambda: self.alignRequested.emit(Qt.AlignRight)
-        )
-
         # History button
         self.actHistory = QAction("History", self)
         self.actHistory.triggered.connect(self.historyRequested)
@@ -125,7 +99,6 @@ class ToolBar(QToolBar):
         for a in (
             self.actBold,
             self.actItalic,
-            self.actUnderline,
             self.actStrike,
             self.actH1,
             self.actH2,
@@ -135,17 +108,16 @@ class ToolBar(QToolBar):
             a.setCheckable(True)
             a.setActionGroup(self.grpHeadings)
 
-        self.grpAlign = QActionGroup(self)
-        self.grpAlign.setExclusive(True)
-        for a in (self.actAlignL, self.actAlignC, self.actAlignR):
-            a.setActionGroup(self.grpAlign)
+        self.grpLists = QActionGroup(self)
+        self.grpLists.setExclusive(True)
+        for a in (self.actBullets, self.actNumbers, self.actCheckboxes):
+            a.setActionGroup(self.grpLists)
 
         # Add actions
         self.addActions(
             [
                 self.actBold,
                 self.actItalic,
-                self.actUnderline,
                 self.actStrike,
                 self.actCode,
                 self.actH1,
@@ -156,9 +128,6 @@ class ToolBar(QToolBar):
                 self.actNumbers,
                 self.actCheckboxes,
                 self.actInsertImg,
-                self.actAlignL,
-                self.actAlignC,
-                self.actAlignR,
                 self.actHistory,
             ]
         )
@@ -166,7 +135,6 @@ class ToolBar(QToolBar):
     def _apply_toolbar_styles(self):
         self._style_letter_button(self.actBold, "B", bold=True)
         self._style_letter_button(self.actItalic, "I", italic=True)
-        self._style_letter_button(self.actUnderline, "U", underline=True)
         self._style_letter_button(self.actStrike, "S", strike=True)
         # Monospace look for code; use a fixed font
         code_font = QFontDatabase.systemFont(QFontDatabase.FixedFont)
@@ -182,11 +150,6 @@ class ToolBar(QToolBar):
         self._style_letter_button(self.actBullets, "•")
         self._style_letter_button(self.actNumbers, "1.")
 
-        # Alignment
-        self._style_letter_button(self.actAlignL, "L")
-        self._style_letter_button(self.actAlignC, "C")
-        self._style_letter_button(self.actAlignR, "R")
-
         # History
         self._style_letter_button(self.actHistory, "View History")
 

{bouquin-0.1.10.dist-info → bouquin-0.2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bouquin
-Version: 0.1.10
+Version: 0.2.1.2
 Summary: Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher.
 Home-page: https://git.mig5.net/mig5/bouquin
 License: GPL-3.0-or-later
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: markdownify (>=1.2.0,<2.0.0)
 Requires-Dist: pyside6 (>=6.8.1,<7.0.0)
 Requires-Dist: sqlcipher3-wheels (>=0.5.5.post0,<0.6.0)
 Project-URL: Repository, https://git.mig5.net/mig5/bouquin
@@ -36,7 +35,7 @@ There is deliberately no network connectivity or syncing intended.
 
 ## Screenshot
 
-![Screenshot of Bouquin](./screenshot.png)
+![Screenshot of Bouquin](https://git.mig5.net/mig5/bouquin/raw/branch/main/screenshot.png)
 
 ## Features
 
@@ -44,15 +43,19 @@ There is deliberately no network connectivity or syncing intended.
  * 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
+ * Text is Markdown with basic styling
+ * Tabs are supported - right-click on a date from the calendar to open it in a new tab.
  * Images are supported
- * Search
+ * Search all pages, or find text on page (Ctrl+F)
  * Automatic periodic saving (or explicitly save)
  * Transparent integrity checking of the database when it opens
  * Automatic locking of the app after a period of inactivity (default 15 min)
  * Rekey the database (change the password)
- * Export the database to json, txt, html, csv or .sql (for sqlite3)
+ * Export the database to json, txt, html, csv, markdown or .sql (for sqlite3)
  * Backup the database to encrypted SQLCipher format (which can then be loaded back in to a Bouquin)
+ * Dark and light themes
+ * Automatically generate checkboxes when typing 'TODO'
+ * Optionally automatically move unchecked checkboxes from yesterday to today, on startup
 
 
 ## How to install
@@ -79,5 +82,5 @@ Make sure you have `libxcb-cursor0` installed (it may be called something else o
  * Clone the repo
  * Ensure you have poetry installed
  * Run `poetry install --with test`
- * Run `poetry run pytest -vvvv --cov=bouquin`
+ * Run `./tests.sh`
 

bouquin-0.2.1.2.dist-info/RECORD

@@ -0,0 +1,21 @@
+bouquin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bouquin/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
+bouquin/db.py,sha256=mx7ogJnH_wVaCRpkOy7KBLLHyMOJDorHY14L9xz_QkE,15576
+bouquin/find_bar.py,sha256=oDl3XyW7NY6q-MvDCuGglH62-nLER_HEi0W2blbWF0Y,6335
+bouquin/history_dialog.py,sha256=m-crhYV_a3CMGh5-sjhvIOqpFdmB3VKNr5QCoiEaDHY,6259
+bouquin/key_prompt.py,sha256=oQhLDOQv1QUr_ImA9Zu78JkDpVqPbZZJdhu0c_5Cq5U,1266
+bouquin/lock_overlay.py,sha256=d1xoBMx2CSNk0zP5V6k65UqJCC4aiIrwNlfDld49ymA,4197
+bouquin/main.py,sha256=lBOMS7THgHb4CAJVj8NRYABtNAEez9jlL0wI1oOtfT4,611
+bouquin/main_window.py,sha256=idyUFj_lNlmSCZgfYecV16JMzQJAm2ZcmEmzNCM-jmQ,50690
+bouquin/markdown_editor.py,sha256=MeKe8LkFh2XtEwUnIiIshKytGmMVVOV_3F-aUVhdKyQ,29017
+bouquin/save_dialog.py,sha256=YUkZ8kL1hja15D8qv68yY2zPyjBAJZsDQbp6Y6EvDbA,1023
+bouquin/search.py,sha256=jUhiy90pThmQUvsDnKYjes5SRnAWKBkqGpHPWMsfRJs,7764
+bouquin/settings.py,sha256=F3WLkk2G_By3ppZsRbrnq3PtL2Zav7aA-mIegvGTc8Y,1128
+bouquin/settings_dialog.py,sha256=YQHYjn3y2sgJGtkkApADxAodojDfLvnZYeQmynXLkos,10699
+bouquin/theme.py,sha256=6ODq9oKLAk7lnvW9uGRMIIjfhf70SgPivLYh3ZN671M,3489
+bouquin/toolbar.py,sha256=_FZ4lqJmQD86qx-0k7XpAu3HzyFedX2pG2mGyug0ea8,6588
+bouquin-0.2.1.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+bouquin-0.2.1.2.dist-info/METADATA,sha256=LAbzz9A-S-ymz6cHn-oZ8IeksoxlKZiGc5qpc71Ugzs,3141
+bouquin-0.2.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+bouquin-0.2.1.2.dist-info/entry_points.txt,sha256=d2C5Mc85suj1vWg_mmcfFuEBAYEkdwhZquusme5EWuQ,49
+bouquin-0.2.1.2.dist-info/RECORD,,