Changeset 0586368ef50fee5ed7de7b6e77e1118c58e6b267

Timestamp:

01/06/07 23:53:30 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

a78113f8b06bcdc8bc7c7355d36814b7cc1145c7

Children:

51b236c1846da0708cf013194f4d2877e97b8308

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:53:30Z+0000

Message:

[project @ Remember the window positions]

Original author: Philipp Kern <phil@…>
Date: 2005-11-13 17:10:11+00:00

Files:

• inc/documentlist.hpp (modified) (2 diffs)
• inc/preferences.hpp (modified) (1 diff)
• inc/preferencesdialog.hpp (modified) (1 diff)
• inc/toolwindow.hpp (modified) (3 diffs)
• inc/userlist.hpp (modified) (3 diffs)
• inc/window.hpp (modified) (2 diffs)
• src/documentlist.cpp (modified) (1 diff)
• src/preferences.cpp (modified) (2 diffs)
• src/preferencesdialog.cpp (modified) (3 diffs)
• src/toolwindow.cpp (modified) (3 diffs)
• src/userlist.cpp (modified) (1 diff)
• src/window.cpp (modified) (3 diffs)

inc/documentlist.hpp

@@ -26 +26 @@
 #include "toolwindow.hpp"
 #include "header.hpp"
+#include "config.hpp"
 
 namespace Gobby
@@ -46 +47 @@
         };
 
-        DocumentList(Gtk::Window& parent,
-                     Header& header);
+        DocumentList(Gtk::Window& parent, Header& header, Config& config);
 
         // Calls from the window

inc/preferences.hpp

@@ -72 +72 @@
         {
                 Gtk::ToolbarStyle toolbar_show;
+                bool remember;
         } appearance;
 };

inc/preferencesdialog.hpp

@@ -133 +133 @@
 
                 Gtk::ToolbarStyle get_toolbar_style() const;
+
+                bool get_remember() const;
         protected:
                 Gtk::VBox m_box;
                 Gtk::Frame m_frame_toolbar;
+                Gtk::Frame m_frame_windows;
 
                 Gtk::VBox m_box_toolbar;
                 Gtk::ComboBoxText m_cmb_toolbar_style;
+
+                Gtk::VBox m_box_windows;
+                Gtk::CheckButton m_btn_remember;
         };
 

inc/toolwindow.hpp

@@ -22 +22 @@
 #include <gtkmm/window.h>
 #include <gtkmm/toggleaction.h>
+#include "config.hpp"
 
 namespace Gobby
@@ -34 +35 @@
         ToolWindow(Gtk::Window& parent,
                    const Glib::ustring& title,
-                   const Glib::RefPtr<Gtk::ToggleAction>& action);
+                   const Glib::RefPtr<Gtk::ToggleAction>& action,
+                   Config& config,
+                   const Glib::ustring& config_key);
+        ~ToolWindow();
 
 protected:
@@ -43 +47 @@
 
         Glib::RefPtr<Gtk::ToggleAction> m_action;
+
+        Config& m_config;
+        Glib::ustring m_config_key;
 };
 

inc/userlist.hpp

@@ -27 +27 @@
 #include "toolwindow.hpp"
 #include "header.hpp"
+#include "config.hpp"
 
 namespace Gobby
@@ -46 +47 @@
         };
 
-        UserList(Gtk::Window& parent,
-                 Header& header);
+        UserList(Gtk::Window& parent, Header& header, Config& config);
         ~UserList();
 
@@ -69 +69 @@
                                  const obby::local_document_info& info);
 
-        /** Reference to header.
-         */
         Header& m_header;
 

inc/window.hpp

@@ -51 +51 @@
 protected:
         // Gtk::Window overrides
+        virtual void on_show();
         virtual void on_realize();
 
@@ -115 +116 @@
 
         // Config
-        Config m_config;
+        Config& m_config;
         Preferences m_preferences;
         const IconManager& m_icon_mgr;

src/documentlist.cpp

@@ -39 +39 @@
 
 Gobby::DocumentList::DocumentList(Gtk::Window& parent,
-                                  Header& header):
+                                  Header& header,
+                                  Config& config):
         ToolWindow(
                 parent,
                 _("Document list"),
-                header.action_window_documentlist
+                header.action_window_documentlist,
+                config,
+                "documentlist"
         ),
         m_btn_subscribe(_("Subscribe") ),

src/preferences.cpp

@@ -53 +53 @@
                 )
         );
+        appearance.remember =
+                config["appearance"]["windows"]["remember"].get<bool>(true);
 }
 
@@ -82 +84 @@
         config["appearance"]["toolbar"]["show"].set(
                 static_cast<int>(appearance.toolbar_show) );
+        config["appearance"]["windows"]["remember"].set(appearance.remember);
 }
 

src/preferencesdialog.cpp

@@ -235 +235 @@
         const Gobby::Preferences& preferences)
  : Page(preferences),
-   m_frame_toolbar(_("Toolbar") )
+   m_frame_toolbar(_("Toolbar") ),
+   m_frame_windows(_("Windows") ),
+   m_btn_remember(_("Remember the positions and states") )
 {
         Gtk::ToolbarStyle style = preferences.appearance.toolbar_show;
+        bool remember = preferences.appearance.remember;
 
         m_cmb_toolbar_style.append_text(_("Show text only") );
@@ -256 +259 @@
         m_frame_toolbar.add(m_box_toolbar);
 
+        m_box_windows.set_spacing(5);
+        m_box_windows.set_border_width(5);
+        m_btn_remember.set_active(remember);
+        m_box_windows.pack_start(m_btn_remember, Gtk::PACK_SHRINK);
+
+        m_frame_windows.add(m_box_windows);
+
         m_box.set_spacing(5);
         m_box.pack_start(m_frame_toolbar, Gtk::PACK_SHRINK);
+        m_box.pack_start(m_frame_windows, Gtk::PACK_SHRINK);
 
         set_border_width(10);
@@ -276 +287 @@
         case 2: default: return Gtk::TOOLBAR_BOTH;
         }
+}
+
+bool Gobby::PreferencesDialog::Appearance::get_remember() const
+{
+        return m_btn_remember.get_active();
 }
 

src/toolwindow.cpp

@@ -21 +21 @@
 Gobby::ToolWindow::ToolWindow(Gtk::Window& parent,
                               const Glib::ustring& title,
-                              const Glib::RefPtr<Gtk::ToggleAction>& action):
-        Gtk::Window(Gtk::WINDOW_TOPLEVEL), m_action(action)
+                              const Glib::RefPtr<Gtk::ToggleAction>& action,
+                              Config& config,
+                              const Glib::ustring& config_key):
+        Gtk::Window(Gtk::WINDOW_TOPLEVEL),
+        m_action(action),
+        m_config(config),
+        m_config_key(config_key)
 {
         set_transient_for(parent);
-        set_position(Gtk::WIN_POS_CENTER_ON_PARENT);
         set_title(title);
 
@@ -35 +39 @@
 
         set_border_width(0);
+
+        if(config["appearance"]["windows"]["remember"].get<bool>(true) )
+        {
+                // Read the ToolWindow's last position from the configuration,
+                // relative to the parent window.
+                const int x = config[config_key]["x"].get<int>(0);
+                const int y = config[config_key]["y"].get<int>(0);
+                const int w = config[config_key]["width"].get<int>(0);
+                const int h = config[config_key]["height"].get<int>(0);
+                const bool visible = config[config_key]["visible"].get<bool>(false);
+                if((x != 0) || (y != 0))
+                {
+                        move(x, y);
+                        resize(w, h);
+                }
+        }
+}
+
+Gobby::ToolWindow::~ToolWindow()
+{
+        if(m_config["appearance"]["windows"]["remember"].get<bool>(true) )
+        {
+                int x, y, w, h;
+                get_position(x, y);
+                get_size(w, h);
+                m_config[m_config_key]["x"].set(x);
+                m_config[m_config_key]["y"].set(y);
+                m_config[m_config_key]["width"].set(w);
+                m_config[m_config_key]["height"].set(h);
+                m_config[m_config_key]["visible"].set(is_visible() );
+        }
 }
 
@@ -56 +91 @@
         Gtk::Window::on_hide();
 }
+

src/userlist.cpp

@@ -65 +65 @@
 }
 
-Gobby::UserList::UserList(Gtk::Window& parent,
-                          Header& header):
-        ToolWindow(parent, _("User list"), header.action_window_userlist),
+Gobby::UserList::UserList(Gtk::Window& parent, Header& header, Config& config):
+        ToolWindow(parent, _("User list"), header.action_window_userlist,
+                config, "userlist"),
         m_header(header)
 {

src/window.cpp

@@ -58 +58 @@
    m_header(),
    m_finddialog(*this),
-   m_userlist(*this, m_header),
-   m_documentlist(*this, m_header),
+   m_userlist(*this, m_header, config),
+   m_documentlist(*this, m_header, config),
    m_folder(m_header, m_preferences),
    m_statusbar(m_header, m_folder)
@@ -161 +161 @@
         }
 #endif
+
+        if(m_preferences.appearance.remember)
+        {
+                // Restore the window's position from the configuration
+                const int x = config["window"]["x"].get<int>(0);
+                const int y = config["window"]["y"].get<int>(0);
+                const int w = config["window"]["width"].get<int>(0);
+                const int h = config["window"]["height"].get<int>(0);
+                const int s_w = config["screen"]["width"].get<int>(0);
+                const int s_h = config["screen"]["height"].get<int>(0);
+                const bool first_run = (x == 0) && (y == 0)
+                        && (w == 0) && (h == 0);
+                Glib::RefPtr<Gdk::Screen> screen(get_screen() );
+                if((screen->get_width() >= s_w && screen->get_height() >= s_h)
+                        && !first_run)
+                {
+                        move(x, y);
+                        resize(w, h);
+                }
+                else
+                        set_position(Gtk::WIN_POS_CENTER);
+        }
 }
 
@@ -169 +191 @@
         // Serialise preferences into config
         m_preferences.serialise(m_config);
+
+        // Save the window's current position
+        if(m_preferences.appearance.remember)
+        {
+                int x, y, w, h;
+                get_position(x, y); get_size(w, h);
+                Glib::RefPtr<Gdk::Screen> screen(get_screen() );
+                m_config["window"]["x"].set(x);
+                m_config["window"]["y"].set(y);
+                m_config["window"]["width"].set(w);
+                m_config["window"]["height"].set(h);
+                m_config["screen"]["width"].set(screen->get_width() );
+                m_config["screen"]["height"].set(screen->get_height() );
+        }
+}
+
+void Gobby::Window::on_show()
+{
+        Gtk::Window::on_show();
+
+        if(m_preferences.appearance.remember)
+        {
+                if(m_config["userlist"]["visible"].get<bool>(false) )
+                        m_userlist.show();
+                if(m_config["documentlist"]["visible"].get<bool>(false) )
+                        m_documentlist.show();
+        }
 }