diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs index fab5f90..68aadc4 100644 --- a/cosmic-settings/src/app.rs +++ b/cosmic-settings/src/app.rs @@ -120,6 +120,7 @@ impl SettingsApp { PageCommands::RegionLanguage => self.pages.page_id::(), #[cfg(feature = "page-sound")] PageCommands::Sound => self.pages.page_id::(), + PageCommands::StartupApps => self.pages.page_id::(), PageCommands::System => self.pages.page_id::(), PageCommands::Time => self.pages.page_id::(), #[cfg(feature = "page-input")] @@ -548,6 +549,12 @@ impl cosmic::Application for SettingsApp { } } + crate::pages::Message::StartupApps(message) => { + if let Some(page) = self.pages.page_mut::() { + return page.update(message).map(Into::into); + } + } + #[cfg(feature = "page-users")] crate::pages::Message::User(message) => { if let Some(page) = self.pages.page_mut::() { @@ -638,12 +645,6 @@ impl cosmic::Application for SettingsApp { return page.update(message).map(Into::into); } } - - crate::pages::Message::StartupApps(message) => { - if let Some(page) = self.pages.page_mut::() { - return page.update(message).map(Into::into); - } - } }, #[cfg(feature = "wayland")] diff --git a/cosmic-settings/src/main.rs b/cosmic-settings/src/main.rs index e67d4dc..05d58c8 100644 --- a/cosmic-settings/src/main.rs +++ b/cosmic-settings/src/main.rs @@ -103,6 +103,8 @@ pub enum PageCommands { /// Sound settings page #[cfg(feature = "page-sound")] Sound, + /// Startup applications settings page + StartupApps, /// System & Accounts settings page System, /// Time & Language settings page diff --git a/cosmic-settings/src/pages/applications/startup_apps.rs b/cosmic-settings/src/pages/applications/startup_apps.rs index 2ca58b2..9313d51 100644 --- a/cosmic-settings/src/pages/applications/startup_apps.rs +++ b/cosmic-settings/src/pages/applications/startup_apps.rs @@ -99,7 +99,7 @@ impl page::AutoBind for Page {} impl page::Page for Page { fn info(&self) -> Info { - page::Info::new("startup-apps", "system-reboot-symbolic") + page::Info::new("startup-apps", "preferences-startup-applications-symbolic") .title(fl!("startup-apps")) .description(fl!("startup-apps", "desc")) } diff --git a/debian/install b/debian/install index f4f48e9..2cd8505 100644 --- a/debian/install +++ b/debian/install @@ -21,6 +21,7 @@ /usr/share/applications/com.system76.CosmicSettings.Power.desktop /usr/share/applications/com.system76.CosmicSettings.RegionLanguage.desktop /usr/share/applications/com.system76.CosmicSettings.Sound.desktop +/usr/share/applications/com.system76.CosmicSettings.StartupApps.desktop /usr/share/applications/com.system76.CosmicSettings.System.desktop /usr/share/applications/com.system76.CosmicSettings.Time.desktop /usr/share/applications/com.system76.CosmicSettings.Touchpad.desktop diff --git a/justfile b/justfile index f69d3ba..f9b0264 100644 --- a/justfile +++ b/justfile @@ -52,6 +52,7 @@ entry-panel := appid + '.Panel.desktop' entry-power := appid + '.Power.desktop' entry-region-language := appid + '.RegionLanguage.desktop' entry-sound := appid + '.Sound.desktop' +entry-startup-apps := appid + '.StartupApps.desktop' entry-system := appid + '.System.desktop' entry-time := appid + '.Time.desktop' entry-touchpad := appid + '.Touchpad.desktop' @@ -91,6 +92,7 @@ install-desktop-entries: install -Dm0644 'resources/{{entry-power}}' '{{appdir}}/{{entry-power}}' install -Dm0644 'resources/{{entry-region-language}}' '{{appdir}}/{{entry-region-language}}' install -Dm0644 'resources/{{entry-sound}}' '{{appdir}}/{{entry-sound}}' + install -Dm0644 'resources/{{entry-startup-apps}}' '{{appdir}}/{{entry-startup-apps}}' install -Dm0644 'resources/{{entry-system}}' '{{appdir}}/{{entry-system}}' install -Dm0644 'resources/{{entry-time}}' '{{appdir}}/{{entry-time}}' install -Dm0644 'resources/{{entry-touchpad}}' '{{appdir}}/{{entry-touchpad}}' @@ -144,6 +146,7 @@ uninstall: '{{appdir}}/{{entry-power}}' \ '{{appdir}}/{{entry-region-language}}' \ '{{appdir}}/{{entry-sound}}' \ + '{{appdir}}/{{entry-startup-apps}}' \ '{{appdir}}/{{entry-system}}' \ '{{appdir}}/{{entry-time}}' \ '{{appdir}}/{{entry-touchpad}}' \ diff --git a/resources/com.system76.CosmicSettings.StartupApps.desktop b/resources/com.system76.CosmicSettings.StartupApps.desktop new file mode 100644 index 0000000..579e056 --- /dev/null +++ b/resources/com.system76.CosmicSettings.StartupApps.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Startup applications +Comment=Configure applications which run on login. +Type=Settings +Exec=cosmic-settings startup-apps +Terminal=false +Categories=COSMIC +Keywords=COSMIC +NoDisplay=true +OnlyShowIn=COSMIC +Icon=preferences-startup-applications +StartupNotify=true