Changeset 883ac1c0c36c0f5370a1dcb4bcde33f4b72c0a7f

Timestamp:

06/22/08 01:06:41 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

91aa9b20f84f5db304446175b7e75cccb2f4bab7

Children:

b00f66c045b9598773e5dcadfdcf887be78d63a3

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-06-22T01:06:41Z+0200

Message:

2008-06-22 Armin Burgmeier <armin@…>

• inc/util/file.hpp:
• src/util/file.cpp:
• inc/util/Makefile.am:
• src/util/Makefile.am: Added file.hpp/.cpp containing utility functions to deal with the filesystem. Currently, a function that creates a directory and all its parent if necessary is implemented.

• inc/util/config.hpp:
• src/util/config.cpp: Make use of that function in the destructor.

• inc/util/resolv.hpp: Include <memory> since we use std::auto_ptr<>.

• inc/operations/documentinfostorage.hpp:
• src/operations/documentinfostorage.cpp: Added class that stores local information on known documents such as the local location, the encoding and the eol style.

• inc/operations/operation-open.hpp:
• src/operations/operation-open.cpp: Implemented opening documents from files, via giomm.

• inc/operations/Makefile.am:
• src/operations/Makefile.am: Add the new source files to the build.

• inc/operations/operations.hpp:
• src/operations/operations.cpp: Added encoding parameter to create_document(), added DocumentInfoStorage? member.

• inc/commands/file-commands.hpp:
• src/commands/file-commands.cpp: Added functionlity for the Open menu item.

• inc/window.hpp:
• src/window.cpp: Instantiate a DocumentInfoStorage?, pass to Operations.

• src/main.cpp: Initialize giomm.

• configure.ac: Added giomm as a dependency.

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)
• inc/commands/file-commands.hpp (modified) (3 diffs)
• inc/operations/.operation-open.hpp.swp (added)
• inc/operations/Makefile.am (modified) (1 diff)
• inc/operations/documentinfostorage.hpp (added)
• inc/operations/operation-open.hpp (added)
• inc/operations/operations.hpp (modified) (4 diffs)
• inc/util/Makefile.am (modified) (1 diff)
• inc/util/config.hpp (modified) (1 diff)
• inc/util/file.hpp (added)
• inc/util/resolv.hpp (modified) (1 diff)
• inc/window.hpp (modified) (1 diff)
• src/commands/file-commands.cpp (modified) (2 diffs)
• src/main.cpp (modified) (2 diffs)
• src/operations/Makefile.am (modified) (1 diff)
• src/operations/documentinfostorage.cpp (added)
• src/operations/operation-open.cpp (added)
• src/operations/operations.cpp (modified) (3 diffs)
• src/util/Makefile.am (modified) (1 diff)
• src/util/config.cpp (modified) (4 diffs)
• src/util/file.cpp (added)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-06-22  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/util/file.hpp:
+        * src/util/file.cpp:
+        * inc/util/Makefile.am:
+        * src/util/Makefile.am: Added file.hpp/.cpp containing utility
+        functions to deal with the filesystem. Currently, a function that
+        creates a directory and all its parent if necessary is implemented.
+
+        * inc/util/config.hpp:
+        * src/util/config.cpp: Make use of that function in the destructor.
+
+        * inc/util/resolv.hpp: Include <memory> since we use std::auto_ptr<>.
+
+        * inc/operations/documentinfostorage.hpp:
+        * src/operations/documentinfostorage.cpp: Added class that stores
+        local information on known documents such as the local location, the
+        encoding and the eol style.
+
+        * inc/operations/operation-open.hpp:
+        * src/operations/operation-open.cpp: Implemented opening documents
+        from files, via giomm.
+
+        * inc/operations/Makefile.am:
+        * src/operations/Makefile.am: Add the new source files to the build.
+
+        * inc/operations/operations.hpp:
+        * src/operations/operations.cpp: Added encoding parameter to
+        create_document(), added DocumentInfoStorage member.
+
+        * inc/commands/file-commands.hpp:
+        * src/commands/file-commands.cpp: Added functionlity for the Open menu
+        item.
+
+        * inc/window.hpp:
+        * src/window.cpp: Instantiate a DocumentInfoStorage, pass to
+        Operations.
+
+        * src/main.cpp: Initialize giomm.
+
+        * configure.ac: Added giomm as a dependency.
+
 2008-05-19  Armin Burgmeier  <armin@0x539.de>
 

configure.ac

@@ -37 +37 @@
 AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
 
-required_libs="libxml++-2.6 glibmm-2.4 >= 2.16.0 gtkmm-2.4 >= 2.12.0 gthread-2.0 gtksourceview-2.0 libinfinity-1.0 libinftext-1.0 libinfgtk-1.0 libinftextgtk-1.0"
+required_libs="libxml++-2.6 glibmm-2.4 >= 2.16.0 giomm-2.4 >= 2.16.0 gtkmm-2.4 >= 2.12.0 gthread-2.0 gtksourceview-2.0 libinfinity-1.0 libinftext-1.0 libinfgtk-1.0 libinftextgtk-1.0"
 
 # Checks for libraries.

inc/commands/file-commands.hpp

@@ -26 +26 @@
 
 #include <gtkmm/window.h>
+#include <gtkmm/filechooserdialog.h>
 #include <sigc++/trackable.h>
 
@@ -39 +40 @@
 
 protected:
+        enum Mode {
+                MODE_NEW,
+                MODE_OPEN,
+                MODE_SAVE
+        };
+
+        void create_file_dialog();
+        void create_location_dialog();
+
         void on_new();
+        void on_open();
+
+        void on_file_dialog_response(int id);
         void on_location_dialog_response(int id);
 
@@ -47 +60 @@
         Operations& m_operations;
 
+        std::string m_open_uri;
+
+        Mode m_mode;
         std::auto_ptr<DocumentLocationDialog> m_location_dialog;
+        std::auto_ptr<Gtk::FileChooserDialog> m_file_dialog;
 };
 

inc/operations/Makefile.am

@@ -1 +1 @@
 
 noinst_HEADERS = \
+        documentinfostorage.hpp \
         operations.hpp \
-        operation-new.hpp
+        operation-new.hpp \
+        operation-open.hpp

inc/operations/operations.hpp

@@ -20 +20 @@
 #define _GOBBY_OPERATIONS_OPERATIONS_HPP_
 
+#include "operations/documentinfostorage.hpp"
 #include "core/statusbar.hpp"
 
@@ -47 +48 @@
                 }
 
+                DocumentInfoStorage& get_info_storage()
+                {
+                        return m_operations.m_info_storage;
+                }
+
                 void remove() { m_operations.remove_operation(this); }
         private:
@@ -52 +58 @@
         };
 
-        Operations(StatusBar& status_bar);
+        Operations(DocumentInfoStorage& info_storage, StatusBar& status_bar);
         ~Operations();
 
@@ -62 +68 @@
                              InfcBrowserIter* parent,
                              const Glib::ustring name,
-                             const Glib::ustring& from_uri);
+                             const Glib::ustring& from_uri,
+                             const char* encoding);
 
 protected:
         void remove_operation(Operation* operation);
 
+        DocumentInfoStorage& m_info_storage;
         StatusBar& m_status_bar;
 

inc/util/Makefile.am

@@ -5 +5 @@
         defaultaccumulator.hpp \
         encoding.hpp \
+        file.hpp \
         i18n.hpp \
         resolv.hpp \

inc/util/config.hpp

@@ -38 +38 @@
 {
 public:
-        class Error: public Glib::Error
-        {
-        public:
-                enum Code {
-                        PATH_CREATION_FAILED
-                };
-
-                Error(Code error_code, const Glib::ustring& error_message);
-                Code code() const;
-        };
-
         /** @brief Abstract base class for configuration file entries.
          */

inc/util/resolv.hpp

@@ -24 +24 @@
 #include <glibmm/ustring.h>
 #include <sigc++/sigc++.h>
+
 #include <stdexcept>
+#include <memory>
 
 namespace Gobby

inc/window.hpp

@@ -89 +89 @@
 
         // Functionality
+        DocumentInfoStorage m_info_storage;
         Operations m_operations;
 

src/commands/file-commands.cpp

@@ -20 +20 @@
 #include "util/i18n.hpp"
 
+#include <gtkmm/stock.h>
+
 Gobby::FileCommands::FileCommands(Gtk::Window& parent, Header& header,
                                   const Browser& browser, Folder& folder,
                                   Operations& operations):
         m_parent(parent), m_browser(browser), m_folder(folder),
-        m_operations(operations)
+        m_operations(operations), m_mode(MODE_NEW)
 {
         header.action_file_new->signal_activate().connect(
                 sigc::mem_fun(*this, &FileCommands::on_new));
+        header.action_file_open->signal_activate().connect(
+                sigc::mem_fun(*this, &FileCommands::on_open));
+}
+
+void Gobby::FileCommands::create_location_dialog()
+{
+        m_location_dialog.reset(
+                new DocumentLocationDialog(
+                        m_parent,
+                        INF_GTK_BROWSER_MODEL(
+                                m_browser.get_store())));
+
+        m_location_dialog->signal_response().connect(
+                sigc::mem_fun(
+                        *this,
+                        &FileCommands::on_location_dialog_response));
+}
+
+void Gobby::FileCommands::create_file_dialog()
+{
+        m_file_dialog.reset(new Gtk::FileChooserDialog(m_parent, ""));
+        m_file_dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+        m_file_dialog->add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
+        m_file_dialog->signal_response().connect(
+                sigc::mem_fun(*this, &FileCommands::on_file_dialog_response));
 }
 
 void Gobby::FileCommands::on_new()
 {
+        if(m_file_dialog.get() != NULL)
+                m_file_dialog->hide();
+
         if(m_location_dialog.get() == NULL)
+                create_location_dialog();
+
+        m_mode = MODE_NEW;
+        m_location_dialog->set_document_name(_("New Document"));
+        m_location_dialog->present();
+}
+
+void Gobby::FileCommands::on_open()
+{
+        if(m_location_dialog.get() != NULL)
+                m_location_dialog->hide();
+
+        if(m_file_dialog.get() == NULL)
+                create_file_dialog();
+
+        // TODO: Allow multiple selection
+        // TODO: Encoding selection in file chooser
+        m_mode = MODE_OPEN;
+        m_file_dialog->set_title("Choose a text file to open");
+        m_file_dialog->set_action(Gtk::FILE_CHOOSER_ACTION_OPEN);
+        m_file_dialog->present();
+}
+
+void Gobby::FileCommands::on_file_dialog_response(int id)
+{
+        if(id == Gtk::RESPONSE_ACCEPT)
         {
-                m_location_dialog.reset(
-                        new DocumentLocationDialog(
-                                m_parent,
-                                INF_GTK_BROWSER_MODEL(
-                                        m_browser.get_store())));
+                switch(m_mode)
+                {
+                case MODE_OPEN:
+                        if(m_location_dialog.get() == NULL)
+                                create_location_dialog();
 
-                m_location_dialog->signal_response().connect(
-                        sigc::mem_fun(
-                                *this,
-                                &FileCommands::on_location_dialog_response));
+                        // TODO: Handle multiple selection
+                        m_open_uri = m_file_dialog->get_uri();
+                        m_location_dialog->set_document_name(
+                                Glib::path_get_basename(
+                                        m_file_dialog->get_filename()));
+                        m_location_dialog->present();
+
+                        break;
+                case MODE_SAVE:
+                        // TODO:
+                        break;
+                case MODE_NEW:
+                default:
+                        g_assert_not_reached();
+                }
         }
 
-        m_location_dialog->set_document_name(_("New Document"));
-        m_location_dialog->present();
+        m_file_dialog->hide();
 }
 
@@ -59 +125 @@
                 g_assert(browser != NULL);
 
-                m_operations.create_document(
-                        browser, &iter,
-                        m_location_dialog->get_document_name());
+                switch(m_mode)
+                {
+                case MODE_NEW:
+                        m_operations.create_document(
+                                browser, &iter,
+                                m_location_dialog->get_document_name());
+                        break;
+                case MODE_OPEN:
+                        m_operations.create_document(
+                                browser, &iter,
+                                m_location_dialog->get_document_name(),
+                                m_open_uri, NULL);
+                        break;
+                case MODE_SAVE:
+                default:
+                        g_assert_not_reached();
+                }
         }
 

src/main.cpp

@@ -25 +25 @@
 #include <gtkmm/main.h>
 #include <gtkmm/messagedialog.h>
+#include <giomm/init.h>
 #include <glibmm/optionentry.h>
 #include <glibmm/optiongroup.h>
 #include <glibmm/optioncontext.h>
 
+#include <libintl.h> // bindtextdomain
 #include <iostream>
 
@@ -48 +50 @@
         g_thread_init(NULL);
         gnutls_global_init();
+        Gio::init();
 
         setlocale(LC_ALL, "");

src/operations/Makefile.am

@@ -2 +2 @@
 
 libgobby_operations_a_SOURCES = \
+        documentinfostorage.cpp \
         operations.cpp \
-        operation-new.cpp
+        operation-new.cpp \
+        operation-open.cpp
 
 libgobby_operations_a_CPPFLAGS = $(gobby_CFLAGS) -I../../inc/ \

src/operations/operations.cpp

@@ -18 +18 @@
 
 #include "operations/operation-new.hpp"
+#include "operations/operation-open.hpp"
 #include "operations/operations.hpp"
 
@@ -25 +26 @@
 Gobby::Operations::Operation::~Operation() {}
 
-Gobby::Operations::Operations(StatusBar& status_bar):
-        m_status_bar(status_bar)
+Gobby::Operations::Operations(DocumentInfoStorage& info_storage,
+                              StatusBar& status_bar):
+        m_info_storage(info_storage), m_status_bar(status_bar)
 {
 }
@@ -49 +51 @@
                                         InfcBrowserIter* parent,
                                         const Glib::ustring name,
-                                        const Glib::ustring& from_uri)
+                                        const Glib::ustring& from_uri,
+                                        const char* encoding)
 {
+        m_operations.insert(new OperationOpen(*this, browser, parent, name,
+                                              from_uri, encoding));
 }
 

src/util/Makefile.am

@@ -5 +5 @@
         config.cpp \
         encoding.cpp \
+        file.cpp \
         i18n.cpp \
         resolv.cpp \

src/util/config.cpp

@@ -18 +18 @@
 
 #include "util/config.hpp"
+#include "util/file.hpp"
 #include "util/i18n.hpp"
 
@@ -26 +27 @@
 #include <libxml++/exceptions/exception.h>
 
-// For mkdir / CreateDirectory
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <cerrno>
-#endif
-
-#include <cstring>
 #include <stdexcept>
 
 namespace
 {
-        // Creates a new directory
-        void create_directory(const char* path)
-        {
-                using namespace Gobby;
-#ifdef WIN32
-                if(CreateDirectoryA(path, NULL) == FALSE)
-                {
-                        LPVOID msgbuf;
-                        DWORD err = GetLastError();
-
-                        FormatMessageA(
-                                FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                                FORMAT_MESSAGE_FROM_SYSTEM,
-                                NULL,
-                                err,
-                                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                                reinterpret_cast<LPSTR>(&msgbuf),
-                                0,
-                                NULL
-                        );
-
-                        std::string error_message = static_cast<LPSTR>(msgbuf);
-                        LocalFree(msgbuf);
-
-                        // TODO: Convert to UTF-8?
-
-                        throw Gobby::Config::Error(
-                                Gobby::Config::Error::PATH_CREATION_FAILED,
-                                Glib::ustring::compose(
-                                        _("Could not create directory "
-                                          "\"%1\": %2"), std::string(path),
-                                        error_message));
-                }
-#else
-                if(mkdir(path, 0755) == -1)
-                {
-                        throw Gobby::Config::Error(
-                                Gobby::Config::Error::PATH_CREATION_FAILED,
-                                Glib::ustring::compose(
-                                        _("Could not create directory "
-                                          "\"%1\": %2"), std::string(path),
-                                        strerror(errno)));
-                }
-#endif
-        }
-
-        void create_path_to(const std::string& to)
-        {
-                // Directory exists, nothing to do
-                if(Glib::file_test(to, Glib::FILE_TEST_IS_DIR) )
-                        return;
-
-                // Find path to the directory to create
-                Glib::ustring path_to = Glib::path_get_dirname(to);
-
-                // Create this path, if it doesn't exists
-                create_path_to(path_to);
-
-                // Create new directory
-                create_directory(to.c_str() );
-        }
-
         template<typename Map>
         typename Map::mapped_type ptrmap_find(const Map& map,
@@ -110 +39 @@
                 return iter->second;
         }
-}
-
-Gobby::Config::Error::Error(Code error_code,
-                            const Glib::ustring& error_message):
-        Glib::Error(
-                g_quark_from_static_string("GOBBY_CONFIG_ERROR"),
-                static_cast<int>(error_code),
-                error_message
-        )
-{
-}
-
-Gobby::Config::Error::Code Gobby::Config::Error::code() const
-{
-        return static_cast<Code>(gobject_->code);
 }
 
@@ -318 +232 @@
         {
                 Glib::ustring dirname = Glib::path_get_dirname(m_filename);
-                create_path_to(dirname);
+                create_directory_with_parents(dirname);
 
                 document.write_to_file_formatted(m_filename, "UTF-8");

src/window.cpp

@@ -31 +31 @@
         m_statusbar(m_folder),
         m_browser(*this, Plugins::TEXT, m_statusbar, m_preferences),
-        m_operations(m_statusbar), 
+        m_info_storage(INF_GTK_BROWSER_MODEL(m_browser.get_store())),
+        m_operations(m_info_storage, m_statusbar), 
         m_commands_browser(m_browser, m_folder, m_statusbar, m_preferences),
         m_commands_file(*this, m_header, m_browser, m_folder, m_operations)