From b66e048ecfbc3e9ab007786b65a31dd867602b38 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Tue, 13 Feb 2024 23:09:32 +0100
Subject: [PATCH] chore: move displays page to the top level

---
 app/src/app.rs                                     | 7 ++++---
 app/src/pages/desktop/mod.rs                       | 4 +---
 app/src/pages/{desktop => }/display/arrangement.rs | 0
 app/src/pages/{desktop => }/display/graphics.rs    | 0
 app/src/pages/{desktop => }/display/mod.rs         | 0
 app/src/pages/{desktop => }/display/text.rs        | 0
 app/src/pages/input/mod.rs                         | 6 +++---
 app/src/pages/mod.rs                               | 3 ++-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename app/src/pages/{desktop => }/display/arrangement.rs (100%)
 rename app/src/pages/{desktop => }/display/graphics.rs (100%)
 rename app/src/pages/{desktop => }/display/mod.rs (100%)
 rename app/src/pages/{desktop => }/display/text.rs (100%)

diff --git a/app/src/app.rs b/app/src/app.rs
index 7d78b5d..ab05626 100644
--- a/app/src/app.rs
+++ b/app/src/app.rs
@@ -13,7 +13,7 @@ use crate::pages::desktop::{
     },
 };
 use crate::pages::input::{self, keyboard};
-use crate::pages::{sound, system, time};
+use crate::pages::{display, sound, system, time};
 use crate::subscription::desktop_files;
 use crate::widget::{page_title, search_header};
 use crate::PageCommands;
@@ -111,10 +111,11 @@ impl cosmic::Application for SettingsApp {
         };
 
         let desktop_id = app.insert_page::<desktop::Page>().id();
+        app.insert_page::<input::Page>();
+        app.insert_page::<display::Page>();
         app.insert_page::<sound::Page>();
         app.insert_page::<system::Page>();
         app.insert_page::<time::Page>();
-        app.insert_page::<input::Page>();
 
         let active_id = match flags.subcommand {
             Some(p) => app.subcommand_to_page(&p),
@@ -283,7 +284,7 @@ impl cosmic::Application for SettingsApp {
                 }
 
                 crate::pages::Message::Displays(message) => {
-                    if let Some(page) = self.pages.page_mut::<desktop::display::Page>() {
+                    if let Some(page) = self.pages.page_mut::<display::Page>() {
                         return page.update(message).map(cosmic::app::Message::App);
                     }
                 }
diff --git a/app/src/pages/desktop/mod.rs b/app/src/pages/desktop/mod.rs
index 5baa0db..1daf743 100644
--- a/app/src/pages/desktop/mod.rs
+++ b/app/src/pages/desktop/mod.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 pub mod appearance;
-pub mod display;
 pub mod dock;
 pub mod notifications;
 pub mod options;
@@ -27,8 +26,7 @@ impl page::Page<crate::pages::Message> for Page {
 
 impl page::AutoBind<crate::pages::Message> for Page {
     fn sub_pages(page: page::Insert<crate::pages::Message>) -> page::Insert<crate::pages::Message> {
-        page.sub_page::<display::Page>()
-            .sub_page::<options::Page>()
+        page.sub_page::<options::Page>()
             .sub_page::<wallpaper::Page>()
             .sub_page::<appearance::Page>()
             .sub_page::<workspaces::Page>()
diff --git a/app/src/pages/desktop/display/arrangement.rs b/app/src/pages/display/arrangement.rs
similarity index 100%
rename from app/src/pages/desktop/display/arrangement.rs
rename to app/src/pages/display/arrangement.rs
diff --git a/app/src/pages/desktop/display/graphics.rs b/app/src/pages/display/graphics.rs
similarity index 100%
rename from app/src/pages/desktop/display/graphics.rs
rename to app/src/pages/display/graphics.rs
diff --git a/app/src/pages/desktop/display/mod.rs b/app/src/pages/display/mod.rs
similarity index 100%
rename from app/src/pages/desktop/display/mod.rs
rename to app/src/pages/display/mod.rs
diff --git a/app/src/pages/desktop/display/text.rs b/app/src/pages/display/text.rs
similarity index 100%
rename from app/src/pages/desktop/display/text.rs
rename to app/src/pages/display/text.rs
diff --git a/app/src/pages/input/mod.rs b/app/src/pages/input/mod.rs
index 8618ccf..a064c42 100644
--- a/app/src/pages/input/mod.rs
+++ b/app/src/pages/input/mod.rs
@@ -207,9 +207,9 @@ impl Page {
 impl page::Page<crate::pages::Message> for Page {
     fn info(&self) -> page::Info {
         // XXX icon?
-        page::Info::new("input", "input-keyboard-symbolic")
-            .title(fl!("input"))
-            .description(fl!("input", "desc"))
+        page::Info::new("input-devices", "input-keyboard-symbolic")
+            .title(fl!("input-devices"))
+            .description(fl!("input-devices", "desc"))
     }
 }
 
diff --git a/app/src/pages/mod.rs b/app/src/pages/mod.rs
index 95e8b0b..224434a 100644
--- a/app/src/pages/mod.rs
+++ b/app/src/pages/mod.rs
@@ -4,6 +4,7 @@
 use cosmic_settings_page::Entity;
 
 pub mod desktop;
+pub mod display;
 pub mod input;
 pub mod networking;
 pub mod sound;
@@ -18,7 +19,7 @@ pub enum Message {
     Desktop(desktop::Message),
     DesktopWallpaper(desktop::wallpaper::Message),
     DesktopWorkspaces(desktop::workspaces::Message),
-    Displays(desktop::display::Message),
+    Displays(display::Message),
     Dock(desktop::dock::Message),
     DockApplet(desktop::dock::applets::Message),
     External { id: String, message: Vec<u8> },