diff --git a/recipe.json b/recipe.json
index cf75d1f..87f2e43 100644
--- a/recipe.json
+++ b/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"]
}
]
},
diff --git a/vanilla_first_setup/assets/bundle-app-icons/com.github.flxzt.rnote.png b/vanilla_first_setup/assets/bundle-app-icons/com.github.flxzt.rnote.png
new file mode 100644
index 0000000..7c01688
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/com.github.flxzt.rnote.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/com.github.tchx84.Flatseal.png b/vanilla_first_setup/assets/bundle-app-icons/com.github.tchx84.Flatseal.png
new file mode 100644
index 0000000..4a0d916
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/com.github.tchx84.Flatseal.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/com.usebottles.bottles.png b/vanilla_first_setup/assets/bundle-app-icons/com.usebottles.bottles.png
new file mode 100644
index 0000000..56f92b4
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/com.usebottles.bottles.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/de.haeckerfelix.Shortwave.png b/vanilla_first_setup/assets/bundle-app-icons/de.haeckerfelix.Shortwave.png
new file mode 100644
index 0000000..ca45f17
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/de.haeckerfelix.Shortwave.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/fr.romainvigier.MetadataCleaner.png b/vanilla_first_setup/assets/bundle-app-icons/fr.romainvigier.MetadataCleaner.png
new file mode 100644
index 0000000..1e69caf
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/fr.romainvigier.MetadataCleaner.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Boxes.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Boxes.png
new file mode 100644
index 0000000..07b6360
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Boxes.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calculator.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calculator.png
new file mode 100644
index 0000000..055be6b
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calculator.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calendar.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calendar.png
new file mode 100644
index 0000000..ae45f0f
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Calendar.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Characters.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Characters.png
new file mode 100644
index 0000000..e61cb77
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Characters.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Cheese.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Cheese.png
new file mode 100644
index 0000000..66606f1
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Cheese.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Connections.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Connections.png
new file mode 100644
index 0000000..c592d50
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Connections.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Contacts.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Contacts.png
new file mode 100644
index 0000000..0b59e66
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Contacts.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Evince.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Evince.png
new file mode 100644
index 0000000..80e87e3
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Evince.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Extensions.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Extensions.png
new file mode 100644
index 0000000..9219e5d
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Extensions.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Logs.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Logs.png
new file mode 100644
index 0000000..1aa915d
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Logs.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Maps.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Maps.png
new file mode 100644
index 0000000..4d6c17d
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Maps.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Music.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Music.png
new file mode 100644
index 0000000..ea8468c
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Music.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Photos.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Photos.png
new file mode 100644
index 0000000..56c2e65
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Photos.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.SoundRecorder.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.SoundRecorder.png
new file mode 100644
index 0000000..f6ddffd
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.SoundRecorder.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.TextEditor.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.TextEditor.png
new file mode 100644
index 0000000..8f68b53
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.TextEditor.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Totem.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Totem.png
new file mode 100644
index 0000000..292209e
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Totem.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Weather.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Weather.png
new file mode 100644
index 0000000..c4d1e49
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.Weather.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.baobab.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.baobab.png
new file mode 100644
index 0000000..618ca1e
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.baobab.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.clocks.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.clocks.png
new file mode 100644
index 0000000..26feac6
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.clocks.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png
new file mode 100644
index 0000000..fc70bdf
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.eog.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.gnome.font-viewer.png b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.font-viewer.png
new file mode 100644
index 0000000..545ec37
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.gnome.font-viewer.png differ
diff --git a/vanilla_first_setup/assets/bundle-app-icons/org.libreoffice.LibreOffice.png b/vanilla_first_setup/assets/bundle-app-icons/org.libreoffice.LibreOffice.png
new file mode 100644
index 0000000..5dd30f5
Binary files /dev/null and b/vanilla_first_setup/assets/bundle-app-icons/org.libreoffice.LibreOffice.png differ
diff --git a/vanilla_first_setup/defaults/applications.py b/vanilla_first_setup/defaults/applications.py
index 1b2a73e..b9b20ba 100644
--- a/vanilla_first_setup/defaults/applications.py
+++ b/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)
diff --git a/vanilla_first_setup/vanilla-first-setup.gresource.xml b/vanilla_first_setup/vanilla-first-setup.gresource.xml
index 6098082..56e5ce6 100644
--- a/vanilla_first_setup/vanilla-first-setup.gresource.xml
+++ b/vanilla_first_setup/vanilla-first-setup.gresource.xml
@@ -14,9 +14,38 @@
gtk/layout-yes-no.ui
gtk/layout-applications.ui
-
+
../data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg
../data/icons/hicolor/symbolic/actions/vanilla-container-terminal-symbolic.svg
../data/icons/hicolor/symbolic/actions/vanilla-puzzle-piece-symbolic.svg
+
+ assets/bundle-app-icons/com.github.flxzt.rnote.png
+ assets/bundle-app-icons/com.github.tchx84.Flatseal.png
+ assets/bundle-app-icons/com.usebottles.bottles.png
+ assets/bundle-app-icons/de.haeckerfelix.Shortwave.png
+ assets/bundle-app-icons/fr.romainvigier.MetadataCleaner.png
+ assets/bundle-app-icons/org.gnome.baobab.png
+ assets/bundle-app-icons/org.gnome.Boxes.png
+ assets/bundle-app-icons/org.gnome.Calculator.png
+ assets/bundle-app-icons/org.gnome.Calendar.png
+ assets/bundle-app-icons/org.gnome.Characters.png
+ assets/bundle-app-icons/org.gnome.Cheese.png
+ assets/bundle-app-icons/org.gnome.clocks.png
+ assets/bundle-app-icons/org.gnome.Connections.png
+ assets/bundle-app-icons/org.gnome.Contacts.png
+ assets/bundle-app-icons/org.gnome.eog.png
+ assets/bundle-app-icons/org.gnome.Evince.png
+ assets/bundle-app-icons/org.gnome.Extensions.png
+ assets/bundle-app-icons/org.gnome.font-viewer.png
+ assets/bundle-app-icons/org.gnome.Logs.png
+ assets/bundle-app-icons/org.gnome.Maps.png
+ assets/bundle-app-icons/org.gnome.Music.png
+ assets/bundle-app-icons/org.gnome.Photos.png
+ assets/bundle-app-icons/org.gnome.SoundRecorder.png
+ assets/bundle-app-icons/org.gnome.TextEditor.png
+ assets/bundle-app-icons/org.gnome.Totem.png
+ assets/bundle-app-icons/org.gnome.Weather.png
+ assets/bundle-app-icons/org.libreoffice.LibreOffice.png
+
\ No newline at end of file