Merge branch 'merge-tcl-commands' of https://bitbucket.org/sopak/flatcam into tcl-commands

Conflicts:
	FlatCAMApp.py
	FlatCAMWorker.py
	termwidget.py
This commit is contained in:
Kamil Sopko
2016-03-31 18:03:48 +02:00
5 changed files with 5 additions and 6 deletions

View File

@@ -1079,6 +1079,7 @@ class App(QtCore.QObject):
toggle shell if is visible close it if closed open it
:return:
"""
if self.ui.shell_dock.isVisible():
self.ui.shell_dock.hide()
else:
@@ -1091,6 +1092,7 @@ class App(QtCore.QObject):
:return: None
"""
objs = self.collection.get_selected()
def initialize(obj, app):
@@ -1802,6 +1804,7 @@ class App(QtCore.QObject):
:param outname:
:return:
"""
self.log.debug("export_svg()")
try: