British-Information-Technologies
/
ChatKit-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Interface branch onto development branch #5

Closed
michael-bailey wants to merge 53 commits from Interface into master
pull from: Interface
merge into: British-Information-Technologies:master
Conversation 1 Commits 53 Files Changed 24 +8 -1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 454355a1d0 - Show all commits

2
src/main.rs
View File

@ -30,7 +30,7 @@ use clap::{App, Arg};
use crate::server::ServerV3::Server;
use cursive::views::{Dialog, TextView, Menubar, LinearLayout, ResizedView, ListView, Panel};
use crate::server::ui::server_view::ServerControlView;
use crate::server::ui::server_view_controller::ServerControlView;
fn main() -> Result<(), ErrorKind> {
let args = App::new("--rust chat server--")

7
src/server/ui/server_view_controller.rs
View File

@ -1,3 +1,10 @@
use cursive::{Cursive, CursiveExt, CbSink, Printer, View};
use cursive::event::{EventResult, Event};
use cursive::views::{ResizedView, Dialog, TextView};
use cursive::menu::MenuTree;
use cursive::view::ViewWrapper;
use std::sync::Arc;
use crate::server::ServerV3::Server;
pub struct ServerControlView {
display: Cursive,