Changeset bb701404f93f68d6525a906a5196648f24158df5

Timestamp:

03/03/09 12:01:47 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

6de9d3e6ad08269fde98c532ae747b229878d4b8

Children:

6e0d5b2a5b4b05c72c59298583b1d95cf0ff7f5f

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-03-03T12:01:47Z+0100

Message:

Added "Save Session As" menu option

2009-03-03 Armin Burgmeier <armin@…>

• inc/header.hpp:
• src/header.cpp: Added a "Save Session As" menu option.

• inc/window.hpp:
• src/window.cpp: Added corresponding functionality. Now "Save Session" saves to a known location, if any, and "Save Session As" brings up a File Chooser. Patch by Nick <gentuu@…>.

Files:

• ChangeLog (modified) (1 diff)
• inc/header.hpp (modified) (1 diff)
• inc/window.hpp (modified) (1 diff)
• src/header.cpp (modified) (4 diffs)
• src/window.cpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-03-03  Armin Burgmeier  <armin@0x539.de>
+
+        * inc/header.hpp:
+        * src/header.cpp: Added a "Save Session As" menu option.
+
+        * inc/window.hpp:
+        * src/window.cpp: Added corresponding functionality. Now "Save
+        Session" saves to a known location, if any, and "Save Session As"
+        brings up a File Chooser. Patch by Nick <gentuu@gmail.com>.
+
 2009-02-02  Armin Burgmeier  <armin@0x539.de>
 

inc/header.hpp

@@ -135 +135 @@
         const Glib::RefPtr<Gtk::Action> action_app_session_join;
         const Glib::RefPtr<Gtk::Action> action_app_session_save;
+        const Glib::RefPtr<Gtk::Action> action_app_session_save_as;
         const Glib::RefPtr<Gtk::Action> action_app_session_quit;
         const Glib::RefPtr<Gtk::Action> action_app_quit;

inc/window.hpp

@@ -120 +120 @@
         void on_session_join();
         void on_session_save();
+        void on_session_save_as();
         void on_session_quit();
 

src/header.cpp

@@ -39 +39 @@
                 "      <menuitem action=\"AppSessionJoin\" />"
                 "      <menuitem action=\"AppSessionSave\" />"
+                "      <menuitem action=\"AppSessionSaveAs\" />"
                 "      <menuitem action=\"AppSessionQuit\" />"
                 "      <separator />"
@@ -250 +251 @@
                         "AppSessionSave",
                         Gtk::Stock::SAVE,
-                        _("Save session..."),
+                        _("Save session"),
                         _("Saves the complete session for a later restore")
+                )
+        ),
+
+        action_app_session_save_as(
+                Gtk::Action::create(
+                        "AppSessionSaveAs",
+                        Gtk::Stock::SAVE_AS,
+                        _("Save session as..."),
+                        _("\"Saves as...\" the complete session for a later restore")
                 )
         ),
@@ -456 +466 @@
 
         set_action_auto(
+                action_app_session_save_as, state,
+                APPLICATION_NONE, APPLICATION_INITIAL
+        );
+
+        set_action_auto(
                 action_app_session_quit, state,
                 APPLICATION_SESSION, APPLICATION_NONE
@@ -581 +596 @@
         group_app->add(action_app_session_create);
         group_app->add(action_app_session_join);
-        group_app->add(action_app_session_save, Gtk::AccelKey("") );
+        group_app->add(action_app_session_save,
+                Gtk::AccelKey("<control>E", "<Actions>/MenuApp/AppSessionSave") );
+        group_app->add(action_app_session_save_as);
         group_app->add(action_app_session_quit);
         group_app->add(action_app_quit);

src/window.cpp

@@ -86 +86 @@
         m_header.action_app_session_save->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_session_save) );
+        m_header.action_app_session_save_as->signal_activate().connect(
+                sigc::mem_fun(*this, &Window::on_session_save_as) );
         m_header.action_app_session_quit->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_session_quit) );
@@ -445 +447 @@
 
 void Gobby::Window::on_session_save()
+{
+        // Call the dialog if we have no previos filename
+        if(m_prev_session.empty()) {
+                on_session_save_as();
+        } else {
+                // Just overwrite if we already were writing there
+                try
+                {
+                        m_buffer->serialise(m_prev_session);
+                }
+                catch(std::exception& e)
+                {
+                        display_error(e.what() );
+                }
+        }
+}
+
+void Gobby::Window::on_session_save_as()
 {
         Gtk::CheckButton m_chk_default_ext(