chore(desktop): add desktop entries

cosmic-settings/src/pages/desktop/appearance.rs

@@ -1487,11 +1487,11 @@ pub fn style() -> Section<crate::pages::Message> {
 pub fn window_management() -> Section<crate::pages::Message> {
     let mut descriptions = Slab::new();
 
-    let active_hint = descriptions.insert(fl!("window-management", "active-hint"));
+    let active_hint = descriptions.insert(fl!("window-management-appearance", "active-hint"));
-    let gaps = descriptions.insert(fl!("window-management", "gaps"));
+    let gaps = descriptions.insert(fl!("window-management-appearance", "gaps"));
 
     Section::default()
-        .title(fl!("window-management"))
+        .title(fl!("window-management-appearance"))
         .descriptions(descriptions)
         .view::<Page>(move |_binder, page, section| {
             let descriptions = &section.descriptions;

i18n/en/cosmic_settings.ftl

@@ -8,10 +8,38 @@ number = { $number }
 
 desktop = Desktop
 
+## Desktop: Wallpaper
+
+wallpaper = Wallpaper
+    .change = Change image every
+    .desc = Wallpaper images, colors, and slideshow options.
+    .fit = Wallpaper fit
+    .folder-dialog = Choose wallpaper folder
+    .image-dialog = Choose wallpaper image
+    .plural = Wallpapers
+    .same = Same wallpaper on all displays
+    .slide = Slideshow
+
+add-color = Add color
+add-image = Add image
+all-displays = All Displays
+colors = Colors
+dialog-add = Add
+fill = Fill
+fit-to-screen = Fit to Screen
+open-new-folder = Open new folder
+recent-folders = Recent Folders
+
+x-minutes = { $number } minutes
+x-hours = { $number ->
+    [1] 1 hour
+    *[other] { $number } hours
+}
+
 ## Desktop: Appearance
 
 appearance = Appearance
-    .desc = Accent colors and COSMIC theming.
+    .desc = Accent colors and theming.
 
 accent-color = Accent color
 app-background = Application or window background
@@ -66,11 +94,111 @@ style = Style
     .square = Square
 
 # interface density left out for now
-window-management = Window Management
+window-management-appearance = Window Management
     .active-hint = Active window hint size
     .gaps = Gaps around tiled windows
 
-## Desktop: Display
+## Desktop: Notifications
+
+notifications = Notifications
+    .desc = Do Not Disturb, lockscreen notifications, and per-application settings.
+
+## Desktop: Panel
+
+panel = Panel
+    .desc = Top bar with desktop controls and menus.
+
+add = Add
+add-applet = Add Applet
+all = All
+applets = Applets
+center-segment = Center Segment
+drop-here = Drop applets here
+end-segment = End Segment
+large = Large
+no-applets-found = No applets found...
+panel-bottom = Bottom
+panel-left = Left
+panel-right = Right
+panel-top = Top
+search-applets = Search applets...
+small = Small
+start-segment = Start Segment
+
+panel-appearance = Appearance
+    .match = Match desktop
+    .light = Light
+    .dark = Dark
+
+panel-behavior-and-position = Behavior and Positions
+    .autohide = Automatically hide panel
+    .dock-autohide = Automatically hide dock
+    .position = Position on screen
+    .display = Show on display
+
+panel-style = Style
+    .anchor-gap = Gap between panel and screen edges
+    .dock-anchor-gap = Gap between dock and screen edges
+    .extend = Extend panel to screen edges
+    .dock-extend = Extend dock to screen edges
+    .appearance = Appearance
+    .size = Size
+    .background-opacity = Background opacity
+
+panel-applets = Configuration
+    .dock-desc = Configure dock applets.
+    .desc = Configure panel applets.
+
+panel-missing = Panel Configuration is Missing
+    .desc = The panel configuration file is missing due to use of a custom configuration or it is corrupted.
+    .fix = Reset to default
+
+## Desktop: Dock
+
+dock = Dock
+    .desc = Panel with pinned applications in the app tray and other applets.
+
+## Desktop: Window management
+
+window-management = Window management
+    .desc = Super key action, window control options, and additional window tiling options.
+
+super-key = Super key
+    .launcher = Open Launcher
+    .workspaces = Open Workspaces
+    .applications = Open Applications
+
+window-controls = Window Controls
+    .minimize = Show minimize button
+    .maximize = Show maximize button
+
+## Desktop: Workspaces
+
+workspaces = Workspaces
+    .desc = Workspace orientation and behavior.
+
+workspaces-behavior = Workspace Behavior
+    .dynamic = Dynamic workspaces
+    .dynamic-desc = Automatically removes empty workspaces.
+    .fixed = Fixed Number of Workspaces
+    .fixed-desc = Add or remove workspaces in the overview.
+
+workspaces-multi-behavior = Multi-monitor Behavior
+    .span = Workspaces Span Displays
+    .separate = Displays Have Separate Workspaces
+
+workspaces-overview-thumbnails = Workspace Overview Thumbnails
+    .show-number = Show Workspace Number
+    .show-name = Show Workspace Name
+
+workspaces-orientation = Workspaces Orientation
+    .vertical = Vertical
+    .horizontal = Horizontal
+
+hot-corner = Hot Corner
+    .top-left-corner = Enable top-left hot corner for Workspaces
+
+## Displays
 
 -requires-restart = Requires restart
 
@@ -124,143 +252,6 @@ dialog = Dialog
     .change-prompt = Settings changes will automatically revert in { $time } seconds.
     .revert-settings = Revert Settings
 
-## Desktop: Notifications
-
-notifications = Notifications
-    .desc = Do Not Disturb, lockscreen notifications, and per-application settings.
-
-## Desktop: Options
-
-desktop-panel-options = Desktop and Panel
-    .desc = Super Key action, hot corners, window control options.
-
-desktop-panels-and-applets = Desktop Panels and Applets
-
-dock = Dock
-    .desc = Panel with pinned applications.
-
-hot-corner = Hot Corner
-    .top-left-corner = Enable top-left hot corner for Workspaces
-
-top-panel = Top Panel
-    .workspaces = Show Workspaces Button
-    .applications = Show Applications Button
-
-## Desktop: Panel
-
-panel = Panel
-    .desc = Top bar with desktop controls and menus.
-
-add = Add
-add-applet = Add Applet
-all = All
-applets = Applets
-center-segment = Center Segment
-drop-here = Drop applets here
-end-segment = End Segment
-large = Large
-no-applets-found = No applets found...
-panel-bottom = Bottom
-panel-left = Left
-panel-right = Right
-panel-top = Top
-search-applets = Search applets...
-small = Small
-start-segment = Start Segment
-
-panel-appearance = Appearance
-    .match = Match desktop
-    .light = Light
-    .dark = Dark
-
-panel-behavior-and-position = Behavior and Positions
-    .autohide = Automatically hide panel
-    .dock-autohide = Automatically hide dock
-    .position = Position on screen
-    .display = Show on display
-
-panel-style = Style
-    .anchor-gap = Gap between panel and screen edges
-    .dock-anchor-gap = Gap between dock and screen edges
-    .extend = Extend panel to screen edges
-    .dock-extend = Extend dock to screen edges
-    .appearance = Appearance
-    .size = Size
-    .background-opacity = Background opacity
-
-panel-applets = Configuration
-    .dock-desc = Configure dock applets.
-    .desc = Configure panel applets.
-
-panel-missing = Panel Configuration is Missing
-    .desc = The panel configuration file is missing due to use of a custom configuration or it is corrupted.
-    .fix = Reset to default
-
-## Desktop: Wallpaper
-
-wallpaper = Wallpaper
-    .change = Change image every
-    .desc = Wallpaper images, colors, and slideshow options.
-    .fit = Wallpaper fit
-    .folder-dialog = Choose wallpaper folder
-    .image-dialog = Choose wallpaper image
-    .plural = Wallpapers
-    .same = Same wallpaper on all displays
-    .slide = Slideshow
-
-add-color = Add color
-add-image = Add image
-all-displays = All Displays
-colors = Colors
-dialog-add = Add
-fill = Fill
-fit-to-screen = Fit to Screen
-open-new-folder = Open new folder
-recent-folders = Recent Folders
-
-x-minutes = { $number } minutes
-x-hours = { $number ->
-    [1] 1 hour
-    *[other] { $number } hours
-}
-
-## Desktop: Window management
-
-window-management = Window management
-    .desc = Super key action, window control options, and additional window tiling options.
-
-super-key = Super key
-    .launcher = Open Launcher
-    .workspaces = Open Workspaces
-    .applications = Open Applications
-
-window-controls = Window Controls
-    .minimize = Show minimize button
-    .maximize = Show maximize button
-
-## Desktop: Workspaces
-
-workspaces = Workspaces
-    .desc = Set workspace number, behavior, and placement.
-
-workspaces-behavior = Workspace Behavior
-    .dynamic = Dynamic workspaces
-    .dynamic-desc = Automatically removes empty workspaces.
-    .fixed = Fixed Number of Workspaces
-    .fixed-desc = Add or remove workspaces in the overview.
-
-workspaces-multi-behavior = Multi-monitor Behavior
-    .span = Workspaces Span Displays
-    .separate = Displays Have Separate Workspaces
-
-workspaces-overview-thumbnails = Workspace Overview Thumbnails
-    .show-number = Show Workspace Number
-    .show-name = Show Workspace Name
-
-workspaces-orientation = Workspaces Orientation
-    .vertical = Vertical
-    .horizontal = Horizontal
-
 ## Networking: Wired
 
 wired = Wired

justfile

@@ -28,17 +28,19 @@ entry-settings := appid + '.desktop'
 entry-about := appid + '.About.desktop'
 entry-appear := appid + '.Appearance.desktop'
 entry-date-time := appid + '.DateTime.desktop'
-entry-desktop := appid + '.Desktop.desktop'
 entry-displays := appid + '.Displays.desktop'
+entry-dock := appid + '.Dock.desktop'
 entry-firmware := appid + '.Firmware.desktop'
 entry-keyboard := appid + '.Keyboard.desktop'
 entry-mouse := appid + '.Mouse.desktop'
 entry-notifications := appid + '.Notifications.desktop'
+entry-panel := appid + '.Panel.desktop'
 entry-region-language := appid + '.RegionLanguage.desktop'
 entry-sound := appid + '.Sound.desktop'
 entry-touchpad := appid + '.Touchpad.desktop'
 entry-users := appid + '.Users.desktop'
 entry-wallpaper := appid + '.Wallpaper.desktop'
+entry-window-management := appid + '.WindowManagement.desktop'
 entry-workspaces := appid + '.Workspaces.desktop'
 
 # Build recipes
@@ -51,17 +53,19 @@ install-desktop-entries:
     install -Dm0644 'resources/{{entry-about}}' '{{appdir}}/{{entry-about}}'
     install -Dm0644 'resources/{{entry-appear}}' '{{appdir}}/{{entry-appear}}'
     install -Dm0644 'resources/{{entry-date-time}}' '{{appdir}}/{{entry-date-time}}'
-    install -Dm0644 'resources/{{entry-desktop}}' '{{appdir}}/{{entry-desktop}}'
     install -Dm0644 'resources/{{entry-displays}}' '{{appdir}}/{{entry-displays}}'
+    install -Dm0644 'resources/{{entry-dock}}' '{{appdir}}/{{entry-dock}}'
     install -Dm0644 'resources/{{entry-firmware}}' '{{appdir}}/{{entry-firmware}}'
     install -Dm0644 'resources/{{entry-keyboard}}' '{{appdir}}/{{entry-keyboard}}'
     install -Dm0644 'resources/{{entry-mouse}}' '{{appdir}}/{{entry-mouse}}'
     install -Dm0644 'resources/{{entry-notifications}}' '{{appdir}}/{{entry-notifications}}'
+    install -Dm0644 'resources/{{entry-panel}}' '{{appdir}}/{{entry-panel}}'
     install -Dm0644 'resources/{{entry-region-language}}' '{{appdir}}/{{entry-region-language}}'
     install -Dm0644 'resources/{{entry-sound}}' '{{appdir}}/{{entry-sound}}'
     install -Dm0644 'resources/{{entry-touchpad}}' '{{appdir}}/{{entry-touchpad}}'
     install -Dm0644 'resources/{{entry-users}}' '{{appdir}}/{{entry-users}}'
     install -Dm0644 'resources/{{entry-wallpaper}}' '{{appdir}}/{{entry-wallpaper}}'
+    install -Dm0644 'resources/{{entry-window-management}}' '{{appdir}}/{{entry-window-management}}'
     install -Dm0644 'resources/{{entry-workspaces}}' '{{appdir}}/{{entry-workspaces}}'
 
 # Install everything
@@ -86,17 +90,19 @@ uninstall:
         '{{appdir}}/{{entry-about}}' \
         '{{appdir}}/{{entry-appear}}' \
         '{{appdir}}/{{entry-date-time}}' \
-        '{{appdir}}/{{entry-desktop}}' \
         '{{appdir}}/{{entry-displays}}' \
+        '{{appdir}}/{{entry-dock}}' \
         '{{appdir}}/{{entry-firmware}}' \
         '{{appdir}}/{{entry-keyboard}}' \
         '{{appdir}}/{{entry-mouse}}' \
         '{{appdir}}/{{entry-notifications}}' \
+        '{{appdir}}/{{entry-panel}}' \
         '{{appdir}}/{{entry-region-language}}' \
         '{{appdir}}/{{entry-sound}}' \
         '{{appdir}}/{{entry-touchpad}}' \
         '{{appdir}}/{{entry-users}}' \
         '{{appdir}}/{{entry-wallpaper}}' \
+        '{{appdir}}/{{entry-window-management}}' \
         '{{appdir}}/{{entry-workspaces}}'
     find 'resources'/'default_schema' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} rm -rf {{default-schema-target}}/{}
     find 'resources'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} rm {{iconsdir}}/{}

resources/com.system76.CosmicSettings.Desktop.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Desktop and Panel
-Comment=Super key action, hot corners, and window control options
-Type=Settings
-Exec=cosmic-settings desktop-panel
-Terminal=false
-Categories=COSMIC
-Keywords=COSMIC
-NoDisplay=true
-OnlyShowIn=COSMIC
-Icon=preferences-desktop
-StartupNotify=true

resources/com.system76.CosmicSettings.Dock.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Dock
+Comment=Panel with pinned applications in the app tray and other applets.
+Type=Settings
+Exec=cosmic-settings dock
+Terminal=false
+Categories=COSMIC
+Keywords=COSMIC
+NoDisplay=true
+OnlyShowIn=COSMIC
+Icon=preferences-desktop-dock
+StartupNotify=true

resources/com.system76.CosmicSettings.Panel.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Panel
+Comment=Top bar with desktop controls and menus.
+Type=Settings
+Exec=cosmic-settings panel
+Terminal=false
+Categories=COSMIC
+Keywords=COSMIC
+NoDisplay=true
+OnlyShowIn=COSMIC
+Icon=preferences-desktop-panel
+StartupNotify=true

resources/com.system76.CosmicSettings.WindowManagement.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Window management
+Comment=Super key action, window control options, and additional window tiling options.
+Type=Settings
+Exec=cosmic-settings window-management
+Terminal=false
+Categories=COSMIC
+Keywords=COSMIC
+NoDisplay=true
+OnlyShowIn=COSMIC
+Icon=preferences-desktop-window-management
+StartupNotify=true