Skip to content

Commit b456f4d

Browse files
committed
[processing] restore missed icons in various dialogs
1 parent 5560f00 commit b456f4d

File tree

4 files changed

+26
-31
lines changed

4 files changed

+26
-31
lines changed

python/plugins/processing/ProcessingPlugin.py

+22-30
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@
3131
import sys
3232

3333
from PyQt4.QtCore import Qt, QCoreApplication, QDir
34-
3534
from PyQt4.QtGui import QMenu, QAction, QIcon
35+
3636
from processing.core.Processing import Processing
3737
from processing.gui.ProcessingToolbox import ProcessingToolbox
3838
from processing.gui.HistoryDialog import HistoryDialog
3939
from processing.gui.ConfigDialog import ConfigDialog
4040
from processing.gui.ResultsDialog import ResultsDialog
41-
from processing.modeler.ModelerDialog import ModelerDialog
4241
from processing.gui.CommanderWindow import CommanderWindow
42+
from processing.modeler.ModelerDialog import ModelerDialog
4343
from processing.tools.system import tempFolder
4444

45-
#import processing.resources_rc
45+
import processing.resources_rc
4646

4747
cmd_folder = os.path.split(inspect.getfile(inspect.currentframe()))[0]
4848
if cmd_folder not in sys.path:
@@ -63,45 +63,36 @@ def initGui(self):
6363
Processing.addAlgListListener(self.toolbox)
6464

6565
self.menu = QMenu(self.iface.mainWindow().menuBar())
66-
self.menu.setObjectName( 'processing' )
67-
self.menu.setTitle(QCoreApplication.translate('Processing',
68-
'Pro&cessing'))
66+
self.menu.setObjectName('processing')
67+
self.menu.setTitle(self.tr('Pro&cessing'))
6968

7069
self.toolboxAction = self.toolbox.toggleViewAction()
71-
self.toolboxAction.setObjectName( 'toolboxAction' )
70+
self.toolboxAction.setObjectName('toolboxAction')
7271
self.toolboxAction.setIcon(QIcon(':/processing/images/alg.png'))
73-
self.toolboxAction.setText(QCoreApplication.translate('Processing',
74-
'&Toolbox'))
72+
self.toolboxAction.setText(self.tr('&Toolbox'))
7573
self.menu.addAction(self.toolboxAction)
7674

7775
self.modelerAction = QAction(QIcon(':/processing/images/model.png'),
78-
QCoreApplication.translate('Processing',
79-
'Graphical &Modeler...'),
80-
self.iface.mainWindow())
81-
self.modelerAction.setObjectName( 'modelerAction' )
76+
self.tr('Graphical &Modeler...'), self.iface.mainWindow())
77+
self.modelerAction.setObjectName('modelerAction')
8278
self.modelerAction.triggered.connect(self.openModeler)
8379
self.menu.addAction(self.modelerAction)
8480

8581
self.historyAction = QAction(QIcon(':/processing/images/history.gif'),
86-
QCoreApplication.translate('Processing',
87-
'&History and Log...'),
88-
self.iface.mainWindow())
89-
self.historyAction.setObjectName( 'historyAction' )
82+
self.tr('&History and Log...'), self.iface.mainWindow())
83+
self.historyAction.setObjectName('historyAction')
9084
self.historyAction.triggered.connect(self.openHistory)
9185
self.menu.addAction(self.historyAction)
9286

9387
self.configAction = QAction(QIcon(':/processing/images/config.png'),
94-
QCoreApplication.translate('Processing',
95-
'&Options...'),
96-
self.iface.mainWindow())
97-
self.configAction.setObjectName( 'configAction' )
88+
self.tr('&Options...'), self.iface.mainWindow())
89+
self.configAction.setObjectName('configAction')
9890
self.configAction.triggered.connect(self.openConfig)
9991
self.menu.addAction(self.configAction)
10092

10193
self.resultsAction = QAction(QIcon(':/processing/images/results.png'),
102-
QCoreApplication.translate('Processing', '&Results Viewer...'),
103-
self.iface.mainWindow())
104-
self.resultsAction.setObjectName( 'resultsAction' )
94+
self.tr('&Results Viewer...'), self.iface.mainWindow())
95+
self.resultsAction.setObjectName('resultsAction')
10596
self.resultsAction.triggered.connect(self.openResults)
10697
self.menu.addAction(self.resultsAction)
10798

@@ -111,14 +102,12 @@ def initGui(self):
111102

112103
self.commanderAction = QAction(
113104
QIcon(':/processing/images/commander.png'),
114-
QCoreApplication.translate('Processing', '&Commander'),
115-
self.iface.mainWindow())
116-
self.commanderAction.setObjectName( 'commanderAction' )
105+
self.tr('&Commander'), self.iface.mainWindow())
106+
self.commanderAction.setObjectName('commanderAction')
117107
self.commanderAction.triggered.connect(self.openCommander)
118108
self.menu.addAction(self.commanderAction)
119-
self.iface.registerMainWindowAction(
120-
self.commanderAction,
121-
QCoreApplication.translate('Processing', 'Ctrl+Alt+M' ) )
109+
self.iface.registerMainWindowAction(self.commanderAction,
110+
self.tr('Ctrl+Alt+M'))
122111

123112
def unload(self):
124113
self.toolbox.setVisible(False)
@@ -165,3 +154,6 @@ def openHistory(self):
165154
def openConfig(self):
166155
dlg = ConfigDialog(self.toolbox)
167156
dlg.exec_()
157+
158+
def tr(self, message):
159+
return QCoreApplication.translate('Processing', message)

python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py

+2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@
126126
from HypsometricCurves import HypsometricCurves
127127
from SplitLinesWithLines import SplitLinesWithLines
128128

129+
import processing.resources_rc
130+
129131

130132
class QGISAlgorithmProvider(AlgorithmProvider):
131133

python/plugins/processing/gui/ScriptEditorDialog.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
from processing.script.ScriptUtils import ScriptUtils
4747
from processing.ui.ui_DlgScriptEditor import Ui_DlgScriptEditor
4848

49-
#import processing.resources_rc
49+
import processing.resources_rc
5050

5151

5252
class ScriptEditorDialog(QDialog, Ui_DlgScriptEditor):

python/plugins/processing/modeler/ModelerDialog.py

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747

4848
from processing.ui.ui_DlgModeler import Ui_DlgModeler
4949

50+
import processing.resources_rc
5051

5152
class ModelerDialog(QDialog, Ui_DlgModeler):
5253

0 commit comments

Comments
 (0)