From 1fac11e81fcad1775738b5b7015dc235c50bff04 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Mon, 14 May 2018 18:33:24 +0300
Subject: [PATCH 6/9] Qt: Add Qt for Python (PySide) support

---
 FusionIcon/interface_qt/main.py.in | 18 +++++++++++-------
 setup.py                           | 10 +++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/FusionIcon/interface_qt/main.py.in b/FusionIcon/interface_qt/main.py.in
index eb91e34..f9695d3 100644
--- a/FusionIcon/interface_qt/main.py.in
+++ b/FusionIcon/interface_qt/main.py.in
@@ -17,13 +17,17 @@
 # Author(s): xsacha, XRevan86, raveit65
 
 import sys, os, time
-from PyQt@qtver@ import QtCore, QtGui
-if tuple(map(int, (QtCore.QT_VERSION_STR.split('.')))) < (4, 6, 0):
-	raise ImportError('Qt 4.6.x or later required')
 try:
-	from PyQt@qtver@ import QtWidgets
+	from PySide@pysidever@ import QtCore, QtGui, QtGui as QtWidgets
 except ImportError:
-	from PyQt@qtver@ import QtGui as QtWidgets
+	from PyQt@qtver@ import QtCore, QtGui, QtGui as QtWidgets
+if int(QtCore.qVersion().split('.')[0]) >= 5:
+	try:
+		from PySide@pysidever@ import QtWidgets
+	except ImportError:
+		from PyQt@qtver@ import QtWidgets
+elif tuple(map(int, (QtCore.qVersion().split('.')))) < (4, 6, 0):
+	raise ImportError('Qt 4.6.x or later required')
 from FusionIcon.start import wms, apps, options, decorators, init
 from FusionIcon.execute import run
 
@@ -45,7 +49,7 @@ class Build(QtWidgets.QApplication):
 		decorators.active = decorator
 
 	def __init__(self, parent=None):
-		QtCore.QObject.__init__(self, parent)
+		QtWidgets.QApplication.__init__(self, parent)
 		self.setApplicationName('Fusion Icon')
 		image = QtGui.QIcon()
 		for iconName in ('fusion-icon', 'image-missing'):
@@ -108,7 +112,7 @@ class Build(QtWidgets.QApplication):
 				rect = self.Tray.geometry()
 				pos = QtCore.QPoint(rect.left() + (rect.width() / 2),
 				                    rect.bottom() + 1)
-			elif int(QtCore.QT_VERSION_STR.split('.')[0]) >= 5:
+			elif int(QtCore.qVersion().split('.')[0]) >= 5:
 				# With SNI this will be used, unless Qt4 (sni-qt).
 				pos = QtGui.QCursor.pos()
 
diff --git a/setup.py b/setup.py
index 71e5adb..62bc023 100755
--- a/setup.py
+++ b/setup.py
@@ -76,6 +76,10 @@ if sys.argv[1] == 'build':
 	data = f.read()
 	f.close()
 	data = data.replace('@qtver@', qtver.split('.')[0])
+	if int(qtver.split('.')[0]) >= 5:
+		data = data.replace('@pysidever@', "%d" % (int(qtver.split('.')[0]) - 3))
+	else:
+		data = data.replace('@pysidever@', '')
 	f = open(os.path.join('FusionIcon/interface_qt/main.py'), 'wt')
 	f.write(data)
 	f.close()
@@ -84,10 +88,10 @@ if sys.argv[1] == 'build':
 	data = f.read()
 	f.close()
 	data = data.replace('@gtkver@', gtkver)
-	if gtkver == '2.0':
-		data = data.replace('@aaiver@', '')
+	if int(gtkver.split('.')[0]) >= 3:
+		data = data.replace('@aaiver@', gtkver.split('.')[0])
 	else:
-		data = data.replace('@aaiver@', '3')
+		data = data.replace('@aaiver@', '')
 	f = open(os.path.join('FusionIcon/interface_gtk/main.py'), 'wt')
 	f.write(data)
 	f.close()
-- 
2.19.2