Option to install proprietary codecs

src/Config.vala.in

@@ -1,7 +1,7 @@
 namespace Build {
-	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-	public const string LANG_LIST = "@LANG_LIST@";
-	public const string PREFERRED_LANG_LIST = "@PREFERRED_LANG_LIST@";
-	public const string XKB_BASE = "@XKB_BASE@";
-	public const string ISO_CODES_LOCATION = "@ISO_CODES_LOCATION@";
+    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    public const string LANG_LIST = "@LANG_LIST@";
+    public const string PREFERRED_LANG_LIST = "@PREFERRED_LANG_LIST@";
+    public const string XKB_BASE = "@XKB_BASE@";
+    public const string ISO_CODES_LOCATION = "@ISO_CODES_LOCATION@";
 }

src/MainWindow.vala

@@ -23,6 +23,7 @@ public class Installer.MainWindow : Hdy.Window {
     private AccountView account_view;
     private LanguageView language_view;
     private KeyboardLayoutView keyboard_layout_view;
+    private SoftwareView third_party_software_view;
 
     public MainWindow () {
         Object (
@@ -65,7 +66,20 @@ public class Installer.MainWindow : Hdy.Window {
         stack.add (keyboard_layout_view);
         stack.visible_child = keyboard_layout_view;
 
-        keyboard_layout_view.next_step.connect (() => load_account_view ());
+        keyboard_layout_view.next_step.connect (() => load_third_party_software_view ());
+    }
+
+    private void load_third_party_software_view () {
+        if (third_party_software_view != null) {
+            third_party_software_view.destroy ();
+        }
+
+        third_party_software_view = new SoftwareView ();
+        third_party_software_view.previous_view = keyboard_layout_view;
+        stack.add (third_party_software_view);
+        stack.visible_child = third_party_software_view;
+
+        third_party_software_view.next_step.connect (() => load_account_view ());
     }
 
     private void load_account_view () {
@@ -74,7 +88,7 @@ public class Installer.MainWindow : Hdy.Window {
         }
 
         account_view = new AccountView ();
-        account_view.previous_view = keyboard_layout_view;
+        account_view.previous_view = third_party_software_view;
         stack.add (account_view);
         stack.visible_child = account_view;
 

src/Objects/Configuration.vala

@@ -32,4 +32,5 @@ public class Configuration : GLib.Object {
     public string? country { get; set; default = null; }
     public string keyboard_layout { get; set; }
     public string? keyboard_variant { get; set; default = null; }
+    public bool install_additional_media_formats { get; set; default = false; }
 }

src/Views/SoftwareView.vala

@@ -0,0 +1,82 @@
+/*-
+ * Copyright 2020 elementary, Inc. (https://elementary.io)
+ *
+ * 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 Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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/>.
+ * Authored by: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
+ */
+
+public class Installer.SoftwareView : AbstractInstallerView {
+    construct {
+        var image = new Gtk.Image.from_icon_name ("system-software-update", Gtk.IconSize.DIALOG);
+        image.valign = Gtk.Align.END;
+
+        var title_label = new Gtk.Label (_("Software"));
+        title_label.get_style_context ().add_class (Granite.STYLE_CLASS_H2_LABEL);
+        title_label.valign = Gtk.Align.START;
+
+        var form_grid = new Gtk.Grid ();
+        form_grid.row_spacing = 3;
+        form_grid.valign = Gtk.Align.CENTER;
+        form_grid.vexpand = true;
+
+        var additional_media_formats_name_label = new Gtk.Label (_("Install additional media formats"));
+        additional_media_formats_name_label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
+        additional_media_formats_name_label.halign = Gtk.Align.START;
+        additional_media_formats_name_label.hexpand = true;
+
+        var additional_media_formats_description_label = new Gtk.Label (_("This software is subject to license terms included with its documentation. Some is propietary."));
+        additional_media_formats_description_label.wrap = true;
+        additional_media_formats_description_label.xalign = 0;
+
+        var additional_media_formats_switch = new Gtk.Switch ();
+        additional_media_formats_switch.valign = Gtk.Align.CENTER;
+
+        unowned Configuration configuration = Configuration.get_default ();
+        configuration.bind_property ("install_additional_media_formats", additional_media_formats_switch, "active", BindingFlags.BIDIRECTIONAL);
+
+        form_grid.attach (additional_media_formats_name_label, 0, 0);
+        form_grid.attach (additional_media_formats_description_label, 0, 1);
+        form_grid.attach (additional_media_formats_switch, 1, 0, 1, 2);
+
+        content_area.attach (image, 0, 0, 1, 1);
+        content_area.attach (title_label, 0, 1, 1, 1);
+        content_area.attach (form_grid, 1, 0, 1, 2);
+
+        var back_button = new Gtk.Button.with_label (_("Back"));
+
+        var next_button = new Gtk.Button.with_label (_("Select"));
+        next_button.sensitive = true;
+        next_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+
+        action_area.add (back_button);
+        action_area.add (next_button);
+
+        back_button.clicked.connect (() => ((Gtk.Stack) get_parent ()).visible_child = previous_view);
+        next_button.clicked.connect (on_next_button_clicked);
+
+        show_all ();
+    }
+
+    private void on_next_button_clicked () {
+        unowned Configuration configuration = Configuration.get_default ();
+        var additional_packages_to_install = new List<string> ();
+        if (configuration.install_additional_media_formats) {
+            additional_packages_to_install.append ("gstreamer1.0-libav");
+            additional_packages_to_install.append ("gstreamer1.0-plugins-bad");
+            additional_packages_to_install.append ("gstreamer1.0-plugins-ugly");
+        }
+
+        next_step ();
+    }
+}

src/Views/ThirdPartySoftwareView.vala

@@ -0,0 +1,82 @@
+/*-
+ * Copyright 2020 elementary, Inc. (https://elementary.io)
+ *
+ * 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 Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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/>.
+ * Authored by: Marius Meisenzahl <mariusmeisenzahl@gmail.com>
+ */
+
+public class Installer.ThirdPartySoftwareView : AbstractInstallerView {
+    construct {
+        var image = new Gtk.Image.from_icon_name ("emblem-synchronized", Gtk.IconSize.DIALOG);
+        image.valign = Gtk.Align.END;
+
+        var title_label = new Gtk.Label (_("Third Party Software"));
+        title_label.get_style_context ().add_class (Granite.STYLE_CLASS_H2_LABEL);
+        title_label.valign = Gtk.Align.START;
+
+        var form_grid = new Gtk.Grid ();
+        form_grid.row_spacing = 3;
+        form_grid.valign = Gtk.Align.CENTER;
+        form_grid.vexpand = true;
+
+        var additional_media_formats_name_label = new Gtk.Label (_("Install additional media formats"));
+        additional_media_formats_name_label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
+        additional_media_formats_name_label.halign = Gtk.Align.START;
+        additional_media_formats_name_label.hexpand = true;
+
+        var additional_media_formats_description_label = new Gtk.Label (_("This software is subject to license terms included with its documentation. Some is proprietary."));
+        additional_media_formats_description_label.wrap = true;
+        additional_media_formats_description_label.xalign = 0;
+
+        var additional_media_formats_switch = new Gtk.Switch ();
+        additional_media_formats_switch.valign = Gtk.Align.CENTER;
+
+        unowned Configuration configuration = Configuration.get_default ();
+        configuration.bind_property ("install_additional_media_formats", additional_media_formats_switch, "active", BindingFlags.BIDIRECTIONAL);
+
+        form_grid.attach (additional_media_formats_name_label, 0, 0);
+        form_grid.attach (additional_media_formats_description_label, 0, 1);
+        form_grid.attach (additional_media_formats_switch, 1, 0, 1, 2);
+
+        content_area.attach (image, 0, 0, 1, 1);
+        content_area.attach (title_label, 0, 1, 1, 1);
+        content_area.attach (form_grid, 1, 0, 1, 2);
+
+        var back_button = new Gtk.Button.with_label (_("Back"));
+
+        var next_button = new Gtk.Button.with_label (_("Select"));
+        next_button.sensitive = true;
+        next_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+
+        action_area.add (back_button);
+        action_area.add (next_button);
+
+        back_button.clicked.connect (() => ((Gtk.Stack) get_parent ()).visible_child = previous_view);
+        next_button.clicked.connect (on_next_button_clicked);
+
+        show_all ();
+    }
+
+    private void on_next_button_clicked () {
+        unowned Configuration configuration = Configuration.get_default ();
+        var additional_packages_to_install = new List<string> ();
+        if (configuration.install_additional_media_formats) {
+            additional_packages_to_install.append ("gstreamer1.0-libav");
+            additional_packages_to_install.append ("gstreamer1.0-plugins-bad");
+            additional_packages_to_install.append ("gstreamer1.0-plugins-ugly");
+        }
+
+        next_step ();
+    }
+}

src/meson.build

@@ -12,6 +12,7 @@ vala_files = [
     'Views/AccountView.vala',
     'Views/KeyboardLayoutView.vala',
     'Views/LanguageView.vala',
+    'Views/SoftwareView.vala',
     'Widgets/LayoutWidget.vala',
     'Widgets/VariantWidget.vala'
 ]