johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

window: Remove unneeded code

Browse source
This commit is contained in:
Elias Projahn 2021-02-05 11:09:47 +01:00
parent 15d78a8b0f
commit 43023fdb5b
2 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/musicus/src/window.rs
View file

@ -1,7 +1,7 @@
use crate::config; use crate::config;
use crate::import::SourceSelector; use crate::import::SourceSelector;
use crate::preferences::Preferences; use crate::preferences::Preferences;
use crate::screens::*; use crate::screens::{EnsembleScreen, PersonScreen, PlayerScreen};
use crate::widgets::*; use crate::widgets::*;
use crate::navigator::{Navigator, NavigatorWindow}; use crate::navigator::{Navigator, NavigatorWindow};
use futures::prelude::*; use futures::prelude::*;
@ -114,16 +114,6 @@ impl Window {
result.stack.set_visible_child_name("content"); result.stack.set_visible_child_name("content");
})); }));
// action!(
// result.window,
// "import-disc",
// clone!(@strong result => move |_, _| {
// let dialog = ImportDiscDialog::new(result.backend.clone());
// let window = NavigatorWindow::new(dialog);
// window.show();
// })
// );
action!( action!(
result.window, result.window,
"preferences", "preferences",
@ -160,7 +150,7 @@ impl Window {
let player = clone.backend.get_player().unwrap(); let player = clone.backend.get_player().unwrap();
player.set_raise_cb(clone!(@weak clone => move || { player.set_raise_cb(clone!(@weak clone => move || {
clone.window.present(); clone.present();
})); }));
clone.player_bar.set_player(Some(player.clone())); clone.player_bar.set_player(Some(player.clone()));
@ -172,7 +162,7 @@ impl Window {
let clone = result.clone(); let clone = result.clone();
context.spawn_local(async move { context.spawn_local(async move {
// This is not done in the async block below, because backend state changes may happen // This is not done in the async block above, because backend state changes may happen
// while this method is running. // while this method is running.
clone.backend.clone().init().await.unwrap(); clone.backend.clone().init().await.unwrap();
}); });

4
res/ui/window.ui
View file

@ -224,10 +224,6 @@
</object> </object>
<menu id="menu"> <menu id="menu">
<section> <section>
<item>
<attribute name="label" translatable="yes">Import CD</attribute>
<attribute name="action">win.import-disc</attribute>
</item>
<item> <item>
<attribute name="label" translatable="yes">Preferences</attribute> <attribute name="label" translatable="yes">Preferences</attribute>
<attribute name="action">win.preferences</attribute> <attribute name="action">win.preferences</attribute>