From c88830314605b8af5f4369f465acbd790777a976 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 7 Feb 2019 20:39:37 +0200 Subject: [PATCH] - added a new function and the shortcut 'leftquote' (left of Key 1) for toggle of the notebook section - changed the Shortcut list shortcut key to F3 --- FlatCAMApp.py | 6 ++++++ FlatCAMGUI.py | 28 +++++++++++++++++----------- README.md | 3 +++ share/about32.png | Bin 0 -> 1838 bytes share/youtube32.png | Bin 0 -> 637 bytes 5 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 share/about32.png create mode 100644 share/youtube32.png diff --git a/FlatCAMApp.py b/FlatCAMApp.py index 7b6319d7..d082602a 100644 --- a/FlatCAMApp.py +++ b/FlatCAMApp.py @@ -2896,6 +2896,12 @@ class App(QtCore.QObject): else: self.ui.plot_tab_area.closeTab(0) + def on_toggle_notebook(self): + if self.ui.splitter.sizes()[0] == 0: + self.ui.splitter.setSizes([1, 1]) + else: + self.ui.splitter.setSizes([0, 1]) + def on_toggle_axis(self): self.report_usage("on_toggle_axis()") diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index 91737671..b6bb0bef 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -286,12 +286,12 @@ class FlatCAMGUI(QtWidgets.QMainWindow): ### Help ### self.menuhelp = self.menu.addMenu('&Help') - self.menuhelp_about = self.menuhelp.addAction(QtGui.QIcon('share/tv16.png'), 'About FlatCAM') - self.menuhelp_home = self.menuhelp.addAction(QtGui.QIcon('share/home16.png'), 'Home') - self.menuhelp_manual = self.menuhelp.addAction(QtGui.QIcon('share/globe16.png'), 'Manual\tF1') + self.menuhelp_manual = self.menuhelp.addAction(QtGui.QIcon('share/globe16.png'), 'Help\tF1') + self.menuhelp_home = self.menuhelp.addAction(QtGui.QIcon('share/home16.png'), 'FlatCAM.org') self.menuhelp.addSeparator() - self.menuhelp_shortcut_list = self.menuhelp.addAction(QtGui.QIcon('share/shortcuts24.png'), 'Shortcuts List\t`') - self.menuhelp_videohelp = self.menuhelp.addAction(QtGui.QIcon('share/videohelp24.png'), 'See on YouTube\tF2') + self.menuhelp_videohelp = self.menuhelp.addAction(QtGui.QIcon('share/youtube32.png'), 'YouTube Channel\tF2') + self.menuhelp_shortcut_list = self.menuhelp.addAction(QtGui.QIcon('share/shortcuts24.png'), 'Shortcuts List\tF3') + self.menuhelp_about = self.menuhelp.addAction(QtGui.QIcon('share/about32.png'), 'About') ### FlatCAM Editor menu ### @@ -757,7 +757,7 @@ class FlatCAMGUI(QtWidgets.QMainWindow): - + @@ -984,6 +984,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): + + + + @@ -1665,6 +1669,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if key == QtCore.Qt.Key_F2 or key == 'F2': webbrowser.open(self.app.video_url) + # Show shortcut list + if key == QtCore.Qt.Key_F3 or key == 'F3': + self.app.on_shortcut_list() + # Switch to Project Tab if key == QtCore.Qt.Key_1: self.app.on_select_tab('project') @@ -1768,12 +1776,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow): if key == QtCore.Qt.Key_Minus: self.app.plotcanvas.zoom(self.app.defaults['zoom_ratio'], self.app.mouse) - # Show shortcut list - if key == QtCore.Qt.Key_Ampersand: - self.app.on_shortcut_list() - + # toggle display of Notebook area if key == QtCore.Qt.Key_QuoteLeft: - self.app.on_shortcut_list() + self.app.on_toggle_notebook() + return def dragEnterEvent(self, event): diff --git a/README.md b/README.md index d4fd47e5..3363d5bf 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,9 @@ CAD program, and create G-Code for Isolation routing. - imported speedups for shapely - added a disable menu entry in the canvas contextual menu - small changes in Tools layout +- added some new icons in the help menu and reorganized this menu +- added a new function and the shortcut 'leftquote' (left of Key 1) for toggle of the notebook section +- changed the Shortcut list shortcut key to F3 6.02.2019 diff --git a/share/about32.png b/share/about32.png new file mode 100644 index 0000000000000000000000000000000000000000..48bf9f6f38c404d86774de95515513c97609bafb GIT binary patch literal 1838 zcmV+}2hsS6P)yQnVE7r=o%% zG}bB-!4E|XNgMp&(xyhRX-TTmrYOOLG-+O%bTzvryV=d&P4>RO%^W|>+?lz1HyV53 zuy>X-=l_5H&;NPO8O3dm{KE$)z&wDc?Fzj)m&SE0h5@pf6!jLAYc8(qp#_ZBX1P?OaI?(fQnA=n@#WEe$QBLbYvY@uQ!-mYO!#$-L=jHfBRC3v<*ocZZ4OY zUn~^srP*hujyydHG;gKIss!@8Up=sG%g__|@7T(}=9)~+HfXg?*BS$$RQCo7l=6ur z#AETs5~bqYYnR^G^CVDNO^qG``Q5J`*m+<6iIL$AoVrwIx#ALs?f~C6o&gl6E|;Ti z!rc_2ASF<(6}egX_Zye~`1q4RaU}_TEAZoIi&Pt454ci_=e{w_^LsY()z1%*O>6#s zp#q{nDG)&^|91<8Whb$m%-z|sU3V2Oy#5x@BFY>Rfxj}bZOc#y-fEk0l>v-W{>H%g zXeuN%KAHkisLoVDYJz81DRiozWNzcv#vXj}n?NRxE8x35n@#V(f5%o%T`Kp0hq+dO zDCU-$A%VH27AnZS4=RWbe(Pu^vunu=-TOjr>`Qk7PFD&(Gye7GckbBsl|tF#>SC)4 zT!r8&oTomnGQH5`-LoZLKC*}si7B9bMU+HoQU0^mwqvE%>!pwWbR1{^#sbJ@Q_pT3 zS;w(|F84%E2p%Y*6y>_dnwZ5tKV3(3Z}ZfaL<$5(T$u&~U<{5Dw4L4nBmiyYa+yt) zTGX66(zjg0a=C?TKy*-AS|M6kIm8kqMnF2%&>>;`vNi^6ZAhg12k}c$TcBurURU(x zs!OrzB3gwtEg~U6j{*Tf(f&FmF$EN1-!q=UaZD!&4Tx1NRcEv^n>x`i6z8E3}l5; zxkMW#Ufe--;X+oKB|4eawH^>NNCn(HS^cY zl`BVo^f#aiv;=53>cyApjVk@AC~qoa5Ji6r1v=)8t6&Au+kp}r1~i4GI>p&@hXe2m z&=$a}TsyU|S}7H?34^V>Tj|Q#eZu%7EYlbX%Z^B7`!wrwaQ!zdy)}kLIE@1?jMCO){y;4{1I;U*y^c zhksR_KQ{~92s{wpOx&p>Pfs?g*I&b{lF@+^0ww&D@xR{SgY~{gL_kEa9mU-vnwjY` z7f+u%cIE9K90L}C62aXtzN-Lz;}gF>V5c`txGGEAQh~8_blBLD$#iHo9p&5>EXN|- zrx_p8T$wI&{OHMJXMX$OUSJNG1u+TS@A)K=>Hi{1 zJ4!of3Cc8fCdAK&{*T_ z*Wdg2cbqj_9uudp&q<_6ISCR;jh)aq2_c;lk_koI^;j-9nV&CJigV`;PC3m9ZB9x%gi` cxBYqkAGY6f`z8K zq!=hIE(#@qlP(So4MDUvJNbX;rvJblf`-VcA;?K*39c9}4Q7gDC0^sISFi8ebT0`G z-gD&|9E6pMTH0_#IVkC8qA-K|))yKhIt(}%08 zD_R~IX>;jatKk(#m8p*VejnO+lPuJummZnYl9qtPEe4{~2Q}UCO^v=)IK0cngfVt=8 z(2;dO($`1#>}=*^3FwfdBx`{hO&rS&H7l=?@mTEA3Y;P0!ml>H{dH%hLa9(-zfd45 zl?!DAp16Cp*?Vxfw8ZZ8G}W!GhH?%kiQoX}%p$ICZn8Tw!{O3WmNdg>K$h)3 zcaB*p!TlG~gNuf;ZufbZ+0O*&dn2Kpsi~&Lb=f6F&UN83-!<>zMh1Q;M9A7-~Aq66tB z?x{g)(B@JiX!F{a)ZHbWI#hvUK?V0C%nk#}7V#UiQoxRxEvFH0dRA7-EnDz4|1^I9 X)kodu!KzTv00000NkvXXu0mjf+cqTF literal 0 HcmV?d00001
~F3  SHOW SHORTCUT LIST
Del  Delete Obj
'`' (left to Key_1)Toogle Notebook Area (Left Side)
SPACE  En(Dis)able Obj Plot