Browse Source

- made the Properties checkbox in the Object UI into a checkable button and added to it an icon

Marius Stanciu 5 years ago
parent
commit
ed26aead0c

+ 1 - 0
CHANGELOG.md

@@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta
 - In Excellon Object UI fixed the milling geometry generation
 - updated the translations strings to the changes in the source code
 - some strings changed
+- made the Properties checkbox in the Object UI into a checkable button and added to it an icon
 
 20.10.2020
 

+ 40 - 24
appGUI/ObjectUI.py

@@ -252,12 +252,16 @@ class GerberObjectUI(ObjectUI):
         grid0.addWidget(self.editor_button, 4, 0, 1, 3)
 
         # PROPERTIES CB
-        self.properties_lbl = FCLabel('<b>%s</b>:' % _("PROPERTIES"))
-        self.properties_lbl.setToolTip(_("Show the Properties."))
-        self.properties_cb = FCCheckBox()
-
-        grid0.addWidget(self.properties_lbl, 6, 0)
-        grid0.addWidget(self.properties_cb, 6, 1, 1, 2)
+        self.properties_button = FCButton('%s' % _("PROPERTIES"), checkable=True)
+        self.properties_button.setIcon(QtGui.QIcon(self.app.resource_location + '/properties32.png'))
+        self.properties_button.setToolTip(_("Show the Properties."))
+        self.properties_button.setStyleSheet("""
+                                      QPushButton
+                                      {
+                                          font-weight: bold;
+                                      }
+                                      """)
+        grid0.addWidget(self.properties_button, 6, 0, 1, 3)
 
         # PROPERTIES Frame
         self.properties_frame = QtWidgets.QFrame()
@@ -561,12 +565,16 @@ class ExcellonObjectUI(ObjectUI):
         grid0.addWidget(self.editor_button, 4, 0, 1, 3)
 
         # PROPERTIES CB
-        self.properties_lbl = FCLabel('<b>%s</b>:' % _("PROPERTIES"))
-        self.properties_lbl.setToolTip(_("Show the Properties."))
-        self.properties_cb = FCCheckBox()
-
-        grid0.addWidget(self.properties_lbl, 6, 0)
-        grid0.addWidget(self.properties_cb, 6, 1, 1, 2)
+        self.properties_button = FCButton('%s' % _("PROPERTIES"), checkable=True)
+        self.properties_button.setIcon(QtGui.QIcon(self.app.resource_location + '/properties32.png'))
+        self.properties_button.setToolTip(_("Show the Properties."))
+        self.properties_button.setStyleSheet("""
+                                      QPushButton
+                                      {
+                                          font-weight: bold;
+                                      }
+                                      """)
+        grid0.addWidget(self.properties_button, 6, 0, 1, 3)
 
         # PROPERTIES Frame
         self.properties_frame = QtWidgets.QFrame()
@@ -861,12 +869,16 @@ class GeometryObjectUI(ObjectUI):
         grid_header.addWidget(self.editor_button, 4, 0, 1, 3)
 
         # PROPERTIES CB
-        self.properties_lbl = FCLabel('<b>%s</b>:' % _("PROPERTIES"))
-        self.properties_lbl.setToolTip(_("Show the Properties."))
-        self.properties_cb = FCCheckBox()
-
-        grid_header.addWidget(self.properties_lbl, 6, 0)
-        grid_header.addWidget(self.properties_cb, 6, 1, 1, 2)
+        self.properties_button = FCButton('%s' % _("PROPERTIES"), checkable=True)
+        self.properties_button.setIcon(QtGui.QIcon(self.app.resource_location + '/properties32.png'))
+        self.properties_button.setToolTip(_("Show the Properties."))
+        self.properties_button.setStyleSheet("""
+                                      QPushButton
+                                      {
+                                          font-weight: bold;
+                                      }
+                                      """)
+        grid_header.addWidget(self.properties_button, 6, 0, 1, 3)
 
         # PROPERTIES Frame
         self.properties_frame = QtWidgets.QFrame()
@@ -1827,12 +1839,16 @@ class CNCObjectUI(ObjectUI):
         f_lay.addWidget(self.editor_button, 4, 0, 1, 3)
 
         # PROPERTIES CB
-        self.properties_lbl = FCLabel('<b>%s</b>:' % _("PROPERTIES"))
-        self.properties_lbl.setToolTip(_("Show the Properties."))
-        self.properties_cb = FCCheckBox()
-
-        f_lay.addWidget(self.properties_lbl, 6, 0)
-        f_lay.addWidget(self.properties_cb, 6, 1, 1, 2)
+        self.properties_button = FCButton('%s' % _("PROPERTIES"), checkable=True)
+        self.properties_button.setIcon(QtGui.QIcon(self.app.resource_location + '/properties32.png'))
+        self.properties_button.setToolTip(_("Show the Properties."))
+        self.properties_button.setStyleSheet("""
+                                      QPushButton
+                                      {
+                                          font-weight: bold;
+                                      }
+                                      """)
+        f_lay.addWidget(self.properties_button, 6, 0, 1, 3)
 
         # PROPERTIES Frame
         self.properties_frame = QtWidgets.QFrame()

+ 1 - 1
appObjects/FlatCAMCNCJob.py

@@ -579,7 +579,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
         self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
 
         # Properties
-        self.ui.properties_cb.stateChanged.connect(self.on_properties)
+        self.ui.properties_button.toggled.connect(self.on_properties)
         self.calculations_finished.connect(self.update_area_chull)
 
         # autolevelling signals

+ 1 - 1
appObjects/FlatCAMExcellon.py

@@ -178,7 +178,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
         self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
 
         # Properties
-        self.ui.properties_cb.stateChanged.connect(self.on_properties)
+        self.ui.properties_button.toggled.connect(self.on_properties)
         self.calculations_finished.connect(self.update_area_chull)
 
         self.ui.drill_button.clicked.connect(lambda: self.app.drilling_tool.run(toggle=True))

+ 1 - 1
appObjects/FlatCAMGeometry.py

@@ -598,7 +598,7 @@ class GeometryObject(FlatCAMObj, Geometry):
         self.ui.editor_button.clicked.connect(self.app.object2editor)
 
         # Properties
-        self.ui.properties_cb.stateChanged.connect(self.on_properties)
+        self.ui.properties_button.toggled.connect(self.on_properties)
         self.calculations_finished.connect(self.update_area_chull)
 
         self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)

+ 1 - 1
appObjects/FlatCAMGerber.py

@@ -151,7 +151,7 @@ class GerberObject(FlatCAMObj, Gerber):
         self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
 
         # Properties
-        self.ui.properties_cb.stateChanged.connect(self.on_properties)
+        self.ui.properties_button.toggled.connect(self.on_properties)
         self.calculations_finished.connect(self.update_area_chull)
 
         # Tools

BIN
locale/tr/LC_MESSAGES/strings.mo


File diff suppressed because it is too large
+ 140 - 140
locale/tr/LC_MESSAGES/strings.po


File diff suppressed because it is too large
+ 144 - 144
locale_template/strings.pot


Some files were not shown because too many files changed in this diff