- updated translations
- fixed the the labels for shortcut keys for zoom in and zoom out both in the Menu links and in the Shortcut list - made sure the zoom functions use the global_zoom_ratio parameter from App.self.defaults dictionary.
This commit is contained in:
parent
bc3fb076b4
commit
3bd2957739
|
@ -681,7 +681,7 @@ class App(QtCore.QObject):
|
|||
"zoom_out_key": '-',
|
||||
"zoom_in_key": '=',
|
||||
"grid_toggle_key": 'G',
|
||||
"zoom_ratio": 1.5,
|
||||
"global_zoom_ratio": 1.5,
|
||||
"global_point_clipboard_format": "(%.4f, %.4f)",
|
||||
"global_zdownrate": None,
|
||||
|
||||
|
@ -1416,9 +1416,15 @@ class App(QtCore.QObject):
|
|||
self.ui.menuviewdisableall.triggered.connect(self.disable_all_plots)
|
||||
self.ui.menuviewdisableother.triggered.connect(self.disable_other_plots)
|
||||
self.ui.menuviewenable.triggered.connect(self.enable_all_plots)
|
||||
|
||||
self.ui.menuview_zoom_fit.triggered.connect(self.on_zoom_fit)
|
||||
self.ui.menuview_zoom_in.triggered.connect(lambda: self.plotcanvas.zoom(1 / 1.5))
|
||||
self.ui.menuview_zoom_out.triggered.connect(lambda: self.plotcanvas.zoom(1.5))
|
||||
self.ui.menuview_zoom_in.triggered.connect(
|
||||
lambda: self.plotcanvas.zoom(1 / float(self.defaults['global_zoom_ratio']))
|
||||
)
|
||||
self.ui.menuview_zoom_out.triggered.connect(
|
||||
lambda: self.plotcanvas.zoom(float(self.defaults['global_zoom_ratio']))
|
||||
)
|
||||
|
||||
self.ui.menuview_toggle_code_editor.triggered.connect(self.on_toggle_code_editor)
|
||||
self.ui.menuview_toggle_fscreen.triggered.connect(self.on_fullscreen)
|
||||
self.ui.menuview_toggle_parea.triggered.connect(self.on_toggle_plotarea)
|
||||
|
|
|
@ -9,12 +9,17 @@ CAD program, and create G-Code for Isolation routing.
|
|||
|
||||
=================================================
|
||||
|
||||
9.06.2019
|
||||
|
||||
- updated translations
|
||||
- fixed the the labels for shortcut keys for zoom in and zoom out both in the Menu links and in the Shortcut list
|
||||
- made sure the zoom functions use the global_zoom_ratio parameter from App.self.defaults dictionary.
|
||||
|
||||
8.06.2019
|
||||
|
||||
- make sure that the annotation shapes are deleted on creation of a new project
|
||||
- added folder for the Russian translation
|
||||
- made sure that visibility for TextGroup is set only if index is not None in VisPyVisuals.TextGroup.visible() setter
|
||||
- RELEASE 8.918
|
||||
|
||||
7.06.2019
|
||||
|
||||
|
|
|
@ -355,8 +355,8 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
# Separator
|
||||
self.menuview.addSeparator()
|
||||
self.menuview_zoom_fit = self.menuview.addAction(QtGui.QIcon('share/zoom_fit32.png'), _("&Zoom Fit\tV"))
|
||||
self.menuview_zoom_in = self.menuview.addAction(QtGui.QIcon('share/zoom_in32.png'), _("&Zoom In\t-"))
|
||||
self.menuview_zoom_out = self.menuview.addAction(QtGui.QIcon('share/zoom_out32.png'), _("&Zoom Out\t="))
|
||||
self.menuview_zoom_in = self.menuview.addAction(QtGui.QIcon('share/zoom_in32.png'), _("&Zoom In\t="))
|
||||
self.menuview_zoom_out = self.menuview.addAction(QtGui.QIcon('share/zoom_out32.png'), _("&Zoom Out\t-"))
|
||||
self.menuview.addSeparator()
|
||||
|
||||
self.menuview_toggle_code_editor = self.menuview.addAction(QtGui.QIcon('share/code_editor32.png'),
|
||||
|
@ -1069,11 +1069,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
<td> Flip on Y_axis</td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
<td height="20"><strong>'='</strong></td>
|
||||
<td height="20"><strong>'-'</strong></td>
|
||||
<td> Zoom Out</td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
<td height="20"><strong>'-'</strong></td>
|
||||
<td height="20"><strong>'='</strong></td>
|
||||
<td> Zoom In</td>
|
||||
</tr>
|
||||
<tr height="20">
|
||||
|
@ -2289,7 +2289,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
self.app.on_set_origin()
|
||||
return
|
||||
|
||||
# Set Origin
|
||||
# Properties Tool
|
||||
if key == QtCore.Qt.Key_P:
|
||||
self.app.properties_tool.run()
|
||||
return
|
||||
|
@ -2329,11 +2329,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
|
||||
# Zoom In
|
||||
if key == QtCore.Qt.Key_Equal:
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse)
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'], self.app.mouse)
|
||||
|
||||
# Zoom Out
|
||||
if key == QtCore.Qt.Key_Minus:
|
||||
self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse)
|
||||
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'], self.app.mouse)
|
||||
|
||||
# toggle display of Notebook area
|
||||
if key == QtCore.Qt.Key_QuoteLeft:
|
||||
|
@ -2455,11 +2455,11 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
self.app.geo_editor.transform_tool.on_rotate_key()
|
||||
|
||||
if key == QtCore.Qt.Key_Minus or key == '-':
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.geo_editor.snap_x, self.app.geo_editor.snap_y])
|
||||
|
||||
if key == QtCore.Qt.Key_Equal or key == '=':
|
||||
self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.geo_editor.snap_x, self.app.geo_editor.snap_y])
|
||||
|
||||
# Switch to Project Tab
|
||||
|
@ -2657,13 +2657,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
|
||||
if key == QtCore.Qt.Key_Minus or key == '-':
|
||||
self.app.grb_editor.launched_from_shortcuts = True
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.grb_editor.snap_x, self.app.grb_editor.snap_y])
|
||||
return
|
||||
|
||||
if key == QtCore.Qt.Key_Equal or key == '=':
|
||||
self.app.grb_editor.launched_from_shortcuts = True
|
||||
self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.grb_editor.snap_x, self.app.grb_editor.snap_y])
|
||||
return
|
||||
|
||||
|
@ -2869,13 +2869,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
|
|||
|
||||
if key == QtCore.Qt.Key_Minus or key == '-':
|
||||
self.app.exc_editor.launched_from_shortcuts = True
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(1 / self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.exc_editor.snap_x, self.app.exc_editor.snap_y])
|
||||
return
|
||||
|
||||
if key == QtCore.Qt.Key_Equal or key == '=':
|
||||
self.app.exc_editor.launched_from_shortcuts = True
|
||||
self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'],
|
||||
self.app.plotcanvas.zoom(self.app.defaults['global_zoom_ratio'],
|
||||
[self.app.exc_editor.snap_x, self.app.exc_editor.snap_y])
|
||||
return
|
||||
|
||||
|
|
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue