deavmi
/
gustav
mirror of https://github.com/deavminet/gustav.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Migrated channel joining code (the majority of it) from gui.d to Connection.d (only the needed left overs are in gui.d - for the handler) 

Also set the fields back to private
This commit is contained in:
Tristan B. Kildaire 2020-10-19 19:07:56 +02:00
parent 5332d26be9
commit 7da8efee61
2 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/Connection.d
View File

@ -201,7 +201,53 @@ public final class Connection : Thread
}
public void joinChannel(string channelName)
{
/* Check if we have joined this channel already */
Channel foundChannel = findChannel(channelName);
/* If we have joined this channel before */
if(foundChannel)
{
/* TODO: Switch to */
writeln("nope time: "~channelName);
}
/* If we haven't joined this channel before */
else
{
/* Join the channel */
getClient().join(channelName);
/* Create the Channel object */
Channel newChannel = new Channel(client, channelName);
/* Add the channel */
addChannel(newChannel);
/* Set as the `foundChannel` */
foundChannel = newChannel;
/* Get the Widgets container for this channel and add a tab for it */
notebookSwitcher.add(newChannel.getBox());
notebookSwitcher.setTabReorderable(newChannel.getBox(), true);
notebookSwitcher.setTabLabelText(newChannel.getBox(), newChannel.getName());
writeln("hdsjghjsd");
writeln("first time: "~channelName);
/* Get the user's list */
newChannel.populateUsersList();
}
/* Switch to the channel's pane */
//currentConnection.notebookSwitcher.setCurrentPage(foundChannel.getBox());
/* Render recursively all children of the container and then the container itself */
box.showAll();
}
private void channelList()
@ -275,6 +321,12 @@ public final class Connection : Thread
channels.add(new Label(newChannel.getName()));
}
/**
* Called when you select a channel in the sidebar
*
* This moves you to the correct notebook tab for
* that channel
*/
private void viewChannel(ListBox s)
{
/* Get the name of the channel selected */

50
source/gui.d
View File

@ -288,14 +288,14 @@ public class GUI : Thread
}
/* TODO: Add handler for clicking label that lets you join the channel */
channelsList.addOnSelectedRowsChanged(&selectChannelNG);
channelsList.addOnSelectedRowsChanged(&selectChannel);
win.showAll();
}
import gtk.ListBoxRow;
private void selectChannelNG(ListBox s)
private void selectChannel(ListBox s)
{
/* Get the current connection */
Connection currentConnection = connections[notebook.getCurrentPage()];
@ -303,50 +303,10 @@ public class GUI : Thread
/* Get the name of the channel selected */
string channelSelected = (cast(Label)(s.getSelectedRow().getChild())).getText();
/* Check if we have joined this channel already */
Channel foundChannel = currentConnection.findChannel(channelSelected);
/* Join the channel on this connection */
currentConnection.joinChannel(channelSelected);
/* If we have joined this channel before */
if(foundChannel)
{
/* TODO: Switch to */
writeln("nope time: "~channelSelected);
}
/* If we haven't joined this channel before */
else
{
/* Join the channel */
currentConnection.getClient().join(channelSelected);
/* Create the Channel object */
Channel newChannel = new Channel(currentConnection.getClient(), channelSelected);
/* Add the channel */
currentConnection.addChannel(newChannel);
/* Set as the `foundChannel` */
foundChannel = newChannel;
/* Get the Widgets container for this channel and add a tab for it */
currentConnection.notebookSwitcher.add(newChannel.getBox());
currentConnection.notebookSwitcher.setTabReorderable(newChannel.getBox(), true);
currentConnection.notebookSwitcher.setTabLabelText(newChannel.getBox(), newChannel.getName());
writeln("hdsjghjsd");
writeln("first time: "~channelSelected);
/* Get the user's list */
newChannel.populateUsersList();
}
/* Switch to the channel's pane */
//currentConnection.notebookSwitcher.setCurrentPage(foundChannel.getBox());
/* Render recursively all children of the container and then the container itself */
currentConnection.box.showAll();
}