From aef1607fd5ef9b0d217a6cfbeba36e101cf95778 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 1 Jun 2020 19:21:51 +0300 Subject: [PATCH] - in Preferences replaced the widgets that sets colors with a compound one (from David Robertson) --- AppGUI/GUIElements.py | 2 + AppGUI/preferences/PreferencesUIManager.py | 98 +------ .../cncjob/CNCJobAdvOptPrefGroupUI.py | 39 +-- .../cncjob/CNCJobGenPrefGroupUI.py | 128 +-------- .../excellon/ExcellonGenPrefGroupUI.py | 67 +---- .../general/GeneralAPPSetGroupUI.py | 39 +-- .../general/GeneralGUIPrefGroupUI.py | 246 ++---------------- .../geometry/GeometryGenPrefGroupUI.py | 36 +-- .../gerber/GerberGenPrefGroupUI.py | 87 ++----- .../tools/Tools2QRCodePrefGroupUI.py | 86 +----- .../preferences/tools/ToolsFilmPrefGroupUI.py | 42 +-- CHANGELOG.md | 4 +- 12 files changed, 110 insertions(+), 764 deletions(-) diff --git a/AppGUI/GUIElements.py b/AppGUI/GUIElements.py index 1af35470..73415ca1 100644 --- a/AppGUI/GUIElements.py +++ b/AppGUI/GUIElements.py @@ -704,6 +704,8 @@ class FCColorEntry(QtWidgets.QFrame): self.entry.editingFinished.connect(self._sync_button_color) self.button.clicked.connect(self._on_button_clicked) + self.editingFinished = self.entry.editingFinished + def get_value(self) -> str: return self.entry.get_value() diff --git a/AppGUI/preferences/PreferencesUIManager.py b/AppGUI/preferences/PreferencesUIManager.py index c0bfba22..6dede0db 100644 --- a/AppGUI/preferences/PreferencesUIManager.py +++ b/AppGUI/preferences/PreferencesUIManager.py @@ -123,8 +123,8 @@ class PreferencesUIManager: "gerber_def_zeros": self.ui.gerber_defaults_form.gerber_gen_group.gerber_zeros_radio, "gerber_clean_apertures": self.ui.gerber_defaults_form.gerber_gen_group.gerber_clean_cb, "gerber_extra_buffering": self.ui.gerber_defaults_form.gerber_gen_group.gerber_extra_buffering, - "gerber_plot_fill": self.ui.gerber_defaults_form.gerber_gen_group.pf_color_entry, - "gerber_plot_line": self.ui.gerber_defaults_form.gerber_gen_group.pl_color_entry, + "gerber_plot_fill": self.ui.gerber_defaults_form.gerber_gen_group.fill_color_entry, + "gerber_plot_line": self.ui.gerber_defaults_form.gerber_gen_group.line_color_entry, # Gerber Options "gerber_noncoppermargin": self.ui.gerber_defaults_form.gerber_opt_group.noncopper_margin_entry, @@ -737,7 +737,7 @@ class PreferencesUIManager: self.ui.fa_scroll_area.setWidget(fa_form) fa_form.show() - # Initialize the color box's color in Preferences -> Global -> Colo + # Initialize the color box's color in Preferences -> Global -> Colors self.__init_color_pickers() # Button handlers @@ -750,162 +750,90 @@ class PreferencesUIManager: def __init_color_pickers(self): # Init Gerber Plot Colors - self.ui.gerber_defaults_form.gerber_gen_group.pf_color_entry.set_value(self.defaults['gerber_plot_fill']) - self.ui.gerber_defaults_form.gerber_gen_group.pf_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['gerber_plot_fill'])[:7]) + self.ui.gerber_defaults_form.gerber_gen_group.fill_color_entry.set_value(self.defaults['gerber_plot_fill']) + self.ui.gerber_defaults_form.gerber_gen_group.line_color_entry.set_value(self.defaults['gerber_plot_line']) self.ui.gerber_defaults_form.gerber_gen_group.gerber_alpha_entry.set_value( int(self.defaults['gerber_plot_fill'][7:9], 16)) # alpha - self.ui.gerber_defaults_form.gerber_gen_group.pl_color_entry.set_value(self.defaults['gerber_plot_line']) - self.ui.gerber_defaults_form.gerber_gen_group.pl_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['gerber_plot_line'])[:7]) - # Init Excellon Plot Colors self.ui.excellon_defaults_form.excellon_gen_group.fill_color_entry.set_value( self.defaults['excellon_plot_fill']) - self.ui.excellon_defaults_form.excellon_gen_group.fill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['excellon_plot_fill'])[:7]) + self.ui.excellon_defaults_form.excellon_gen_group.line_color_entry.set_value( + self.defaults['excellon_plot_line']) self.ui.excellon_defaults_form.excellon_gen_group.excellon_alpha_entry.set_value( int(self.defaults['excellon_plot_fill'][7:9], 16)) - self.ui.excellon_defaults_form.excellon_gen_group.line_color_entry.set_value( - self.defaults['excellon_plot_line']) - self.ui.excellon_defaults_form.excellon_gen_group.line_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['excellon_plot_line'])[:7]) - # Init Geometry Plot Colors self.ui.geometry_defaults_form.geometry_gen_group.line_color_entry.set_value( self.defaults['geometry_plot_line']) - self.ui.geometry_defaults_form.geometry_gen_group.line_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['geometry_plot_line'])[:7]) # Init CNCJob Travel Line Colors self.ui.cncjob_defaults_form.cncjob_gen_group.tfill_color_entry.set_value( self.defaults['cncjob_travel_fill']) - self.ui.cncjob_defaults_form.cncjob_gen_group.tfill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['cncjob_travel_fill'])[:7]) + self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_entry.set_value( + self.defaults['cncjob_travel_line']) self.ui.cncjob_defaults_form.cncjob_gen_group.cncjob_alpha_entry.set_value( int(self.defaults['cncjob_travel_fill'][7:9], 16)) # alpha - self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_entry.set_value( - self.defaults['cncjob_travel_line']) - self.ui.cncjob_defaults_form.cncjob_gen_group.tline_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['cncjob_travel_line'])[:7]) - # Init CNCJob Plot Colors self.ui.cncjob_defaults_form.cncjob_gen_group.fill_color_entry.set_value( self.defaults['cncjob_plot_fill']) - self.ui.cncjob_defaults_form.cncjob_gen_group.fill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['cncjob_plot_fill'])[:7]) self.ui.cncjob_defaults_form.cncjob_gen_group.line_color_entry.set_value( self.defaults['cncjob_plot_line']) - self.ui.cncjob_defaults_form.cncjob_gen_group.line_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['cncjob_plot_line'])[:7]) # Init Left-Right Selection colors self.ui.general_defaults_form.general_gui_group.sf_color_entry.set_value(self.defaults['global_sel_fill']) - self.ui.general_defaults_form.general_gui_group.sf_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_sel_fill'])[:7]) + self.ui.general_defaults_form.general_gui_group.sl_color_entry.set_value(self.defaults['global_sel_line']) self.ui.general_defaults_form.general_gui_group.left_right_alpha_entry.set_value( int(self.defaults['global_sel_fill'][7:9], 16)) - self.ui.general_defaults_form.general_gui_group.sl_color_entry.set_value(self.defaults['global_sel_line']) - self.ui.general_defaults_form.general_gui_group.sl_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_sel_line'])[:7]) - # Init Right-Left Selection colors self.ui.general_defaults_form.general_gui_group.alt_sf_color_entry.set_value( self.defaults['global_alt_sel_fill']) - self.ui.general_defaults_form.general_gui_group.alt_sf_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_alt_sel_fill'])[:7]) + self.ui.general_defaults_form.general_gui_group.alt_sl_color_entry.set_value( + self.defaults['global_alt_sel_line']) self.ui.general_defaults_form.general_gui_group.right_left_alpha_entry.set_value( int(self.defaults['global_sel_fill'][7:9], 16)) - self.ui.general_defaults_form.general_gui_group.alt_sl_color_entry.set_value( - self.defaults['global_alt_sel_line']) - self.ui.general_defaults_form.general_gui_group.alt_sl_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_alt_sel_line'])[:7]) - # Init Draw color and Selection Draw Color self.ui.general_defaults_form.general_gui_group.draw_color_entry.set_value( self.defaults['global_draw_color']) - self.ui.general_defaults_form.general_gui_group.draw_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_draw_color'])[:7]) self.ui.general_defaults_form.general_gui_group.sel_draw_color_entry.set_value( self.defaults['global_sel_draw_color']) - self.ui.general_defaults_form.general_gui_group.sel_draw_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_sel_draw_color'])[:7]) # Init Project Items color self.ui.general_defaults_form.general_gui_group.proj_color_entry.set_value( self.defaults['global_proj_item_color']) - self.ui.general_defaults_form.general_gui_group.proj_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_proj_item_color'])[:7]) # Init Project Disabled Items color self.ui.general_defaults_form.general_gui_group.proj_color_dis_entry.set_value( self.defaults['global_proj_item_dis_color']) - self.ui.general_defaults_form.general_gui_group.proj_color_dis_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_proj_item_dis_color'])[:7]) - # Init Project Disabled Items color + # Init Mouse Cursor color self.ui.general_defaults_form.general_app_set_group.mouse_cursor_entry.set_value( self.defaults['global_cursor_color']) - self.ui.general_defaults_form.general_app_set_group.mouse_cursor_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['global_cursor_color'])[:7]) # Init the Annotation CNC Job color self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_entry.set_value( self.defaults['cncjob_annotation_fontcolor']) - self.ui.cncjob_defaults_form.cncjob_adv_opt_group.annotation_fontcolor_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['cncjob_annotation_fontcolor'])[:7]) # Init the Tool Film color self.ui.tools_defaults_form.tools_film_group.film_color_entry.set_value( self.defaults['tools_film_color']) - self.ui.tools_defaults_form.tools_film_group.film_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_film_color'])[:7] - ) # Init the Tool QRCode colors self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_entry.set_value( self.defaults['tools_qrcode_fill_color']) - self.ui.tools2_defaults_form.tools2_qrcode_group.fill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_qrcode_fill_color'])[:7]) self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_entry.set_value( self.defaults['tools_qrcode_back_color']) - self.ui.tools2_defaults_form.tools2_qrcode_group.back_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_qrcode_back_color'])[:7]) def on_save_button(self, save_to_file=True): log.debug("on_save_button() --> Applying preferences to file.") diff --git a/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py b/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py index f4809915..53f7e0ae 100644 --- a/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py +++ b/AppGUI/preferences/cncjob/CNCJobAdvOptPrefGroupUI.py @@ -1,7 +1,7 @@ -from PyQt5 import QtWidgets, QtGui, QtCore +from PyQt5 import QtWidgets, QtGui from PyQt5.QtCore import QSettings, Qt -from AppGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry +from AppGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext import AppTranslation as fcTranslate @@ -158,28 +158,16 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI): self.annotation_color_label.setToolTip( _("Set the font color for the annotation texts.") ) - self.annotation_fontcolor_entry = FCEntry() - self.annotation_fontcolor_button = QtWidgets.QPushButton() - self.annotation_fontcolor_button.setFixedSize(15, 15) + self.annotation_fontcolor_entry = FCColorEntry() - self.form_box_child = QtWidgets.QHBoxLayout() - self.form_box_child.setContentsMargins(0, 0, 0, 0) - self.form_box_child.addWidget(self.annotation_fontcolor_entry) - self.form_box_child.addWidget(self.annotation_fontcolor_button, alignment=Qt.AlignRight) - self.form_box_child.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - color_widget = QtWidgets.QWidget() - color_widget.setLayout(self.form_box_child) grid0.addWidget(self.annotation_color_label, 3, 0) - grid0.addWidget(color_widget, 3, 1) - grid0.addWidget(QtWidgets.QLabel(''), 3, 2) + grid0.addWidget(self.annotation_fontcolor_entry, 3, 1) + grid0.addWidget(QtWidgets.QLabel(''), 3, 2) self.layout.addStretch() self.tc_variable_combo.currentIndexChanged[str].connect(self.on_cnc_custom_parameters) - self.annotation_fontcolor_entry.editingFinished.connect(self.on_annotation_fontcolor_entry) - self.annotation_fontcolor_button.clicked.connect(self.on_annotation_fontcolor_button) def on_cnc_custom_parameters(self, signal_text): if signal_text == 'Parameters': @@ -189,20 +177,3 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI): def on_annotation_fontcolor_entry(self): self.app.defaults['cncjob_annotation_fontcolor'] = self.annotation_fontcolor_entry.get_value() - self.annotation_fontcolor_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['cncjob_annotation_fontcolor'])) - - def on_annotation_fontcolor_button(self): - current_color = QtGui.QColor(self.app.defaults['cncjob_annotation_fontcolor']) - - c_dialog = QtWidgets.QColorDialog() - annotation_color = c_dialog.getColor(initial=current_color) - - if annotation_color.isValid() is False: - return - - self.annotation_fontcolor_button.setStyleSheet("background-color:%s" % str(annotation_color.name())) - - new_val_sel = str(annotation_color.name()) - self.annotation_fontcolor_entry.set_value(new_val_sel) - self.app.defaults['cncjob_annotation_fontcolor'] = new_val_sel diff --git a/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py b/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py index 3396f0d3..11a88763 100644 --- a/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py +++ b/AppGUI/preferences/cncjob/CNCJobGenPrefGroupUI.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from AppGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCEntry, FCSliderWithSpinner +from AppGUI.GUIElements import FCCheckBox, RadioSet, FCSpinner, FCDoubleSpinner, FCSliderWithSpinner, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext import AppTranslation as fcTranslate @@ -170,17 +170,10 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): self.tline_color_label.setToolTip( _("Set the travel line color for plotted objects.") ) - self.tline_color_entry = FCEntry() - self.tline_color_button = QtWidgets.QPushButton() - self.tline_color_button.setFixedSize(15, 15) - - self.form_box_child_2 = QtWidgets.QHBoxLayout() - self.form_box_child_2.addWidget(self.tline_color_entry) - self.form_box_child_2.addWidget(self.tline_color_button) - self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.tline_color_entry = FCColorEntry() grid0.addWidget(self.tline_color_label, 14, 0) - grid0.addLayout(self.form_box_child_2, 14, 1) + grid0.addWidget(self.tline_color_entry, 14, 1) # Plot Fill Color self.tfill_color_label = QtWidgets.QLabel('%s:' % _('Fill')) @@ -189,17 +182,10 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.tfill_color_entry = FCEntry() - self.tfill_color_button = QtWidgets.QPushButton() - self.tfill_color_button.setFixedSize(15, 15) - - self.form_box_child_1 = QtWidgets.QHBoxLayout() - self.form_box_child_1.addWidget(self.tfill_color_entry) - self.form_box_child_1.addWidget(self.tfill_color_button) - self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.tfill_color_entry = FCColorEntry() grid0.addWidget(self.tfill_color_label, 15, 0) - grid0.addLayout(self.form_box_child_1, 15, 1) + grid0.addWidget(self.tfill_color_entry, 15, 1) # Plot Fill Transparency Level self.cncjob_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha')) @@ -217,7 +203,7 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): grid0.addWidget(separator_line, 17, 0, 1, 2) # CNCJob Object Color - self.cnc_color_label = QtWidgets.QLabel('%s' % _('CNCJob Object Color')) + self.cnc_color_label = QtWidgets.QLabel('%s' % _('Object Color')) grid0.addWidget(self.cnc_color_label, 18, 0, 1, 2) # Plot Line Color @@ -225,17 +211,10 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): self.line_color_label.setToolTip( _("Set the color for plotted objects.") ) - self.line_color_entry = FCEntry() - self.line_color_button = QtWidgets.QPushButton() - self.line_color_button.setFixedSize(15, 15) - - self.form_box_child_2 = QtWidgets.QHBoxLayout() - self.form_box_child_2.addWidget(self.line_color_entry) - self.form_box_child_2.addWidget(self.line_color_button) - self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.line_color_entry = FCColorEntry() grid0.addWidget(self.line_color_label, 19, 0) - grid0.addLayout(self.form_box_child_2, 19, 1) + grid0.addWidget(self.line_color_entry, 19, 1) # Plot Fill Color self.fill_color_label = QtWidgets.QLabel('%s:' % _('Fill')) @@ -244,32 +223,21 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.fill_color_entry = FCEntry() - self.fill_color_button = QtWidgets.QPushButton() - self.fill_color_button.setFixedSize(15, 15) - - self.form_box_child_1 = QtWidgets.QHBoxLayout() - self.form_box_child_1.addWidget(self.fill_color_entry) - self.form_box_child_1.addWidget(self.fill_color_button) - self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.fill_color_entry = FCColorEntry() grid0.addWidget(self.fill_color_label, 20, 0) - grid0.addLayout(self.form_box_child_1, 20, 1) + grid0.addWidget(self.fill_color_entry, 20, 1) self.layout.addStretch() # Setting plot colors signals self.tline_color_entry.editingFinished.connect(self.on_tline_color_entry) - self.tline_color_button.clicked.connect(self.on_tline_color_button) self.tfill_color_entry.editingFinished.connect(self.on_tfill_color_entry) - self.tfill_color_button.clicked.connect(self.on_tfill_color_button) self.cncjob_alpha_entry.valueChanged.connect(self.on_cncjob_alpha_changed) # alpha self.line_color_entry.editingFinished.connect(self.on_line_color_entry) - self.line_color_button.clicked.connect(self.on_line_color_button) self.fill_color_entry.editingFinished.connect(self.on_fill_color_entry) - self.fill_color_button.clicked.connect(self.on_fill_color_button) # ------------------------------------------------------ # Setting travel colors handlers @@ -277,23 +245,10 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): def on_tfill_color_entry(self): self.app.defaults['cncjob_travel_fill'] = self.tfill_color_entry.get_value()[:7] + \ self.app.defaults['cncjob_travel_fill'][7:9] - self.tfill_color_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['cncjob_travel_fill'])[:7]) - def on_tfill_color_button(self): - current_color = QtGui.QColor(self.app.defaults['cncjob_travel_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.tfill_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['cncjob_travel_fill'][7:9]) - self.tfill_color_entry.set_value(new_val) - self.app.defaults['cncjob_travel_fill'] = new_val + def on_tline_color_entry(self): + self.app.defaults['cncjob_travel_line'] = self.tline_color_entry.get_value()[:7] + \ + self.app.defaults['cncjob_travel_line'][7:9] def on_cncjob_alpha_changed(self, spinner_value): self.app.defaults['cncjob_travel_fill'] = \ @@ -303,70 +258,13 @@ class CNCJobGenPrefGroupUI(OptionsGroupUI): self.app.defaults['cncjob_travel_line'][:7] + \ (hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00') - def on_tline_color_entry(self): - self.app.defaults['cncjob_travel_line'] = self.tline_color_entry.get_value()[:7] + \ - self.app.defaults['cncjob_travel_line'][7:9] - self.tline_color_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['cncjob_travel_line'])[:7]) - - def on_tline_color_button(self): - current_color = QtGui.QColor(self.app.defaults['cncjob_travel_line'][:7]) - # print(current_color) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.tline_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['cncjob_travel_line'][7:9]) - self.tline_color_entry.set_value(new_val_line) - self.app.defaults['cncjob_travel_line'] = new_val_line - # ------------------------------------------------------ # Setting plot colors handlers # ------------------------------------------------------ def on_fill_color_entry(self): self.app.defaults['cncjob_plot_fill'] = self.fill_color_entry.get_value()[:7] + \ self.app.defaults['cncjob_plot_fill'][7:9] - self.fill_color_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['cncjob_plot_fill'])[:7]) - - def on_fill_color_button(self): - current_color = QtGui.QColor(self.app.defaults['cncjob_plot_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.fill_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['cncjob_plot_fill'][7:9]) - self.fill_color_entry.set_value(new_val) - self.app.defaults['cncjob_plot_fill'] = new_val def on_line_color_entry(self): self.app.defaults['cncjob_plot_line'] = self.line_color_entry.get_value()[:7] + \ self.app.defaults['cncjob_plot_line'][7:9] - self.line_color_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['cncjob_plot_line'])[:7]) - - def on_line_color_button(self): - current_color = QtGui.QColor(self.app.defaults['cncjob_plot_line'][:7]) - # print(current_color) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.line_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['cncjob_plot_line'][7:9]) - self.line_color_entry.set_value(new_val_line) - self.app.defaults['cncjob_plot_line'] = new_val_line diff --git a/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py b/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py index 6516898e..93d4e9a4 100644 --- a/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py +++ b/AppGUI/preferences/excellon/ExcellonGenPrefGroupUI.py @@ -3,7 +3,7 @@ import platform from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry, FCSliderWithSpinner +from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry, FCSliderWithSpinner, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext import AppTranslation as fcTranslate @@ -264,7 +264,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): grid2.addWidget(separator_line, 11, 0, 1, 2) # Excellon Object Color - self.gerber_color_label = QtWidgets.QLabel('%s' % _('Excellon Object Color')) + self.gerber_color_label = QtWidgets.QLabel('%s' % _('Object Color')) grid2.addWidget(self.gerber_color_label, 12, 0, 1, 2) # Plot Line Color @@ -272,17 +272,10 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): self.line_color_label.setToolTip( _("Set the line color for plotted objects.") ) - self.line_color_entry = FCEntry() - self.line_color_button = QtWidgets.QPushButton() - self.line_color_button.setFixedSize(15, 15) - - self.form_box_child_2 = QtWidgets.QHBoxLayout() - self.form_box_child_2.addWidget(self.line_color_entry) - self.form_box_child_2.addWidget(self.line_color_button) - self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.line_color_entry = FCColorEntry() grid2.addWidget(self.line_color_label, 13, 0) - grid2.addLayout(self.form_box_child_2, 13, 1) + grid2.addWidget(self.line_color_entry, 13, 1) # Plot Fill Color self.fill_color_label = QtWidgets.QLabel('%s:' % _('Fill')) @@ -291,17 +284,10 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.fill_color_entry = FCEntry() - self.fill_color_button = QtWidgets.QPushButton() - self.fill_color_button.setFixedSize(15, 15) - - self.form_box_child_1 = QtWidgets.QHBoxLayout() - self.form_box_child_1.addWidget(self.fill_color_entry) - self.form_box_child_1.addWidget(self.fill_color_button) - self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.fill_color_entry = FCColorEntry() grid2.addWidget(self.fill_color_label, 14, 0) - grid2.addLayout(self.form_box_child_1, 14, 1) + grid2.addWidget(self.fill_color_entry, 14, 1) # Plot Fill Transparency Level self.excellon_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha')) @@ -331,9 +317,7 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): # Setting plot colors signals self.line_color_entry.editingFinished.connect(self.on_line_color_entry) - self.line_color_button.clicked.connect(self.on_line_color_button) self.fill_color_entry.editingFinished.connect(self.on_fill_color_entry) - self.fill_color_button.clicked.connect(self.on_fill_color_button) self.excellon_alpha_entry.valueChanged.connect(self.on_excellon_alpha_changed) # alpha @@ -358,22 +342,10 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): def on_fill_color_entry(self): self.app.defaults['excellon_plot_fill'] = self.fill_color_entry.get_value()[:7] + \ self.app.defaults['excellon_plot_fill'][7:9] - self.fill_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['excellon_plot_fill'])[:7]) - def on_fill_color_button(self): - current_color = QtGui.QColor(self.app.defaults['excellon_plot_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.fill_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['excellon_plot_fill'][7:9]) - self.fill_color_entry.set_value(new_val) - self.app.defaults['excellon_plot_fill'] = new_val + def on_line_color_entry(self): + self.app.defaults['excellon_plot_line'] = self.line_color_entry.get_value()[:7] + \ + self.app.defaults['excellon_plot_line'][7:9] def on_excellon_alpha_changed(self, spinner_value): self.app.defaults['excellon_plot_fill'] = \ @@ -383,27 +355,6 @@ class ExcellonGenPrefGroupUI(OptionsGroupUI): self.app.defaults['excellon_plot_line'][:7] + \ (hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00') - def on_line_color_entry(self): - self.app.defaults['excellon_plot_line'] = self.line_color_entry.get_value()[:7] + \ - self.app.defaults['excellon_plot_line'][7:9] - self.line_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['excellon_plot_line'])[:7]) - - def on_line_color_button(self): - current_color = QtGui.QColor(self.app.defaults['excellon_plot_line'][:7]) - # print(current_color) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.line_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['excellon_plot_line'][7:9]) - self.line_color_entry.set_value(new_val_line) - self.app.defaults['excellon_plot_line'] = new_val_line - def on_excellon_defaults_button(self): self.app.preferencesUiManager.defaults_form_fields["excellon_format_lower_in"].set_value('4') self.app.preferencesUiManager.defaults_form_fields["excellon_format_upper_in"].set_value('2') diff --git a/AppGUI/preferences/general/GeneralAPPSetGroupUI.py b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py index a056c200..bfc8f91b 100644 --- a/AppGUI/preferences/general/GeneralAPPSetGroupUI.py +++ b/AppGUI/preferences/general/GeneralAPPSetGroupUI.py @@ -1,8 +1,8 @@ -from PyQt5 import QtCore, QtWidgets, QtGui +from PyQt5 import QtCore, QtWidgets from PyQt5.QtCore import QSettings from AppGUI.GUIElements import FCDoubleSpinner, FCCheckBox, FCComboBox, RadioSet, OptionalInputSection, FCSpinner, \ - FCEntry + FCColorEntry from AppGUI.preferences import settings from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI @@ -334,24 +334,16 @@ class GeneralAPPSetGroupUI(OptionsGroupUI): self.mouse_color_label.setToolTip( _("Set the color of the mouse cursor.") ) - self.mouse_cursor_entry = FCEntry() - self.mouse_cursor_button = QtWidgets.QPushButton() - self.mouse_cursor_button.setFixedSize(15, 15) - - self.form_box_child_1 = QtWidgets.QHBoxLayout() - self.form_box_child_1.addWidget(self.mouse_cursor_entry) - self.form_box_child_1.addWidget(self.mouse_cursor_button) - self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.mouse_cursor_entry = FCColorEntry() grid0.addWidget(self.mouse_color_label, 26, 0) - grid0.addLayout(self.form_box_child_1, 26, 1) + grid0.addWidget(self.mouse_cursor_entry, 26, 1) self.mois = OptionalInputSection( self.mouse_cursor_color_cb, [ self.mouse_color_label, - self.mouse_cursor_entry, - self.mouse_cursor_button + self.mouse_cursor_entry ] ) # Select mouse pan button @@ -451,9 +443,7 @@ class GeneralAPPSetGroupUI(OptionsGroupUI): self.layout.addStretch() self.mouse_cursor_color_cb.stateChanged.connect(self.on_mouse_cursor_color_enable) - self.mouse_cursor_entry.editingFinished.connect(self.on_mouse_cursor_entry) - self.mouse_cursor_button.clicked.connect(self.on_mouse_cursor_button) def on_mouse_cursor_color_enable(self, val): if val: @@ -472,23 +462,4 @@ class GeneralAPPSetGroupUI(OptionsGroupUI): def on_mouse_cursor_entry(self): self.app.defaults['global_cursor_color'] = self.mouse_cursor_entry.get_value() - self.mouse_cursor_button.setStyleSheet("background-color:%s" % str(self.app.defaults['global_cursor_color'])) - - self.app.cursor_color_3D = self.app.defaults["global_cursor_color"] - - def on_mouse_cursor_button(self): - current_color = QtGui.QColor(self.app.defaults['global_cursor_color']) - - c_dialog = QtWidgets.QColorDialog() - proj_color = c_dialog.getColor(initial=current_color) - - if proj_color.isValid() is False: - return - - self.mouse_cursor_button.setStyleSheet("background-color:%s" % str(proj_color.name())) - - new_val_sel = str(proj_color.name()) - self.mouse_cursor_entry.set_value(new_val_sel) - self.app.defaults['global_cursor_color'] = new_val_sel - self.app.cursor_color_3D = self.app.defaults["global_cursor_color"] diff --git a/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py b/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py index 9215e09a..4b9cb96e 100644 --- a/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py +++ b/AppGUI/preferences/general/GeneralGUIPrefGroupUI.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings, Qt -from AppGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCEntry, FCSpinner, FCSliderWithSpinner +from AppGUI.GUIElements import RadioSet, FCCheckBox, FCComboBox, FCSliderWithSpinner, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -155,17 +155,10 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.sl_color_label.setToolTip( _("Set the line color for the 'left to right' selection box.") ) - self.sl_color_entry = FCEntry() - self.sl_color_button = QtWidgets.QPushButton() - self.sl_color_button.setFixedSize(15, 15) - - self.form_box_child_4 = QtWidgets.QHBoxLayout() - self.form_box_child_4.addWidget(self.sl_color_entry) - self.form_box_child_4.addWidget(self.sl_color_button) - self.form_box_child_4.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.sl_color_entry = FCColorEntry() grid0.addWidget(self.sl_color_label, 16, 0) - grid0.addLayout(self.form_box_child_4, 16, 1) + grid0.addWidget(self.sl_color_entry, 16, 1) self.sf_color_label = QtWidgets.QLabel('%s:' % _('Fill')) self.sf_color_label.setToolTip( @@ -174,17 +167,10 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.sf_color_entry = FCEntry() - self.sf_color_button = QtWidgets.QPushButton() - self.sf_color_button.setFixedSize(15, 15) - - self.form_box_child_5 = QtWidgets.QHBoxLayout() - self.form_box_child_5.addWidget(self.sf_color_entry) - self.form_box_child_5.addWidget(self.sf_color_button) - self.form_box_child_5.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.sf_color_entry = FCColorEntry() grid0.addWidget(self.sf_color_label, 17, 0) - grid0.addLayout(self.form_box_child_5, 17, 1) + grid0.addWidget(self.sf_color_entry, 17, 1) # Plot Selection (left - right) Fill Transparency Level self.left_right_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha')) @@ -210,17 +196,10 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.alt_sl_color_label.setToolTip( _("Set the line color for the 'right to left' selection box.") ) - self.alt_sl_color_entry = FCEntry() - self.alt_sl_color_button = QtWidgets.QPushButton() - self.alt_sl_color_button.setFixedSize(15, 15) - - self.form_box_child_7 = QtWidgets.QHBoxLayout() - self.form_box_child_7.addWidget(self.alt_sl_color_entry) - self.form_box_child_7.addWidget(self.alt_sl_color_button) - self.form_box_child_7.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.alt_sl_color_entry = FCColorEntry() grid0.addWidget(self.alt_sl_color_label, 21, 0) - grid0.addLayout(self.form_box_child_7, 21, 1) + grid0.addWidget(self.alt_sl_color_entry, 21, 1) # Plot Selection (right - left) Fill Color self.alt_sf_color_label = QtWidgets.QLabel('%s:' % _('Fill')) @@ -230,24 +209,17 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.alt_sf_color_entry = FCEntry() - self.alt_sf_color_button = QtWidgets.QPushButton() - self.alt_sf_color_button.setFixedSize(15, 15) - - self.form_box_child_8 = QtWidgets.QHBoxLayout() - self.form_box_child_8.addWidget(self.alt_sf_color_entry) - self.form_box_child_8.addWidget(self.alt_sf_color_button) - self.form_box_child_8.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.alt_sf_color_entry = FCColorEntry() grid0.addWidget(self.alt_sf_color_label, 22, 0) - grid0.addLayout(self.form_box_child_8, 22, 1) + grid0.addWidget(self.alt_sf_color_entry, 22, 1) # Plot Selection (right - left) Fill Transparency Level self.right_left_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha')) self.right_left_alpha_label.setToolTip( _("Set the fill transparency for selection 'right to left' box.") ) - self.right_left_alpha_entry = FCSliderWithSpinner(0 , 255, 1) + self.right_left_alpha_entry = FCSliderWithSpinner(0, 255, 1) grid0.addWidget(self.right_left_alpha_label, 23, 0) grid0.addWidget(self.right_left_alpha_entry, 23, 1) @@ -269,34 +241,20 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.alt_sf_color_label.setToolTip( _("Set the color for the shape.") ) - self.draw_color_entry = FCEntry() - self.draw_color_button = QtWidgets.QPushButton() - self.draw_color_button.setFixedSize(15, 15) - - self.form_box_child_10 = QtWidgets.QHBoxLayout() - self.form_box_child_10.addWidget(self.draw_color_entry) - self.form_box_child_10.addWidget(self.draw_color_button) - self.form_box_child_10.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.draw_color_entry = FCColorEntry() grid0.addWidget(self.draw_color_label, 26, 0) - grid0.addLayout(self.form_box_child_10, 26, 1) + grid0.addWidget(self.draw_color_entry, 26, 1) # Editor Draw Selection Color self.sel_draw_color_label = QtWidgets.QLabel('%s:' % _('Selection')) self.sel_draw_color_label.setToolTip( _("Set the color of the shape when selected.") ) - self.sel_draw_color_entry = FCEntry() - self.sel_draw_color_button = QtWidgets.QPushButton() - self.sel_draw_color_button.setFixedSize(15, 15) - - self.form_box_child_11 = QtWidgets.QHBoxLayout() - self.form_box_child_11.addWidget(self.sel_draw_color_entry) - self.form_box_child_11.addWidget(self.sel_draw_color_button) - self.form_box_child_11.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.sel_draw_color_entry = FCColorEntry() grid0.addWidget(self.sel_draw_color_label, 27, 0) - grid0.addLayout(self.form_box_child_11, 27, 1) + grid0.addWidget(self.sel_draw_color_entry, 27, 1) separator_line = QtWidgets.QFrame() separator_line.setFrameShape(QtWidgets.QFrame.HLine) @@ -315,34 +273,20 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.proj_color_label.setToolTip( _("Set the color of the items in Project Tab Tree.") ) - self.proj_color_entry = FCEntry() - self.proj_color_button = QtWidgets.QPushButton() - self.proj_color_button.setFixedSize(15, 15) - - self.form_box_child_12 = QtWidgets.QHBoxLayout() - self.form_box_child_12.addWidget(self.proj_color_entry) - self.form_box_child_12.addWidget(self.proj_color_button) - self.form_box_child_12.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.proj_color_entry = FCColorEntry() grid0.addWidget(self.proj_color_label, 30, 0) - grid0.addLayout(self.form_box_child_12, 30, 1) + grid0.addWidget(self.proj_color_entry, 30, 1) self.proj_color_dis_label = QtWidgets.QLabel('%s:' % _('Disabled')) self.proj_color_dis_label.setToolTip( _("Set the color of the items in Project Tab Tree,\n" "for the case when the items are disabled.") ) - self.proj_color_dis_entry = FCEntry() - self.proj_color_dis_button = QtWidgets.QPushButton() - self.proj_color_dis_button.setFixedSize(15, 15) - - self.form_box_child_13 = QtWidgets.QHBoxLayout() - self.form_box_child_13.addWidget(self.proj_color_dis_entry) - self.form_box_child_13.addWidget(self.proj_color_dis_button) - self.form_box_child_13.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.proj_color_dis_entry = FCColorEntry() grid0.addWidget(self.proj_color_dis_label, 31, 0) - grid0.addLayout(self.form_box_child_13, 31, 1) + grid0.addWidget(self.proj_color_dis_entry, 31, 1) # Project autohide CB self.project_autohide_cb = FCCheckBox(label=_('Project AutoHide')) @@ -365,32 +309,22 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): # Setting selection (left - right) colors signals self.sf_color_entry.editingFinished.connect(self.on_sf_color_entry) - self.sf_color_button.clicked.connect(self.on_sf_color_button) self.sl_color_entry.editingFinished.connect(self.on_sl_color_entry) - self.sl_color_button.clicked.connect(self.on_sl_color_button) self.left_right_alpha_entry.valueChanged.connect(self.on_left_right_alpha_changed) # alpha # Setting selection (right - left) colors signals self.alt_sf_color_entry.editingFinished.connect(self.on_alt_sf_color_entry) - self.alt_sf_color_button.clicked.connect(self.on_alt_sf_color_button) self.alt_sl_color_entry.editingFinished.connect(self.on_alt_sl_color_entry) - self.alt_sl_color_button.clicked.connect(self.on_alt_sl_color_button) self.right_left_alpha_entry.valueChanged.connect(self.on_right_left_alpha_changed) # alpha # Setting Editor Draw colors signals self.draw_color_entry.editingFinished.connect(self.on_draw_color_entry) - self.draw_color_button.clicked.connect(self.on_draw_color_button) - self.sel_draw_color_entry.editingFinished.connect(self.on_sel_draw_color_entry) - self.sel_draw_color_button.clicked.connect(self.on_sel_draw_color_button) self.proj_color_entry.editingFinished.connect(self.on_proj_color_entry) - self.proj_color_button.clicked.connect(self.on_proj_color_button) - self.proj_color_dis_entry.editingFinished.connect(self.on_proj_color_dis_entry) - self.proj_color_dis_button.clicked.connect(self.on_proj_color_dis_button) self.layout_combo.activated.connect(self.on_layout) @@ -417,20 +351,10 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.app.defaults['global_sel_fill'] = self.app.defaults['global_sel_fill'][7:9] self.sf_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['global_sel_fill'])[:7]) - def on_sf_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_sel_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.sf_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['global_sel_fill'][7:9]) - self.sf_color_entry.set_value(new_val) - self.app.defaults['global_sel_fill'] = new_val + def on_sl_color_entry(self): + self.app.defaults['global_sel_line'] = self.sl_color_entry.get_value()[:7] + \ + self.app.defaults['global_sel_line'][7:9] + self.sl_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['global_sel_line'])[:7]) def on_left_right_alpha_changed(self, spinner_value): """ @@ -448,26 +372,6 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.app.defaults['global_sel_line'] = self.app.defaults['global_sel_line'][:7] + \ (hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00') - def on_sl_color_entry(self): - self.app.defaults['global_sel_line'] = self.sl_color_entry.get_value()[:7] + \ - self.app.defaults['global_sel_line'][7:9] - self.sl_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['global_sel_line'])[:7]) - - def on_sl_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_sel_line'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.sl_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['global_sel_line'][7:9]) - self.sl_color_entry.set_value(new_val_line) - self.app.defaults['global_sel_line'] = new_val_line - # Setting selection colors (right - left) handlers def on_alt_sf_color_entry(self): self.app.defaults['global_alt_sel_fill'] = self.alt_sf_color_entry.get_value()[:7] + \ @@ -476,20 +380,12 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): "background-color:%s" % str(self.app.defaults['global_alt_sel_fill'])[:7] ) - def on_alt_sf_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_alt_sel_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.alt_sf_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['global_alt_sel_fill'][7:9]) - self.alt_sf_color_entry.set_value(new_val) - self.app.defaults['global_alt_sel_fill'] = new_val + def on_alt_sl_color_entry(self): + self.app.defaults['global_alt_sel_line'] = self.alt_sl_color_entry.get_value()[:7] + \ + self.app.defaults['global_alt_sel_line'][7:9] + self.alt_sl_color_button.setStyleSheet( + "background-color:%s" % str(self.app.defaults['global_alt_sel_line'])[:7] + ) def on_right_left_alpha_changed(self, spinner_value): """ @@ -507,112 +403,26 @@ class GeneralGUIPrefGroupUI(OptionsGroupUI): self.app.defaults['global_alt_sel_line'] = self.app.defaults['global_alt_sel_line'][:7] + \ (hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00') - def on_alt_sf_color_slider(self): - slider_value = self.alt_sf_color_alpha_slider.value() - self.alt_sf_color_alpha_spinner.setValue(slider_value) - - def on_alt_sl_color_entry(self): - self.app.defaults['global_alt_sel_line'] = self.alt_sl_color_entry.get_value()[:7] + \ - self.app.defaults['global_alt_sel_line'][7:9] - self.alt_sl_color_button.setStyleSheet( - "background-color:%s" % str(self.app.defaults['global_alt_sel_line'])[:7] - ) - - def on_alt_sl_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_alt_sel_line'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.alt_sl_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['global_alt_sel_line'][7:9]) - self.alt_sl_color_entry.set_value(new_val_line) - self.app.defaults['global_alt_sel_line'] = new_val_line - # Setting Editor colors def on_draw_color_entry(self): self.app.defaults['global_draw_color'] = self.draw_color_entry.get_value() self.draw_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['global_draw_color'])) - def on_draw_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_draw_color']) - - c_dialog = QtWidgets.QColorDialog() - draw_color = c_dialog.getColor(initial=current_color) - - if draw_color.isValid() is False: - return - - self.draw_color_button.setStyleSheet("background-color:%s" % str(draw_color.name())) - - new_val = str(draw_color.name()) - self.draw_color_entry.set_value(new_val) - self.app.defaults['global_draw_color'] = new_val - def on_sel_draw_color_entry(self): self.app.defaults['global_sel_draw_color'] = self.sel_draw_color_entry.get_value() self.sel_draw_color_button.setStyleSheet( "background-color:%s" % str(self.app.defaults['global_sel_draw_color'])) - def on_sel_draw_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_sel_draw_color']) - - c_dialog = QtWidgets.QColorDialog() - sel_draw_color = c_dialog.getColor(initial=current_color) - - if sel_draw_color.isValid() is False: - return - - self.sel_draw_color_button.setStyleSheet("background-color:%s" % str(sel_draw_color.name())) - - new_val_sel = str(sel_draw_color.name()) - self.sel_draw_color_entry.set_value(new_val_sel) - self.app.defaults['global_sel_draw_color'] = new_val_sel - def on_proj_color_entry(self): self.app.defaults['global_proj_item_color'] = self.proj_color_entry.get_value() self.proj_color_button.setStyleSheet( "background-color:%s" % str(self.app.defaults['global_proj_item_color'])) - def on_proj_color_button(self): - current_color = QtGui.QColor(self.app.defaults['global_proj_item_color']) - - c_dialog = QtWidgets.QColorDialog() - proj_color = c_dialog.getColor(initial=current_color) - - if proj_color.isValid() is False: - return - - self.proj_color_button.setStyleSheet("background-color:%s" % str(proj_color.name())) - - new_val_sel = str(proj_color.name()) - self.proj_color_entry.set_value(new_val_sel) - self.app.defaults['global_proj_item_color'] = new_val_sel - def on_proj_color_dis_entry(self): self.app.defaults['global_proj_item_dis_color'] = self.proj_color_dis_entry.get_value() self.proj_color_dis_button.setStyleSheet( "background-color:%s" % str(self.app.defaults['global_proj_item_dis_color'])) - def on_proj_color_dis_button(self): - current_color = QtGui.QColor(self.app.defaults['global_proj_item_dis_color']) - - c_dialog = QtWidgets.QColorDialog() - proj_color = c_dialog.getColor(initial=current_color) - - if proj_color.isValid() is False: - return - - self.proj_color_dis_button.setStyleSheet("background-color:%s" % str(proj_color.name())) - - new_val_sel = str(proj_color.name()) - self.proj_color_dis_entry.set_value(new_val_sel) - self.app.defaults['global_proj_item_dis_color'] = new_val_sel - def on_layout(self, index=None, lay=None): """ Set the toolbars layout (location) diff --git a/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py b/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py index dd4f77ac..b958fca1 100644 --- a/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py +++ b/AppGUI/preferences/geometry/GeometryGenPrefGroupUI.py @@ -1,7 +1,7 @@ -from PyQt5 import QtWidgets, QtCore, QtGui +from PyQt5 import QtWidgets from PyQt5.QtCore import QSettings -from AppGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry +from AppGUI.GUIElements import FCCheckBox, FCSpinner, FCEntry, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -32,7 +32,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI): self.layout.addWidget(self.plot_options_label) plot_hlay = QtWidgets.QHBoxLayout() - self.layout.addLayout((plot_hlay)) + self.layout.addLayout(plot_hlay) # Plot CB self.plot_cb = FCCheckBox(label=_('Plot')) @@ -87,7 +87,7 @@ class GeometryGenPrefGroupUI(OptionsGroupUI): grid0.addWidget(separator_line, 9, 0, 1, 2) # Geometry Object Color - self.gerber_color_label = QtWidgets.QLabel('%s' % _('Geometry Object Color')) + self.gerber_color_label = QtWidgets.QLabel('%s' % _('Object Color')) grid0.addWidget(self.gerber_color_label, 10, 0, 1, 2) # Plot Line Color @@ -95,39 +95,15 @@ class GeometryGenPrefGroupUI(OptionsGroupUI): self.line_color_label.setToolTip( _("Set the line color for plotted objects.") ) - self.line_color_entry = FCEntry() - self.line_color_button = QtWidgets.QPushButton() - self.line_color_button.setFixedSize(15, 15) - - self.form_box_child_2 = QtWidgets.QHBoxLayout() - self.form_box_child_2.addWidget(self.line_color_entry) - self.form_box_child_2.addWidget(self.line_color_button) - self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) + self.line_color_entry = FCColorEntry() grid0.addWidget(self.line_color_label, 11, 0) - grid0.addLayout(self.form_box_child_2, 11, 1) + grid0.addWidget(self.line_color_entry, 11, 1) self.layout.addStretch() # Setting plot colors signals self.line_color_entry.editingFinished.connect(self.on_line_color_entry) - self.line_color_button.clicked.connect(self.on_line_color_button) def on_line_color_entry(self): self.app.defaults['geometry_plot_line'] = self.line_color_entry.get_value()[:7] + 'FF' - self.line_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['geometry_plot_line'])[:7]) - - def on_line_color_button(self): - current_color = QtGui.QColor(self.app.defaults['geometry_plot_line'][:7]) - # print(current_color) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.line_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['geometry_plot_line'][7:9]) - self.line_color_entry.set_value(new_val_line) diff --git a/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py b/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py index dbc93b53..da893c53 100644 --- a/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py +++ b/AppGUI/preferences/gerber/GerberGenPrefGroupUI.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import QSettings -from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry, FCSliderWithSpinner +from AppGUI.GUIElements import FCCheckBox, FCSpinner, RadioSet, FCEntry, FCSliderWithSpinner, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -146,44 +146,30 @@ class GerberGenPrefGroupUI(OptionsGroupUI): grid0.addWidget(separator_line, 9, 0, 1, 3) # Gerber Object Color - self.gerber_color_label = QtWidgets.QLabel('%s' % _('Gerber Object Color')) + self.gerber_color_label = QtWidgets.QLabel('%s' % _('Object Color')) grid0.addWidget(self.gerber_color_label, 10, 0, 1, 3) # Plot Line Color - self.pl_color_label = QtWidgets.QLabel('%s:' % _('Outline')) - self.pl_color_label.setToolTip( + self.line_color_label = QtWidgets.QLabel('%s:' % _('Outline')) + self.line_color_label.setToolTip( _("Set the line color for plotted objects.") ) - self.pl_color_entry = FCEntry() - self.pl_color_button = QtWidgets.QPushButton() - self.pl_color_button.setFixedSize(15, 15) + self.line_color_entry = FCColorEntry() - self.form_box_child_2 = QtWidgets.QHBoxLayout() - self.form_box_child_2.addWidget(self.pl_color_entry) - self.form_box_child_2.addWidget(self.pl_color_button) - self.form_box_child_2.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - grid0.addWidget(self.pl_color_label, 11, 0) - grid0.addLayout(self.form_box_child_2, 11, 1, 1, 2) + grid0.addWidget(self.line_color_label, 11, 0) + grid0.addWidget(self.line_color_entry, 11, 1, 1, 2) # Plot Fill Color - self.pf_color_label = QtWidgets.QLabel('%s:' % _('Fill')) - self.pf_color_label.setToolTip( + self.fill_color_label = QtWidgets.QLabel('%s:' % _('Fill')) + self.fill_color_label.setToolTip( _("Set the fill color for plotted objects.\n" "First 6 digits are the color and the last 2\n" "digits are for alpha (transparency) level.") ) - self.pf_color_entry = FCEntry() - self.pf_color_button = QtWidgets.QPushButton() - self.pf_color_button.setFixedSize(15, 15) + self.fill_color_entry = FCColorEntry() - self.form_box_child_1 = QtWidgets.QHBoxLayout() - self.form_box_child_1.addWidget(self.pf_color_entry) - self.form_box_child_1.addWidget(self.pf_color_button) - self.form_box_child_1.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - grid0.addWidget(self.pf_color_label, 12, 0) - grid0.addLayout(self.form_box_child_1, 12, 1, 1, 2) + grid0.addWidget(self.fill_color_label, 12, 0) + grid0.addWidget(self.fill_color_entry, 12, 1, 1, 2) # Plot Fill Transparency Level self.gerber_alpha_label = QtWidgets.QLabel('%s:' % _('Alpha')) @@ -198,33 +184,15 @@ class GerberGenPrefGroupUI(OptionsGroupUI): self.layout.addStretch() # Setting plot colors signals - self.pl_color_entry.editingFinished.connect(self.on_pl_color_entry) - self.pl_color_button.clicked.connect(self.on_pl_color_button) - self.pf_color_entry.editingFinished.connect(self.on_pf_color_entry) - self.pf_color_button.clicked.connect(self.on_pf_color_button) + self.line_color_entry.editingFinished.connect(self.on_line_color_changed) + self.fill_color_entry.editingFinished.connect(self.on_fill_color_changed) self.gerber_alpha_entry.valueChanged.connect(self.on_gerber_alpha_changed) # alpha # Setting plot colors handlers - def on_pf_color_entry(self): - self.app.defaults['gerber_plot_fill'] = self.pf_color_entry.get_value()[:7] + \ - self.app.defaults['gerber_plot_fill'][7:9] - self.pf_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['gerber_plot_fill'])[:7]) - - def on_pf_color_button(self): - current_color = QtGui.QColor(self.app.defaults['gerber_plot_fill'][:7]) - - c_dialog = QtWidgets.QColorDialog() - plot_fill_color = c_dialog.getColor(initial=current_color) - - if plot_fill_color.isValid() is False: - return - - self.pf_color_button.setStyleSheet("background-color:%s" % str(plot_fill_color.name())) - - new_val = str(plot_fill_color.name()) + str(self.app.defaults['gerber_plot_fill'][7:9]) - self.pf_color_entry.set_value(new_val) - self.app.defaults['gerber_plot_fill'] = new_val + def on_fill_color_changed(self): + self.app.defaults['gerber_plot_fill'] = self.fill_color_entry.get_value()[:7] + \ + self.app.defaults['gerber_plot_fill'][7:9] def on_gerber_alpha_changed(self, spinner_value): self.app.defaults['gerber_plot_fill'] = \ @@ -234,23 +202,6 @@ class GerberGenPrefGroupUI(OptionsGroupUI): self.app.defaults['gerber_plot_line'][:7] + \ (hex(spinner_value)[2:] if int(hex(spinner_value)[2:], 16) > 0 else '00') - def on_pl_color_entry(self): - self.app.defaults['gerber_plot_line'] = self.pl_color_entry.get_value()[:7] + \ + def on_line_color_changed(self): + self.app.defaults['gerber_plot_line'] = self.line_color_entry.get_value()[:7] + \ self.app.defaults['gerber_plot_line'][7:9] - self.pl_color_button.setStyleSheet("background-color:%s" % str(self.app.defaults['gerber_plot_line'])[:7]) - - def on_pl_color_button(self): - current_color = QtGui.QColor(self.app.defaults['gerber_plot_line'][:7]) - # print(current_color) - - c_dialog = QtWidgets.QColorDialog() - plot_line_color = c_dialog.getColor(initial=current_color) - - if plot_line_color.isValid() is False: - return - - self.pl_color_button.setStyleSheet("background-color:%s" % str(plot_line_color.name())) - - new_val_line = str(plot_line_color.name()) + str(self.app.defaults['gerber_plot_line'][7:9]) - self.pl_color_entry.set_value(new_val_line) - self.app.defaults['gerber_plot_line'] = new_val_line diff --git a/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py b/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py index 04f7c605..6a0efb4a 100644 --- a/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py +++ b/AppGUI/preferences/tools/Tools2QRCodePrefGroupUI.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import Qt, QSettings -from AppGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry +from AppGUI.GUIElements import FCSpinner, RadioSet, FCTextArea, FCEntry, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -153,42 +153,20 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI): self.fill_color_label.setToolTip( _("Set the QRCode fill color (squares color).") ) - self.fill_color_entry = FCEntry() - self.fill_color_button = QtWidgets.QPushButton() - self.fill_color_button.setFixedSize(15, 15) - - fill_lay_child = QtWidgets.QHBoxLayout() - fill_lay_child.setContentsMargins(0, 0, 0, 0) - fill_lay_child.addWidget(self.fill_color_entry) - fill_lay_child.addWidget(self.fill_color_button, alignment=Qt.AlignRight) - fill_lay_child.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - fill_color_widget = QtWidgets.QWidget() - fill_color_widget.setLayout(fill_lay_child) + self.fill_color_entry = FCColorEntry() grid_lay.addWidget(self.fill_color_label, 9, 0) - grid_lay.addWidget(fill_color_widget, 9, 1) + grid_lay.addWidget(self.fill_color_entry, 9, 1) # BACK COLOR # self.back_color_label = QtWidgets.QLabel('%s:' % _('Back Color')) self.back_color_label.setToolTip( _("Set the QRCode background color.") ) - self.back_color_entry = FCEntry() - self.back_color_button = QtWidgets.QPushButton() - self.back_color_button.setFixedSize(15, 15) - - back_lay_child = QtWidgets.QHBoxLayout() - back_lay_child.setContentsMargins(0, 0, 0, 0) - back_lay_child.addWidget(self.back_color_entry) - back_lay_child.addWidget(self.back_color_button, alignment=Qt.AlignRight) - back_lay_child.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - back_color_widget = QtWidgets.QWidget() - back_color_widget.setLayout(back_lay_child) + self.back_color_entry = FCColorEntry() grid_lay.addWidget(self.back_color_label, 10, 0) - grid_lay.addWidget(back_color_widget, 10, 1) + grid_lay.addWidget(self.back_color_entry, 10, 1) # Selection Limit self.sel_limit_label = QtWidgets.QLabel('%s:' % _("Selection limit")) @@ -208,64 +186,10 @@ class Tools2QRCodePrefGroupUI(OptionsGroupUI): # QRCode Tool self.fill_color_entry.editingFinished.connect(self.on_qrcode_fill_color_entry) - self.fill_color_button.clicked.connect(self.on_qrcode_fill_color_button) self.back_color_entry.editingFinished.connect(self.on_qrcode_back_color_entry) - self.back_color_button.clicked.connect(self.on_qrcode_back_color_button) def on_qrcode_fill_color_entry(self): self.app.defaults['tools_qrcode_fill_color'] = self.fill_color_entry.get_value() - self.fill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_qrcode_fill_color']) - ) - - def on_qrcode_fill_color_button(self): - current_color = QtGui.QColor(self.app.defaults['tools_qrcode_fill_color']) - - c_dialog = QtWidgets.QColorDialog() - fill_color = c_dialog.getColor(initial=current_color) - - if fill_color.isValid() is False: - return - - # if new color is different then mark that the Preferences are changed - if fill_color != current_color: - self.app.preferencesUiManager.on_preferences_edited() - - self.fill_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(fill_color.name()) - ) - - new_val_sel = str(fill_color.name()) - self.fill_color_entry.set_value(new_val_sel) - self.app.defaults['tools_qrcode_fill_color'] = new_val_sel def on_qrcode_back_color_entry(self): self.app.defaults['tools_qrcode_back_color'] = self.back_color_entry.get_value() - self.back_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_qrcode_back_color']) - ) - - def on_qrcode_back_color_button(self): - current_color = QtGui.QColor(self.app.defaults['tools_qrcode_back_color']) - - c_dialog = QtWidgets.QColorDialog() - back_color = c_dialog.getColor(initial=current_color) - - if back_color.isValid() is False: - return - - # if new color is different then mark that the Preferences are changed - if back_color != current_color: - self.app.preferencesUiManager.on_preferences_edited() - - self.back_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(back_color.name()) - ) - - new_val_sel = str(back_color.name()) - self.back_color_entry.set_value(new_val_sel) - self.app.defaults['tools_qrcode_back_color'] = new_val_sel diff --git a/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py b/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py index 4378dec7..f2e2a528 100644 --- a/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py +++ b/AppGUI/preferences/tools/ToolsFilmPrefGroupUI.py @@ -1,7 +1,7 @@ from PyQt5 import QtWidgets, QtCore, QtGui from PyQt5.QtCore import Qt, QSettings -from AppGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox +from AppGUI.GUIElements import RadioSet, FCEntry, FCDoubleSpinner, FCCheckBox, FCComboBox, FCColorEntry from AppGUI.preferences.OptionsGroupUI import OptionsGroupUI import gettext @@ -57,20 +57,10 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI): self.film_color_label.setToolTip( _("Set the film color when positive film is selected.") ) - self.film_color_entry = FCEntry() - self.film_color_button = QtWidgets.QPushButton() - self.film_color_button.setFixedSize(15, 15) + self.film_color_entry = FCColorEntry() - self.form_box_child = QtWidgets.QHBoxLayout() - self.form_box_child.setContentsMargins(0, 0, 0, 0) - self.form_box_child.addWidget(self.film_color_entry) - self.form_box_child.addWidget(self.film_color_button, alignment=Qt.AlignRight) - self.form_box_child.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter) - - film_color_widget = QtWidgets.QWidget() - film_color_widget.setLayout(self.form_box_child) grid0.addWidget(self.film_color_label, 1, 0) - grid0.addWidget(film_color_widget, 1, 1) + grid0.addWidget(self.film_color_entry, 1, 1) # Film Border self.film_boundary_entry = FCDoubleSpinner() @@ -316,32 +306,6 @@ class ToolsFilmPrefGroupUI(OptionsGroupUI): # Film Tool self.film_color_entry.editingFinished.connect(self.on_film_color_entry) - self.film_color_button.clicked.connect(self.on_film_color_button) def on_film_color_entry(self): self.app.defaults['tools_film_color'] = self.film_color_entry.get_value() - self.film_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(self.defaults['tools_film_color']) - ) - - def on_film_color_button(self): - current_color = QtGui.QColor(self.app.defaults['tools_film_color']) - - c_dialog = QtWidgets.QColorDialog() - film_color = c_dialog.getColor(initial=current_color) - - if film_color.isValid() is False: - return - - # if new color is different then mark that the Preferences are changed - if film_color != current_color: - self.app.preferencesUiManager.on_preferences_edited() - - self.film_color_button.setStyleSheet( - "background-color:%s;" - "border-color: dimgray" % str(film_color.name()) - ) - new_val_sel = str(film_color.name()) - self.film_color_entry.set_value(new_val_sel) - self.app.defaults['tools_film_color'] = new_val_sel diff --git a/CHANGELOG.md b/CHANGELOG.md index aa087187..938980a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,8 +21,8 @@ CHANGELOG for FlatCAM beta - added a button for Transformations Tool in the lower side (common) of the Object UI - some other UI changes - after using Isolation Tool it will switch automatically to the Geometry UI -- in Preferences replaced some widgets with a new one that combine a Slider with a Spinner (courtesy of David Robertson) - +- in Preferences replaced some widgets with a new one that combine a Slider with a Spinner (from David Robertson) +- in Preferences replaced the widgets that sets colors with a compound one (from David Robertson) 31.05.2020