marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[new/change] updated PyLoT icons to a more homogeneous icon set

Browse Source
This commit is contained in:
marcel 2017-06-28 16:25:14 +02:00
parent 2f7033329b
commit cb5f7b6946
35 changed files with 80345 additions and 71007 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
QtPyLoT.py
View File

@ -247,25 +247,37 @@ class MainWindow(QMainWindow):
self.tabs.setCurrentIndex(0) self.tabs.setCurrentIndex(0)
quitIcon = self.style().standardIcon(QStyle.SP_MediaStop) quitIcon = self.style().standardIcon(QStyle.SP_MediaStop)
saveIcon = self.style().standardIcon(QStyle.SP_DriveHDIcon)
openIcon = self.style().standardIcon(QStyle.SP_DirOpenIcon)
helpIcon = self.style().standardIcon(QStyle.SP_DialogHelpButton) helpIcon = self.style().standardIcon(QStyle.SP_DialogHelpButton)
newIcon = self.style().standardIcon(QStyle.SP_FileIcon) newIcon = self.style().standardIcon(QStyle.SP_FileIcon)
newFolderIcon = self.style().standardIcon(QStyle.SP_FileDialogNewFolder) newFolderIcon = self.style().standardIcon(QStyle.SP_FileDialogNewFolder)
# create resource icons # create resource icons
locactionicon = QIcon() addIcon = QIcon()
locactionicon.addPixmap(QPixmap(':/icons/locactionicon.png')) addIcon.addPixmap(QPixmap(':/icons/add.png'))
manupicksicon = QIcon() saveIcon = QIcon()
manupicksicon.addPixmap(QPixmap(':/icons/manupicsicon.png')) saveIcon.addPixmap(QPixmap(':/icons/save.png'))
autopicksicon = QIcon() saveasIcon = QIcon()
autopicksicon.addPixmap(QPixmap(':/icons/autopicsicon.png')) saveasIcon.addPixmap(QPixmap(':/icons/saveas.png'))
saveProjectIcon = QIcon()
saveProjectIcon.addPixmap(QPixmap(':/icons/saveproject.png'))
saveProjectAsIcon = QIcon()
saveProjectAsIcon.addPixmap(QPixmap(':/icons/saveprojectas.png'))
openIcon = QIcon()
openIcon.addPixmap(QPixmap(':/icons/openfile.png'))
openProjectIcon = QIcon()
openProjectIcon.addPixmap(QPixmap(':/icons/openproject.png'))
openLocIcon = QIcon()
openLocIcon.addPixmap(QPixmap(':/icons/openloc.png'))
openEventIcon = QIcon()
openEventIcon.addPixmap(QPixmap(':/icons/openpick.png'))
openEventsIcon = QIcon()
openEventsIcon.addPixmap(QPixmap(':/icons/openpicks.png'))
saveEventsIcon = QIcon()
saveEventsIcon.addPixmap(QPixmap(':/icons/savepicks.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()
self.manupicksicon_small.addPixmap(QPixmap(':/icons/manupicksicon_small.png')) self.manupicksicon_small.addPixmap(QPixmap(':/icons/manupicksicon_small.png'))
saveProjectIcon = QIcon()
saveProjectIcon.addPixmap(QPixmap(':/icons/Library-icon.png'))
loadpiloticon = QIcon() loadpiloticon = QIcon()
loadpiloticon.addPixmap(QPixmap(':/icons/Matlab_PILOT_icon.png')) loadpiloticon.addPixmap(QPixmap(':/icons/Matlab_PILOT_icon.png'))
p_icon = QIcon() p_icon = QIcon()
@ -283,7 +295,7 @@ class MainWindow(QMainWindow):
e_icon = QIcon() e_icon = QIcon()
e_icon.addPixmap(QPixmap(':/icons/key_E.png')) e_icon.addPixmap(QPixmap(':/icons/key_E.png'))
autotune_icon = QIcon() autotune_icon = QIcon()
autotune_icon.addPixmap(QPixmap(':/icons/autopick_button.png')) autotune_icon.addPixmap(QPixmap(':/icons/tune.png'))
autopylot_icon = QIcon() autopylot_icon = QIcon()
autopylot_icon.addPixmap(QPixmap(':/icons/autopylot_button')) autopylot_icon.addPixmap(QPixmap(':/icons/autopylot_button'))
locate_icon = QIcon() locate_icon = QIcon()
@ -297,7 +309,7 @@ class MainWindow(QMainWindow):
self.openProjectAction = self.createAction(self, "&Open project ...", self.openProjectAction = self.createAction(self, "&Open project ...",
self.loadProject, self.loadProject,
QKeySequence.Open, QKeySequence.Open,
openIcon, openProjectIcon,
"Load project file") "Load project file")
self.saveProjectAction = self.createAction(self, "&Save project ...", self.saveProjectAction = self.createAction(self, "&Save project ...",
self.saveProject, self.saveProject,
@ -308,7 +320,7 @@ class MainWindow(QMainWindow):
self.saveProjectAsAction = self.createAction(self, "Save project as ...", self.saveProjectAsAction = self.createAction(self, "Save project as ...",
self.saveProjectAs, self.saveProjectAs,
QKeySequence.SaveAs, QKeySequence.SaveAs,
saveProjectIcon, saveProjectAsIcon,
"Save project file as...") "Save project file as...")
self.saveProjectAsAction.setEnabled(False) self.saveProjectAsAction.setEnabled(False)
# newEventAction = self.createAction(self, "&New event ...", # newEventAction = self.createAction(self, "&New event ...",
@ -318,7 +330,7 @@ class MainWindow(QMainWindow):
self.openmanualpicksaction = self.createAction(self, "Load event ...", self.openmanualpicksaction = self.createAction(self, "Load event ...",
self.load_data, self.load_data,
"Ctrl+M", "Ctrl+M",
manupicksicon, openEventIcon,
"Load event information for " "Load event information for "
"the displayed event.") "the displayed event.")
self.openmanualpicksaction.setEnabled(False) self.openmanualpicksaction.setEnabled(False)
@ -327,7 +339,7 @@ class MainWindow(QMainWindow):
self.openautopicksaction = self.createAction(self, "Load event information &automatically ... ", self.openautopicksaction = self.createAction(self, "Load event information &automatically ... ",
self.load_multiple_data, self.load_multiple_data,
"Ctrl+A", "Ctrl+A",
autopicksicon, openEventsIcon,
"Load event data automatically " "Load event data automatically "
"for for all events.") "for for all events.")
self.openautopicksaction.setEnabled(False) self.openautopicksaction.setEnabled(False)
@ -335,7 +347,7 @@ class MainWindow(QMainWindow):
self.loadlocationaction = self.createAction(self, "Load &location ...", self.loadlocationaction = self.createAction(self, "Load &location ...",
self.load_loc, "Ctrl+L", self.load_loc, "Ctrl+L",
locactionicon, openLocIcon,
"Load location information on " "Load location information on "
"the displayed event.") "the displayed event.")
self.loadlocationaction.setEnabled(False) self.loadlocationaction.setEnabled(False)
@ -349,12 +361,12 @@ class MainWindow(QMainWindow):
self.saveManualPicksAction = self.createAction(self, "Save &picks ...", self.saveManualPicksAction = self.createAction(self, "Save &picks ...",
self.saveData, "Ctrl+P", self.saveData, "Ctrl+P",
saveIcon, "Save event pick data.") saveEventsIcon, "Save event pick data.")
self.disableSaveManualPicksAction() self.disableSaveManualPicksAction()
self.addEventDataAction = self.createAction(self, "Add &events ...", self.addEventDataAction = self.createAction(self, "Add &events ...",
self.add_events, self.add_events,
"Ctrl+E", newFolderIcon, "Ctrl+E", addIcon,
"Add event data") "Add event data")
prefsEventAction = self.createAction(self, "Preferences", prefsEventAction = self.createAction(self, "Preferences",
self.PyLoTprefs, self.PyLoTprefs,
@ -427,8 +439,8 @@ class MainWindow(QMainWindow):
fileToolActions = (self.newProjectAction, self.addEventDataAction, fileToolActions = (self.newProjectAction, self.addEventDataAction,
self.openProjectAction, self.saveProjectAction, self.openProjectAction, self.saveProjectAction,
self.saveProjectAsAction, self.openmanualpicksaction, self.saveProjectAsAction, self.openmanualpicksaction,
self.openautopicksaction, self.loadlocationaction, self.openautopicksaction, self.saveManualPicksAction,
self.loadpilotevent, self.saveManualPicksAction) self.loadlocationaction, self.loadpilotevent)
fileToolBar.setObjectName("FileTools") fileToolBar.setObjectName("FileTools")
self.addActions(fileToolBar, fileToolActions) self.addActions(fileToolBar, fileToolActions)
@ -2401,7 +2413,7 @@ class MainWindow(QMainWindow):
self.setDirty(True) self.setDirty(True)
def setDirty(self, value): def setDirty(self, value):
self.saveProjectAction.setEnabled(bool(self.get_current_event().picks)) self.saveProjectAction.setEnabled(value)
self.saveProjectAsAction.setEnabled(True) self.saveProjectAsAction.setEnabled(True)
self.project.setDirty(value) self.project.setDirty(value)
self.dirty = value self.dirty = value

23
icons.qrc
View File

@ -1,15 +1,26 @@
<RCC> <RCC>
<qresource> <qresource>
<file>icons/Library-icon.png</file>
<file>icons/pylot.ico</file> <file>icons/pylot.ico</file>
<file>icons/pylot.png</file> <file>icons/pylot.png</file>
<file>icons/manupicsicon.png</file> <file>icons/open.png</file>
<file>icons/autopicsicon.png</file> <file>icons/openproject.png</file>
<file>icons/autopylot_button.png</file> <file>icons/add.png</file>
<file>icons/save.png</file>
<file>icons/saveas.png</file>
<file>icons/saveproject.png</file>
<file>icons/saveprojectas.png</file>
<file>icons/manupicksicon_small.png</file> <file>icons/manupicksicon_small.png</file>
<file>icons/autopicksicon_small.png</file> <file>icons/autopicksicon_small.png</file>
<file>icons/autopick_button.png</file> <file>icons/tune.png</file>
<file>icons/locactionicon.png</file> <file>icons/autopylot_button.png</file>
<file>icons/pick.png</file>
<file>icons/waveform.png</file>
<file>icons/openpick.png</file>
<file>icons/openpicks.png</file>
<file>icons/openpick.png</file>
<file>icons/openpicks.png</file>
<file>icons/savepicks.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>
<file>icons/Matlab_PILOT_icon.png</file> <file>icons/Matlab_PILOT_icon.png</file>

BIN
icons/add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
icons/autopick_button.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 629 KiB

BIN
icons/autopicksicon_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
icons/autopylot_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
icons/compare_button.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
icons/key_E.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 37 KiB

BIN
icons/key_N.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
icons/key_P.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 43 KiB

BIN
icons/key_Q.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 59 KiB

BIN
icons/key_R.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
icons/key_S.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 55 KiB

BIN
icons/key_T.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 0 B

After

Width:  |  Height:  |  Size: 36 KiB

BIN
icons/key_U.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 44 KiB

BIN
icons/key_V.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
icons/key_W.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 54 KiB

BIN
icons/key_Z.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
icons/locactionicon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 124 KiB

BIN
icons/manupicksicon_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
icons/open.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
icons/openfile.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
icons/openloc.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
icons/openpick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

BIN
icons/openpicks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
icons/openproject.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
icons/pick.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
icons/save.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
icons/saveas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
icons/savepicks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
icons/saveproject.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
icons/saveprojectas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
icons/tune.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 37 KiB

BIN
icons/waveform.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

151275
icons_rc.py
View File

File diff suppressed because it is too large Load Diff