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

Rename application from Musicus Editor to Musicus

Browse source
This commit is contained in:
Elias Projahn 2020-11-01 12:49:10 +01:00
parent 4bb92a3c27
commit a42161dc05
28 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,5 +1,5 @@
[package] [package]
name = "musicus_editor" name = "musicus"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"

18
README.md
View file

@ -1,6 +1,6 @@
# Musicus Editor # Musicus
A desktop app for editing a Musicus database. The classical music player and organizer.
https://musicus.org https://musicus.org
@ -38,14 +38,14 @@ This file should never be edited manually.
## License ## License
Musicus Editor is free and open source software: you can redistribute it and/or Musicus is free and open source software: you can redistribute it and/or modify
modify it under the terms of the GNU Affero General Public License as published it under the terms of the GNU Affero General Public License as published by the
by the Free Software Foundation, either version 3 of the License, or (at your Free Software Foundation, either version 3 of the License, or (at your option)
option) any later version. any later version.
Musicus Editor is distributed in the hope that it will be useful, but WITHOUT Musicus is distributed in the hope that it will be useful, but WITHOUT ANY
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
details. details.
You should have received a copy of the GNU Affero General Public License along You should have received a copy of the GNU Affero General Public License along

2
res/resources.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/de/johrpan/musicus_editor"> <gresource prefix="/de/johrpan/musicus">
<file preprocess="xml-stripblanks">ui/ensemble_editor.ui</file> <file preprocess="xml-stripblanks">ui/ensemble_editor.ui</file>
<file preprocess="xml-stripblanks">ui/ensemble_selector.ui</file> <file preprocess="xml-stripblanks">ui/ensemble_selector.ui</file>
<file preprocess="xml-stripblanks">ui/ensemble_screen.ui</file> <file preprocess="xml-stripblanks">ui/ensemble_screen.ui</file>

10
res/ui/window.ui
View file

@ -12,7 +12,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="title" translatable="yes">Musicus Editor</property> <property name="title" translatable="yes">Musicus</property>
<property name="show-close-button">True</property> <property name="show-close-button">True</property>
</object> </object>
<packing> <packing>
@ -48,7 +48,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="opacity">0.5</property> <property name="opacity">0.5</property>
<property name="label" translatable="yes">Welcome to Musicus Editor!</property> <property name="label" translatable="yes">Welcome to Musicus!</property>
<attributes> <attributes>
<attribute name="size" value="16384" /> <attribute name="size" value="16384" />
</attributes> </attributes>
@ -101,7 +101,7 @@
<object class="HdyHeaderBar"> <object class="HdyHeaderBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes">Musicus Editor</property> <property name="title" translatable="yes">Musicus</property>
<property name="show-close-button">True</property> <property name="show-close-button">True</property>
</object> </object>
<packing> <packing>
@ -138,7 +138,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="opacity">0.5019607843137255</property> <property name="opacity">0.5019607843137255</property>
<property name="label" translatable="yes">Welcome to Musicus Editor!</property> <property name="label" translatable="yes">Welcome to Musicus!</property>
<attributes> <attributes>
<attribute name="size" value="16384" /> <attribute name="size" value="16384" />
</attributes> </attributes>
@ -203,7 +203,7 @@
<object class="HdyHeaderBar"> <object class="HdyHeaderBar">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes">Musicus Editor</property> <property name="title" translatable="yes">Musicus</property>
<property name="show-close-button">True</property> <property name="show-close-button">True</property>
</object> </object>
<packing> <packing>

2
src/dialogs/ensemble_editor.rs
View file

@ -27,7 +27,7 @@ where
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/ensemble_selector.rs
View file

@ -26,7 +26,7 @@ where
{ {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> { pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, add_button); get_widget!(builder, gtk::Button, add_button);

2
src/dialogs/instrument_editor.rs
View file

@ -27,7 +27,7 @@ where
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/instrument_selector.rs
View file

@ -26,7 +26,7 @@ where
{ {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> { pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, add_button); get_widget!(builder, gtk::Button, add_button);

2
src/dialogs/part_editor.rs
View file

@ -26,7 +26,7 @@ impl PartEditor {
part: Option<WorkPartDescription>, part: Option<WorkPartDescription>,
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/performance_editor.rs
View file

@ -34,7 +34,7 @@ where
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/person_editor.rs
View file

@ -27,7 +27,7 @@ where
person: Option<Person>, person: Option<Person>,
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/person_selector.rs
View file

@ -19,7 +19,7 @@ impl PersonSelector {
F: Fn(Person) -> () + 'static, F: Fn(Person) -> () + 'static,
{ {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, add_button); get_widget!(builder, gtk::Button, add_button);

2
src/dialogs/preferences.rs
View file

@ -11,7 +11,7 @@ pub struct Preferences {
impl Preferences { impl Preferences {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P) -> Self { pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, 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, gtk::Window, window);
get_widget!(builder, libhandy::ActionRow, music_library_path_row); get_widget!(builder, libhandy::ActionRow, music_library_path_row);

2
src/dialogs/recording_editor.rs
View file

@ -36,7 +36,7 @@ where
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

6
src/dialogs/recording_selector.rs
View file

@ -26,7 +26,7 @@ impl RecordingSelector {
F: Fn(RecordingDescription) -> () + 'static, F: Fn(RecordingDescription) -> () + 'static,
{ {
let builder = 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, gtk::Window, window);
get_widget!(builder, libhandy::Leaflet, leaflet); get_widget!(builder, libhandy::Leaflet, leaflet);
@ -93,7 +93,7 @@ struct RecordingSelectorPersonScreen {
impl RecordingSelectorPersonScreen { impl RecordingSelectorPersonScreen {
pub fn new(backend: Rc<Backend>, selector: Rc<RecordingSelector>, person: Person) -> Rc<Self> { pub fn new(backend: Rc<Backend>, selector: Rc<RecordingSelector>, person: Person) -> Rc<Self> {
let builder = gtk::Builder::from_resource( 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); get_widget!(builder, gtk::Box, widget);
@ -187,7 +187,7 @@ impl RecordingSelectorWorkScreen {
work: WorkDescription, work: WorkDescription,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = gtk::Builder::from_resource( 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); get_widget!(builder, gtk::Box, widget);

2
src/dialogs/section_editor.rs
View file

@ -16,7 +16,7 @@ impl SectionEditor {
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
let builder = 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/track_editor.rs
View file

@ -16,7 +16,7 @@ impl TrackEditor {
W: IsA<gtk::Window>, W: IsA<gtk::Window>,
F: Fn(TrackDescription) -> () + 'static, 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/tracks_editor.rs
View file

@ -18,7 +18,7 @@ impl TracksEditor {
parent: &P, parent: &P,
callback: F, callback: F,
) -> Self { ) -> 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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/work_editor.rs
View file

@ -76,7 +76,7 @@ where
work: Option<WorkDescription>, work: Option<WorkDescription>,
callback: F, callback: F,
) -> Rc<Self> { ) -> Rc<Self> {
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::Window, window);
get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, cancel_button);

2
src/dialogs/work_selector.rs
View file

@ -46,7 +46,7 @@ where
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> { pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P, callback: F) -> Rc<Self> {
use WorkSelectorState::*; 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::Window, window);
get_widget!(builder, libhandy::Leaflet, leaflet); get_widget!(builder, libhandy::Leaflet, leaflet);

2
src/main.rs
View file

@ -29,7 +29,7 @@ fn main() {
gio::resources_register(&resource); gio::resources_register(&resource);
let app = gtk::Application::new( let app = gtk::Application::new(
Some("de.johrpan.musicus_desktop"), Some("de.johrpan.musicus"),
gio::ApplicationFlags::empty(), gio::ApplicationFlags::empty(),
) )
.expect("Failed to initialize GTK application!"); .expect("Failed to initialize GTK application!");

2
src/screens/ensemble_screen.rs
View file

@ -20,7 +20,7 @@ pub struct EnsembleScreen {
impl EnsembleScreen { impl EnsembleScreen {
pub fn new(backend: Rc<Backend>, ensemble: Ensemble) -> Rc<Self> { pub fn new(backend: Rc<Backend>, ensemble: Ensemble) -> Rc<Self> {
let builder = 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, gtk::Box, widget);
get_widget!(builder, libhandy::HeaderBar, header); get_widget!(builder, libhandy::HeaderBar, header);

2
src/screens/person_screen.rs
View file

@ -20,7 +20,7 @@ pub struct PersonScreen {
impl PersonScreen { impl PersonScreen {
pub fn new(backend: Rc<Backend>, person: Person) -> Rc<Self> { pub fn new(backend: Rc<Backend>, person: Person) -> Rc<Self> {
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, gtk::Box, widget);
get_widget!(builder, libhandy::HeaderBar, header); get_widget!(builder, libhandy::HeaderBar, header);

2
src/screens/recording_screen.rs
View file

@ -18,7 +18,7 @@ pub struct RecordingScreen {
impl RecordingScreen { impl RecordingScreen {
pub fn new(backend: Rc<Backend>, recording: RecordingDescription) -> Rc<Self> { pub fn new(backend: Rc<Backend>, recording: RecordingDescription) -> Rc<Self> {
let builder = 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, gtk::Box, widget);
get_widget!(builder, libhandy::HeaderBar, header); get_widget!(builder, libhandy::HeaderBar, header);

2
src/screens/work_screen.rs
View file

@ -19,7 +19,7 @@ pub struct WorkScreen {
impl WorkScreen { impl WorkScreen {
pub fn new(backend: Rc<Backend>, work: WorkDescription) -> Rc<Self> { pub fn new(backend: Rc<Backend>, work: WorkDescription) -> Rc<Self> {
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, gtk::Box, widget);
get_widget!(builder, libhandy::HeaderBar, header); get_widget!(builder, libhandy::HeaderBar, header);

2
src/widgets/person_list.rs
View file

@ -15,7 +15,7 @@ pub struct PersonList {
impl PersonList { impl PersonList {
pub fn new(backend: Rc<Backend>) -> Rc<Self> { pub fn new(backend: Rc<Backend>) -> Rc<Self> {
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::Box, widget);
get_widget!(builder, gtk::SearchEntry, search_entry); get_widget!(builder, gtk::SearchEntry, search_entry);

2
src/widgets/poe_list.rs
View file

@ -30,7 +30,7 @@ pub struct PoeList {
impl PoeList { impl PoeList {
pub fn new(backend: Rc<Backend>) -> Rc<Self> { pub fn new(backend: Rc<Backend>) -> Rc<Self> {
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::Box, widget);
get_widget!(builder, gtk::SearchEntry, search_entry); get_widget!(builder, gtk::SearchEntry, search_entry);

2
src/window.rs
View file

@ -22,7 +22,7 @@ pub struct Window {
impl Window { impl Window {
pub fn new(app: &gtk::Application) -> Rc<Self> { pub fn new(app: &gtk::Application) -> Rc<Self> {
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, libhandy::ApplicationWindow, window);
get_widget!(builder, gtk::Stack, stack); get_widget!(builder, gtk::Stack, stack);