- added ability to add a menu-entry separator after the tool, on install
This commit is contained in:
@@ -573,7 +573,7 @@ class App(QtCore.QObject):
|
|||||||
### Tools and Plugins ###
|
### Tools and Plugins ###
|
||||||
#########################
|
#########################
|
||||||
self.dblsidedtool = DblSidedTool(self)
|
self.dblsidedtool = DblSidedTool(self)
|
||||||
self.dblsidedtool.install(icon=QtGui.QIcon('share:doubleside16.png'))
|
self.dblsidedtool.install(icon=QtGui.QIcon('share:doubleside16.png'), separator=True)
|
||||||
|
|
||||||
self.measeurement_tool = Measurement(self)
|
self.measeurement_tool = Measurement(self)
|
||||||
self.measeurement_tool.install(icon=QtGui.QIcon('share:measure16.png'))
|
self.measeurement_tool.install(icon=QtGui.QIcon('share:measure16.png'))
|
||||||
@@ -607,6 +607,7 @@ class App(QtCore.QObject):
|
|||||||
QtGui.QDockWidget.DockWidgetFloatable | QtGui.QDockWidget.DockWidgetClosable)
|
QtGui.QDockWidget.DockWidgetFloatable | QtGui.QDockWidget.DockWidgetClosable)
|
||||||
self.ui.addDockWidget(QtCore.Qt.BottomDockWidgetArea, self.ui.shell_dock)
|
self.ui.addDockWidget(QtCore.Qt.BottomDockWidgetArea, self.ui.shell_dock)
|
||||||
|
|
||||||
|
|
||||||
if self.defaults["shell_at_startup"]:
|
if self.defaults["shell_at_startup"]:
|
||||||
self.ui.shell_dock.show()
|
self.ui.shell_dock.show()
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -32,11 +32,13 @@ class FlatCAMTool(QtGui.QWidget):
|
|||||||
|
|
||||||
self.menuAction = None
|
self.menuAction = None
|
||||||
|
|
||||||
def install(self, icon=None):
|
def install(self, icon=None, separator=None):
|
||||||
if icon is None:
|
if icon is None:
|
||||||
self.menuAction = self.app.ui.menutool.addAction(self.toolName)
|
self.menuAction = self.app.ui.menutool.addAction(self.toolName)
|
||||||
else:
|
else:
|
||||||
self.menuAction = self.app.ui.menutool.addAction(icon, self.toolName)
|
self.menuAction = self.app.ui.menutool.addAction(icon, self.toolName)
|
||||||
|
if separator is True:
|
||||||
|
self.app.ui.menutool.addSeparator()
|
||||||
self.menuAction.triggered.connect(self.run)
|
self.menuAction.triggered.connect(self.run)
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ class Measurement(FlatCAMTool):
|
|||||||
self.click_subscription = None
|
self.click_subscription = None
|
||||||
self.move_subscription = None
|
self.move_subscription = None
|
||||||
|
|
||||||
def install(self, icon=None):
|
def install(self, icon=None, separator=None):
|
||||||
FlatCAMTool.install(self, icon)
|
FlatCAMTool.install(self, icon, separator)
|
||||||
self.app.ui.right_layout.addWidget(self)
|
self.app.ui.right_layout.addWidget(self)
|
||||||
self.app.plotcanvas.mpl_connect('key_press_event', self.on_key_press)
|
self.app.plotcanvas.mpl_connect('key_press_event', self.on_key_press)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user