Merge lp:~evfool/scratch/lp1100193 into lp:~elementary-apps/scratch/scratch

[Robert Roth]

* Use fallback charset in case chardet.py fails
* Change fallback charset to ISO-8859-1, in case encoding could not be detected. UTF-n encoding can usually be detected from the first byte
(based on the docs of chardet [1])

[1] http://www.tech.co.bydgoszcz.pl/doc/python-chardet/how-it-works.html

This branch includes the following changes:
* uses fallback charset in case chardet.py fails
* changes fallback charset to ISO-8859-1, in case encoding could not be detected. This might be controversial, but as UTF-n encoding can usually be detected from the first byte
(based on the docs of chardet [1]) this won't affect UTF-n encoded files, as it's unlikely for a file whose encoding could not be detected to be UTF-n

[1] http://www.tech.co.bydgoszcz.pl/doc/python-chardet/how-it-works.html

=== modified file 'plugins/folder-manager/FileView.vala'
--- plugins/folder-manager/FileView.vala	2014-04-28 17:07:31 +0000
+++ plugins/folder-manager/FileView.vala	2014-07-16 02:36:44 +0000
@@ -37,10 +37,6 @@
             });
 
             settings = new Settings ();
-
-            this.set_sort_func ((a, b) => {
-                return File.compare ((a as Item).file, (b as Item).file);
-            });
         }
 
         public void restore_saved_state () {
@@ -147,25 +143,36 @@
     }
 
     /**
-     * Common interface for normal and expandable items.
+     * Common abstract class for file and filder items.
      */
-    internal interface Item : Granite.Widgets.SourceList.Item {
-        public abstract File file { get; construct; }
-        public abstract string path { get; }
+    internal class Item: Granite.Widgets.SourceList.ExpandableItem, Granite.Widgets.SourceListSortable {
+        public File file { get; construct; }
+        public string path { get { return file.path; } }
+
+        public int compare (Granite.Widgets.SourceList.Item a,
+                            Granite.Widgets.SourceList.Item b) {
+            if (a is FolderItem && b is FileItem) {
+                return -1;
+            } else if (a is FileItem && b is FolderItem) {
+                return 1;
+            }
+            return File.compare ((a as Item).file, (b as Item).file);;
+        }
+
+        public bool allow_dnd_sorting () { 
+            return false;
+        }
     }
 
     /**
      * Normal item in the source list, represents a textfile.
      * TODO Remove, Rename
      */
-    internal class FileItem : Granite.Widgets.SourceList.Item, Item {
+    internal class FileItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
 
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
         public FileItem (File file) requires (file.is_valid_textfile) {
             Object (file: file);
 
@@ -194,7 +201,7 @@
      * Monitored for changes inside the directory.
      * TODO remove, rename, create new file
      */
-    internal class FolderItem : Granite.Widgets.SourceList.ExpandableItem, Item {
+    internal class FolderItem : Item {
 
         //Gtk.Menu menu;
         //Gtk.MenuItem item_trash;
@@ -203,9 +210,6 @@
         private GLib.FileMonitor monitor;
         private bool children_loaded = false;
 
-        public File file { get; construct; }
-        public string path { get { return file.path; } }
-
         public FolderItem (File file) requires (file.is_valid_directory) {
             Object (file: file);
 

=== modified file 'plugins/folder-manager/FolderManagerPlugin.vala'
--- plugins/folder-manager/FolderManagerPlugin.vala	2014-06-25 10:54:07 +0000
+++ plugins/folder-manager/FolderManagerPlugin.vala	2014-07-16 02:36:44 +0000
@@ -92,8 +92,8 @@
                 Gtk.Window window = plugins.manager.window;
                 Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog (
                     "Select a folder.", window, Gtk.FileChooserAction.SELECT_FOLDER,
-                    Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                    Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
+                    _("_Cancel"), Gtk.ResponseType.CANCEL,
+                    _("_Open"), Gtk.ResponseType.ACCEPT);
                 chooser.select_multiple = true;
 
                 if (chooser.run () == Gtk.ResponseType.ACCEPT) {

=== modified file 'src/Services/Encoding.vala'
--- src/Services/Encoding.vala	2014-03-14 01:43:10 +0000
+++ src/Services/Encoding.vala	2014-07-16 02:36:44 +0000
@@ -259,7 +259,7 @@
     public static string get_charset (string path) {
         // Get correct encoding via chardect.py script
 
-        const string FALLBACK_CHARSET = "UTF-8";
+        const string FALLBACK_CHARSET = "ISO-8859-1";
         string script = Constants.SCRIPTDIR + "/chardetect.py";
         string command = "python " + script + " \"" + path.replace ("\\ ", " ") + "\"";
         string? charset = null;
@@ -269,7 +269,7 @@
         } catch (SpawnError e) {
             warning ("Could not execute \"%s\": %s", script, e.message);
         }
-        if ( charset == null ) {
+        if ( charset == null || strcmp (charset, "error") != 0) {
             warning ("Could not automatically detect encoding, assuming %s", FALLBACK_CHARSET);
             charset = FALLBACK_CHARSET; //TODO: prompt the user to meddle with encoding manually, until satisfied
         } else {