mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-26 11:47:25 +01:00
Avoid some errors using insensitive buttons
This commit is contained in:
parent
a371e356f7
commit
43b07c73dc
11 changed files with 88 additions and 49 deletions
|
|
@ -250,6 +250,7 @@ impl RecordingEditor {
|
|||
.composers_string()
|
||||
.unwrap_or_else(|| gettext("No composers")),
|
||||
);
|
||||
self.imp().save_row.set_sensitive(true);
|
||||
self.imp().work.replace(Some(work));
|
||||
}
|
||||
|
||||
|
|
@ -344,39 +345,40 @@ impl RecordingEditor {
|
|||
|
||||
#[template_callback]
|
||||
fn save(&self) {
|
||||
let library = self.imp().library.get().unwrap();
|
||||
if let Some(work) = &*self.imp().work.borrow() {
|
||||
let library = self.imp().library.get().unwrap();
|
||||
|
||||
// TODO: No work selected?
|
||||
let work = self.imp().work.borrow().as_ref().unwrap().clone();
|
||||
let year = self.imp().year_row.value() as i32;
|
||||
let work = work.to_owned();
|
||||
let year = self.imp().year_row.value() as i32;
|
||||
|
||||
let performers = self
|
||||
.imp()
|
||||
.performer_rows
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|p| p.performer())
|
||||
.collect::<Vec<Performer>>();
|
||||
let performers = self
|
||||
.imp()
|
||||
.performer_rows
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|p| p.performer())
|
||||
.collect::<Vec<Performer>>();
|
||||
|
||||
let ensembles = self
|
||||
.imp()
|
||||
.ensemble_rows
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|e| e.ensemble())
|
||||
.collect::<Vec<EnsemblePerformer>>();
|
||||
let ensembles = self
|
||||
.imp()
|
||||
.ensemble_rows
|
||||
.borrow()
|
||||
.iter()
|
||||
.map(|e| e.ensemble())
|
||||
.collect::<Vec<EnsemblePerformer>>();
|
||||
|
||||
if let Some(recording_id) = self.imp().recording_id.get() {
|
||||
library
|
||||
.update_recording(recording_id, work, Some(year), performers, ensembles)
|
||||
.unwrap();
|
||||
} else {
|
||||
let recording = library
|
||||
.create_recording(work, Some(year), performers, ensembles)
|
||||
.unwrap();
|
||||
self.emit_by_name::<()>("created", &[&recording]);
|
||||
if let Some(recording_id) = self.imp().recording_id.get() {
|
||||
library
|
||||
.update_recording(recording_id, work, Some(year), performers, ensembles)
|
||||
.unwrap();
|
||||
} else {
|
||||
let recording = library
|
||||
.create_recording(work, Some(year), performers, ensembles)
|
||||
.unwrap();
|
||||
self.emit_by_name::<()>("created", &[&recording]);
|
||||
}
|
||||
|
||||
self.imp().navigation.get().unwrap().pop();
|
||||
}
|
||||
|
||||
self.imp().navigation.get().unwrap().pop();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@ impl TracksEditor {
|
|||
|
||||
self.imp().tracks_label.set_sensitive(true);
|
||||
self.imp().track_list.set_sensitive(true);
|
||||
self.imp().save_row.set_sensitive(true);
|
||||
|
||||
self.imp().recording.replace(Some(recording));
|
||||
}
|
||||
|
|
@ -304,23 +305,23 @@ impl TracksEditor {
|
|||
|
||||
#[template_callback]
|
||||
fn save(&self) {
|
||||
for track in self.imp().removed_tracks.borrow_mut().drain(..) {
|
||||
self.library().delete_track(&track).unwrap();
|
||||
}
|
||||
if let Some(recording) = &*self.imp().recording.borrow() {
|
||||
for track in self.imp().removed_tracks.borrow_mut().drain(..) {
|
||||
self.library().delete_track(&track).unwrap();
|
||||
}
|
||||
|
||||
for (index, track_row) in self.imp().track_rows.borrow_mut().drain(..).enumerate() {
|
||||
let track_data = track_row.track_data();
|
||||
for (index, track_row) in self.imp().track_rows.borrow_mut().drain(..).enumerate() {
|
||||
let track_data = track_row.track_data();
|
||||
|
||||
match track_data.location {
|
||||
TrackLocation::Undefined => {
|
||||
log::error!("Failed to save track: Undefined track location.");
|
||||
}
|
||||
TrackLocation::Library(track) => self
|
||||
.library()
|
||||
.update_track(&track.track_id, index as i32, track_data.parts)
|
||||
.unwrap(),
|
||||
TrackLocation::System(path) => {
|
||||
if let Some(recording) = &*self.imp().recording.borrow() {
|
||||
match track_data.location {
|
||||
TrackLocation::Undefined => {
|
||||
log::error!("Failed to save track: Undefined track location.");
|
||||
}
|
||||
TrackLocation::Library(track) => self
|
||||
.library()
|
||||
.update_track(&track.track_id, index as i32, track_data.parts)
|
||||
.unwrap(),
|
||||
TrackLocation::System(path) => {
|
||||
self.library()
|
||||
.import_track(
|
||||
&path,
|
||||
|
|
@ -329,15 +330,13 @@ impl TracksEditor {
|
|||
track_data.parts,
|
||||
)
|
||||
.unwrap();
|
||||
} else {
|
||||
log::error!("Failed to save track: No recording set.");
|
||||
}
|
||||
}
|
||||
|
||||
self.imp().track_list.remove(&track_row);
|
||||
}
|
||||
|
||||
self.imp().track_list.remove(&track_row);
|
||||
self.navigation().pop();
|
||||
}
|
||||
|
||||
self.navigation().pop();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue