From 30eb600c02446c904e8fb7ed83025be68ba13149 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Tue, 29 May 2018 17:23:06 +0300 Subject: [PATCH] - added ability to add a menu-entry separator after the tool, on install --- FlatCAMApp.py | 3 ++- FlatCAMTool.py | 4 +++- MeasurementTool.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 2c0d8635..123dd082 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -573,7 +573,7 @@ class App(QtCore.QObject): ### Tools and Plugins ### ######################### 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.install(icon=QtGui.QIcon('share:measure16.png')) @@ -607,6 +607,7 @@ class App(QtCore.QObject): QtGui.QDockWidget.DockWidgetFloatable | QtGui.QDockWidget.DockWidgetClosable) self.ui.addDockWidget(QtCore.Qt.BottomDockWidgetArea, self.ui.shell_dock) + if self.defaults["shell_at_startup"]: self.ui.shell_dock.show() else: diff --git a/FlatCAMTool.py b/FlatCAMTool.py index 9de65625..45c6a0e8 100644 --- a/FlatCAMTool.py +++ b/FlatCAMTool.py @@ -32,11 +32,13 @@ class FlatCAMTool(QtGui.QWidget): self.menuAction = None - def install(self, icon=None): + def install(self, icon=None, separator=None): if icon is None: self.menuAction = self.app.ui.menutool.addAction(self.toolName) else: 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) def run(self): diff --git a/MeasurementTool.py b/MeasurementTool.py index 19e540ff..3f70c6e6 100644 --- a/MeasurementTool.py +++ b/MeasurementTool.py @@ -29,8 +29,8 @@ class Measurement(FlatCAMTool): self.click_subscription = None self.move_subscription = None - def install(self, icon=None): - FlatCAMTool.install(self, icon) + def install(self, icon=None, separator=None): + FlatCAMTool.install(self, icon, separator) self.app.ui.right_layout.addWidget(self) self.app.plotcanvas.mpl_connect('key_press_event', self.on_key_press)