improve flatpak

Author: arch

build_flatpak.sh

@@ -2,6 +2,7 @@
 
 sudo sysctl kernel.unprivileged_userns_clone=1
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-# flatpak install flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
-flatpak install org.gnome.Platform//3.38 org.gnome.Sdk//3.38
+flatpak install -y flathub org.freedesktop.Platform//21.08 org.freedesktop.Sdk//21.08
+flatpak install -y flathub org.gnome.Platform//3.38 org.gnome.Sdk//3.38
+flatpak install -y flathub org.gtk.Gtk3theme.Breeze-Dark
 flatpak-builder --repo=repo --force-clean build-dir org.flatpak.PythonFunscriptEditor.json

contrib/flatpak/README.md

@@ -12,7 +12,7 @@ To verify that the build was successful, run the following:
 
 ```bash
 flatpak --user remote-add --no-gpg-verify local-repo repo
-flatpak --user install local-repo org.flatpak.PythonFunscriptEditor
+flatpak --user install -y local-repo org.flatpak.PythonFunscriptEditor
 flatpak run org.flatpak.PythonFunscriptEditor
 flatpak --user remote-delete local-repo
 ```

funscript_editor/api.py

@@ -41,5 +41,5 @@ def generate_funscript(
     logging.info("Args: video_file=%s, start_time=%s, end_time=%s, output_file=%s", \
             str(video_file), str(start_time), str(end_time), str(output_file))
     app = QtWidgets.QApplication(sys.argv)
-    generator = FunscriptGeneratorWindow(video_file, start_time, end_time, output_file)
+    _ = FunscriptGeneratorWindow(video_file, start_time, end_time, output_file)
     sys.exit(app.exec_())

funscript_editor/config/settings.yaml

@@ -35,3 +35,6 @@ raw_output: False
 
 # Insert change points at high second derivative
 additional_changepoints: True
+
+# Force dark ui theme
+dark_theme: False

funscript_editor/ui/breeze_resources.py

@@ -21,11 +21,11 @@
 from funscript_editor.ui.video_player import VideoPlayer
 from funscript_editor.ui.funscript_visualizer import FunscriptVisualizer
 from funscript_editor.data.funscript import Funscript
-from funscript_editor.algorithms.funscriptgenerator import FunscriptGeneratorThread, FunscriptGeneratorParameter
-from funscript_editor.utils.config import UI_CONFIG, VERSION
-from funscript_editor.definitions import APP_DOCUMENTATION_DIR, CODE_DOCUMENTATION_DIR
+from funscript_editor.utils.config import UI_CONFIG, VERSION, SETTINGS
+from funscript_editor.definitions import APP_DOCUMENTATION_DIR
 from funscript_editor.data.ffmpegstream import FFmpegStream
 from funscript_editor.ui.funscript_generator_window import FunscriptGeneratorWindow
+from funscript_editor.ui.theme import setup_theme
 
 import funscript_editor.definitions as definitions
 
@@ -34,6 +34,7 @@ class FunscriptEditorWindow(QtWidgets.QMainWindow):
 
     def __init__(self):
         super(FunscriptEditorWindow, self).__init__()
+        setup_theme()
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
         self.__setup_video_player()

funscript_editor/ui/funscript_editor_window.py

@@ -9,6 +9,7 @@
 from funscript_editor.data.funscript import Funscript
 from funscript_editor.ui.settings_dialog import SettingsDialog
 import funscript_editor.definitions as definitions
+from funscript_editor.ui.theme import setup_theme
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
@@ -32,6 +33,7 @@ def __init__(self,
             end_time: float,
             output_file: str):
         super(FunscriptGeneratorWindow, self).__init__()
+        setup_theme()
         if os.path.exists(definitions.ICON_PATH):
             self.setWindowIcon(QtGui.QIcon(definitions.ICON_PATH))
 

funscript_editor/ui/funscript_generator_window.py

@@ -0,0 +1,17 @@
+
+from PyQt5 import QtGui, QtCore ,QtWidgets
+
+from funscript_editor.utils.config import SETTINGS
+import funscript_editor.ui.breeze_resources
+
+
+def setup_theme():
+        try:
+            if SETTINGS['dark_theme']:
+                app = QtWidgets.QApplication.instance()
+                if app is not None:
+                    file = QtCore.QFile(":/dark/stylesheet.qss")
+                    file.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text)
+                    stream = QtCore.QTextStream(file)
+                    app.setStyleSheet(stream.readAll())
+        except: pass

funscript_editor/ui/theme.py

@@ -121,7 +121,8 @@
       "sources": [
         {
           "type": "git",
-          "url": "https://git.ffmpeg.org/ffmpeg.git"
+          "url": "https://git.ffmpeg.org/ffmpeg.git",
+          "commit": "d92fdc714496d43234733c315894abe0beeb3529"
         }
       ]
     },