From 499fc87a593a8208acfbef8e4760d0e952d620d4 Mon Sep 17 00:00:00 2001
From: Elias Projahn <johrpan@gmail.com>
Date: Tue, 2 Feb 2021 10:59:28 +0100
Subject: [PATCH] Move new navigator to its own module

---
 src/main.rs                                                  | 1 +
 src/meson.build                                              | 4 ++--
 src/{widgets/new_navigator.rs => navigator/mod.rs}           | 3 +++
 src/{widgets/new_navigator_window.rs => navigator/window.rs} | 2 +-
 src/preferences/login.rs                                     | 2 +-
 src/preferences/mod.rs                                       | 2 +-
 src/preferences/register.rs                                  | 2 +-
 src/widgets/mod.rs                                           | 4 ----
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename src/{widgets/new_navigator.rs => navigator/mod.rs} (99%)
 rename src/{widgets/new_navigator_window.rs => navigator/window.rs} (96%)

diff --git a/src/main.rs b/src/main.rs
index d9cc10b..5261920 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,6 +19,7 @@ mod config;
 mod database;
 mod editors;
 mod import;
+mod navigator;
 mod player;
 mod preferences;
 mod screens;
diff --git a/src/meson.build b/src/meson.build
index cbeaa40..e83e7e8 100644
--- a/src/meson.build
+++ b/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',
diff --git a/src/widgets/new_navigator.rs b/src/navigator/mod.rs
similarity index 99%
rename from src/widgets/new_navigator.rs
rename to src/navigator/mod.rs
index 8cf0d15..93dde69 100644
--- a/src/widgets/new_navigator.rs
+++ b/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 {
diff --git a/src/widgets/new_navigator_window.rs b/src/navigator/window.rs
similarity index 96%
rename from src/widgets/new_navigator_window.rs
rename to src/navigator/window.rs
index 7548791..4c12486 100644
--- a/src/widgets/new_navigator_window.rs
+++ b/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;
diff --git a/src/preferences/login.rs b/src/preferences/login.rs
index f3ae150..2a41902 100644
--- a/src/preferences/login.rs
+++ b/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;
diff --git a/src/preferences/mod.rs b/src/preferences/mod.rs
index 0e589d8..f5526d6 100644
--- a/src/preferences/mod.rs
+++ b/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::*;
diff --git a/src/preferences/register.rs b/src/preferences/register.rs
index 5bfbeca..f8f4ef0 100644
--- a/src/preferences/register.rs
+++ b/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;
diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs
index d8018eb..bb85c93 100644
--- a/src/widgets/mod.rs
+++ b/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::*;