Merge lp:~elementary-apps/pantheon-mail/ask-to-open-dialog into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

Create AskToOpenDialog.vala
Move strings and logic from geary-controller.vala to AskToOpenDialog.vala

[lp:~elementary-apps/pantheon-mail/ask-to-open-dialog]

2059. By Danielle Foré on 2016-05-27

more sane naming

[Zisu Andrei (matzipan)]

Diff comment below. Otherwise, LGTM.

But there is no option in the Preferences panel to enable this dialog, you have to use dconf.

review: Needs Fixing

[lp:~elementary-apps/pantheon-mail/ask-to-open-dialog]

2060. By Danielle Foré on 2016-05-29

use style class for dialog title text

[Danielle Foré (danrabbit)]

Created a style class in egtk for dialog primary text and made use of it.

Yep that's correct that there's currently no option to re-enable this dialog. That's the same as trunk and I think outside of this branch's scope

[lp:~elementary-apps/pantheon-mail/ask-to-open-dialog]

2061. By Danielle Foré on 2016-05-29

use markup line no longer necessary

[Zisu Andrei (matzipan)]

I know it is out of scope, I was just checking, maybe I missed something.

review: Approve

[Danielle Foré (danrabbit)]

Thanks!

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-03-20 20:04:33 +0000
+++ src/CMakeLists.txt	2016-05-29 16:52:19 +0000
@@ -363,6 +363,7 @@
 client/conversation-viewer/AttachmentWidget.vala
 
 client/dialogs/alert-dialog.vala
+client/dialogs/OpenAttachmentDialog.vala
 client/dialogs/attachment-dialog.vala
 client/dialogs/certificate-warning-dialog.vala
 client/dialogs/password-dialog.vala

=== modified file 'src/client/application/geary-controller.vala'
--- src/client/application/geary-controller.vala	2016-03-17 15:51:02 +0000
+++ src/client/application/geary-controller.vala	2016-05-29 16:52:19 +0000
@@ -1942,15 +1942,11 @@
 
     private void on_open_attachment(Geary.Attachment attachment) {
         if (GearyApplication.instance.config.ask_open_attachment) {
-            QuestionDialog ask_to_open = new QuestionDialog.with_checkbox(main_window,
-                _("Are you sure you want to open \"%s\"?").printf(attachment.file.get_basename()),
-                _("Attachments may cause damage to your system if opened.  Only open files from trusted sources."),
-                Stock._OPEN_BUTTON, Stock._CANCEL, _("Don't _ask me again"), false);
-            if (ask_to_open.run() != Gtk.ResponseType.OK)
+            var ask_to_open = new OpenAttachmentDialog (main_window, attachment);
+            if (ask_to_open.run() != Gtk.ResponseType.OK) {
                 return;
-
-            // only save checkbox state if OK was selected
-            GearyApplication.instance.config.ask_open_attachment = !ask_to_open.is_checked;
+            }
+            ask_to_open.destroy ();
         }
 
         // Open the attachment if we know what to do with it.

=== added file 'src/client/dialogs/OpenAttachmentDialog.vala'
--- src/client/dialogs/OpenAttachmentDialog.vala	1970-01-01 00:00:00 +0000
+++ src/client/dialogs/OpenAttachmentDialog.vala	2016-05-29 16:52:19 +0000
@@ -0,0 +1,81 @@
+/*
+* Copyright (c) 2016 elementary LLC (http://launchpad.net/pantheon-mail
+*
+* 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., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+* Authored by: Daniel Foré <[e-mail]>
+*/
+
+public class OpenAttachmentDialog : Gtk.Dialog {
+    private Gtk.CheckButton checkbox;
+
+    public OpenAttachmentDialog (Gtk.Window parent, Geary.Attachment attachment) {
+        border_width = 6;
+        deletable = false;
+        resizable = false;
+        transient_for = parent;
+
+        var warning_image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
+        warning_image.valign = Gtk.Align.START;
+
+        var primary_label = new Gtk.Label (_("Are you sure you want to open %s?").printf(attachment.file.get_basename()));
+        primary_label.get_style_context ().add_class ("primary");
+        primary_label.max_width_chars = 60;
+        primary_label.wrap = true;
+        primary_label.xalign = 0;
+
+        var secondary_label = new Gtk.Label (_("Attachments may cause damage to your system if opened. Only open files from trusted sources."));
+        secondary_label.max_width_chars = 60;
+        secondary_label.wrap = true;
+        secondary_label.xalign = 0;
+
+        checkbox = new Gtk.CheckButton.with_label (_("Don't ask me again"));
+        checkbox.margin_top = 6;
+
+        var open_button = new Gtk.Button.with_label (_("Open Anyway"));
+        open_button.get_style_context ().add_class ("destructive-action");
+
+        var layout = new Gtk.Grid ();
+        layout.margin = 6;
+        layout.margin_top = 0;
+        layout.column_spacing = 12;
+        layout.row_spacing = 6;
+        layout.attach (warning_image, 0, 0, 1, 3);
+        layout.attach (primary_label, 1, 0, 1, 1);
+        layout.attach (secondary_label, 1, 1, 1, 1);
+        layout.attach (checkbox, 1, 2, 1, 1);
+
+        var content = get_content_area () as Gtk.Box;
+        content.add (layout);
+
+        add_button (_("Cancel"), Gtk.ResponseType.CLOSE);
+        add_action_widget (open_button, Gtk.ResponseType.OK);
+        show_all ();
+
+        response.connect (on_response);
+    }
+
+    private void on_response (Gtk.Dialog source, int response_id) {
+        switch (response_id) {
+        case Gtk.ResponseType.OK:
+            GearyApplication.instance.config.ask_open_attachment = !checkbox.active;
+	        break;
+        case Gtk.ResponseType.CLOSE:
+	        destroy ();
+	        break;
+        }
+    }
+}