From c8ba7bd150797233102689ae8c5b4e931c7803c2 Mon Sep 17 00:00:00 2001 From: camellan Date: Sun, 9 Jun 2019 02:33:12 +0400 Subject: [PATCH] Fix Zoom function. Update translate. --- FlatCAMApp.py | 6 +++--- flatcamGUI/FlatCAMGUI.py | 12 ++++++------ locale/ru/LC_MESSAGES/strings.mo | Bin 100642 -> 100680 bytes locale/ru/LC_MESSAGES/strings.po | 10 ++++++---- 4 files changed, 15 insertions(+), 13 deletions(-) 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 b5993fe94d88e5f90796153a82b37fe18e8982c1..eec18964ee71cba27a033e0981ab60839d5d50b7 100644 GIT binary patch delta 3303 zcmY+`XKd9~7{~E*pp?oeLu3@i3nB%CODUse7i$?UZIw+KWmF0jDwVRwZ5c8RL%;zd z7L1DkYJiGjQ#VHAy$pFlBmzRL3xWYdK=k|TId4qUe9m+Jy0r@gVr>|y_kXJ-l#6t)F*xtb$t@H#0B^mZo?+{2{y#jKK>c&65qx+td(F*R}5f# z9FFn0G{J^UHidmue2ITy0UqyaO%Aq8v?d=*u_;zzb2Qzoc?4SEqu9^K)37b^T2#Xa zumygF58_4ag7>g52D^u>sZF7vyEU;m5AVm7-ksQp_#M=XKKA~A4-;QUb);brH?r;+ zO*|3RfjrdnA-rIX*@_y-+$3v;;o1-d-FOCd;TjIc=wxeJV-{)&=Ax!}1*(Iau`%xR z9`*Gnu?_Vuhs3cv5n$ed~9XpP_Xy1HCp&b>q2e>5&q8>;?^)$!V zufPt(JFq=#S%I3VUs7B)#|*Tl0dWErV+wZ0BbbGkaS|pzZp{eXiuGyVT%ph(|H68@ zA=R1`9Ds^TP)YPWYFoXA>d3p8jAv21AodB@;qIuBkM$O#M!W?RaUbfvKVV2BxJ*GK zt(oSgE*`Z%lTp_vqn4lq_2ONq7aT*~_c?0He@89RKR#|c$iEK*)F-2IVVrmMAol-o zDh~OI8iU;fol!mRj}`b7s=-D>T-LV2hlo3)c1H$kUynm|XgyXZHO3I1#ryDr_ZRPt zAtBe$T`H6V4Tid&_C)RXG1v)EJ5v({iy3_Q8Rf5 zzsHst*6haLLKG%YSU1cycm;K|{)@`y$1 zxNO(ZF4T-9Kk1&EfZ7eAITUpAZT1)T-~i%7xDT)4PJH1hYhK2V!`+O1j!MRJs5QOp zjUC|z&qW0@x)SA!t^<}6Ret{$L5{5Bp zoI8MGa$GLV@a{&PA7Rvyeg(C3cTve&Z@e2=9M+|MlSn~X+aI+i(@{t1I@E)EP}zGB z>tHz^!p~6qf8GRZ$X{~+OYr7IYZg+!AlI5V@lVXaos+GpdbN-i9>yal2M=MiQXbiB3|P? zfy#lKs9!=gLj|tkPN*JrLyas8bzsa!HMj{k;$c*l_nqxVn29CC#i#@6CMIBqInEpm z5^uzK*8VuoBED4UW-gTZjB9urPUXT1jKYhkslAG+co)^Nl(}yIPx2O_l5I6E*L^q? zmlUy7HTX7QI&rYrU0;m(#D61888W%^t(iu}NzBB~3)~NlrKp}(q8{k9(5?M;oI!jK zr(pgfvKUXIIx=*zJ76kNM|NfFltfmBkA#mNYZYT})%st}!?89HcyU!1 u+oVnVMI8eD0!#C97cCDg3q(r7ha;u@tqgw>*&IF*E)O3$mL0UGbN&NjGTc%C delta 3267 zcmY+`d2o+M9LMopCDI^>y04_7QfDMVT#+CWB8e+RkklE(-MAA!x1cjBjy4n3sr;d> z62`QQyHbi_Bvqx`tIg;q0nznq2IyWj=ssp zm`0tgX^hJ-2@5^%U>)N2UEK3%Y)(83JK!vQ4d2IlxZjIUVJ+fo*bMJtSA2nC*fHFi zc9<4!eI}JcJ{9Nj3g+PUuGVCriLfRc#$h8Y!zOqO+u)zr78^&pxG#nhPegUR9-HDv z*aDAZ7rcpm&_Bv&O-%~%QPu=vGB&{Rp7XFi@mkb}c6uJf*2I@k1NjX#v%qfF_+by! z0Af(>$KoApOb%)yLwZ;<6es#9=*0u52Ny8`f5H$9i*{Qu1hvHJr~%HvAk6oC*Q+nV z*Qr0^c?-`H|ASxPnV!~E$Hl$egnfAwG=t3;jHRfVm7{XvDQd6%ds`EaQ5cTPP|x?F zCQybA@s4LDYJdTKtZ9!eQMr?d>Te46GR9{Lyoxf^-u;UDaP7XXK`5$&Sk&H+Lp{&M zEPMym?g_TS`Y~>$!ciT@p^|h0YDE{I2DTl0(!beD;SDP8p|-%kpKH(>HPR?leLB90 zb1{s)EJCf+*;tp&_pvTdrl|iT zn^6$zc`wu!WT2LGA?gELQRjF!s@-|i7JcW%Pd)7*Ta{Zus9cEj%pAn|A3?=Nui{74 zhiWFc5jVlp#2ru_K1LnW=h#y3CA!nm7Im&8Q3INcn$TwS$5MP1k9wZJ-n(K);w0>bOHeaBfRXq$YUy91mNsOF+nQ0RQ?df}ycD&P*YPU;g}d;a zFUgwm6ebOI9iB!Vx9?HeTqD^Tib}2ls9YF{TB)g+ii>a)p2s~nJjI%oSc&RrVX9k^ zpkc0EchqU{B~Z|k&hQ>A!G6RWu>>#TPMkg5nj)+|!mZeDR5Bhy?deI+ho}iO80og8 zA8PC7;v>w%SvYM}Rlh!S%@xdj)Qtb|te57_c^CYK`UJd$%|^Rq{MpltaUC>Atwhn+^{18Xs2`tC@W8DRGAC(LJ zGn|W17tW`sd*d`}>u#X_oBo2jz$&p8{hQk3T-G*0?MW=^DxHLCxCE8G1sH&ZSc)H@ z&VTZFYsg!(9#`Vk3Dzv8epr?@d+`D$;k>u3`I6@+P+PZR66aspyorJ=!C*XrRrdjQ zA-0pUj1X7L0o^DJO9g3D^-M5=N$E&qo@wAdGQMjCT^JRwzxa$y(!t=`S(%b zM@1nPV-bFW-KJYpfp<}- zu>>`cHcQOSWZZ$hiT(532L_^Mv<&0% zE1Zu3`PQUk9*)85n1-EJSThILpuY1Aw_s;-O`gI+OyR8V(#Y>ocpF!&a=(6`;kU$@ ztKEu3u5nAa3f0kNjKk2i?uW!Q)WviR`(WL5)(pa-*ci8=?umV#53nzB%k`{WKMLb0 z#9%S@$6KflT5fPN%EIo%pJN0*L0ze>3*7Je-l&^%HY(YQQSV4I}``K|@NI zm;8lRGlzeOzU;G+hd(}=lUi#{#fI{O6{{*%mmfRQ%HRH7<9{`+18s2dwv>WaN7i(< H=Q92S^OC{A 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 ..."