bouquin 0.4.1__tar.gz → 0.4.2__tar.gz

{bouquin-0.4.1 → bouquin-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bouquin
-Version: 0.4.1
+Version: 0.4.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

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/bug_report_dialog.py

@@ -70,10 +70,6 @@ class BugReportDialog(QDialog):
         self.text_edit.setPlainText(text[: self.MAX_CHARS])
         self.text_edit.blockSignals(False)
 
-        # Clamp cursor position to end of text
-        if pos > self.MAX_CHARS:
-            pos = self.MAX_CHARS
-
         cursor.setPosition(pos)
         self.text_edit.setTextCursor(cursor)
 
@@ -88,10 +84,7 @@ class BugReportDialog(QDialog):
             return
 
         # Get current app version
-        try:
-            version = importlib.metadata.version("bouquin")
-        except importlib.metadata.PackageNotFoundError:
-            version = "unknown"
+        version = importlib.metadata.version("bouquin")
 
         payload: dict[str, str] = {
             "message": text,

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/db.py

@@ -61,7 +61,10 @@ class DBConfig:
     idle_minutes: int = 15  # 0 = never lock
     theme: str = "system"
     move_todos: bool = False
+    tags: bool = True
+    time_log: bool = True
     locale: str = "en"
+    font_size: int = 11
 
 
 class DBManager:
@@ -734,12 +737,8 @@ class DBManager:
                 page_most_revisions_count = c
                 page_most_revisions = date_iso
 
-            try:
-                d = _dt.date.fromisoformat(date_iso)
-                revisions_by_date[d] = c
-            except ValueError:
-                # Ignore malformed dates
-                pass
+            d = _dt.date.fromisoformat(date_iso)
+            revisions_by_date[d] = c
 
         # 4) total words + per-date words (current version only)
         entries = self.get_all_entries()
@@ -749,11 +748,8 @@ class DBManager:
         for date_iso, content in entries:
             wc = self._count_words(content or "")
             total_words += wc
-            try:
-                d = _dt.date.fromisoformat(date_iso)
-                words_by_date[d] = wc
-            except ValueError:
-                pass
+            d = _dt.date.fromisoformat(date_iso)
+            words_by_date[d] = wc
 
         # tags + page with most tags
 

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/key_prompt.py

@@ -99,8 +99,9 @@ class KeyPrompt(QDialog):
 
     def db_path(self) -> Path | None:
         """Return the chosen DB path (or None if unchanged/not shown)."""
+        p = self._db_path
         if self.path_edit is not None:
             text = self.path_edit.text().strip()
             if text:
-                return Path(text)
-        return self._db_path
+                p = Path(text)
+        return p

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/locales/en.json

@@ -5,7 +5,6 @@
     "db_version_id_does_not_belong_to_the_given_date": "version_id does not belong to the given date",
     "db_key_incorrect": "The key is probably incorrect",
     "db_database_error": "Database error",
-    "database_path": "Database path",
     "database_maintenance": "Database maintenance",
     "database_compact": "Compact the database",
     "database_compact_explanation": "Compacting runs VACUUM on the database. This can help reduce its size.",
@@ -26,16 +25,14 @@
     "close": "Close",
     "find": "Find",
     "file": "File",
-    "locale": "Locale",
+    "locale": "Language",
     "locale_restart": "Please restart the application to load the new language.",
     "settings": "Settings",
     "theme": "Theme",
     "system": "System",
     "light": "Light",
     "dark": "Dark",
-    "behaviour": "Behaviour",
     "never": "Never",
-    "browse": "Browse",
     "close_tab": "Close tab",
     "previous": "Previous",
     "previous_day": "Previous day",
@@ -45,7 +42,6 @@
     "show": "Show",
     "history": "History",
     "view_history": "View History",
-    "export": "Export",
     "export_accessible_flag": "&Export",
     "export_entries": "Export entries",
     "export_complete": "Export complete",
@@ -98,15 +94,23 @@
     "backup_encrypted_notebook": "Backup encrypted notebook",
     "enter_a_name_for_this_version": "Enter a name for this version",
     "new_version_i_saved_at": "New version I saved at",
+    "appearance": "Appearance",
+    "security": "Security",
+    "features": "Features",
+    "database": "Database",
     "save_key_warning": "If you don't want to be prompted for your encryption key, check this to remember it.\nWARNING: the key is saved to disk and could be recoverable if your disk is compromised.",
     "lock_screen_when_idle": "Lock screen when idle",
-    "autolock_explanation": "Bouquin will automatically lock the notepad after this length of time, after which you'll need to re-enter the key to unlock it.'nSet to 0 (never) to never lock.",
+    "autolock_explanation": "Bouquin will automatically lock the notepad after this length of time, after which you'll need to re-enter the key to unlock it.\nSet to 0 (never) to never lock.",
+    "font_size": "Font size",
+    "font_size_explanation": "Changing this value will change the size of all paragraph text in all tabs. It does not affect heading or code block size",
     "search_for_notes_here": "Search for notes here",
     "toolbar_format": "Format",
     "toolbar_bold": "Bold",
     "toolbar_italic": "Italic",
     "toolbar_strikethrough": "Strikethrough",
     "toolbar_normal_paragraph_text": "Normal paragraph text",
+    "toolbar_font_smaller": "Smaller text",
+    "toolbar_font_larger": "Larger text",
     "toolbar_bulleted_list": "Bulleted list",
     "toolbar_numbered_list": "Numbered list",
     "toolbar_code_block": "Code block",
@@ -115,20 +119,11 @@
     "tags": "Tags",
     "tag": "Tag",
     "manage_tags": "Manage tags",
-    "main_window_manage_tags_accessible_flag": "Manage &Tags",
     "add_tag_placeholder": "Add a tag and press Enter",
     "tag_browser_title": "Tag Browser",
     "tag_browser_instructions": "Click a tag to expand and see all pages with that tag. Click a date to open it. Select a tag to edit its name, change its color, or delete it globally.",
-    "tag_name": "Tag name",
-    "tag_color_hex": "Hex colour",
     "color_hex": "Colour",
     "date": "Date",
-    "pick_color": "Pick colour",
-    "invalid_color_title": "Invalid colour",
-    "invalid_color_message": "Please enter a valid hex colour like #RRGGBB.",
-    "add": "Add",
-    "remove": "Remove",
-    "ok": "OK",
     "add_a_tag": "Add a tag",
     "edit_tag_name": "Edit tag name",
     "new_tag_name": "New tag name:",
@@ -156,6 +151,7 @@
     "bug_report_send_failed": "Could not send bug report.",
     "bug_report_sent_ok": "Bug report sent. Thank you!",
     "send": "Send",
+    "reminder": "Reminder",
     "set_reminder": "Set reminder prompt",
     "set_reminder_prompt": "Enter a time",
     "reminder_no_text_fallback": "You scheduled a reminder to alert you now!",
@@ -193,7 +189,6 @@
     "invalid_activity_title": "Invalid activity",
     "invalid_project_message": "The project is invalid",
     "invalid_project_title": "Invalid project",
-    "label_key": "Label",
     "manage_activities": "Manage activities",
     "manage_projects": "Manage projects",
     "manage_projects_activities": "Manage project activities",
@@ -209,8 +204,14 @@
     "rename_activity": "Rename activity",
     "rename_project": "Rename project",
     "run_report": "Run report",
-    "add_project_label": "Add a project",
+    "add_activity_title": "Add activity",
     "add_activity_label": "Add an activity",
+    "rename_activity_label": "Rename activity",
+    "add_project_title": "Add project",
+    "add_project_label": "Add a project",
+    "rename_activity_title": "Rename this activity",
+    "rename_project_label": "Rename project",
+    "rename_project_title": "Rename this project",
     "select_activity_message": "Select an activity",
     "select_activity_title": "Select activity",
     "select_project_message": "Select a project",
@@ -227,7 +228,6 @@
     "time_log_total_hours": "Total time spent",
     "time_log_with_total": "Time log ({hours:.2f}h)",
     "time_log_total_hours": "Total for day: {hours:.2f}h",
-    "title_key": "title",
     "update_time_entry": "Update time entry",
     "time_report_total": "Total: {hours:.2f} hours",
     "no_report_title": "No report",
@@ -238,5 +238,7 @@
     "export_csv_error_message": "Could not write CSV file:\n{error}",
     "export_pdf": "Export PDF",
     "export_pdf_error_title": "PDF export failed",
-    "export_pdf_error_message": "Could not write PDF file:\n{error}"
+    "export_pdf_error_message": "Could not write PDF file:\n{error}",
+    "enable_tags_feature": "Enable Tags",
+    "enable_time_log_feature": "Enable Time Logging"
 }

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/locales/fr.json

@@ -5,7 +5,6 @@
     "db_version_id_does_not_belong_to_the_given_date": "version_id ne correspond pas à la date indiquée",
     "db_key_incorrect": "La clé est peut-être incorrecte",
     "db_database_error": "Erreur de base de données",
-    "database_path": "Chemin de la base de données",
     "database_maintenance": "Maintenance de la base de données",
     "database_compact": "Compacter la base de données",
     "database_compact_explanation": "La compaction exécute VACUUM sur la base de données. Cela peut aider à réduire sa taille.",
@@ -33,9 +32,7 @@
     "system": "Système",
     "light": "Clair",
     "dark": "Sombre",
-    "behaviour": "Comportement",
     "never": "Jamais",
-    "browse": "Parcourir",
     "previous": "Précédent",
     "previous_day": "Jour précédent",
     "next": "Suivant",
@@ -44,7 +41,6 @@
     "show": "Afficher",
     "history": "Historique",
     "view_history": "Afficher l'historique",
-    "export": "Exporter",
     "export_accessible_flag": "E&xporter",
     "export_entries": "Exporter les entrées",
     "export_complete": "Exportation terminée",
@@ -117,16 +113,8 @@
     "add_tag_placeholder": "Ajouter une étiquette et appuyez sur Entrée",
     "tag_browser_title": "Navigateur de étiquettes",
     "tag_browser_instructions": "Cliquez sur une étiquette pour l'étendre et voir toutes les pages avec cette étiquette. Cliquez sur une date pour l'ouvrir. Sélectionnez une étiquette pour modifier son nom, changer sa couleur ou la supprimer globalement.",
-    "tag_name": "Nom de l'étiquette",
-    "tag_color_hex": "Couleur hexadécimale",
     "color_hex": "Couleur",
     "date": "Date",
-    "pick_color": "Choisir la couleur",
-    "invalid_color_title": "Couleur invalide",
-    "invalid_color_message": "Veuillez entrer une couleur hexadécimale valide comme #RRGGBB.",
-    "add": "Ajouter",
-    "remove": "Supprimer",
-    "ok": "OK",
     "add_a_tag": "Ajouter une étiquette",
     "edit_tag_name": "Modifier le nom de l'étiquette",
     "new_tag_name": "Nouveau nom de l'étiquette :",

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/locales/it.json

@@ -3,9 +3,8 @@
     "db_issues_reported": "problema/i segnalato/i",
     "db_reopen_failed_after_rekey": "Riapertura fallita dopo il cambio chiave",
     "db_version_id_does_not_belong_to_the_given_date": "version_id non appartiene alla data indicata",
-    "db_key_incorrect": "La chiave è probabilmente errata",
     "db_database_error": "Errore del database",
-    "database_path": "Percorso del database",
+    "db_key_incorrect": "La chiave è probabilmente errata",
     "database_maintenance": "Manutenzione del database",
     "database_compact": "Compatta il database",
     "database_compact_explanation": "La compattazione esegue VACUUM sul database. Può aiutare a ridurne le dimensioni.",
@@ -33,9 +32,7 @@
     "system": "Sistema",
     "light": "Chiaro",
     "dark": "Scuro",
-    "behaviour": "Comportamento",
     "never": "Mai",
-    "browse": "Sfoglia",
     "previous": "Precedente",
     "previous_day": "Giorno precedente",
     "next": "Successivo",
@@ -44,7 +41,6 @@
     "show": "Mostra",
     "history": "Cronologia",
     "view_history": "Visualizza cronologia",
-    "export": "Esporta",
     "export_accessible_flag": "&Esporta",
     "export_entries": "Esporta voci",
     "export_complete": "Esportazione completata",
@@ -116,16 +112,8 @@
     "add_tag_placeholder": "Aggiungi un tag e premi Invio",
     "tag_browser_title": "Browser dei tag",
     "tag_browser_instructions": "Fai clic su un tag per espandere e vedere tutte le pagine con quel tag. Fai clic su una data per aprirla. Seleziona un tag per modificarne il nome, cambiarne il colore o eliminarlo globalmente.",
-    "tag_name": "Nome del tag",
-    "tag_color_hex": "Colore esadecimale",
     "color_hex": "Colore",
     "date": "Data",
-    "pick_color": "Scegli colore",
-    "invalid_color_title": "Colore non valido",
-    "invalid_color_message": "Inserisci un colore esadecimale valido come #RRGGBB.",
-    "add": "Aggiungi",
-    "remove": "Rimuovi",
-    "ok": "OK",
     "add_a_tag": "Aggiungi un tag",
     "edit_tag_name": "Modifica nome tag",
     "new_tag_name": "Nuovo nome tag:",

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/main_window.py

@@ -66,7 +66,7 @@ from .statistics_dialog import StatisticsDialog
 from . import strings
 from .tags_widget import PageTagsWidget
 from .theme import ThemeManager
-from .time_log import TimeLogWidget, TimeReportDialog
+from .time_log import TimeLogWidget
 from .toolbar import ToolBar
 
 
@@ -92,6 +92,8 @@ class MainWindow(QMainWindow):
         else:
             self._try_connect()
 
+        self.settings = QSettings(APP_ORG, APP_NAME)
+
         # ---- UI: Left fixed panel (calendar) + right editor -----------------
         self.calendar = QCalendarWidget()
         self.calendar.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
@@ -219,18 +221,10 @@ class MainWindow(QMainWindow):
         act_backup.setShortcut("Ctrl+Shift+B")
         act_backup.triggered.connect(self._backup)
         file_menu.addAction(act_backup)
-        act_tags = QAction(strings._("main_window_manage_tags_accessible_flag"), self)
-        act_tags.setShortcut("Ctrl+T")
-        act_tags.triggered.connect(self.tags._open_manager)
-        file_menu.addAction(act_tags)
         act_stats = QAction(strings._("main_window_statistics_accessible_flag"), self)
         act_stats.setShortcut("Shift+Ctrl+S")
         act_stats.triggered.connect(self._open_statistics)
         file_menu.addAction(act_stats)
-        act_time_report = QAction(strings._("time_log_report"), self)
-        act_time_report.setShortcut("Ctrl+Shift+L")
-        act_time_report.triggered.connect(self._open_time_report)
-        file_menu.addAction(act_time_report)
         file_menu.addSeparator()
         act_quit = QAction("&" + strings._("quit"), self)
         act_quit.setShortcut("Ctrl+Q")
@@ -320,8 +314,13 @@ class MainWindow(QMainWindow):
             self._load_selected_date()
         self._refresh_calendar_marks()
 
+        # Hide tags and time log widgets if not enabled
+        if not self.cfg.tags:
+            self.tags.hide()
+        if not self.cfg.time_log:
+            self.time_log.hide()
+
         # Restore window position from settings
-        self.settings = QSettings(APP_ORG, APP_NAME)
         self._restore_window_position()
 
         # re-apply all runtime color tweaks when theme changes
@@ -487,6 +486,9 @@ class MainWindow(QMainWindow):
 
         editor = MarkdownEditor(self.themes)
 
+        # Apply user’s preferred font size
+        self._apply_font_size(editor)
+
         # Set up the editor's event connections
         editor.currentCharFormatChanged.connect(lambda _f: self._sync_toolbar())
         editor.cursorPositionChanged.connect(self._sync_toolbar)
@@ -914,6 +916,17 @@ class MainWindow(QMainWindow):
             pass
 
     # ----------------- Some theme helpers -------------------#
+    def _apply_font_size(self, editor: MarkdownEditor) -> None:
+        """Apply the saved font size to a newly created editor."""
+        size = self.cfg.font_size
+        editor.qfont.setPointSize(size)
+        editor.setFont(editor.qfont)
+        self.cfg.font_size = size
+        # save size to settings
+        cfg = load_db_config()
+        cfg.font_size = self.cfg.font_size
+        save_db_config(cfg)
+
     def _retheme_overrides(self):
         self._apply_calendar_text_colors()
         self._apply_search_highlights(getattr(self, "_search_highlighted_dates", set()))
@@ -997,6 +1010,8 @@ class MainWindow(QMainWindow):
         self._tb_numbers = lambda: self._call_editor("toggle_numbers")
         self._tb_checkboxes = lambda: self._call_editor("toggle_checkboxes")
         self._tb_alarm = self._on_alarm_requested
+        self._tb_font_larger = self._on_font_larger_requested
+        self._tb_font_smaller = self._on_font_smaller_requested
 
         tb.boldRequested.connect(self._tb_bold)
         tb.italicRequested.connect(self._tb_italic)
@@ -1009,6 +1024,8 @@ class MainWindow(QMainWindow):
         tb.alarmRequested.connect(self._tb_alarm)
         tb.insertImageRequested.connect(self._on_insert_image)
         tb.historyRequested.connect(self._open_history)
+        tb.fontSizeLargerRequested.connect(self._tb_font_larger)
+        tb.fontSizeSmallerRequested.connect(self._tb_font_smaller)
 
         self._toolbar_bound = True
 
@@ -1054,6 +1071,34 @@ class MainWindow(QMainWindow):
         self.toolBar.actBullets.setChecked(bool(bullets_on))
         self.toolBar.actNumbers.setChecked(bool(numbers_on))
 
+    def _change_font_size(self, delta: int) -> None:
+        """Change font size for all editor tabs and save the setting."""
+        old_size = self.cfg.font_size
+        new_size = old_size + delta
+
+        self.cfg.font_size = new_size
+        # save size to settings
+        cfg = load_db_config()
+        cfg.font_size = self.cfg.font_size
+        save_db_config(cfg)
+
+        # Apply font size change to all open editors
+        self._apply_font_size_to_all_tabs(new_size)
+
+    def _apply_font_size_to_all_tabs(self, size: int) -> None:
+        for i in range(self.tab_widget.count()):
+            ed = self.tab_widget.widget(i)
+            if not isinstance(ed, MarkdownEditor):
+                continue
+            ed.qfont.setPointSize(size)
+            ed.setFont(ed.qfont)
+
+    def _on_font_larger_requested(self) -> None:
+        self._change_font_size(+1)
+
+    def _on_font_smaller_requested(self) -> None:
+        self._change_font_size(-1)
+
     # ----------- Alarms handler ------------#
     def _on_alarm_requested(self):
         """Create a one-shot reminder based on the current line in the editor."""
@@ -1320,13 +1365,17 @@ class MainWindow(QMainWindow):
         self.cfg.idle_minutes = getattr(new_cfg, "idle_minutes", self.cfg.idle_minutes)
         self.cfg.theme = getattr(new_cfg, "theme", self.cfg.theme)
         self.cfg.move_todos = getattr(new_cfg, "move_todos", self.cfg.move_todos)
+        self.cfg.tags = getattr(new_cfg, "tags", self.cfg.tags)
+        self.cfg.time_log = getattr(new_cfg, "time_log", self.cfg.time_log)
         self.cfg.locale = getattr(new_cfg, "locale", self.cfg.locale)
+        self.cfg.font_size = getattr(new_cfg, "font_size", self.cfg.font_size)
 
         # Persist once
         save_db_config(self.cfg)
-
         # Apply idle setting immediately (restart the timer with new interval if it changed)
         self._apply_idle_minutes(self.cfg.idle_minutes)
+        # Apply font size to all tabs
+        self._apply_font_size_to_all_tabs(self.cfg.font_size)
 
         # If the DB path changed, reconnect
         if self.cfg.path != old_path:
@@ -1341,6 +1390,13 @@ class MainWindow(QMainWindow):
             self._load_selected_date()
             self._refresh_calendar_marks()
 
+        # Show or hide the tags and time_log features depending on what the settings are now.
+        self.tags.hide() if not self.cfg.tags else self.tags.show()
+        if not self.cfg.time_log:
+            self.time_log.hide()
+        else:
+            self.time_log.show()
+
     # ------------ Statistics handler --------------- #
 
     def _open_statistics(self):
@@ -1358,11 +1414,6 @@ class MainWindow(QMainWindow):
             dlg._heatmap.date_clicked.connect(on_date_clicked)
         dlg.exec()
 
-    # ------------ Timesheet report handler --------------- #
-    def _open_time_report(self):
-        dlg = TimeReportDialog(self.db, self)
-        dlg.exec()
-
     # ------------ Window positioning --------------- #
     def _restore_window_position(self):
         geom = self.settings.value("main/geometry", None)

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/markdown_editor.py

@@ -41,9 +41,9 @@ class MarkdownEditor(QTextEdit):
         self.setAcceptRichText(False)
 
         # Normal text
-        font = QFont()
-        font.setPointSize(10)
-        self.setFont(font)
+        self.qfont = QFont()
+        self.qfont.setPointSize(11)
+        self.setFont(self.qfont)
 
         self._apply_line_spacing()  # 1.25× initial spacing
 

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/save_dialog.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import datetime
 
+from PySide6.QtGui import QFontMetrics
 from PySide6.QtWidgets import (
     QDialog,
     QVBoxLayout,
@@ -22,13 +23,24 @@ class SaveDialog(QDialog):
         Used for explicitly saving a new version of a page.
         """
         super().__init__(parent)
+
         self.setWindowTitle(strings._("enter_a_name_for_this_version"))
+
         v = QVBoxLayout(self)
         v.addWidget(QLabel(strings._("enter_a_name_for_this_version")))
+
         self.note = QLineEdit()
         now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        self.note.setText(strings._("new_version_i_saved_at") + f" {now}")
+        text = strings._("new_version_i_saved_at") + f" {now}"
+        self.note.setText(text)
         v.addWidget(self.note)
+
+        # make dialog wide enough for the line edit text
+        fm = QFontMetrics(self.note.font())
+        text_width = fm.horizontalAdvance(text) + 20
+        self.note.setMinimumWidth(text_width)
+        self.adjustSize()
+
         bb = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         bb.accepted.connect(self.accept)
         bb.rejected.connect(self.reject)

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/settings.py

@@ -41,14 +41,20 @@ def load_db_config() -> DBConfig:
     idle = s.value("ui/idle_minutes", 15, type=int)
     theme = s.value("ui/theme", "system", type=str)
     move_todos = s.value("ui/move_todos", False, type=bool)
+    tags = s.value("ui/tags", True, type=bool)
+    time_log = s.value("ui/time_log", True, type=bool)
     locale = s.value("ui/locale", "en", type=str)
+    font_size = s.value("ui/font_size", 11, type=int)
     return DBConfig(
         path=path,
         key=key,
         idle_minutes=idle,
         theme=theme,
         move_todos=move_todos,
+        tags=tags,
+        time_log=time_log,
         locale=locale,
+        font_size=font_size,
     )
 
 
@@ -59,4 +65,7 @@ def save_db_config(cfg: DBConfig) -> None:
     s.setValue("ui/idle_minutes", str(cfg.idle_minutes))
     s.setValue("ui/theme", str(cfg.theme))
     s.setValue("ui/move_todos", str(cfg.move_todos))
+    s.setValue("ui/tags", str(cfg.tags))
+    s.setValue("ui/time_log", str(cfg.time_log))
     s.setValue("ui/locale", str(cfg.locale))
+    s.setValue("ui/font_size", str(cfg.font_size))

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/settings_dialog.py

@@ -6,7 +6,6 @@ from PySide6.QtWidgets import (
     QCheckBox,
     QComboBox,
     QDialog,
-    QFormLayout,
     QFrame,
     QGroupBox,
     QLabel,
@@ -18,6 +17,8 @@ from PySide6.QtWidgets import (
     QSizePolicy,
     QSpinBox,
     QMessageBox,
+    QWidget,
+    QTabWidget,
 )
 from PySide6.QtCore import Qt, Slot
 from PySide6.QtGui import QPalette
@@ -39,14 +40,45 @@ class SettingsDialog(QDialog):
         self._db = db
         self.key = ""
 
-        form = QFormLayout()
-        form.setFieldGrowthPolicy(QFormLayout.ExpandingFieldsGrow)
-        self.setMinimumWidth(560)
+        self.current_settings = load_db_config()
+
+        self.setMinimumWidth(480)
         self.setSizeGripEnabled(True)
 
-        self.current_settings = load_db_config()
+        # --- Tabs ----------------------------------------------------------
+        tabs = QTabWidget()
+        tabs.setTabPosition(QTabWidget.North)
+        tabs.setDocumentMode(True)
+        tabs.setMovable(False)
+
+        tabs.addTab(self._create_appearance_page(cfg), strings._("appearance"))
+        tabs.addTab(self._create_features_page(), strings._("features"))
+        tabs.addTab(self._create_security_page(cfg), strings._("security"))
+        tabs.addTab(self._create_database_page(), strings._("database"))
 
-        # Add theme selection
+        # --- Buttons -------------------------------------------------------
+        bb = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Cancel)
+        bb.accepted.connect(self._save)
+        bb.rejected.connect(self.reject)
+
+        # Root layout
+        root = QVBoxLayout(self)
+        root.setContentsMargins(12, 12, 12, 12)
+        root.setSpacing(8)
+        root.addWidget(tabs)
+        root.addWidget(bb, 0, Qt.AlignRight)
+
+    # ------------------------------------------------------------------ #
+    #  Pages
+    # ------------------------------------------------------------------ #
+
+    def _create_appearance_page(self, cfg: DBConfig) -> QWidget:
+        page = QWidget()
+        layout = QVBoxLayout(page)
+        layout.setContentsMargins(12, 12, 12, 12)
+        layout.setSpacing(12)
+
+        # --- Theme group --------------------------------------------------
         theme_group = QGroupBox(strings._("theme"))
         theme_layout = QVBoxLayout(theme_group)
 
@@ -54,7 +86,6 @@ class SettingsDialog(QDialog):
         self.theme_light = QRadioButton(strings._("light"))
         self.theme_dark = QRadioButton(strings._("dark"))
 
-        # Load current theme from settings
         current_theme = self.current_settings.theme
         if current_theme == Theme.DARK.value:
             self.theme_dark.setChecked(True)
@@ -67,53 +98,98 @@ class SettingsDialog(QDialog):
         theme_layout.addWidget(self.theme_light)
         theme_layout.addWidget(self.theme_dark)
 
-        form.addRow(theme_group)
-
-        # Locale settings
+        # font size row
+        font_row = QHBoxLayout()
+        self.font_heading = QLabel(strings._("font_size"))
+        self.font_size = QSpinBox()
+        self.font_size.setRange(1, 24)
+        self.font_size.setSingleStep(1)
+        self.font_size.setAccelerated(True)
+        self.font_size.setValue(getattr(cfg, "font_size", 11))
+        font_row.addWidget(self.font_heading)
+        font_row.addWidget(self.font_size)
+        font_row.addStretch()
+        theme_layout.addLayout(font_row)
+
+        # explanation
+        self.font_size_label = QLabel(strings._("font_size_explanation"))
+        self.font_size_label.setWordWrap(True)
+        self.font_size_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
+        pal = self.font_size_label.palette()
+        self.font_size_label.setForegroundRole(QPalette.PlaceholderText)
+        self.font_size_label.setPalette(pal)
+
+        font_exp_row = QHBoxLayout()
+        font_exp_row.setContentsMargins(24, 0, 0, 0)
+        font_exp_row.addWidget(self.font_size_label)
+        theme_layout.addLayout(font_exp_row)
+
+        layout.addWidget(theme_group)
+
+        # --- Locale group -------------------------------------------------
         locale_group = QGroupBox(strings._("locale"))
         locale_layout = QVBoxLayout(locale_group)
-        locale_layout.setContentsMargins(12, 8, 12, 12)
-        locale_layout.setSpacing(6)
 
         self.locale_combobox = QComboBox()
         self.locale_combobox.addItems(strings._AVAILABLE)
         self.locale_combobox.setCurrentText(self.current_settings.locale)
         locale_layout.addWidget(self.locale_combobox, 0, Qt.AlignLeft)
 
-        # Explanation for locale
         self.locale_label = QLabel(strings._("locale_restart"))
         self.locale_label.setWordWrap(True)
         self.locale_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
-        # make it look secondary
         lpal = self.locale_label.palette()
         self.locale_label.setForegroundRole(QPalette.PlaceholderText)
         self.locale_label.setPalette(lpal)
-        locale_row = QHBoxLayout()
-        locale_row.setContentsMargins(24, 0, 0, 0)
-        locale_row.addWidget(self.locale_label)
-        locale_layout.addLayout(locale_row)
-        form.addRow(locale_group)
+        loc_row = QHBoxLayout()
+        loc_row.setContentsMargins(24, 0, 0, 0)
+        loc_row.addWidget(self.locale_label)
+        locale_layout.addLayout(loc_row)
+
+        layout.addWidget(locale_group)
+        layout.addStretch()
+        return page
 
-        # Add Behaviour
-        behaviour_group = QGroupBox(strings._("behaviour"))
-        behaviour_layout = QVBoxLayout(behaviour_group)
+    def _create_features_page(self) -> QWidget:
+        page = QWidget()
+        layout = QVBoxLayout(page)
+        layout.setContentsMargins(12, 12, 12, 12)
+        layout.setSpacing(12)
+
+        features_group = QGroupBox(strings._("features"))
+        features_layout = QVBoxLayout(features_group)
 
         self.move_todos = QCheckBox(
             strings._("move_yesterdays_unchecked_todos_to_today_on_startup")
         )
         self.move_todos.setChecked(self.current_settings.move_todos)
         self.move_todos.setCursor(Qt.PointingHandCursor)
+        features_layout.addWidget(self.move_todos)
+
+        self.tags = QCheckBox(strings._("enable_tags_feature"))
+        self.tags.setChecked(self.current_settings.tags)
+        self.tags.setCursor(Qt.PointingHandCursor)
+        features_layout.addWidget(self.tags)
+
+        self.time_log = QCheckBox(strings._("enable_time_log_feature"))
+        self.time_log.setChecked(self.current_settings.time_log)
+        self.time_log.setCursor(Qt.PointingHandCursor)
+        features_layout.addWidget(self.time_log)
 
-        behaviour_layout.addWidget(self.move_todos)
-        form.addRow(behaviour_group)
+        layout.addWidget(features_group)
+        layout.addStretch()
+        return page
 
-        # Encryption settings
+    def _create_security_page(self, cfg: DBConfig) -> QWidget:
+        page = QWidget()
+        layout = QVBoxLayout(page)
+        layout.setContentsMargins(12, 12, 12, 12)
+        layout.setSpacing(12)
+
+        # --- Encryption group ---------------------------------------------
         enc_group = QGroupBox(strings._("encryption"))
         enc = QVBoxLayout(enc_group)
-        enc.setContentsMargins(12, 8, 12, 12)
-        enc.setSpacing(6)
 
-        # Checkbox to remember key
         self.save_key_btn = QCheckBox(strings._("remember_key"))
         self.key = self.current_settings.key or ""
         self.save_key_btn.setChecked(bool(self.key))
@@ -121,17 +197,15 @@ class SettingsDialog(QDialog):
         self.save_key_btn.toggled.connect(self._save_key_btn_clicked)
         enc.addWidget(self.save_key_btn, 0, Qt.AlignLeft)
 
-        # Explanation for remembering key
         self.save_key_label = QLabel(strings._("save_key_warning"))
         self.save_key_label.setWordWrap(True)
         self.save_key_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
-        # make it look secondary
         pal = self.save_key_label.palette()
         self.save_key_label.setForegroundRole(QPalette.PlaceholderText)
         self.save_key_label.setPalette(pal)
 
         exp_row = QHBoxLayout()
-        exp_row.setContentsMargins(24, 0, 0, 0)  # indent to line up under the checkbox
+        exp_row.setContentsMargins(24, 0, 0, 0)
         exp_row.addWidget(self.save_key_label)
         enc.addLayout(exp_row)
 
@@ -140,62 +214,59 @@ class SettingsDialog(QDialog):
         line.setFrameShadow(QFrame.Sunken)
         enc.addWidget(line)
 
-        # Change key button
         self.rekey_btn = QPushButton(strings._("change_encryption_key"))
         self.rekey_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.rekey_btn.clicked.connect(self._change_key)
-
         enc.addWidget(self.rekey_btn, 0, Qt.AlignLeft)
 
-        form.addRow(enc_group)
+        layout.addWidget(enc_group)
 
-        # Privacy settings
+        # --- Idle lock group ----------------------------------------------
         priv_group = QGroupBox(strings._("lock_screen_when_idle"))
         priv = QVBoxLayout(priv_group)
-        priv.setContentsMargins(12, 8, 12, 12)
-        priv.setSpacing(6)
 
         self.idle_spin = QSpinBox()
         self.idle_spin.setRange(0, 240)
         self.idle_spin.setSingleStep(1)
         self.idle_spin.setAccelerated(True)
         self.idle_spin.setSuffix(" min")
-        self.idle_spin.setSpecialValueText(strings._("Never"))
+        self.idle_spin.setSpecialValueText(strings._("never"))
         self.idle_spin.setValue(getattr(cfg, "idle_minutes", 15))
         priv.addWidget(self.idle_spin, 0, Qt.AlignLeft)
-        # Explanation for idle option (autolock)
+
         self.idle_spin_label = QLabel(strings._("autolock_explanation"))
         self.idle_spin_label.setWordWrap(True)
         self.idle_spin_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
-        # make it look secondary
         spal = self.idle_spin_label.palette()
         self.idle_spin_label.setForegroundRole(QPalette.PlaceholderText)
         self.idle_spin_label.setPalette(spal)
 
         spin_row = QHBoxLayout()
-        spin_row.setContentsMargins(24, 0, 0, 0)  # indent to line up under the spinbox
+        spin_row.setContentsMargins(24, 0, 0, 0)
         spin_row.addWidget(self.idle_spin_label)
         priv.addLayout(spin_row)
 
-        form.addRow(priv_group)
+        layout.addWidget(priv_group)
+        layout.addStretch()
+        return page
+
+    def _create_database_page(self) -> QWidget:
+        page = QWidget()
+        layout = QVBoxLayout(page)
+        layout.setContentsMargins(12, 12, 12, 12)
+        layout.setSpacing(12)
 
-        # Maintenance settings
         maint_group = QGroupBox(strings._("database_maintenance"))
         maint = QVBoxLayout(maint_group)
-        maint.setContentsMargins(12, 8, 12, 12)
-        maint.setSpacing(6)
 
         self.compact_btn = QPushButton(strings._("database_compact"))
         self.compact_btn.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.compact_btn.clicked.connect(self._compact_btn_clicked)
-
         maint.addWidget(self.compact_btn, 0, Qt.AlignLeft)
 
-        # Explanation for compacting button
         self.compact_label = QLabel(strings._("database_compact_explanation"))
         self.compact_label.setWordWrap(True)
         self.compact_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum)
-        # make it look secondary
         cpal = self.compact_label.palette()
         self.compact_label.setForegroundRole(QPalette.PlaceholderText)
         self.compact_label.setPalette(cpal)
@@ -205,22 +276,15 @@ class SettingsDialog(QDialog):
         maint_row.addWidget(self.compact_label)
         maint.addLayout(maint_row)
 
-        form.addRow(maint_group)
-
-        # Buttons
-        bb = QDialogButtonBox(QDialogButtonBox.Save | QDialogButtonBox.Cancel)
-        bb.accepted.connect(self._save)
-        bb.rejected.connect(self.reject)
+        layout.addWidget(maint_group)
+        layout.addStretch()
+        return page
 
-        # Root layout (adjust margins/spacing a bit)
-        v = QVBoxLayout(self)
-        v.setContentsMargins(12, 12, 12, 12)
-        v.setSpacing(10)
-        v.addLayout(form)
-        v.addWidget(bb, 0, Qt.AlignRight)
+    # ------------------------------------------------------------------ #
+    #  Save settings
+    # ------------------------------------------------------------------ #
 
     def _save(self):
-        # Save the selected theme into QSettings
         if self.theme_dark.isChecked():
             selected_theme = Theme.DARK
         elif self.theme_light.isChecked():
@@ -236,7 +300,10 @@ class SettingsDialog(QDialog):
             idle_minutes=self.idle_spin.value(),
             theme=selected_theme.value,
             move_todos=self.move_todos.isChecked(),
+            tags=self.tags.isChecked(),
+            time_log=self.time_log.isChecked(),
             locale=self.locale_combobox.currentText(),
+            font_size=self.font_size.value(),
         )
 
         save_db_config(self._cfg)

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/statistics_dialog.py

@@ -98,7 +98,7 @@ class DateHeatmap(QWidget):
 
     def minimumSizeHint(self) -> QSize:
         sz = self.sizeHint()
-        return QSize(min(300, sz.width()), sz.height())
+        return QSize(min(350, sz.width()), sz.height())
 
     def paintEvent(self, event):
         super().paintEvent(event)
@@ -249,6 +249,7 @@ class StatisticsDialog(QDialog):
 
         self.setWindowTitle(strings._("statistics"))
         self.setMinimumWidth(600)
+        self.setMinimumHeight(350)
         root = QVBoxLayout(self)
 
         (

{bouquin-0.4.1 → bouquin-0.4.2}/bouquin/toolbar.py

@@ -19,6 +19,8 @@ class ToolBar(QToolBar):
     historyRequested = Signal()
     insertImageRequested = Signal()
     alarmRequested = Signal()
+    fontSizeLargerRequested = Signal()
+    fontSizeSmallerRequested = Signal()
 
     def __init__(self, parent=None):
         super().__init__(strings._("toolbar_format"), parent)
@@ -67,12 +69,22 @@ class ToolBar(QToolBar):
         self.actH3.setCheckable(True)
         self.actH3.setShortcut("Ctrl+3")
         self.actH3.triggered.connect(lambda: self.headingRequested.emit(14))
-        self.actNormal = QAction("N", self)
+        self.actNormal = QAction("P", self)
         self.actNormal.setToolTip(strings._("toolbar_normal_paragraph_text"))
         self.actNormal.setCheckable(True)
-        self.actNormal.setShortcut("Ctrl+N")
+        self.actNormal.setShortcut("Ctrl+.")
         self.actNormal.triggered.connect(lambda: self.headingRequested.emit(0))
 
+        self.actFontSmaller = QAction("P-", self)
+        self.actFontSmaller.setToolTip(strings._("toolbar_font_smaller"))
+        self.actFontSmaller.setShortcut("Ctrl+Shift+-")
+        self.actFontSmaller.triggered.connect(self.fontSizeSmallerRequested)
+
+        self.actFontLarger = QAction("P+", self)
+        self.actFontLarger.setToolTip(strings._("toolbar_font_larger"))
+        self.actFontLarger.setShortcut("Ctrl+Shift+=")
+        self.actFontLarger.triggered.connect(self.fontSizeLargerRequested)
+
         # Lists
         self.actBullets = QAction("•", self)
         self.actBullets.setToolTip(strings._("toolbar_bulleted_list"))
@@ -132,6 +144,8 @@ class ToolBar(QToolBar):
                 self.actH2,
                 self.actH3,
                 self.actNormal,
+                self.actFontSmaller,
+                self.actFontLarger,
                 self.actBullets,
                 self.actNumbers,
                 self.actCheckboxes,
@@ -153,7 +167,9 @@ class ToolBar(QToolBar):
         self._style_letter_button(self.actH1, "H1")
         self._style_letter_button(self.actH2, "H2")
         self._style_letter_button(self.actH3, "H3")
-        self._style_letter_button(self.actNormal, "N")
+        self._style_letter_button(self.actNormal, "P")
+        self._style_letter_button(self.actFontSmaller, "P-")
+        self._style_letter_button(self.actFontLarger, "P+")
 
         # Lists
         self._style_letter_button(self.actBullets, "•")

{bouquin-0.4.1 → bouquin-0.4.2}/pyproject.toml

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