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

This commit is contained in:
Marius Stanciu 2020-10-21 12:16:17 +03:00 committed by Marius
parent c5baf10847
commit ed26aead0c
9 changed files with 670 additions and 653 deletions

View File

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

View File

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

View File

@ -579,7 +579,7 @@ class CNCJobObject(FlatCAMObj, CNCjob):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor()) self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties # 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.calculations_finished.connect(self.update_area_chull)
# autolevelling signals # autolevelling signals

View File

@ -178,7 +178,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor()) self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties # 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.calculations_finished.connect(self.update_area_chull)
self.ui.drill_button.clicked.connect(lambda: self.app.drilling_tool.run(toggle=True)) self.ui.drill_button.clicked.connect(lambda: self.app.drilling_tool.run(toggle=True))

View File

@ -598,7 +598,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.editor_button.clicked.connect(self.app.object2editor) self.ui.editor_button.clicked.connect(self.app.object2editor)
# Properties # 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.calculations_finished.connect(self.update_area_chull)
self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click) self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)

View File

@ -151,7 +151,7 @@ class GerberObject(FlatCAMObj, Gerber):
self.ui.editor_button.clicked.connect(lambda: self.app.object2editor()) self.ui.editor_button.clicked.connect(lambda: self.app.object2editor())
# Properties # 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.calculations_finished.connect(self.update_area_chull)
# Tools # Tools

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff