Changeset 092ccc37a6a943df09a8a3b83fa16f22cfed9c63

Timestamp:

08/25/08 00:08:47 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

3bb736dc8aaca0b06ecd8cd17b594c34c828759e

Children:

e17f0d1480360907f999c68409c415c8022f259f

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-08-25T00:08:47Z+0200

Message:

Added context menu for browser pane

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

• inc/core/nodewatch.hpp:
• src/core/nodewatch.cpp: Added a class that watches a node in a InfcBrowser? and emits a signal when it is removed.

• inc/dialogs/entrydialog.hpp:
• src/dialogs/entrydialog.cpp: Added a class that shows a dialog with an entry, to prompt the user for a string to enter.

• inc/operations/operation-delete.hpp:
• src/operations/operation-delete.cpp: Added an operation that deletes a node.

• inc/core/browser.hpp:
• src/core/browser.cpp: Added get_view().

• inc/operations/operation-new.hpp:
• src/operations/operation-new.cpp: Allow this to create a directory, via a boolean parameter.

• inc/operations/operations.hpp:
• src/operations/operations.cpp: Added delete_node() and create_directory().

• src/core/documentinfostorage.cpp (on_node_removed): Don't require the removed node to be in our map.

• inc/commands/browser-context-commands.hpp:
• src/commands/browser-context-commands.cpp: Added a class that shows a context menu for the left browser pane, allowing the user to create or remove nodes.

• inc/window.hpp:
• src/window.cpp: Instantiate a BrowserContextCommands? object.

• inc/core/Makefile.am:
• inc/dialogs/Makefile.am:
• inc/operations/Makefile.am:
• inc/commands/Makefile.am:
• src/core/Makefile.am:
• src/dialogs/Makefile.am:
• src/operations/Makefile.am:
• src/commands/Makefile.am: Added the new files to the build.

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (1 diff)
• inc/commands/Makefile.am (modified) (1 diff)
• inc/commands/browser-context-commands.hpp (added)
• inc/core/Makefile.am (modified) (1 diff)
• inc/core/browser.hpp (modified) (1 diff)
• inc/core/nodewatch.hpp (added)
• inc/dialogs/Makefile.am (modified) (1 diff)
• inc/dialogs/entrydialog.hpp (added)
• inc/operations/Makefile.am (modified) (1 diff)
• inc/operations/operation-delete.hpp (added)
• inc/operations/operation-new.hpp (modified) (2 diffs)
• inc/operations/operations.hpp (modified) (2 diffs)
• inc/window.hpp (modified) (2 diffs)
• src/commands/Makefile.am (modified) (1 diff)
• src/commands/browser-context-commands.cpp (added)
• src/core/Makefile.am (modified) (1 diff)
• src/core/browser.cpp (modified) (1 diff)
• src/core/documentinfostorage.cpp (modified) (1 diff)
• src/core/nodewatch.cpp (added)
• src/dialogs/Makefile.am (modified) (1 diff)
• src/dialogs/documentlocationdialog.cpp (modified) (3 diffs)
• src/dialogs/entrydialog.cpp (added)
• src/dialogs/finddialog.cpp (modified) (2 diffs)
• src/dialogs/gotodialog.cpp (modified) (2 diffs)
• src/operations/Makefile.am (modified) (1 diff)
• src/operations/operation-delete.cpp (added)
• src/operations/operation-new.cpp (modified) (3 diffs)
• src/operations/operations.cpp (modified) (3 diffs)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-08-24  Armin Burgmeier  <armin@arbur.net>
+
+        * inc/core/nodewatch.hpp:
+        * src/core/nodewatch.cpp: Added a class that watches a node in a
+        InfcBrowser and emits a signal when it is removed.
+
+        * inc/dialogs/entrydialog.hpp:
+        * src/dialogs/entrydialog.cpp: Added a class that shows a dialog with
+        an entry, to prompt the user for a string to enter.
+
+        * inc/operations/operation-delete.hpp:
+        * src/operations/operation-delete.cpp: Added an operation that deletes
+        a node.
+
+        * inc/core/browser.hpp:
+        * src/core/browser.cpp: Added get_view().
+
+        * inc/operations/operation-new.hpp:
+        * src/operations/operation-new.cpp: Allow this to create a directory,
+        via a boolean parameter.
+
+        * inc/operations/operations.hpp:
+        * src/operations/operations.cpp: Added delete_node() and
+        create_directory().
+
+        * src/core/documentinfostorage.cpp (on_node_removed): Don't require
+        the removed node to be in our map.
+
+        * inc/commands/browser-context-commands.hpp:
+        * src/commands/browser-context-commands.cpp: Added a class that shows
+        a context menu for the left browser pane, allowing the user to create
+        or remove nodes.
+
+        * inc/window.hpp:
+        * src/window.cpp: Instantiate a BrowserContextCommands object.
+
+        * inc/core/Makefile.am:
+        * inc/dialogs/Makefile.am:
+        * inc/operations/Makefile.am:
+        * inc/commands/Makefile.am:
+        * src/core/Makefile.am:
+        * src/dialogs/Makefile.am:
+        * src/operations/Makefile.am:
+        * src/commands/Makefile.am: Added the new files to the build.
+
 2008-08-24  Armin Burgmeier  <armin@arbur.net>
 

TODO

@@ -7 +7 @@
  - ^W should close the window
  - Remove references to doclist, userlist and chat in the icon manager
- - Implemente single instance, probably using GtkUnique
+ - Implement single instance, probably using GtkUnique
  - Implement self-hosting, this also requires showing and handling directories
    in InfGtkBrowserModel/Store
  - Sort BrowserModel in Left pane and DocumentLocationDialog
  - Add remove and add directory operations to Operations
- - Add context menu to browser in left pane
  - Add user list to DocWindows.
  - Add close buttons to browser in left pane, user lists and docwindow infos,
    and a way to re-show the former two.
+ - hue-only color selector
 
 These things need to be implemented in infinote, but again would be nice

inc/commands/Makefile.am

@@ -2 +2 @@
 noinst_HEADERS = \
         browser-commands.hpp \
+        browser-context-commands.hpp \
         edit-commands.hpp \
         file-commands.hpp \

inc/core/Makefile.am

@@ -9 +9 @@
         header.hpp \
         iconmanager.hpp \
+        nodewatch.hpp \
         noteplugin.hpp \
         preferences.hpp \

inc/core/browser.hpp

@@ -66 +66 @@
         }
 
+        InfGtkBrowserView* get_view() { return m_browser_view; }
+
         bool get_selected(InfcBrowser** browser, InfcBrowserIter* iter);
         void set_selected(InfcBrowser* browser, InfcBrowserIter* iter);

inc/dialogs/Makefile.am

@@ -1 +1 @@
 noinst_HEADERS = \
         documentlocationdialog.hpp \
+        entrydialog.hpp \
         finddialog.hpp \
         gotodialog.hpp \

inc/operations/Makefile.am

@@ -2 +2 @@
 noinst_HEADERS = \
         operations.hpp \
+        operation-delete.hpp \
         operation-new.hpp \
         operation-open.hpp \

inc/operations/operation-new.hpp

@@ -29 +29 @@
 public:
         OperationNew(Operations& operations, InfcBrowser* browser,
-                     InfcBrowserIter* parent, const Glib::ustring& name);
+                     InfcBrowserIter* parent, const Glib::ustring& name,
+                     bool directory);
 
         virtual ~OperationNew();
@@ -57 +58 @@
 protected:
         Glib::ustring m_name;
+        bool m_directory;
         InfcNodeRequest* m_request;
         gulong m_finished_id;

inc/operations/operations.hpp

@@ -61 +61 @@
         ~Operations();
 
-        void create_document(InfcBrowser* browser,
-                             InfcBrowserIter* parent,
-                             const Glib::ustring name);
+        void create_directory(InfcBrowser* browser,
+                              InfcBrowserIter* parent,
+                              const Glib::ustring& name);
 
         void create_document(InfcBrowser* browser,
                              InfcBrowserIter* parent,
-                             const Glib::ustring name,
-                             Preferences& preferences,
+                             const Glib::ustring& name);
+
+        void create_document(InfcBrowser* browser,
+                             InfcBrowserIter* parent,
+                             const Glib::ustring& name,
+                             const Preferences& preferences,
                              const Glib::ustring& from_uri,
                              const char* encoding);
@@ -77 +81 @@
                            const std::string& encoding,
                            DocumentInfoStorage::EolStyle eol_style);
+
+        void delete_node(InfcBrowser* browser,
+                         InfcBrowserIter* iter);
 
 protected:

inc/window.hpp

@@ -24 +24 @@
 
 #include "commands/browser-commands.hpp"
+#include "commands/browser-context-commands.hpp"
 #include "commands/file-commands.hpp"
 #include "commands/edit-commands.hpp"
@@ -93 +94 @@
 
         BrowserCommands m_commands_browser;
+        BrowserContextCommands m_commands_browser_context;
         FileCommands m_commands_file;
         EditCommands m_commands_edit;

src/commands/Makefile.am

@@ -3 +3 @@
 libgobby_commands_a_SOURCES = \
         browser-commands.cpp \
+        browser-context-commands.cpp \
         edit-commands.cpp \
         file-commands.cpp \

src/core/Makefile.am

@@ -10 +10 @@
         header.cpp \
         iconmanager.cpp \
+        nodewatch.cpp \
         noteplugin.cpp \
         preferences.cpp \

src/core/browser.cpp

@@ -283 +283 @@
                 GTK_TREE_MODEL(m_browser_store), &tree_iter,
                 INF_GTK_BROWSER_MODEL_COL_BROWSER, &tmp_browser,
-                INF_GTK_BROWSER_MODEL_COL_NODE, &tmp_iter, -1);
+                -1);
+
+        if(tmp_browser == NULL)
+                return false;
+
+        gtk_tree_model_get(
+                GTK_TREE_MODEL(m_browser_store), &tree_iter,
+                INF_GTK_BROWSER_MODEL_COL_NODE, &tmp_iter,
+                -1);
 
         *browser = tmp_browser;

src/core/documentinfostorage.cpp

@@ -319 +319 @@
         std::string key = get_key(browser, iter);
         InfoMap::iterator map_iter = m_infos.find(key);
-        g_assert(map_iter != m_infos.end());
-        m_infos.erase(map_iter);
-}
-
+
+        if(map_iter != m_infos.end())
+                m_infos.erase(map_iter);
+}
+

src/dialogs/Makefile.am

@@ -3 +3 @@
 libgobby_dialogs_a_SOURCES = \
         documentlocationdialog.cpp \
+        entrydialog.cpp \
         finddialog.cpp \
         gotodialog.cpp \

src/dialogs/documentlocationdialog.cpp

@@ -35 +35 @@
 Gobby::DocumentLocationDialog::DocumentLocationDialog(Gtk::Window& parent,
                                                       InfGtkBrowserModel* m):
+        Gtk::Dialog(_("Select document's target location"), parent),
         m_table(3, 2), m_name_label(_("Document Name:"), Gtk::ALIGN_RIGHT),
         m_location_label(
@@ -62 +63 @@
                        Gtk::FILL | Gtk::EXPAND, Gtk::FILL | Gtk::EXPAND);
         m_table.set_spacings(6);
-        m_table.set_border_width(12);
         m_table.show();
 
@@ -86 +86 @@
         set_default_response(Gtk::RESPONSE_ACCEPT);
         set_default_size(-1, 480);
-        set_title(_("Select document's target location"));
+        set_border_width(12);
 }
 

src/dialogs/finddialog.cpp

@@ -87 +87 @@
         m_box_main.pack_start(m_check_wrap_around, Gtk::PACK_SHRINK);
         m_box_main.set_spacing(12);
-        m_box_main.set_border_width(12);
         m_box_main.show();
 
@@ -97 +96 @@
                 sigc::mem_fun(*this, &FindDialog::on_replace_text_changed));
 
+        set_border_width(12);
         set_resizable(false);
 

src/dialogs/gotodialog.cpp

@@ -43 +43 @@
                        Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK);
         m_table.set_spacings(12);
-        m_table.set_border_width(12);
         m_table.show();
 
@@ -59 +58 @@
 
         set_default_response(Gtk::RESPONSE_ACCEPT);
+        set_border_width(12);
         set_resizable(false);
 

src/operations/Makefile.am

@@ -3 +3 @@
 libgobby_operations_a_SOURCES = \
         operations.cpp \
+        operation-delete.cpp \
         operation-new.cpp \
         operation-open.cpp \

src/operations/operation-new.cpp

@@ -25 +25 @@
                                   InfcBrowser* browser,
                                   InfcBrowserIter* parent,
-                                  const Glib::ustring& name):
-        Operation(operations), m_name(name)
+                                  const Glib::ustring& name,
+                                  bool directory):
+        Operation(operations), m_name(name), m_directory(directory)
 {
-        // TODO: Use TRUE here as soon as BrowserCommands handles it
-        m_request = infc_browser_add_note(browser, parent, name.c_str(),
-                                          Plugins::TEXT, TRUE);
+        if(directory)
+        {
+                m_request = infc_browser_add_subdirectory(browser, parent,
+                                                          name.c_str());
+        }
+        else
+        {
+                m_request = infc_browser_add_note(browser, parent,
+                                                  name.c_str(), Plugins::TEXT,
+                                                  TRUE);
+        }
+
         // Note infc_browser_add_note does not return a
         // new reference.
@@ -44 +54 @@
         m_message_handle = get_status_bar().add_message(
                 StatusBar::INFO,
-                Glib::ustring::compose(_("Creating document %1
"), name), 0);
+                Glib::ustring::compose(
+                        directory ? _("Creating directory %1
")
+                                  : _("Creating document %1
"), name), 0);
 }
 
@@ -60 +72 @@
         get_status_bar().add_message(
                 StatusBar::ERROR,
-                Glib::ustring::compose(_("Failed to create document %1: %2"),
-                                       m_name, error->message), 5);
+                Glib::ustring::compose(
+                        m_directory ? _("Failed to create directory %1: %2")
+                                    : _("Failed to create document %1: %2"),
+                        m_name, error->message), 5);
 
         remove();

src/operations/operations.cpp

@@ -20 +20 @@
 #include "operations/operation-open.hpp"
 #include "operations/operation-save.hpp"
+#include "operations/operation-delete.hpp"
 #include "operations/operations.hpp"
 
@@ -42 +43 @@
 }
 
-void Gobby::Operations::create_document(InfcBrowser* browser,
-                                        InfcBrowserIter* parent,
-                                        const Glib::ustring name)
+void Gobby::Operations::create_directory(InfcBrowser* browser,
+                                         InfcBrowserIter* parent,
+                                         const Glib::ustring& name)
 {
-        m_operations.insert(new OperationNew(*this, browser, parent, name));
+        m_operations.insert(new OperationNew(*this, browser, parent,
+                                             name, true));
 }
 
 void Gobby::Operations::create_document(InfcBrowser* browser,
                                         InfcBrowserIter* parent,
-                                        const Glib::ustring name,
-                                        Preferences& preferences,
+                                        const Glib::ustring& name)
+{
+        m_operations.insert(new OperationNew(*this, browser, parent,
+                                             name, false));
+}
+
+void Gobby::Operations::create_document(InfcBrowser* browser,
+                                        InfcBrowserIter* parent,
+                                        const Glib::ustring& name,
+                                        const Preferences& preferences,
                                         const Glib::ustring& from_uri,
                                         const char* encoding)
@@ -72 +82 @@
 }
 
+void Gobby::Operations::delete_node(InfcBrowser* browser,
+                                    InfcBrowserIter* iter)
+{
+        m_operations.insert(new OperationDelete(*this, browser, iter));
+}
+
 void Gobby::Operations::remove_operation(Operation* operation)
 {

src/window.cpp

@@ -35 +35 @@
         m_commands_browser(m_browser, m_folder, m_info_storage, m_statusbar,
                            m_preferences),
+        m_commands_browser_context(*this, m_browser, m_file_chooser,
+                                   m_operations, m_preferences),
         m_commands_file(*this, m_header, m_browser, m_folder, m_file_chooser,
                         m_operations, m_info_storage, m_preferences),