OpenShot: use all icons from system theme

This commit is contained in:
Gerasim Troeglazov
2019-10-12 22:43:12 +10:00
parent 0ae535bcff
commit 0aa6788833
2 changed files with 54 additions and 4 deletions

View File

@@ -6,7 +6,7 @@ you create the film you always dreamed of. Easily add sub-titles, transitions,\
HOMEPAGE="https://www.openshot.org"
COPYRIGHT="2008-2019 OpenShot Studios, LLC"
LICENSE="GNU GPL v3"
REVISION="5"
REVISION="6"
SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be"
SOURCE_FILENAME="openshot-$portVersion.tar.gz"

View File

@@ -1,11 +1,11 @@
From d2bc8e4ee9f8af710c59a73521c3bfab60ca9c4f Mon Sep 17 00:00:00 2001
From 2c801d768ae60f4718b44d30f8ec3830ddc31762 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 6 Oct 2018 12:15:40 +1000
Subject: classes/info: use finddir
diff --git a/src/classes/info.py b/src/classes/info.py
index 3bdb404..fed2985 100644
index 85acdb1..1e59702 100644
--- a/src/classes/info.py
+++ b/src/classes/info.py
@@ -24,7 +24,7 @@
@@ -27,5 +27,55 @@ index 3bdb404..fed2985 100644
BLENDER_PATH = os.path.join(USER_PATH, "blender")
ASSETS_PATH = os.path.join(USER_PATH, "assets")
--
2.19.0
2.23.0
From 2112ac5e1e8e7f33c8307d2b6c81b36cef750866 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 12 Oct 2019 22:39:25 +1000
Subject: Use icons from theme
diff --git a/src/windows/ui/main-window.ui b/src/windows/ui/main-window.ui
index 22a3c0a..9a49141 100644
--- a/src/windows/ui/main-window.ui
+++ b/src/windows/ui/main-window.ui
@@ -784,7 +784,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">
@@ -799,7 +799,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">
@@ -817,7 +817,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">
@@ -829,7 +829,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.23.0