|
@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing;
|
25
|
25
|
import com.dmdirc.addons.ui_swing.components.FileBrowser;
|
26
|
26
|
import com.dmdirc.addons.ui_swing.components.FontPicker;
|
27
|
27
|
import com.dmdirc.addons.ui_swing.components.OptionalJSpinner;
|
28
|
|
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
|
29
|
28
|
import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
|
30
|
29
|
import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
|
31
|
30
|
import com.dmdirc.addons.ui_swing.components.durationeditor.DurationListener;
|
|
@@ -353,15 +352,18 @@ public final class PrefsComponentFactory {
|
353
|
352
|
*/
|
354
|
353
|
private static JComponent getColourOption(
|
355
|
354
|
final PreferencesSetting setting) {
|
356
|
|
- final ColourChooser option = new ColourChooser(setting.getValue(),
|
357
|
|
- true, true);
|
|
355
|
+ final OptionalColourChooser option = new OptionalColourChooser(
|
|
356
|
+ setting.getValue(), true, true, true);
|
358
|
357
|
|
359
|
358
|
option.addActionListener(new ActionListener() {
|
360
|
359
|
|
361
|
360
|
/** {@inheritDoc} */
|
362
|
361
|
@Override
|
363
|
362
|
public void actionPerformed(final ActionEvent e) {
|
364
|
|
- setting.setValue(((ColourChooser) e.getSource()).getColour());
|
|
363
|
+ final OptionalColourChooser chooser
|
|
364
|
+ = ((OptionalColourChooser) e.getSource());
|
|
365
|
+ setting.setValue(chooser.isEnabled() + ":"
|
|
366
|
+ + chooser.getColour());
|
365
|
367
|
}
|
366
|
368
|
});
|
367
|
369
|
|