From 6a787fef864339fb88cbef3a513c1064cfde9ec9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 4 Sep 2021 19:42:30 +1000
Subject: classes/info: use finddir


diff --git a/src/classes/info.py b/src/classes/info.py
index 7724683..6926f1a 100644
--- a/src/classes/info.py
+++ b/src/classes/info.py
@@ -25,6 +25,7 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
 
+import subprocess
 import os
 from time import strftime
 
@@ -48,7 +49,7 @@ EXPORT_PRESETS_PATH = os.path.join(PATH, "presets")
 
 # User paths
 HOME_PATH = os.path.join(os.path.expanduser("~"))
-USER_PATH = os.path.join(HOME_PATH, ".openshot_qt")
+USER_PATH = os.path.join(subprocess.run(["finddir", "B_USER_VAR_DIRECTORY"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True, errors="strict").stdout.strip(), "openshot_qt")
 BACKUP_PATH = os.path.join(USER_PATH)
 RECOVERY_PATH = os.path.join(USER_PATH, "recovery")
 THUMBNAIL_PATH = os.path.join(USER_PATH, "thumbnail")
-- 
2.30.2


From 3a3ad0a2b0a600eeed8787a52ba8bb15b9c876d9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 4 Sep 2021 19:42:45 +1000
Subject: Use icons from theme


diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
index 99380a1..a9280c8 100644
--- a/src/windows/ui/main-window.ui
+++ b/src/windows/ui/main-window.ui
@@ -860,7 +860,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../images/openshot.qrc">
+    <iconset theme="arrow" resource="../../../images/openshot.qrc">
      <normaloff>:/icons/Humanity/actions/custom/arrow.png</normaloff>:/icons/Humanity/actions/custom/arrow.png</iconset>
    </property>
    <property name="text">
@@ -875,7 +875,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../images/openshot.qrc">
+    <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">
@@ -896,7 +896,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="../../../images/openshot.qrc">
+    <iconset theme="snap" resource="../../../images/openshot.qrc">
      <normaloff>:/icons/Humanity/actions/custom/snap.png</normaloff>:/icons/Humanity/actions/custom/snap.png</iconset>
    </property>
    <property name="text">
@@ -908,7 +908,7 @@
   </action>
   <action name="actionAddMarker">
    <property name="icon">
-    <iconset resource="../../../images/openshot.qrc">
+    <iconset theme="add_marker" resource="../../../images/openshot.qrc">
      <normaloff>:/icons/Humanity/actions/custom/add_marker.png</normaloff>:/icons/Humanity/actions/custom/add_marker.png</iconset>
    </property>
    <property name="text">
-- 
2.30.2

