Merge lp:~elementary-pantheon/switchboard-plug-about/restore-dialog into lp:~elementary-apps/switchboard-plug-about/trunk

[Danielle Foré]

Rewrite settings restore dialog as its own widget

[lp:~elementary-pantheon/switchboard-plug-about/restore-dialog]

442. By Danielle Foré on 2017-03-19

actually restore the dialog

[Adam Bieńkowski (donadigo)]

Perhaps you could call get_content_area () once like this, and do everything in one go:

var action_area = get_action_area ();
action_area.add (grid);
action_area.margin_right = 6;
action_area.margin_bottom = 6;
action_area.margin_top = 14;

[Adam Bieńkowski (donadigo)]

Ignore my first comment. Looking good.

review: Approve (code / testing)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-01-06 07:38:10 +0000
+++ src/CMakeLists.txt	2017-03-19 18:19:27 +0000
@@ -14,6 +14,7 @@
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C
     Plug.vala
+    RestoreDialog.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-11-16 17:56:55 +0000
+++ src/Plug.vala	2017-03-19 18:19:27 +0000
@@ -489,45 +489,9 @@
  * returns true to continue, false to cancel
  */
 private bool confirm_restore_action () {
-    var dialog = new Gtk.Dialog ();
-
-    Gtk.Box box = dialog.get_content_area () as Gtk.Box;
-    var layout = new Gtk.Grid ();
-    var text = new Gtk.Label ("");
-
-    text.set_markup ("<span weight='bold' size='larger'>" +
-                     _("System settings will be restored to the factory defaults") + "</span>\n\n"+
-                     _("All system settings and data will be reset to the default values.") + "\n" +
-                     _("Personal data, such as music and pictures, will be uneffected."));
-
-    var image = new Gtk.Image.from_icon_name ("dialog-warning",
-                                              Gtk.IconSize.DIALOG);
-    image.yalign = 0;
-    image.show ();
-
-    layout.set_column_spacing (12);
-    layout.set_margin_right (6);
-    layout.set_margin_bottom (18);
-    layout.set_margin_left (6);
-
-    layout.add (image);
-    layout.add (text);
-
-    box.pack_start (layout);
-
-    var continue_button = new Gtk.Button.with_label (_("Restore Settings"));
-    continue_button.get_style_context ().add_class ("destructive-action");
-
-    var cancel_button = new Gtk.Button.with_label (_("Cancel"));
-    continue_button.show ();
-    cancel_button.show ();
-
-    dialog.border_width = 6;
-    dialog.deletable = false;
-    dialog.add_action_widget (cancel_button, 0);
-    dialog.add_action_widget (continue_button, 1);
-
+    var dialog = new RestoreDialog ();
     dialog.show_all ();
+
     var result = dialog.run ();
     dialog.destroy ();
 

=== added file 'src/RestoreDialog.vala'
--- src/RestoreDialog.vala	1970-01-01 00:00:00 +0000
+++ src/RestoreDialog.vala	2017-03-19 18:19:27 +0000
@@ -0,0 +1,63 @@
+/*
+* Copyright (c) 2017 elementary LLC. (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 2 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, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
+
+public class RestoreDialog : Gtk.Dialog {
+    public RestoreDialog () {
+        Object (resizable: false, deletable: false, skip_taskbar_hint: true);
+    }
+
+    construct {
+        var image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
+        image.valign = Gtk.Align.START;
+
+        var primary_label = new Gtk.Label (_("System Settings Will Be Restored to The Factory Defaults"));
+        primary_label.get_style_context ().add_class ("primary");
+        primary_label.max_width_chars = 50;
+        primary_label.wrap = true;
+        primary_label.xalign = 0;
+
+        var secondary_label = new Gtk.Label (_("All system settings and data will be reset to the default values. Personal data, such as music and pictures, will be uneffected."));
+        secondary_label.max_width_chars = 50;
+        secondary_label.wrap = true;
+        secondary_label.xalign = 0;
+
+        var grid = new Gtk.Grid ();
+        grid.column_spacing = 12;
+        grid.row_spacing = 6;
+        grid.margin_left = grid.margin_right = 12;
+        grid.attach (image, 0, 0, 1, 2);
+        grid.attach (primary_label, 1, 0, 1, 1);
+        grid.attach (secondary_label, 1, 1, 1, 1);
+
+        get_content_area ().add (grid);
+
+        var continue_button = new Gtk.Button.with_label (_("Restore Settings"));
+        continue_button.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
+
+        var cancel_button = new Gtk.Button.with_label (_("Cancel"));
+
+        add_action_widget (cancel_button, 0);
+        add_action_widget (continue_button, 1);
+
+        var action_area = get_action_area ();
+        action_area.margin_right = 6;
+        action_area.margin_bottom = 6;
+        action_area.margin_top = 14;
+    }
+}