- Snap Toolbar is now visible in Fullscreen
- in Fullscreen now the Notebook is available but it will be hidden on Fullscreen launch - fixed some minor issues (in the HUD added a separating line, missing an icon in toolbars on first launch)
This commit is contained in:
parent
d7677b5e08
commit
3c0ee97c61
|
@ -13,6 +13,9 @@ CHANGELOG for FlatCAM beta
|
||||||
- made the HUD work in Legacy2D mode
|
- made the HUD work in Legacy2D mode
|
||||||
- fixed situation when the mouse cursor is outside of the canvas and no therefore returning None values
|
- fixed situation when the mouse cursor is outside of the canvas and no therefore returning None values
|
||||||
- remade the Snap Toolbar presence; now it is always active and situated in the Status Bar
|
- remade the Snap Toolbar presence; now it is always active and situated in the Status Bar
|
||||||
|
- Snap Toolbar is now visible in Fullscreen
|
||||||
|
- in Fullscreen now the Notebook is available but it will be hidden on Fullscreen launch
|
||||||
|
- fixed some minor issues (in the HUD added a separating line, missing an icon in toolbars on first launch)
|
||||||
|
|
||||||
10.05.2020
|
10.05.2020
|
||||||
|
|
||||||
|
|
|
@ -4508,14 +4508,16 @@ class App(QtCore.QObject):
|
||||||
|
|
||||||
for tb in self.ui.findChildren(QtWidgets.QToolBar):
|
for tb in self.ui.findChildren(QtWidgets.QToolBar):
|
||||||
tb.setVisible(False)
|
tb.setVisible(False)
|
||||||
self.ui.splitter_left.setVisible(False)
|
self.ui.snap_toolbar.setVisible(True) # This is always visible
|
||||||
|
# self.ui.splitter_left.setVisible(False)
|
||||||
|
self.ui.splitter.setSizes([0, 1])
|
||||||
self.toggle_fscreen = True
|
self.toggle_fscreen = True
|
||||||
elif self.toggle_fscreen is True or disable is True:
|
elif self.toggle_fscreen is True or disable is True:
|
||||||
self.ui.setWindowFlags(flags & ~Qt.FramelessWindowHint)
|
self.ui.setWindowFlags(flags & ~Qt.FramelessWindowHint)
|
||||||
self.ui.setGeometry(self.x_pos, self.y_pos, self.width, self.height)
|
self.ui.setGeometry(self.x_pos, self.y_pos, self.width, self.height)
|
||||||
self.ui.showNormal()
|
self.ui.showNormal()
|
||||||
self.restore_toolbar_view()
|
self.restore_toolbar_view()
|
||||||
self.ui.splitter_left.setVisible(True)
|
# self.ui.splitter_left.setVisible(True)
|
||||||
self.toggle_fscreen = False
|
self.toggle_fscreen = False
|
||||||
|
|
||||||
def on_toggle_plotarea(self):
|
def on_toggle_plotarea(self):
|
||||||
|
|
|
@ -3813,7 +3813,7 @@ class FlatCAMExcEditor(QtCore.QObject):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
||||||
|
|
||||||
|
|
|
@ -4284,7 +4284,7 @@ class FlatCAMGeoEditor(QtCore.QObject):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
||||||
|
|
||||||
|
|
|
@ -4536,8 +4536,8 @@ class FlatCAMGrbEditor(QtCore.QObject):
|
||||||
self.pos = (self.pos[0], self.pos[1])
|
self.pos = (self.pos[0], self.pos[1])
|
||||||
|
|
||||||
if event.button == 1:
|
if event.button == 1:
|
||||||
self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f <b>Dy</b>: "
|
# self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f <b>Dy</b>: "
|
||||||
"%.4f " % (0, 0))
|
# "%.4f " % (0, 0))
|
||||||
|
|
||||||
# Selection with left mouse button
|
# Selection with left mouse button
|
||||||
if self.active_tool is not None:
|
if self.active_tool is not None:
|
||||||
|
@ -4549,8 +4549,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
|
||||||
self.app.defaults["global_point_clipboard_format"] %
|
self.app.defaults["global_point_clipboard_format"] %
|
||||||
(self.decimals, self.pos[0], self.decimals, self.pos[1])
|
(self.decimals, self.pos[0], self.decimals, self.pos[1])
|
||||||
)
|
)
|
||||||
self.app.inform.emit('[success] %s' %
|
self.app.inform.emit('[success] %s' % _("Coordinates copied to clipboard."))
|
||||||
_("Coordinates copied to clipboard."))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
# Dispatch event to active_tool
|
# Dispatch event to active_tool
|
||||||
|
@ -4787,7 +4786,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
self.app.dx, units, self.app.dy, units, x, units, y, units)
|
||||||
|
|
||||||
|
|
|
@ -2555,6 +2555,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
||||||
QtGui.QIcon(self.app.resource_location + '/distance_min32.png'), _("Distance Min Tool"))
|
QtGui.QIcon(self.app.resource_location + '/distance_min32.png'), _("Distance Min Tool"))
|
||||||
self.origin_btn = self.toolbargeo.addAction(
|
self.origin_btn = self.toolbargeo.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/origin32.png'), _('Set Origin'))
|
QtGui.QIcon(self.app.resource_location + '/origin32.png'), _('Set Origin'))
|
||||||
|
self.move2origin_btn = self.toolbargeo.addAction(
|
||||||
|
QtGui.QIcon(self.app.resource_location + '/origin2_32.png'), _('Move to Origin'))
|
||||||
self.jmp_btn = self.toolbargeo.addAction(
|
self.jmp_btn = self.toolbargeo.addAction(
|
||||||
QtGui.QIcon(self.app.resource_location + '/jump_to16.png'), _('Jump to Location'))
|
QtGui.QIcon(self.app.resource_location + '/jump_to16.png'), _('Jump to Location'))
|
||||||
self.locate_btn = self.toolbargeo.addAction(
|
self.locate_btn = self.toolbargeo.addAction(
|
||||||
|
|
|
@ -748,6 +748,9 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI):
|
||||||
self.app.ui.exc_edit_toolbar.setVisible(False)
|
self.app.ui.exc_edit_toolbar.setVisible(False)
|
||||||
self.app.ui.lock_toolbar(lock=True)
|
self.app.ui.lock_toolbar(lock=True)
|
||||||
|
|
||||||
|
self.app.ui.corner_snap_btn.setVisible(False)
|
||||||
|
self.app.ui.snap_magnet.setVisible(False)
|
||||||
|
|
||||||
# add all the actions to the toolbars
|
# add all the actions to the toolbars
|
||||||
self.app.ui.populate_toolbars()
|
self.app.ui.populate_toolbars()
|
||||||
|
|
||||||
|
|
|
@ -923,7 +923,7 @@ class ToolCopperThieving(FlatCAMTool):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
||||||
|
|
||||||
|
|
|
@ -551,7 +551,7 @@ class Distance(FlatCAMTool):
|
||||||
# )
|
# )
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
0.0000, units, 0.0000, units, pos[0], units, pos[1], units)
|
0.0000, units, 0.0000, units, pos[0], units, pos[1], units)
|
||||||
|
|
||||||
|
|
|
@ -1838,7 +1838,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
||||||
|
|
||||||
|
|
|
@ -1737,7 +1737,7 @@ class ToolPaint(FlatCAMTool, Gerber):
|
||||||
# "%.4f " % (self.app.dx, self.app.dy))
|
# "%.4f " % (self.app.dx, self.app.dy))
|
||||||
|
|
||||||
units = self.app.defaults["units"].lower()
|
units = self.app.defaults["units"].lower()
|
||||||
self.plotcanvas.text_hud.text = \
|
self.app.plotcanvas.text_hud.text = \
|
||||||
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
'Dx:\t{:<.4f} [{:s}]\nDy:\t{:<.4f} [{:s}]\n\nX: \t{:<.4f} [{:s}]\nY: \t{:<.4f} [{:s}]'.format(
|
||||||
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
self.app.dx, units, self.app.dy, units, curr_pos[0], units, curr_pos[1], units)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue