Changeset fb634fcf967dddf76b509e6fa3132384c87a4c65

Timestamp:

09/11/08 21:48:27 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

9a0333e8de963e333740e7609e769dda89ee11c5

Children:

fce3ea7cff4296b3af6c3f631e9407f14f6e203e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-11T21:48:27Z+0200

Message:

Added buttons to close the userlist and the browser

2008-09-11 Armin Burgmeier <armin@…>

• inc/core/closableframe.hpp:
• src/core/closableframe.cpp: Added a new widget, derived from Gtk::Frame, that shows a close button in the upper right corner, for the frame to be closed.

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

• inc/core/preferences.hpp:
• src/core/preferences.cpp: Added show_browser and show_userlist options.

• inc/window.hpp:
• src/window.cpp:
• src/core/docwindow.cpp: Use a ClosableFrame? for the browser and userlist, respectively.

• src/core/browser.cpp: Removed the border_width. It is now applied by the ClosableFrame?. If border_width is desired in certain situations, then it can still be called from elsewhere.

• inc/core/header.hpp:
• src/core/header.cpp: Added "Show Document Browser" and "Show Userlist" items to the View menu.

• inc/commands/view-commands.hpp:
• src/commands/view-commands.cpp: Implemented functionality for these (by setting the preference options).

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (1 diff)
• inc/commands/view-commands.hpp (modified) (3 diffs)
• inc/core/Makefile.am (modified) (1 diff)
• inc/core/closableframe.hpp (added)
• inc/core/header.hpp (modified) (1 diff)
• inc/core/preferences.hpp (modified) (1 diff)
• inc/window.hpp (modified) (2 diffs)
• src/commands/view-commands.cpp (modified) (4 diffs)
• src/core/Makefile.am (modified) (1 diff)
• src/core/browser.cpp (modified) (1 diff)
• src/core/closableframe.cpp (added)
• src/core/docwindow.cpp (modified) (2 diffs)
• src/core/header.cpp (modified) (3 diffs)
• src/core/preferences.cpp (modified) (2 diffs)
• src/window.cpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-09-11  Armin Burgmeier  <armin@arbur.net>
+
+        * inc/core/closableframe.hpp:
+        * src/core/closableframe.cpp: Added a new widget, derived from
+        Gtk::Frame, that shows a close button in the upper right corner, for
+        the frame to be closed.
+
+        * inc/core/Makefile.am:
+        * src/core/Makefile.am: Added the new files to the build.
+
+        * inc/core/preferences.hpp:
+        * src/core/preferences.cpp: Added show_browser and show_userlist
+        options.
+
+        * inc/window.hpp:
+        * src/window.cpp:
+        * src/core/docwindow.cpp: Use a ClosableFrame for the browser and
+        userlist, respectively.
+
+        * src/core/browser.cpp: Removed the border_width. It is now applied by
+        the ClosableFrame. If border_width is desired in certain situations,
+        then it can still be called from elsewhere.
+
+        * inc/core/header.hpp:
+        * src/core/header.cpp: Added "Show Document Browser" and "Show
+        Userlist" items to the View menu.
+
+        * inc/commands/view-commands.hpp:
+        * src/commands/view-commands.cpp: Implemented functionality for these
+        (by setting the preference options).
+
 2008-09-11  Armin Burgmeier  <armin@arbur.net>
 

TODO

@@ -10 +10 @@
    in InfGtkBrowserModel/Store
  - Sort BrowserModel in Left pane and DocumentLocationDialog
- - Add close buttons to browser in left pane, user lists and docwindow infos,
-   and a way to re-show the former two.
  - Set session title as initial file name in Save As filechooser
+ - Add base preferences class with Preferences::Option definition to util/,
+   inherit in core/, move ClosableFrame to util/
 
 These things need to be implemented in infinote, but again would be nice

inc/commands/view-commands.hpp

@@ -40 +40 @@
         void on_menu_toolbar_toggled();
         void on_menu_statusbar_toggled();
+        void on_menu_browser_toggled();
+        void on_menu_userlist_toggled();
         void on_pref_toolbar_changed();
         void on_pref_statusbar_changed();
+        void on_pref_browser_changed();
+        void on_pref_userlist_changed();
 
         void on_menu_language_changed(
@@ -57 +61 @@
 
         sigc::connection m_menu_view_toolbar_connection;
+        sigc::connection m_menu_view_statusbar_connection;
+        sigc::connection m_menu_view_browser_connection;
+        sigc::connection m_menu_view_userlist_connection;
+
+        sigc::connection m_pref_view_statusbar_connection;
         sigc::connection m_pref_view_toolbar_connection;
-
-        sigc::connection m_menu_view_statusbar_connection;
-        sigc::connection m_pref_view_statusbar_connection;
+        sigc::connection m_pref_view_browser_connection;
+        sigc::connection m_pref_view_userlist_connection;
 
 private:
@@ -67 +75 @@
 
 }
-        
+
 #endif // _GOBBY_VIEW_COMMANDS_HPP_

inc/core/Makefile.am

@@ -2 +2 @@
 noinst_HEADERS = \
         browser.hpp \
+        closableframe.hpp \
         documentinfostorage.hpp \
         docwindow.hpp \

inc/core/header.hpp

@@ -121 +121 @@
         const Glib::RefPtr<Gtk::ToggleAction> action_view_toolbar;
         const Glib::RefPtr<Gtk::ToggleAction> action_view_statusbar;
+        const Glib::RefPtr<Gtk::ToggleAction> action_view_browser;
+        const Glib::RefPtr<Gtk::ToggleAction> action_view_userlist;
         const Glib::RefPtr<Gtk::Action> action_view_highlight_mode;
         const Glib::RefPtr<LanguageAction> action_view_highlight_none;

inc/core/preferences.hpp

@@ -142 +142 @@
                 Option<bool> show_toolbar;
                 Option<bool> show_statusbar;
+                Option<bool> show_browser;
+                Option<bool> show_userlist;
         };
 

inc/window.hpp

@@ -46 +46 @@
 #include <gtkmm/window.h>
 #include <gtkmm/paned.h>
-#include <gtkmm/frame.h>
 #include <gtkmm/messagedialog.h>
 
@@ -81 +80 @@
         Gtk::HPaned m_paned;
 
-        Gtk::Frame m_frame_browser;
-        Gtk::Frame m_frame_text;
-
         Header m_header;
         Folder m_folder;

src/commands/view-commands.cpp

@@ -36 +36 @@
                                 &ViewCommands::on_menu_statusbar_toggled));
 
-        m_pref_view_statusbar_connection =
+        m_menu_view_browser_connection =
+                m_header.action_view_browser->signal_toggled().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &ViewCommands::on_menu_browser_toggled));
+
+        m_menu_view_userlist_connection =
+                m_header.action_view_userlist->signal_toggled().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &ViewCommands::on_menu_userlist_toggled));
+
+        m_pref_view_toolbar_connection =
                 preferences.appearance.show_toolbar.signal_changed().connect(
                         sigc::mem_fun(
@@ -47 +59 @@
                                 *this,
                                 &ViewCommands::on_pref_statusbar_changed));
+
+        m_pref_view_browser_connection =
+                preferences.appearance.show_browser.signal_changed().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &ViewCommands::on_pref_browser_changed));
+
+        m_pref_view_userlist_connection =
+                preferences.appearance.show_userlist.signal_changed().connect(
+                        sigc::mem_fun(
+                                *this,
+                                &ViewCommands::on_pref_userlist_changed));
 
         m_folder.signal_document_changed().connect(
@@ -112 +136 @@
 }
 
+void Gobby::ViewCommands::on_menu_browser_toggled()
+{
+        m_pref_view_browser_connection.block();
+        m_preferences.appearance.show_browser =
+                m_header.action_view_browser->get_active();
+        m_pref_view_browser_connection.unblock();
+}
+
+void Gobby::ViewCommands::on_menu_userlist_toggled()
+{
+        m_pref_view_userlist_connection.block();
+        m_preferences.appearance.show_userlist =
+                m_header.action_view_userlist->get_active();
+        m_pref_view_userlist_connection.unblock();
+}
+
 void Gobby::ViewCommands::on_pref_toolbar_changed()
 {
@@ -126 +166 @@
                 m_preferences.appearance.show_statusbar);
         m_menu_view_statusbar_connection.unblock();
+}
+
+void Gobby::ViewCommands::on_pref_browser_changed()
+{
+        m_menu_view_browser_connection.block();
+        m_header.action_view_browser->set_active(
+                m_preferences.appearance.show_browser);
+        m_menu_view_browser_connection.unblock();
+}
+
+void Gobby::ViewCommands::on_pref_userlist_changed()
+{
+        m_menu_view_userlist_connection.block();
+        m_header.action_view_userlist->set_active(
+                m_preferences.appearance.show_userlist);
+        m_menu_view_userlist_connection.unblock();
 }
 

src/core/Makefile.am

@@ -3 +3 @@
 libgobby_core_a_SOURCES = \
         browser.cpp \
+        closableframe.cpp \
         documentinfostorage.cpp \
         docwindow.cpp \

src/core/browser.cpp

@@ -98 +98 @@
 
         set_spacing(6);
-        set_border_width(6);
         pack_start(m_scroll, Gtk::PACK_EXPAND_WIDGET);
         pack_start(m_expander, Gtk::PACK_SHRINK);

src/core/docwindow.cpp

@@ -19 +19 @@
 #include "features.hpp"
 
+#include "core/docwindow.hpp"
 #include "core/preferences.hpp"
-#include "core/docwindow.hpp"
+#include "core/closableframe.hpp"
 
 #include <gtkmm/scrolledwindow.h>
@@ -193 +194 @@
 
         m_userlist.show();
+        Gtk::Frame* frame = Gtk::manage(new ClosableFrame(
+                m_preferences.appearance.show_userlist));
+        frame->set_shadow_type(Gtk::SHADOW_IN);
+        frame->add(m_userlist);
+        // frame manages visibility itself
 
         pack1(*vbox, true, false);
-        pack2(m_userlist, false, false);
+        pack2(*frame, false, false);
+
+
 }
 

src/core/header.cpp

@@ -62 +62 @@
                 "      <menuitem action=\"ViewStatusbar\" />"
                 "      <separator />"
+                "      <menuitem action=\"ViewBrowser\" />"
+                "      <menuitem action=\"ViewUserlist\" />"
+                "      <separator />"
                 "      <menu action=\"ViewHighlightMode\">"
                 "        <menuitem"
@@ -261 +264 @@
                         _("Whether to show the statusbar"),
                         preferences.appearance.show_statusbar)),
+        action_view_browser(
+                Gtk::ToggleAction::create(
+                        "ViewBrowser", _("View Document Browser"),
+                        _("Whether to show the document browser"),
+                        preferences.appearance.show_browser)),
+        action_view_userlist(
+                Gtk::ToggleAction::create(
+                        "ViewUserlist", _("View User List"),
+                        _("Whether to show the user list"),
+                        preferences.appearance.show_userlist)),
         action_view_highlight_mode(
                 Gtk::Action::create("ViewHighlightMode",
@@ -318 +331 @@
         group_edit->add(action_edit_preferences);
 
-        group_edit->add(action_view);
-        group_edit->add(action_view_toolbar);
-        group_edit->add(action_view_statusbar);
-        group_edit->add(action_view_highlight_mode);
-        group_edit->add(action_view_highlight_none);
+        group_view->add(action_view);
+        group_view->add(action_view_toolbar);
+        group_view->add(action_view_statusbar);
+        group_view->add(action_view_browser,
+                        Gtk::AccelKey("F9",
+                                      "<Actions>/MenuView/ViewBrowser"));
+        group_view->add(action_view_userlist,
+                        Gtk::AccelKey("<control>F9",
+                                      "<Actions>/MenuView/ViewUserList"));
+        group_view->add(action_view_highlight_mode);
+        group_view->add(action_view_highlight_none);
         for(LanguageMap::const_iterator iter =
                 action_view_highlight_languages.begin();

src/core/preferences.cpp

@@ -95 +95 @@
         userlist_width(entry.get_value<unsigned int>("userlist_width", 150)),
         show_toolbar(entry.get_value<bool>("show_toolbar", true)),
-        show_statusbar(entry.get_value<bool>("show_statusbar", true))
+        show_statusbar(entry.get_value<bool>("show_statusbar", true)),
+        show_browser(entry.get_value<bool>("show_browser", true)),
+        show_userlist(entry.get_value<bool>("show_userlist", true))
 {
 }
@@ -113 +115 @@
         entry.set_value("show_toolbar", show_toolbar);
         entry.set_value("show_statusbar", show_statusbar);
+        entry.set_value("show_browser", show_browser);
+        entry.set_value("show_userlist", show_userlist);
 }
 

src/window.cpp

@@ -22 +22 @@
 #include "core/iconmanager.hpp"
 #include "core/noteplugin.hpp"
+#include "core/closableframe.hpp"
+
+#include <gtkmm/frame.h>
 
 Gobby::Window::Window(const IconManager& icon_mgr, Config& config):
@@ -48 +51 @@
         m_browser.show();
         m_folder.show();
-        m_statusbar.show();
 
         // Build UI
         add_accel_group(m_header.get_accel_group() );
 
-        m_frame_browser.set_shadow_type(Gtk::SHADOW_IN);
-        m_frame_browser.add(m_browser);
-        m_frame_browser.show();
-        m_frame_text.set_shadow_type(Gtk::SHADOW_IN);
-        m_frame_text.add(m_folder);
-        m_frame_text.show();
+        Gtk::Frame* frame_browser = Gtk::manage(
+                new ClosableFrame(m_preferences.appearance.show_browser));
+        frame_browser->set_shadow_type(Gtk::SHADOW_IN);
+        frame_browser->add(m_browser);
+        // frame_browser manages visibility itself
 
-        m_paned.pack1(m_frame_browser, false, false);
-        m_paned.pack2(m_frame_text, true, false);
+        Gtk::Frame* frame_text = Gtk::manage(new Gtk::Frame);
+        frame_text->set_shadow_type(Gtk::SHADOW_IN);
+        frame_text->add(m_folder);
+        frame_text->show();
+
+        m_paned.pack1(*frame_browser, false, false);
+        m_paned.pack2(*frame_text, true, false);
         m_paned.show();