bouquin 0.6.2__tar.gz → 0.6.4__tar.gz

{bouquin-0.6.2 → bouquin-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bouquin
-Version: 0.6.2
+Version: 0.6.4
 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.6.2 → bouquin-0.6.4}/bouquin/db.py

@@ -1108,8 +1108,8 @@ class DBManager:
         project_id: int,
         start_date_iso: str,
         end_date_iso: str,
-        granularity: str = "day",  # 'day' | 'week' | 'month'
-    ) -> list[tuple[str, str, int]]:
+        granularity: str = "day",  # 'day' | 'week' | 'month' | 'none'
+    ) -> list[tuple[str, str, str, int]]:
         """
         Return (time_period, activity_name, total_minutes) tuples between start and end
         for a project, grouped by period and activity.
@@ -1117,7 +1117,33 @@ class DBManager:
           - 'YYYY-MM-DD' for day
           - 'YYYY-WW'    for week
           - 'YYYY-MM'    for month
+        For 'none' granularity,  each individual time log entry becomes a row.
         """
+        cur = self.conn.cursor()
+
+        if granularity == "none":
+            # No grouping: one row per entry
+            rows = cur.execute(
+                """
+                SELECT
+                    t.page_date   AS period,
+                    a.name        AS activity_name,
+                    t.note        AS note,
+                    t.minutes     AS total_minutes
+                FROM time_log t
+                JOIN activities a ON a.id = t.activity_id
+                WHERE t.project_id = ?
+                  AND t.page_date BETWEEN ? AND ?
+                ORDER BY period, LOWER(a.name), t.id;
+                """,
+                (project_id, start_date_iso, end_date_iso),
+            ).fetchall()
+
+            return [
+                (r["period"], r["activity_name"], r["note"], r["total_minutes"])
+                for r in rows
+            ]
+
         if granularity == "day":
             bucket_expr = "page_date"
         elif granularity == "week":
@@ -1126,13 +1152,11 @@ class DBManager:
         else:  # month
             bucket_expr = "substr(page_date, 1, 7)"  # YYYY-MM
 
-        cur = self.conn.cursor()
         rows = cur.execute(
             f"""
             SELECT
                 {bucket_expr} AS bucket,
                 a.name         AS activity_name,
-                t.note         AS note,
                 SUM(t.minutes) AS total_minutes
             FROM time_log t
             JOIN activities a ON a.id = t.activity_id
@@ -1144,8 +1168,82 @@ class DBManager:
             (project_id, start_date_iso, end_date_iso),
         ).fetchall()
 
+        return [(r["bucket"], r["activity_name"], "", r["total_minutes"]) for r in rows]
+
+    def time_report_all(
+        self,
+        start_date_iso: str,
+        end_date_iso: str,
+        granularity: str = "day",  # 'day' | 'week' | 'month' | 'none'
+    ) -> list[tuple[str, str, str, str, int]]:
+        """
+        Return (project_name, time_period, activity_name, note, total_minutes)
+        across *all* projects between start and end, grouped by project + period + activity.
+        """
+        cur = self.conn.cursor()
+
+        if granularity == "none":
+            # No grouping – one row per time_log record
+            rows = cur.execute(
+                """
+                SELECT
+                    p.name       AS project_name,
+                    t.page_date  AS period,
+                    a.name       AS activity_name,
+                    t.note       AS note,
+                    t.minutes    AS total_minutes
+                FROM time_log t
+                JOIN projects  p ON p.id = t.project_id
+                JOIN activities a ON a.id = t.activity_id
+                WHERE t.page_date BETWEEN ? AND ?
+                ORDER BY LOWER(p.name), period, LOWER(activity_name), t.id;
+                """,
+                (start_date_iso, end_date_iso),
+            ).fetchall()
+
+            return [
+                (
+                    r["project_name"],
+                    r["period"],
+                    r["activity_name"],
+                    r["note"],
+                    r["total_minutes"],
+                )
+                for r in rows
+            ]
+
+        if granularity == "day":
+            bucket_expr = "page_date"
+        elif granularity == "week":
+            bucket_expr = "strftime('%Y-%W', page_date)"
+        else:  # month
+            bucket_expr = "substr(page_date, 1, 7)"  # YYYY-MM
+
+        rows = cur.execute(
+            f"""
+            SELECT
+                p.name        AS project_name,
+                {bucket_expr} AS bucket,
+                a.name        AS activity_name,
+                SUM(t.minutes) AS total_minutes
+            FROM time_log t
+            JOIN projects  p ON p.id = t.project_id
+            JOIN activities a ON a.id = t.activity_id
+            WHERE t.page_date BETWEEN ? AND ?
+            GROUP BY p.id, bucket, activity_name
+            ORDER BY LOWER(p.name), bucket, LOWER(activity_name);
+            """,  # nosec
+            (start_date_iso, end_date_iso),
+        ).fetchall()
+
         return [
-            (r["bucket"], r["activity_name"], r["note"], r["total_minutes"])
+            (
+                r["project_name"],
+                r["bucket"],
+                r["activity_name"],
+                "",
+                r["total_minutes"],
+            )
             for r in rows
         ]
 

{bouquin-0.6.2 → bouquin-0.6.4}/bouquin/locales/en.json

@@ -40,6 +40,8 @@
     "next_day": "Next day",
     "today": "Today",
     "show": "Show",
+    "edit": "Edit",
+    "delete": "Delete",
     "history": "History",
     "export_accessible_flag": "&Export",
     "export_entries": "Export entries",
@@ -50,6 +52,7 @@
     "backup_failed": "Backup failed",
     "quit": "Quit",
     "cancel": "Cancel",
+    "close": "Close",
     "save": "Save",
     "help": "Help",
     "saved": "Saved",
@@ -193,10 +196,16 @@
     "add_project": "Add project",
     "add_time_entry": "Add time entry",
     "time_period": "Time period",
+    "dont_group": "Don't group",
     "by_day": "by day",
     "by_month": "by month",
     "by_week": "by week",
     "date_range": "Date range",
+    "custom_range": "Custom",
+    "this_week": "This week",
+    "this_month": "This month",
+    "this_year": "This year",
+    "all_projects": "All projects",
     "delete_activity": "Delete activity",
     "delete_activity_confirm": "Are you sure you want to delete this activity?",
     "delete_activity_title": "Delete activity - are you sure?",
@@ -277,18 +286,35 @@
     "pause": "Pause",
     "resume": "Resume",
     "stop_and_log": "Stop and log",
+    "manage_reminders": "Manage Reminders",
+    "upcoming_reminders": "Upcoming Reminders",
+    "no_upcoming_reminders": "No upcoming reminders",
     "once": "once",
     "daily": "daily",
     "weekdays": "weekdays",
     "weekly": "weekly",
-    "set_reminder": "Set reminder",
-    "edit_reminder": "Edit reminder",
+    "add_reminder": "Add Reminder",
+    "set_reminder": "Set Reminder",
+    "edit_reminder": "Edit Reminder",
+    "delete_reminder": "Delete Reminder",
+    "delete_reminders": "Delete Reminders",
+    "deleting_it_will_remove_all_future_occurrences": "Deleting it will remove all future occurrences.",
+    "this_is_a_reminder_of_type": "Note: This is a reminder of type",
+    "this_will_delete_the_actual_reminders": "Note: This will delete the actual reminders, not just individual occurrences.",
     "reminder": "Reminder",
+    "reminders": "Reminders",
     "time": "Time",
     "once_today": "Once (today)",
     "every_day": "Every day",
     "every_weekday": "Every weekday (Mon-Fri)",
     "every_week": "Every week",
+    "every_fortnight": "Every 2 weeks",
+    "every_month": "Every month (same date)",
+    "every_month_nth_weekday": "Every month (e.g. 3rd Monday)",
+    "week_in_month": "Week in month",
+    "fortnightly": "Fortnightly",
+    "monthly_same_date": "Monthly (same date)",
+    "monthly_nth_weekday": "Monthly (nth weekday)",
     "repeat": "Repeat",
     "monday": "Monday",
     "tuesday": "Tuesday",
@@ -297,7 +323,18 @@
     "friday": "Friday",
     "saturday": "Saturday",
     "sunday": "Sunday",
+    "monday_short": "Mon",
+    "tuesday_short": "Tue",
+    "wednesday_short": "Wed",
+    "thursday_short": "Thu",
+    "friday_short": "Fri",
+    "saturday_short": "Sat",
+    "sunday_short": "Sun",
     "day": "Day",
+    "text": "Text",
+    "type": "Type",
+    "active": "Active",
+    "actions": "Actions",
     "edit_code_block": "Edit code block",
     "delete_code_block": "Delete code block",
     "search_result_heading_document": "Document",

{bouquin-0.6.2 → bouquin-0.6.4}/bouquin/pomodoro_timer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import math
 from typing import Optional
 
-from PySide6.QtCore import Qt, QTimer, Signal, Slot, QSignalBlocker
+from PySide6.QtCore import Qt, QTimer, Signal, Slot
 from PySide6.QtWidgets import (
     QFrame,
     QVBoxLayout,
@@ -167,9 +167,12 @@ class PomodoroManager:
         # Untoggle the toolbar button without retriggering the slot
         tool_bar = getattr(self._parent, "toolBar", None)
         if tool_bar is not None and hasattr(tool_bar, "actTimer"):
-            blocker = QSignalBlocker(tool_bar.actTimer)
-            tool_bar.actTimer.setChecked(False)
-            del blocker
+            action = tool_bar.actTimer
+            was_blocked = action.blockSignals(True)
+            try:
+                action.setChecked(False)
+            finally:
+                action.blockSignals(was_blocked)
 
         # Remove the embedded widget
         self.cancel_timer()

{bouquin-0.6.2 → bouquin-0.6.4}/bouquin/reminders.py

@@ -26,6 +26,8 @@ from PySide6.QtWidgets import (
     QTableWidgetItem,
     QAbstractItemView,
     QHeaderView,
+    QSpinBox,
+    QDateEdit,
 )
 
 from . import strings
@@ -37,6 +39,9 @@ class ReminderType(Enum):
     DAILY = strings._("daily")
     WEEKDAYS = strings._("weekdays")  # Mon-Fri
     WEEKLY = strings._("weekly")  # specific day of week
+    FORTNIGHTLY = strings._("fortnightly")  # every 2 weeks
+    MONTHLY_DATE = strings._("monthly_same_date")  # same calendar date
+    MONTHLY_NTH_WEEKDAY = strings._("monthly_nth_weekday")  # e.g. 3rd Monday
 
 
 @dataclass
@@ -72,6 +77,22 @@ class ReminderDialog(QDialog):
             self.text_edit.setText(reminder.text)
         self.form.addRow("&" + strings._("reminder") + ":", self.text_edit)
 
+        # Date
+        self.date_edit = QDateEdit()
+        self.date_edit.setCalendarPopup(True)
+        self.date_edit.setDisplayFormat("yyyy-MM-dd")
+
+        if reminder and reminder.date_iso:
+            d = QDate.fromString(reminder.date_iso, "yyyy-MM-dd")
+            if d.isValid():
+                self.date_edit.setDate(d)
+            else:
+                self.date_edit.setDate(QDate.currentDate())
+        else:
+            self.date_edit.setDate(QDate.currentDate())
+
+        self.form.addRow("&" + strings._("date") + ":", self.date_edit)
+
         # Time
         self.time_edit = QTimeEdit()
         self.time_edit.setDisplayFormat("HH:mm")
@@ -79,7 +100,9 @@ class ReminderDialog(QDialog):
             parts = reminder.time_str.split(":")
             self.time_edit.setTime(QTime(int(parts[0]), int(parts[1])))
         else:
-            self.time_edit.setTime(QTime.currentTime())
+            # Default to 5 minutes in the future
+            future = QTime.currentTime().addSecs(5 * 60)
+            self.time_edit.setTime(future)
         self.form.addRow("&" + strings._("time") + ":", self.time_edit)
 
         # Recurrence type
@@ -88,6 +111,11 @@ class ReminderDialog(QDialog):
         self.type_combo.addItem(strings._("every_day"), ReminderType.DAILY)
         self.type_combo.addItem(strings._("every_weekday"), ReminderType.WEEKDAYS)
         self.type_combo.addItem(strings._("every_week"), ReminderType.WEEKLY)
+        self.type_combo.addItem(strings._("every_fortnight"), ReminderType.FORTNIGHTLY)
+        self.type_combo.addItem(strings._("every_month"), ReminderType.MONTHLY_DATE)
+        self.type_combo.addItem(
+            strings._("every_month_nth_weekday"), ReminderType.MONTHLY_NTH_WEEKDAY
+        )
 
         if reminder:
             for i in range(self.type_combo.count()):
@@ -115,12 +143,31 @@ class ReminderDialog(QDialog):
         if reminder and reminder.weekday is not None:
             self.weekday_combo.setCurrentIndex(reminder.weekday)
         else:
-            self.weekday_combo.setCurrentIndex(QDate.currentDate().dayOfWeek() - 1)
+            self.weekday_combo.setCurrentIndex(self.date_edit.date().dayOfWeek() - 1)
 
         self.form.addRow("&" + strings._("day") + ":", self.weekday_combo)
         day_label = self.form.labelForField(self.weekday_combo)
         day_label.setVisible(False)
 
+        self.nth_spin = QSpinBox()
+        self.nth_spin.setRange(1, 5)  # up to 5th Monday, etc.
+        self.nth_spin.setValue(1)
+        # If editing an existing MONTHLY_NTH_WEEKDAY reminder, derive the nth from date_iso
+        if (
+            reminder
+            and reminder.reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY
+            and reminder.date_iso
+        ):
+            anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd")
+            if anchor.isValid():
+                nth_index = (anchor.day() - 1) // 7  # 0-based
+                self.nth_spin.setValue(nth_index + 1)
+
+        self.form.addRow("&" + strings._("week_in_month") + ":", self.nth_spin)
+        nth_label = self.form.labelForField(self.nth_spin)
+        nth_label.setVisible(False)
+        self.nth_spin.setVisible(False)
+
         layout.addLayout(self.form)
 
         # Buttons
@@ -141,11 +188,31 @@ class ReminderDialog(QDialog):
         self._on_type_changed()
 
     def _on_type_changed(self):
-        """Show/hide weekday selector based on reminder type."""
+        """Show/hide weekday / nth selectors based on reminder type."""
         reminder_type = self.type_combo.currentData()
-        self.weekday_combo.setVisible(reminder_type == ReminderType.WEEKLY)
+
+        show_weekday = reminder_type in (
+            ReminderType.WEEKLY,
+            ReminderType.MONTHLY_NTH_WEEKDAY,
+        )
+        self.weekday_combo.setVisible(show_weekday)
         day_label = self.form.labelForField(self.weekday_combo)
-        day_label.setVisible(reminder_type == ReminderType.WEEKLY)
+        day_label.setVisible(show_weekday)
+
+        show_nth = reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY
+        nth_label = self.form.labelForField(self.nth_spin)
+        self.nth_spin.setVisible(show_nth)
+        nth_label.setVisible(show_nth)
+
+        # For new reminders, when switching to a type that uses a weekday,
+        # snap the weekday to match the currently selected date.
+        if reminder_type in (
+            ReminderType.WEEKLY,
+            ReminderType.MONTHLY_NTH_WEEKDAY,
+        ) and (self._reminder is None or self._reminder.reminder_type != reminder_type):
+            dow = self.date_edit.date().dayOfWeek() - 1  # 0..6 (Mon..Sun)
+            if 0 <= dow < self.weekday_combo.count():
+                self.weekday_combo.setCurrentIndex(dow)
 
     def get_reminder(self) -> Reminder:
         """Get the configured reminder."""
@@ -154,13 +221,39 @@ class ReminderDialog(QDialog):
         time_str = f"{time_obj.hour():02d}:{time_obj.minute():02d}"
 
         weekday = None
-        if reminder_type == ReminderType.WEEKLY:
+        if reminder_type in (ReminderType.WEEKLY, ReminderType.MONTHLY_NTH_WEEKDAY):
             weekday = self.weekday_combo.currentData()
 
         date_iso = None
+        anchor_date = self.date_edit.date()
+
         if reminder_type == ReminderType.ONCE:
-            # Right now this just means "today at the chosen time".
-            date_iso = QDate.currentDate().toString("yyyy-MM-dd")
+            # Fire once, on the chosen calendar date at the chosen time
+            date_iso = anchor_date.toString("yyyy-MM-dd")
+
+        elif reminder_type == ReminderType.FORTNIGHTLY:
+            # Anchor: the chosen calendar date. Every 14 days from this date.
+            date_iso = anchor_date.toString("yyyy-MM-dd")
+
+        elif reminder_type == ReminderType.MONTHLY_DATE:
+            # Anchor: the chosen calendar date. "Same date each month"
+            date_iso = anchor_date.toString("yyyy-MM-dd")
+
+        elif reminder_type == ReminderType.MONTHLY_NTH_WEEKDAY:
+            # Anchor: the nth weekday for the chosen month (gives us “3rd Monday” etc.)
+            weekday = self.weekday_combo.currentData()
+            nth_index = self.nth_spin.value() - 1  # 0-based
+
+            first = QDate(anchor_date.year(), anchor_date.month(), 1)
+            target_dow = weekday + 1  # Qt: Monday=1
+            offset = (target_dow - first.dayOfWeek() + 7) % 7
+            anchor = first.addDays(offset + nth_index * 7)
+
+            # If nth weekday doesn't exist in this month, fall back to the last such weekday
+            if anchor.month() != anchor_date.month():
+                anchor = anchor.addDays(-7)
+
+            date_iso = anchor.toString("yyyy-MM-dd")
 
         return Reminder(
             id=self._reminder.id if self._reminder else None,
@@ -187,7 +280,7 @@ class UpcomingRemindersWidget(QFrame):
 
         # Header with toggle button
         self.toggle_btn = QToolButton()
-        self.toggle_btn.setText("Upcoming Reminders")
+        self.toggle_btn.setText(strings._("upcoming_reminders"))
         self.toggle_btn.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
         self.toggle_btn.setCheckable(True)
         self.toggle_btn.setChecked(False)
@@ -196,7 +289,7 @@ class UpcomingRemindersWidget(QFrame):
 
         self.add_btn = QToolButton()
         self.add_btn.setText("⏰")
-        self.add_btn.setToolTip("Add Reminder")
+        self.add_btn.setToolTip(strings._("add_reminder"))
         self.add_btn.setAutoRaise(True)
         self.add_btn.clicked.connect(self._add_reminder)
 
@@ -204,7 +297,7 @@ class UpcomingRemindersWidget(QFrame):
         self.manage_btn.setIcon(
             self.style().standardIcon(QStyle.SP_FileDialogDetailedView)
         )
-        self.manage_btn.setToolTip("Manage All Reminders")
+        self.manage_btn.setToolTip(strings._("manage_reminders"))
         self.manage_btn.setAutoRaise(True)
         self.manage_btn.clicked.connect(self._manage_reminders)
 
@@ -328,24 +421,75 @@ class UpcomingRemindersWidget(QFrame):
             self.reminder_list.addItem(item)
 
         if not upcoming:
-            item = QListWidgetItem("No upcoming reminders")
+            item = QListWidgetItem(strings._("no_upcoming_reminders"))
             item.setFlags(Qt.NoItemFlags)
             self.reminder_list.addItem(item)
 
     def _should_fire_on_date(self, reminder: Reminder, date: QDate) -> bool:
         """Check if a reminder should fire on a given date."""
-        if reminder.reminder_type == ReminderType.ONCE:
+        rtype = reminder.reminder_type
+
+        if rtype == ReminderType.ONCE:
             if reminder.date_iso:
                 return date.toString("yyyy-MM-dd") == reminder.date_iso
             return False
-        elif reminder.reminder_type == ReminderType.DAILY:
+
+        if rtype == ReminderType.DAILY:
             return True
-        elif reminder.reminder_type == ReminderType.WEEKDAYS:
+
+        if rtype == ReminderType.WEEKDAYS:
             # Monday=1, Sunday=7
             return 1 <= date.dayOfWeek() <= 5
-        elif reminder.reminder_type == ReminderType.WEEKLY:
+
+        if rtype == ReminderType.WEEKLY:
             # Qt: Monday=1, reminder: Monday=0
             return date.dayOfWeek() - 1 == reminder.weekday
+
+        if rtype == ReminderType.FORTNIGHTLY:
+            if not reminder.date_iso:
+                return False
+            anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd")
+            if not anchor.isValid() or date < anchor:
+                return False
+            days = anchor.daysTo(date)
+            return days % 14 == 0
+
+        if rtype == ReminderType.MONTHLY_DATE:
+            if not reminder.date_iso:
+                return False
+            anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd")
+            if not anchor.isValid():
+                return False
+            anchor_day = anchor.day()
+            # Clamp to the last day of this month (for 29/30/31)
+            first_of_month = QDate(date.year(), date.month(), 1)
+            last_of_month = first_of_month.addMonths(1).addDays(-1)
+            target_day = min(anchor_day, last_of_month.day())
+            return date.day() == target_day
+
+        if rtype == ReminderType.MONTHLY_NTH_WEEKDAY:
+            if not reminder.date_iso or reminder.weekday is None:
+                return False
+
+            anchor = QDate.fromString(reminder.date_iso, "yyyy-MM-dd")
+            if not anchor.isValid():
+                return False
+
+            # Which "nth" weekday is the anchor? (0=1st, 1=2nd, etc.)
+            anchor_n = (anchor.day() - 1) // 7
+            target_dow = reminder.weekday + 1  # Qt dayOfWeek (1..7)
+
+            # Compute the anchor_n-th target weekday in this month
+            first = QDate(date.year(), date.month(), 1)
+            offset = (target_dow - first.dayOfWeek() + 7) % 7
+            candidate = first.addDays(offset + anchor_n * 7)
+
+            # If that nth weekday doesn’t exist this month (e.g. 5th Monday), skip
+            if candidate.month() != date.month():
+                return False
+
+            return date == candidate
+
         return False
 
     def _check_reminders(self):
@@ -431,7 +575,7 @@ class UpcomingRemindersWidget(QFrame):
         if len(selected_items) == 1:
             reminder = selected_items[0].data(Qt.UserRole)
             if reminder:
-                edit_action = QAction("Edit", self)
+                edit_action = QAction(strings._("edit"), self)
                 edit_action.triggered.connect(
                     lambda: self._edit_reminder(selected_items[0])
                 )
@@ -439,9 +583,13 @@ class UpcomingRemindersWidget(QFrame):
 
         # Delete option for any selection
         if len(selected_items) == 1:
-            delete_text = "Delete"
+            delete_text = strings._("delete")
         else:
-            delete_text = f"Delete {len(selected_items)} Reminders"
+            delete_text = (
+                strings._("delete")
+                + f" {len(selected_items)} "
+                + strings._("reminders")
+            )
 
         delete_action = QAction(delete_text, self)
         delete_action.triggered.connect(lambda: self._delete_selected_reminders())
@@ -468,15 +616,31 @@ class UpcomingRemindersWidget(QFrame):
         # Confirmation message
         if len(unique_reminders) == 1:
             reminder = list(unique_reminders.values())[0]
-            msg = f"Delete reminder '{reminder.text}'?"
+            msg = (
+                strings._("delete")
+                + " "
+                + strings._("reminder")
+                + f" '{reminder.text}'?"
+            )
             if reminder.reminder_type != ReminderType.ONCE:
-                msg += f"\n\nNote: This is a {reminder.reminder_type.value} reminder. Deleting it will remove all future occurrences."
+                msg += (
+                    "\n\n"
+                    + strings._("this_is_a_reminder_of_type")
+                    + f" '{reminder.reminder_type.value}'. "
+                    + strings._("deleting_it_will_remove_all_future_occurrences")
+                )
         else:
-            msg = f"Delete {len(unique_reminders)} reminders?\n\nNote: This will delete the actual reminders, not just individual occurrences."
+            msg = (
+                strings._("delete")
+                + f"{len(unique_reminders)} "
+                + strings._("reminders")
+                + " ?\n\n"
+                + strings._("this_will_delete_the_actual_reminders")
+            )
 
         reply = QMessageBox.question(
             self,
-            "Delete Reminders",
+            strings._("delete_reminders"),
             msg,
             QMessageBox.Yes | QMessageBox.No,
             QMessageBox.No,
@@ -489,13 +653,18 @@ class UpcomingRemindersWidget(QFrame):
 
     def _delete_reminder(self, reminder):
         """Delete a single reminder after confirmation."""
-        msg = f"Delete reminder '{reminder.text}'?"
+        msg = strings._("delete") + " " + strings._("reminder") + f" '{reminder.text}'?"
         if reminder.reminder_type != ReminderType.ONCE:
-            msg += f"\n\nNote: This is a {reminder.reminder_type.value} reminder. Deleting it will remove all future occurrences."
+            msg += (
+                "\n\n"
+                + strings._("this_is_a_reminder_of_type")
+                + f" '{reminder.reminder_type.value}'. "
+                + strings._("deleting_it_will_remove_all_future_occurrences")
+            )
 
         reply = QMessageBox.question(
             self,
-            "Delete Reminder",
+            strings._("delete_reminder"),
             msg,
             QMessageBox.Yes | QMessageBox.No,
             QMessageBox.No,
@@ -520,7 +689,7 @@ class ManageRemindersDialog(QDialog):
         super().__init__(parent)
         self._db = db
 
-        self.setWindowTitle("Manage Reminders")
+        self.setWindowTitle(strings._("manage_reminders"))
         self.setMinimumSize(700, 500)
 
         layout = QVBoxLayout(self)
@@ -529,23 +698,30 @@ class ManageRemindersDialog(QDialog):
         self.table = QTableWidget()
         self.table.setColumnCount(5)
         self.table.setHorizontalHeaderLabels(
-            ["Text", "Time", "Type", "Active", "Actions"]
+            [
+                strings._("text"),
+                strings._("time"),
+                strings._("type"),
+                strings._("active"),
+                strings._("actions"),
+            ]
         )
         self.table.horizontalHeader().setStretchLastSection(False)
         self.table.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
         self.table.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.table.setEditTriggers(QAbstractItemView.NoEditTriggers)
         layout.addWidget(self.table)
 
         # Buttons
         btn_layout = QHBoxLayout()
 
-        add_btn = QPushButton("Add Reminder")
+        add_btn = QPushButton(strings._("add_reminder"))
         add_btn.clicked.connect(self._add_reminder)
         btn_layout.addWidget(add_btn)
 
         btn_layout.addStretch()
 
-        close_btn = QPushButton("Close")
+        close_btn = QPushButton(strings._("close"))
         close_btn.clicked.connect(self.accept)
         btn_layout.addWidget(close_btn)
 
@@ -579,13 +755,30 @@ class ManageRemindersDialog(QDialog):
                 ReminderType.DAILY: "Daily",
                 ReminderType.WEEKDAYS: "Weekdays",
                 ReminderType.WEEKLY: "Weekly",
+                ReminderType.FORTNIGHTLY: "Fortnightly",
+                ReminderType.MONTHLY_DATE: "Monthly (date)",
+                ReminderType.MONTHLY_NTH_WEEKDAY: "Monthly (nth weekday)",
             }.get(reminder.reminder_type, "Unknown")
 
+            # Add day-of-week annotation where it makes sense
             if (
-                reminder.reminder_type == ReminderType.WEEKLY
+                reminder.reminder_type
+                in (
+                    ReminderType.WEEKLY,
+                    ReminderType.FORTNIGHTLY,
+                    ReminderType.MONTHLY_NTH_WEEKDAY,
+                )
                 and reminder.weekday is not None
             ):
-                days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
+                days = [
+                    strings._("monday_short"),
+                    strings._("tuesday_short"),
+                    strings._("wednesday_short"),
+                    strings._("thursday_short"),
+                    strings._("friday_short"),
+                    strings._("saturday_short"),
+                    strings._("sunday_short"),
+                ]
                 type_str += f" ({days[reminder.weekday]})"
 
             type_item = QTableWidgetItem(type_str)
@@ -600,11 +793,11 @@ class ManageRemindersDialog(QDialog):
             actions_layout = QHBoxLayout(actions_widget)
             actions_layout.setContentsMargins(2, 2, 2, 2)
 
-            edit_btn = QPushButton("Edit")
+            edit_btn = QPushButton(strings._("edit"))
             edit_btn.clicked.connect(lambda checked, r=reminder: self._edit_reminder(r))
             actions_layout.addWidget(edit_btn)
 
-            delete_btn = QPushButton("Delete")
+            delete_btn = QPushButton(strings._("delete"))
             delete_btn.clicked.connect(
                 lambda checked, r=reminder: self._delete_reminder(r)
             )
@@ -632,8 +825,8 @@ class ManageRemindersDialog(QDialog):
         """Delete a reminder."""
         reply = QMessageBox.question(
             self,
-            "Delete Reminder",
-            f"Delete reminder '{reminder.text}'?",
+            strings._("delete_reminder"),
+            strings._("delete") + " " + strings._("reminder") + f" '{reminder.text}'?",
             QMessageBox.Yes | QMessageBox.No,
             QMessageBox.No,
         )

{bouquin-0.6.2 → bouquin-0.6.4}/bouquin/time_log.py

@@ -986,7 +986,7 @@ class TimeReportDialog(QDialog):
         self._db = db
 
         # state for last run
-        self._last_rows: list[tuple[str, str, int]] = []
+        self._last_rows: list[tuple[str, str, str, str, int]] = []
         self._last_total_minutes: int = 0
         self._last_project_name: str = ""
         self._last_start: str = ""
@@ -1001,25 +1001,44 @@ class TimeReportDialog(QDialog):
         form = QFormLayout()
         # Project
         self.project_combo = QComboBox()
+        self.project_combo.addItem(strings._("all_projects"), None)
         for proj_id, name in self._db.list_projects():
             self.project_combo.addItem(name, proj_id)
         form.addRow(strings._("project"), self.project_combo)
 
         # Date range
         today = QDate.currentDate()
-        self.from_date = QDateEdit(today.addDays(-7))
+        start_of_month = QDate(today.year(), today.month(), 1)
+
+        self.range_preset = QComboBox()
+        self.range_preset.addItem(strings._("custom_range"), "custom")
+        self.range_preset.addItem(strings._("today"), "today")
+        self.range_preset.addItem(strings._("this_week"), "this_week")
+        self.range_preset.addItem(strings._("this_month"), "this_month")
+        self.range_preset.addItem(strings._("this_year"), "this_year")
+        self.range_preset.currentIndexChanged.connect(self._on_range_preset_changed)
+
+        self.from_date = QDateEdit(start_of_month)
         self.from_date.setCalendarPopup(True)
         self.to_date = QDateEdit(today)
         self.to_date.setCalendarPopup(True)
 
         range_row = QHBoxLayout()
+        range_row.addWidget(self.range_preset)
         range_row.addWidget(self.from_date)
         range_row.addWidget(QLabel("—"))
         range_row.addWidget(self.to_date)
+
         form.addRow(strings._("date_range"), range_row)
 
+        # After widgets are created, choose default preset
+        idx = self.range_preset.findData("this_month")
+        if idx != -1:
+            self.range_preset.setCurrentIndex(idx)
+
         # Granularity
         self.granularity = QComboBox()
+        self.granularity.addItem(strings._("dont_group"), "none")
         self.granularity.addItem(strings._("by_day"), "day")
         self.granularity.addItem(strings._("by_week"), "week")
         self.granularity.addItem(strings._("by_month"), "month")
@@ -1046,9 +1065,10 @@ class TimeReportDialog(QDialog):
 
         # Table
         self.table = QTableWidget()
-        self.table.setColumnCount(4)
+        self.table.setColumnCount(5)
         self.table.setHorizontalHeaderLabels(
             [
+                strings._("project"),
                 strings._("time_period"),
                 strings._("activity"),
                 strings._("note"),
@@ -1058,8 +1078,9 @@ class TimeReportDialog(QDialog):
         self.table.horizontalHeader().setSectionResizeMode(0, QHeaderView.Stretch)
         self.table.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch)
         self.table.horizontalHeader().setSectionResizeMode(2, QHeaderView.Stretch)
+        self.table.horizontalHeader().setSectionResizeMode(3, QHeaderView.Stretch)
         self.table.horizontalHeader().setSectionResizeMode(
-            3, QHeaderView.ResizeToContents
+            4, QHeaderView.ResizeToContents
         )
         root.addWidget(self.table, 1)
 
@@ -1075,39 +1096,155 @@ class TimeReportDialog(QDialog):
         close_row.addWidget(close_btn)
         root.addLayout(close_row)
 
+    def _configure_table_columns(self, granularity: str) -> None:
+        if granularity == "none":
+            # Show notes
+            self.table.setColumnCount(5)
+            self.table.setHorizontalHeaderLabels(
+                [
+                    strings._("project"),
+                    strings._("time_period"),
+                    strings._("activity"),
+                    strings._("note"),
+                    strings._("hours"),
+                ]
+            )
+            # project, period, activity, note stretch; hours shrink
+            header = self.table.horizontalHeader()
+            header.setSectionResizeMode(0, QHeaderView.Stretch)
+            header.setSectionResizeMode(1, QHeaderView.Stretch)
+            header.setSectionResizeMode(2, QHeaderView.Stretch)
+            header.setSectionResizeMode(3, QHeaderView.Stretch)
+            header.setSectionResizeMode(4, QHeaderView.ResizeToContents)
+        else:
+            # Grouped: no note column
+            self.table.setColumnCount(4)
+            self.table.setHorizontalHeaderLabels(
+                [
+                    strings._("project"),
+                    strings._("time_period"),
+                    strings._("activity"),
+                    strings._("hours"),
+                ]
+            )
+            header = self.table.horizontalHeader()
+            header.setSectionResizeMode(0, QHeaderView.Stretch)
+            header.setSectionResizeMode(1, QHeaderView.Stretch)
+            header.setSectionResizeMode(2, QHeaderView.Stretch)
+            header.setSectionResizeMode(3, QHeaderView.ResizeToContents)
+
+    def _on_range_preset_changed(self, index: int) -> None:
+        preset = self.range_preset.currentData()
+        today = QDate.currentDate()
+
+        if preset == "today":
+            start = end = today
+
+        elif preset == "this_week":
+            # Monday-based week, clamp end to today
+            # dayOfWeek(): Monday=1, Sunday=7
+            start = today.addDays(1 - today.dayOfWeek())
+            end = today
+
+        elif preset == "this_month":
+            start = QDate(today.year(), today.month(), 1)
+            end = today
+
+        elif preset == "this_year":
+            start = QDate(today.year(), 1, 1)
+            end = today
+
+        else:  # "custom" – leave fields as user-set
+            return
+
+        # Update date edits without triggering anything else
+        self.from_date.blockSignals(True)
+        self.to_date.blockSignals(True)
+        self.from_date.setDate(start)
+        self.to_date.setDate(end)
+        self.from_date.blockSignals(False)
+        self.to_date.blockSignals(False)
+
     def _run_report(self):
         idx = self.project_combo.currentIndex()
         if idx < 0:
             return
-        proj_id = int(self.project_combo.itemData(idx))
 
+        proj_data = self.project_combo.itemData(idx)
         start = self.from_date.date().toString("yyyy-MM-dd")
         end = self.to_date.date().toString("yyyy-MM-dd")
         gran = self.granularity.currentData()
 
-        # Keep human-friendly copies for PDF header
-        self._last_project_name = self.project_combo.currentText()
         self._last_start = start
         self._last_end = end
         self._last_gran_label = self.granularity.currentText()
+        self._last_gran = gran  # remember which grouping was used
 
-        rows = self._db.time_report(proj_id, start, end, gran)
+        self._configure_table_columns(gran)
 
-        self._last_rows = rows
-        self._last_total_minutes = sum(r[3] for r in rows)
+        rows_for_table: list[tuple[str, str, str, str, int]] = []
 
-        self.table.setRowCount(len(rows))
-        for i, (time_period, activity_name, note, minutes) in enumerate(rows):
-            hrs = minutes / 60.0
-            self.table.setItem(i, 0, QTableWidgetItem(time_period))
-            self.table.setItem(i, 1, QTableWidgetItem(activity_name))
-            self.table.setItem(i, 2, QTableWidgetItem(note))
-            self.table.setItem(i, 3, QTableWidgetItem(f"{hrs:.2f}"))
+        if proj_data is None:
+            # All projects
+            self._last_all_projects = True
+            self._last_project_name = strings._("all_projects")
+            rows_for_table = self._db.time_report_all(start, end, gran)
+        else:
+            self._last_all_projects = False
+            proj_id = int(proj_data)
+            project_name = self.project_combo.currentText()
+            self._last_project_name = project_name
+
+            per_project_rows = self._db.time_report(proj_id, start, end, gran)
+            # Adapt DB rows (period, activity, note, minutes) → include project
+            rows_for_table = [
+                (project_name, period, activity, note, minutes)
+                for (period, activity, note, minutes) in per_project_rows
+            ]
+
+        # Store for export
+        self._last_rows = rows_for_table
+        self._last_total_minutes = sum(r[4] for r in rows_for_table)
 
+        # Per-project totals
+        self._last_project_totals = defaultdict(int)
+        for project, _period, _activity, _note, minutes in rows_for_table:
+            self._last_project_totals[project] += minutes
+
+        # Populate table
+        self.table.setRowCount(len(rows_for_table))
+        for i, (project, time_period, activity_name, note, minutes) in enumerate(
+            rows_for_table
+        ):
+            hrs = minutes / 60.0
+            self.table.setItem(i, 0, QTableWidgetItem(project))
+            self.table.setItem(i, 1, QTableWidgetItem(time_period))
+            self.table.setItem(i, 2, QTableWidgetItem(activity_name))
+
+            if self._last_gran == "none":
+                self.table.setItem(i, 3, QTableWidgetItem(note or ""))
+                self.table.setItem(i, 4, QTableWidgetItem(f"{hrs:.2f}"))
+            else:
+                # no note column
+                self.table.setItem(i, 3, QTableWidgetItem(f"{hrs:.2f}"))
+
+        # Summary label – include per-project totals when in "all projects" mode
         total_hours = self._last_total_minutes / 60.0
-        self.total_label.setText(
-            strings._("time_report_total").format(hours=total_hours)
-        )
+        if self._last_all_projects:
+            per_project_bits = [
+                f"{proj}: {mins/60.0:.2f}h"
+                for proj, mins in sorted(self._last_project_totals.items())
+            ]
+            self.total_label.setText(
+                strings._("time_report_total").format(hours=total_hours)
+                + "  ("
+                + ", ".join(per_project_bits)
+                + ")"
+            )
+        else:
+            self.total_label.setText(
+                strings._("time_report_total").format(hours=total_hours)
+            )
 
     def _export_csv(self):
         if not self._last_rows:
@@ -1133,20 +1270,33 @@ class TimeReportDialog(QDialog):
             with open(filename, "w", newline="", encoding="utf-8") as f:
                 writer = csv.writer(f)
 
+                show_note = getattr(self, "_last_gran", "day") == "none"
+
                 # Header
-                writer.writerow(
-                    [
-                        strings._("time_period"),
-                        strings._("activity"),
-                        strings._("note"),
-                        strings._("hours"),
-                    ]
-                )
+                header = [
+                    strings._("project"),
+                    strings._("time_period"),
+                    strings._("activity"),
+                ]
+                if show_note:
+                    header.append(strings._("note"))
+                header.append(strings._("hours"))
+                writer.writerow(header)
 
                 # Data rows
-                for time_period, activity_name, note, minutes in self._last_rows:
+                for (
+                    project,
+                    time_period,
+                    activity_name,
+                    note,
+                    minutes,
+                ) in self._last_rows:
                     hours = minutes / 60.0
-                    writer.writerow([time_period, activity_name, note, f"{hours:.2f}"])
+                    row = [project, time_period, activity_name]
+                    if show_note:
+                        row.append(note)
+                    row.append(f"{hours:.2f}")
+                    writer.writerow(row)
 
                 # Blank line + total
                 total_hours = self._last_total_minutes / 60.0
@@ -1181,7 +1331,7 @@ class TimeReportDialog(QDialog):
 
         # ---------- Build chart image (hours per period) ----------
         per_period_minutes: dict[str, int] = defaultdict(int)
-        for period, _activity, note, minutes in self._last_rows:
+        for _project, period, _activity, note, minutes in self._last_rows:
             per_period_minutes[period] += minutes
 
         periods = sorted(per_period_minutes.keys())
@@ -1282,10 +1432,11 @@ class TimeReportDialog(QDialog):
 
         # Table rows (period, activity, hours)
         row_html_parts: list[str] = []
-        for period, activity, note, minutes in self._last_rows:
+        for project, period, activity, note, minutes in self._last_rows:
             hours = minutes / 60.0
             row_html_parts.append(
                 "<tr>"
+                f"<td>{html.escape(project)}</td>"
                 f"<td>{html.escape(period)}</td>"
                 f"<td>{html.escape(activity)}</td>"
                 f"<td style='text-align:right'>{hours:.2f}</td>"
@@ -1343,6 +1494,7 @@ class TimeReportDialog(QDialog):
   <p><img src="chart" class="chart" /></p>
   <table>
     <tr>
+      <th>{html.escape(strings._("project"))}</th>
       <th>{html.escape(strings._("time_period"))}</th>
       <th>{html.escape(strings._("activity"))}</th>
       <th>{html.escape(strings._("hours"))}</th>

{bouquin-0.6.2 → bouquin-0.6.4}/pyproject.toml

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