|
@@ -31,6 +31,7 @@ import com.dmdirc.events.ChannelUserAwayEvent;
|
31
|
31
|
import com.dmdirc.events.ChannelUserBackEvent;
|
32
|
32
|
import com.dmdirc.interfaces.config.AggregateConfigProvider;
|
33
|
33
|
import com.dmdirc.plugins.PluginDomain;
|
|
34
|
+import com.dmdirc.ui.messages.ColourManager;
|
34
|
35
|
import com.dmdirc.util.colours.Colour;
|
35
|
36
|
|
36
|
37
|
import javax.inject.Inject;
|
|
@@ -44,17 +45,19 @@ public class AwayColoursManager {
|
44
|
45
|
|
45
|
46
|
private final DMDircMBassador eventBus;
|
46
|
47
|
private final ConfigBinder binder;
|
47
|
|
- private Colour colour;
|
|
48
|
+ private final ColourManager colourManager;
|
|
49
|
+ private Colour colour = Colour.BLACK;
|
48
|
50
|
private boolean nicklist = true;
|
49
|
51
|
private boolean text = true;
|
50
|
52
|
|
51
|
53
|
@Inject
|
52
|
54
|
public AwayColoursManager(final DMDircMBassador eventBus,
|
53
|
55
|
@GlobalConfig final AggregateConfigProvider config,
|
54
|
|
- @PluginDomain(AwayColoursPlugin.class) final String domain) {
|
|
56
|
+ @PluginDomain(AwayColoursPlugin.class) final String domain,
|
|
57
|
+ @GlobalConfig final ColourManager colourManager) {
|
55
|
58
|
this.eventBus = eventBus;
|
|
59
|
+ this.colourManager = colourManager;
|
56
|
60
|
binder = new ConfigBinder(config, domain);
|
57
|
|
-
|
58
|
61
|
}
|
59
|
62
|
|
60
|
63
|
public void load() {
|
|
@@ -68,8 +71,8 @@ public class AwayColoursManager {
|
68
|
71
|
}
|
69
|
72
|
|
70
|
73
|
@ConfigBinding(key = "colour")
|
71
|
|
- public void handleColourChange(final Colour colour) {
|
72
|
|
- this.colour = colour;
|
|
74
|
+ public void handleColourChange(final String colour) {
|
|
75
|
+ this.colour = colourManager.getColourFromString(colour, Colour.GRAY);
|
73
|
76
|
}
|
74
|
77
|
|
75
|
78
|
@ConfigBinding(key = "nicklist")
|