Browse Source

Plugin support for optional colours.

Change-Id: Ic17b9ff399a25e1b91bd1ce91d6d7071ba44ecb2
Depends-On: I50a19086bab32a35fee535c8500a1636ff82b959
Reviewed-on: http://gerrit.dmdirc.com/3461
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
changes/61/3461/2
Chris Smith 10 years ago
parent
commit
433e39684f

+ 11
- 2
src/com/dmdirc/addons/debug/commands/Notify.java View File

27
 import com.dmdirc.addons.debug.DebugCommand;
27
 import com.dmdirc.addons.debug.DebugCommand;
28
 import com.dmdirc.commandparser.CommandArguments;
28
 import com.dmdirc.commandparser.CommandArguments;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
29
 import com.dmdirc.commandparser.commands.context.CommandContext;
30
+import com.dmdirc.ui.Colour;
31
+
32
+import com.google.common.base.Optional;
30
 
33
 
31
 import javax.inject.Inject;
34
 import javax.inject.Inject;
32
 import javax.inject.Provider;
35
 import javax.inject.Provider;
59
     @Override
62
     @Override
60
     public void execute(final FrameContainer origin,
63
     public void execute(final FrameContainer origin,
61
             final CommandArguments args, final CommandContext context) {
64
             final CommandArguments args, final CommandContext context) {
62
-        sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
63
-                "Current notification colour is: " + origin.getNotification());
65
+        final Optional<Colour> colour = origin.getNotification();
66
+        if (colour.isPresent()) {
67
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
68
+                    "Current notification colour is: " + colour.get());
69
+        } else {
70
+            sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
71
+                    "No current notification colour");
72
+        }
64
     }
73
     }
65
 
74
 
66
 }
75
 }

+ 2
- 1
src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java View File

436
 
436
 
437
             @Override
437
             @Override
438
             public void run() {
438
             public void run() {
439
-                notificationSet(window, window.getNotification());
439
+                // TODO: Should this colour be configurable?
440
+                notificationSet(window, window.getNotification().or(Colour.BLACK));
440
             }
441
             }
441
         });
442
         });
442
     }
443
     }

+ 2
- 1
src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java View File

241
                 window.addFrameInfoListener(TreeFrameManager.this);
241
                 window.addFrameInfoListener(TreeFrameManager.this);
242
                 window.addNotificationListener(TreeFrameManager.this);
242
                 window.addNotificationListener(TreeFrameManager.this);
243
 
243
 
244
-                node.getLabel().notificationSet(window, window.getNotification());
244
+                // TODO: Should this colour be configurable?
245
+                node.getLabel().notificationSet(window, window.getNotification().or(Colour.BLACK));
245
                 node.getLabel().iconChanged(window, window.getIcon());
246
                 node.getLabel().iconChanged(window, window.getIcon());
246
             }
247
             }
247
         });
248
         });

Loading…
Cancel
Save