Merge pull request #4223 from OpenShot/audio-effects

Audio effects

Author: jonoomph

src/effects/icons/bars.png

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
+"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
 "Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
-"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
+"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jonathan Thomas <[email protected]>\n"
 "Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

src/effects/icons/[email protected]

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
+"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
 "Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
-"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
+"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jonathan Thomas <[email protected]>\n"
 "Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

src/effects/icons/blur.png

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
+"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
 "Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
-"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
+"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jonathan Thomas <[email protected]>\n"
 "Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

src/effects/icons/[email protected]

@@ -66,6 +66,7 @@
 try:
     # Enable High-DPI resolutions
     QApplication.setAttribute(Qt.AA_EnableHighDpiScaling)
+    QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps)
 except AttributeError:
     pass  # Quietly fail for older Qt5 versions
 

src/effects/icons/brightness.png

@@ -89,6 +89,7 @@ class MainWindow(updates.UpdateWatcher, QMainWindow):
     refreshFrameSignal = pyqtSignal()
     refreshFilesSignal = pyqtSignal()
     refreshTransitionsSignal = pyqtSignal()
+    refreshEffectsSignal = pyqtSignal()
     LoadFileSignal = pyqtSignal(str)
     PlaySignal = pyqtSignal(int)
     PauseSignal = pyqtSignal()
@@ -834,6 +835,15 @@ def actionTransitionsShowAll_trigger(self, checked=True):
     def actionTransitionsShowCommon_trigger(self, checked=True):
         self.refreshTransitionsSignal.emit()
 
+    def actionEffectsShowAll_trigger(self, checked=True):
+        self.refreshEffectsSignal.emit()
+
+    def actionEffectsShowVideo_trigger(self, checked=True):
+        self.refreshEffectsSignal.emit()
+
+    def actionEffectsShowAudio_trigger(self, checked=True):
+        self.refreshEffectsSignal.emit()
+
     def actionHelpContents_trigger(self, checked=True):
         try:
             webbrowser.open("https://www.openshot.org/%suser-guide/?app-menu" % info.website_language(), new=1)
@@ -2500,6 +2510,15 @@ def setup_toolbars(self):
         # Add effects toolbar
         self.effectsToolbar = QToolBar("Effects Toolbar")
         self.effectsFilter = QLineEdit()
+        self.effectsActionGroup = QActionGroup(self)
+        self.effectsActionGroup.setExclusive(True)
+        self.effectsActionGroup.addAction(self.actionEffectsShowAll)
+        self.effectsActionGroup.addAction(self.actionEffectsShowVideo)
+        self.effectsActionGroup.addAction(self.actionEffectsShowAudio)
+        self.actionEffectsShowAll.setChecked(True)
+        self.effectsToolbar.addAction(self.actionEffectsShowAll)
+        self.effectsToolbar.addAction(self.actionEffectsShowVideo)
+        self.effectsToolbar.addAction(self.actionEffectsShowAudio)
         self.effectsFilter.setObjectName("effectsFilter")
         self.effectsFilter.setPlaceholderText(_("Filter"))
         self.effectsFilter.setClearButtonEnabled(True)

src/effects/icons/[email protected]

@@ -47,6 +47,28 @@ class EffectsProxyModel(QSortFilterProxyModel):
     def __init__(self, parent=None):
         super().__init__(parent=parent)
 
+    def filterAcceptsRow(self, sourceRow, sourceParent):
+        """Filter for common transitions and text filter"""
+
+        if not get_app().window.actionEffectsShowAll.isChecked():
+            # Fetch the effect values
+            effect_name = self.sourceModel().data(self.sourceModel().index(sourceRow, 1, sourceParent))
+            effect_desc = self.sourceModel().data(self.sourceModel().index(sourceRow, 2, sourceParent))
+            effect_type = self.sourceModel().data(self.sourceModel().index(sourceRow, 3, sourceParent))
+
+            # Return, if regExp match in displayed format.
+            if get_app().window.actionEffectsShowVideo.isChecked():
+                return effect_type == "Video" and \
+                       self.filterRegExp().indexIn(effect_name) >= 0 and \
+                       self.filterRegExp().indexIn(effect_desc) >= 0
+            else:
+                return effect_type == "Audio" and \
+                       self.filterRegExp().indexIn(effect_name) >= 0 and \
+                       self.filterRegExp().indexIn(effect_desc) >= 0
+
+        # Continue running built-in parent filter logic
+        return super(EffectsProxyModel, self).filterAcceptsRow(sourceRow, sourceParent)
+
     def mimeData(self, indexes):
         # Create MimeData for drag operation
         data = QMimeData()
@@ -102,7 +124,6 @@ def update_model(self, clear=True):
                 category = "Audio & Video"
             elif not effect_info["has_video"] and effect_info["has_audio"]:
                 category = "Audio"
-                icon_path = os.path.join(icons_dir, "audio.png")
             elif effect_info["has_video"] and not effect_info["has_audio"]:
                 category = "Video"
 

src/effects/icons/caption.png

@@ -118,3 +118,4 @@ def __init__(self, model):
         # setup filter events
         app = get_app()
         app.window.effectsFilter.textChanged.connect(self.filter_changed)
+        app.window.refreshEffectsSignal.connect(self.refresh_view)