Adding a few missing shortcuts in settings. Updating shortcuts for Preview, Split File, Edit Title. Added double click functions to project files. Made preview/split file dialog close with ESC key. Renamed a few menus (Split Clips -> Split File, Export Clips -> Export Files). Updated documentation with updated keyboard names and shortcuts.

Author: jonoomph

doc/main_window.rst

@@ -116,15 +116,16 @@ configure these shortcuts in the Preferences window, which is opened by selectin
 (On macOS, choose :guilabel:`OpenShot Video Editor→Preferences`.)
 Learning a few of these shortcuts can save you a bunch of time!
 
-===================================   =======================   ====================  ====================
-Action                                Shortcut 1                Shortcut 2            Shortcut 3
-===================================   =======================   ====================  ====================
+===================================   =======================   ==========================   ====================
+Action                                Shortcut 1                Shortcut 2                   Shortcut 3
+===================================   =======================   ==========================   ====================
 About OpenShot                        :kbd:`Ctrl+H`
 Add Marker                            :kbd:`M`
 Add Track                             :kbd:`Ctrl+Y`
 Add to Timeline                       :kbd:`Ctrl+Alt+A`
 Advanced View                         :kbd:`Alt+Shift+1`
 Animated Title                        :kbd:`Ctrl+Shift+T`
+Ask a Question...                     :kbd:`F4`
 Center on Playhead                    :kbd:`Shift+C`            :kbd:`Alt+Up`
 Choose Profile                        :kbd:`Ctrl+Alt+P`
 Clear All Cache                       :kbd:`Ctrl+Shift+ESC`
@@ -135,14 +136,18 @@ Cut                                   :kbd:`Ctrl+X`
 Delete Item                           :kbd:`Delete`             :kbd:`Backspace`
 Delete Item (Ripple)                  :kbd:`Shift+Delete`
 Details View                          :kbd:`Ctrl+Page Up`
+Donate                                :kbd:`F7`
 Duplicate                             :kbd:`Ctrl+Shift+/`
-Edit Title                            :kbd:``
-Export Video                          :kbd:`Ctrl+E`             :kbd:`Ctrl+M`
+Edit Title                            :kbd:`Alt+T`
+Export Selected Files                 :kbd:`Ctrl+Shift+E`
+Export Video / Media                  :kbd:`Ctrl+E`             :kbd:`Ctrl+M`
 Fast Forward                          :kbd:`L`
+File Properties                       :kbd:`Alt+I`              :kbd:`Alt+Double Click`
 Freeze View                           :kbd:`Ctrl+F`
 Fullscreen                            :kbd:`F11`
 Import Files...                       :kbd:`Ctrl+I`
 Insert Keyframe                       :kbd:`Alt+Shift+K`
+Join our Community...                 :kbd:`F5`
 Jump To End                           :kbd:`End`
 Jump To Start                         :kbd:`Home`
 Launch Tutorial                       :kbd:`F2`
@@ -156,14 +161,16 @@ Nudge right (5 Frames)                :kbd:`Shift+Ctrl+Right`
 Open Help Contents                    :kbd:`F1`
 Open Project...                       :kbd:`Ctrl+O`
 Paste                                 :kbd:`Ctrl+V`
-Play/Pause Toggle                     :kbd:`Space`              :kbd:`Up`             :kbd:`Down`
+Play/Pause Toggle                     :kbd:`Space`              :kbd:`Up`                    :kbd:`Down`
 Preferences                           :kbd:`Ctrl+P`
+Preview File                          :kbd:`Alt+P`              :kbd:`Double Click`
 Previous Frame                        :kbd:`Left`               :kbd:`,`
 Previous Marker                       :kbd:`Ctrl+Shift+M`       :kbd:`Alt+Left`
 Properties                            :kbd:`U`
 Quit                                  :kbd:`Ctrl+Q`
-Razor Toggle                          :kbd:`C`                  :kbd:`B`              :kbd:`R`
+Razor Toggle                          :kbd:`C`                  :kbd:`B`                     :kbd:`R`
 Redo                                  :kbd:`Ctrl+Shift+Z`
+Report a Bug...                       :kbd:`F3`
 Rewind                                :kbd:`J`
 Save Current Frame                    :kbd:`Ctrl+Shift+Y`
 Save Current Frame                    :kbd:`Ctrl+Shift+Y`
@@ -183,16 +190,17 @@ Slice Selected: Keep Right Side       :kbd:`Ctrl+L`
 Slice Selected: Keep Left (Ripple)    :kbd:`W`
 Slice Selected: Keep Right (Ripple)   :kbd:`Q`
 Snapping Toggle                       :kbd:`S`
-Split Clip...                         :kbd:`Shift+1`
+Split File                            :kbd:`Alt+S`              :kbd:`Shift+Double Click`
 Thumbnail View                        :kbd:`Ctrl+Page Down`
 Title                                 :kbd:`Ctrl+T`
 Transform                             :kbd:`Ctrl+Alt+T`
+Translate this Application...         :kbd:`F6`
 Un-Freeze View                        :kbd:`Ctrl+Shift+F`
 Undo                                  :kbd:`Ctrl+Z`
 View Toolbar                          :kbd:`Ctrl+Shift+B`
 Zoom In                               :kbd:`=`                  :kbd:`Ctrl+=`
 Zoom Out                              :kbd:`-`                  :kbd:`Ctrl+-`
-===================================   =======================   ====================  ====================
+===================================   =======================   ==========================   ====================
 
 Menu
 ----

src/settings/_default.settings

@@ -574,6 +574,46 @@
     "value": "Ctrl+H",
     "type": "text"
   },
+  {
+    "category": "Keyboard",
+    "title": "Report a Bug...",
+    "restart": false,
+    "setting": "actionReportBug",
+    "value": "F3",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "Ask a Question...",
+    "restart": false,
+    "setting": "actionAskQuestion",
+    "value": "F4",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "Join our Community...",
+    "restart": false,
+    "setting": "actionDiscord",
+    "value": "F5",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "Translate this Application...",
+    "restart": false,
+    "setting": "actionTranslate",
+    "value": "F6",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "Donate",
+    "restart": false,
+    "setting": "actionDonate",
+    "value": "F7",
+    "type": "text"
+  },
   {
     "category": "Keyboard",
     "title": "Add Marker",
@@ -654,6 +694,22 @@
     "value": "Ctrl+E | Ctrl+M",
     "type": "text"
   },
+  {
+    "category": "Keyboard",
+    "title": "Export Files",
+    "restart": false,
+    "setting": "actionExportFiles",
+    "value": "Ctrl+Shift+E",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "File Properties",
+    "restart": false,
+    "setting": "actionFile_Properties",
+    "value": "Alt+I",
+    "type": "text"
+  },
   {
     "category": "Keyboard",
     "title": "Fullscreen",
@@ -712,10 +768,10 @@
   },
   {
     "category": "Keyboard",
-    "title": "Split Clip...",
+    "title": "Split File",
     "restart": false,
-    "setting": "actionSplitClip",
-    "value": "Shift+1",
+    "setting": "actionSplitFile",
+    "value": "Alt+S",
     "type": "text"
   },
   {
@@ -1027,7 +1083,15 @@
     "title": "Edit Title",
     "restart": false,
     "setting": "actionEditTitle",
-    "value": "",
+    "value": "Alt+T",
+    "type": "text"
+  },
+  {
+    "category": "Keyboard",
+    "title": "Preview File",
+    "restart": false,
+    "setting": "actionPreview_File",
+    "value": "Alt+P",
     "type": "text"
   },
   {

src/windows/cutting.py

@@ -389,15 +389,6 @@ def btnAddClip_clicked(self):
         # Reset form
         self.clearForm()
 
-    # TODO: Remove these 4 methods
-    def accept(self):
-        """ Ok button clicked """
-        log.info('accept')
-
-    def close(self):
-        """ Actually close window and accept dialog """
-        log.info('close')
-
     def closeEvent(self, event):
         log.debug('closeEvent')
 
@@ -413,5 +404,3 @@ def closeEvent(self, event):
         self.clip.Close()
         self.r.ClearAllCache()
 
-    def reject(self):
-        log.info('reject')

src/windows/main_window.py

@@ -1821,9 +1821,8 @@ def actionProfile_trigger(self):
         # Enable video caching
         openshot.Settings.Instance().ENABLE_PLAYBACK_CACHING = True
 
-
-    def actionSplitClip_trigger(self):
-        log.debug("actionSplitClip_trigger")
+    def actionSplitFile_trigger(self):
+        log.debug("actionSplitFile_trigger")
 
         # Loop through selected files (set 1 selected file if more than 1)
         f = self.files_model.current_file()
@@ -2185,7 +2184,7 @@ def actionFile_Properties_trigger(self):
         else:
             log.info('File Properties Cancelled')
 
-    def actionExportClips_trigger(self):
+    def actionExportFiles_trigger(self):
         from windows.export_clips import clipExportWindow
         f = self.selected_files()
         exp = clipExportWindow(export_clips_arg=f)

src/windows/preferences.py

@@ -779,9 +779,6 @@ def update_shortcut_visual_feedback(self, shortcut_map):
                     if info['is_duplicate']:
                         # Mark the field with red text and border for duplicates
                         widget.setStyleSheet("color: red;")
-                    else:
-                        # Reset the widget style if the shortcut is valid
-                        widget.setStyleSheet("")
 
     def closeEvent(self, event):
         """Signal for closing Preferences window"""

src/windows/ui/main-window.ui

@@ -573,17 +573,17 @@
     <string>Save Project As...</string>
    </property>
   </action>
-  <action name="actionExportClips">
+  <action name="actionExportFiles">
    <property name="icon">
     <iconset theme="media-record" resource="../../../images/openshot.qrc">
     <!--PLACEHOLDER ICON-->
      <normaloff>:/icons/Humanity/actions/16/media-record.svg</normaloff>:/icons/Humanity/actions/16/media-record.svg</iconset>
    </property>
    <property name="text">
-    <string>Export Clips</string>
+    <string>Export Files</string>
    </property>
    <property name="toolTip">
-    <string>Export clips to video files</string>
+    <string>Export files</string>
    </property>
   </action>
   <action name="actionImportFiles">
@@ -1404,16 +1404,16 @@
     <string>Remove Effect</string>
    </property>
   </action>
-  <action name="actionSplitClip">
+  <action name="actionSplitFile">
    <property name="icon">
     <iconset theme="edit-cut" resource="../../../images/openshot.qrc">
      <normaloff>:/icons/Humanity/actions/16/edit-cut.svg</normaloff>:/icons/Humanity/actions/16/edit-cut.svg</iconset>
    </property>
    <property name="text">
-    <string>Split Clip...</string>
+    <string>Split File</string>
    </property>
    <property name="toolTip">
-    <string>Split Clip</string>
+    <string>Split File</string>
    </property>
   </action>
   <action name="actionProperties">

src/windows/views/files_listview.py

@@ -77,8 +77,8 @@ def contextMenuEvent(self, event):
 
             menu.addAction(self.win.actionPreview_File)
             menu.addSeparator()
-            menu.addAction(self.win.actionSplitClip)
-            menu.addAction(self.win.actionExportClips)
+            menu.addAction(self.win.actionSplitFile)
+            menu.addAction(self.win.actionExportFiles)
             menu.addSeparator()
             menu.addAction(self.win.actionAdd_to_Timeline)
             menu.addAction(self.win.actionFile_Properties)
@@ -89,6 +89,16 @@ def contextMenuEvent(self, event):
         # Show menu
         menu.popup(event.globalPos())
 
+    def mouseDoubleClickEvent(self, event):
+        super(FilesListView, self).mouseDoubleClickEvent(event)
+        # Preview File, File Properties, or Split Clip (depending on Shift/Ctrl)
+        if int(get_app().keyboardModifiers() & Qt.ShiftModifier) > 0:
+            get_app().window.actionSplitFile.trigger()
+        elif int(get_app().keyboardModifiers() & Qt.ControlModifier) > 0:
+            get_app().window.actionFile_Properties.trigger()
+        else:
+            get_app().window.actionPreview_File.trigger()
+
     def dragEnterEvent(self, event):
         # If dragging urls onto widget, accept
         if not event.mimeData().hasUrls():

src/windows/views/files_treeview.py

@@ -80,8 +80,8 @@ def contextMenuEvent(self, event):
 
             menu.addAction(self.win.actionPreview_File)
             menu.addSeparator()
-            menu.addAction(self.win.actionSplitClip)
-            menu.addAction(self.win.actionExportClips)
+            menu.addAction(self.win.actionSplitFile)
+            menu.addAction(self.win.actionExportFiles)
             menu.addSeparator()
             menu.addAction(self.win.actionAdd_to_Timeline)
             menu.addAction(self.win.actionFile_Properties)
@@ -92,6 +92,16 @@ def contextMenuEvent(self, event):
         # Show menu
         menu.popup(event.globalPos())
 
+    def mouseDoubleClickEvent(self, event):
+        super(FilesTreeView, self).mouseDoubleClickEvent(event)
+        # Preview File, File Properties, or Split Clip (depending on Shift/Ctrl)
+        if int(get_app().keyboardModifiers() & Qt.ShiftModifier) > 0:
+            get_app().window.actionSplitFile.trigger()
+        elif int(get_app().keyboardModifiers() & Qt.ControlModifier) > 0:
+            get_app().window.actionFile_Properties.trigger()
+        else:
+            get_app().window.actionPreview_File.trigger()
+
     def dragEnterEvent(self, event):
         # If dragging urls onto widget, accept
         if event.mimeData().hasUrls():