bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- getting rid of all the Options GUI and related functions as it is no longer supported

Browse Source
This commit is contained in:
Marius Stanciu
2019-11-04 22:06:06 +02:00
committed by Marius
parent e96129b5d1
commit cd7620c801
6 changed files with 151 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
flatcamGUI/FlatCAMGUI.py
View File

@@ -978,13 +978,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.hlay1 = QtWidgets.QHBoxLayout()
self.general_tab_lay.addLayout(self.hlay1)
self.options_combo = QtWidgets.QComboBox()
self.options_combo.addItem(_("APP. DEFAULTS"))
self.options_combo.addItem(_("PROJ. OPTIONS "))
self.hlay1.addWidget(self.options_combo)
# disable this button as it may no longer be useful
self.options_combo.setVisible(False)
self.hlay1.addStretch()
self.general_scroll_area = QtWidgets.QScrollArea()
@@ -2022,15 +2015,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
self.tools2_defaults_form = Tools2PreferencesUI()
self.util_defaults_form = UtilPreferencesUI()
self.general_options_form = GeneralPreferencesUI()
self.gerber_options_form = GerberPreferencesUI()
self.excellon_options_form = ExcellonPreferencesUI()
self.geometry_options_form = GeometryPreferencesUI()
self.cncjob_options_form = CNCJobPreferencesUI()
self.tools_options_form = ToolsPreferencesUI()
self.tools2_options_form = Tools2PreferencesUI()
self.util_options_form = UtilPreferencesUI()
QtWidgets.qApp.installEventFilter(self)
# restore the Toolbar State from file
@@ -3649,9 +3633,27 @@ class FlatCAMActivityView(QtWidgets.QWidget):
This class create and control the activity icon displayed in the App status bar
"""
def __init__(self, movie="share/active.gif", icon='share/active_static.png', parent=None):
def __init__(self, app, parent=None):
super().__init__(parent=parent)
self.app = app
if self.app.defaults["global_activity_icon"] == "Ball green":
icon = 'share/active_2_static.png'
movie = "share/active_2.gif"
elif self.app.defaults["global_activity_icon"] == "Ball black":
icon = 'share/active_static.png'
movie = "share/active.gif"
elif self.app.defaults["global_activity_icon"] == "Arrow green":
icon = 'share/active_3_static.png'
movie = "share/active_3.gif"
elif self.app.defaults["global_activity_icon"] == "Eclipse green":
icon = 'share/active_4_static.png'
movie = "share/active_4.gif"
else:
icon = 'share/active_static.png'
movie = "share/active.gif"
self.setMinimumWidth(200)
self.movie_path = movie
self.icon_path = icon