diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 3821dd84..dd8f0e61 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -545,23 +545,24 @@ class App(QtCore.QObject): "gerber_def_units": 'IN', "gerber_def_zeros": 'L', - "gerber_save_filters": "Gerber File (*.gbr);;Gerber File (*.bot);;Gerber File (*.bsm);;" - "Gerber File (*.cmp);;Gerber File (*.crc);;Gerber File (*.crs);;" - "Gerber File (*.gb0);;Gerber File (*.gb1);;Gerber File (*.gb2);;" - "Gerber File (*.gb3);;Gerber File (*.gb4);;Gerber File (*.gb5);;" - "Gerber File (*.gb6);;Gerber File (*.gb7);;Gerber File (*.gb8);;" - "Gerber File (*.gb9);;Gerber File (*.gbd);;Gerber File (*.gbl);;" - "Gerber File (*.gbo);;Gerber File (*.gbp);;Gerber File (*.gbs);;" - "Gerber File (*.gdo);;Gerber File (*.ger);;Gerber File (*.gko);;" - "Gerber File (*.gm1);;Gerber File (*.gm2);;Gerber File (*.gm3);;" - "Gerber File (*.grb);;Gerber File (*.gtl);;Gerber File (*.gto);;" - "Gerber File (*.gtp);;Gerber File (*.gts);;Gerber File (*.ly15);;" - "Gerber File (*.ly2);;Gerber File (*.mil);;Gerber File (*.pho);;" - "Gerber File (*.plc);;Gerber File (*.pls);;Gerber File (*.smb);;" - "Gerber File (*.smt);;Gerber File (*.sol);;Gerber File (*.spb);;" - "Gerber File (*.spt);;Gerber File (*.ssb);;Gerber File (*.sst);;" - "Gerber File (*.stc);;Gerber File (*.sts);;Gerber File (*.top);;" - "Gerber File (*.tsm);;Gerber File (*.art)" + "gerber_save_filters": "Gerber File .gbr (*.gbr);;Gerber File .bot (*.bot);;Gerber File .bsm (*.bsm);;" + "Gerber File .cmp (*.cmp);;Gerber File .crc (*.crc);;Gerber File .crs (*.crs);;" + "Gerber File .gb0 (*.gb0);;Gerber File .gb1 (*.gb1);;Gerber File .gb2 (*.gb2);;" + "Gerber File .gb3 (*.gb3);;Gerber File .gb4 (*.gb4);;Gerber File .gb5 (*.gb5);;" + "Gerber File .gb6 (*.gb6);;Gerber File .gb7 (*.gb7);;Gerber File .gb8 (*.gb8);;" + "Gerber File .gb9 (*.gb9);;Gerber File .gbd (*.gbd);;Gerber File .gbl (*.gbl);;" + "Gerber File .gbo (*.gbo);;Gerber File .gbp (*.gbp);;Gerber File .gbs (*.gbs);;" + "Gerber File .gdo (*.gdo);;Gerber File .ger (*.ger);;Gerber File .gko (*.gko);;" + "Gerber File .gm1 (*.gm1);;Gerber File .gm2 (*.gm2);;Gerber File .gm3 (*.gm3);;" + "Gerber File .grb (*.grb);;Gerber File .gtl (*.gtl);;Gerber File .gto (*.gto);;" + "Gerber File .gtp (*.gtp);;Gerber File .gts (*.gts);;Gerber File .ly15 (*.ly15);;" + "Gerber File .ly2 (*.ly2);;Gerber File .mil (*.mil);;" + "Gerber File .outline (*.outline);;Gerber File .pho (*.pho);;" + "Gerber File .plc (*.plc);;Gerber File .pls (*.pls);;Gerber File .smb (*.smb);;" + "Gerber File .smt (*.smt);;Gerber File .sol (*.sol);;Gerber File .spb (*.spb);;" + "Gerber File .spt (*.spt);;Gerber File .ssb (*.ssb);;Gerber File .sst (*.sst);;" + "Gerber File .stc (*.stc);;Gerber File .sts (*.sts);;Gerber File .top (*.top);;" + "Gerber File .tsm (*.tsm);;Gerber File .art (*.art)" "All Files (*.*)", # Gerber Options @@ -627,9 +628,11 @@ class App(QtCore.QObject): "excellon_optimization_type": 'B', "excellon_search_time": 3, - "excellon_save_filters": "Excellon File (*.txt);;Excellon File (*.drd);;Excellon File (*.drl);;" - "Excellon File (*.exc);;Excellon File (*.ncd);;Excellon File (*.tap);;" - "Excellon File (*.xln);;All Files (*.*)", + "excellon_save_filters": "Excellon File .txt (*.txt);;Excellon File .drd (*.drd);;" + "Excellon File .drill (*.drill);;" + "Excellon File .drl (*.drl);;Excellon File .exc (*.exc);;" + "Excellon File .ncd (*.ncd);;Excellon File .tap (*.tap);;" + "Excellon File .xln (*.xln);;All Files (*.*)", "excellon_plot_fill": '#C40000BF', "excellon_plot_line": '#750000BF', @@ -749,15 +752,15 @@ class App(QtCore.QObject): "cncjob_steps_per_circle": 64, "cncjob_footer": False, "cncjob_line_ending": False, - "cncjob_save_filters": "G-Code Files (*.nc);;G-Code Files (*.din);;G-Code Files (*.dnc);;" - "G-Code Files (*.ecs);;G-Code Files (*.eia);;G-Code Files (*.fan);;" - "G-Code Files (*.fgc);;G-Code Files (*.fnc);;G-Code Files (*.gc);;" - "G-Code Files (*.gcd);;G-Code Files (*.gcode);;G-Code Files (*.h);;" - "G-Code Files (*.hnc);;G-Code Files (*.i);;G-Code Files (*.min);;" - "G-Code Files (*.mpf);;G-Code Files (*.mpr);;G-Code Files (*.cnc);;" - "G-Code Files (*.ncc);;G-Code Files (*.ncg);;G-Code Files (*.ncp);;" - "G-Code Files (*.ngc);;G-Code Files (*.out);;G-Code Files (*.ply);;" - "G-Code Files (*.sbp);;G-Code Files (*.tap);;G-Code Files (*.xpi);;" + "cncjob_save_filters": "G-Code Files .nc (*.nc);;G-Code Files .din (*.din);;G-Code Files .dnc (*.dnc);;" + "G-Code Files .ecs (*.ecs);;G-Code Files .eia (*.eia);;G-Code Files .fan (*.fan);;" + "G-Code Files .fgc (*.fgc);;G-Code Files .fnc (*.fnc);;G-Code Files . gc (*.gc);;" + "G-Code Files .gcd (*.gcd);;G-Code Files .gcode (*.gcode);;G-Code Files .h (*.h);;" + "G-Code Files .hnc (*.hnc);;G-Code Files .i (*.i);;G-Code Files .min (*.min);;" + "G-Code Files .mpf (*.mpf);;G-Code Files .mpr (*.mpr);;G-Code Files .cnc (*.cnc);;" + "G-Code Files .ncc (*.ncc);;G-Code Files .ncg (*.ncg);;G-Code Files .ncp (*.ncp);;" + "G-Code Files .ngc (*.ngc);;G-Code Files .out (*.out);;G-Code Files .ply (*.ply);;" + "G-Code Files .sbp (*.sbp);;G-Code Files .tap (*.tap);;G-Code Files .xpi (*.xpi);;" "All Files (*.*)", "cncjob_plot_line": '#4650BDFF', "cncjob_plot_fill": '#5E6CFFFF', @@ -1022,12 +1025,12 @@ class App(QtCore.QObject): # Utilities # file associations - "fa_excellon": 'drd, drl, exc, ncd, tap, xln', + "fa_excellon": 'drd, drill, drl, exc, ncd, tap, xln', "fa_gcode": 'cnc, din, dnc, ecs, eia, fan, fgc, fnc, gc, gcd, gcode, h, hnc, i, min, mpf, mpr, nc, ncc, ' 'ncg, ncp, ngc, out, ply, rol, sbp, tap, xpi', "fa_gerber": 'art, bot, bsm, cmp, crc, crs, dim, gb0, gb1, gb2, gb3, gb4, gb5, gb6, gb7, gb8, gb9, gbd, ' 'gbl, gbo, gbp, gbr, gbs, gdo, ger, gko, gm1, gm2, gm3, grb, gtl, gto, gtp, gts, ly15, ly2, ' - 'mil, pho, plc, pls, smb, smt, sol, spb, spt, ssb, sst, stc, sts, top, tsm', + 'mil, outline, pho, plc, pls, smb, smt, sol, spb, spt, ssb, sst, stc, sts, top, tsm', # Keyword list "util_autocomplete_keywords": 'Desktop, Documents, FlatConfig, FlatPrj, False, ' 'Marius, My Documents, Paste_1, ' @@ -2726,10 +2729,11 @@ class App(QtCore.QObject): self.grb_list = ['art', 'bot', 'bsm', 'cmp', 'crc', 'crs', 'dim', 'g4', 'gb0', 'gb1', 'gb2', 'gb3', 'gb5', 'gb6', 'gb7', 'gb8', 'gb9', 'gbd', 'gbl', 'gbo', 'gbp', 'gbr', 'gbs', 'gdo', 'ger', 'gko', - 'gml', 'gm1', 'gm2', 'gm3', 'grb', 'gtl', 'gto', 'gtp', 'gts', 'ly15', 'ly2', 'mil', 'pho', - 'plc', 'pls', 'smb', 'smt', 'sol', 'spb', 'spt', 'ssb', 'sst', 'stc', 'sts', 'top', 'tsm'] + 'gml', 'gm1', 'gm2', 'gm3', 'grb', 'gtl', 'gto', 'gtp', 'gts', 'ly15', 'ly2', 'mil', 'outline', + 'pho', 'plc', 'pls', 'smb', 'smt', 'sol', 'spb', 'spt', 'ssb', 'sst', 'stc', 'sts', 'top', + 'tsm'] - self.exc_list = ['drd', 'drl', 'exc', 'ncd', 'tap', 'txt', 'xln'] + self.exc_list = ['drd', 'drl', 'drill', 'exc', 'ncd', 'tap', 'txt', 'xln'] self.gcode_list = ['cnc', 'din', 'dnc', 'ecs', 'eia', 'fan', 'fgc', 'fnc', 'gc', 'gcd', 'gcode', 'h', 'hnc', 'i', 'min', 'mpf', 'mpr', 'nc', 'ncc', 'ncg', 'ngc', 'ncp', 'out', 'ply', 'rol', @@ -10082,8 +10086,7 @@ class App(QtCore.QObject): # Check for more compatible types and add as required if not isinstance(obj, FlatCAMExcellon): - self.inform.emit('[ERROR_NOTCL] %s' % - _("Failed. Only Excellon objects can be saved as Excellon files...")) + self.inform.emit('[ERROR_NOTCL] %s' % _("Failed. Only Excellon objects can be saved as Excellon files...")) return name = self.collection.get_active().options["name"] @@ -10100,8 +10103,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit('[WARNING_NOTCL] %s' % - _("Export Excellon cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Export Excellon cancelled.")) return else: used_extension = filename.rpartition('.')[2] @@ -10147,8 +10149,7 @@ class App(QtCore.QObject): filename = str(filename) if filename == "": - self.inform.emit('[WARNING_NOTCL] %s' % - _("Export Gerber cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Export Gerber cancelled.")) return else: used_extension = filename.rpartition('.')[2] @@ -10170,8 +10171,7 @@ class App(QtCore.QObject): obj = self.collection.get_active() if obj is None: - self.inform.emit('[WARNING_NOTCL] %s' % - _("No object selected.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("No object selected.")) msg = _("Please Select a Geometry object to export") msgbox = QtWidgets.QMessageBox() msgbox.setInformativeText(msg) @@ -10182,8 +10182,7 @@ class App(QtCore.QObject): # Check for more compatible types and add as required if not isinstance(obj, FlatCAMGeometry): - msg = '[ERROR_NOTCL] %s' % \ - _("Only Geometry objects can be used.") + msg = '[ERROR_NOTCL] %s' % _("Only Geometry objects can be used.") msgbox = QtWidgets.QMessageBox() msgbox.setInformativeText(msg) bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) @@ -10194,21 +10193,19 @@ class App(QtCore.QObject): name = self.collection.get_active().options["name"] - _filter_ = "DXF File (*.DXF);;All Files (*.*)" + _filter_ = "DXF File .dxf (*.DXF);;All Files (*.*)" try: filename, _f = FCFileSaveDialog.get_saved_filename( caption=_("Export DXF"), directory=self.get_last_save_folder() + '/' + name, filter=_filter_) except TypeError: - filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export DXF"), - filter=_filter_) + filename, _f = FCFileSaveDialog.get_saved_filename(caption=_("Export DXF"), filter=_filter_) filename = str(filename) if filename == "": - self.inform.emit('[WARNING_NOTCL] %s' % - _("Export DXF cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Export DXF cancelled.")) return else: self.export_dxf(name, filename) @@ -10226,7 +10223,7 @@ class App(QtCore.QObject): self.report_usage("on_file_importsvg") App.log.debug("on_file_importsvg()") - _filter_ = "SVG File (*.svg);;All Files (*.*)" + _filter_ = "SVG File .svg (*.svg);;All Files (*.*)" try: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Import SVG"), directory=self.get_last_folder(), filter=_filter_) @@ -10240,8 +10237,7 @@ class App(QtCore.QObject): filenames = [str(filename) for filename in filenames] if len(filenames) == 0: - self.inform.emit('[WARNING_NOTCL] %s' % - _("Open SVG cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Open SVG cancelled.")) else: for filename in filenames: if filename != '': @@ -10258,7 +10254,7 @@ class App(QtCore.QObject): self.report_usage("on_file_importdxf") App.log.debug("on_file_importdxf()") - _filter_ = "DXF File (*.DXF);;All Files (*.*)" + _filter_ = "DXF File .dxf (*.DXF);;All Files (*.*)" try: filenames, _f = QtWidgets.QFileDialog.getOpenFileNames(caption=_("Import DXF"), directory=self.get_last_folder(), @@ -10273,8 +10269,7 @@ class App(QtCore.QObject): filenames = [str(filename) for filename in filenames] if len(filenames) == 0: - self.inform.emit('[WARNING_NOTCL] %s' % - _("Open DXF cancelled.")) + self.inform.emit('[WARNING_NOTCL] %s' % _("Open DXF cancelled.")) else: for filename in filenames: if filename != '': @@ -10332,11 +10327,11 @@ class App(QtCore.QObject): flt = "All Files (*.*)" if obj.kind == 'gerber': - flt = "Gerber Files (*.GBR);;PDF Files (*.PDF);;All Files (*.*)" + flt = "Gerber Files .gbr (*.GBR);;PDF Files .pdf (*.PDF);;All Files (*.*)" elif obj.kind == 'excellon': - flt = "Excellon Files (*.DRL);;PDF Files (*.PDF);;All Files (*.*)" + flt = "Excellon Files .drl (*.DRL);;PDF Files .pdf (*.PDF);;All Files (*.*)" elif obj.kind == 'cncjob': - flt = "GCode Files (*.NC);;PDF Files (*.PDF);;All Files (*.*)" + flt = "GCode Files .nc (*.NC);;PDF Files .pdf (*.PDF);;All Files (*.*)" self.source_editor_tab = TextEditor(app=self, plain_text=True) @@ -10497,7 +10492,8 @@ class App(QtCore.QObject): self.report_usage("on_fileopenscript") App.log.debug("on_fileopenscript()") - _filter_ = "TCL script (*.FlatScript);;TCL script (*.TCL);;TCL script (*.TXT);;All Files (*.*)" + _filter_ = "TCL script .FlatScript (*.FlatScript);;TCL script .tcl (*.TCL);;TCL script .txt (*.TXT);;" \ + "All Files (*.*)" if name: filenames = [name] @@ -10539,7 +10535,8 @@ class App(QtCore.QObject): alignment=Qt.AlignBottom | Qt.AlignLeft, color=QtGui.QColor("gray")) else: - _filter_ = "TCL script (*.FlatScript);;TCL script (*.TCL);;TCL script (*.TXT);;All Files (*.*)" + _filter_ = "TCL script .FlatScript (*.FlatScript);;TCL script .tcl (*.TCL);;TCL script .txt (*.TXT);;" \ + "All Files (*.*)" try: filename, _f = QtWidgets.QFileDialog.getOpenFileName(caption=_("Run TCL script"), directory=self.get_last_folder(), filter=_filter_) @@ -10616,7 +10613,7 @@ class App(QtCore.QObject): self.date = ''.join(c for c in self.date if c not in ':-') self.date = self.date.replace(' ', '_') - filter_ = "FlatCAM Project (*.FlatPrj);; All Files (*.*)" + filter_ = "FlatCAM Project .FlatPrj (*.FlatPrj);; All Files (*.*)" try: filename, _f = FCFileSaveDialog.get_saved_filename( caption=_("Save Project As ..."), @@ -10670,7 +10667,7 @@ class App(QtCore.QObject): self.inform.emit('[ERROR_NOTCL] %s' % _("No object selected.")) return - filter_ = "PDF File (*.PDF);; All Files (*.*)" + filter_ = "PDF File .pdf (*.PDF);; All Files (*.*)" try: filename, _f = FCFileSaveDialog.get_saved_filename( caption=_("Save Object as PDF ..."), @@ -11542,10 +11539,11 @@ class App(QtCore.QObject): Opens a G-gcode file, parses it and creates a new object for it in the program. Thread-safe. - :param outname: Name of the resulting object. None causes the name to be that of the file. - :param filename: G-code file filename - :type filename: str - :return: None + :param filename: G-code file filename + :param outname: Name of the resulting object. None causes the name to be that of the file. + :param force_parsing: + :param plot: + :return: None """ App.log.debug("open_gcode()") @@ -11605,11 +11603,9 @@ class App(QtCore.QObject): Opens a HPGL2 file, parses it and creates a new object for it in the program. Thread-safe. - :param outname: Name of the resulting object. None causes the - name to be that of the file. - :param filename: HPGL2 file filename - :type filename: str - :return: None + :param outname: Name of the resulting object. None causes the name to be that of the file. + :param filename: HPGL2 file filename + :return: None """ filename = filename @@ -11672,10 +11668,9 @@ class App(QtCore.QObject): Opens a Script file, parses it and creates a new object for it in the program. Thread-safe. - :param outname: Name of the resulting object. None causes the name to be that of the file. - :param filename: Script file filename - :type filename: str - :return: None + :param outname: Name of the resulting object. None causes the name to be that of the file. + :param filename: Script file filename + :return: None """ App.log.debug("open_script()") @@ -11709,9 +11704,9 @@ class App(QtCore.QObject): """ Loads a config file from the specified file. - :param filename: Name of the file from which to load. - :type filename: str - :return: None + :param filename: Name of the file from which to load. + :param run_from_arg: if True the FlatConfig file will be open as an command line argument + :return: None """ App.log.debug("Opening config file: " + filename) @@ -11760,12 +11755,11 @@ class App(QtCore.QObject): 5) Calls new_object() with the object's from_dict() as init method. 6) Calls plot_all() if plot=True - :param filename: Name of the file from which to load. - :type filename: str - :param run_from_arg: True if run for arguments - :param plot: If True plot all objects in the project - :param cli: run from command line - :return: None + :param filename: Name of the file from which to load. + :param run_from_arg: True if run for arguments + :param plot: If True plot all objects in the project + :param cli: Run from command line + :return: None """ App.log.debug("Opening project: " + filename) @@ -11870,7 +11864,8 @@ class App(QtCore.QObject): an alternative to project options but allows the use of values invisible to the user. - :return: None + :param silent: No messages + :return: None """ if silent is False: @@ -11914,7 +11909,7 @@ class App(QtCore.QObject): :param fit_view: if True will plot the objects and will adjust the zoom to fit all plotted objects into view :param use_thread: if True will use threading for plotting the objects - :return: + :return: None """ self.log.debug("Plot_all()") self.inform.emit('[success] %s...' % _("Redrawing all objects")) @@ -11933,12 +11928,31 @@ class App(QtCore.QObject): worker_task(obj) def register_folder(self, filename): + """ + Register the last folder used by the app to open something + + :param filename: the last folder is extracted from the filename + :return: None + """ self.defaults["global_last_folder"] = os.path.split(str(filename))[0] def register_save_folder(self, filename): + """ + Register the last folder used by the app to save something + + :param filename: the last folder is extracted from the filename + :return: None + """ self.defaults["global_last_save_folder"] = os.path.split(str(filename))[0] def set_progress_bar(self, percentage, text=""): + """ + Set a progress bar to a value (percentage) + + :param percentage: Value set to the progressbar + :param text: Not used + :return: None + """ self.ui.progress_bar.setValue(int(percentage)) def setup_shell(self): @@ -12143,7 +12157,11 @@ class App(QtCore.QObject): ''') def setup_recent_items(self): + """ + Setup a dictionary with the recent files accessed, organized by type + :return: + """ # TODO: Move this to constructor icons = { "gerber": self.resource_location + "/flatcam_icon16.png", @@ -12309,6 +12327,11 @@ class App(QtCore.QObject): self.log.debug("Recent items list has been populated.") def setup_component_editor(self): + """ + Default text for the Selected tab when is not taken by the Object UI. + + :return: + """ # label = QtWidgets.QLabel("Choose an item from Project") # label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter) @@ -12423,7 +12446,8 @@ class App(QtCore.QObject): def setup_obj_classes(self): """ - Sets up application specifics on the FlatCAMObj class. + Sets up application specifics on the FlatCAMObj class. This way the object.app attribute will point to the App + class. :return: None """ @@ -12504,10 +12528,10 @@ class App(QtCore.QObject): def on_plotcanvas_setup(self, container=None): """ - This is doing the setup for the plot area (canvas) + This is doing the setup for the plot area (canvas). - :param container: widget where to install the canvas - :return: None + :param container: QT Widget where to install the canvas + :return: None """ if container: plot_container = container @@ -12571,8 +12595,8 @@ class App(QtCore.QObject): toolbar button or the '1' key when the canvas is focused. Calls ``self.adjust_axes()`` with axes limits from the geometry bounds of all objects. - :param event: Ignored. - :return: None + :param event: Ignored. + :return: None """ if self.is_legacy is False: self.plotcanvas.fit_view() @@ -12723,8 +12747,9 @@ class App(QtCore.QObject): def toggle_plots(self, objects): """ Toggle plots visibility - :param objects: list of Objects for which to be toggled the visibility - :return: + + :param objects: list of Objects for which to be toggled the visibility + :return: None """ # if no objects selected then do nothing @@ -12741,6 +12766,11 @@ class App(QtCore.QObject): self.plots_updated.emit() def clear_plots(self): + """ + Clear the plots + + :return: None + """ objects = self.collection.get_list() diff --git a/FlatCAMObj.py b/FlatCAMObj.py index 0256853a..5176ea16 100644 --- a/FlatCAMObj.py +++ b/FlatCAMObj.py @@ -447,10 +447,10 @@ class FlatCAMObj(QtCore.QObject): Will modify the filter string that is used when saving a file (a list of file extensions) to have the last used file extension as the first one in the special string - :param last_ext: the file extension that was last used to save a file - :param filter_string: a key in self.app.defaults that holds a string with the filter from QFileDialog + :param last_ext: The file extension that was last used to save a file + :param filter_string: A key in self.app.defaults that holds a string with the filter from QFileDialog used when saving a file - :return: None + :return: None """ filters = copy(self.app.defaults[filter_string]) @@ -7007,6 +7007,12 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.app.worker_task.emit({'fcn': worker_task, 'params': []}) def on_exportgcode_button_click(self, *args): + """ + Handler activated by a button clicked when exporting GCode. + + :param args: + :return: + """ self.app.report_usage("cncjob_on_exportgcode_button") self.read_form() @@ -7014,9 +7020,9 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): save_gcode = False if 'Roland' in self.pp_excellon_name or 'Roland' in self.pp_geometry_name: - _filter_ = "RML1 Files (*.rol);;All Files (*.*)" + _filter_ = "RML1 Files .rol (*.rol);;All Files (*.*)" elif 'hpgl' in self.pp_geometry_name: - _filter_ = "HPGL Files (*.plt);;All Files (*.*)" + _filter_ = "HPGL Files .plt (*.plt);;All Files (*.*)" else: save_gcode = True _filter_ = self.app.defaults['cncjob_save_filters'] @@ -7055,10 +7061,16 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): if self.app.defaults["global_open_style"] is False: self.app.file_opened.emit("gcode", filename) self.app.file_saved.emit("gcode", filename) - self.app.inform.emit('[success] %s: %s' % - (_("Machine Code file saved to"), filename)) + self.app.inform.emit('[success] %s: %s' % (_("Machine Code file saved to"), filename)) def on_edit_code_click(self, *args): + """ + Handler activated by a button clicked when editing GCode. + + :param args: + :return: + """ + self.app.proc_container.view.set_busy(_("Loading...")) preamble = str(self.ui.prepend_text.get_value()) @@ -7116,9 +7128,9 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): """ Will create a header to be added to all GCode files generated by FlatCAM - :param comment_start_symbol: a symbol to be used as the first symbol in a comment - :param comment_stop_symbol: a symbol to be used as the last symbol in a comment - :return: a string with a GCode header + :param comment_start_symbol: A symbol to be used as the first symbol in a comment + :param comment_stop_symbol: A symbol to be used as the last symbol in a comment + :return: A string with a GCode header """ log.debug("FlatCAMCNCJob.gcode_header()") @@ -7219,6 +7231,7 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): def gcode_footer(self, end_command=None): """ + Will add the M02 to the end of GCode, if requested. :param end_command: 'M02' or 'M30' - String :return: @@ -7232,11 +7245,11 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): """ This will save the GCode from the Gcode object to a file on the OS filesystem - :param filename: filename for the GCode file - :param preamble: a custom Gcode block to be added at the beginning of the Gcode file - :param postamble: a custom Gcode block to be added at the end of the Gcode file - :param to_file: if False then no actual file is saved but the app will know that a file was created - :return: None + :param filename: filename for the GCode file + :param preamble: a custom Gcode block to be added at the beginning of the Gcode file + :param postamble: a custom Gcode block to be added at the end of the Gcode file + :param to_file: if False then no actual file is saved but the app will know that a file was created + :return: None """ # gcode = '' # roland = False @@ -7482,6 +7495,13 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): return lines def on_toolchange_custom_clicked(self, signal): + """ + Handler for clicking toolchange custom. + + :param signal: + :return: + """ + try: if 'toolchange_custom' not in str(self.options['ppname_e']).lower(): if self.ui.toolchange_cb.get_value(): @@ -7503,7 +7523,13 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.app.inform.emit('[ERROR] %s' % _("There is no preprocessor file.")) def get_gcode(self, preamble='', postamble=''): - # we need this to be able get_gcode separately for shell command export_gcode + """ + We need this to be able to get_gcode separately for shell command export_gcode + + :param preamble: Extra GCode added to the beginning of the GCode + :param postamble: Extra GCode added at the end of the GCode + :return: The modified GCode + """ return preamble + '\n' + self.gcode + "\n" + postamble def get_svg(self): @@ -7511,6 +7537,12 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): pass def on_plot_cb_click(self, *args): + """ + Handler for clicking on the Plot checkbox. + + :param args: + :return: + """ if self.muted_ui: return kind = self.ui.cncplot_method_combo.get_value() @@ -7528,6 +7560,12 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.ui_connect() def on_plot_cb_click_table(self): + """ + Handler for clicking the plot checkboxes added into a Table on each row. Purpose: toggle visibility for the + tool/aperture found on that row. + :return: + """ + # self.ui.cnc_tools_table.cellWidget(row, 2).widget().setCheckState(QtCore.Qt.Unchecked) self.ui_disconnect() # cw = self.sender() @@ -7566,9 +7604,14 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.ui_connect() def plot(self, visible=None, kind='all'): - + """ # Does all the required setup and returns False # if the 'ptint' option is set to False. + + :param visible: Boolean to decide if the object will be plotted as visible or disabled on canvas + :param kind: String. Can be "all" or "travel" or "cut". For CNCJob plotting + :return: None + """ if not FlatCAMObj.plot(self): return @@ -7612,6 +7655,11 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.annotation.clear(update=True) def on_annotation_change(self): + """ + Handler for toggling the annotation display by clicking a checkbox. + :return: + """ + if self.app.is_legacy is False: if self.ui.annotation_cb.get_value(): self.text_col.enabled = True @@ -7625,6 +7673,13 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob): self.plot(kind=kind) def convert_units(self, units): + """ + Units conversion used by the CNCJob objects. + + :param units: Can be "MM" or "IN" + :return: + """ + log.debug("FlatCAMObj.FlatCAMECNCjob.convert_units()") factor = CNCjob.convert_units(self, units) @@ -7723,6 +7778,11 @@ class FlatCAMScript(FlatCAMObj): self.script_editor_tab = TextEditor(app=self.app, plain_text=True) def set_ui(self, ui): + """ + Sets the Object UI in Selected Tab for the FlatCAM Script type of object. + :param ui: + :return: + """ FlatCAMObj.set_ui(self, ui) FlatCAMApp.App.log.debug("FlatCAMScript.set_ui()") diff --git a/README.md b/README.md index 54b7e758..84ca08fc 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,9 @@ CAD program, and create G-Code for Isolation routing. 14.04.2020 - lightened the hue of the color for 'success' messages printed in the Tcl Shell browser +- modified the extensions all over such the names include also the extension name. For Linux who does not display the extensions in the native FileDialog. +- added descriptions for some of the methods in the app. +- added lightened icons for the dark theme from Leandro Heck 13.04.2020 diff --git a/share/dark_resources/about32.png b/share/dark_resources/about32.png deleted file mode 100644 index 91c2caf1..00000000 Binary files a/share/dark_resources/about32.png and /dev/null differ diff --git a/share/dark_resources/active_static.png b/share/dark_resources/active_static.png index 6c98a7ec..d583dbf5 100644 Binary files a/share/dark_resources/active_static.png and b/share/dark_resources/active_static.png differ diff --git a/share/dark_resources/addarray16.png b/share/dark_resources/addarray16.png index 8b26c310..170c3aeb 100644 Binary files a/share/dark_resources/addarray16.png and b/share/dark_resources/addarray16.png differ diff --git a/share/dark_resources/addarray20.png b/share/dark_resources/addarray20.png index f5892d5c..ce121e34 100644 Binary files a/share/dark_resources/addarray20.png and b/share/dark_resources/addarray20.png differ diff --git a/share/dark_resources/addarray32.png b/share/dark_resources/addarray32.png index 7e855a71..b4682112 100644 Binary files a/share/dark_resources/addarray32.png and b/share/dark_resources/addarray32.png differ diff --git a/share/dark_resources/aero.png b/share/dark_resources/aero.png index 4b17865e..ad251cc0 100644 Binary files a/share/dark_resources/aero.png and b/share/dark_resources/aero.png differ diff --git a/share/dark_resources/aero_arc.png b/share/dark_resources/aero_arc.png index 729f6523..612858ac 100644 Binary files a/share/dark_resources/aero_arc.png and b/share/dark_resources/aero_arc.png differ diff --git a/share/dark_resources/aero_array.png b/share/dark_resources/aero_array.png index b8efdcb2..011f5c75 100644 Binary files a/share/dark_resources/aero_array.png and b/share/dark_resources/aero_array.png differ diff --git a/share/dark_resources/aero_buffer.png b/share/dark_resources/aero_buffer.png index 41f26dd7..95778e3a 100644 Binary files a/share/dark_resources/aero_buffer.png and b/share/dark_resources/aero_buffer.png differ diff --git a/share/dark_resources/aero_circle.png b/share/dark_resources/aero_circle.png index 63e0c9ba..73d4f76d 100644 Binary files a/share/dark_resources/aero_circle.png and b/share/dark_resources/aero_circle.png differ diff --git a/share/dark_resources/aero_circle_geo.png b/share/dark_resources/aero_circle_geo.png index e8fe8029..f85966ad 100644 Binary files a/share/dark_resources/aero_circle_geo.png and b/share/dark_resources/aero_circle_geo.png differ diff --git a/share/dark_resources/aero_disc.png b/share/dark_resources/aero_disc.png index 59f32773..0f75fe53 100644 Binary files a/share/dark_resources/aero_disc.png and b/share/dark_resources/aero_disc.png differ diff --git a/share/dark_resources/aero_drill.png b/share/dark_resources/aero_drill.png index 0f166d95..46760ea3 100644 Binary files a/share/dark_resources/aero_drill.png and b/share/dark_resources/aero_drill.png differ diff --git a/share/dark_resources/aero_drill_array.png b/share/dark_resources/aero_drill_array.png index 0cd39bc3..f8203bad 100644 Binary files a/share/dark_resources/aero_drill_array.png and b/share/dark_resources/aero_drill_array.png differ diff --git a/share/dark_resources/aero_path1.png b/share/dark_resources/aero_path1.png index e3b24dfd..b1ca4013 100644 Binary files a/share/dark_resources/aero_path1.png and b/share/dark_resources/aero_path1.png differ diff --git a/share/dark_resources/aero_path2.png b/share/dark_resources/aero_path2.png index 80a83881..cd95994c 100644 Binary files a/share/dark_resources/aero_path2.png and b/share/dark_resources/aero_path2.png differ diff --git a/share/dark_resources/aero_path3.png b/share/dark_resources/aero_path3.png index 4a7da0d5..d712ec73 100644 Binary files a/share/dark_resources/aero_path3.png and b/share/dark_resources/aero_path3.png differ diff --git a/share/dark_resources/aero_path4.png b/share/dark_resources/aero_path4.png index 5cca6e2e..155b0329 100644 Binary files a/share/dark_resources/aero_path4.png and b/share/dark_resources/aero_path4.png differ diff --git a/share/dark_resources/aero_path5.png b/share/dark_resources/aero_path5.png index 1185bbbb..3dd9f14b 100644 Binary files a/share/dark_resources/aero_path5.png and b/share/dark_resources/aero_path5.png differ diff --git a/share/dark_resources/aero_semidisc.png b/share/dark_resources/aero_semidisc.png index 498d6fee..a4a23e8a 100644 Binary files a/share/dark_resources/aero_semidisc.png and b/share/dark_resources/aero_semidisc.png differ diff --git a/share/dark_resources/aero_slot.png b/share/dark_resources/aero_slot.png index 19fc6f42..8773de07 100644 Binary files a/share/dark_resources/aero_slot.png and b/share/dark_resources/aero_slot.png differ diff --git a/share/dark_resources/aero_text.png b/share/dark_resources/aero_text.png index 62862d14..59fd5a1b 100644 Binary files a/share/dark_resources/aero_text.png and b/share/dark_resources/aero_text.png differ diff --git a/share/dark_resources/align_center32.png b/share/dark_resources/align_center32.png index 3abaae9c..6e7570f8 100644 Binary files a/share/dark_resources/align_center32.png and b/share/dark_resources/align_center32.png differ diff --git a/share/dark_resources/align_justify32.png b/share/dark_resources/align_justify32.png index a2e329a3..be35b0e5 100644 Binary files a/share/dark_resources/align_justify32.png and b/share/dark_resources/align_justify32.png differ diff --git a/share/dark_resources/align_left32.png b/share/dark_resources/align_left32.png index 14aafdf8..9cd3ca91 100644 Binary files a/share/dark_resources/align_left32.png and b/share/dark_resources/align_left32.png differ diff --git a/share/dark_resources/align_right32.png b/share/dark_resources/align_right32.png index 3044f6ac..480b1d59 100644 Binary files a/share/dark_resources/align_right32.png and b/share/dark_resources/align_right32.png differ diff --git a/share/dark_resources/aperture16.png b/share/dark_resources/aperture16.png index f836c9b0..9a510f15 100644 Binary files a/share/dark_resources/aperture16.png and b/share/dark_resources/aperture16.png differ diff --git a/share/dark_resources/aperture32.png b/share/dark_resources/aperture32.png index c155cf1a..3c9156ab 100644 Binary files a/share/dark_resources/aperture32.png and b/share/dark_resources/aperture32.png differ diff --git a/share/dark_resources/arc16.png b/share/dark_resources/arc16.png index 658b41f6..c5215403 100644 Binary files a/share/dark_resources/arc16.png and b/share/dark_resources/arc16.png differ diff --git a/share/dark_resources/arc24.png b/share/dark_resources/arc24.png index a6e15d91..202cbb06 100644 Binary files a/share/dark_resources/arc24.png and b/share/dark_resources/arc24.png differ diff --git a/share/dark_resources/arc32.png b/share/dark_resources/arc32.png index 391325ed..29f355a6 100644 Binary files a/share/dark_resources/arc32.png and b/share/dark_resources/arc32.png differ diff --git a/share/dark_resources/axis32.png b/share/dark_resources/axis32.png index 2d4259eb..03ec1806 100644 Binary files a/share/dark_resources/axis32.png and b/share/dark_resources/axis32.png differ diff --git a/share/dark_resources/backup24.png b/share/dark_resources/backup24.png index 6ed19d28..6f8b1553 100644 Binary files a/share/dark_resources/backup24.png and b/share/dark_resources/backup24.png differ diff --git a/share/dark_resources/backup_export24.png b/share/dark_resources/backup_export24.png index 5e12a21c..0dd0cbe3 100644 Binary files a/share/dark_resources/backup_export24.png and b/share/dark_resources/backup_export24.png differ diff --git a/share/dark_resources/backup_import24.png b/share/dark_resources/backup_import24.png index 9c510a76..f81e20b4 100644 Binary files a/share/dark_resources/backup_import24.png and b/share/dark_resources/backup_import24.png differ diff --git a/share/dark_resources/blocked16.png b/share/dark_resources/blocked16.png index 79e31c3f..270a727a 100644 Binary files a/share/dark_resources/blocked16.png and b/share/dark_resources/blocked16.png differ diff --git a/share/dark_resources/bold32.png b/share/dark_resources/bold32.png index 46a46d9a..774d0f93 100644 Binary files a/share/dark_resources/bold32.png and b/share/dark_resources/bold32.png differ diff --git a/share/dark_resources/bookmarks16.png b/share/dark_resources/bookmarks16.png index 63304362..71e82914 100644 Binary files a/share/dark_resources/bookmarks16.png and b/share/dark_resources/bookmarks16.png differ diff --git a/share/dark_resources/bookmarks32.png b/share/dark_resources/bookmarks32.png index 5bf9f698..1394db58 100644 Binary files a/share/dark_resources/bookmarks32.png and b/share/dark_resources/bookmarks32.png differ diff --git a/share/dark_resources/buffer16-2.png b/share/dark_resources/buffer16-2.png index 7ac3b940..c2e352c5 100644 Binary files a/share/dark_resources/buffer16-2.png and b/share/dark_resources/buffer16-2.png differ diff --git a/share/dark_resources/buffer16.png b/share/dark_resources/buffer16.png index 1e215e85..ae5b8021 100644 Binary files a/share/dark_resources/buffer16.png and b/share/dark_resources/buffer16.png differ diff --git a/share/dark_resources/buffer20.png b/share/dark_resources/buffer20.png index 27208f5c..0b1685c7 100644 Binary files a/share/dark_resources/buffer20.png and b/share/dark_resources/buffer20.png differ diff --git a/share/dark_resources/buffer24.png b/share/dark_resources/buffer24.png index 1f71ecb2..8b05a949 100644 Binary files a/share/dark_resources/buffer24.png and b/share/dark_resources/buffer24.png differ diff --git a/share/dark_resources/bug16.png b/share/dark_resources/bug16.png index 3fb1429a..5261297f 100644 Binary files a/share/dark_resources/bug16.png and b/share/dark_resources/bug16.png differ diff --git a/share/dark_resources/bug32.png b/share/dark_resources/bug32.png index 166aeca0..489166e7 100644 Binary files a/share/dark_resources/bug32.png and b/share/dark_resources/bug32.png differ diff --git a/share/dark_resources/calculator16.png b/share/dark_resources/calculator16.png index 2ed0b8ce..3bfb06dd 100644 Binary files a/share/dark_resources/calculator16.png and b/share/dark_resources/calculator16.png differ diff --git a/share/dark_resources/calculator24.png b/share/dark_resources/calculator24.png index b539177d..22ccd524 100644 Binary files a/share/dark_resources/calculator24.png and b/share/dark_resources/calculator24.png differ diff --git a/share/dark_resources/calibrate_16.png b/share/dark_resources/calibrate_16.png index a05ce1d3..b0d71ed3 100644 Binary files a/share/dark_resources/calibrate_16.png and b/share/dark_resources/calibrate_16.png differ diff --git a/share/dark_resources/calibrate_32.png b/share/dark_resources/calibrate_32.png index 182e8a99..d90df948 100644 Binary files a/share/dark_resources/calibrate_32.png and b/share/dark_resources/calibrate_32.png differ diff --git a/share/dark_resources/cancel_edit16.png b/share/dark_resources/cancel_edit16.png index 6e20773f..5185e04a 100644 Binary files a/share/dark_resources/cancel_edit16.png and b/share/dark_resources/cancel_edit16.png differ diff --git a/share/dark_resources/cancel_edit32.png b/share/dark_resources/cancel_edit32.png index 64a2a7eb..99cc1e08 100644 Binary files a/share/dark_resources/cancel_edit32.png and b/share/dark_resources/cancel_edit32.png differ diff --git a/share/dark_resources/circle32.png b/share/dark_resources/circle32.png index e0cb877d..e91e1b2e 100644 Binary files a/share/dark_resources/circle32.png and b/share/dark_resources/circle32.png differ diff --git a/share/dark_resources/clear_plot16.png b/share/dark_resources/clear_plot16.png index 9c5332e8..1264993e 100644 Binary files a/share/dark_resources/clear_plot16.png and b/share/dark_resources/clear_plot16.png differ diff --git a/share/dark_resources/clear_plot32.png b/share/dark_resources/clear_plot32.png index 10274a2f..9c2054ce 100644 Binary files a/share/dark_resources/clear_plot32.png and b/share/dark_resources/clear_plot32.png differ diff --git a/share/dark_resources/close_edit_file16.png b/share/dark_resources/close_edit_file16.png index 9ace7014..2195bcd0 100644 Binary files a/share/dark_resources/close_edit_file16.png and b/share/dark_resources/close_edit_file16.png differ diff --git a/share/dark_resources/close_edit_file32.png b/share/dark_resources/close_edit_file32.png index 1b3f4777..a137a662 100644 Binary files a/share/dark_resources/close_edit_file32.png and b/share/dark_resources/close_edit_file32.png differ diff --git a/share/dark_resources/cnc16.png b/share/dark_resources/cnc16.png index 3e4f1583..66704cbd 100644 Binary files a/share/dark_resources/cnc16.png and b/share/dark_resources/cnc16.png differ diff --git a/share/dark_resources/cnc32.png b/share/dark_resources/cnc32.png index c8028727..28b98fd7 100644 Binary files a/share/dark_resources/cnc32.png and b/share/dark_resources/cnc32.png differ diff --git a/share/dark_resources/code.png b/share/dark_resources/code.png index 0d75a631..5fae26d0 100644 Binary files a/share/dark_resources/code.png and b/share/dark_resources/code.png differ diff --git a/share/dark_resources/code_editor32.png b/share/dark_resources/code_editor32.png index 9a301ee5..6f03e946 100644 Binary files a/share/dark_resources/code_editor32.png and b/share/dark_resources/code_editor32.png differ diff --git a/share/dark_resources/convert24.png b/share/dark_resources/convert24.png index ccfb3255..ba5b3327 100644 Binary files a/share/dark_resources/convert24.png and b/share/dark_resources/convert24.png differ diff --git a/share/dark_resources/copperfill16.png b/share/dark_resources/copperfill16.png index 15fec13e..83cddef8 100644 Binary files a/share/dark_resources/copperfill16.png and b/share/dark_resources/copperfill16.png differ diff --git a/share/dark_resources/copperfill32.png b/share/dark_resources/copperfill32.png index 3df2a768..5f420827 100644 Binary files a/share/dark_resources/copperfill32.png and b/share/dark_resources/copperfill32.png differ diff --git a/share/dark_resources/copy.png b/share/dark_resources/copy.png index 70f8aff3..db1ccfac 100644 Binary files a/share/dark_resources/copy.png and b/share/dark_resources/copy.png differ diff --git a/share/dark_resources/copy16.png b/share/dark_resources/copy16.png index fec837b7..86743c9a 100644 Binary files a/share/dark_resources/copy16.png and b/share/dark_resources/copy16.png differ diff --git a/share/dark_resources/copy32.png b/share/dark_resources/copy32.png index ec949509..1c43766e 100644 Binary files a/share/dark_resources/copy32.png and b/share/dark_resources/copy32.png differ diff --git a/share/dark_resources/copy_16.png b/share/dark_resources/copy_16.png index fec837b7..a8824408 100644 Binary files a/share/dark_resources/copy_16.png and b/share/dark_resources/copy_16.png differ diff --git a/share/dark_resources/copy_file16.png b/share/dark_resources/copy_file16.png index e2440052..9fff7cce 100644 Binary files a/share/dark_resources/copy_file16.png and b/share/dark_resources/copy_file16.png differ diff --git a/share/dark_resources/copy_file32.png b/share/dark_resources/copy_file32.png index 480325ad..d1f08ddf 100644 Binary files a/share/dark_resources/copy_file32.png and b/share/dark_resources/copy_file32.png differ diff --git a/share/dark_resources/copy_geo.png b/share/dark_resources/copy_geo.png index 994999ee..c9dc599f 100644 Binary files a/share/dark_resources/copy_geo.png and b/share/dark_resources/copy_geo.png differ diff --git a/share/dark_resources/corner32.png b/share/dark_resources/corner32.png index a8998182..f2697135 100644 Binary files a/share/dark_resources/corner32.png and b/share/dark_resources/corner32.png differ diff --git a/share/dark_resources/cut16.png b/share/dark_resources/cut16.png index a33fe87f..7a4a4419 100644 Binary files a/share/dark_resources/cut16.png and b/share/dark_resources/cut16.png differ diff --git a/share/dark_resources/cut16_bis.png b/share/dark_resources/cut16_bis.png index 28066699..8e5e5e7b 100644 Binary files a/share/dark_resources/cut16_bis.png and b/share/dark_resources/cut16_bis.png differ diff --git a/share/dark_resources/cut32.png b/share/dark_resources/cut32.png index fa1ce92a..80556310 100644 Binary files a/share/dark_resources/cut32.png and b/share/dark_resources/cut32.png differ diff --git a/share/dark_resources/cut32_bis.png b/share/dark_resources/cut32_bis.png index b669d007..67d5ca97 100644 Binary files a/share/dark_resources/cut32_bis.png and b/share/dark_resources/cut32_bis.png differ diff --git a/share/dark_resources/cutpath16.png b/share/dark_resources/cutpath16.png index 9c92c0a2..34640f67 100644 Binary files a/share/dark_resources/cutpath16.png and b/share/dark_resources/cutpath16.png differ diff --git a/share/dark_resources/cutpath24.png b/share/dark_resources/cutpath24.png index 68d283de..a6df309e 100644 Binary files a/share/dark_resources/cutpath24.png and b/share/dark_resources/cutpath24.png differ diff --git a/share/dark_resources/cutpath32.png b/share/dark_resources/cutpath32.png index e0d7a6fb..41ec263c 100644 Binary files a/share/dark_resources/cutpath32.png and b/share/dark_resources/cutpath32.png differ diff --git a/share/dark_resources/database32.png b/share/dark_resources/database32.png index 131dc8ac..6f054e9f 100644 Binary files a/share/dark_resources/database32.png and b/share/dark_resources/database32.png differ diff --git a/share/dark_resources/defaults.png b/share/dark_resources/defaults.png index a4402b82..423ff50c 100644 Binary files a/share/dark_resources/defaults.png and b/share/dark_resources/defaults.png differ diff --git a/share/dark_resources/delete32.png b/share/dark_resources/delete32.png index 76ab5ce9..736330af 100644 Binary files a/share/dark_resources/delete32.png and b/share/dark_resources/delete32.png differ diff --git a/share/dark_resources/delete_file16.png b/share/dark_resources/delete_file16.png index b2391fbd..4f8605d9 100644 Binary files a/share/dark_resources/delete_file16.png and b/share/dark_resources/delete_file16.png differ diff --git a/share/dark_resources/delete_file32.png b/share/dark_resources/delete_file32.png index 9eeaa32d..d1c7cb17 100644 Binary files a/share/dark_resources/delete_file32.png and b/share/dark_resources/delete_file32.png differ diff --git a/share/dark_resources/deleteshape16.png b/share/dark_resources/deleteshape16.png index 03f99dd9..c11edf2b 100644 Binary files a/share/dark_resources/deleteshape16.png and b/share/dark_resources/deleteshape16.png differ diff --git a/share/dark_resources/deleteshape24.png b/share/dark_resources/deleteshape24.png index b0c1afcd..1d7bc7f3 100644 Binary files a/share/dark_resources/deleteshape24.png and b/share/dark_resources/deleteshape24.png differ diff --git a/share/dark_resources/deleteshape32.png b/share/dark_resources/deleteshape32.png index c06640a5..f81c5701 100644 Binary files a/share/dark_resources/deleteshape32.png and b/share/dark_resources/deleteshape32.png differ diff --git a/share/dark_resources/deselect_all32.png b/share/dark_resources/deselect_all32.png index 9071fac1..762e2fd0 100644 Binary files a/share/dark_resources/deselect_all32.png and b/share/dark_resources/deselect_all32.png differ diff --git a/share/dark_resources/disable16.png b/share/dark_resources/disable16.png index fe65737a..926583fe 100644 Binary files a/share/dark_resources/disable16.png and b/share/dark_resources/disable16.png differ diff --git a/share/dark_resources/disable32.png b/share/dark_resources/disable32.png index 762a9270..f004b13a 100644 Binary files a/share/dark_resources/disable32.png and b/share/dark_resources/disable32.png differ diff --git a/share/dark_resources/disc32.png b/share/dark_resources/disc32.png index bdbbaa8e..b3e122bf 100644 Binary files a/share/dark_resources/disc32.png and b/share/dark_resources/disc32.png differ diff --git a/share/dark_resources/distance16.png b/share/dark_resources/distance16.png index 8355b17b..ec805d90 100644 Binary files a/share/dark_resources/distance16.png and b/share/dark_resources/distance16.png differ diff --git a/share/dark_resources/distance32.png b/share/dark_resources/distance32.png index f61d0900..1aa556f4 100644 Binary files a/share/dark_resources/distance32.png and b/share/dark_resources/distance32.png differ diff --git a/share/dark_resources/distance_min16.png b/share/dark_resources/distance_min16.png index 8e1c8520..8e5953c0 100644 Binary files a/share/dark_resources/distance_min16.png and b/share/dark_resources/distance_min16.png differ diff --git a/share/dark_resources/distance_min32.png b/share/dark_resources/distance_min32.png index cfc8c020..a3ff60af 100644 Binary files a/share/dark_resources/distance_min32.png and b/share/dark_resources/distance_min32.png differ diff --git a/share/dark_resources/doubleside16.png b/share/dark_resources/doubleside16.png index 92e873fc..cea43331 100644 Binary files a/share/dark_resources/doubleside16.png and b/share/dark_resources/doubleside16.png differ diff --git a/share/dark_resources/doubleside32.png b/share/dark_resources/doubleside32.png index a159a4c5..fa79cdf8 100644 Binary files a/share/dark_resources/doubleside32.png and b/share/dark_resources/doubleside32.png differ diff --git a/share/dark_resources/draw32.png b/share/dark_resources/draw32.png index 58f7edb2..9a3f151f 100644 Binary files a/share/dark_resources/draw32.png and b/share/dark_resources/draw32.png differ diff --git a/share/dark_resources/drill16.png b/share/dark_resources/drill16.png index 496fa44e..1b6992e6 100644 Binary files a/share/dark_resources/drill16.png and b/share/dark_resources/drill16.png differ diff --git a/share/dark_resources/drill32.png b/share/dark_resources/drill32.png index 6b0696b3..5e451469 100644 Binary files a/share/dark_resources/drill32.png and b/share/dark_resources/drill32.png differ diff --git a/share/dark_resources/dxf16.png b/share/dark_resources/dxf16.png index 97f3c3f2..0c395dd2 100644 Binary files a/share/dark_resources/dxf16.png and b/share/dark_resources/dxf16.png differ diff --git a/share/dark_resources/edit16.png b/share/dark_resources/edit16.png index a8e5661b..6e7f5a63 100644 Binary files a/share/dark_resources/edit16.png and b/share/dark_resources/edit16.png differ diff --git a/share/dark_resources/edit32.png b/share/dark_resources/edit32.png index 18bdd611..dcd69fbf 100644 Binary files a/share/dark_resources/edit32.png and b/share/dark_resources/edit32.png differ diff --git a/share/dark_resources/edit_file16.png b/share/dark_resources/edit_file16.png index 6b58fa5e..05185539 100644 Binary files a/share/dark_resources/edit_file16.png and b/share/dark_resources/edit_file16.png differ diff --git a/share/dark_resources/edit_file32.png b/share/dark_resources/edit_file32.png index 8a78241b..98f49fde 100644 Binary files a/share/dark_resources/edit_file32.png and b/share/dark_resources/edit_file32.png differ diff --git a/share/dark_resources/edit_ok16.png b/share/dark_resources/edit_ok16.png index 5af14cf2..5b2cb6d9 100644 Binary files a/share/dark_resources/edit_ok16.png and b/share/dark_resources/edit_ok16.png differ diff --git a/share/dark_resources/edit_ok32.png b/share/dark_resources/edit_ok32.png index 710ccd5f..0a7dce36 100644 Binary files a/share/dark_resources/edit_ok32.png and b/share/dark_resources/edit_ok32.png differ diff --git a/share/dark_resources/edit_ok32_bis.png b/share/dark_resources/edit_ok32_bis.png index 5a554def..f89d5b3d 100644 Binary files a/share/dark_resources/edit_ok32_bis.png and b/share/dark_resources/edit_ok32_bis.png differ diff --git a/share/dark_resources/eraser26.png b/share/dark_resources/eraser26.png index 561a3605..c69973c1 100644 Binary files a/share/dark_resources/eraser26.png and b/share/dark_resources/eraser26.png differ diff --git a/share/dark_resources/explode32.png b/share/dark_resources/explode32.png index d1753113..38d35576 100644 Binary files a/share/dark_resources/explode32.png and b/share/dark_resources/explode32.png differ diff --git a/share/dark_resources/export.png b/share/dark_resources/export.png index c1034ac7..a1a51d1e 100644 Binary files a/share/dark_resources/export.png and b/share/dark_resources/export.png differ diff --git a/share/dark_resources/export_png32.png b/share/dark_resources/export_png32.png index 9bff090f..b27a1162 100644 Binary files a/share/dark_resources/export_png32.png and b/share/dark_resources/export_png32.png differ diff --git a/share/dark_resources/fiducials_32.png b/share/dark_resources/fiducials_32.png index 8df8779c..b7ffcae8 100644 Binary files a/share/dark_resources/fiducials_32.png and b/share/dark_resources/fiducials_32.png differ diff --git a/share/dark_resources/file16.png b/share/dark_resources/file16.png index 4f219db2..b56f78cf 100644 Binary files a/share/dark_resources/file16.png and b/share/dark_resources/file16.png differ diff --git a/share/dark_resources/file32.png b/share/dark_resources/file32.png index 2ea2f86b..2a034650 100644 Binary files a/share/dark_resources/file32.png and b/share/dark_resources/file32.png differ diff --git a/share/dark_resources/film16.png b/share/dark_resources/film16.png index d54ad486..97a4c0d3 100644 Binary files a/share/dark_resources/film16.png and b/share/dark_resources/film16.png differ diff --git a/share/dark_resources/film32.png b/share/dark_resources/film32.png deleted file mode 100644 index 8b5bf323..00000000 Binary files a/share/dark_resources/film32.png and /dev/null differ diff --git a/share/dark_resources/flatcam_icon128.png b/share/dark_resources/flatcam_icon128.png index 20e3d97a..893bbf37 100644 Binary files a/share/dark_resources/flatcam_icon128.png and b/share/dark_resources/flatcam_icon128.png differ diff --git a/share/dark_resources/flatcam_icon16.png b/share/dark_resources/flatcam_icon16.png index 0bcc34ab..21a7c2f0 100644 Binary files a/share/dark_resources/flatcam_icon16.png and b/share/dark_resources/flatcam_icon16.png differ diff --git a/share/dark_resources/flatcam_icon24.png b/share/dark_resources/flatcam_icon24.png index 8125531e..e2ac7396 100644 Binary files a/share/dark_resources/flatcam_icon24.png and b/share/dark_resources/flatcam_icon24.png differ diff --git a/share/dark_resources/flatcam_icon256.png b/share/dark_resources/flatcam_icon256.png index 77d3840f..2cd088e6 100644 Binary files a/share/dark_resources/flatcam_icon256.png and b/share/dark_resources/flatcam_icon256.png differ diff --git a/share/dark_resources/flatcam_icon32.png b/share/dark_resources/flatcam_icon32.png index 13e40335..7a3e9f4a 100644 Binary files a/share/dark_resources/flatcam_icon32.png and b/share/dark_resources/flatcam_icon32.png differ diff --git a/share/dark_resources/flatcam_icon32_green.png b/share/dark_resources/flatcam_icon32_green.png index e100c6aa..e52b756a 100644 Binary files a/share/dark_resources/flatcam_icon32_green.png and b/share/dark_resources/flatcam_icon32_green.png differ diff --git a/share/dark_resources/flatcam_icon48.png b/share/dark_resources/flatcam_icon48.png index 2f86c7b2..bcf5469f 100644 Binary files a/share/dark_resources/flatcam_icon48.png and b/share/dark_resources/flatcam_icon48.png differ diff --git a/share/dark_resources/flipx.png b/share/dark_resources/flipx.png index b86b99c2..8ef66467 100644 Binary files a/share/dark_resources/flipx.png and b/share/dark_resources/flipx.png differ diff --git a/share/dark_resources/flipy.png b/share/dark_resources/flipy.png index a4a0392b..4861f5d2 100644 Binary files a/share/dark_resources/flipy.png and b/share/dark_resources/flipy.png differ diff --git a/share/dark_resources/floppy16.png b/share/dark_resources/floppy16.png index c3beb9c7..5c82a2ae 100644 Binary files a/share/dark_resources/floppy16.png and b/share/dark_resources/floppy16.png differ diff --git a/share/dark_resources/floppy32.png b/share/dark_resources/floppy32.png index 0c1e4852..2b49aca6 100644 Binary files a/share/dark_resources/floppy32.png and b/share/dark_resources/floppy32.png differ diff --git a/share/dark_resources/folder16.png b/share/dark_resources/folder16.png index 3da9da26..31c0e742 100644 Binary files a/share/dark_resources/folder16.png and b/share/dark_resources/folder16.png differ diff --git a/share/dark_resources/folder32.png b/share/dark_resources/folder32.png index 10eb3f36..af0da2d8 100644 Binary files a/share/dark_resources/folder32.png and b/share/dark_resources/folder32.png differ diff --git a/share/dark_resources/folder32_Excellon.png b/share/dark_resources/folder32_Excellon.png index 3467b86d..85fac5b7 100644 Binary files a/share/dark_resources/folder32_Excellon.png and b/share/dark_resources/folder32_Excellon.png differ diff --git a/share/dark_resources/folder32_bis.png b/share/dark_resources/folder32_bis.png index ce7b5720..2ebb9f7b 100644 Binary files a/share/dark_resources/folder32_bis.png and b/share/dark_resources/folder32_bis.png differ diff --git a/share/dark_resources/folder32_gerber.png b/share/dark_resources/folder32_gerber.png index a3a0763b..4d63db6d 100644 Binary files a/share/dark_resources/folder32_gerber.png and b/share/dark_resources/folder32_gerber.png differ diff --git a/share/dark_resources/fscreen32.png b/share/dark_resources/fscreen32.png index a7738ada..3d90ab0a 100644 Binary files a/share/dark_resources/fscreen32.png and b/share/dark_resources/fscreen32.png differ diff --git a/share/dark_resources/gear32.png b/share/dark_resources/gear32.png index 0977265b..a40b09e9 100644 Binary files a/share/dark_resources/gear32.png and b/share/dark_resources/gear32.png differ diff --git a/share/dark_resources/gear48.png b/share/dark_resources/gear48.png index 9f6ab714..c6319fb1 100644 Binary files a/share/dark_resources/gear48.png and b/share/dark_resources/gear48.png differ diff --git a/share/dark_resources/geometry16.png b/share/dark_resources/geometry16.png index 5c275bfb..14bdbe82 100644 Binary files a/share/dark_resources/geometry16.png and b/share/dark_resources/geometry16.png differ diff --git a/share/dark_resources/globe16.png b/share/dark_resources/globe16.png index e403b62b..1fc36f66 100644 Binary files a/share/dark_resources/globe16.png and b/share/dark_resources/globe16.png differ diff --git a/share/dark_resources/goemetry32.png b/share/dark_resources/goemetry32.png index a1f4fc68..88bc6573 100644 Binary files a/share/dark_resources/goemetry32.png and b/share/dark_resources/goemetry32.png differ diff --git a/share/dark_resources/grid16.png b/share/dark_resources/grid16.png index 0b4be5f5..5543d7f2 100644 Binary files a/share/dark_resources/grid16.png and b/share/dark_resources/grid16.png differ diff --git a/share/dark_resources/grid32.png b/share/dark_resources/grid32.png index d7ac5083..5929e363 100644 Binary files a/share/dark_resources/grid32.png and b/share/dark_resources/grid32.png differ diff --git a/share/dark_resources/grid32_menu.png b/share/dark_resources/grid32_menu.png index ae0952f5..76e48844 100644 Binary files a/share/dark_resources/grid32_menu.png and b/share/dark_resources/grid32_menu.png differ diff --git a/share/dark_resources/help.png b/share/dark_resources/help.png index 0bf6b9be..58a70814 100644 Binary files a/share/dark_resources/help.png and b/share/dark_resources/help.png differ diff --git a/share/dark_resources/home16.png b/share/dark_resources/home16.png index ac795df4..63993fb8 100644 Binary files a/share/dark_resources/home16.png and b/share/dark_resources/home16.png differ diff --git a/share/dark_resources/image16.png b/share/dark_resources/image16.png index dd546bed..c5f979ee 100644 Binary files a/share/dark_resources/image16.png and b/share/dark_resources/image16.png differ diff --git a/share/dark_resources/image32.png b/share/dark_resources/image32.png index 3503791a..ab4bffc0 100644 Binary files a/share/dark_resources/image32.png and b/share/dark_resources/image32.png differ diff --git a/share/dark_resources/import.png b/share/dark_resources/import.png index f42002d7..1e3a26a7 100644 Binary files a/share/dark_resources/import.png and b/share/dark_resources/import.png differ diff --git a/share/dark_resources/info16.png b/share/dark_resources/info16.png index 11847e5b..d1bbfd88 100644 Binary files a/share/dark_resources/info16.png and b/share/dark_resources/info16.png differ diff --git a/share/dark_resources/intersection16.png b/share/dark_resources/intersection16.png index f05e252f..ab41f3c5 100644 Binary files a/share/dark_resources/intersection16.png and b/share/dark_resources/intersection16.png differ diff --git a/share/dark_resources/intersection24.png b/share/dark_resources/intersection24.png index d89dd33d..43675e85 100644 Binary files a/share/dark_resources/intersection24.png and b/share/dark_resources/intersection24.png differ diff --git a/share/dark_resources/intersection32.png b/share/dark_resources/intersection32.png index 4ac94675..de6f4c61 100644 Binary files a/share/dark_resources/intersection32.png and b/share/dark_resources/intersection32.png differ diff --git a/share/dark_resources/italic32.png b/share/dark_resources/italic32.png index 85a77e27..325924b4 100644 Binary files a/share/dark_resources/italic32.png and b/share/dark_resources/italic32.png differ diff --git a/share/dark_resources/join16.png b/share/dark_resources/join16.png index 720e86e4..191ea560 100644 Binary files a/share/dark_resources/join16.png and b/share/dark_resources/join16.png differ diff --git a/share/dark_resources/join32.png b/share/dark_resources/join32.png index 266b104a..bc1d0a3a 100644 Binary files a/share/dark_resources/join32.png and b/share/dark_resources/join32.png differ diff --git a/share/dark_resources/jump_to16.png b/share/dark_resources/jump_to16.png index e0417351..8df33fe1 100644 Binary files a/share/dark_resources/jump_to16.png and b/share/dark_resources/jump_to16.png differ diff --git a/share/dark_resources/jump_to32.png b/share/dark_resources/jump_to32.png index bbef66ad..14e30613 100644 Binary files a/share/dark_resources/jump_to32.png and b/share/dark_resources/jump_to32.png differ diff --git a/share/dark_resources/language32.png b/share/dark_resources/language32.png index 2a6af89c..9244e76d 100644 Binary files a/share/dark_resources/language32.png and b/share/dark_resources/language32.png differ diff --git a/share/dark_resources/letter_t_32.png b/share/dark_resources/letter_t_32.png index 0f673c48..d2802310 100644 Binary files a/share/dark_resources/letter_t_32.png and b/share/dark_resources/letter_t_32.png differ diff --git a/share/dark_resources/link16.png b/share/dark_resources/link16.png deleted file mode 100644 index 5c9c0046..00000000 Binary files a/share/dark_resources/link16.png and /dev/null differ diff --git a/share/dark_resources/machine16.png b/share/dark_resources/machine16.png index 40397a7c..1a044918 100644 Binary files a/share/dark_resources/machine16.png and b/share/dark_resources/machine16.png differ diff --git a/share/dark_resources/markarea32.png b/share/dark_resources/markarea32.png index 0a7dcade..ddde702a 100644 Binary files a/share/dark_resources/markarea32.png and b/share/dark_resources/markarea32.png differ diff --git a/share/dark_resources/move16.png b/share/dark_resources/move16.png index cbe0bbc7..5a6600e6 100644 Binary files a/share/dark_resources/move16.png and b/share/dark_resources/move16.png differ diff --git a/share/dark_resources/move32.png b/share/dark_resources/move32.png index 60f1063c..03755989 100644 Binary files a/share/dark_resources/move32.png and b/share/dark_resources/move32.png differ diff --git a/share/dark_resources/move32_bis.png b/share/dark_resources/move32_bis.png index f464fa53..66760b51 100644 Binary files a/share/dark_resources/move32_bis.png and b/share/dark_resources/move32_bis.png differ diff --git a/share/dark_resources/ncc16.png b/share/dark_resources/ncc16.png index d17e27b2..07ae5931 100644 Binary files a/share/dark_resources/ncc16.png and b/share/dark_resources/ncc16.png differ diff --git a/share/dark_resources/new_exc32.png b/share/dark_resources/new_exc32.png index 2410ecc3..e4e78890 100644 Binary files a/share/dark_resources/new_exc32.png and b/share/dark_resources/new_exc32.png differ diff --git a/share/dark_resources/new_file16.png b/share/dark_resources/new_file16.png index cc054b8e..b7447868 100644 Binary files a/share/dark_resources/new_file16.png and b/share/dark_resources/new_file16.png differ diff --git a/share/dark_resources/new_file32.png b/share/dark_resources/new_file32.png index 5e403c24..80421e92 100644 Binary files a/share/dark_resources/new_file32.png and b/share/dark_resources/new_file32.png differ diff --git a/share/dark_resources/new_file_exc16.png b/share/dark_resources/new_file_exc16.png index 4053f6dd..77d80ef2 100644 Binary files a/share/dark_resources/new_file_exc16.png and b/share/dark_resources/new_file_exc16.png differ diff --git a/share/dark_resources/new_file_exc32.png b/share/dark_resources/new_file_exc32.png index 4252d051..2c3949c0 100644 Binary files a/share/dark_resources/new_file_exc32.png and b/share/dark_resources/new_file_exc32.png differ diff --git a/share/dark_resources/new_file_geo16.png b/share/dark_resources/new_file_geo16.png index da9bcbed..0f9c4830 100644 Binary files a/share/dark_resources/new_file_geo16.png and b/share/dark_resources/new_file_geo16.png differ diff --git a/share/dark_resources/new_file_geo32.png b/share/dark_resources/new_file_geo32.png index 5d96f0c5..9e809d6e 100644 Binary files a/share/dark_resources/new_file_geo32.png and b/share/dark_resources/new_file_geo32.png differ diff --git a/share/dark_resources/new_file_grb16.png b/share/dark_resources/new_file_grb16.png index 49840289..4777955f 100644 Binary files a/share/dark_resources/new_file_grb16.png and b/share/dark_resources/new_file_grb16.png differ diff --git a/share/dark_resources/new_file_grb32.png b/share/dark_resources/new_file_grb32.png index a47b28a2..d2298aa6 100644 Binary files a/share/dark_resources/new_file_grb32.png and b/share/dark_resources/new_file_grb32.png differ diff --git a/share/dark_resources/new_geo16.png b/share/dark_resources/new_geo16.png index 286910c6..26e4dc1d 100644 Binary files a/share/dark_resources/new_geo16.png and b/share/dark_resources/new_geo16.png differ diff --git a/share/dark_resources/new_geo32.png b/share/dark_resources/new_geo32.png index 8030150c..c2adcf5c 100644 Binary files a/share/dark_resources/new_geo32.png and b/share/dark_resources/new_geo32.png differ diff --git a/share/dark_resources/new_geo32_bis.png b/share/dark_resources/new_geo32_bis.png index d21d8495..17e7b2ea 100644 Binary files a/share/dark_resources/new_geo32_bis.png and b/share/dark_resources/new_geo32_bis.png differ diff --git a/share/dark_resources/notebook16.png b/share/dark_resources/notebook16.png index 91dad310..85afa534 100644 Binary files a/share/dark_resources/notebook16.png and b/share/dark_resources/notebook16.png differ diff --git a/share/dark_resources/notebook32.png b/share/dark_resources/notebook32.png index 4f8ad4bb..7537b94b 100644 Binary files a/share/dark_resources/notebook32.png and b/share/dark_resources/notebook32.png differ diff --git a/share/dark_resources/notes16.png b/share/dark_resources/notes16.png index ac73e890..c3ebad9b 100644 Binary files a/share/dark_resources/notes16.png and b/share/dark_resources/notes16.png differ diff --git a/share/dark_resources/notes16_1.png b/share/dark_resources/notes16_1.png index bc9a6e02..0fde3995 100644 Binary files a/share/dark_resources/notes16_1.png and b/share/dark_resources/notes16_1.png differ diff --git a/share/dark_resources/offset32.png b/share/dark_resources/offset32.png index b32b117c..6f32dad2 100644 Binary files a/share/dark_resources/offset32.png and b/share/dark_resources/offset32.png differ diff --git a/share/dark_resources/offsetx32.png b/share/dark_resources/offsetx32.png index b32b117c..08e0a6f1 100644 Binary files a/share/dark_resources/offsetx32.png and b/share/dark_resources/offsetx32.png differ diff --git a/share/dark_resources/offsety32.png b/share/dark_resources/offsety32.png index 9174daad..954b3b36 100644 Binary files a/share/dark_resources/offsety32.png and b/share/dark_resources/offsety32.png differ diff --git a/share/dark_resources/open_excellon32.png b/share/dark_resources/open_excellon32.png index 4f71b3a7..518e5083 100644 Binary files a/share/dark_resources/open_excellon32.png and b/share/dark_resources/open_excellon32.png differ diff --git a/share/dark_resources/open_script32.png b/share/dark_resources/open_script32.png index f8b02677..478e77a5 100644 Binary files a/share/dark_resources/open_script32.png and b/share/dark_resources/open_script32.png differ diff --git a/share/dark_resources/origin.png b/share/dark_resources/origin.png index b8b4e317..46faa1fc 100644 Binary files a/share/dark_resources/origin.png and b/share/dark_resources/origin.png differ diff --git a/share/dark_resources/origin16.png b/share/dark_resources/origin16.png index 02dc6937..4a69f12c 100644 Binary files a/share/dark_resources/origin16.png and b/share/dark_resources/origin16.png differ diff --git a/share/dark_resources/origin32.png b/share/dark_resources/origin32.png index 423af08d..5cfd7cb5 100644 Binary files a/share/dark_resources/origin32.png and b/share/dark_resources/origin32.png differ diff --git a/share/dark_resources/padarray32.png b/share/dark_resources/padarray32.png index 6a2078bd..eb9ffcb9 100644 Binary files a/share/dark_resources/padarray32.png and b/share/dark_resources/padarray32.png differ diff --git a/share/dark_resources/paint16.png b/share/dark_resources/paint16.png index 038ca1f1..fef99a78 100644 Binary files a/share/dark_resources/paint16.png and b/share/dark_resources/paint16.png differ diff --git a/share/dark_resources/paint20.png b/share/dark_resources/paint20.png index 4f6ee1f9..093ce61e 100644 Binary files a/share/dark_resources/paint20.png and b/share/dark_resources/paint20.png differ diff --git a/share/dark_resources/paint20_1.png b/share/dark_resources/paint20_1.png index 25046740..1929e475 100644 Binary files a/share/dark_resources/paint20_1.png and b/share/dark_resources/paint20_1.png differ diff --git a/share/dark_resources/panel16.png b/share/dark_resources/panel16.png index 60878d09..a775f539 100644 Binary files a/share/dark_resources/panel16.png and b/share/dark_resources/panel16.png differ diff --git a/share/dark_resources/panel32.png b/share/dark_resources/panel32.png index 4f0aadff..330b9a22 100644 Binary files a/share/dark_resources/panel32.png and b/share/dark_resources/panel32.png differ diff --git a/share/dark_resources/panelize16.png b/share/dark_resources/panelize16.png index fdd3a40e..ce6afdee 100644 Binary files a/share/dark_resources/panelize16.png and b/share/dark_resources/panelize16.png differ diff --git a/share/dark_resources/panelize32.png b/share/dark_resources/panelize32.png index c9ce43a6..aa3479b2 100644 Binary files a/share/dark_resources/panelize32.png and b/share/dark_resources/panelize32.png differ diff --git a/share/dark_resources/path32.png b/share/dark_resources/path32.png index a83693df..edcbe2be 100644 Binary files a/share/dark_resources/path32.png and b/share/dark_resources/path32.png differ diff --git a/share/dark_resources/pdf32.png b/share/dark_resources/pdf32.png index 2f2b4f45..6faccc51 100644 Binary files a/share/dark_resources/pdf32.png and b/share/dark_resources/pdf32.png differ diff --git a/share/dark_resources/pdf_link16.png b/share/dark_resources/pdf_link16.png index acec32fc..9bf29c1f 100644 Binary files a/share/dark_resources/pdf_link16.png and b/share/dark_resources/pdf_link16.png differ diff --git a/share/dark_resources/plot32.png b/share/dark_resources/plot32.png index 4e61b5af..e4170a5d 100644 Binary files a/share/dark_resources/plot32.png and b/share/dark_resources/plot32.png differ diff --git a/share/dark_resources/plus16.png b/share/dark_resources/plus16.png index bc2b71e1..c6c42b21 100644 Binary files a/share/dark_resources/plus16.png and b/share/dark_resources/plus16.png differ diff --git a/share/dark_resources/plus32.png b/share/dark_resources/plus32.png index ff0f9472..4e6b88b2 100644 Binary files a/share/dark_resources/plus32.png and b/share/dark_resources/plus32.png differ diff --git a/share/dark_resources/pointer.png b/share/dark_resources/pointer.png index c1f410e4..8df14501 100644 Binary files a/share/dark_resources/pointer.png and b/share/dark_resources/pointer.png differ diff --git a/share/dark_resources/pointer32.png b/share/dark_resources/pointer32.png index 99e0ce51..61b134af 100644 Binary files a/share/dark_resources/pointer32.png and b/share/dark_resources/pointer32.png differ diff --git a/share/dark_resources/poligonize32.png b/share/dark_resources/poligonize32.png index 2f454536..4bfd1482 100644 Binary files a/share/dark_resources/poligonize32.png and b/share/dark_resources/poligonize32.png differ diff --git a/share/dark_resources/polygon32.png b/share/dark_resources/polygon32.png index afa05504..16656db5 100644 Binary files a/share/dark_resources/polygon32.png and b/share/dark_resources/polygon32.png differ diff --git a/share/dark_resources/power16.png b/share/dark_resources/power16.png index 04cc2c6b..5946e231 100644 Binary files a/share/dark_resources/power16.png and b/share/dark_resources/power16.png differ diff --git a/share/dark_resources/pref.png b/share/dark_resources/pref.png index 3bd655ed..fe15f4bf 100644 Binary files a/share/dark_resources/pref.png and b/share/dark_resources/pref.png differ diff --git a/share/dark_resources/printer16.png b/share/dark_resources/printer16.png index 1b98d2fb..e93dcc88 100644 Binary files a/share/dark_resources/printer16.png and b/share/dark_resources/printer16.png differ diff --git a/share/dark_resources/printer32.png b/share/dark_resources/printer32.png index 9d952ff3..b72a7695 100644 Binary files a/share/dark_resources/printer32.png and b/share/dark_resources/printer32.png differ diff --git a/share/dark_resources/project16.png b/share/dark_resources/project16.png index 5290735a..7e2003d4 100644 Binary files a/share/dark_resources/project16.png and b/share/dark_resources/project16.png differ diff --git a/share/dark_resources/project_save16.png b/share/dark_resources/project_save16.png index 1690afac..8dea1b1c 100644 Binary files a/share/dark_resources/project_save16.png and b/share/dark_resources/project_save16.png differ diff --git a/share/dark_resources/project_save32.png b/share/dark_resources/project_save32.png index f6369880..6ed7fb3f 100644 Binary files a/share/dark_resources/project_save32.png and b/share/dark_resources/project_save32.png differ diff --git a/share/dark_resources/properties32.png b/share/dark_resources/properties32.png index 362759aa..e5acda48 100644 Binary files a/share/dark_resources/properties32.png and b/share/dark_resources/properties32.png differ diff --git a/share/dark_resources/qrcode32.png b/share/dark_resources/qrcode32.png index 80c1c65c..acc56384 100644 Binary files a/share/dark_resources/qrcode32.png and b/share/dark_resources/qrcode32.png differ diff --git a/share/dark_resources/recent_files.png b/share/dark_resources/recent_files.png index 15ac385d..f63ecd34 100644 Binary files a/share/dark_resources/recent_files.png and b/share/dark_resources/recent_files.png differ diff --git a/share/dark_resources/rectangle32.png b/share/dark_resources/rectangle32.png index a95ba1ec..ac813b29 100644 Binary files a/share/dark_resources/rectangle32.png and b/share/dark_resources/rectangle32.png differ diff --git a/share/dark_resources/recycle16.png b/share/dark_resources/recycle16.png index cc32de8e..1d15d0ab 100644 Binary files a/share/dark_resources/recycle16.png and b/share/dark_resources/recycle16.png differ diff --git a/share/dark_resources/replot16.png b/share/dark_resources/replot16.png index c48abc04..9f2f4d7a 100644 Binary files a/share/dark_resources/replot16.png and b/share/dark_resources/replot16.png differ diff --git a/share/dark_resources/replot32.png b/share/dark_resources/replot32.png index 7d4f47dd..052f61fa 100644 Binary files a/share/dark_resources/replot32.png and b/share/dark_resources/replot32.png differ diff --git a/share/dark_resources/resize16.png b/share/dark_resources/resize16.png index 2694b84a..f9d71f11 100644 Binary files a/share/dark_resources/resize16.png and b/share/dark_resources/resize16.png differ diff --git a/share/dark_resources/rotate.png b/share/dark_resources/rotate.png index 21efb72a..755a0b20 100644 Binary files a/share/dark_resources/rotate.png and b/share/dark_resources/rotate.png differ diff --git a/share/dark_resources/rules32.png b/share/dark_resources/rules32.png index 6df220b7..a861406d 100644 Binary files a/share/dark_resources/rules32.png and b/share/dark_resources/rules32.png differ diff --git a/share/dark_resources/save_as.png b/share/dark_resources/save_as.png index 10a63091..2d3ae02b 100644 Binary files a/share/dark_resources/save_as.png and b/share/dark_resources/save_as.png differ diff --git a/share/dark_resources/scale32.png b/share/dark_resources/scale32.png index c959b49c..079fe539 100644 Binary files a/share/dark_resources/scale32.png and b/share/dark_resources/scale32.png differ diff --git a/share/dark_resources/script14.png b/share/dark_resources/script14.png index b35fc125..d5385f98 100644 Binary files a/share/dark_resources/script14.png and b/share/dark_resources/script14.png differ diff --git a/share/dark_resources/script16.png b/share/dark_resources/script16.png index e4e5c545..2f03cdd9 100644 Binary files a/share/dark_resources/script16.png and b/share/dark_resources/script16.png differ diff --git a/share/dark_resources/script_new16.png b/share/dark_resources/script_new16.png index 3b583fba..d6e1a45c 100644 Binary files a/share/dark_resources/script_new16.png and b/share/dark_resources/script_new16.png differ diff --git a/share/dark_resources/script_new24.png b/share/dark_resources/script_new24.png index f8e14ad8..a4e37c0a 100644 Binary files a/share/dark_resources/script_new24.png and b/share/dark_resources/script_new24.png differ diff --git a/share/dark_resources/script_open16.png b/share/dark_resources/script_open16.png index 190cd041..a41dbce0 100644 Binary files a/share/dark_resources/script_open16.png and b/share/dark_resources/script_open16.png differ diff --git a/share/dark_resources/script_open18.png b/share/dark_resources/script_open18.png index 6df220b7..d7406d21 100644 Binary files a/share/dark_resources/script_open18.png and b/share/dark_resources/script_open18.png differ diff --git a/share/dark_resources/script_open24.png b/share/dark_resources/script_open24.png index 28c5b15e..e7f97b6a 100644 Binary files a/share/dark_resources/script_open24.png and b/share/dark_resources/script_open24.png differ diff --git a/share/dark_resources/select_all.png b/share/dark_resources/select_all.png index efa8eb31..a1631040 100644 Binary files a/share/dark_resources/select_all.png and b/share/dark_resources/select_all.png differ diff --git a/share/dark_resources/semidisc32.png b/share/dark_resources/semidisc32.png index 8bce9b13..562585b9 100644 Binary files a/share/dark_resources/semidisc32.png and b/share/dark_resources/semidisc32.png differ diff --git a/share/dark_resources/shell16.png b/share/dark_resources/shell16.png index 37201d70..7a472207 100644 Binary files a/share/dark_resources/shell16.png and b/share/dark_resources/shell16.png differ diff --git a/share/dark_resources/shell32.png b/share/dark_resources/shell32.png index c930c890..670dfb3e 100644 Binary files a/share/dark_resources/shell32.png and b/share/dark_resources/shell32.png differ diff --git a/share/dark_resources/shortcuts24.png b/share/dark_resources/shortcuts24.png index 56b5217f..15eafe48 100644 Binary files a/share/dark_resources/shortcuts24.png and b/share/dark_resources/shortcuts24.png differ diff --git a/share/dark_resources/skewX.png b/share/dark_resources/skewX.png index 7d9571f0..43002b43 100644 Binary files a/share/dark_resources/skewX.png and b/share/dark_resources/skewX.png differ diff --git a/share/dark_resources/skewY.png b/share/dark_resources/skewY.png index 7f02f9be..2e3261d8 100644 Binary files a/share/dark_resources/skewY.png and b/share/dark_resources/skewY.png differ diff --git a/share/dark_resources/slot26.png b/share/dark_resources/slot26.png index 58168047..1c83ef0a 100644 Binary files a/share/dark_resources/slot26.png and b/share/dark_resources/slot26.png differ diff --git a/share/dark_resources/slot_array26.png b/share/dark_resources/slot_array26.png index 6bef0951..a8871684 100644 Binary files a/share/dark_resources/slot_array26.png and b/share/dark_resources/slot_array26.png differ diff --git a/share/dark_resources/snap_16.png b/share/dark_resources/snap_16.png index 25bf01dd..c8666a1a 100644 Binary files a/share/dark_resources/snap_16.png and b/share/dark_resources/snap_16.png differ diff --git a/share/dark_resources/snap_filled_16.png b/share/dark_resources/snap_filled_16.png index 0db6956a..229c91fe 100644 Binary files a/share/dark_resources/snap_filled_16.png and b/share/dark_resources/snap_filled_16.png differ diff --git a/share/dark_resources/solderpaste32.png b/share/dark_resources/solderpaste32.png index c93c0711..65831a55 100644 Binary files a/share/dark_resources/solderpaste32.png and b/share/dark_resources/solderpaste32.png differ diff --git a/share/dark_resources/solderpastebis32.png b/share/dark_resources/solderpastebis32.png index 8e1ea130..41ba7c51 100644 Binary files a/share/dark_resources/solderpastebis32.png and b/share/dark_resources/solderpastebis32.png differ diff --git a/share/dark_resources/source32.png b/share/dark_resources/source32.png index b04fab9b..7c01c7bb 100644 Binary files a/share/dark_resources/source32.png and b/share/dark_resources/source32.png differ diff --git a/share/dark_resources/sub32.png b/share/dark_resources/sub32.png index 73540a29..5e008d1e 100644 Binary files a/share/dark_resources/sub32.png and b/share/dark_resources/sub32.png differ diff --git a/share/dark_resources/subtract16.png b/share/dark_resources/subtract16.png index 8fd86055..8f7a9a04 100644 Binary files a/share/dark_resources/subtract16.png and b/share/dark_resources/subtract16.png differ diff --git a/share/dark_resources/subtract24.png b/share/dark_resources/subtract24.png index 09ab3aa4..3ea2b4c4 100644 Binary files a/share/dark_resources/subtract24.png and b/share/dark_resources/subtract24.png differ diff --git a/share/dark_resources/subtract32.png b/share/dark_resources/subtract32.png index b460e0d2..8bb30d49 100644 Binary files a/share/dark_resources/subtract32.png and b/share/dark_resources/subtract32.png differ diff --git a/share/dark_resources/svg16.png b/share/dark_resources/svg16.png index 05962ac8..68feb35e 100644 Binary files a/share/dark_resources/svg16.png and b/share/dark_resources/svg16.png differ diff --git a/share/dark_resources/svg32.png b/share/dark_resources/svg32.png index 3e9e6d21..f43d6038 100644 Binary files a/share/dark_resources/svg32.png and b/share/dark_resources/svg32.png differ diff --git a/share/dark_resources/text32.png b/share/dark_resources/text32.png index 7cc4998f..8f47ebd1 100644 Binary files a/share/dark_resources/text32.png and b/share/dark_resources/text32.png differ diff --git a/share/dark_resources/toggle_units16.png b/share/dark_resources/toggle_units16.png index 2da61f42..892b5808 100644 Binary files a/share/dark_resources/toggle_units16.png and b/share/dark_resources/toggle_units16.png differ diff --git a/share/dark_resources/toggle_units32.png b/share/dark_resources/toggle_units32.png index dddacdf5..83dfe57c 100644 Binary files a/share/dark_resources/toggle_units32.png and b/share/dark_resources/toggle_units32.png differ diff --git a/share/dark_resources/track32.png b/share/dark_resources/track32.png index d9ae2ebe..0a6c25d8 100644 Binary files a/share/dark_resources/track32.png and b/share/dark_resources/track32.png differ diff --git a/share/dark_resources/transform.png b/share/dark_resources/transform.png index b8950bf1..d3846d0c 100644 Binary files a/share/dark_resources/transform.png and b/share/dark_resources/transform.png differ diff --git a/share/dark_resources/trash16.png b/share/dark_resources/trash16.png index 137f8392..eb76cf26 100644 Binary files a/share/dark_resources/trash16.png and b/share/dark_resources/trash16.png differ diff --git a/share/dark_resources/trash32.png b/share/dark_resources/trash32.png index b9a4f14b..8ba6f690 100644 Binary files a/share/dark_resources/trash32.png and b/share/dark_resources/trash32.png differ diff --git a/share/dark_resources/tv16.png b/share/dark_resources/tv16.png index d21417f7..501ad7d7 100644 Binary files a/share/dark_resources/tv16.png and b/share/dark_resources/tv16.png differ diff --git a/share/dark_resources/underline32.png b/share/dark_resources/underline32.png index f3ec119a..4c0c17ad 100644 Binary files a/share/dark_resources/underline32.png and b/share/dark_resources/underline32.png differ diff --git a/share/dark_resources/union16.png b/share/dark_resources/union16.png index d1766607..f74231d0 100644 Binary files a/share/dark_resources/union16.png and b/share/dark_resources/union16.png differ diff --git a/share/dark_resources/union32.png b/share/dark_resources/union32.png index 07d4bd69..6a12eb38 100644 Binary files a/share/dark_resources/union32.png and b/share/dark_resources/union32.png differ diff --git a/share/dark_resources/videohelp24.png b/share/dark_resources/videohelp24.png index 6676a417..92e4d1ef 100644 Binary files a/share/dark_resources/videohelp24.png and b/share/dark_resources/videohelp24.png differ diff --git a/share/dark_resources/view64.png b/share/dark_resources/view64.png index 63d2cbca..de3a6c37 100644 Binary files a/share/dark_resources/view64.png and b/share/dark_resources/view64.png differ diff --git a/share/dark_resources/workspace24.png b/share/dark_resources/workspace24.png index 4ca990e7..1a76d29e 100644 Binary files a/share/dark_resources/workspace24.png and b/share/dark_resources/workspace24.png differ diff --git a/share/dark_resources/zoom_fit32.png b/share/dark_resources/zoom_fit32.png index 6145c1b2..9858387f 100644 Binary files a/share/dark_resources/zoom_fit32.png and b/share/dark_resources/zoom_fit32.png differ diff --git a/share/dark_resources/zoom_in32.png b/share/dark_resources/zoom_in32.png index 6d5cc2e2..e71a15fa 100644 Binary files a/share/dark_resources/zoom_in32.png and b/share/dark_resources/zoom_in32.png differ diff --git a/share/dark_resources/zoom_out32.png b/share/dark_resources/zoom_out32.png index 38c13e2b..3f3ce4ca 100644 Binary files a/share/dark_resources/zoom_out32.png and b/share/dark_resources/zoom_out32.png differ