- added new translation: Spanish. Finished 10%

This commit is contained in:
Marius Stanciu 2019-06-27 01:03:31 +03:00
parent 39535daac4
commit 649d0c6342
4 changed files with 10093 additions and 61 deletions

View File

@ -94,8 +94,8 @@ class App(QtCore.QObject):
log.addHandler(handler) log.addHandler(handler)
# Version # Version
version = 8.919 version = 8.920
version_date = "2019/06/23" version_date = "2019/06/28"
beta = True beta = True
# current date now # current date now
@ -273,7 +273,7 @@ class App(QtCore.QObject):
self.mouse = [0, 0] self.mouse = [0, 0]
# ################### # ###################
# # Initialize GUI # ## # # Initialize GUI ##
# ################### # ###################
# FlatCAM colors used in plotting # FlatCAM colors used in plotting
@ -285,9 +285,6 @@ class App(QtCore.QObject):
QtCore.QObject.__init__(self) QtCore.QObject.__init__(self)
self.ui = FlatCAMGUI(self.version, self.beta, self) self.ui = FlatCAMGUI(self.version, self.beta, self)
# self.connect(self.ui,
# QtCore.SIGNAL("geomUpdate(int, int, int, int, int)"),
# self.save_geometry) PyQt4
self.ui.geom_update[int, int, int, int, int].connect(self.save_geometry) self.ui.geom_update[int, int, int, int, int].connect(self.save_geometry)
self.ui.final_save.connect(self.final_save) self.ui.final_save.connect(self.final_save)
@ -909,7 +906,7 @@ class App(QtCore.QObject):
}) })
# ############################## # ##############################
# # ## Load defaults from file # ## # ## Load defaults from file ###
# ############################## # ##############################
if user_defaults: if user_defaults:
@ -1201,7 +1198,7 @@ class App(QtCore.QObject):
# ### Define OBJECT COLLECTION ### # ### Define OBJECT COLLECTION ###
self.collection = ObjectCollection(self) self.collection = ObjectCollection(self)
self.ui.project_tab_layout.addWidget(self.collection.view) self.ui.project_tab_layout.addWidget(self.collection.view)
# ### # ################################
self.log.debug("Finished creating Object Collection.") self.log.debug("Finished creating Object Collection.")
@ -1323,7 +1320,7 @@ class App(QtCore.QObject):
self.worker_task.connect(self.workers.add_task) self.worker_task.connect(self.workers.add_task)
# ### Signal handling ### # ### Signal handling ###
# # ## Custom signals # ### Custom signals ###
self.inform.connect(self.info) self.inform.connect(self.info)
self.app_quit.connect(self.quit_application) self.app_quit.connect(self.quit_application)
self.message.connect(self.message_dialog) self.message.connect(self.message_dialog)
@ -1485,7 +1482,7 @@ class App(QtCore.QObject):
self.ui.pref_open_button.clicked.connect(self.on_preferences_open_folder) self.ui.pref_open_button.clicked.connect(self.on_preferences_open_folder)
# ############################## # ##############################
# # ## GUI PREFERENCES SIGNALS # ## # ### GUI PREFERENCES SIGNALS ##
# ############################## # ##############################
self.ui.general_options_form.general_app_group.units_radio.group_toggle_fn = self.on_toggle_units self.ui.general_options_form.general_app_group.units_radio.group_toggle_fn = self.on_toggle_units
self.ui.general_defaults_form.general_app_group.language_apply_btn.clicked.connect( self.ui.general_defaults_form.general_app_group.language_apply_btn.clicked.connect(
@ -1495,7 +1492,7 @@ class App(QtCore.QObject):
lambda: self.on_toggle_units(no_pref=False)) lambda: self.on_toggle_units(no_pref=False))
# ############################## # ##############################
# # ## GUI PREFERENCES SIGNALS # ## # ### GUI PREFERENCES SIGNALS ##
# ############################## # ##############################
# Setting plot colors signals # Setting plot colors signals
@ -1603,20 +1600,20 @@ class App(QtCore.QObject):
self.ui.splitter.setSizes([0, 1]) self.ui.splitter.setSizes([0, 1])
# ################### # ###################
# # ## Other setups # ## # ### Other setups ##
# ################### # ###################
# Sets up FlatCAMObj, FCProcess and FCProcessContainer. # Sets up FlatCAMObj, FCProcess and FCProcessContainer.
self.setup_obj_classes() self.setup_obj_classes()
self.setup_recent_items() self.setup_recent_items()
self.setup_component_editor() self.setup_component_editor()
# ############ # ############
# # ## Shell # ## # ### Shell ##
# ############ # ############
# # ## # #########################
# Auto-complete KEYWORDS # Auto-complete KEYWORDS ##
# #########################
self.tcl_commands_list = ['add_circle', 'add_poly', 'add_polygon', 'add_polyline', 'add_rectangle', self.tcl_commands_list = ['add_circle', 'add_poly', 'add_polygon', 'add_polyline', 'add_rectangle',
'aligndrill', 'clear', 'aligndrill', 'clear',
'aligndrillgrid', 'cncjob', 'cutout', 'delete', 'drillcncjob', 'aligndrillgrid', 'cncjob', 'cutout', 'delete', 'drillcncjob',
@ -1853,7 +1850,7 @@ class App(QtCore.QObject):
self.ui.shell_dock.hide() self.ui.shell_dock.hide()
# ######################## # ########################
# # ## Tools and Plugins # ## # ### Tools and Plugins ##
# ######################## # ########################
self.dblsidedtool = None self.dblsidedtool = None
@ -1979,8 +1976,10 @@ class App(QtCore.QObject):
self.isHovering = False self.isHovering = False
self.notHovering = True self.notHovering = True
# #########################################################
# ### Save defaults to factory_defaults.FlatConfig file ### # ### Save defaults to factory_defaults.FlatConfig file ###
# # ## It's done only once after install ########### ## # ### It's done only once after install ###################
# #########################################################
factory_file = open(self.data_path + '/factory_defaults.FlatConfig') factory_file = open(self.data_path + '/factory_defaults.FlatConfig')
fac_def_from_file = factory_file.read() fac_def_from_file = factory_file.read()
factory_defaults = json.loads(fac_def_from_file) factory_defaults = json.loads(fac_def_from_file)
@ -1994,6 +1993,7 @@ class App(QtCore.QObject):
# Set the combobox in Preferences to the current layout # Set the combobox in Preferences to the current layout
idx = self.ui.general_defaults_form.general_gui_set_group.layout_combo.findText(initial_lay) idx = self.ui.general_defaults_form.general_gui_set_group.layout_combo.findText(initial_lay)
self.ui.general_defaults_form.general_gui_set_group.layout_combo.setCurrentIndex(idx) self.ui.general_defaults_form.general_gui_set_group.layout_combo.setCurrentIndex(idx)
factory_file.close() factory_file.close()
# and then make the factory_defaults.FlatConfig file read_only os it can't be modified after creation. # and then make the factory_defaults.FlatConfig file read_only os it can't be modified after creation.

View File

@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
27.06.2019
- added new translation: Spanish. Finished 10%
23.06.2019 23.06.2019
- fixes issues with units conversion when the tool diameters are a list of comma separated values (NCC Tool, SolderPaste Tool and Geometry Object) - fixes issues with units conversion when the tool diameters are a list of comma separated values (NCC Tool, SolderPaste Tool and Geometry Object)

Binary file not shown.

File diff suppressed because it is too large Load Diff