From 7762d8253f9a8d073a20d9c7413a091e37ead068 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Tue, 2 Feb 2021 10:29:28 +0100
Subject: [PATCH] Move about dialog to window

---
 src/dialogs/about.rs | 21 ---------------------
 src/dialogs/mod.rs   |  3 ---
 src/meson.build      |  1 -
 src/window.rs        | 21 ++++++++++++++++++++-
 4 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 src/dialogs/about.rs

diff --git a/src/dialogs/about.rs b/src/dialogs/about.rs
deleted file mode 100644
index abfa407..0000000
--- a/src/dialogs/about.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::config;
-use gettextrs::gettext;
-use gtk::prelude::*;
-
-pub fn show_about_dialog<W: IsA<gtk::Window>>(parent: &W) {
-    let dialog = gtk::AboutDialogBuilder::new()
-        .transient_for(parent)
-        .modal(true)
-        .logo_icon_name("de.johrpan.musicus")
-        .program_name(&gettext("Musicus"))
-        .version(config::VERSION)
-        .comments(&gettext("The classical music player and organizer."))
-        .website("https://github.com/johrpan/musicus")
-        .website_label(&gettext("Further information and source code"))
-        .copyright("© 2020 Elias Projahn")
-        .license_type(gtk::License::Agpl30)
-        .authors(vec![String::from("Elias Projahn <johrpan@gmail.com>")])
-        .build();
-
-    dialog.show();
-}
diff --git a/src/dialogs/mod.rs b/src/dialogs/mod.rs
index c04e7bc..61938e1 100644
--- a/src/dialogs/mod.rs
+++ b/src/dialogs/mod.rs
@@ -1,6 +1,3 @@
-pub mod about;
-pub use about::*;
-
 pub mod login_dialog;
 pub use login_dialog::*;
 
diff --git a/src/meson.build b/src/meson.build
index bba9fa8..c4673f6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,7 +53,6 @@ sources = files(
   'database/schema.rs',
   'database/thread.rs',
   'database/works.rs',
-  'dialogs/about.rs',
   'dialogs/login_dialog.rs',
   'dialogs/mod.rs',
   'dialogs/preferences.rs',
diff --git a/src/window.rs b/src/window.rs
index 6129b16..7ceb262 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,4 +1,5 @@
 use crate::backend::*;
+use crate::config;
 use crate::dialogs::*;
 use crate::import::SourceSelector;
 use crate::screens::*;
@@ -142,7 +143,7 @@ impl Window {
             result.window,
             "about",
             clone!(@strong result => move |_, _| {
-                show_about_dialog(&result.window);
+                result.show_about_dialog();
             })
         );
 
@@ -210,4 +211,22 @@ impl Window {
         self.navigator.reset();
         self.leaflet.set_visible_child(&self.sidebar_box);
     }
+
+    fn show_about_dialog(&self) {
+        let dialog = gtk::AboutDialogBuilder::new()
+            .transient_for(&self.window)
+            .modal(true)
+            .logo_icon_name("de.johrpan.musicus")
+            .program_name(&gettext("Musicus"))
+            .version(config::VERSION)
+            .comments(&gettext("The classical music player and organizer."))
+            .website("https://github.com/johrpan/musicus")
+            .website_label(&gettext("Further information and source code"))
+            .copyright("© 2020 Elias Projahn")
+            .license_type(gtk::License::Agpl30)
+            .authors(vec![String::from("Elias Projahn <johrpan@gmail.com>")])
+            .build();
+
+        dialog.show();
+    }
 }