Merged marius_stanciu/flatcam_beta/Beta into Beta
|
@ -20,6 +20,12 @@ CHANGELOG for FlatCAM beta
|
|||
- added a new Tcl command named OpenDXF (open_dxf alias)
|
||||
- fixed some errors in Scripting features
|
||||
- added a new Tcl command named GetPath as a convenient way to get the current default path stored in App.defaults['global_tcl_path']
|
||||
- added a new package to be installed in Linux to make available the black theme for FlatCAM beta
|
||||
- moved all the 'share' resources (icons) to the 'assets/resources' folder
|
||||
- some more fixes to problems generated by latest changes in the open handlers
|
||||
- modified the make_freezed.py script for the new location of the icons
|
||||
- added a fix for the ConnectionRefusedError in Linux that is issued when first running after a FlatCAM crash
|
||||
|
||||
|
||||
27.04.2020
|
||||
|
||||
|
|
|
@ -1096,9 +1096,9 @@ class App(QtCore.QObject):
|
|||
self.decimals = int(self.defaults['decimals_inch'])
|
||||
|
||||
if self.defaults["global_gray_icons"] is False:
|
||||
self.resource_location = 'share'
|
||||
self.resource_location = 'assets/resources'
|
||||
else:
|
||||
self.resource_location = 'share/dark_resources'
|
||||
self.resource_location = 'assets/resources/dark_resources'
|
||||
|
||||
self.current_units = self.defaults['units']
|
||||
|
||||
|
@ -3032,7 +3032,7 @@ class App(QtCore.QObject):
|
|||
if silent is False:
|
||||
self.inform.emit(_("Open Excellon file failed."))
|
||||
else:
|
||||
self.on_fileopenexcellon(name=file_name)
|
||||
self.on_fileopenexcellon(name=file_name, signal=None)
|
||||
return
|
||||
|
||||
gco_list = self.ui.util_defaults_form.fa_gcode_group.gco_list_text.get_value().split(',')
|
||||
|
@ -3045,7 +3045,7 @@ class App(QtCore.QObject):
|
|||
if silent is False:
|
||||
self.inform.emit(_("Open GCode file failed."))
|
||||
else:
|
||||
self.on_fileopengcode(name=file_name)
|
||||
self.on_fileopengcode(name=file_name, signal=None)
|
||||
return
|
||||
|
||||
grb_list = self.ui.util_defaults_form.fa_gerber_group.grb_list_text.get_value().split(',')
|
||||
|
@ -3058,7 +3058,7 @@ class App(QtCore.QObject):
|
|||
if silent is False:
|
||||
self.inform.emit(_("Open Gerber file failed."))
|
||||
else:
|
||||
self.on_fileopengerber(name=file_name)
|
||||
self.on_fileopengerber(name=file_name, signal=None)
|
||||
return
|
||||
|
||||
# if it reached here without already returning then the app was registered with a file that it does not
|
||||
|
@ -12929,16 +12929,26 @@ class ArgsThread(QtCore.QObject):
|
|||
conn = self.listener.accept()
|
||||
self.serve(conn)
|
||||
except socket.error:
|
||||
conn = Client(*address)
|
||||
conn.send(sys.argv)
|
||||
conn.send('close')
|
||||
# close the current instance only if there are args
|
||||
if len(sys.argv) > 1:
|
||||
try:
|
||||
self.listener.close()
|
||||
except Exception:
|
||||
try:
|
||||
conn = Client(*address)
|
||||
conn.send(sys.argv)
|
||||
conn.send('close')
|
||||
# close the current instance only if there are args
|
||||
if len(sys.argv) > 1:
|
||||
try:
|
||||
self.listener.close()
|
||||
except Exception:
|
||||
pass
|
||||
sys.exit()
|
||||
except ConnectionRefusedError:
|
||||
if sys.platform == 'win32':
|
||||
pass
|
||||
sys.exit()
|
||||
else:
|
||||
os.system('rm /tmp/testipc')
|
||||
self.listener = Listener(*address)
|
||||
while True:
|
||||
conn = self.listener.accept()
|
||||
self.serve(conn)
|
||||
|
||||
def serve(self, conn):
|
||||
while True:
|
||||
|
|
|
@ -88,9 +88,9 @@ def on_language_apply_click(app, restart=False):
|
|||
theme = 'white'
|
||||
|
||||
if theme == 'white':
|
||||
resource_loc = 'share'
|
||||
resource_loc = 'assets/resources'
|
||||
else:
|
||||
resource_loc = 'share'
|
||||
resource_loc = 'assets/resources'
|
||||
|
||||
# do nothing if trying to apply the language that is the current language (already applied).
|
||||
settings = QSettings("Open Source", "FlatCAM")
|
||||
|
@ -180,9 +180,9 @@ def restart_program(app, ask=None):
|
|||
theme = 'white'
|
||||
|
||||
if theme == 'white':
|
||||
resource_loc = 'share'
|
||||
resource_loc = 'assets/resources'
|
||||
else:
|
||||
resource_loc = 'share'
|
||||
resource_loc = 'assets/resources'
|
||||
|
||||
# close the Socket in ArgsThread class
|
||||
app.new_launch.listener.close()
|
||||
|
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 420 B |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 509 B After Width: | Height: | Size: 509 B |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 406 B |
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 400 B |
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 361 B |
Before Width: | Height: | Size: 521 B After Width: | Height: | Size: 521 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 457 B |
Before Width: | Height: | Size: 539 B After Width: | Height: | Size: 539 B |
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 331 B After Width: | Height: | Size: 331 B |
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 517 B |
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 838 B |
Before Width: | Height: | Size: 546 B After Width: | Height: | Size: 546 B |
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 676 B |
Before Width: | Height: | Size: 798 B After Width: | Height: | Size: 798 B |
Before Width: | Height: | Size: 593 B After Width: | Height: | Size: 593 B |
Before Width: | Height: | Size: 467 B After Width: | Height: | Size: 467 B |
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 339 B |
Before Width: | Height: | Size: 183 B After Width: | Height: | Size: 183 B |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 459 B After Width: | Height: | Size: 459 B |
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 491 B |
Before Width: | Height: | Size: 626 B After Width: | Height: | Size: 626 B |
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 371 B |
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 406 B |
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 574 B After Width: | Height: | Size: 574 B |
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 481 B |
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 524 B |
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 875 B After Width: | Height: | Size: 875 B |
Before Width: | Height: | Size: 546 B After Width: | Height: | Size: 546 B |
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 675 B |
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 347 B |
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B |
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 544 B |
Before Width: | Height: | Size: 716 B After Width: | Height: | Size: 716 B |
Before Width: | Height: | Size: 599 B After Width: | Height: | Size: 599 B |
Before Width: | Height: | Size: 677 B After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 485 B After Width: | Height: | Size: 485 B |
Before Width: | Height: | Size: 648 B After Width: | Height: | Size: 648 B |
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 786 B After Width: | Height: | Size: 786 B |
Before Width: | Height: | Size: 626 B After Width: | Height: | Size: 626 B |
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 383 B |
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 565 B |
Before Width: | Height: | Size: 569 B After Width: | Height: | Size: 569 B |
Before Width: | Height: | Size: 958 B After Width: | Height: | Size: 958 B |
Before Width: | Height: | Size: 569 B After Width: | Height: | Size: 569 B |
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 534 B |
Before Width: | Height: | Size: 669 B After Width: | Height: | Size: 669 B |
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 453 B |
Before Width: | Height: | Size: 590 B After Width: | Height: | Size: 590 B |
Before Width: | Height: | Size: 582 B After Width: | Height: | Size: 582 B |
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 838 B |
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 481 B |
Before Width: | Height: | Size: 570 B After Width: | Height: | Size: 570 B |
Before Width: | Height: | Size: 654 B After Width: | Height: | Size: 654 B |
Before Width: | Height: | Size: 1013 B After Width: | Height: | Size: 1013 B |
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 407 B |
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 540 B |
Before Width: | Height: | Size: 679 B After Width: | Height: | Size: 679 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 420 B |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 509 B After Width: | Height: | Size: 509 B |