Standardize dialogs update & shortcuts list

Author: M-Rajabi-dev

dialogs/bookmark_list_dialog.py

@@ -120,7 +120,7 @@ def on_delete(self, event):
         bookmark_title = self.bookmark_list.GetItemText(selected_index)
 
         msg = _("Are you sure you want to delete bookmark '{0}'?").format(bookmark_title)
-        if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.ICON_WARNING) == wx.YES:
+        if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.CANCEL | wx.ICON_WARNING | wx.YES_DEFAULT) == wx.YES:
             try:
                 db_manager.delete_bookmark(bookmark_id)
                 speak(_("Bookmark deleted."), LEVEL_CRITICAL)

dialogs/confirm_dialog.py

@@ -9,6 +9,8 @@ class CheckboxConfirmDialog(wx.Dialog):
     def __init__(self, parent, title, message, check_label, button_label):
         super().__init__(parent, title=title, style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
 
+        wx.Bell()
+
         self.panel = wx.Panel(self)
         vbox = wx.BoxSizer(wx.VERTICAL)
 

dialogs/shortcuts_dialog.py

@@ -7,12 +7,8 @@
 
 
 class ShortcutsDialog(wx.Dialog):
-    """
-    Displays a dialog listing all available keyboard shortcuts in a ListCtrl.
-    """
-
     def __init__(self, parent):
-        super(ShortcutsDialog, self).__init__(parent, title=_("Keyboard Shortcuts"), size=(600, 500))
+        super(ShortcutsDialog, self).__init__(parent, title=_("Keyboard Shortcuts"), size=(650, 600))
 
         self.panel = wx.Panel(self)
         main_sizer = wx.BoxSizer(wx.VERTICAL)
@@ -21,8 +17,8 @@ def __init__(self, parent):
         main_sizer.Add(info_lbl, 0, wx.ALL, 10)
 
         self.list_ctrl = wx.ListCtrl(self.panel, style=wx.LC_REPORT | wx.LC_SINGLE_SEL)
-        self.list_ctrl.InsertColumn(0, _("Action"), width=350)
-        self.list_ctrl.InsertColumn(1, _("Shortcut"), width=180)
+        self.list_ctrl.InsertColumn(0, _("Action"), width=400)
+        self.list_ctrl.InsertColumn(1, _("Shortcut"), width=200)
 
         self._populate_list()
 
@@ -42,72 +38,74 @@ def __init__(self, parent):
         self.SetDefaultItem(close_btn)
 
     def _add_item(self, action, shortcut):
-        """Adds a single shortcut item to the list."""
         idx = self.list_ctrl.GetItemCount()
         self.list_ctrl.InsertItem(idx, action)
         self.list_ctrl.SetItem(idx, 1, shortcut)
 
     def _add_header(self, title):
-        """Adds a separator/header row to the list."""
         idx = self.list_ctrl.GetItemCount()
         self.list_ctrl.InsertItem(idx, f"--- {title} ---")
         self.list_ctrl.SetItem(idx, 1, "")
 
     def _populate_list(self):
-        """Populates the list control with all defined shortcuts."""
-        # General
         self._add_header(_("General & Library"))
         self._add_item(_("Add Book Folder"), "Ctrl + O")
         self._add_item(_("Add Single File"), "Ctrl + Shift + O")
+        self._add_item(_("Paste Book from Clipboard"), "Ctrl + V")
         self._add_item(_("Create New Shelf"), "Ctrl + N")
         self._add_item(_("Refresh Library"), "F5")
+        self._add_item(_("Rename Item"), "F2")
+        self._add_item(_("Delete Item"), "Delete")
+        self._add_item(_("Permanent Delete"), "Shift + Delete")
+        self._add_item(_("Properties"), "Alt + Enter")
+        self._add_item(_("Go Back / Up Level"), "Backspace / Alt + Left")
+        self._add_item(_("Go Forward"), "Alt + Right")
         self._add_item(_("Settings"), "Ctrl + Shift + S")
         self._add_item(_("Cycle Verbosity"), "Ctrl + Shift + V")
         self._add_item(_("Search"), "Ctrl + F")
         self._add_item(_("Select All"), "Ctrl + A")
-        self._add_item(_("Context Menu"), "Apps Key / Right Click")
+        self._add_item(_("Context Menu"), _("Apps Key / Right Click"))
 
-        # Navigation
         self._add_header(_("Navigation"))
         self._add_item(_("Focus Library List"), "Ctrl + B")
         self._add_item(_("Focus History List"), "Ctrl + H")
         self._add_item(_("Play Last Book"), "Ctrl + L")
         self._add_item(_("Toggle Pin (Selected)"), "Ctrl + P")
         self._add_item(_("Jump to All Books"), "Alt + 0")
         self._add_item(_("Jump to Default Shelf"), "Alt + 1")
-        self._add_item(_("Jump to Pinned Books"), "Alt + P")
+        self._add_item(_("Jump to Custom Shelves"), "Alt + 2..8")
         self._add_item(_("Jump to Finished Books"), "Alt + 9")
-        self._add_item(_("Jump to Shelf 2..8"), "Alt + 2..8")
+        self._add_item(_("Jump to Pinned Books"), "Alt + P")
         self._add_item(_("Previous Shelf"), "Alt + PageUp")
         self._add_item(_("Next Shelf"), "Alt + PageDown")
 
-        # Player: Playback
         self._add_header(_("Player: Playback"))
         self._add_item(_("Play / Pause"), "Space")
         self._add_item(_("Stop (Reset to start)"), "Shift + Space")
         self._add_item(_("Previous File"), "PageUp")
         self._add_item(_("Next File"), "PageDown")
         self._add_item(_("Previous Book"), "Ctrl + PageUp")
         self._add_item(_("Next Book"), "Ctrl + PageDown")
+        self._add_item(_("Previous Bookmark"), "Shift + PageUp")
+        self._add_item(_("Next Bookmark"), "Shift + PageDown")
         self._add_item(_("Play Pinned Book (1-9)"), "Ctrl + 1..9")
 
-        # Player: Seeking
         self._add_header(_("Player: Seeking"))
-        self._add_item(_("Seek Forward (Short)"), "Right Arrow")
-        self._add_item(_("Seek Backward (Short)"), "Left Arrow")
-        self._add_item(_("Seek Forward (Long)"), "Ctrl + Right Arrow")
-        self._add_item(_("Seek Backward (Long)"), "Ctrl + Left Arrow")
-        self._add_item(_("Restart File"), "Backspace")
+        self._add_item(_("Seek Forward (Short)"), _("Right Arrow"))
+        self._add_item(_("Seek Backward (Short)"), _("Left Arrow"))
+        self._add_item(_("Seek Forward (Long)"), _("Ctrl + Right Arrow"))
+        self._add_item(_("Seek Backward (Long)"), _("Ctrl + Left Arrow"))
+        self._add_item(_("Restart File"), "Home / Backspace")
+        self._add_item(_("Go to End of File"), "End")
         self._add_item(_("Go to 50% of File"), "Ctrl + Backspace")
         self._add_item(_("Go to 30s before End"), "Shift + Backspace")
         self._add_item(_("Go To Time..."), "G")
         self._add_item(_("Show File List"), "F")
-        self._add_item(_("Go To File Number..."), "Ctrl + F")
+        self._add_item(_("Go To File Number..."), "Shift + F")
 
-        # Player: Audio
         self._add_header(_("Player: Audio"))
-        self._add_item(_("Volume Up"), "Up Arrow")
-        self._add_item(_("Volume Down"), "Down Arrow")
+        self._add_item(_("Volume Up"), _("Up Arrow"))
+        self._add_item(_("Volume Down"), _("Down Arrow"))
         self._add_item(_("Mute Toggle"), "M")
         self._add_item(_("Increase Speed (+0.1)"), "J")
         self._add_item(_("Decrease Speed (-0.1)"), "H")
@@ -117,7 +115,6 @@ def _populate_list(self):
         self._add_item(_("Toggle Equalizer"), "E")
         self._add_item(_("Open Equalizer"), "Ctrl + E")
 
-        # Player: Tools
         self._add_header(_("Player: Tools"))
         self._add_item(_("Add Quick Bookmark"), "B")
         self._add_item(_("Add Bookmark (Dialog)"), "Shift + B")
@@ -127,19 +124,17 @@ def _populate_list(self):
         self._add_item(_("Clear Loop"), "D")
         self._add_item(_("Toggle File Repeat"), "R")
 
-        # Player: Sleep Timer
         self._add_header(_("Player: Sleep Timer"))
         self._add_item(_("Start Quick Timer"), "T")
         self._add_item(_("Open Timer Dialog"), "Ctrl + T")
         self._add_item(_("Cancel Timer"), "Shift + T")
         self._add_item(_("Announce Timer"), "Alt + T")
 
-        # Player: Info
         self._add_header(_("Player: Info Announcements"))
         self._add_item(_("Announce Current Time"), "I")
-        self._add_item(_("Announce File Name"), "Ctrl + I")
+        self._add_item(_("Copy Current Time"), "Ctrl + I")
         self._add_item(_("Time Remaining (File)"), "Alt + I")
-        self._add_item(_("Time Remaining (File, Speed adj)"), "Shift + I")
+        self._add_item(_("Time Remaining (File, Speed Adjusted)"), "Shift + I")
         self._add_item(_("Total Elapsed / Duration"), "O")
         self._add_item(_("Total Remaining"), "Alt + O")
-        self._add_item(_("Total Remaining (Speed adj)"), "Shift + O")
+        self._add_item(_("Total Remaining (Speed Adjusted)"), "Shift + O")

frames/library/actions/book_actions.py

@@ -155,7 +155,6 @@ def on_context_update_location(frame, event, source='library'):
 
 
 def on_context_delete_book(frame, event, source='library'):
-    skip_confirm = wx.GetKeyState(wx.WXK_SHIFT)
     books_to_delete = action_utils.get_selected_book_data_list(frame, source)
 
     if not books_to_delete:
@@ -166,18 +165,15 @@ def on_context_delete_book(frame, event, source='library'):
             return
 
     count = len(books_to_delete)
-    if not skip_confirm:
-        if count == 1:
-            msg = _("Are you sure you want to remove '{0}' from your library? (Files will NOT be deleted)").format(
-                books_to_delete[0][1])
-        else:
-            msg = _("Are you sure you want to remove {0} books from your library? (Files will NOT be deleted)").format(
-                count)
-        
-        if wx.MessageBox(msg, _("Confirm Remove"), wx.YES_NO | wx.ICON_WARNING | wx.NO_DEFAULT, parent=frame) != wx.YES:
-            return
+    if count == 1:
+        msg = _("Are you sure you want to remove '{0}' from your library? (Files will NOT be deleted)").format(
+            books_to_delete[0][1])
     else:
-        logging.info(f"Quick Delete (Shift+Delete) activated for {count} books.")
+        msg = _("Are you sure you want to remove {0} books from your library? (Files will NOT be deleted)").format(
+            count)
+    
+    if wx.MessageBox(msg, _("Confirm Remove"), wx.YES_NO | wx.CANCEL | wx.ICON_WARNING | wx.YES_DEFAULT, parent=frame) != wx.YES:
+        return
 
     try:
         for (book_id, book_title) in books_to_delete:

frames/library/actions/shelf_actions.py

@@ -101,14 +101,9 @@ def on_context_rename_shelf(frame, event, source='library'):
 
 
 def on_context_delete_shelf(frame, event, source='library'):
-    """
-    Deletes selected shelf/shelves. Only empty shelves can be deleted.
-    Hold Shift to skip confirmation dialog (Quick Delete).
-    """
     if source != 'library':
         return
 
-    skip_confirm = wx.GetKeyState(wx.WXK_SHIFT)
     shelves_to_delete = action_utils.get_selected_shelf_data_list(frame)
 
     if not shelves_to_delete:
@@ -129,17 +124,14 @@ def on_context_delete_shelf(frame, event, source='library'):
         return
 
     count = len(valid_shelves)
-    if not skip_confirm:
-        if count == 1:
-            msg = _("Are you sure you want to delete shelf '{0}'? This only works if the shelf is empty.").format(
-                valid_shelves[0][1])
-        else:
-            msg = _("Are you sure you want to delete {0} shelves? Only empty shelves will be deleted.").format(count)
-
-        if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.ICON_WARNING | wx.NO_DEFAULT, parent=frame) != wx.YES:
-            return
+    if count == 1:
+        msg = _("Are you sure you want to delete shelf '{0}'? This only works if the shelf is empty.").format(
+            valid_shelves[0][1])
     else:
-        logging.info(f"Quick Delete (Shift+Delete) activated for {count} shelves.")
+        msg = _("Are you sure you want to delete {0} shelves? Only empty shelves will be deleted.").format(count)
+
+    if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.CANCEL | wx.ICON_WARNING | wx.YES_DEFAULT, parent=frame) != wx.YES:
+        return
 
     deleted_count = 0
     failed_count = 0
@@ -150,7 +142,7 @@ def on_context_delete_shelf(frame, event, source='library'):
                 db_manager.shelf_repo.delete_shelf(sid)
                 deleted_count += 1
             except sqlite3.IntegrityError:
-                failed_count += 1  # Not empty
+                failed_count += 1
             except Exception as e:
                 logging.error(f"Error deleting shelf {sid}: {e}")
                 failed_count += 1
@@ -168,4 +160,4 @@ def on_context_delete_shelf(frame, event, source='library'):
 
     except Exception as e:
         logging.error(f"Error during shelf deletion: {e}", exc_info=True)
-        speak(_("Error deleting shelves."), LEVEL_CRITICAL)
+        speak(_("Error deleting shelves."), LEVEL_CRITICAL)

frames/library/list_manager.py

@@ -395,6 +395,7 @@ def on_list_char_hook(self, frame, event: wx.KeyEvent):
         keycode = event.GetKeyCode()
         ctrl_down = event.ControlDown()
         alt_down = event.AltDown()
+        shift_down = event.ShiftDown()
 
         if alt_down and keycode in (wx.WXK_RETURN, wx.WXK_NUMPAD_ENTER):
             context_actions.on_context_properties(frame, None, source='library')
@@ -457,7 +458,10 @@ def on_list_char_hook(self, frame, event: wx.KeyEvent):
                 if item_data:
                     item_type, item_id = item_data
                     if item_type == 'book':
-                        context_actions.on_context_delete_book(frame, None, source='library')
+                        if shift_down:
+                            context_actions.on_context_delete_computer(frame, None, source='library')
+                        else:
+                            context_actions.on_context_delete_book(frame, None, source='library')
                     elif item_type == 'shelf':
                         context_actions.on_context_delete_shelf(frame, None, source='library')
             return

frames/library/menu_handlers.py

@@ -160,7 +160,7 @@ def on_import_database(frame, event):
             "The application will close immediately after import.\n"
             "Do you want to continue?")
 
-    if wx.MessageBox(msg, _("Confirm Import"), wx.YES_NO | wx.ICON_WARNING) != wx.YES:
+    if wx.MessageBox(msg, _("Confirm Import"), wx.YES_NO | wx.CANCEL | wx.ICON_WARNING | wx.YES_DEFAULT) != wx.YES:
         return
 
     dlg = wx.FileDialog(

frames/library/task_handlers.py

@@ -480,8 +480,7 @@ def on_missing_books_result(frame, event):
         titles = "\n - ".join([b[1] for b in missing_books])
         msg += "\n\n - " + titles
 
-    if wx.MessageBox(msg, _("Clear Missing Books"), wx.YES_NO | wx.ICON_QUESTION | wx.NO_DEFAULT,
-                     parent=frame) == wx.YES:
+    if wx.MessageBox(msg, _("Clear Missing Books"), wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION | wx.YES_DEFAULT, parent=frame) == wx.YES:
 
         speak(_("Removing missing books..."), LEVEL_CRITICAL)
         wx.BeginBusyCursor()

frames/library_frame.py

@@ -457,7 +457,7 @@ def on_update_result(self, event):
         if event.success and event.has_update:
             msg = _("A new version ({0}) is available.\nDo you want to download and install it now?").format(
                 event.latest_version)
-            if wx.MessageBox(msg, _("Update Available"), wx.YES_NO | wx.ICON_INFORMATION, parent=self) == wx.YES:
+            if wx.MessageBox(msg, _("Update Available"), wx.YES_NO | wx.CANCEL | wx.ICON_INFORMATION, parent=self) == wx.YES:
                 self.update_manager.download_and_install(event.download_url)
         elif not event.success and not event.silent:
             wx.MessageBox(_("Update check failed.\nError: {0}").format(event.error_msg), _("Error"),

frames/player/equalizer_frame.py

@@ -62,7 +62,8 @@ def __init__(self,
 
         # Bind ESC key to close
         accel_tbl = wx.AcceleratorTable([
-            (wx.ACCEL_NORMAL, wx.WXK_ESCAPE, wx.ID_CLOSE)
+            (wx.ACCEL_NORMAL, wx.WXK_ESCAPE, wx.ID_CLOSE),
+            (wx.ACCEL_NORMAL, wx.WXK_DELETE, ID_DELETE_PRESET)
         ])
         self.SetAcceleratorTable(accel_tbl)
         self.Bind(wx.EVT_MENU, self.on_close, id=wx.ID_CLOSE)
@@ -175,6 +176,7 @@ def _bind_events(self):
         self.preset_choice.Bind(wx.EVT_CHOICE, self.on_preset_select)
         self.save_button.Bind(wx.EVT_BUTTON, self.on_save_preset)
         self.delete_button.Bind(wx.EVT_BUTTON, self.on_delete_preset)
+        self.Bind(wx.EVT_MENU, self.on_delete_preset, id=ID_DELETE_PRESET)
 
         for slider in self.sliders:
             slider.Bind(wx.EVT_SCROLL_CHANGED, self.on_slider_change)
@@ -288,7 +290,7 @@ def on_delete_preset(self, event: wx.CommandEvent):
             return
 
         msg = _("Are you sure you want to delete preset '{0}'?").format(preset_name)
-        if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.ICON_WARNING) == wx.YES:
+        if wx.MessageBox(msg, _("Confirm Delete"), wx.YES_NO | wx.CANCEL | wx.ICON_WARNING | wx.YES_DEFAULT) == wx.YES:
             try:
                 db_manager.delete_eq_preset(preset_id)
                 speak(_("Preset deleted."), LEVEL_CRITICAL)