bouquin 0.4__tar.gz → 0.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bouquin
-Version: 0.4
+Version: 0.4.1
 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 → bouquin-0.4.1}/bouquin/locales/en.json

@@ -36,6 +36,7 @@
     "behaviour": "Behaviour",
     "never": "Never",
     "browse": "Browse",
+    "close_tab": "Close tab",
     "previous": "Previous",
     "previous_day": "Previous day",
     "next": "Next",
@@ -162,80 +163,80 @@
     "invalid_time_message": "Please enter a time in the format HH:MM",
     "dismiss": "Dismiss",
     "toolbar_alarm": "Set reminder alarm",
-   "activities": "Activities",
-   "activity": "Activity",
-   "note": "Note",
-   "activity_delete_error_message": "A problem occurred deleting the activity",
-   "activity_delete_error_title": "Problem deleting activity",
-   "activity_rename_error_message": "A problem occurred renaming the activity",
-   "activity_rename_error_title": "Problem renaming activity",
-   "activity_required_message": "An activity name is required",
-   "activity_required_title": "Activity name required",
-   "add_activity": "Add activity",
-   "add_project": "Add project",
-   "add_time_entry": "Add time entry",
-   "time_period": "Time period",
-   "by_day": "by day",
-   "by_month": "by month",
-   "by_week": "by week",
-   "date_range": "Date range",
-   "delete_activity": "Delete activity",
-   "delete_activity_confirm": "Are you sure you want to delete this activity?",
-   "delete_activity_title": "Delete activity - are you sure?",
-   "delete_project": "Delete project",
-   "delete_project_confirm": "Are you sure you want to delete this project?",
-   "delete_project_title": "Delete project - are you sure?",
-   "delete_time_entry": "Delete time entry",
-   "group_by": "Group by",
-   "hours": "Hours",
-   "invalid_activity_message": "The activity is invalid",
-   "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",
-   "open_time_log": "Open time log",
-   "project": "Project",
-   "project_delete_error_message": "A problem occurred deleting the project",
-   "project_delete_error_title": "Problem deleting project",
-   "project_rename_error_message": "A problem occurred renaming the project",
-   "project_rename_error_title": "Problem renaming project",
-   "project_required_message": "A project is required",
-   "project_required_title": "Project required",
-   "projects": "Projects",
-   "rename_activity": "Rename activity",
-   "rename_project": "Rename project",
-   "run_report": "Run report",
-   "add_project_label": "Add a project",
-   "add_activity_label": "Add an activity",
-   "select_activity_message": "Select an activity",
-   "select_activity_title": "Select activity",
-   "select_project_message": "Select a project",
-   "select_project_title": "Select project",
-   "time_log": "Time log",
-   "time_log_collapsed_hint": "Time log",
-   "time_log_date_label": "Time log date: {date}",
-   "time_log_for": "Time log for {date}",
-   "time_log_no_date": "Time log",
-   "time_log_no_entries": "No time entries yet",
-   "time_log_report": "Time log report",
-   "time_log_report_title": "Time log for {project}",
-   "time_log_report_meta": "From {start} to {end}, grouped {granularity}",
-   "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",
-   "no_report_message": "Please run a report before exporting.",
-   "total": "Total",
-   "export_csv": "Export CSV",
-   "export_csv_error_title": "Export failed",
-   "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}"
+    "activities": "Activities",
+    "activity": "Activity",
+    "note": "Note",
+    "activity_delete_error_message": "A problem occurred deleting the activity",
+    "activity_delete_error_title": "Problem deleting activity",
+    "activity_rename_error_message": "A problem occurred renaming the activity",
+    "activity_rename_error_title": "Problem renaming activity",
+    "activity_required_message": "An activity name is required",
+    "activity_required_title": "Activity name required",
+    "add_activity": "Add activity",
+    "add_project": "Add project",
+    "add_time_entry": "Add time entry",
+    "time_period": "Time period",
+    "by_day": "by day",
+    "by_month": "by month",
+    "by_week": "by week",
+    "date_range": "Date range",
+    "delete_activity": "Delete activity",
+    "delete_activity_confirm": "Are you sure you want to delete this activity?",
+    "delete_activity_title": "Delete activity - are you sure?",
+    "delete_project": "Delete project",
+    "delete_project_confirm": "Are you sure you want to delete this project?",
+    "delete_project_title": "Delete project - are you sure?",
+    "delete_time_entry": "Delete time entry",
+    "group_by": "Group by",
+    "hours": "Hours",
+    "invalid_activity_message": "The activity is invalid",
+    "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",
+    "open_time_log": "Open time log",
+    "project": "Project",
+    "project_delete_error_message": "A problem occurred deleting the project",
+    "project_delete_error_title": "Problem deleting project",
+    "project_rename_error_message": "A problem occurred renaming the project",
+    "project_rename_error_title": "Problem renaming project",
+    "project_required_message": "A project is required",
+    "project_required_title": "Project required",
+    "projects": "Projects",
+    "rename_activity": "Rename activity",
+    "rename_project": "Rename project",
+    "run_report": "Run report",
+    "add_project_label": "Add a project",
+    "add_activity_label": "Add an activity",
+    "select_activity_message": "Select an activity",
+    "select_activity_title": "Select activity",
+    "select_project_message": "Select a project",
+    "select_project_title": "Select project",
+    "time_log": "Time log",
+    "time_log_collapsed_hint": "Time log",
+    "time_log_date_label": "Time log date: {date}",
+    "time_log_for": "Time log for {date}",
+    "time_log_no_date": "Time log",
+    "time_log_no_entries": "No time entries yet",
+    "time_log_report": "Time log report",
+    "time_log_report_title": "Time log for {project}",
+    "time_log_report_meta": "From {start} to {end}, grouped {granularity}",
+    "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",
+    "no_report_message": "Please run a report before exporting.",
+    "total": "Total",
+    "export_csv": "Export CSV",
+    "export_csv_error_title": "Export failed",
+    "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}"
 }

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

@@ -260,6 +260,13 @@ class MainWindow(QMainWindow):
         nav_menu.addAction(act_today)
         self.addAction(act_today)
 
+        act_close_tab = QAction(strings._("close_tab"), self)
+        act_close_tab.setShortcut("Ctrl+W")
+        act_close_tab.setShortcutContext(Qt.ApplicationShortcut)
+        act_close_tab.triggered.connect(self._close_current_tab)
+        nav_menu.addAction(act_close_tab)
+        self.addAction(act_close_tab)
+
         act_find = QAction(strings._("find_on_page"), self)
         act_find.setShortcut(QKeySequence.Find)
         act_find.triggered.connect(self.findBar.show_bar)
@@ -520,6 +527,12 @@ class MainWindow(QMainWindow):
 
         self.tab_widget.removeTab(index)
 
+    def _close_current_tab(self):
+        """Close the currently active tab via shortcuts (Ctrl+W)."""
+        idx = self.tab_widget.currentIndex()
+        if idx >= 0:
+            self._close_tab(idx)
+
     def _on_tab_changed(self, index: int):
         """Handle tab change - reconnect toolbar and sync UI."""
         if index < 0:

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

@@ -406,9 +406,14 @@ class MarkdownEditor(QTextEdit):
         # Append the new marker
         new_line = f"{new_line} ⏰ {time_str}"
 
-        bc = QTextCursor(block)
+        # --- : only replace the block's text, not its newline ---
+        block_start = block.position()
+        block_end = block_start + len(line)
+
+        bc = QTextCursor(self.document())
         bc.beginEditBlock()
-        bc.select(QTextCursor.SelectionType.BlockUnderCursor)
+        bc.setPosition(block_start)
+        bc.setPosition(block_end, QTextCursor.KeepAnchor)
         bc.insertText(new_line)
         bc.endEditBlock()
 
@@ -426,6 +431,35 @@ class MarkdownEditor(QTextEdit):
         """Public wrapper used by MainWindow for reminders."""
         return self._get_current_line()
 
+    def _list_prefix_length_for_block(self, block) -> int:
+        """Return the length (in chars) of the visual list prefix for the given
+        block (including leading indentation), or 0 if it's not a list item.
+        """
+        line = block.text()
+        stripped = line.lstrip()
+        leading_spaces = len(line) - len(stripped)
+
+        # Checkbox (Unicode display)
+        if stripped.startswith(
+            f"{self._CHECK_UNCHECKED_DISPLAY} "
+        ) or stripped.startswith(f"{self._CHECK_CHECKED_DISPLAY} "):
+            return leading_spaces + 2  # icon + space
+
+        # Unicode bullet
+        if stripped.startswith(f"{self._BULLET_DISPLAY} "):
+            return leading_spaces + 2  # bullet + space
+
+        # Markdown bullet list (-, *, +)
+        if re.match(r"^[-*+]\s", stripped):
+            return leading_spaces + 2  # marker + space
+
+        # Numbered list: e.g. "1. "
+        m = re.match(r"^(\d+\.\s)", stripped)
+        if m:
+            return leading_spaces + leading_spaces + (len(m.group(1)) - leading_spaces)
+
+        return 0
+
     def _detect_list_type(self, line: str) -> tuple[str | None, str]:
         """
         Detect if line is a list item. Returns (list_type, prefix).
@@ -559,48 +593,102 @@ class MarkdownEditor(QTextEdit):
                     self._update_code_block_row_backgrounds()
                 return
 
-        # Handle Home and Left arrow keys to prevent going left of list markers
+        # Handle Backspace on empty list items so the marker itself can be deleted
+        if event.key() == Qt.Key.Key_Backspace:
+            cursor = self.textCursor()
+            # Let Backspace behave normally when deleting a selection.
+            if not cursor.hasSelection():
+                block = cursor.block()
+                prefix_len = self._list_prefix_length_for_block(block)
+
+                if prefix_len > 0:
+                    block_start = block.position()
+                    line = block.text()
+                    pos_in_block = cursor.position() - block_start
+                    after_text = line[prefix_len:]
+
+                    # If there is no real content after the marker, treat Backspace
+                    # as "remove the list marker".
+                    if after_text.strip() == "" and pos_in_block >= prefix_len:
+                        cursor.beginEditBlock()
+                        cursor.setPosition(block_start)
+                        cursor.setPosition(
+                            block_start + prefix_len, QTextCursor.KeepAnchor
+                        )
+                        cursor.removeSelectedText()
+                        cursor.endEditBlock()
+                        self.setTextCursor(cursor)
+                        return
+
+        # Handle Home and Left arrow keys to keep the caret to the *right*
+        # of list prefixes (checkboxes / bullets / numbers).
         if event.key() in (Qt.Key.Key_Home, Qt.Key.Key_Left):
+            # Let Ctrl+Home / Ctrl+Left keep their usual meaning (start of
+            # document / word-left) – we don't interfere with those.
+            if event.modifiers() & Qt.ControlModifier:
+                pass
+            else:
+                cursor = self.textCursor()
+                block = cursor.block()
+                prefix_len = self._list_prefix_length_for_block(block)
+
+                if prefix_len > 0:
+                    block_start = block.position()
+                    pos_in_block = cursor.position() - block_start
+                    target = block_start + prefix_len
+
+                    if event.key() == Qt.Key.Key_Home:
+                        # Home should jump to just after the prefix; with Shift
+                        # it should *select* back to that position.
+                        if event.modifiers() & Qt.ShiftModifier:
+                            cursor.setPosition(target, QTextCursor.KeepAnchor)
+                        else:
+                            cursor.setPosition(target)
+                        self.setTextCursor(cursor)
+                        return
+
+                    # Left arrow: don't allow the caret to move into the prefix
+                    # region; snap it to just after the marker instead.
+                    if event.key() == Qt.Key.Key_Left and pos_in_block <= prefix_len:
+                        if event.modifiers() & Qt.ShiftModifier:
+                            cursor.setPosition(target, QTextCursor.KeepAnchor)
+                        else:
+                            cursor.setPosition(target)
+                        self.setTextCursor(cursor)
+                        return
+
+        # After moving vertically, make sure we don't land *inside* a list
+        # prefix. We let QTextEdit perform the move first and then adjust.
+        if event.key() in (Qt.Key.Key_Up, Qt.Key.Key_Down) and not (
+            event.modifiers() & Qt.ControlModifier
+        ):
+            super().keyPressEvent(event)
+
             cursor = self.textCursor()
             block = cursor.block()
-            line = block.text()
-            pos_in_block = cursor.position() - block.position()
-
-            # Detect list prefix length
-            prefix_len = 0
-            stripped = line.lstrip()
-            leading_spaces = len(line) - len(stripped)
-
-            # Check for checkbox (Unicode display format)
-            if stripped.startswith(
-                f"{self._CHECK_UNCHECKED_DISPLAY} "
-            ) or stripped.startswith(f"{self._CHECK_CHECKED_DISPLAY} "):
-                prefix_len = leading_spaces + 2  # icon + space
-            # Check for Unicode bullet
-            elif stripped.startswith(f"{self._BULLET_DISPLAY} "):
-                prefix_len = leading_spaces + 2  # bullet + space
-            # Check for markdown bullet list (-, *, +)
-            elif re.match(r"^[-*+]\s", stripped):
-                prefix_len = leading_spaces + 2  # marker + space
-            # Check for numbered list
-            elif re.match(r"^\d+\.\s", stripped):
-                match = re.match(r"^(\d+\.\s)", stripped)
-                if match:
-                    prefix_len = leading_spaces + len(match.group(1))
 
+            # Don't interfere with code blocks (they can contain literal
+            # markdown-looking text).
+            if self._is_inside_code_block(block):
+                return
+
+            prefix_len = self._list_prefix_length_for_block(block)
             if prefix_len > 0:
-                if event.key() == Qt.Key.Key_Home:
-                    # Move to after the list marker
-                    cursor.setPosition(block.position() + prefix_len)
+                block_start = block.position()
+                pos_in_block = cursor.position() - block_start
+                if pos_in_block < prefix_len:
+                    target = block_start + prefix_len
+                    if event.modifiers() & Qt.ShiftModifier:
+                        # Preserve the current anchor while snapping the visual
+                        # caret to just after the marker.
+                        anchor = cursor.anchor()
+                        cursor.setPosition(anchor)
+                        cursor.setPosition(target, QTextCursor.KeepAnchor)
+                    else:
+                        cursor.setPosition(target)
                     self.setTextCursor(cursor)
-                    return
-                elif event.key() == Qt.Key.Key_Left and pos_in_block <= prefix_len:
-                    # Prevent moving left of the list marker
-                    if pos_in_block > prefix_len:
-                        # Allow normal left movement if we're past the prefix
-                        super().keyPressEvent(event)
-                    # Otherwise block the movement
-                    return
+
+            return
 
         # Handle Enter key for smart list continuation AND code blocks
         if event.key() == Qt.Key.Key_Return or event.key() == Qt.Key.Key_Enter:
@@ -665,6 +753,19 @@ class MarkdownEditor(QTextEdit):
                 super().keyPressEvent(event)
                 return
 
+            # Auto-insert an extra blank line after headings (#, ##, ###)
+            # when pressing Enter at the end of the line.
+            if re.match(r"^#{1,3}\s+", stripped) and pos_in_block >= len(line_text):
+                cursor.beginEditBlock()
+                # First blank line: visual separator between heading and body
+                cursor.insertBlock()
+                # Second blank line: where body text will start (caret ends here)
+                cursor.insertBlock()
+                cursor.endEditBlock()
+
+                self.setTextCursor(cursor)
+                return
+
             # Check for list continuation
             list_type, prefix = self._detect_list_type(current_line)
 

{bouquin-0.4 → bouquin-0.4.1}/bouquin/tag_browser.py

@@ -52,21 +52,21 @@ class TagBrowserDialog(QDialog):
         # Tag management buttons
         btn_row = QHBoxLayout()
 
-        self.add_tag_btn = QPushButton(strings._("add_a_tag"))
+        self.add_tag_btn = QPushButton("&" + strings._("add_a_tag"))
         self.add_tag_btn.clicked.connect(self._add_a_tag)
         btn_row.addWidget(self.add_tag_btn)
 
-        self.edit_name_btn = QPushButton(strings._("edit_tag_name"))
+        self.edit_name_btn = QPushButton("&" + strings._("edit_tag_name"))
         self.edit_name_btn.clicked.connect(self._edit_tag_name)
         self.edit_name_btn.setEnabled(False)
         btn_row.addWidget(self.edit_name_btn)
 
-        self.change_color_btn = QPushButton(strings._("change_color"))
+        self.change_color_btn = QPushButton("&" + strings._("change_color"))
         self.change_color_btn.clicked.connect(self._change_tag_color)
         self.change_color_btn.setEnabled(False)
         btn_row.addWidget(self.change_color_btn)
 
-        self.delete_btn = QPushButton(strings._("delete_tag"))
+        self.delete_btn = QPushButton("&" + strings._("delete_tag"))
         self.delete_btn.clicked.connect(self._delete_tag)
         self.delete_btn.setEnabled(False)
         btn_row.addWidget(self.delete_btn)

{bouquin-0.4 → bouquin-0.4.1}/bouquin/time_log.py

@@ -181,6 +181,9 @@ class TimeLogDialog(QDialog):
         self._db = db
         self._date_iso = date_iso
         self._current_entry_id: Optional[int] = None
+        # Guard flag used when repopulating the table so we don’t treat
+        # programmatic item changes as user edits.
+        self._reloading_entries: bool = False
 
         self.setWindowTitle(strings._("time_log_for").format(date=date_iso))
         self.resize(900, 600)
@@ -228,14 +231,14 @@ class TimeLogDialog(QDialog):
 
         # --- Buttons for entry
         btn_row = QHBoxLayout()
-        self.add_update_btn = QPushButton(strings._("add_time_entry"))
+        self.add_update_btn = QPushButton("&" + strings._("add_time_entry"))
         self.add_update_btn.clicked.connect(self._on_add_or_update)
 
-        self.delete_btn = QPushButton(strings._("delete_time_entry"))
+        self.delete_btn = QPushButton("&" + strings._("delete_time_entry"))
         self.delete_btn.clicked.connect(self._on_delete_entry)
         self.delete_btn.setEnabled(False)
 
-        self.report_btn = QPushButton(strings._("run_report"))
+        self.report_btn = QPushButton("&" + strings._("run_report"))
         self.report_btn.clicked.connect(self._on_run_report)
 
         btn_row.addStretch(1)
@@ -264,12 +267,14 @@ class TimeLogDialog(QDialog):
         self.table.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.table.setSelectionMode(QAbstractItemView.SingleSelection)
         self.table.itemSelectionChanged.connect(self._on_row_selected)
+        # When a cell is edited inline, commit the change back to the DB.
+        self.table.itemChanged.connect(self._on_table_item_changed)
         root.addWidget(self.table, 1)
 
         # --- Close button
         close_row = QHBoxLayout()
         close_row.addStretch(1)
-        close_btn = QPushButton(strings._("close"))
+        close_btn = QPushButton("&" + strings._("close"))
         close_btn.clicked.connect(self.accept)
         close_row.addWidget(close_btn)
         root.addLayout(close_row)
@@ -293,32 +298,42 @@ class TimeLogDialog(QDialog):
         self.activity_edit.setCompleter(completer)
 
     def _reload_entries(self) -> None:
-        rows = self._db.time_log_for_date(self._date_iso)
-        self.table.setRowCount(len(rows))
-        for row_idx, r in enumerate(rows):
-            entry_id = r[0]
-            project_name = r[3]
-            activity_name = r[5]
-            note = r[7] or ""
-            minutes = r[6]
-            hours = minutes / 60.0
-
-            item_proj = QTableWidgetItem(project_name)
-            item_act = QTableWidgetItem(activity_name)
-            item_note = QTableWidgetItem(note)
-            item_hours = QTableWidgetItem(f"{hours:.2f}")
+        """Reload the table from the database.
 
-            # store the entry id on the first column
-            item_proj.setData(Qt.ItemDataRole.UserRole, entry_id)
-
-            self.table.setItem(row_idx, 0, item_proj)
-            self.table.setItem(row_idx, 1, item_act)
-            self.table.setItem(row_idx, 2, item_note)
-            self.table.setItem(row_idx, 3, item_hours)
+        While we are repopulating the QTableWidget we temporarily disable the
+        itemChanged handler so that programmatic changes do not get written
+        back to the database.
+        """
+        self._reloading_entries = True
+        try:
+            rows = self._db.time_log_for_date(self._date_iso)
+            self.table.setRowCount(len(rows))
+            for row_idx, r in enumerate(rows):
+                entry_id = r[0]
+                project_name = r[3]
+                activity_name = r[5]
+                note = r[7] or ""
+                minutes = r[6]
+                hours = minutes / 60.0
+
+                item_proj = QTableWidgetItem(project_name)
+                item_act = QTableWidgetItem(activity_name)
+                item_note = QTableWidgetItem(note)
+                item_hours = QTableWidgetItem(f"{hours:.2f}")
+
+                # store the entry id on the first column
+                item_proj.setData(Qt.ItemDataRole.UserRole, entry_id)
+
+                self.table.setItem(row_idx, 0, item_proj)
+                self.table.setItem(row_idx, 1, item_act)
+                self.table.setItem(row_idx, 2, item_note)
+                self.table.setItem(row_idx, 3, item_hours)
+        finally:
+            self._reloading_entries = False
 
         self._current_entry_id = None
         self.delete_btn.setEnabled(False)
-        self.add_update_btn.setText(strings._("add_time_entry"))
+        self.add_update_btn.setText("&" + strings._("add_time_entry"))
 
     # ----- Actions -----------------------------------------------------
 
@@ -368,7 +383,6 @@ class TimeLogDialog(QDialog):
                 self._current_entry_id, proj_id, activity_id, minutes, note
             )
 
-        self.note.setText("")
         self._reload_entries()
 
     def _on_row_selected(self) -> None:
@@ -376,7 +390,7 @@ class TimeLogDialog(QDialog):
         if not items:
             self._current_entry_id = None
             self.delete_btn.setEnabled(False)
-            self.add_update_btn.setText(strings._("add_time_entry"))
+            self.add_update_btn.setText("&" + strings._("add_time_entry"))
             return
 
         row = items[0].row()
@@ -388,7 +402,7 @@ class TimeLogDialog(QDialog):
 
         self._current_entry_id = int(entry_id)
         self.delete_btn.setEnabled(True)
-        self.add_update_btn.setText(strings._("update_time_entry"))
+        self.add_update_btn.setText("&" + strings._("update_time_entry"))
 
         # push values into the editors
         proj_name = proj_item.text()
@@ -405,6 +419,81 @@ class TimeLogDialog(QDialog):
         self.note.setText(note)
         self.hours_spin.setValue(hours)
 
+    def _on_table_item_changed(self, item: QTableWidgetItem) -> None:
+        """Commit inline edits in the table back to the database.
+
+        Editing a cell should behave like selecting that row and pressing
+        the Add/Update button, so we reuse the same validation and DB logic.
+        """
+        if self._reloading_entries:
+            # Ignore changes that come from _reload_entries().
+            return
+
+        if item is None:
+            return
+
+        row = item.row()
+
+        proj_item = self.table.item(row, 0)
+        act_item = self.table.item(row, 1)
+        note_item = self.table.item(row, 2)
+        hours_item = self.table.item(row, 3)
+
+        if proj_item is None or act_item is None or hours_item is None:
+            # Incomplete row – nothing to do.
+            return
+
+        # Recover the entry id from the hidden UserRole on the project cell
+        entry_id = proj_item.data(Qt.ItemDataRole.UserRole)
+        self._current_entry_id = int(entry_id) if entry_id is not None else None
+
+        # Push values into the editors (similar to _on_row_selected).
+        proj_name = proj_item.text()
+        act_name = act_item.text()
+        note_text = note_item.text() if note_item is not None else ""
+        hours_text = hours_item.text()
+
+        # Set project combo by name, creating a project on the fly if needed.
+        idx = self.project_combo.findText(proj_name, Qt.MatchFixedString)
+        if idx < 0 and proj_name:
+            # Allow creating a new project directly from the table.
+            proj_id = self._db.add_project(proj_name)
+            self._reload_projects()
+            idx = self.project_combo.findData(proj_id)
+        if idx >= 0:
+            self.project_combo.setCurrentIndex(idx)
+        else:
+            self.project_combo.setCurrentIndex(-1)
+
+        self.activity_edit.setText(act_name)
+        self.note.setText(note_text)
+
+        # Parse hours; if invalid, show the same style of warning as elsewhere.
+        try:
+            hours = float(hours_text)
+        except ValueError:
+            QMessageBox.warning(
+                self,
+                strings._("invalid_time_title"),
+                strings._("invalid_time_message"),
+            )
+            # Reset table back to the last known-good state.
+            self._reload_entries()
+            return
+
+        self.hours_spin.setValue(hours)
+
+        # Mirror button state to reflect whether we're updating or adding.
+        if self._current_entry_id is None:
+            self.delete_btn.setEnabled(False)
+            self.add_update_btn.setText(strings._("add_time_entry"))
+        else:
+            self.delete_btn.setEnabled(True)
+            self.add_update_btn.setText(strings._("update_time_entry"))
+
+        # Finally, reuse the existing validation + DB logic.
+        self._on_add_or_update()
+
     def _on_delete_entry(self) -> None:
         if self._current_entry_id is None:
             return
@@ -453,15 +542,15 @@ class TimeCodeManagerDialog(QDialog):
         proj_layout.addWidget(self.project_list, 1)
 
         proj_btn_row = QHBoxLayout()
-        self.proj_add_btn = QPushButton(strings._("add_project"))
-        self.proj_rename_btn = QPushButton(strings._("rename_project"))
-        self.proj_delete_btn = QPushButton(strings._("delete_project"))
+        self.proj_add_btn = QPushButton("&" + strings._("add_project"))
+        self.proj_rename_btn = QPushButton("&" + strings._("rename_project"))
+        self.proj_delete_btn = QPushButton("&" + strings._("delete_project"))
         proj_btn_row.addWidget(self.proj_add_btn)
         proj_btn_row.addWidget(self.proj_rename_btn)
         proj_btn_row.addWidget(self.proj_delete_btn)
         proj_layout.addLayout(proj_btn_row)
 
-        self.tabs.addTab(proj_tab, strings._("projects"))
+        self.tabs.addTab(proj_tab, "&" + strings._("projects"))
 
         # Activities tab
         act_tab = QWidget()
@@ -470,9 +559,9 @@ class TimeCodeManagerDialog(QDialog):
         act_layout.addWidget(self.activity_list, 1)
 
         act_btn_row = QHBoxLayout()
-        self.act_add_btn = QPushButton(strings._("add_activity"))
-        self.act_rename_btn = QPushButton(strings._("rename_activity"))
-        self.act_delete_btn = QPushButton(strings._("delete_activity"))
+        self.act_add_btn = QPushButton("&" + strings._("add_activity"))
+        self.act_rename_btn = QPushButton("&" + strings._("rename_activity"))
+        self.act_delete_btn = QPushButton("&" + strings._("delete_activity"))
         act_btn_row.addWidget(self.act_add_btn)
         act_btn_row.addWidget(self.act_rename_btn)
         act_btn_row.addWidget(self.act_delete_btn)
@@ -483,7 +572,7 @@ class TimeCodeManagerDialog(QDialog):
         # Close
         close_row = QHBoxLayout()
         close_row.addStretch(1)
-        close_btn = QPushButton(strings._("close"))
+        close_btn = QPushButton("&" + strings._("close"))
         close_btn.clicked.connect(self.accept)
         close_row.addWidget(close_btn)
         root.addLayout(close_row)
@@ -827,7 +916,7 @@ class TimeReportDialog(QDialog):
         # Close
         close_row = QHBoxLayout()
         close_row.addStretch(1)
-        close_btn = QPushButton(strings._("close"))
+        close_btn = QPushButton("&" + strings._("close"))
         close_btn.clicked.connect(self.accept)
         close_row.addWidget(close_btn)
         root.addLayout(close_row)

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

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