From 1a354871354514637319d3a7e771ceef63e62087 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Tue, 2 Feb 2021 10:39:38 +0100
Subject: [PATCH] Rename dialogs module to preferences

---
 src/dialogs/mod.rs                                    | 11 -----------
 src/main.rs                                           |  2 +-
 src/meson.build                                       |  9 ++++-----
 src/{dialogs/login_dialog.rs => preferences/login.rs} |  2 +-
 src/{dialogs/preferences.rs => preferences/mod.rs}    |  9 ++++++++-
 src/{dialogs => preferences}/register.rs              |  0
 .../server_dialog.rs => preferences/server.rs}        |  0
 src/window.rs                                         |  2 +-
 8 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 src/dialogs/mod.rs
 rename src/{dialogs/login_dialog.rs => preferences/login.rs} (98%)
 rename src/{dialogs/preferences.rs => preferences/mod.rs} (97%)
 rename src/{dialogs => preferences}/register.rs (100%)
 rename src/{dialogs/server_dialog.rs => preferences/server.rs} (100%)

diff --git a/src/dialogs/mod.rs b/src/dialogs/mod.rs
deleted file mode 100644
index 61938e1..0000000
--- a/src/dialogs/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod login_dialog;
-pub use login_dialog::*;
-
-pub mod preferences;
-pub use preferences::*;
-
-pub mod register;
-pub use register::*;
-
-pub mod server_dialog;
-pub use server_dialog::*;
diff --git a/src/main.rs b/src/main.rs
index b17ca7a..d9cc10b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,10 +17,10 @@ mod macros;
 mod backend;
 mod config;
 mod database;
-mod dialogs;
 mod editors;
 mod import;
 mod player;
+mod preferences;
 mod screens;
 mod selectors;
 mod widgets;
diff --git a/src/meson.build b/src/meson.build
index c4673f6..cbeaa40 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,11 +53,6 @@ sources = files(
   'database/schema.rs',
   'database/thread.rs',
   'database/works.rs',
-  'dialogs/login_dialog.rs',
-  'dialogs/mod.rs',
-  'dialogs/preferences.rs',
-  'dialogs/register.rs',
-  'dialogs/server_dialog.rs',
   'editors/ensemble.rs',
   'editors/instrument.rs',
   'editors/mod.rs',
@@ -76,6 +71,10 @@ sources = files(
   'import/track_editor.rs',
   'import/track_selector.rs',
   'import/track_set_editor.rs',
+  'preferences/login.rs',
+  'preferences/mod.rs',
+  'preferences/register.rs',
+  'preferences/server.rs',
   'screens/ensemble.rs',
   'screens/mod.rs',
   'screens/person.rs',
diff --git a/src/dialogs/login_dialog.rs b/src/preferences/login.rs
similarity index 98%
rename from src/dialogs/login_dialog.rs
rename to src/preferences/login.rs
index 5e7f4d9..f3ae150 100644
--- a/src/dialogs/login_dialog.rs
+++ b/src/preferences/login.rs
@@ -1,4 +1,4 @@
-use super::RegisterDialog;
+use super::register::RegisterDialog;
 use crate::push;
 use crate::backend::{Backend, LoginData};
 use crate::widgets::new_navigator::{NavigationHandle, Screen, Widget};
diff --git a/src/dialogs/preferences.rs b/src/preferences/mod.rs
similarity index 97%
rename from src/dialogs/preferences.rs
rename to src/preferences/mod.rs
index ad56120..0e589d8 100644
--- a/src/dialogs/preferences.rs
+++ b/src/preferences/mod.rs
@@ -1,4 +1,3 @@
-use super::{LoginDialog, ServerDialog};
 use crate::backend::Backend;
 use crate::widgets::new_navigator_window::NavigatorWindow;
 use gettextrs::gettext;
@@ -8,6 +7,14 @@ use gtk_macros::get_widget;
 use libadwaita::prelude::*;
 use std::rc::Rc;
 
+mod login;
+use login::LoginDialog;
+
+mod server;
+use server::ServerDialog;
+
+mod register;
+
 /// A dialog for configuring the app.
 pub struct Preferences {
     backend: Rc<Backend>,
diff --git a/src/dialogs/register.rs b/src/preferences/register.rs
similarity index 100%
rename from src/dialogs/register.rs
rename to src/preferences/register.rs
diff --git a/src/dialogs/server_dialog.rs b/src/preferences/server.rs
similarity index 100%
rename from src/dialogs/server_dialog.rs
rename to src/preferences/server.rs
diff --git a/src/window.rs b/src/window.rs
index 7ceb262..f0db8ee 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,7 +1,7 @@
 use crate::backend::*;
 use crate::config;
-use crate::dialogs::*;
 use crate::import::SourceSelector;
+use crate::preferences::Preferences;
 use crate::screens::*;
 use crate::widgets::*;
 use futures::prelude::*;