Move new navigator to its own module

src/main.rs

@@ -19,6 +19,7 @@ mod config;
 mod database;
 mod editors;
 mod import;
+mod navigator;
 mod player;
 mod preferences;
 mod screens;

src/meson.build

@@ -71,6 +71,8 @@ sources = files(
   'import/track_editor.rs',
   'import/track_selector.rs',
   'import/track_set_editor.rs',
+  'navigator/mod.rs',
+  'navigator/window.rs',
   'preferences/login.rs',
   'preferences/mod.rs',
   'preferences/register.rs',
@@ -96,8 +98,6 @@ sources = files(
   'widgets/mod.rs',
   'widgets/navigator.rs',
   'widgets/navigator_window.rs',
-  'widgets/new_navigator.rs',
-  'widgets/new_navigator_window.rs',
   'widgets/player_bar.rs',
   'widgets/poe_list.rs',
   'widgets/screen.rs',

src/navigator/mod.rs

@@ -6,6 +6,9 @@ use gtk::prelude::*;
 use std::cell::{Cell, RefCell};
 use std::rc::{Rc, Weak};
 
+pub mod window;
+pub use window::*;
+
 /// A widget that represents a logical unit of transient user interaction and
 /// that optionally resolves to a specific return value.
 pub trait Screen<I, O>: Widget {

src/navigator/window.rs

@@ -1,5 +1,5 @@
 use crate::backend::Backend;
-use super::new_navigator::{Navigator, Screen};
+use super::{Navigator, Screen};
 use glib::clone;
 use gtk::prelude::*;
 use std::rc::Rc;

src/preferences/login.rs

@@ -1,7 +1,7 @@
 use super::register::RegisterDialog;
 use crate::push;
 use crate::backend::{Backend, LoginData};
-use crate::widgets::new_navigator::{NavigationHandle, Screen, Widget};
+use crate::navigator::{NavigationHandle, Screen, Widget};
 use glib::clone;
 use gtk::prelude::*;
 use gtk_macros::get_widget;

src/preferences/mod.rs

@@ -1,5 +1,5 @@
 use crate::backend::Backend;
-use crate::widgets::new_navigator_window::NavigatorWindow;
+use crate::navigator::NavigatorWindow;
 use gettextrs::gettext;
 use glib::clone;
 use gtk::prelude::*;

src/preferences/register.rs

@@ -1,5 +1,5 @@
 use crate::backend::{Backend, LoginData, UserRegistration};
-use crate::widgets::new_navigator::{NavigationHandle, Screen, Widget};
+use crate::navigator::{NavigationHandle, Screen, Widget};
 use glib::clone;
 use gtk::prelude::*;
 use gtk_macros::get_widget;

src/widgets/mod.rs

@@ -10,13 +10,9 @@ pub use list::*;
 pub mod navigator;
 pub use navigator::*;
 
-pub mod new_navigator;
-
 pub mod navigator_window;
 pub use navigator_window::*;
 
-pub mod new_navigator_window;
-
 pub mod player_bar;
 pub use player_bar::*;