From a42161dc05253c077eeb514f986777dd703053aa Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Sun, 1 Nov 2020 12:49:10 +0100 Subject: [PATCH] Rename application from Musicus Editor to Musicus --- Cargo.toml | 2 +- README.md | 18 +++++++++--------- res/resources.xml | 2 +- res/ui/window.ui | 10 +++++----- src/dialogs/ensemble_editor.rs | 2 +- src/dialogs/ensemble_selector.rs | 2 +- src/dialogs/instrument_editor.rs | 2 +- src/dialogs/instrument_selector.rs | 2 +- src/dialogs/part_editor.rs | 2 +- src/dialogs/performance_editor.rs | 2 +- src/dialogs/person_editor.rs | 2 +- src/dialogs/person_selector.rs | 2 +- src/dialogs/preferences.rs | 2 +- src/dialogs/recording_editor.rs | 2 +- src/dialogs/recording_selector.rs | 6 +++--- src/dialogs/section_editor.rs | 2 +- src/dialogs/track_editor.rs | 2 +- src/dialogs/tracks_editor.rs | 2 +- src/dialogs/work_editor.rs | 2 +- src/dialogs/work_selector.rs | 2 +- src/main.rs | 2 +- src/screens/ensemble_screen.rs | 2 +- src/screens/person_screen.rs | 2 +- src/screens/recording_screen.rs | 2 +- src/screens/work_screen.rs | 2 +- src/widgets/person_list.rs | 2 +- src/widgets/poe_list.rs | 2 +- src/window.rs | 2 +- 28 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e0e6961..e0af27a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "musicus_editor" +name = "musicus" version = "0.1.0" edition = "2018" diff --git a/README.md b/README.md index 0fd8ec9..3f6975b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Musicus Editor +# Musicus -A desktop app for editing a Musicus database. +The classical music player and organizer. https://musicus.org @@ -38,14 +38,14 @@ This file should never be edited manually. ## License -Musicus Editor is free and open source software: you can redistribute it and/or -modify it under the terms of the GNU Affero General Public License as published -by the Free Software Foundation, either version 3 of the License, or (at your -option) any later version. +Musicus is free and open source software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by the +Free Software Foundation, either version 3 of the License, or (at your option) +any later version. -Musicus Editor is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +Musicus is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along diff --git a/res/resources.xml b/res/resources.xml index 4cc5d85..6b77e61 100644 --- a/res/resources.xml +++ b/res/resources.xml @@ -1,6 +1,6 @@ - + ui/ensemble_editor.ui ui/ensemble_selector.ui ui/ensemble_screen.ui diff --git a/res/ui/window.ui b/res/ui/window.ui index 02f95d8..51b672e 100644 --- a/res/ui/window.ui +++ b/res/ui/window.ui @@ -12,7 +12,7 @@ True False True - Musicus Editor + Musicus True @@ -48,7 +48,7 @@ True False 0.5 - Welcome to Musicus Editor! + Welcome to Musicus! @@ -101,7 +101,7 @@ True False - Musicus Editor + Musicus True @@ -138,7 +138,7 @@ True False 0.5019607843137255 - Welcome to Musicus Editor! + Welcome to Musicus! @@ -203,7 +203,7 @@ True False - Musicus Editor + Musicus True diff --git a/src/dialogs/ensemble_editor.rs b/src/dialogs/ensemble_editor.rs index c0fbeff..ca68b1d 100644 --- a/src/dialogs/ensemble_editor.rs +++ b/src/dialogs/ensemble_editor.rs @@ -27,7 +27,7 @@ where callback: F, ) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/ensemble_editor.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/ensemble_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/ensemble_selector.rs b/src/dialogs/ensemble_selector.rs index 808aba5..39e6913 100644 --- a/src/dialogs/ensemble_selector.rs +++ b/src/dialogs/ensemble_selector.rs @@ -26,7 +26,7 @@ where { pub fn new>(backend: Rc, parent: &P, callback: F) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/ensemble_selector.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/ensemble_selector.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, add_button); diff --git a/src/dialogs/instrument_editor.rs b/src/dialogs/instrument_editor.rs index 15a6225..104ff16 100644 --- a/src/dialogs/instrument_editor.rs +++ b/src/dialogs/instrument_editor.rs @@ -27,7 +27,7 @@ where callback: F, ) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/instrument_editor.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/instrument_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/instrument_selector.rs b/src/dialogs/instrument_selector.rs index c147236..bc5f07c 100644 --- a/src/dialogs/instrument_selector.rs +++ b/src/dialogs/instrument_selector.rs @@ -26,7 +26,7 @@ where { pub fn new>(backend: Rc, parent: &P, callback: F) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/instrument_selector.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/instrument_selector.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, add_button); diff --git a/src/dialogs/part_editor.rs b/src/dialogs/part_editor.rs index cb7f721..dcbd841 100644 --- a/src/dialogs/part_editor.rs +++ b/src/dialogs/part_editor.rs @@ -26,7 +26,7 @@ impl PartEditor { part: Option, callback: F, ) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/part_editor.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/part_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/performance_editor.rs b/src/dialogs/performance_editor.rs index f4333eb..4431ac1 100644 --- a/src/dialogs/performance_editor.rs +++ b/src/dialogs/performance_editor.rs @@ -34,7 +34,7 @@ where callback: F, ) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/performance_editor.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/performance_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/person_editor.rs b/src/dialogs/person_editor.rs index 7783f19..fec47a4 100644 --- a/src/dialogs/person_editor.rs +++ b/src/dialogs/person_editor.rs @@ -27,7 +27,7 @@ where person: Option, callback: F, ) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/person_editor.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/person_selector.rs b/src/dialogs/person_selector.rs index d01cd49..6830a01 100644 --- a/src/dialogs/person_selector.rs +++ b/src/dialogs/person_selector.rs @@ -19,7 +19,7 @@ impl PersonSelector { F: Fn(Person) -> () + 'static, { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/person_selector.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_selector.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, add_button); diff --git a/src/dialogs/preferences.rs b/src/dialogs/preferences.rs index 8a16771..965b040 100644 --- a/src/dialogs/preferences.rs +++ b/src/dialogs/preferences.rs @@ -11,7 +11,7 @@ pub struct Preferences { impl Preferences { pub fn new>(backend: Rc, parent: &P) -> Self { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/preferences.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/preferences.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, libhandy::ActionRow, music_library_path_row); diff --git a/src/dialogs/recording_editor.rs b/src/dialogs/recording_editor.rs index 07f000b..fa2ec9b 100644 --- a/src/dialogs/recording_editor.rs +++ b/src/dialogs/recording_editor.rs @@ -36,7 +36,7 @@ where callback: F, ) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/recording_editor.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/recording_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/recording_selector.rs b/src/dialogs/recording_selector.rs index 55940c0..a23aa72 100644 --- a/src/dialogs/recording_selector.rs +++ b/src/dialogs/recording_selector.rs @@ -26,7 +26,7 @@ impl RecordingSelector { F: Fn(RecordingDescription) -> () + 'static, { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/recording_selector.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/recording_selector.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, libhandy::Leaflet, leaflet); @@ -93,7 +93,7 @@ struct RecordingSelectorPersonScreen { impl RecordingSelectorPersonScreen { pub fn new(backend: Rc, selector: Rc, person: Person) -> Rc { let builder = gtk::Builder::from_resource( - "/de/johrpan/musicus_editor/ui/recording_selector_screen.ui", + "/de/johrpan/musicus/ui/recording_selector_screen.ui", ); get_widget!(builder, gtk::Box, widget); @@ -187,7 +187,7 @@ impl RecordingSelectorWorkScreen { work: WorkDescription, ) -> Rc { let builder = gtk::Builder::from_resource( - "/de/johrpan/musicus_editor/ui/recording_selector_screen.ui", + "/de/johrpan/musicus/ui/recording_selector_screen.ui", ); get_widget!(builder, gtk::Box, widget); diff --git a/src/dialogs/section_editor.rs b/src/dialogs/section_editor.rs index 625d8c2..7c94410 100644 --- a/src/dialogs/section_editor.rs +++ b/src/dialogs/section_editor.rs @@ -16,7 +16,7 @@ impl SectionEditor { callback: F, ) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/section_editor.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/section_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/track_editor.rs b/src/dialogs/track_editor.rs index cd7ba5a..a5148f8 100644 --- a/src/dialogs/track_editor.rs +++ b/src/dialogs/track_editor.rs @@ -16,7 +16,7 @@ impl TrackEditor { W: IsA, F: Fn(TrackDescription) -> () + 'static, { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/track_editor.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/track_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/tracks_editor.rs b/src/dialogs/tracks_editor.rs index d1e39fb..ba44528 100644 --- a/src/dialogs/tracks_editor.rs +++ b/src/dialogs/tracks_editor.rs @@ -18,7 +18,7 @@ impl TracksEditor { parent: &P, callback: F, ) -> Self { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/tracks_editor.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/tracks_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/work_editor.rs b/src/dialogs/work_editor.rs index 47532cd..f1b6e50 100644 --- a/src/dialogs/work_editor.rs +++ b/src/dialogs/work_editor.rs @@ -76,7 +76,7 @@ where work: Option, callback: F, ) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/work_editor.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/work_editor.ui"); get_widget!(builder, gtk::Window, window); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/work_selector.rs b/src/dialogs/work_selector.rs index 95c6112..457b15b 100644 --- a/src/dialogs/work_selector.rs +++ b/src/dialogs/work_selector.rs @@ -46,7 +46,7 @@ where pub fn new>(backend: Rc, parent: &P, callback: F) -> Rc { use WorkSelectorState::*; - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/work_selector.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/work_selector.ui"); get_widget!(builder, libhandy::Window, window); get_widget!(builder, libhandy::Leaflet, leaflet); diff --git a/src/main.rs b/src/main.rs index fadced3..b7d15f3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,7 +29,7 @@ fn main() { gio::resources_register(&resource); let app = gtk::Application::new( - Some("de.johrpan.musicus_desktop"), + Some("de.johrpan.musicus"), gio::ApplicationFlags::empty(), ) .expect("Failed to initialize GTK application!"); diff --git a/src/screens/ensemble_screen.rs b/src/screens/ensemble_screen.rs index 29e29d7..bafdf88 100644 --- a/src/screens/ensemble_screen.rs +++ b/src/screens/ensemble_screen.rs @@ -20,7 +20,7 @@ pub struct EnsembleScreen { impl EnsembleScreen { pub fn new(backend: Rc, ensemble: Ensemble) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/ensemble_screen.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/ensemble_screen.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, libhandy::HeaderBar, header); diff --git a/src/screens/person_screen.rs b/src/screens/person_screen.rs index dee8ca5..a26c3e9 100644 --- a/src/screens/person_screen.rs +++ b/src/screens/person_screen.rs @@ -20,7 +20,7 @@ pub struct PersonScreen { impl PersonScreen { pub fn new(backend: Rc, person: Person) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/person_screen.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_screen.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, libhandy::HeaderBar, header); diff --git a/src/screens/recording_screen.rs b/src/screens/recording_screen.rs index 634716e..c5124e4 100644 --- a/src/screens/recording_screen.rs +++ b/src/screens/recording_screen.rs @@ -18,7 +18,7 @@ pub struct RecordingScreen { impl RecordingScreen { pub fn new(backend: Rc, recording: RecordingDescription) -> Rc { let builder = - gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/recording_screen.ui"); + gtk::Builder::from_resource("/de/johrpan/musicus/ui/recording_screen.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, libhandy::HeaderBar, header); diff --git a/src/screens/work_screen.rs b/src/screens/work_screen.rs index cdefe15..90e6bcb 100644 --- a/src/screens/work_screen.rs +++ b/src/screens/work_screen.rs @@ -19,7 +19,7 @@ pub struct WorkScreen { impl WorkScreen { pub fn new(backend: Rc, work: WorkDescription) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/work_screen.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/work_screen.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, libhandy::HeaderBar, header); diff --git a/src/widgets/person_list.rs b/src/widgets/person_list.rs index 4e283e8..5c49bcd 100644 --- a/src/widgets/person_list.rs +++ b/src/widgets/person_list.rs @@ -15,7 +15,7 @@ pub struct PersonList { impl PersonList { pub fn new(backend: Rc) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/person_list.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_list.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, gtk::SearchEntry, search_entry); diff --git a/src/widgets/poe_list.rs b/src/widgets/poe_list.rs index 4d82f8a..99b3579 100644 --- a/src/widgets/poe_list.rs +++ b/src/widgets/poe_list.rs @@ -30,7 +30,7 @@ pub struct PoeList { impl PoeList { pub fn new(backend: Rc) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/poe_list.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/poe_list.ui"); get_widget!(builder, gtk::Box, widget); get_widget!(builder, gtk::SearchEntry, search_entry); diff --git a/src/window.rs b/src/window.rs index 7030574..39e10b0 100644 --- a/src/window.rs +++ b/src/window.rs @@ -22,7 +22,7 @@ pub struct Window { impl Window { pub fn new(app: >k::Application) -> Rc { - let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/window.ui"); + let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/window.ui"); get_widget!(builder, libhandy::ApplicationWindow, window); get_widget!(builder, gtk::Stack, stack);