Merge pull request #69 from kra-mo/main

Update apps and icons

recipe.json

@@ -96,9 +96,9 @@
             "description": "Choose which applications to install.",
             "bundles": [
                 {
-                    "id": "essential-apps",
-                    "title": "Essential Applications",
-                    "subtitle": "Core GNOME apps like Calendar or Calculator.",
+                    "id": "core-apps",
+                    "title": "Core Applications",
+                    "subtitle": "Essential GNOME apps like Calendar or Calculator.",
                     "default": true,
                     "applications" : [
                         {
@@ -130,6 +130,11 @@
                             "flatpak" : true,
                             "snap" : true
                         },
+                        {
+                            "name" : "Connections",
+                            "icon" :  "org.gnome.Connections",
+                            "flatpak" : true 
+                        },
                         {
                             "name" : "Contacts",
                             "icon" :  "org.gnome.Contacts",
@@ -202,16 +207,62 @@
                         }
                     ]
                 },
+                {
+                    "id": "office",
+                    "title": "Office",
+                    "subtitle": "The LibreOffice suite.",
+                    "default": false,
+                    "applications" : [
+                        {
+                            "name" : "LibreOffice",
+                            "icon" : "org.libreoffice.LibreOffice",
+                            "flatpak": true,
+                            "snap" : true
+                        }
+                    ]
+                },
                 {
                     "id": "utilities",
                     "title": "Common Utilities",
-                    "subtitle": "Useful utilities like Bottles.",
-                    "default": true,
+                    "subtitle": "Useful utilities like Bottles or Sound Recorder.",
+                    "default": false,
                     "applications" : [
                         {
                             "name" : "Bottles",
                             "icon" :  "com.usebottles.bottles",
-                            "flatpak" : "com.usebottles.bottles"
+                            "flatpak" : true
+                        },
+                        {
+                            "name" : "Boxes",
+                            "icon" :  "org.gnome.Boxes",
+                            "flatpak" : true,
+                            "snap" : true
+                        },
+                        {
+                            "name" : "Flatseal",
+                            "icon" :  "com.github.tchx84.Flatseal",
+                            "flatpak" : true
+                        },
+                        {
+                            "name" : "Metadata Cleaner",
+                            "icon" :  "fr.romainvigier.MetadataCleaner",
+                            "flatpak" : true
+                        },
+                        {
+                            "name" : "Rnote",
+                            "icon" : "com.github.flxzt.rnote",
+                            "flatpak" : true
+                        },
+                        {
+                            "name" : "Shortwave",
+                            "icon" : "de.haeckerfelix.Shortwave",
+                            "flatpak" : true,
+                            "snap" : true
+                        },
+                        {
+                            "name" : "Sound Recorder",
+                            "icon" : "org.gnome.SoundRecorder",
+                            "flatpak" : true
                         }
                     ]
                 }
@@ -242,6 +293,11 @@
                     "type" :  "command",
                     "commands" : ["!nextBoot flatpak install -y org.gnome.clocks || snap install gnome-clocks"]
                 },
+                {
+                    "if" : "Connections",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y org.gnome.Connections"]
+                },
                 {
                     "if" : "Contacts",
                     "type" :  "command",
@@ -307,10 +363,45 @@
                     "type" :  "command",
                     "commands" : ["!nextBoot flatpak install -y org.gnome.Weather || snap install gnome-weather"]
                 },
+                {
+                    "if" : "LibreOffice",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y org.libreoffice.LibreOffice || snap install libreoffice"]
+                },
                 {
                     "if" : "Bottles",
                     "type" :  "command",
                     "commands" : ["!nextBoot flatpak install -y com.usebottles.bottles"]
+                },
+                {
+                    "if" : "Boxes",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y org.gnome.Boxes || snap install gnome-boxes"]
+                },
+                {
+                    "if" : "Flatseal",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y com.github.tchx84.Flatseal"]
+                },
+                {
+                    "if" : "Metadata Cleaner",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y fr.romainvigier.MetadataCleaner"]
+                },
+                {
+                    "if" : "Rnote",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y com.github.flxzt.rnote"]
+                },
+                {
+                    "if" : "Shortwave",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y de.haeckerfelix.Shortwave || snap install shortwave"]
+                },
+                {
+                    "if" : "Sound Recorder",
+                    "type" :  "command",
+                    "commands" : ["!nextBoot flatpak install -y org.gnome.SoundRecorder"]
                 }
             ]
         },

vanilla_first_setup/defaults/applications.py

@@ -69,8 +69,11 @@ class VanillaLayoutApplications(Adw.Bin):
                     if app[package_manager]:
                         _apps_action_row = Adw.ActionRow(
                             title=app["name"],
-                            icon_name=app["icon"]
                         )
+                        _app_icon = Gtk.Image.new_from_resource("/io/github/vanilla-os/FirstSetup/assets/bundle-app-icons/" + app["icon"] + ".png")
+                        _app_icon.set_icon_size(Gtk.IconSize.LARGE)
+                        _app_icon.add_css_class("lowres-icon")
+                        _apps_action_row.add_prefix(_app_icon)
                         _app_switcher = Gtk.Switch()
                         _app_switcher.set_active(True)
                         _app_switcher.set_valign(Gtk.Align.CENTER)

vanilla_first_setup/vanilla-first-setup.gresource.xml

@@ -14,9 +14,38 @@
     <file>gtk/layout-yes-no.ui</file>
     <file>gtk/layout-applications.ui</file>
   </gresource>
-  <gresource prefix="/io/github/vanilla-os/FirstSetup/icons/scalable/actions/">
+  <gresource prefix="/io/github/vanilla-os/FirstSetup/icons/scalable/actions">
     <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg</file>
     <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg</file>
     <file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg</file>
   </gresource>
+  <gresource prefix="/io/github/vanilla-os/FirstSetup">
+    <file>assets/bundle-app-icons/com.github.flxzt.rnote.png</file>
+    <file>assets/bundle-app-icons/com.github.tchx84.Flatseal.png</file>
+    <file>assets/bundle-app-icons/com.usebottles.bottles.png</file>
+    <file>assets/bundle-app-icons/de.haeckerfelix.Shortwave.png</file>
+    <file>assets/bundle-app-icons/fr.romainvigier.MetadataCleaner.png</file>
+    <file>assets/bundle-app-icons/org.gnome.baobab.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Boxes.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Calculator.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Calendar.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Characters.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Cheese.png</file>
+    <file>assets/bundle-app-icons/org.gnome.clocks.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Connections.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Contacts.png</file>
+    <file>assets/bundle-app-icons/org.gnome.eog.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Evince.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Extensions.png</file>
+    <file>assets/bundle-app-icons/org.gnome.font-viewer.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Logs.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Maps.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Music.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Photos.png</file>
+    <file>assets/bundle-app-icons/org.gnome.SoundRecorder.png</file>
+    <file>assets/bundle-app-icons/org.gnome.TextEditor.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Totem.png</file>
+    <file>assets/bundle-app-icons/org.gnome.Weather.png</file>
+    <file>assets/bundle-app-icons/org.libreoffice.LibreOffice.png</file>
+  </gresource>
 </gresources>