@@ -53,32 +53,21 @@ def __init__(self, alg=None):
53
53
self .hasChanged = False
54
54
self .setupUi (self )
55
55
56
- self .setWindowFlags (self .windowFlags () | Qt .WindowSystemMenuHint |
57
- Qt .WindowMinMaxButtonsHint )
56
+ # self.setWindowFlags(self.windowFlags() | Qt.WindowSystemMenuHint |
57
+ # Qt.WindowMinMaxButtonsHint)
58
58
self .tabWidget .setCurrentIndex (0 )
59
59
self .scene = ModelerScene (self )
60
60
self .scene .setSceneRect (QRectF (0 , 0 , 4000 , 4000 ))
61
61
self .view .setScene (self .scene )
62
62
self .view .ensureVisible (0 , 0 , 10 , 10 )
63
63
64
- # additional buttons
65
- self .editHelpButton = QPushButton (self .tr ("Edit model help" ))
66
- self .buttonBox .addButton (self .editHelpButton , QDialogButtonBox .ActionRole )
67
- self .runButton = QPushButton (self .tr ("Run" ))
68
- self .runButton .setToolTip (self .tr ("Execute current model" ))
69
- self .buttonBox .addButton (self .runButton , QDialogButtonBox .ActionRole )
70
- self .openButton = QPushButton (self .tr ("Open" ))
71
- self .openButton .setToolTip (self .tr ("Open existing model" ))
72
- self .buttonBox .addButton (self .openButton , QDialogButtonBox .ActionRole )
73
- self .saveButton = QPushButton (self .tr ("Save" ))
74
- self .saveButton .setToolTip (self .tr ("Save current model" ))
75
- self .buttonBox .addButton (self .saveButton , QDialogButtonBox .ActionRole )
76
- self .saveAsButton = QPushButton (self .tr ("Save as..." ))
77
- self .saveAsButton .setToolTip (self .tr ("Save current model as" ))
78
- self .buttonBox .addButton (self .saveAsButton , QDialogButtonBox .ActionRole )
79
- self .exportAsImageButton = QPushButton (self .tr ("Export as image..." ))
80
- self .exportAsImageButton .setToolTip (self .tr ("Export current model to image" ))
81
- self .buttonBox .addButton (self .exportAsImageButton , QDialogButtonBox .ActionRole )
64
+ # set icons
65
+ self .btnOpen .setIcon (QgsApplication .getThemeIcon ("/mActionFileOpen.svg" ))
66
+ self .btnSave .setIcon (QgsApplication .getThemeIcon ("/mActionFileSave.svg" ))
67
+ self .btnSaveAs .setIcon (QgsApplication .getThemeIcon ("/mActionFileSaveAs.svg" ))
68
+ self .btnExportImage .setIcon (QgsApplication .getThemeIcon ("/mActionSaveMapAsImage.png" ))
69
+ self .btnEditHelp .setIcon (QIcon (":/processing/images/edithelp.png" ))
70
+ self .btnRun .setIcon (QIcon (":/processing/images/runalgorithm.png" ))
82
71
83
72
# fill trees with inputs and algorithms
84
73
self .fillInputsTree ()
@@ -97,12 +86,12 @@ def __init__(self, alg=None):
97
86
self .searchBox .textChanged .connect (self .fillAlgorithmTree )
98
87
self .algorithmTree .doubleClicked .connect (self .addAlgorithm )
99
88
100
- self .openButton .clicked .connect (self .openModel )
101
- self .saveButton .clicked .connect (self .save )
102
- self .saveAsButton .clicked .connect (self .saveAs )
103
- self .exportAsImageButton .clicked .connect (self .exportAsImage )
104
- self .runButton .clicked .connect (self .runModel )
105
- self .editHelpButton .clicked .connect (self .editHelp )
89
+ self .btnOpen .clicked .connect (self .openModel )
90
+ self .btnSave .clicked .connect (self .save )
91
+ self .btnSaveAs .clicked .connect (self .saveAs )
92
+ self .btnExportImage .clicked .connect (self .exportAsImage )
93
+ self .btnEditHelp .clicked .connect (self .editHelp )
94
+ self .btnRun .clicked .connect (self .runModel )
106
95
107
96
if alg is not None :
108
97
self .alg = alg
@@ -117,19 +106,21 @@ def __init__(self, alg=None):
117
106
self .help = None
118
107
self .update = False #indicates whether to update or not the toolbox after closing this dialog
119
108
120
- def closeEvent (self , evt ):
109
+ def closeEvent (self , evt ):
121
110
if self .hasChanged :
122
- ret = QMessageBox .question (self , 'Message' ,
123
- "The are unchanged changes in model. Close modeler without saving?" ,
124
- QMessageBox .Yes | QMessageBox .No , QMessageBox .No )
111
+ ret = QMessageBox .question (self ,
112
+ self .tr ("Message" ),
113
+ self .tr ("The are unchanged changes in model. Close modeler without saving?" ),
114
+ QMessageBox .Yes | QMessageBox .No , QMessageBox .No
115
+ )
125
116
126
117
if ret == QMessageBox .Yes :
127
118
evt .accept ()
128
119
else :
129
- evt .ignore ()
120
+ evt .ignore ()
130
121
else :
131
- evt .accept ()
132
-
122
+ evt .accept ()
123
+
133
124
def editHelp (self ):
134
125
dlg = HelpEditionDialog (self .alg )
135
126
dlg .exec_ ()
@@ -212,7 +203,10 @@ def saveModel(self, saveAs):
212
203
if self .alg .descriptionFile != None and not saveAs :
213
204
filename = self .alg .descriptionFile
214
205
else :
215
- filename = unicode (QFileDialog .getSaveFileName (self , self .tr ("Save Model" ), ModelerUtils .modelsFolder (), self .tr ("Processing models (*.model)" )))
206
+ filename = unicode (QFileDialog .getSaveFileName (self ,
207
+ self .tr ("Save Model" ),
208
+ ModelerUtils .modelsFolder (),
209
+ self .tr ("Processing models (*.model)" )))
216
210
if filename :
217
211
if not filename .endswith (".model" ):
218
212
filename += ".model"
@@ -224,14 +218,14 @@ def saveModel(self, saveAs):
224
218
except :
225
219
if saveAs :
226
220
QMessageBox .warning (self ,
227
- self .tr ("I/O error" ),
228
- self .tr ("Unable to save edits. Reason:\n %1" ). arg (unicode (sys .exc_info ()[1 ]))
229
- )
221
+ self .tr ("I/O error" ),
222
+ self .tr ("Unable to save edits. Reason:\n %s" ) % (unicode (sys .exc_info ()[1 ]))
223
+ )
230
224
else :
231
225
QMessageBox .warning (self ,
232
- self .tr ("Can't save model" ),
233
- self .tr ("This model can't be saved in its original location\n (probably you do not have permission to do it).\n Please, use the 'Save as...' option." )
234
- )
226
+ self .tr ("Can't save model" ),
227
+ self .tr ("This model can't be saved in its original location\n (probably you do not have permission to do it).\n Please, use the 'Save as...' option." )
228
+ )
235
229
return
236
230
fout .write (text )
237
231
fout .close ()
@@ -246,11 +240,14 @@ def saveModel(self, saveAs):
246
240
self .tr ("Model saved" ),
247
241
self .tr ("Model was correctly saved." )
248
242
)
249
-
243
+
250
244
self .hasChanged = False
251
245
252
246
def openModel (self ):
253
- filename = unicode (QFileDialog .getOpenFileName (self , self .tr ("Open Model" ), ModelerUtils .modelsFolder (), self .tr ("Processing models (*.model)" )))
247
+ filename = unicode (QFileDialog .getOpenFileName (self ,
248
+ self .tr ("Open Model" ),
249
+ ModelerUtils .modelsFolder (),
250
+ self .tr ("Processing models (*.model)" )))
254
251
if filename :
255
252
try :
256
253
alg = ModelerAlgorithm ()
@@ -267,7 +264,7 @@ def openModel(self):
267
264
except WrongModelException , e :
268
265
QMessageBox .critical (self ,
269
266
self .tr ("Could not open model" ),
270
- self .tr ("The selected model could not be loaded.\n Wrong line: %1" ). arg ( e .msg )
267
+ self .tr ("The selected model could not be loaded.\n Wrong line: %s" ) % e .msg
271
268
)
272
269
273
270
def repaintModel (self ):
@@ -418,7 +415,6 @@ def fillAlgorithmTreeUsingCategories(self):
418
415
if text != "" :
419
416
groupItem .setExpanded (True )
420
417
421
-
422
418
def fillAlgorithmTreeUsingProviders (self ):
423
419
self .algorithmTree .clear ()
424
420
text = str (self .searchBox .text ())
0 commit comments