Rename dialogs module to preferences

src/dialogs/mod.rs

@@ -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::*;

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;

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',

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};

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>,

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::*;