Skip to content

Commit 2f7ff46

Browse files
committedMay 30, 2016
fix imports (follow up b52828f)
1 parent 6396d8f commit 2f7ff46

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed
 

‎python/plugins/processing/script/ScriptSelector.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@
2222
__copyright__ = '(C) 2016, Victor Olaya'
2323

2424
# This will get replaced with a git SHA1 when you do a git archive
25-
from PyQt4 import QtGui, uic, QtCore
25+
2626
import os
2727
from collections import defaultdict
28+
29+
from qgis.PyQt import uic
30+
from qgis.PyQt.QtCore import Qt
31+
from qgis.PyQt.QtWidgets import QTreeWidgetItem, QFileDialog,
32+
2833
from processing.core.alglist import algList
2934

3035
pluginPath = os.path.split(os.path.dirname(__file__))[0]
@@ -35,7 +40,7 @@
3540
class ScriptSelector(BASE, WIDGET):
3641

3742
def __init__(self):
38-
QtGui.QDialog.__init__(self)
43+
super(ScriptSelector, self).__init__(None)
3944
self.setupUi(self)
4045

4146
self.scripts = None
@@ -46,13 +51,13 @@ def __init__(self):
4651
allScripts[script.group].append(script)
4752

4853
for group, groupScripts in allScripts.iteritems():
49-
groupItem = QtGui.QTreeWidgetItem()
54+
groupItem = QTreeWidgetItem()
5055
groupItem.setText(0, group)
51-
groupItem.setFlags(groupItem.flags() | QtCore.Qt.ItemIsTristate)
56+
groupItem.setFlags(groupItem.flags() | Qt.ItemIsTristate)
5257
for script in groupScripts:
53-
scriptItem = QtGui.QTreeWidgetItem()
54-
scriptItem.setFlags(scriptItem.flags() | QtCore.Qt.ItemIsUserCheckable)
55-
scriptItem.setCheckState(0, QtCore.Qt.Checked)
58+
scriptItem = QTreeWidgetItem()
59+
scriptItem.setFlags(scriptItem.flags() | Qt.ItemIsUserCheckable)
60+
scriptItem.setCheckState(0, Qt.Checked)
5661
scriptItem.script = script
5762
scriptItem.setText(0, script.name)
5863
groupItem.addChild(scriptItem)
@@ -69,12 +74,12 @@ def __init__(self):
6974
self.buttonBox.rejected.connect(self.cancelPressed)
7075

7176
def selectFolder(self):
72-
folder = QtGui.QFileDialog.getExistingDirectory(self, 'Select folder')
77+
folder = QFileDialog.getExistingDirectory(self, 'Select folder')
7378
if folder:
7479
self.folderBox.setText(folder)
7580

7681
def checkScripts(self, b):
77-
state = QtCore.Qt.Checked if b else QtCore.Qt.Unchecked
82+
state = Qt.Checked if b else Qt.Unchecked
7883
for i in xrange(self.scriptsTree.topLevelItemCount()):
7984
item = self.scriptsTree.topLevelItem(i)
8085
for j in xrange(item.childCount()):
@@ -98,7 +103,7 @@ def okPressed(self):
98103
groupItem = self.scriptsTree.topLevelItem(i)
99104
for j in xrange(groupItem.childCount()):
100105
scriptItem = groupItem.child(j)
101-
if scriptItem.checkState(0) == QtCore.Qt.Checked:
106+
if scriptItem.checkState(0) == Qt.Checked:
102107
self.scripts.append(scriptItem.script)
103108
self.folder = self._getValue(self.folderBox)
104109
try:

0 commit comments

Comments
 (0)
Please sign in to comment.