Fix some things that I broke and further cleanup

This commit is contained in:
David Robertson
2020-04-29 02:46:52 +01:00
parent 72c2dd5f26
commit a05c174ec8
41 changed files with 314 additions and 308 deletions

View File

@@ -122,7 +122,7 @@ class BufferSelectionTool(FlatCAMTool):
self.buffer_distance_entry.set_value(0.01)
def run(self):
self.app.report_usage("Geo Editor ToolBuffer()")
self.app.defaults.report_usage("Geo Editor ToolBuffer()")
FlatCAMTool.run(self)
# if the splitter us hidden, display it
@@ -339,7 +339,7 @@ class TextInputTool(FlatCAMTool):
self.font_italic_tb.clicked.connect(self.on_italic_button)
def run(self):
self.app.report_usage("Geo Editor TextInputTool()")
self.app.defaults.report_usage("Geo Editor TextInputTool()")
FlatCAMTool.run(self)
# if the splitter us hidden, display it
@@ -537,7 +537,7 @@ class PaintOptionsTool(FlatCAMTool):
self.set_tool_ui()
def run(self):
self.app.report_usage("Geo Editor ToolPaint()")
self.app.defaults.report_usage("Geo Editor ToolPaint()")
FlatCAMTool.run(self)
# if the splitter us hidden, display it
@@ -980,7 +980,7 @@ class TransformEditorTool(FlatCAMTool):
self.set_tool_ui()
def run(self):
self.app.report_usage("Geo Editor Transform Tool()")
self.app.defaults.report_usage("Geo Editor Transform Tool()")
FlatCAMTool.run(self)
self.set_tool_ui()

View File

@@ -5516,7 +5516,7 @@ class TransformEditorTool(FlatCAMTool):
self.set_tool_ui()
def run(self, toggle=True):
self.app.report_usage("Geo Editor Transform Tool()")
self.app.defaults.report_usage("Geo Editor Transform Tool()")
# if the splitter is hidden, display it, else hide it but only if the current widget is the same
if self.app.ui.splitter.sizes()[0] == 0:

View File

@@ -152,14 +152,14 @@ class TextEditor(QtWidgets.QWidget):
self.code_edited = ''
def handlePrint(self):
self.app.report_usage("handlePrint()")
self.app.defaults.report_usage("handlePrint()")
dialog = QtPrintSupport.QPrintDialog()
if dialog.exec_() == QtWidgets.QDialog.Accepted:
self.code_editor.document().print_(dialog.printer())
def handlePreview(self):
self.app.report_usage("handlePreview()")
self.app.defaults.report_usage("handlePreview()")
dialog = QtPrintSupport.QPrintPreviewDialog()
dialog.paintRequested.connect(self.code_editor.print_)
@@ -172,7 +172,7 @@ class TextEditor(QtWidgets.QWidget):
pass
def handleOpen(self, filt=None):
self.app.report_usage("handleOpen()")
self.app.defaults.report_usage("handleOpen()")
if filt:
_filter_ = filt
@@ -192,7 +192,7 @@ class TextEditor(QtWidgets.QWidget):
file.close()
def handleSaveGCode(self, name=None, filt=None, callback=None):
self.app.report_usage("handleSaveGCode()")
self.app.defaults.report_usage("handleSaveGCode()")
if filt:
_filter_ = filt
@@ -287,7 +287,7 @@ class TextEditor(QtWidgets.QWidget):
callback()
def handleFindGCode(self):
self.app.report_usage("handleFindGCode()")
self.app.defaults.report_usage("handleFindGCode()")
flags = QtGui.QTextDocument.FindCaseSensitively
text_to_be_found = self.entryFind.get_value()
@@ -298,7 +298,7 @@ class TextEditor(QtWidgets.QWidget):
r = self.code_editor.find(str(text_to_be_found), flags)
def handleReplaceGCode(self):
self.app.report_usage("handleReplaceGCode()")
self.app.defaults.report_usage("handleReplaceGCode()")
old = self.entryFind.get_value()
new = self.entryReplace.get_value()