Merge lp:~elementary-apps/noise/not-found-dialog into lp:~elementary-apps/noise/trunk

[Danielle Foré]

* Rewrite FileNotFoundDialog.vala as a subclass of Gtk.Dialog
* Change dialog copy
* Change icon
* fix code style

Rewrite FileNotFoundDialog.vala as a subclass of Gtk.Dialog

[lp:~elementary-apps/noise/not-found-dialog]

1585. By David Gomes on 2014-04-21

Fixes code style.

[David Gomes (davidgomes)]

review: Approve

[Rico Tzschichholz (ricotz)]

+ body_string = (_("The music file for " + "<b>" +"$NAME" + "</b>" +
+ " by " + "<b>" + "$ARTIST" + "</b>" + " could not be found.").replace
+ ("$NAME", s.title.escape ("")).replace ("$ARTIST", s.artist.escape ("")));

How is this suppose to be translated properly?

This looks pretty scary and "...".printf (...) should be used to do it better!
Of cource there is still be possibility an improper translation will let it fail bad.

[David Gomes (davidgomes)]

That doesn't really belong here but instead in a bug report. Very valid concerns though Rico.

[Rico Tzschichholz (ricotz)]

The line was heavily changed into this, so it pretty much concerns this merge. It wasn't good before either though.

=== modified file 'src/Dialogs/FileNotFoundDialog.vala'
--- src/Dialogs/FileNotFoundDialog.vala	2014-04-20 17:04:53 +0000
+++ src/Dialogs/FileNotFoundDialog.vala	2014-04-21 18:21:07 +0000
@@ -29,158 +29,148 @@
  *              Corentin Noël <[e-mail]>
  */
 
-public class Noise.FileNotFoundDialog : Gtk.Window {
+public class Noise.FileNotFoundDialog : Gtk.Dialog {
     Gee.LinkedList<Media> media_list;
 
-    private Gtk.Box content;
-    private Gtk.Box padding;
-
-    Gtk.Button removeMedia;
-    Gtk.Button locateMedia;
     Gtk.Button rescanLibrary;
-    Gtk.Button doNothing;
 
     public FileNotFoundDialog (Gee.LinkedList<Media> media_list) {
         this.media_list = media_list;
 
-        // set the size based on saved gconf settings
-        //this.window_position = WindowPosition.CENTER;
-        this.type_hint = Gdk.WindowTypeHint.DIALOG;
-        this.title = ((Noise.App) GLib.Application.get_default ()).get_name ();
         this.set_modal (true);
         this.set_transient_for (App.main_window);
         this.destroy_with_parent = true;
-
-        set_default_size(475, -1);
+        this.border_width = 6;
         resizable = false;
 
-        content = new Gtk.Box (Gtk.Orientation.VERTICAL, 10);
-        padding = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 20);
+        var content = get_content_area () as Gtk.Box;
 
         // initialize controls
-        Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
-        Gtk.Label title = new Gtk.Label("");
-        Gtk.Label info = new Gtk.Label("");
-        removeMedia = new Gtk.Button.with_label(_("Remove Media"));
-        locateMedia = new Gtk.Button.with_label(_("Locate Media"));
-        rescanLibrary = new Gtk.Button.with_label(_("Rescan Library"));
-        doNothing = new Gtk.Button.with_label(_("Do Nothing"));
-
-        // pretty up labels
-
-        // be a bit explicit to make translations better
-        var MARKUP_TEMPLATE = "<span weight=\"bold\" size=\"larger\">%s</span>";		
-        var title_string = MARKUP_TEMPLATE.printf (String.escape (_("Could not find media file")));
-        title.set_markup (title_string);
-        title.xalign = 0.0f; //FIXME: deprecated
-
-        info.set_line_wrap (true);
-        info.xalign = 0.0f; //FIXME: deprecated
+        Gtk.Image warning = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
+        warning.yalign = 0;
+
+        var title_string = _("File not found");
+        var body_string = "";
 
         if (media_list.size == 1) {
             var s = media_list.get (0);
-            info.set_markup (_("The music file for $NAME by $ARTIST could not be found. What would you like to do?").replace ("$NAME", s.title.escape ("")).replace ("$ARTIST", s.artist.escape ("")));
+
+            body_string = (_("The music file for " + "<b>" +"$NAME" + "</b>" +
+                             " by " + "<b>" + "$ARTIST" + "</b>" + " could not be found.").replace
+                           ("$NAME", s.title.escape ("")).replace ("$ARTIST", s.artist.escape ("")));
         } else {
-            info.set_text (_("%i media files could not be found. What would you like to do?").printf (media_list.size));
+             body_string = (_("%i music files could not be found?").printf (media_list.size));
         }
 
-
-
-        rescanLibrary.set_sensitive(!libraries_manager.local_library.doing_file_operations());
-
-        /* set up controls layout */
-        var information = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-        var information_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        information.pack_start(warning, false, false, 10);
-        information_text.pack_start(title, false, true, 10);
-        information_text.pack_start(info, false, true, 0);
-        information.pack_start(information_text, true, true, 10);
-
-        var bottomButtons = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
-        bottomButtons.set_layout(Gtk.ButtonBoxStyle.END);
-        bottomButtons.pack_end(removeMedia, false, false, 0);
-        bottomButtons.pack_end(rescanLibrary, false, false, 0);
-        bottomButtons.pack_end(locateMedia, false, false, 0);
-        bottomButtons.pack_end(doNothing, false, false, 10);
-        bottomButtons.set_spacing(10);
-
-        content.pack_start(information, false, true, 0);
-        content.pack_start(bottomButtons, false, true, 10);
-
-        padding.pack_start(content, true, true, 10);
-
-        removeMedia.clicked.connect(removeMediaClicked);
-        locateMedia.clicked.connect(locateMediaClicked);
-        rescanLibrary.clicked.connect(rescanLibraryClicked);
-        doNothing.clicked.connect( () => { 
-            this.destroy(); 
+        var info = new Granite.Widgets.WrapLabel (("<span weight=\"bold\" size=\"larger\">%s</span>").printf
+            (String.escape (title_string)) + "\n\n" + ("%s").printf (body_string)
+        );
+
+        info.m_wrap_width = 350;
+        info.set_selectable (true);
+        info.set_use_markup (true);
+
+        rescanLibrary.set_sensitive (!libraries_manager.local_library.doing_file_operations ());
+
+        var layout = new Gtk.Grid ();
+        layout.set_column_spacing (12);
+        layout.set_margin_right (6);
+        layout.set_margin_bottom (24);
+        layout.set_margin_left (6);
+        layout.add (warning);
+        layout.add (info);
+
+        content.add (layout);
+
+        add_button (_("Rescan Library"), 1);
+        add_button (_("Remove Song"), 2);
+        add_button (_("Cancel"), Gtk.ResponseType.CLOSE);
+        add_button (_("Find Song"), 3);
+
+        this.response.connect ((response_id) => {
+            switch (response_id) {
+                case 1:
+                    rescan_library_clicked ();
+                    break;
+                case 2:
+                    remove_media_clicked ();
+                    break;
+                case 3:
+                    locate_media_clicked ();
+                    break;
+                case Gtk.ResponseType.CLOSE:
+                    destroy ();
+                    break;
+            }
         });
 
-        libraries_manager.local_library.file_operations_started.connect(file_operations_started);
-        libraries_manager.local_library.file_operations_done.connect(file_operations_done);
+        libraries_manager.local_library.file_operations_started.connect (file_operations_started);
+        libraries_manager.local_library.file_operations_done.connect (file_operations_done);
 
-        add(padding);
-        show_all();
+        show_all ();
     }
 
-    void removeMediaClicked() {
+    void remove_media_clicked () {
         libraries_manager.local_library.remove_medias (media_list, false);
 
-        this.destroy();
+        this.destroy ();
     }
 
-    void locateMediaClicked() {
-        Media m = media_list.get(0);
+    void locate_media_clicked () {
+        Media m = media_list.get (0);
         int media_id = m.rowid;
 
         string file = "";
         var file_chooser = new Gtk.FileChooserDialog (_("Choose Music Folder"), this,
-                                  Gtk.FileChooserAction.OPEN,
-                                  _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
-                                  _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
+                                                      Gtk.FileChooserAction.OPEN,
+                                                      _(STRING_CANCEL), Gtk.ResponseType.CANCEL,
+                                                      _(STRING_OPEN), Gtk.ResponseType.ACCEPT);
 
         // try and help user by setting a sane default folder
-        var invalid_file = File.new_for_uri(libraries_manager.local_library.media_from_id(media_id).uri);
+        var invalid_file = File.new_for_uri (libraries_manager.local_library.media_from_id (media_id).uri);
         var music_folder = Settings.Main.get_default ().music_folder;
-        if(invalid_file.get_parent().query_exists())
-            file_chooser.set_current_folder(invalid_file.get_parent().get_path());
-        else if(invalid_file.get_parent().get_parent().query_exists() && 
-        invalid_file.get_parent ().get_parent ().get_path ().contains (music_folder))
-            file_chooser.set_current_folder(invalid_file.get_parent().get_parent().get_path());
-        else if(File.new_for_path (music_folder).query_exists ())
+
+        if (invalid_file.get_parent ().query_exists ()) {
+            file_chooser.set_current_folder (invalid_file.get_parent().get_path ());
+        } else if (invalid_file.get_parent ().get_parent ().query_exists () &&
+                   invalid_file.get_parent ().get_parent ().get_path ().contains (music_folder)) {
+
+            file_chooser.set_current_folder (invalid_file.get_parent ().get_parent ().get_path ());
+        } else if (File.new_for_path (music_folder).query_exists ()) {
             file_chooser.set_current_folder (music_folder);
-        else
-            file_chooser.set_current_folder(Environment.get_home_dir());
+        } else {
+            file_chooser.set_current_folder (Environment.get_home_dir ());
+        }
 
         if (file_chooser.run () == Gtk.ResponseType.ACCEPT) {
-            file = file_chooser.get_filename();
+            file = file_chooser.get_filename ();
         }
 
         file_chooser.destroy ();
 
-        if(file != "" && File.new_for_path(file).query_exists()) {
-            m.uri = File.new_for_path(file).get_uri();
+         if (file != "" && File.new_for_path (file).query_exists ()) {
+            m.uri = File.new_for_path (file).get_uri ();
             m.location_unknown = false;
             m.unique_status_image = null;
+
             // TODO: lm.lw.media_found(m.rowid);
             libraries_manager.local_library.update_media (m, false, false);
 
-            this.destroy();
+            this.destroy ();
         }
     }
 
-    void rescanLibraryClicked() {
-        ((LocalLibrary)libraries_manager.local_library).rescan_music_folder ();
-
-        this.destroy();
-    }
-
-    void file_operations_done() {
-        rescanLibrary.set_sensitive(true);
-    }
-
-    void file_operations_started() {
-        rescanLibrary.set_sensitive(false);
-    }
-
+    void rescan_library_clicked () {
+        ((LocalLibrary) libraries_manager.local_library).rescan_music_folder ();
+
+        this.destroy ();
+    }
+
+    void file_operations_done () {
+        rescanLibrary.set_sensitive (true);
+    }
+
+    void file_operations_started () {
+        rescanLibrary.set_sensitive (false);
+    }
 }
\ No newline at end of file