MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-07 16:22:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

update cursive from 0.7 to 0.9

Browse Source
This commit is contained in:
Scott Lamb
2018-08-24 22:14:03 -07:00
parent 8c52c36b51
commit a10e77d98e
5 changed files with 117 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmds/config/cameras.rs
View File

@@ -68,7 +68,7 @@ fn get_change(siv: &mut Cursive) -> db::CameraChange {
.unwrap_or(0);
let d = *siv.find_id::<views::SelectView<Option<i32>>>(
&format!("{}_sample_file_dir", t.as_str()))
.unwrap().selection();
.unwrap().selection().unwrap();
c.streams[t.index()] = db::StreamChange {
rtsp_path: p,
sample_file_dir_id: d,
@@ -124,7 +124,7 @@ fn press_test(siv: &mut Cursive, t: db::StreamType) {
let sink = siv.cb_sink().clone();
::std::thread::spawn(move || {
let r = press_test_inner(&url);
sink.send(Box::new(move |siv| {
sink.send(Box::new(move |siv: &mut Cursive| {
// Polling is no longer necessary.
siv.set_fps(0);
siv.pop_layer();
@@ -142,7 +142,7 @@ fn press_test(siv: &mut Cursive, t: db::StreamType) {
format!("{} stream at {}:\n\n{}", t.as_str(), url, description))
.title("Stream test succeeded")
.dismiss_button("Back"));
})).unwrap();
}));
});
}

6
src/cmds/config/dirs.rs
View File

@@ -229,7 +229,7 @@ fn add_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive) {
add_dir(&db, siv, &path)
}
})
.button("Cancel", |siv| siv.pop_layer())
.button("Cancel", |siv| { siv.pop_layer(); })
.title("Add sample file directory"));
}
@@ -257,7 +257,7 @@ fn delete_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive, dir_id: i32) {
delete_dir(&db, siv, dir_id)
}
})
.button("Cancel", |siv| siv.pop_layer())
.button("Cancel", |siv| { siv.pop_layer(); })
.title("Delete sample file directory"));
}
@@ -378,7 +378,7 @@ fn edit_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive, dir_id: i32) {
.child(views::DummyView.full_width());
buttons.add_child(change_button.with_id("change"));
buttons.add_child(views::DummyView);
buttons.add_child(views::Button::new("Cancel", |siv| siv.pop_layer()));
buttons.add_child(views::Button::new("Cancel", |siv| { siv.pop_layer(); }));
siv.add_layer(
views::Dialog::around(
views::LinearLayout::vertical()

2
src/cmds/config/mod.rs
View File

@@ -128,7 +128,7 @@ pub fn run() -> Result<(), Error> {
let clocks = clock::RealClocks {};
let db = Arc::new(db::Database::new(clocks, conn, true)?);
let mut siv = Cursive::new();
let mut siv = Cursive::ncurses();
//siv.add_global_callback('q', |s| s.quit());
siv.add_layer(views::Dialog::around(