Changeset 3bb736dc8aaca0b06ecd8cd17b594c34c828759e

Timestamp:

08/24/08 18:50:11 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

cfeaba1cd10e7c3fa4201bfe898f2b6b17386cc0

Children:

092ccc37a6a943df09a8a3b83fa16f22cfed9c63

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-08-24T18:50:11Z+0200

Message:

Added FileChooser?, to store the current folder uri

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

• inc/core/filechooser.hpp:
• src/core/filechooser.cpp: Added a new class that manages a "current folder uri" which specifies at which location the filechooser has been used the last time. This is used as default location for newly opened file chooser dialogs.

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

• inc/commands/file-commands.hpp:
• src/commands/file-commands.cpp: Use this when showing open or save dialogs.

• inc/window.hpp:
• src/window.cpp: Instantiate a FileChooser?, pass to FileCommands?.

Files:

• ChangeLog (modified) (1 diff)
• inc/commands/file-commands.hpp (modified) (4 diffs)
• inc/core/Makefile.am (modified) (1 diff)
• inc/core/filechooser.hpp (added)
• inc/window.hpp (modified) (3 diffs)
• src/commands/file-commands.cpp (modified) (9 diffs)
• src/core/Makefile.am (modified) (1 diff)
• src/core/filechooser.cpp (added)
• src/window.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-08-24  Armin Burgmeier  <armin@arbur.net>
+
+        * inc/core/filechooser.hpp:
+        * src/core/filechooser.cpp: Added a new class that manages a "current
+        folder uri" which specifies at which location the filechooser has been
+        used the last time. This is used as default location for newly opened
+        file chooser dialogs.
+
+        * inc/core/Makefile.am:
+        * src/core/Makefile.am: Add the new files to the build.
+
+        * inc/commands/file-commands.hpp:
+        * src/commands/file-commands.cpp: Use this when showing open or save
+        dialogs.
+
+        * inc/window.hpp:
+        * src/window.cpp: Instantiate a FileChooser, pass to FileCommands.
+
 2008-08-24  Armin Burgmeier  <armin@arbur.net>
 

inc/commands/file-commands.hpp

@@ -24 +24 @@
 #include "core/header.hpp"
 #include "core/browser.hpp"
+#include "core/filechooser.hpp"
 
+#include <gtkmm/filechooserdialog.h>
 #include <gtkmm/window.h>
-#include <gtkmm/filechooserdialog.h>
 #include <sigc++/trackable.h>
 
@@ -37 +38 @@
         FileCommands(Gtk::Window& parent, Header& header,
                      const Browser& browser, Folder& folder,
-                     Operations& operations,
+                     FileChooser& file_chooser, Operations& operations,
                      const DocumentInfoStorage& info_storage,
                      Preferences& preferences);
@@ -50 +51 @@
 
                 void finish();
+
                 Gtk::Window& get_parent();
                 Folder& get_folder();
+                FileChooser& get_file_chooser();
                 Operations& get_operations();
                 const DocumentInfoStorage& get_document_info_storage();
                 Preferences& get_preferences();
                 DocumentLocationDialog& get_document_location_dialog();
-
-                void set_current_folder_uri(const std::string& uri);
-                const std::string& get_current_folder_uri() const;
 
                 SignalFinished signal_finished() const
@@ -86 +86 @@
         const Browser& m_browser;
         Folder& m_folder;
+        FileChooser& m_file_chooser;
         Operations& m_operations;
         const DocumentInfoStorage& m_document_info_storage;
         Preferences& m_preferences;
-
-        // TODO: This needs also to be available to BrowserCommands
-        std::string m_current_folder_uri;
 
         std::auto_ptr<Task> m_task;

inc/core/Makefile.am

@@ -5 +5 @@
         docwindow.hpp \
         encodingselector.hpp \
+        filechooser.hpp \
         folder.hpp \
         header.hpp \

inc/window.hpp

@@ -32 +32 @@
 #include "dialogs/initialdialog.hpp"
 
-#include "core/preferences.hpp"
 #include "core/iconmanager.hpp"
 #include "core/header.hpp"
@@ -38 +37 @@
 #include "core/browser.hpp"
 #include "core/statusbar.hpp"
+#include "core/preferences.hpp"
+#include "core/filechooser.hpp"
 
 #include "util/config.hpp"
@@ -88 +89 @@
         // Functionality
         DocumentInfoStorage m_info_storage;
+        FileChooser m_file_chooser;
         Operations m_operations;
 

src/commands/file-commands.cpp

@@ -71 +71 @@
         {
         private:
-                Gtk::FileChooserDialog m_file_dialog;
+                FileChooser::Dialog m_file_dialog;
                 std::string m_open_uri;
 
@@ -77 +77 @@
                 TaskOpen(FileCommands& file_commands):
                         Task(file_commands),
-                        m_file_dialog(get_parent(),
+                        m_file_dialog(get_file_chooser(), get_parent(),
                                       _("Choose a text file to open"),
                                       Gtk::FILE_CHOOSER_ACTION_OPEN)
                 {
-                        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, &TaskOpen::on_file_response));
 
-                        m_file_dialog.set_current_folder_uri(
-                                get_current_folder_uri());
                         m_file_dialog.present();
                 }
@@ -96 +89 @@
                 virtual ~TaskOpen()
                 {
-                        set_current_folder_uri(
-                                m_file_dialog.get_current_folder_uri());
-
                         get_document_location_dialog().hide();
                 }
@@ -156 +146 @@
         {
         private:
-                Gtk::FileChooserDialog m_file_dialog;
+                FileChooser::Dialog m_file_dialog;
                 DocWindow* m_document;
 
@@ -163 +153 @@
                         Task(file_commands),
                         m_file_dialog(
-                                get_parent(), Glib::ustring::compose(_(
+                                get_file_chooser(), get_parent(),
+                                Glib::ustring::compose(_(
                                         "Choose a location to save document "
                                         "\"%1\" to"),
@@ -171 +162 @@
                 {
                         
-                        m_file_dialog.add_button(Gtk::Stock::CANCEL,
-                                                 Gtk::RESPONSE_CANCEL);
-                        m_file_dialog.add_button(Gtk::Stock::SAVE,
-                                                  Gtk::RESPONSE_ACCEPT);
-                        m_file_dialog.set_do_overwrite_confirmation(true);
-
                         m_file_dialog.signal_response().connect(sigc::mem_fun(
                                 *this, &TaskSave::on_response));
@@ -192 +177 @@
                                 m_file_dialog.set_uri(info->uri);
                         }
-                        else
-                        {
-                                m_file_dialog.set_current_folder_uri(
-                                        get_current_folder_uri());
-                        }
 
                         m_file_dialog.present();
-                }
-
-                virtual ~TaskSave()
-                {
-                        set_current_folder_uri(
-                                m_file_dialog.get_current_folder_uri());
                 }
 
@@ -360 +334 @@
 }
 
+Gobby::FileChooser& Gobby::FileCommands::Task::get_file_chooser()
+{
+        return m_file_commands.m_file_chooser;
+}
+
 Gobby::Operations& Gobby::FileCommands::Task::get_operations()
 {
@@ -392 +371 @@
 }
 
-void Gobby::FileCommands::Task::set_current_folder_uri(const std::string& uri)
-{
-        m_file_commands.m_current_folder_uri = uri;
-}
-
-const std::string& Gobby::FileCommands::Task::get_current_folder_uri() const
-{
-        return m_file_commands.m_current_folder_uri;
-}
-
 Gobby::FileCommands::FileCommands(Gtk::Window& parent, Header& header,
                                   const Browser& browser, Folder& folder,
+                                  FileChooser& file_chooser,
                                   Operations& operations,
                                   const DocumentInfoStorage& info_storage,
                                   Preferences& preferences):
         m_parent(parent), m_header(header), m_browser(browser),
-        m_folder(folder), m_operations(operations),
-        m_document_info_storage(info_storage), m_preferences(preferences),
-        m_current_folder_uri(Glib::filename_to_uri(Glib::get_current_dir()))
+        m_folder(folder), m_file_chooser(file_chooser),
+        m_operations(operations), m_document_info_storage(info_storage),
+        m_preferences(preferences)
 {
         header.action_file_new->signal_activate().connect(

src/core/Makefile.am

@@ -6 +6 @@
         docwindow.cpp \
         encodingselector.cpp \
+        filechooser.cpp \
         folder.cpp \
         header.cpp \

src/window.cpp

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