Changeset 4e250df417f3de29fc2cf826a93cb136ee515780

Timestamp:

11/07/09 17:04:47 (4 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Gabríel A. Pétursson <gabrielp@simnet.is> / 2009-11-07T17:04:47Z+0100

Parents:

aeee99c57e344cc454862664af4e14e70059fa24

Children:

1c0f9eaecee4addf07208e81f777f28e409cbfe7

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-11-07T17:04:47Z+0100

Message:

Sort browser view alphabetically

2009-11-07 Gabríel A. Pétursson <gabrielp@…>

• code/commands/file-commands.cpp:
• code/core/browser.hpp:
• code/core/browser.cpp: Alphabetical sorting of directory and file names.

Signed-off-by: Armin Burgmeier <armin@…>

Files:

• ChangeLog (modified) (1 diff)
• code/commands/file-commands.cpp (modified) (2 diffs)
• code/core/browser.cpp (modified) (8 diffs)
• code/core/browser.hpp (modified) (3 diffs)

ChangeLog

@@ +1 @@
+2009-11-07  Gabríel A. Pétursson  <gabrielp@simnet.is>
+
+        * code/commands/file-commands.cpp:
+        * code/core/browser.hpp:
+        * code/core/browser.cpp: Alphabetical sorting of directory and file
+        names.
+
 2009-11-06  Armin Burgmeier  <armin@arbur.net>
 

code/commands/file-commands.cpp

@@ -127 +127 @@
                 sigc::mem_fun(*this, &FileCommands::on_document_changed));
 
-        InfGtkBrowserStore* store = browser.get_store();
+        InfGtkBrowserModelSort* store = browser.get_store();
         m_row_inserted_handler =
                 g_signal_connect(G_OBJECT(store), "row-inserted",
@@ -140 +140 @@
 Gobby::FileCommands::~FileCommands()
 {
-        InfGtkBrowserStore* store = m_browser.get_store();
+        InfGtkBrowserModelSort* store = m_browser.get_store();
         g_signal_handler_disconnect(G_OBJECT(store), m_row_inserted_handler);
         g_signal_handler_disconnect(G_OBJECT(store), m_row_deleted_handler);

code/core/browser.cpp

@@ -31 +31 @@
 #endif
 
+gint compare_func(GtkTreeModel* model, GtkTreeIter* first, GtkTreeIter* second, gpointer user_data)
+{
+        gint result = 0;
+        InfcBrowser* br_one;
+        InfcBrowser* br_two;
+        InfcBrowserIter* bri_one;
+        InfcBrowserIter* bri_two;
+        GtkTreeIter parent;
+
+        /* Don't sort top level */
+        if(!gtk_tree_model_iter_parent(model, &parent, first))
+        {
+                g_assert(!gtk_tree_model_iter_parent(model, &parent, second));
+                return 0;
+        }
+
+        gtk_tree_model_get(model, first,  INF_GTK_BROWSER_MODEL_COL_BROWSER, &br_one, INF_GTK_BROWSER_MODEL_COL_NODE, &bri_one, -1);
+        gtk_tree_model_get(model, second, INF_GTK_BROWSER_MODEL_COL_BROWSER, &br_two, INF_GTK_BROWSER_MODEL_COL_NODE, &bri_two, -1);
+
+        if (infc_browser_iter_is_subdirectory(br_one, bri_one) && !infc_browser_iter_is_subdirectory(br_two, bri_two))
+                result = -1;
+        else if (!infc_browser_iter_is_subdirectory(br_one, bri_one) && infc_browser_iter_is_subdirectory(br_two, bri_two))
+                result = 1;
+        else
+        {
+                gchar* name_one;
+                gchar* name_two;
+                
+                gtk_tree_model_get(model, first,  INF_GTK_BROWSER_MODEL_COL_NAME, &name_one, -1);
+                gtk_tree_model_get(model, second, INF_GTK_BROWSER_MODEL_COL_NAME, &name_two, -1);
+                
+                gchar* one = g_utf8_casefold(name_one, -1);
+                gchar* two = g_utf8_casefold(name_two, -1);
+                
+                result = g_utf8_collate(one, two);
+                
+                g_free(name_one);
+                g_free(name_two);
+                g_free(one);
+                g_free(two);
+        }
+        
+        g_object_unref(br_one);
+        g_object_unref(br_two);
+        infc_browser_iter_free(bri_one);
+        infc_browser_iter_free(bri_two);
+        
+        return result;
+}
+
 Gobby::Browser::Browser(Gtk::Window& parent,
                         const InfcNotePlugin* text_plugin,
@@ -65 +115 @@
                                                     communication_manager);
         g_object_unref(communication_manager);
+        
+        m_sort_model = inf_gtk_browser_model_sort_new(INF_GTK_BROWSER_MODEL(m_browser_store));
+        gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(m_sort_model), compare_func, NULL, NULL);
 
         m_xmpp_manager = inf_xmpp_manager_new();
@@ -87 +140 @@
                 INF_GTK_BROWSER_VIEW(
                         inf_gtk_browser_view_new_with_model(
-                                INF_GTK_BROWSER_MODEL(m_browser_store)));
+                                INF_GTK_BROWSER_MODEL(m_sort_model)));
 
         gtk_widget_show(GTK_WIDGET(m_browser_view));
@@ -132 +185 @@
 
         g_object_unref(m_browser_store);
+        g_object_unref(m_sort_model);
         g_object_unref(m_cert_manager);
         g_object_unref(m_xmpp_manager);
@@ -169 +223 @@
         InfcBrowserIter* browser_iter;
 
-        gtk_tree_model_get(GTK_TREE_MODEL(m_browser_store), iter,
+        gtk_tree_model_get(GTK_TREE_MODEL(m_sort_model), iter,
                            INF_GTK_BROWSER_MODEL_COL_BROWSER, &browser,
                            INF_GTK_BROWSER_MODEL_COL_NODE, &browser_iter,
@@ -281 +335 @@
 
         gtk_tree_model_get(
-                GTK_TREE_MODEL(m_browser_store), &tree_iter,
+                GTK_TREE_MODEL(m_sort_model), &tree_iter,
                 INF_GTK_BROWSER_MODEL_COL_BROWSER, &tmp_browser,
                 -1);
@@ -289 +343 @@
 
         gtk_tree_model_get(
-                GTK_TREE_MODEL(m_browser_store), &tree_iter,
+                GTK_TREE_MODEL(m_sort_model), &tree_iter,
                 INF_GTK_BROWSER_MODEL_COL_NODE, &tmp_iter,
                 -1);
@@ -307 +361 @@
 
         gboolean has_iter = inf_gtk_browser_model_browser_iter_to_tree_iter(
-                INF_GTK_BROWSER_MODEL(m_browser_store),
+                INF_GTK_BROWSER_MODEL(m_sort_model),
                 browser, iter, &tree_iter);
         g_assert(has_iter == TRUE);

code/core/browser.hpp

@@ -33 +33 @@
 #include <libinfinity/common/inf-xmpp-manager.h>
 #include <libinfinity/inf-config.h>
+#include <libinfgtk/inf-gtk-browser-model.h>
+#include <libinfgtk/inf-gtk-browser-model-sort.h>
 
 #include <gtkmm/window.h>
@@ -65 +67 @@
         ~Browser();
 
-        InfGtkBrowserStore* get_store() { return m_browser_store; }
-        const InfGtkBrowserStore* get_store() const {
-                return m_browser_store;
+        InfGtkBrowserModelSort* get_store() { return m_sort_model; }
+        const InfGtkBrowserModelSort* get_store() const {
+                return m_sort_model;
         }
 
@@ -137 +139 @@
         ResolvMap m_resolv_map;
         SignalActivate m_signal_activate;
+        
+        InfGtkBrowserModelSort* m_sort_model;
 };