diff --git a/FlatCAMApp.py b/FlatCAMApp.py index ef803939..eff1aab7 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -1417,8 +1417,8 @@ class App(QtCore.QObject): 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.5)) + self.ui.menuview_zoom_out.triggered.connect(lambda: self.plotcanvas.zoom(1 / 1.5)) 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) @@ -8039,7 +8039,7 @@ class App(QtCore.QObject): This behavior works only within main thread, errors with promissed tasks can be catched and detected only with log. - TODO: this problem have to be addressed somehow, maybe rewrite promissing to be blocking somehow for + TODO: this problem have to be addressed somehow, maybe rewrite promissing to be blocking somehow for TCL shell. Kamil's comment: I will rewrite existing TCL commands from time to time to follow this rules. diff --git a/flatcamGUI/FlatCAMGUI.py b/flatcamGUI/FlatCAMGUI.py index fd2eef86..b61da7de 100644 --- a/flatcamGUI/FlatCAMGUI.py +++ b/flatcamGUI/FlatCAMGUI.py @@ -1250,7 +1250,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): - + ''' ) @@ -1265,7 +1265,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): '''Editor Shortcut list

GEOMETRY EDITOR
- + @@ -2328,13 +2328,13 @@ class FlatCAMGUI(QtWidgets.QMainWindow): self.app.on_flipy() # Zoom In - if key == QtCore.Qt.Key_Equal: - self.app.plotcanvas.zoom(1 / self.app.defaults['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) + # Zoom Out + if key == QtCore.Qt.Key_Equal: + self.app.plotcanvas.zoom(1 / self.app.defaults['zoom_ratio'], self.app.mouse) + # toggle display of Notebook area if key == QtCore.Qt.Key_QuoteLeft: self.app.on_toggle_notebook() diff --git a/locale/ru/LC_MESSAGES/strings.mo b/locale/ru/LC_MESSAGES/strings.mo index b5993fe9..eec18964 100644 Binary files a/locale/ru/LC_MESSAGES/strings.mo and b/locale/ru/LC_MESSAGES/strings.mo differ diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po index 6a2025b7..ecdf1aa8 100644 --- a/locale/ru/LC_MESSAGES/strings.po +++ b/locale/ru/LC_MESSAGES/strings.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2019-06-07 23:14+0300\n" -"PO-Revision-Date: 2019-06-09 01:31+0400\n" +"PO-Revision-Date: 2019-06-09 01:51+0400\n" "Last-Translator: Andrey Kultyapov \n" "Language-Team: \n" "Language: ru\n" @@ -3749,11 +3749,11 @@ msgstr "&Вид" #: flatcamGUI/FlatCAMGUI.py:350 msgid "Enable all plots\tALT+1" -msgstr "Включить все участки\tALT+1" +msgstr "Включить все чертежи\tALT+1" #: flatcamGUI/FlatCAMGUI.py:352 msgid "Disable all plots\tALT+2" -msgstr "Отключить все участки\tALT+2" +msgstr "Отключить все чертежи\tALT+2" #: flatcamGUI/FlatCAMGUI.py:354 msgid "Disable non-selected\tALT+3" @@ -9093,7 +9093,9 @@ msgstr "ИЗМЕРИТЕЛЬ: Нажмите на конечную точку .. #: flatcamTools/ToolMeasurement.py:278 #, python-brace-format msgid "MEASURING: Result D(x) = {d_x} | D(y) = {d_y} | Distance = {d_z}" -msgstr "ИЗМЕРИТЕЛЬ: Результат D(x) = {d_x} | D(y) = {d_y} | Расстояние = {d_z}" +msgstr "" +"ИЗМЕРИТЕЛЬ: Результат расстояние(x) = {d_x} | расстояние(y) = {d_y} | " +"Расстояние = {d_z}" #: flatcamTools/ToolMove.py:81 msgid "MOVE: Click on the Start point ..."