Skip to content

Commit 28c03a1

Browse files
alexbruyalexbruy
committedNov 17, 2014
[processing] remove similar widgets (use generic one instead)
·
ltr-3_40archive/master_2
1 parent c3d230c commit 28c03a1

File tree

8 files changed

+36
-107
lines changed

8 files changed

+36
-107
lines changed
 

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from PyQt4.QtGui import *
3232
from qgis.utils import iface
3333
from processing.core.Processing import Processing
34-
from processing.gui.MissingDependencyDialog import MissingDependencyDialog
34+
from processing.gui.MessageDialog import MessageDialog
3535
from processing.gui.ParametersDialog import ParametersDialog
3636
from processing.tools import dataobjects
3737
from processing.tools.system import *
@@ -205,7 +205,9 @@ def runAlgorithm(self, alg):
205205
alg = alg.getCopy()
206206
message = alg.checkBeforeOpeningParametersDialog()
207207
if message:
208-
dlg = MissingDependencyDialog(message)
208+
dlg = MessageDialog()
209+
dlg.setTitle(self.tr('Missing dependency'))
210+
dlg.setMessage(msg)
209211
dlg.exec_()
210212
return
211213
dlg = alg.getCustomParametersDialog()

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@
3131
from qgis.gui import *
3232
from qgis.core import *
3333

34-
from processing.ui.ui_widgetCRSSelector import Ui_widgetCRSSelector
34+
from processing.ui.ui_widgetBaseSelector import Ui_Form
3535

36-
class CrsSelectionPanel(QWidget, Ui_widgetCRSSelector):
36+
class CrsSelectionPanel(QWidget, Ui_Form):
3737

3838
def __init__(self, default):
3939
QWidget.__init__(self)
4040
self.setupUi(self)
4141

42-
self.btnBrowse.clicked.connect(self.browseCRS)
42+
self.leText.setEnabled(False)
43+
44+
self.btnBSelect.clicked.connect(self.browseCRS)
4345
self.authId = QgsCoordinateReferenceSystem(default).authid()
4446
self.updateText()
4547

@@ -56,7 +58,7 @@ def browseCRS(self):
5658

5759
def updateText(self):
5860
if self.authId is not None:
59-
self.leCRS.setText(self.authId)
61+
self.leText.setText(self.authId)
6062

6163
def getValue(self):
6264
return self.authId

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from processing.core.parameters import ParameterMultipleInput
3838
from processing.tools import dataobjects
3939

40-
from processing.ui.ui_widgetExtentSelector import Ui_Form
40+
from processing.ui.ui_widgetBaseSelector import Ui_Form
4141

4242
class ExtentSelectionPanel(QWidget, Ui_Form):
4343

@@ -48,8 +48,8 @@ def __init__(self, dialog, alg, default):
4848
self.dialog = dialog
4949
self.params = alg.parameters
5050
if self.canUseAutoExtent():
51-
if hasattr(self.leExtent, 'setPlaceholderText'):
52-
self.leExtent.setPlaceholderText(
51+
if hasattr(self.leText, 'setPlaceholderText'):
52+
self.leText.setPlaceholderText(
5353
self.tr('[Leave blank to use min covering extent]'))
5454

5555
self.btnSelect.clicked.connect(self.selectExtent)
@@ -92,7 +92,7 @@ def selectExtent(self):
9292
popupmenu.exec_(QCursor.pos())
9393

9494
def useMinCoveringExtent(self):
95-
self.leExtent.setText('')
95+
self.leText.setText('')
9696

9797
def getMinCoveringExtent(self):
9898
first = True
@@ -165,7 +165,7 @@ def setValueFromRect(self, r):
165165
s = '{},{},{},{}'.format(
166166
r.xMinimum(), r.xMaximum(), r.yMinimum(), r.yMaximum())
167167

168-
self.leExtent.setText(s)
168+
self.leText.setText(s)
169169
self.tool.reset()
170170
canvas = iface.mapCanvas()
171171
canvas.setMapTool(self.prevMapTool)
@@ -174,7 +174,7 @@ def setValueFromRect(self, r):
174174
self.dialog.activateWindow()
175175

176176
def getValue(self):
177-
if str(self.leExtent.text()).strip() != '':
178-
return str(self.leExtent.text())
177+
if str(self.leText.text()).strip() != '':
178+
return unicode(self.leText.text())
179179
else:
180180
return self.getMinCoveringExtent()

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
from processing.core.outputs import OutputVector
3838
from processing.core.outputs import OutputDirectory
3939

40-
from processing.ui.ui_widgetOutputSelect import Ui_widgetOutputSelect
40+
from processing.ui.ui_widgetBaseSelector import Ui_Form
4141

42-
class OutputSelectionPanel(QWidget, Ui_widgetOutputSelect):
42+
class OutputSelectionPanel(QWidget, Ui_Form):
4343

4444
SAVE_TO_TEMP_FILE = QCoreApplication.translate(
4545
'OutputSelectionPanel', '[Save to temporary file]')
@@ -51,10 +51,10 @@ def __init__(self, output, alg):
5151
self.output = output
5252
self.alg = alg
5353

54-
if hasattr(self.text, 'setPlaceholderText'):
55-
self.text.setPlaceholderText(self.SAVE_TO_TEMP_FILE)
54+
if hasattr(self.leText, 'setPlaceholderText'):
55+
self.leText.setPlaceholderText(self.SAVE_TO_TEMP_FILE)
5656

57-
self.btnBrowse.clicked.connect(self.selectOutput)
57+
self.btnSelect.clicked.connect(self.selectOutput)
5858

5959
def selectOutput(self):
6060
if isinstance(self.output, OutputDirectory):
@@ -63,29 +63,29 @@ def selectOutput(self):
6363
popupMenu = QMenu()
6464

6565
actionSaveToTempFile = QAction(
66-
self.tr('Save to a temporary file'), self.btnBrowse)
66+
self.tr('Save to a temporary file'), self.btnSelect)
6767
actionSaveToTempFile.triggered.connect(self.saveToTemporaryFile)
6868
popupMenu.addAction(actionSaveToTempFile)
6969

7070
actionSaveToFile = QAction(
71-
self.tr('Save to file...'), self.btnBrowse)
71+
self.tr('Save to file...'), self.btnSelect)
7272
actionSaveToFile.triggered.connect(self.selectFile)
7373
popupMenu.addAction(actionSaveToFile)
7474

7575
if isinstance(self.output, OutputVector) \
7676
and self.alg.provider.supportsNonFileBasedOutput():
7777
actionSaveToMemory = QAction(
78-
self.tr('Save to memory layer'), self.btnBrowse)
78+
self.tr('Save to memory layer'), self.btnSelect)
7979
actionSaveToMemory.triggered.connect(self.saveToMemory)
8080
popupMenu.addAction(actionSaveToMemory)
8181

8282
popupMenu.exec_(QCursor.pos())
8383

8484
def saveToTemporaryFile(self):
85-
self.text.setText('')
85+
self.leText.setText('')
8686

8787
def saveToMemory(self):
88-
self.text.setText('memory:')
88+
self.leText.setText('memory:')
8989

9090
def selectFile(self):
9191
fileFilter = self.output.getFileFilter(self.alg)
@@ -114,7 +114,7 @@ def selectFile(self):
114114
ext = re.search("\*(\.[a-z]{1,5})", selectedFileFilter)
115115
if ext:
116116
fileName += ext.group(1)
117-
self.text.setText(fileName)
117+
self.leText.setText(fileName)
118118
settings.setValue('/Processing/LastOutputPath',
119119
os.path.dirname(fileName))
120120
settings.setValue('/Processing/encoding', encoding)
@@ -125,10 +125,10 @@ def selectDirectory(self):
125125
dirName = QFileDialog.getExistingDirectory(self,
126126
self.tr('Select directory'), lastDir, QFileDialog.ShowDirsOnly)
127127

128-
self.text.setText(dirName)
128+
self.leText.setText(dirName)
129129

130130
def getValue(self):
131-
fileName = unicode(self.text.text())
131+
fileName = unicode(self.leText.text())
132132
if fileName.strip() in ['', self.SAVE_TO_TEMP_FILE]:
133133
value = None
134134
elif fileName.startswith('memory:'):

‎python/plugins/processing/ui/widgetExtentSelector.ui renamed to ‎python/plugins/processing/ui/widgetBaseSelector.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
9+
<width>249</width>
1010
<height>23</height>
1111
</rect>
1212
</property>
@@ -21,7 +21,7 @@
2121
<number>0</number>
2222
</property>
2323
<item>
24-
<widget class="QLineEdit" name="leExtent"/>
24+
<widget class="QLineEdit" name="leText"/>
2525
</item>
2626
<item>
2727
<widget class="QToolButton" name="btnSelect">

‎python/plugins/processing/ui/widgetCRSSelector.ui

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎python/plugins/processing/ui/widgetNumberInput.ui

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
<x>0</x>
88
<y>0</y>
99
<width>251</width>
10-
<height>24</height>
10+
<height>23</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QHBoxLayout" name="horizontalLayout">
17+
<property name="spacing">
18+
<number>2</number>
19+
</property>
1720
<property name="margin">
1821
<number>0</number>
1922
</property>

‎python/plugins/processing/ui/widgetOutputSelect.ui

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.