Changeset 332744111f03bec9a9f87d1cdd4ee32e3b8808ed

Timestamp:

10/08/08 21:20:36 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

927cc449d112ac085e67682a6f7de8434861026c

Children:

5f4fbabbd782af175903825bb04c5e9056b9ba0b

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-10-08T21:20:36Z+0200

Message:

Disable "New" and "Open" actions when there is no document in the browser

2008-10-08 Armin Burgmeier <armin@…>

• src/core/folder.cpp: Emit document_changed with NULL document after the last document has been removed, not before, so get_current_document() yields the correct result.

• inc/commands/edit-commands.hpp:
• src/commands/edit-commands.cpp: Don't rely on m_current_document being valid until on_document_changed() was called.

• inc/commands/file-commands.hpp:
• src/commands/file-commands.cpp: Make "New" and "Open" actions insensitive when there is no entry in the Document Browser.

Files:

• ChangeLog (modified) (1 diff)
• inc/commands/edit-commands.hpp (modified) (1 diff)
• inc/commands/file-commands.hpp (modified) (4 diffs)
• src/commands/edit-commands.cpp (modified) (2 diffs)
• src/commands/file-commands.cpp (modified) (4 diffs)
• src/core/folder.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-10-08  Armin Burgmeier  <armin@arbur.net>
+
+        * src/core/folder.cpp: Emit document_changed with NULL document after
+        the last document has been removed, not before, so
+        get_current_document() yields the correct result.
+
+        * inc/commands/edit-commands.hpp:
+        * src/commands/edit-commands.cpp: Don't rely on m_current_document
+        being valid until on_document_changed() was called.
+
+        * inc/commands/file-commands.hpp:
+        * src/commands/file-commands.cpp: Make "New" and "Open" actions
+        insensitive when there is no entry in the Document Browser.
+
 2008-10-08  Armin Burgmeier  <armin@arbur.net>
 

inc/commands/edit-commands.hpp

@@ -44 +44 @@
 
 protected:
+        void on_document_removed(DocWindow& document);
         void on_document_changed(DocWindow* document);
 

inc/commands/file-commands.hpp

@@ -37 +37 @@
 public:
         FileCommands(Gtk::Window& parent, Header& header,
-                     const Browser& browser, Folder& folder,
+                     Browser& browser, Folder& folder,
                      FileChooser& file_chooser, Operations& operations,
                      const DocumentInfoStorage& info_storage,
                      Preferences& preferences);
+        ~FileCommands();
 
         class Task: public sigc::trackable
@@ -70 +71 @@
 protected:
         void set_task(Task* task);
+
+        static void on_row_inserted_static(GtkTreeModel* model, 
+                                           GtkTreePath* path,
+                                           GtkTreeIter* iter,
+                                           gpointer user_data)
+        {
+                static_cast<FileCommands*>(user_data)->on_row_inserted();
+        }
+
+        static void on_row_deleted_static(GtkTreeModel* model,
+                                          GtkTreePath* path,
+                                          gpointer user_data)
+        {
+                static_cast<FileCommands*>(user_data)->on_row_deleted();
+        }
+
         void on_document_changed(DocWindow* document);
+        void on_row_inserted();
+        void on_row_deleted();
         void on_task_finished();
 
@@ -82 +101 @@
         void on_quit();
 
-        void set_sensitivity(bool sensitivity);
+        void update_sensitivity();
 
         Gtk::Window& m_parent;
         Header& m_header;
-        const Browser& m_browser;
+        Browser& m_browser;
         Folder& m_folder;
         FileChooser& m_file_chooser;
@@ -95 +114 @@
         std::auto_ptr<Task> m_task;
         std::auto_ptr<DocumentLocationDialog> m_location_dialog;
+
+        gulong m_row_inserted_handler;
+        gulong m_row_deleted_handler;
 };
 

src/commands/edit-commands.cpp

@@ -54 +54 @@
         m_header.action_edit_preferences->signal_activate().connect(
                 sigc::mem_fun(*this, &EditCommands::on_preferences));
+        m_folder.signal_document_removed().connect(
+                sigc::mem_fun(*this, &EditCommands::on_document_removed));
         m_folder.signal_document_changed().connect(
                 sigc::mem_fun(*this, &EditCommands::on_document_changed));
@@ -65 +67 @@
         // Disconnect handlers from current document:
         on_document_changed(NULL);
+}
+
+void Gobby::EditCommands::on_document_removed(DocWindow& document)
+{
+        if(&document == m_current_document)
+                on_document_changed(NULL);
 }
 

src/commands/file-commands.cpp

@@ -377 +377 @@
 
 Gobby::FileCommands::FileCommands(Gtk::Window& parent, Header& header,
-                                  const Browser& browser, Folder& folder,
+                                  Browser& browser, Folder& folder,
                                   FileChooser& file_chooser,
                                   Operations& operations,
@@ -401 +401 @@
         header.action_file_quit->signal_activate().connect(
                 sigc::mem_fun(*this, &FileCommands::on_quit));
+
         folder.signal_document_changed().connect(
                 sigc::mem_fun(*this, &FileCommands::on_document_changed));
 
-        set_sensitivity(folder.get_current_document() != NULL);
+        InfGtkBrowserStore* store = browser.get_store();
+        m_row_inserted_handler =
+                g_signal_connect(G_OBJECT(store), "row-inserted",
+                                 G_CALLBACK(on_row_inserted_static), this);
+        m_row_deleted_handler =
+                g_signal_connect(G_OBJECT(store), "row-deleted",
+                                 G_CALLBACK(on_row_deleted_static), this);
+
+        update_sensitivity();   
+}
+
+Gobby::FileCommands::~FileCommands()
+{
+        InfGtkBrowserStore* 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);
 }
 
@@ -416 +432 @@
 void Gobby::FileCommands::on_document_changed(DocWindow* document)
 {
-        set_sensitivity(document != NULL);
+        update_sensitivity();
+}
+
+void Gobby::FileCommands::on_row_inserted()
+{
+        update_sensitivity();
+}
+
+void Gobby::FileCommands::on_row_deleted()
+{
+        update_sensitivity();
 }
 
@@ -482 +508 @@
 }
 
-void Gobby::FileCommands::set_sensitivity(bool sensitivity)
-{
-        m_header.action_file_save->set_sensitive(sensitivity);
-        m_header.action_file_save_as->set_sensitive(sensitivity);
-        m_header.action_file_save_all->set_sensitive(sensitivity);
-        m_header.action_file_close->set_sensitive(sensitivity);
-}
+void Gobby::FileCommands::update_sensitivity()
+{
+        GtkTreeIter dummy_iter;
+        bool create_sensitivity = gtk_tree_model_get_iter_first(
+                GTK_TREE_MODEL(m_browser.get_store()), &dummy_iter);
+        gboolean active_sensitivity = m_folder.get_current_document() != NULL;
+
+        m_header.action_file_new->set_sensitive(create_sensitivity);
+        m_header.action_file_open->set_sensitive(create_sensitivity);
+
+        m_header.action_file_save->set_sensitive(active_sensitivity);
+        m_header.action_file_save_as->set_sensitive(active_sensitivity);
+        m_header.action_file_save_all->set_sensitive(active_sensitivity);
+        m_header.action_file_close->set_sensitive(active_sensitivity);
+}

src/core/folder.cpp

@@ -274 +274 @@
         m_signal_document_removed.emit(window);
 
-        // TODO: We should actually remove the page here, but destroy the
-        // DocWindow after having emitted signal_document_changed.
-        if(get_n_pages() == 1)
-                m_signal_document_changed.emit(NULL);
-
         // Finish the record
-        g_object_set_data(G_OBJECT(window.get_session()),
-                          "GOBBY_SESSION_RECORD", NULL);
-
         InfTextSession* session = window.get_session();
+        g_object_set_data(G_OBJECT(session), "GOBBY_SESSION_RECORD", NULL);
+
         g_object_ref(session);
-
         inf_session_close(INF_SESSION(session));
         remove_page(window);
-
         g_object_unref(session);
+
+        if(get_n_pages() == 0)
+                m_signal_document_changed.emit(NULL);
 }