Merge lp:~elementary-apps/pantheon-photos/remove-multitextentrydialog into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

* Remove unused MultiTextEntryDialog.vala
* Dialogs.vala: Remove unused class MultiTextEntryDialogMediator

I guess this is dead code. Nothing seems to call it and the app compiles fine without it

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-16 19:35:47 +0000
+++ src/CMakeLists.txt	2017-02-18 02:44:04 +0000
@@ -76,7 +76,6 @@
     Dialogs/AdjustDateTimeDialog.vala
     Dialogs/Dialogs.vala
     Dialogs/ExportDialog.vala
-    Dialogs/MultiTextEntryDialog.vala
     Dialogs/PreferencesDialog.vala
     Dialogs/ProgressDialog.vala
     Dialogs/TextEntryDialog.vala

=== modified file 'src/Dialogs/Dialogs.vala'
--- src/Dialogs/Dialogs.vala	2017-02-16 19:35:47 +0000
+++ src/Dialogs/Dialogs.vala	2017-02-18 02:44:04 +0000
@@ -631,27 +631,6 @@
     }
 }
 
-public abstract class MultiTextEntryDialogMediator {
-    private MultiTextEntryDialog dialog;
-
-    public MultiTextEntryDialogMediator (string title, string label, string? initial_text = null) {
-        Gtk.Builder builder = AppWindow.create_builder ();
-        dialog = new MultiTextEntryDialog ();
-        dialog.get_content_area ().add ((Gtk.Box) builder.get_object ("dialog-vbox4"));
-        dialog.set_builder (builder);
-        dialog.setup (on_modify_validate, title, label, initial_text);
-    }
-
-    protected virtual bool on_modify_validate (string text) {
-        return true;
-    }
-
-    protected string? _execute () {
-        return dialog.execute ();
-    }
-}
-
-
 // This method takes primary and secondary texts and returns ready-to-use pango markup
 // for a HIG-compliant alert dialog. Please see
 // http://library.gnome.org/devel/hig-book/2.32/windows-alert.html.en for details.

=== removed file 'src/Dialogs/MultiTextEntryDialog.vala'
--- src/Dialogs/MultiTextEntryDialog.vala	2017-02-16 19:35:47 +0000
+++ src/Dialogs/MultiTextEntryDialog.vala	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2009-2013 Yorba Foundation
-*               2017 elementary  LLC. (https://launchpad.net/pantheon-photos)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 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 MultiTextEntryDialog : Gtk.Dialog {
-    public delegate bool OnModifyValidateType (string text);
-
-    private unowned OnModifyValidateType on_modify_validate;
-    private Gtk.TextView entry;
-    private Gtk.Builder builder;
-    private Gtk.Button button1;
-    private Gtk.Button button2;
-    private Gtk.ButtonBox action_area_box;
-
-    public void set_builder (Gtk.Builder builder) {
-        this.builder = builder;
-    }
-
-    public void setup (OnModifyValidateType? modify_validate, string title, string label, string? initial_text) {
-        set_title (title);
-        set_resizable (true);
-        set_deletable (false);
-        set_default_size (500, 300);
-        set_parent_window (AppWindow.get_instance ().get_parent_window ());
-        set_transient_for (AppWindow.get_instance ());
-        on_modify_validate = modify_validate;
-
-        Gtk.Label name_label = builder.get_object ("label9") as Gtk.Label;
-        name_label.set_text (label);
-
-        Gtk.ScrolledWindow scrolled = builder.get_object ("scrolledwindow1") as Gtk.ScrolledWindow;
-        scrolled.set_shadow_type (Gtk.ShadowType.ETCHED_IN);
-
-        entry = builder.get_object ("textview1") as Gtk.TextView;
-        entry.set_wrap_mode (Gtk.WrapMode.WORD);
-        entry.buffer = new Gtk.TextBuffer (null);
-        entry.buffer.text = (initial_text != null ? initial_text : "");
-
-        entry.grab_focus ();
-
-        action_area_box = (Gtk.ButtonBox) get_action_area ();
-        action_area_box.set_layout (Gtk.ButtonBoxStyle.END);
-
-        button1 = (Gtk.Button) add_button (_ ("_Cancel"), Gtk.ResponseType.CANCEL);
-        button2 = (Gtk.Button) add_button (_ ("_Save"), Gtk.ResponseType.OK);
-
-        set_has_resize_grip (true);
-    }
-
-    public string? execute () {
-        string? text = null;
-
-        show_all ();
-
-        if (run () == Gtk.ResponseType.OK)
-            text = entry.buffer.text;
-
-        destroy ();
-
-        return text;
-    }
-}