diff --git a/AppGUI/MainGUI.py b/AppGUI/MainGUI.py index 0dc75b84..97ae3067 100644 --- a/AppGUI/MainGUI.py +++ b/AppGUI/MainGUI.py @@ -1811,6 +1811,8 @@ class MainGUI(QtWidgets.QMainWindow): msgbox.setText(_("Are you sure you want to delete the GUI Settings? \n")) msgbox.setWindowTitle(_("Clear GUI Settings")) msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/trash32.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) @@ -2627,6 +2629,8 @@ class MainGUI(QtWidgets.QMainWindow): messagebox.setText(msg) messagebox.setWindowTitle(_("Warning")) messagebox.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/warning.png')) + messagebox.setIcon(QtWidgets.QMessageBox.Question) + messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok) messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok) messagebox.exec_() @@ -2789,6 +2793,8 @@ class MainGUI(QtWidgets.QMainWindow): messagebox.setText(msg) messagebox.setWindowTitle(_("Warning")) messagebox.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/warning.png')) + messagebox.setIcon(QtWidgets.QMessageBox.Warning) + messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok) messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok) messagebox.exec_() @@ -2834,6 +2840,8 @@ class MainGUI(QtWidgets.QMainWindow): messagebox.setText(msg) messagebox.setWindowTitle(_("Warning")) messagebox.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/warning.png')) + messagebox.setIcon(QtWidgets.QMessageBox.Warning) + messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok) messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok) messagebox.exec_() @@ -2854,6 +2862,8 @@ class MainGUI(QtWidgets.QMainWindow): messagebox.setText(msg) messagebox.setWindowTitle(_("Warning")) messagebox.setWindowIcon(QtGui.QIcon(self.app.resource_location + '/warning.png')) + messagebox.setIcon(QtWidgets.QMessageBox.Warning) + messagebox.setStandardButtons(QtWidgets.QMessageBox.Ok) messagebox.setDefaultButton(QtWidgets.QMessageBox.Ok) messagebox.exec_() diff --git a/AppGUI/preferences/PreferencesUIManager.py b/AppGUI/preferences/PreferencesUIManager.py index 3d537a2a..d2a82919 100644 --- a/AppGUI/preferences/PreferencesUIManager.py +++ b/AppGUI/preferences/PreferencesUIManager.py @@ -947,6 +947,7 @@ class PreferencesUIManager: msgbox.setText(_("Are you sure you want to continue?")) msgbox.setWindowTitle(_("Application restart")) msgbox.setWindowIcon(QtGui.QIcon(self.ui.app.resource_location + '/warning.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) msgbox.addButton(_('Cancel'), QtWidgets.QMessageBox.NoRole) @@ -1185,6 +1186,7 @@ class PreferencesUIManager: "Do you want to save the Preferences?")) msgbox.setWindowTitle(_("Save Preferences")) msgbox.setWindowIcon(QtGui.QIcon(self.ui.app.resource_location + '/save_as.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) diff --git a/AppGUI/preferences/general/GeneralAPPSetGroupUI.py b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py index a09820b9..a056c200 100644 --- a/AppGUI/preferences/general/GeneralAPPSetGroupUI.py +++ b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py @@ -177,14 +177,6 @@ class GeneralAPPSetGroupUI(OptionsGroupUI): {'label': _('Landscape'), 'value': 'l'}, ], stretch=False) - self.wks = OptionalInputSection(self.workspace_cb, - [ - self.workspace_type_lbl, - self.wk_cb, - self.wk_orientation_label, - self.wk_orientation_radio - ]) - grid0.addWidget(self.wk_orientation_label, 8, 0) grid0.addWidget(self.wk_orientation_radio, 8, 1) diff --git a/AppTranslation.py b/AppTranslation.py index 82a8ac33..8101d72e 100644 --- a/AppTranslation.py +++ b/AppTranslation.py @@ -106,6 +106,8 @@ def on_language_apply_click(app, restart=False): (_("Are you sure do you want to change the current language to"), name.capitalize())) msgbox.setWindowTitle(_("Apply Language ...")) msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/language32.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + bt_yes = msgbox.addButton(_("Yes"), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_("No"), QtWidgets.QMessageBox.NoRole) @@ -203,6 +205,8 @@ def restart_program(app, ask=None): "Do you want to Save the project?")) msgbox.setWindowTitle(_("Save changes")) msgbox.setWindowIcon(QtGui.QIcon(resource_loc + '/save_as.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) diff --git a/App_Main.py b/App_Main.py index 99f4f21d..aa6ec089 100644 --- a/App_Main.py +++ b/App_Main.py @@ -2206,6 +2206,7 @@ class App(QtCore.QObject): msgbox.setText(_("Do you want to save the edited object?")) msgbox.setWindowTitle(_("Close Editor")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/save_as.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) @@ -3092,6 +3093,8 @@ class App(QtCore.QObject): msgbox.setWindowTitle(_("Alternative website")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/globe16.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + bt_yes = msgbox.addButton(_('Close'), QtWidgets.QMessageBox.YesRole) msgbox.setDefaultButton(bt_yes) @@ -4000,6 +4003,8 @@ class App(QtCore.QObject): msgbox = QtWidgets.QMessageBox() msgbox.setWindowTitle(_("Toggle Units")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/toggle_units32.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + msgbox.setText(_("Changing the units of the project\n" "will scale all objects.\n\n" "Do you want to continue?")) @@ -4277,6 +4282,8 @@ class App(QtCore.QObject): "Go to Preferences -> General - Show Advanced Options.")) msgbox.setWindowTitle("Tool adding ...") msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/warning.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Warning) + bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) msgbox.setDefaultButton(bt_ok) @@ -4351,6 +4358,8 @@ class App(QtCore.QObject): msgbox = QtWidgets.QMessageBox() msgbox.setWindowTitle(_("Delete objects")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/deleteshape32.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + # msgbox.setText("%s" % _("Change project units ...")) msgbox.setText(_("Are you sure you want to permanently delete\n" "the selected objects?")) @@ -5361,6 +5370,7 @@ class App(QtCore.QObject): "Do you want to update the Tools Database?")) msgbox.setWindowTitle(_("Save Tools Database")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/save_as.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) @@ -6422,6 +6432,8 @@ class App(QtCore.QObject): "Do you want to Save the project?")) msgbox.setWindowTitle(_("Save changes")) msgbox.setWindowIcon(QtGui.QIcon(self.resource_location + '/save_as.png')) + msgbox.setIcon(QtWidgets.QMessageBox.Question) + bt_yes = msgbox.addButton(_('Yes'), QtWidgets.QMessageBox.YesRole) bt_no = msgbox.addButton(_('No'), QtWidgets.QMessageBox.NoRole) bt_cancel = msgbox.addButton(_('Cancel'), QtWidgets.QMessageBox.RejectRole) @@ -6807,6 +6819,8 @@ class App(QtCore.QObject): self.inform.emit('[WARNING_NOTCL] %s' % _("No object selected.")) msg = _("Please Select a Geometry object to export") msgbox = QtWidgets.QMessageBox() + msgbox.setIcon(QtWidgets.QMessageBox.Warning) + msgbox.setInformativeText(msg) bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) msgbox.setDefaultButton(bt_ok) @@ -6821,6 +6835,8 @@ class App(QtCore.QObject): msg = '[ERROR_NOTCL] %s' % \ _("Only Geometry, Gerber and CNCJob objects can be used.") msgbox = QtWidgets.QMessageBox() + msgbox.setIcon(QtWidgets.QMessageBox.Warning) + msgbox.setInformativeText(msg) bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) msgbox.setDefaultButton(bt_ok) @@ -7154,6 +7170,8 @@ class App(QtCore.QObject): self.inform.emit('[WARNING_NOTCL] %s' % _("No object selected.")) msg = _("Please Select a Geometry object to export") msgbox = QtWidgets.QMessageBox() + msgbox.setIcon(QtWidgets.QMessageBox.Warning) + msgbox.setInformativeText(msg) bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) msgbox.setDefaultButton(bt_ok) @@ -7164,6 +7182,8 @@ class App(QtCore.QObject): if not isinstance(obj, GeometryObject): msg = '[ERROR_NOTCL] %s' % _("Only Geometry objects can be used.") msgbox = QtWidgets.QMessageBox() + msgbox.setIcon(QtWidgets.QMessageBox.Warning) + msgbox.setInformativeText(msg) bt_ok = msgbox.addButton(_('Ok'), QtWidgets.QMessageBox.AcceptRole) msgbox.setDefaultButton(bt_ok) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d201bb7..b4eaa30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta - all tuple entries in the Preferences UI are now protected against letter entry - all entries in the Preferences UI that have numerical entry are protected now against letters - cleaned the Preferences UI in the Gerber area +- minor UI changes 25.05.2020