diff --git a/Cargo.toml b/Cargo.toml index baa66c10e..11f7fb06a 100644 --- a/Cargo.toml +++ b/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" } diff --git a/src/bin/tui/menu.rs b/src/bin/tui/menu.rs index de225b695..1549dfaa2 100644 --- a/src/bin/tui/menu.rs +++ b/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 { +pub fn create() -> Box { 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); diff --git a/src/bin/tui/mining.rs b/src/bin/tui/mining.rs index 97df73b4e..1cfcf2bf0 100644 --- a/src/bin/tui/mining.rs +++ b/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 { + fn create() -> Box { let table_view = TableView::::new() .column(MiningDeviceColumn::PluginId, "Plugin ID", |c| { diff --git a/src/bin/tui/peers.rs b/src/bin/tui/peers.rs index 359bddc17..f8fe87116 100644 --- a/src/bin/tui/peers.rs +++ b/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 for PeerStats { pub struct TUIPeerView; impl TUIStatusListener for TUIPeerView { - fn create() -> Box { + fn create() -> Box { let table_view = TableView::::new() .column(PeerColumn::Address, "Address", |c| c.width_percent(20)) diff --git a/src/bin/tui/status.rs b/src/bin/tui/status.rs index e1b66e35b..529f0ca14 100644 --- a/src/bin/tui/status.rs +++ b/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 { + fn create() -> Box { let basic_status_view = BoxView::with_full_screen( LinearLayout::new(Orientation::Vertical) .child( diff --git a/src/bin/tui/types.rs b/src/bin/tui/types.rs index 17d64a90f..95c3bc636 100644 --- a/src/bin/tui/types.rs +++ b/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; + fn create() -> Box; /// Update according to status update contents fn update(c: &mut Cursive, stats: &ServerStats); } diff --git a/src/bin/tui/ui.rs b/src/bin/tui/ui.rs index 04e271059..4e3cdd76b 100644 --- a/src/bin/tui/ui.rs +++ b/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)), );