Merge lp:~vikoadi/noise/fix-column-order into lp:~elementary-apps/noise/trunk

[Viko Adi Rahmawan]

[TreeViewSetup] Sort column order on importing from sqlite

sort column order on importing from sqlite

[Corentin Noël (tintou)]

Working fine !

review: Approve

=== modified file 'src/Views/ListView/Lists/TreeViewSetup.vala'
--- src/Views/ListView/Lists/TreeViewSetup.vala	2015-02-28 13:43:27 +0000
+++ src/Views/ListView/Lists/TreeViewSetup.vala	2015-03-11 06:06:35 +0000
@@ -84,7 +84,7 @@
      */
     public bool import_columns (string cols) {
         string[] col_strings = cols.split (COLUMN_SEP_STRING, 0);
-        var new_columns = new Gee.TreeSet<Gtk.TreeViewColumn> ();
+        var new_columns = new Gee.TreeSet<Gtk.TreeViewColumn> (column_compare_func);
 
         // the '-1' because col_strings has blank column at end
         for (int index = 0; index < col_strings.length - 1; ++index) {
@@ -212,4 +212,12 @@
     private void append_new_column (ListColumn column, bool initially_visible = true) {
         columns.add (create_column (column, initially_visible));
     }
+
+    private int column_compare_func (Gtk.TreeViewColumn column_a, Gtk.TreeViewColumn column_b) {
+        int a = (int) get_column_type (column_a);
+        int b = (int) get_column_type (column_b);
+
+        // return negative value if a<b;zero if a=b;positive value if a>b
+        return (int) (a > b) - (int) (a < b);
+    }
 }