Add apps UI

main
kra-mo 2 years ago
parent fde28a2a3e
commit a29a948577

@ -25,6 +25,63 @@
}
},
"steps": {
"apps": {
"template": "applications",
"icon": "org.gnome.Software-symbolic",
"title": "Applications",
"description": "Choose which applications to install.",
"bundles": [
{
"id": "essential-apps",
"title": "Essential Applications",
"subtitle": "Core GNOME apps like Calendar or Calculator.",
"default": true,
"applications" : [
{
"name" : "Calendar",
"icon" : "org.gnome.Calendar-symbolic"
},
{
"name" : "Calculator",
"icon" : "org.gnome.Calculator-symbolic"
},
{
"name" : "Cheese",
"icon" : "org.gnome.Cheese-symbolic"
}
]
},
{
"id": "utilities",
"title": "Common Utilities",
"subtitle": "Useful utilities like Disks or Fonts.",
"default": true,
"applications" : [
{
"name" : "Disks",
"icon" : "org.gnome.DiskUtility-symbolic"
},
{
"name" : "Fonts",
"icon" : "org.gnome.font-viewer-symbolic"
}
]
}
],
"final": [
{
"if": "essential-apps",
"type": "command",
"commands": ["flatpak install org.gnome.Geary || snap install snapd"]
},
{
"if": "utilities",
"type": "command",
"commands": ["flatpak install org.gnome.Geary || snap install snapd"]
}
]
},
"welcome": {
"template": "welcome"
},

@ -14,8 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
from gi.repository import Gtk, Gio, GLib, Adw
from gi.repository import Gtk, Gio
@Gtk.Template(resource_path='/io/github/vanilla-os/FirstSetup/gtk/default-theme.ui')

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
from gi.repository import Gtk, Gio, GLib, Adw
from gi.repository import Gtk, GLib, Adw
from vanilla_first_setup.utils.run_async import RunAsync

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<template class="VanillaLayoutApplications" parent="AdwBin">
<property name="halign">fill</property>
<property name="valign">fill</property>
<property name="hexpand">true</property>
<child>
<object class="AdwStatusPage" id="status_page">
<property name="halign">fill</property>
<property name="valign">fill</property>
<property name="hexpand">true</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="vexpand">true</property>
<property name="hexpand">true</property>
<property name="valign">center</property>
<child>
<object class="AdwPreferencesPage">
<child>
<object class="AdwPreferencesGroup" id="bundles_list"></object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="btn_next">
<property name="label">Next</property>
<property name="halign">center</property>
<style>
<class name="pill"/>
<class name="suggested-action"/>
</style>
</object>
</child>
</object>
</child>
</object>
</child>
</template>
</interface>

@ -0,0 +1,128 @@
# applications.py
#
# Copyright 2022 mirkobrombin
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundationat version 3 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from gi.repository import Gtk, Adw
from vanilla_first_setup.dialog import VanillaDialog
@Gtk.Template(resource_path='/io/github/vanilla-os/FirstSetup/gtk/layout-applications.ui')
class VanillaLayoutApplications(Adw.Bin):
__gtype_name__ = 'VanillaLayoutApplications'
status_page = Gtk.Template.Child()
bundles_list = Gtk.Template.Child()
btn_next = Gtk.Template.Child()
def __init__(self, window, distro_info, key, step, **kwargs):
super().__init__(**kwargs)
self.__window = window
self.__distro_info = distro_info
self.__key = key
self.__step = step
self.__register_widgets = []
self.__build_ui()
# signals
self.btn_next.connect("clicked", self.__next_step)
def __build_ui(self):
self.status_page.set_icon_name(self.__step["icon"])
self.status_page.set_title(self.__step["title"])
self.status_page.set_description(self.__step["description"])
selection_dialogs = []
for item in self.__step["bundles"]:
_selection_dialog = Adw.Window()
_cancel_button = Gtk.Button()
_apply_button = Gtk.Button()
_cancel_button.set_label("Cancel")
_apply_button.set_label("Apply")
_apply_button.add_css_class("suggested-action")
_header_bar = Adw.HeaderBar()
_header_bar.pack_start(_cancel_button)
_header_bar.pack_end(_apply_button)
_header_bar.set_show_end_title_buttons(False)
_header_bar.set_show_start_title_buttons(False)
_apps_list = Adw.PreferencesGroup()
_apps_page = Adw.PreferencesPage()
_apps_page.add(_apps_list)
_box = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0)
_box.append(_header_bar)
_box.append(_apps_page)
_selection_dialog.set_content(_box)
_selection_dialog.set_modal(True)
_selection_dialog.set_title("Choose Applications")
_selection_dialog.set_transient_for(self.__window)
selection_dialogs.append(_selection_dialog)
def present_customize(widget, dialog):
dialog.present()
def close_customize(widget, dialog):
dialog.close()
_action_row = Adw.ActionRow(
title=item["title"],
subtitle=item.get("subtitle", "")
)
_switcher = Gtk.Switch()
_switcher.set_active(item.get("default", False))
_switcher.set_valign(Gtk.Align.CENTER)
_action_row.add_suffix(_switcher)
_customize = Gtk.Button()
_customize.set_icon_name("go-next-symbolic")
_customize.set_valign(Gtk.Align.CENTER)
_customize.add_css_class("flat")
_action_row.add_suffix(_customize)
_customize.connect("clicked", present_customize, selection_dialogs[-1])
_cancel_button.connect("clicked", close_customize, selection_dialogs[-1])
for app in item["applications"]:
_apps_action_row = Adw.ActionRow(
title=app["name"],
icon_name=app["icon"]
)
_app_switcher = Gtk.Switch()
_app_switcher.set_active(True)
_app_switcher.set_valign(Gtk.Align.CENTER)
_apps_action_row.add_suffix(_app_switcher)
_apps_list.add(_apps_action_row)
self.bundles_list.add(_action_row)
self.__register_widgets.append((item["id"], _switcher))
def __next_step(self, widget):
self.__window.next()
def get_finals(self):
finals = {"vars": {}, "funcs": [x for x in self.__step["final"]]}
for _id, switcher in self.__register_widgets:
finals["vars"][_id] = switcher.get_active()
return finals

@ -5,6 +5,7 @@ sources = [
'__init__.py',
'preferences.py',
'yes_no.py',
'applications.py'
]
install_data(sources, install_dir: layoutsdir)

@ -14,10 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
from gi.repository import Gtk, Gio, GLib, Adw
from gi.repository import Gtk, Adw
from vanilla_first_setup.utils.run_async import RunAsync
from vanilla_first_setup.dialog import VanillaDialog

@ -18,9 +18,6 @@ import os
import sys
import logging
import subprocess
import json
from gi.repository import Gio
from vanilla_first_setup.utils.recipe import RecipeLoader
@ -29,6 +26,7 @@ from vanilla_first_setup.defaults.theme import VanillaDefaultTheme
from vanilla_first_setup.layouts.preferences import VanillaLayoutPreferences
from vanilla_first_setup.layouts.yes_no import VanillaLayoutYesNo
from vanilla_first_setup.layouts.applications import VanillaLayoutApplications
logger = logging.getLogger("FirstSetup::Builder")
@ -38,7 +36,8 @@ templates = {
"welcome": VanillaDefaultWelcome,
"theme": VanillaDefaultTheme,
"preferences": VanillaLayoutPreferences,
"yes-no": VanillaLayoutYesNo
"yes-no": VanillaLayoutYesNo,
"applications": VanillaLayoutApplications
}

@ -14,10 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import sys
import logging
import json
logger = logging.getLogger("FirstSetup::Parser")

@ -19,8 +19,6 @@ import sys
import logging
import json
from gi.repository import Gio
logger = logging.getLogger("FirstSetup::RecipeLoader")

@ -12,6 +12,7 @@
<file>gtk/layout-preferences.ui</file>
<file>gtk/layout-yes-no.ui</file>
<file>gtk/layout-applications.ui</file>
</gresource>
<gresource prefix="/io/github/vanilla-os/FirstSetup/icons/scalable/actions/">
<file preprocess="xml-stripblanks">../data/icons/hicolor/symbolic/actions/vanilla-package-symbolic.svg</file>

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
from gi.repository import Gtk, Gio, GLib, Adw
from gi.repository import Gtk, Adw
from vanilla_first_setup.utils.builder import Builder
from vanilla_first_setup.utils.parser import Parser

Loading…
Cancel
Save