[add] some more icons added, hopefully fixed problem on ludgers commit deleting icons (changes in data.py should be correct as well)

This commit is contained in:
marcel 2017-06-28 17:20:02 +02:00
parent 4f8631e829
commit aff08d3a9c
6 changed files with 6855 additions and 3100 deletions

View File

@ -274,6 +274,10 @@ class MainWindow(QMainWindow):
openEventsIcon.addPixmap(QPixmap(':/icons/openpicks.png')) openEventsIcon.addPixmap(QPixmap(':/icons/openpicks.png'))
saveEventsIcon = QIcon() saveEventsIcon = QIcon()
saveEventsIcon.addPixmap(QPixmap(':/icons/savepicks.png')) saveEventsIcon.addPixmap(QPixmap(':/icons/savepicks.png'))
prefIcon = QIcon()
prefIcon.addPixmap(QPixmap(':/icons/preferences.png'))
paraIcon = QIcon()
paraIcon.addPixmap(QPixmap(':/icons/parameter.png'))
self.autopicksicon_small = QIcon() self.autopicksicon_small = QIcon()
self.autopicksicon_small.addPixmap(QPixmap(':/icons/autopicksicon_small.png')) self.autopicksicon_small.addPixmap(QPixmap(':/icons/autopicksicon_small.png'))
self.manupicksicon_small = QIcon() self.manupicksicon_small = QIcon()
@ -371,7 +375,7 @@ class MainWindow(QMainWindow):
prefsEventAction = self.createAction(self, "Preferences", prefsEventAction = self.createAction(self, "Preferences",
self.PyLoTprefs, self.PyLoTprefs,
QKeySequence.Preferences, QKeySequence.Preferences,
QIcon(None), prefIcon,
"Edit PyLoT app preferences.") "Edit PyLoT app preferences.")
quitAction = self.createAction(self, "&Quit", quitAction = self.createAction(self, "&Quit",
QCoreApplication.instance().quit, QCoreApplication.instance().quit,
@ -379,7 +383,7 @@ class MainWindow(QMainWindow):
"Close event and quit PyLoT") "Close event and quit PyLoT")
self.parameterAction = self.createAction(self, "Parameter", self.parameterAction = self.createAction(self, "Parameter",
self.setParameter, self.setParameter,
None, QIcon(None), None, paraIcon,
"Modify Parameter") "Modify Parameter")
self.filterAction = self.createAction(self, "&Filter ...", self.filterAction = self.createAction(self, "&Filter ...",
self.filterWaveformData, self.filterWaveformData,
@ -389,7 +393,7 @@ class MainWindow(QMainWindow):
desired seismic phase.""", True) desired seismic phase.""", True)
filterEditAction = self.createAction(self, "&Filter parameter ...", filterEditAction = self.createAction(self, "&Filter parameter ...",
self.adjustFilterOptions, self.adjustFilterOptions,
"Alt+F", QIcon(None), "Alt+F", filter_icon,
"""Adjust filter parameters.""") """Adjust filter parameters.""")
self.selectPAction = self.createAction(self, "&P", self.alterPhase, self.selectPAction = self.createAction(self, "&P", self.alterPhase,
"Alt+P", "Alt+P",

View File

@ -20,6 +20,8 @@
<file>icons/openpick.png</file> <file>icons/openpick.png</file>
<file>icons/openpicks.png</file> <file>icons/openpicks.png</file>
<file>icons/savepicks.png</file> <file>icons/savepicks.png</file>
<file>icons/preferences.png</file>
<file>icons/parameter.png</file>
<file>icons/openloc.png</file> <file>icons/openloc.png</file>
<file>icons/compare_button.png</file> <file>icons/compare_button.png</file>
<file>icons/locate_button.png</file> <file>icons/locate_button.png</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
icons/parameter.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

BIN
icons/preferences.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because it is too large Load Diff