Просмотр исходного кода

- 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

Marius Stanciu 7 лет назад
Родитель
Сommit
c888303146
5 измененных файлов с 26 добавлено и 11 удалено
  1. 6 0
      FlatCAMApp.py
  2. 17 11
      FlatCAMGUI.py
  3. 3 0
      README.md
  4. BIN
      share/about32.png
  5. BIN
      share/youtube32.png

+ 6 - 0
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()")
 

+ 17 - 11
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):
 <table border="0" cellpadding="0" cellspacing="0" style="width:283px">
 	<tbody>
 		<tr height="20">
-			<td height="20" width="89"><strong>~</strong></td>
+			<td height="20" width="89"><strong>F3</strong></td>
 			<td width="194"><span style="color:#006400"><strong>&nbsp;SHOW SHORTCUT LIST</strong></span></td>
 		</tr>
 		<tr height="20">
@@ -984,6 +984,10 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 			<td height="20"><strong>Del</strong></td>
 			<td>&nbsp;Delete Obj</td>
 		</tr>
+        <tr height="20">
+			<td height="20"><strong>'`'</strong></td>
+			<td>&nbsp;(left to Key_1)Toogle Notebook Area (Left Side)</td>
+		</tr>
         <tr height="20">
 			<td height="20"><strong>SPACE</strong></td>
 			<td>&nbsp;En(Dis)able Obj Plot</td>
@@ -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):

+ 3 - 0
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
 

BIN
share/about32.png


BIN
share/youtube32.png