Skip to content

Commit 7cb0be0

Browse files
alexbruyalexbruy
committedOct 2, 2013
[processing] use QtDesigner ui file for Edit rendering styles dialog
·
ltr-3_40archive/master_2
1 parent 498a5d9 commit 7cb0be0

File tree

3 files changed

+161
-45
lines changed

3 files changed

+161
-45
lines changed
 

‎python/plugins/processing/gui/EditRenderingStylesDialog.py

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -27,88 +27,65 @@
2727

2828
from PyQt4.QtCore import *
2929
from PyQt4.QtGui import *
30-
from PyQt4 import QtCore, QtGui
30+
3131
from processing.gui.RenderingStyles import RenderingStyles
3232
from processing.gui.RenderingStyleFilePanel import RenderingStyleFilePanel
3333
from processing.outputs.OutputRaster import OutputRaster
3434
from processing.outputs.OutputVector import OutputVector
3535

36+
from processing.ui.ui_DlgRenderingStyles import Ui_DlgRenderingStyles
37+
3638

37-
class EditRenderingStylesDialog(QtGui.QDialog):
39+
class EditRenderingStylesDialog(QDialog, Ui_DlgRenderingStyles):
3840

3941
def __init__(self, alg):
40-
QtGui.QDialog.__init__(self)
41-
self.setModal(True)
42+
QDialog.__init__(self)
43+
self.setupUi(self)
44+
4245
self.alg = alg
43-
self.setupUi()
4446

45-
def setupUi(self):
47+
self.setModal(True)
48+
self.tblStyles.horizontalHeader().setResizeMode(QHeaderView.Stretch)
49+
self.setWindowTitle(self.alg.name)
50+
4651
self.valueItems = {}
4752
self.dependentItems = {}
48-
self.resize(650, 450)
49-
self.buttonBox = QtGui.QDialogButtonBox()
50-
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
51-
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel
52-
| QtGui.QDialogButtonBox.Ok)
53-
self.tableWidget = QtGui.QTableWidget()
54-
self.tableWidget.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
55-
self.tableWidget.setColumnCount(2)
56-
self.tableWidget.setColumnWidth(0, 300)
57-
self.tableWidget.setColumnWidth(1, 300)
58-
self.tableWidget.setHorizontalHeaderItem(0,
59-
QtGui.QTableWidgetItem('Output'))
60-
self.tableWidget.setHorizontalHeaderItem(1,
61-
QtGui.QTableWidgetItem('Style'))
62-
self.tableWidget.verticalHeader().setVisible(False)
63-
self.tableWidget.horizontalHeader().setResizeMode(
64-
QtGui.QHeaderView.Stretch)
6553
self.setTableContent()
66-
self.setWindowTitle(self.alg.name)
67-
self.verticalLayout = QtGui.QVBoxLayout()
68-
self.verticalLayout.setSpacing(2)
69-
self.verticalLayout.setMargin(0)
70-
self.verticalLayout.addWidget(self.tableWidget)
71-
self.verticalLayout.addWidget(self.buttonBox)
72-
self.setLayout(self.verticalLayout)
73-
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL('accepted()'),
74-
self.okPressed)
75-
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL('rejected()'),
76-
self.cancelPressed)
77-
QtCore.QMetaObject.connectSlotsByName(self)
7854

7955
def setTableContent(self):
8056
numOutputs = 0
8157
for output in self.alg.outputs:
8258
if isinstance(output, (OutputVector, OutputRaster)):
8359
if not output.hidden:
8460
numOutputs += 1
85-
self.tableWidget.setRowCount(numOutputs)
61+
self.tblStyles.setRowCount(numOutputs)
8662

8763
i = 0
8864
for output in self.alg.outputs:
8965
if isinstance(output, (OutputVector, OutputRaster)):
9066
if not output.hidden:
91-
item = QtGui.QTableWidgetItem(output.description + '<'
67+
item = QTableWidgetItem(output.description + '<'
9268
+ output.__module__.split('.')[-1] + '>')
93-
item.setFlags(QtCore.Qt.ItemIsEnabled)
94-
self.tableWidget.setItem(i, 0, item)
69+
item.setFlags(Qt.ItemIsEnabled)
70+
self.tblStyles.setItem(i, 0, item)
9571
item = RenderingStyleFilePanel()
9672
style = \
9773
RenderingStyles.getStyle(self.alg.commandLineName(),
9874
output.name)
9975
if style:
10076
item.setText(str(style))
10177
self.valueItems[output.name] = item
102-
self.tableWidget.setCellWidget(i, 1, item)
103-
self.tableWidget.setRowHeight(i, 22)
78+
self.tblStyles.setCellWidget(i, 1, item)
79+
self.tblStyles.setRowHeight(i, 22)
10480
i += 1
10581

106-
def okPressed(self):
82+
def accepted(self):
10783
styles = {}
10884
for key in self.valueItems.keys():
10985
styles[key] = str(self.valueItems[key].getValue())
11086
RenderingStyles.addAlgStylesAndSave(self.alg.commandLineName(), styles)
111-
self.close()
11287

113-
def cancelPressed(self):
114-
self.close()
88+
QDialog.accept(self)
89+
90+
def rejected(self):
91+
QDialog.reject(self)

‎python/plugins/processing/ui/DlgRenderingStyles.ui

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>DlgRenderingStyles</class>
4+
<widget class="QDialog" name="DlgRenderingStyles">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>550</width>
10+
<height>400</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Dialog</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout">
17+
<property name="spacing">
18+
<number>2</number>
19+
</property>
20+
<property name="margin">
21+
<number>0</number>
22+
</property>
23+
<item>
24+
<widget class="QTableWidget" name="tblStyles">
25+
<attribute name="verticalHeaderVisible">
26+
<bool>false</bool>
27+
</attribute>
28+
<column>
29+
<property name="text">
30+
<string>Output</string>
31+
</property>
32+
</column>
33+
<column>
34+
<property name="text">
35+
<string>Style</string>
36+
</property>
37+
</column>
38+
</widget>
39+
</item>
40+
<item>
41+
<widget class="QDialogButtonBox" name="buttonBox">
42+
<property name="orientation">
43+
<enum>Qt::Horizontal</enum>
44+
</property>
45+
<property name="standardButtons">
46+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
47+
</property>
48+
</widget>
49+
</item>
50+
</layout>
51+
</widget>
52+
<resources/>
53+
<connections>
54+
<connection>
55+
<sender>buttonBox</sender>
56+
<signal>accepted()</signal>
57+
<receiver>DlgRenderingStyles</receiver>
58+
<slot>accept()</slot>
59+
<hints>
60+
<hint type="sourcelabel">
61+
<x>248</x>
62+
<y>254</y>
63+
</hint>
64+
<hint type="destinationlabel">
65+
<x>157</x>
66+
<y>274</y>
67+
</hint>
68+
</hints>
69+
</connection>
70+
<connection>
71+
<sender>buttonBox</sender>
72+
<signal>rejected()</signal>
73+
<receiver>DlgRenderingStyles</receiver>
74+
<slot>reject()</slot>
75+
<hints>
76+
<hint type="sourcelabel">
77+
<x>316</x>
78+
<y>260</y>
79+
</hint>
80+
<hint type="destinationlabel">
81+
<x>286</x>
82+
<y>274</y>
83+
</hint>
84+
</hints>
85+
</connection>
86+
</connections>
87+
</ui>

‎python/plugins/processing/ui/ui_DlgRenderingStyles.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Form implementation generated from reading ui file 'python/plugins/processing/ui/DlgRenderingStyles.ui'
4+
#
5+
# Created: Wed Oct 2 17:04:59 2013
6+
# by: PyQt4 UI code generator 4.9.1
7+
#
8+
# WARNING! All changes made in this file will be lost!
9+
10+
from PyQt4 import QtCore, QtGui
11+
12+
try:
13+
_fromUtf8 = QtCore.QString.fromUtf8
14+
except AttributeError:
15+
_fromUtf8 = lambda s: s
16+
17+
class Ui_DlgRenderingStyles(object):
18+
def setupUi(self, DlgRenderingStyles):
19+
DlgRenderingStyles.setObjectName(_fromUtf8("DlgRenderingStyles"))
20+
DlgRenderingStyles.resize(550, 400)
21+
self.verticalLayout = QtGui.QVBoxLayout(DlgRenderingStyles)
22+
self.verticalLayout.setSpacing(2)
23+
self.verticalLayout.setMargin(0)
24+
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
25+
self.tblStyles = QtGui.QTableWidget(DlgRenderingStyles)
26+
self.tblStyles.setObjectName(_fromUtf8("tblStyles"))
27+
self.tblStyles.setColumnCount(2)
28+
self.tblStyles.setRowCount(0)
29+
item = QtGui.QTableWidgetItem()
30+
self.tblStyles.setHorizontalHeaderItem(0, item)
31+
item = QtGui.QTableWidgetItem()
32+
self.tblStyles.setHorizontalHeaderItem(1, item)
33+
self.tblStyles.verticalHeader().setVisible(False)
34+
self.verticalLayout.addWidget(self.tblStyles)
35+
self.buttonBox = QtGui.QDialogButtonBox(DlgRenderingStyles)
36+
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
37+
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
38+
self.buttonBox.setObjectName(_fromUtf8("buttonBox"))
39+
self.verticalLayout.addWidget(self.buttonBox)
40+
41+
self.retranslateUi(DlgRenderingStyles)
42+
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), DlgRenderingStyles.accept)
43+
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), DlgRenderingStyles.reject)
44+
QtCore.QMetaObject.connectSlotsByName(DlgRenderingStyles)
45+
46+
def retranslateUi(self, DlgRenderingStyles):
47+
DlgRenderingStyles.setWindowTitle(QtGui.QApplication.translate("DlgRenderingStyles", "Dialog", None, QtGui.QApplication.UnicodeUTF8))
48+
item = self.tblStyles.horizontalHeaderItem(0)
49+
item.setText(QtGui.QApplication.translate("DlgRenderingStyles", "Output", None, QtGui.QApplication.UnicodeUTF8))
50+
item = self.tblStyles.horizontalHeaderItem(1)
51+
item.setText(QtGui.QApplication.translate("DlgRenderingStyles", "Style", None, QtGui.QApplication.UnicodeUTF8))
52+

0 commit comments

Comments
 (0)
Please sign in to comment.