diff --git a/source/Channel.d b/source/Channel.d index 46f18d6..ce608c2 100644 --- a/source/Channel.d +++ b/source/Channel.d @@ -182,6 +182,15 @@ public final class Channel return userLabel; } + + // private bool userLabelPopup(Widget) + // { + // import std.stdio; + // writeln("NOWNOWNOWNOWNOW"); + + // return true; + // } + /** * Event handler to be run when you hover over a user's * username in the Users sidebar list which will show diff --git a/source/gui.d b/source/gui.d index fd89147..e2bc4f6 100644 --- a/source/gui.d +++ b/source/gui.d @@ -16,6 +16,8 @@ import gtk.Toolbar; import gtk.ToolButton; import gtk.ScrolledWindow; import gtk.SeparatorToolItem; +import gtk.ToolItem; +import gtk.SearchEntry; import Connection; import Channel; @@ -134,16 +136,11 @@ public class GUI : Thread private Toolbar getToolbar() { + /* Create a new Toolbar */ Toolbar toolbar = new Toolbar(); /* Status selector dropdown */ - import gtk.ComboBox; - import gtk.ToolButton; - - // Menu menu = new Menu(); - // menu.add(new MenuItem("")); - ComboBox statusBox = new ComboBox(); - statusBox.setTitle("Status"); + /* TODO */ /* Set available button */ @@ -170,9 +167,20 @@ public class GUI : Thread setAway.addOnClicked(&setStatus); setBusy.addOnClicked(&setStatus); + + /* The status box */ + Entry statusBox = new Entry(); + statusBox.addOnActivate(&setStatusMessage); + statusBox.setPlaceholderText("I'm currently..."); + ToolItem statusBoxItem = new ToolItem(); + statusBoxItem.add(statusBox); + toolbar.add(statusBoxItem); + + /* Add a seperator */ toolbar.add(new SeparatorToolItem()); + /* List channels button */ ToolButton channelListButton = new ToolButton(""); channelListButton.setIconName("emblem-documents"); @@ -181,19 +189,21 @@ public class GUI : Thread toolbar.add(channelListButton); + - import gtk.SearchEntry; - import gtk.Entry; - Entry d = new Entry(); - d.addOnActivate(&setStatusMessage); - d.setPlaceholderText("I'm currently..."); - // d.addOnLea - // d.addOnEnte - import gtk.ToolItem; - ToolItem k = new ToolItem(); - k.add(d); - toolbar.add(k); + SearchEntry dd = new SearchEntry(); + ToolItem j = new ToolItem(); + j.add(dd); + toolbar.add(j); + + + + + + + + return toolbar;