Changeset 086ff99bdc5863c47bfb8090a3d101683df8b34d

Timestamp:

01/06/07 23:43:26 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

63303a926cadfea5c64181f2b1c8031c7044a23b

Children:

39aa33b84ae653cc8d847fdb972037acac2064d9

git-committer:

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

Message:

[project @ Added toolbar settings into preferences [fixes #32]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-24 09:46:00+00:00

Files:

• inc/header.hpp (modified) (1 diff)
• inc/preferences.hpp (modified) (2 diffs)
• inc/preferencesdialog.hpp (modified) (3 diffs)
• inc/window.hpp (modified) (1 diff)
• src/header.cpp (modified) (1 diff)
• src/preferences.cpp (modified) (3 diffs)
• src/preferencesdialog.cpp (modified) (4 diffs)
• src/window.cpp (modified) (5 diffs)

inc/header.hpp

@@ -72 +72 @@
         Glib::RefPtr<Gtk::AccelGroup> get_accel_group();
         Glib::RefPtr<const Gtk::AccelGroup> get_accel_group() const;
+
+        // Access to toolbar & menubar
+        Gtk::MenuBar& get_menubar();
+        Gtk::Toolbar& get_toolbar();
 
         // Disables actions that deal with documents. The windowscalls this

inc/preferences.hpp

@@ -20 +20 @@
 #define _GOBBY_PREFERENCES_HPP_
 
+#include <gtkmm/toolbar.h>
 #include "config.hpp"
 
@@ -67 +68 @@
                 bool bracket_highlight;
         } view;
+
+        struct
+        {
+                Gtk::ToolbarStyle toolbar_show;
+        } appearance;
 };
 

inc/preferencesdialog.hpp

@@ -27 +27 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/checkbutton.h>
+#include <gtkmm/comboboxtext.h>
 #include <gtkmm/notebook.h>
 #include <gtkmm/tooltips.h>
@@ -131 +132 @@
                 ~Appearance();
 
-                // Fetch the font
+                Gtk::ToolbarStyle get_toolbar_style() const;
         protected:
                 Gtk::VBox m_box;
+                Gtk::Frame m_frame_toolbar;
 
-                Gtk::Frame m_frame_font;
-
-                // Font chooser
+                Gtk::VBox m_box_toolbar;
+                Gtk::ComboBoxText m_cmb_toolbar_style;
         };
 
@@ -155 +156 @@
         };
 
-        PreferencesDialog(Gtk::Window& parent, const Preferences& preferences);
+        PreferencesDialog(Gtk::Window& parent, const Preferences& preferences,
+                          bool local);
         ~PreferencesDialog();
 

inc/window.hpp

@@ -102 +102 @@
 
         // Helper functions
+        void apply_preferences();
         void open_local_file(const Glib::ustring& file);
         void close_document(DocWindow& doc);

src/header.cpp

@@ -462 +462 @@
 }
 
+Gtk::MenuBar& Gobby::Header::get_menubar()
+{
+        return *m_menubar;
+}
+
+Gtk::Toolbar& Gobby::Header::get_toolbar()
+{
+        return *m_toolbar;
+}
+
 void Gobby::Header::disable_document_actions()
 {

src/preferences.cpp

@@ -47 +47 @@
         view.bracket_highlight =
                 config["view"]["bracket"]["highlight"].get<bool>(true);
+
+        appearance.toolbar_show = static_cast<Gtk::ToolbarStyle>(
+                config["appearance"]["toolbar"]["show"].get<int>(
+                        static_cast<int>(Gtk::TOOLBAR_BOTH)
+                )
+        );
 }
 
@@ -71 +77 @@
         config["view"]["curline"]["highlight"].set(view.curline_highlight);
         config["view"]["margin"]["display"].set(view.margin_display);
-        config["view"]["margin"]["pos"].get(view.margin_pos);
-        config["view"]["bracket"]["highlight"].get(view.bracket_highlight);
+        config["view"]["margin"]["pos"].set(view.margin_pos);
+        config["view"]["bracket"]["highlight"].set(view.bracket_highlight);
+
+        config["appearance"]["toolbar"]["show"].set(
+                static_cast<int>(appearance.toolbar_show) );
 }
 
@@ -79 +88 @@
         editor = other.editor;
         view = other.view;
+        appearance = other.appearance;
 
         return *this;

src/preferencesdialog.cpp

@@ -234 +234 @@
 Gobby::PreferencesDialog::Appearance::Appearance(
         const Gobby::Preferences& preferences)
- : Page(preferences)
-{
+ : Page(preferences),
+   m_frame_toolbar(_("Toolbar") )
+{
+        Gtk::ToolbarStyle style = preferences.appearance.toolbar_show;
+
+        m_cmb_toolbar_style.append_text(_("Show text only") );
+        m_cmb_toolbar_style.append_text(_("Show icons only") );
+        m_cmb_toolbar_style.append_text(_("Show both icons and text") );
+
+        switch(style)
+        {
+        case Gtk::TOOLBAR_TEXT: m_cmb_toolbar_style.set_active(0); break;
+        case Gtk::TOOLBAR_ICONS: m_cmb_toolbar_style.set_active(1); break;
+        case Gtk::TOOLBAR_BOTH: m_cmb_toolbar_style.set_active(2); break;
+        }
+
+        m_box_toolbar.set_spacing(5);
+        m_box_toolbar.set_border_width(5);
+        m_box_toolbar.pack_start(m_cmb_toolbar_style, Gtk::PACK_SHRINK);
+
+        m_frame_toolbar.add(m_box_toolbar);
+
+        m_box.set_spacing(5);
+        m_box.pack_start(m_frame_toolbar, Gtk::PACK_SHRINK);
+
+        set_border_width(10);
+        add(m_box);
 }
 
 Gobby::PreferencesDialog::Appearance::~Appearance()
 {
+}
+
+Gtk::ToolbarStyle
+Gobby::PreferencesDialog::Appearance::get_toolbar_style() const
+{
+        switch(m_cmb_toolbar_style.get_active_row_number() )
+        {
+        case 0: return Gtk::TOOLBAR_TEXT;
+        case 1: return Gtk::TOOLBAR_ICONS;
+        case 2: default: return Gtk::TOOLBAR_BOTH;
+        }
 }
 
@@ -252 +288 @@
 
 Gobby::PreferencesDialog::PreferencesDialog(Gtk::Window& parent,
-                                            const Preferences& preferences)
+                                            const Preferences& preferences,
+                                            bool local)
  : Gtk::Dialog(_("Preferences"), parent, true),
    m_page_editor(preferences, m_tooltips), m_page_view(preferences),
@@ -259 +296 @@
         m_notebook.append_page(m_page_editor, _("Editor") );
         m_notebook.append_page(m_page_view, _("View") );
-//      m_notebook.append_page(m_page_appearance, _("Appearance") );
+
+        // Appearance only affects the global Gobby window
+        if(!local) m_notebook.append_page(m_page_appearance, _("Appearance") );
 
         get_vbox()->set_spacing(5);
@@ -297 +336 @@
                 m_page_view.get_bracket_highlight();
 
+        preferences.appearance.toolbar_show =
+                m_page_appearance.get_toolbar_style();
+
         return preferences;
 }

src/window.cpp

@@ -121 +121 @@
         add(m_mainbox);
 
+        // Apply initial preferences
+        apply_preferences();
+
         set_title("Gobby");
         set_default_size(640, 480);
@@ -457 +460 @@
 void Gobby::Window::on_edit_preferences()
 {
-        PreferencesDialog dlg(*this, m_preferences);
+        PreferencesDialog dlg(*this, m_preferences, false);
 
         // Info label
@@ -480 +483 @@
                 // Use new preferences
                 m_preferences = dlg.preferences();
+
+                // Apply window preferences
+                apply_preferences();
 
                 // Apply preferences to open documents.
@@ -535 +541 @@
 
         // Add preferences dialog
-        PreferencesDialog dlg(*this, doc.get_document().get_preferences() );
+        PreferencesDialog dlg(
+                *this,
+                doc.get_document().get_preferences(),
+                true
+        );
 
         // Label text
@@ -708 +718 @@
 }
 
+void Gobby::Window::apply_preferences()
+{
+        m_header.get_toolbar().set_toolbar_style(
+                m_preferences.appearance.toolbar_show);
+}
+
 void Gobby::Window::open_local_file(const Glib::ustring& file)
 {