updates to Cursive master and tying dependency to own fork (#787)

Cargo.toml

@@ -29,7 +29,7 @@ serde_json = "~1.0.7"
 slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] }
 term = "~0.4.6"
 time = "^0.1"
-cursive = { git = "https://github.com/gyscos/Cursive" }
+cursive = { git = "https://github.com/yeastplume/Cursive" }
 # TODO - once "patch" is available we should be able to clean up the workspace dependencies
 # [patch.crate-io]
 # secp256k1zkp = { git = "https://github.com/mimblewimble/rust-secp256k1-zkp" }

src/bin/tui/menu.rs

@@ -15,7 +15,7 @@
 //! Main Menu definition
 
 use cursive::Cursive;
-use cursive::view::AnyView;
+use cursive::view::View;
 use cursive::align::HAlign;
 use cursive::event::{EventResult, Key};
 use cursive::views::{BoxView, LinearLayout, OnEventView, SelectView, StackView, TextView};
@@ -23,7 +23,7 @@ use cursive::direction::Orientation;
 
 use tui::constants::*;
 
-pub fn create() -> Box<AnyView> {
+pub fn create() -> Box<View> {
 	let mut main_menu = SelectView::new().h_align(HAlign::Left);
 	main_menu.add_item("Basic Status", VIEW_BASIC_STATUS);
 	main_menu.add_item("Peers and Sync", VIEW_PEER_SYNC);

src/bin/tui/mining.rs

@@ -17,7 +17,7 @@
 use std::cmp::Ordering;
 
 use cursive::Cursive;
-use cursive::view::AnyView;
+use cursive::view::View;
 use cursive::views::{BoxView, Dialog, LinearLayout, TextView};
 use cursive::direction::Orientation;
 use cursive::traits::*;
@@ -105,7 +105,7 @@ pub struct TUIMiningView;
 
 impl TUIStatusListener for TUIMiningView {
 	/// Create the mining view
-	fn create() -> Box<AnyView> {
+	fn create() -> Box<View> {
 		let table_view =
 			TableView::<CuckooMinerDeviceStats, MiningDeviceColumn>::new()
 				.column(MiningDeviceColumn::PluginId, "Plugin ID", |c| {

src/bin/tui/peers.rs

@@ -19,7 +19,7 @@ use std::cmp::Ordering;
 use grin::types::{PeerStats, ServerStats};
 
 use cursive::Cursive;
-use cursive::view::AnyView;
+use cursive::view::View;
 use cursive::views::{BoxView, Dialog};
 use cursive::traits::*;
 
@@ -76,7 +76,7 @@ impl TableViewItem<PeerColumn> for PeerStats {
 pub struct TUIPeerView;
 
 impl TUIStatusListener for TUIPeerView {
-	fn create() -> Box<AnyView> {
+	fn create() -> Box<View> {
 		let table_view =
 			TableView::<PeerStats, PeerColumn>::new()
 				.column(PeerColumn::Address, "Address", |c| c.width_percent(20))

src/bin/tui/status.rs

@@ -15,7 +15,7 @@
 //! Basic status view definition
 
 use cursive::Cursive;
-use cursive::view::AnyView;
+use cursive::view::View;
 use cursive::views::{BoxView, LinearLayout, TextView};
 use cursive::direction::Orientation;
 use cursive::traits::*;
@@ -29,7 +29,7 @@ pub struct TUIStatusView;
 
 impl TUIStatusListener for TUIStatusView {
 	/// Create basic status view
-	fn create() -> Box<AnyView> {
+	fn create() -> Box<View> {
 		let basic_status_view = BoxView::with_full_screen(
 			LinearLayout::new(Orientation::Vertical)
 				.child(

src/bin/tui/types.rs

@@ -15,7 +15,7 @@
 //! Types specific to the UI module
 
 use cursive::Cursive;
-use cursive::view::AnyView;
+use cursive::view::View;
 use grin::types::ServerStats;
 
 /// Main message struct to communicate between the UI and
@@ -29,7 +29,7 @@ pub enum UIMessage {
 
 pub trait TUIStatusListener {
 	/// create the view, to return to the main UI controller
-	fn create() -> Box<AnyView>;
+	fn create() -> Box<View>;
 	/// Update according to status update contents
 	fn update(c: &mut Cursive, stats: &ServerStats);
 }

src/bin/tui/ui.rs

@@ -24,7 +24,7 @@ use cursive::theme::PaletteColor::*;
 use cursive::theme::Color::*;
 use cursive::theme::BaseColor::*;
 use cursive::utils::markup::StyledString;
-use cursive::views::{LinearLayout, Panel, StackView, TextView};
+use cursive::views::{LinearLayout, Panel, StackView, TextView, ViewBox};
 use cursive::direction::Orientation;
 use cursive::traits::*;
 
@@ -88,7 +88,7 @@ impl UI {
 			.child(Panel::new(TextView::new(title_string)))
 			.child(
 				LinearLayout::new(Orientation::Horizontal)
-					.child(Panel::new(main_menu))
+					.child(Panel::new(ViewBox::new(main_menu)))
 					.child(Panel::new(root_stack)),
 			);