Changeset 0958ce6e3faf508d641138f02672d19883e39604

Timestamp:

05/09/08 21:07:58 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

dddf956080b7fa0418b32a1b5b9d4003a4f239cc

Children:

da28543bdf240dd0748b7d40e2f9768951e90431

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-05-09T21:07:58Z+0200

Message:

Only allow ACCEPT response when a subdirectory is selected, hide after usage

2008-05-09 Armin Burgmeier <armin@…>

• inc/dialogs/documentlocationdialog.hpp:
• src/dialogs/documentlocationdialog.cpp: Only allow ACCEPT response when a subdirectory is selected, filter all nodes but subdirectories.

• src/commands/file-commands.cpp: Hide DocumentLocationDialog? after usage.

Files:

• ChangeLog (modified) (1 diff)
• inc/dialogs/documentlocationdialog.hpp (modified) (1 diff)
• src/commands/file-commands.cpp (modified) (2 diffs)
• src/dialogs/documentlocationdialog.cpp (modified) (4 diffs)

ChangeLog

@@ +1 @@
+2008-05-09  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/dialogs/documentlocationdialog.hpp:
+        * src/dialogs/documentlocationdialog.cpp: Only allow ACCEPT response
+        when a subdirectory is selected, filter all nodes but subdirectories.
+
+        * src/commands/file-commands.cpp: Hide DocumentLocationDialog after
+        usage.
+
 2008-05-09  Armin Burgmeier  <armin@0x539.de>
 

inc/dialogs/documentlocationdialog.hpp

@@ -47 +47 @@
         virtual void on_show();
 
+        static void on_selection_changed_static(InfGtkBrowserView* view,
+                                                GtkTreeIter* iter,
+                                                gpointer user_data)
+        {
+                static_cast<DocumentLocationDialog*>(
+                        user_data)->on_selection_changed(iter);
+        }
+
+        static void on_row_changed_static(GtkTreeModel* model,
+                                          GtkTreePath* path,
+                                          GtkTreeIter* iter,
+                                          gpointer user_data)
+        {
+                static_cast<DocumentLocationDialog*>(
+                        user_data)->on_row_changed(path, iter);
+        }
+
+        static gboolean filter_visible_func_static(GtkTreeModel* model,
+                                                   GtkTreeIter* iter,
+                                                   gpointer user_data)
+        {
+                return static_cast<DocumentLocationDialog*>(
+                        user_data)->filter_visible_func(model, iter);
+        }
+
+        void on_selection_changed(GtkTreeIter* iter);
+        void on_row_changed(GtkTreePath* path, GtkTreeIter* iter);
+
+        bool filter_visible_func(GtkTreeModel* model, GtkTreeIter* iter);
+
         Gtk::Table m_table;
         Gtk::Label m_name_label;

src/commands/file-commands.cpp

@@ -52 +52 @@
 void Gobby::FileCommands::on_location_dialog_response(int id)
 {
-        if(id = Gtk::RESPONSE_ACCEPT)
+        if(id == Gtk::RESPONSE_ACCEPT)
         {
                 InfcBrowserIter iter;
@@ -66 +66 @@
                 // TODO: Info in statusbar, map, etc.
         }
+
+        m_location_dialog->hide();
 }

src/dialogs/documentlocationdialog.cpp

@@ -22 +22 @@
 #include <gtkmm/stock.h>
 
+namespace
+{
+        bool operator==(const GtkTreeIter& iter1, const GtkTreeIter& iter2)
+        {
+                return iter1.stamp == iter2.stamp &&
+                       iter1.user_data == iter2.user_data &&
+                       iter1.user_data2 == iter2.user_data2 &&
+                       iter1.user_data3 == iter2.user_data3;
+        }
+}
+
 Gobby::DocumentLocationDialog::DocumentLocationDialog(Gtk::Window& parent,
                                                       InfGtkBrowserModel* m):
@@ -34 +45 @@
         m_name_label.show();
         m_name_entry.show();
+        m_name_entry.set_activates_default(true);
         m_location_label.show();
         gtk_widget_show(GTK_WIDGET(m_view));
@@ -53 +65 @@
         m_table.show();
 
+        g_signal_connect(m_view, "selection-changed",
+                         G_CALLBACK(on_selection_changed_static), this);
+        g_signal_connect(m_filter_model, "row-changed",
+                         G_CALLBACK(on_row_changed_static), this);
+
+        // Hide non-subdirectories:
+        gtk_tree_model_filter_set_visible_func(
+                GTK_TREE_MODEL_FILTER(m_filter_model),
+                filter_visible_func_static, this, NULL);
+
         get_vbox()->pack_start(m_table, Gtk::PACK_EXPAND_WIDGET);
 
-        // TODO: Make ACCEPT insensitive if nothing is selected
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
         add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
 
+        set_response_sensitive(Gtk::RESPONSE_ACCEPT, false);
+        set_default_response(Gtk::RESPONSE_ACCEPT);
         set_default_size(-1, 480);
         set_title(_("Select document's target location"));
@@ -84 +107 @@
 {
         GtkTreeIter tree_iter;
-        InfcBrowserIter* browser_iter;
-        InfcBrowser* browser;
-
         if(inf_gtk_browser_view_get_selected(m_view, &tree_iter))
         {
+                InfGtkBrowserModelStatus status =
+                        INF_GTK_BROWSER_MODEL_CONNECTED;
+
+                GtkTreeIter dummy_iter;
+                if(!gtk_tree_model_iter_parent(GTK_TREE_MODEL(m_filter_model),
+                                               &dummy_iter, &tree_iter))
+                {
+                        gtk_tree_model_get(
+                                GTK_TREE_MODEL(m_filter_model),
+                                &tree_iter,
+                                INF_GTK_BROWSER_MODEL_COL_STATUS, &status,
+                                -1);
+                }
+
+                if(status == INF_GTK_BROWSER_MODEL_CONNECTED)
+                {
+                        InfcBrowserIter* browser_iter;
+                        InfcBrowser* browser;
+
+                        gtk_tree_model_get(
+                                GTK_TREE_MODEL(m_filter_model),
+                                &tree_iter,
+                                INF_GTK_BROWSER_MODEL_COL_BROWSER, &browser,
+                                INF_GTK_BROWSER_MODEL_COL_NODE, &browser_iter,
+                                -1);
+
+                        *iter = *browser_iter;
+                        infc_browser_iter_free(browser_iter);
+                        g_object_unref(browser);
+                        return browser;
+                }
+                else
+                {
+                        return NULL;
+                }
+        }
+        else
+        {
+                return NULL;
+        }
+}
+
+void Gobby::DocumentLocationDialog::on_show()
+{
+        Gtk::Dialog::on_show();
+
+        m_name_entry.select_region(0, m_name_entry.get_text_length());
+        m_name_entry.grab_focus();
+}
+
+void Gobby::DocumentLocationDialog::on_selection_changed(GtkTreeIter* iter)
+{
+        gboolean accept_sensitive = false;
+        if(iter != NULL)
+        {
+                GtkTreeIter dummy_iter;
+                if(gtk_tree_model_iter_parent(GTK_TREE_MODEL(m_filter_model),
+                                              &dummy_iter, iter))
+                {
+                        // Child: Always OK
+                        accept_sensitive = true;
+                }
+                else
+                {
+                        // Top-level node: Check status
+                        InfGtkBrowserModelStatus status;
+                        gtk_tree_model_get(GTK_TREE_MODEL(m_filter_model),
+                                           iter,
+                                           INF_GTK_BROWSER_MODEL_COL_STATUS,
+                                           &status,
+                                           -1);
+
+                        accept_sensitive =
+                                (status == INF_GTK_BROWSER_MODEL_CONNECTED);
+                }
+        }
+
+        set_response_sensitive(Gtk::RESPONSE_ACCEPT, accept_sensitive);
+}
+
+void Gobby::DocumentLocationDialog::on_row_changed(GtkTreePath* path,
+                                                   GtkTreeIter* iter)
+{
+        // If a toplevel entry is selected, and the status changed to
+        // connected, then make the Accept button sensitive. On the other
+        // hand, if status changed to something else, then
+        // make it insensitive.
+        GtkTreeIter sel_iter;
+
+        if(inf_gtk_browser_view_get_selected(m_view, &sel_iter))
+        {
+                // We cannot compare the iterators directly here, since
+                // GtkTreeModelFilter seems to allow two iterators pointing to
+                // the same row but having a different user_data3 field. We
+                // therefore compare the paths instead.
+                GtkTreePath* sel_path = gtk_tree_model_get_path(
+                        GTK_TREE_MODEL(m_filter_model), &sel_iter);
+                if(gtk_tree_path_compare(path, sel_path) == 0)
+                {
+                        GtkTreeIter dummy_iter;
+                        if(!gtk_tree_model_iter_parent(
+                                GTK_TREE_MODEL(m_filter_model), &dummy_iter,
+                                iter))
+                        {
+                                InfGtkBrowserModelStatus s;
+                                gtk_tree_model_get(
+                                        GTK_TREE_MODEL(m_filter_model), iter,
+                                        INF_GTK_BROWSER_MODEL_COL_STATUS, &s,
+                                        -1);
+
+                                set_response_sensitive(
+                                        Gtk::RESPONSE_ACCEPT,
+                                        s == INF_GTK_BROWSER_MODEL_CONNECTED
+                                );
+                        }
+                }
+
+                gtk_tree_path_free(sel_path);
+        }
+}
+
+bool Gobby::DocumentLocationDialog::filter_visible_func(GtkTreeModel* model,
+                                                        GtkTreeIter* iter)
+{
+        GtkTreeIter dummy_iter;
+        if(!gtk_tree_model_iter_parent(model, &dummy_iter, iter))
+        {
+                return true;
+        }
+        else
+        {
+                InfcBrowserIter* browser_iter;
+                InfcBrowser* browser;
+
                 gtk_tree_model_get(
-                        GTK_TREE_MODEL(m_filter_model),
-                        &tree_iter,
+                        model, iter,
                         INF_GTK_BROWSER_MODEL_COL_BROWSER, &browser,
                         INF_GTK_BROWSER_MODEL_COL_NODE, &browser_iter,
                         -1);
 
-                *iter = *browser_iter;
+                bool result = infc_browser_iter_is_subdirectory(browser,
+                                                                browser_iter);
 
                 infc_browser_iter_free(browser_iter);
                 g_object_unref(browser);
 
-                return browser;
-        }
-        else
-        {
-                return NULL;
-        }
-}
-
-void Gobby::DocumentLocationDialog::on_show()
-{
-        Gtk::Dialog::on_show();
-
-        m_name_entry.select_region(0, m_name_entry.get_text_length());
-        m_name_entry.grab_focus();
-}
+                return result;
+        }
+}