Commit 0bd146ca authored by Yves Reker's avatar Yves Reker

Merge branch 'develop' into feature/356_multiple-caffe-versions

parents 1ba4f991 609ee38a
......@@ -159,9 +159,9 @@ class DefaultActions(QtCore.QObject):
self.tr("Close Application"))
self.undoAction = self._buildAction(self.tr("Undo"), "Ctrl+Z", lambda: self._netManager.undo(),
standardPixmap=QStyle.SP_ArrowLeft)
icon="resources/leftArrow.png")
self.redoAction = self._buildAction(self.tr("Redo"), "Shift+Ctrl+Z", lambda: self._netManager.redo(),
standardPixmap=QStyle.SP_ArrowRight)
icon="resources/rightArrow.png")
self.editNetAction = self._buildAction(self.tr("Edit &Network as Prototxt"), "Ctrl+E", self.openNetEditor)
self.editSolverAction = self._buildAction(self.tr("Edit &Solver as Prototxt"), "Shift+Ctrl+E",
......@@ -176,11 +176,11 @@ class DefaultActions(QtCore.QObject):
self.sortSceneActionVertical = self._buildAction(self.tr("Arrange Layers Vertically"), None, self._sortSceneVertical)
self.newProjectAction = self._buildAction(self.tr("New Project"), "Ctrl+N", lambda: self.newProjectDialog(),
standardPixmap=QStyle.SP_FileIcon)
icon="resources/newDocument.png")
self.loadProjectAction = self._buildAction(self.tr("Load Project"), "Ctrl+O", lambda: self.openProjectDialog(),
standardPixmap=QStyle.SP_DialogOpenButton)
icon="resources/openDocument.png")
self.saveProjectAction = self._buildAction(self.tr("Save Project"), "Ctrl+S", lambda: self.saveProject(),
standardPixmap=QStyle.SP_DialogSaveButton)
icon="resources/saveProject.png")
self.deployAction = self._buildAction(self.tr("Deploy and export"), None,
lambda: self.openDeploymentDialog())
......
......@@ -23,6 +23,7 @@ class NodeEditorEventHandler:
self.setSelectionToItem = None
self.removeFromSelection = False
self.removeFromSelectionItemID = None
self.pressedItem = None
# Save the last item the mouse has moved over
self.lastHoveredItem = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment