Changeset 3c40239e8c602c1870208940eaee9b6828b9032c

Timestamp:

11/10/09 00:21:49 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

2a1e37c2ebaa4d166360a8bed2b730ac8cdc8203

Children:

5cdca2452ef978895eef8f5175a821b555063098

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-11-10T00:21:49Z+0100

Message:

Make GtkSourceView? style scheme configurable

2009-11-09 Gabríel A. Pétursson <gabrielp@…>, Armin Burgmeier <armin@…>

• code/core/preferences.hpp:
• code/core/preferences.cpp: Added scheme_id preference option to appearance.

• code/core/textsessionview.hpp:
• code/core/textsessionview.cpp: Set GtkSourceView? style scheme according to selected scheme ID.

• code/dialogs/preferences-dialog.hpp:
• code/dialogs/preferences-dialog.cpp: Add a list to choose one's favoured style scheme to the appearance tab.

Files:

• ChangeLog (modified) (1 diff)
• code/core/preferences.cpp (modified) (2 diffs)
• code/core/preferences.hpp (modified) (2 diffs)
• code/core/textsessionview.cpp (modified) (3 diffs)
• code/core/textsessionview.hpp (modified) (1 diff)
• code/dialogs/preferences-dialog.cpp (modified) (9 diffs)
• code/dialogs/preferences-dialog.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-11-09  Gabríel A. Pétursson  <gabrielp@simnet.is>, Armin Burgmeier <armin@arbur.net>
+
+        * code/core/preferences.hpp:
+        * code/core/preferences.cpp: Added scheme_id preference option to
+        appearance.
+
+        * code/core/textsessionview.hpp:
+        * code/core/textsessionview.cpp: Set GtkSourceView style scheme
+        according to selected scheme ID.
+
+        * code/dialogs/preferences-dialog.hpp:
+        * code/dialogs/preferences-dialog.cpp: Add a list to choose one's
+        favoured style scheme to the appearance tab.
+
 2009-11-09  Benjamin Herr  <ben@0x539.de>
 

code/core/preferences.cpp

@@ -94 +94 @@
         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))
+        show_userlist(entry.get_value<bool>("show-userlist", true)),
+        scheme_id(entry.get_value<Glib::ustring>("scheme-id", "classic"))
 {
 }
@@ -113 +114 @@
         entry.set_value("show-browser", show_browser);
         entry.set_value("show-userlist", show_userlist);
+        entry.set_value("scheme-id", scheme_id);
 }
 

code/core/preferences.hpp

@@ -25 +25 @@
 
 #include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksourcestyleschememanager.h>
 
 #include <gtkmm/toolbar.h>
@@ -153 +154 @@
                 Option<bool> show_browser;
                 Option<bool> show_userlist;
+                
+                Option<Glib::ustring> scheme_id;
         };
 

code/core/textsessionview.cpp

@@ -190 +190 @@
         m_preferences.appearance.font.signal_changed().connect(
                 sigc::mem_fun(*this, &TextSessionView::on_font_changed));
-
+        m_preferences.appearance.scheme_id.signal_changed().connect(
+                sigc::mem_fun(*this, &TextSessionView::on_scheme_changed));
         gtk_source_view_set_tab_width(m_view, m_preferences.editor.tab_width);
         gtk_source_view_set_insert_spaces_instead_of_tabs(
@@ -228 +229 @@
 
         pack_start(*scroll, Gtk::PACK_EXPAND_WIDGET);
+        
+        gtk_source_buffer_set_style_scheme(m_buffer, gtk_source_style_scheme_manager_get_scheme(gtk_source_style_scheme_manager_get_default(), static_cast<Glib::ustring>(preferences.appearance.scheme_id).c_str()));
 }
 
@@ -423 +426 @@
 }
 
+void Gobby::TextSessionView::on_scheme_changed()
+{
+        gtk_source_buffer_set_style_scheme(m_buffer, gtk_source_style_scheme_manager_get_scheme(gtk_source_style_scheme_manager_get_default(), static_cast<Glib::ustring>(m_preferences.appearance.scheme_id).c_str()));
+}
+
 bool Gobby::TextSessionView::
         on_query_tooltip(int x, int y, bool keyboard_mode,

code/core/textsessionview.hpp

@@ -103 +103 @@
 
         void on_font_changed();
+        void on_scheme_changed();
 
         bool on_query_tooltip(int x, int y, bool keyboard_mode,

code/dialogs/preferences-dialog.cpp

@@ -22 +22 @@
 
 #include <gtkmm/messagedialog.h>
+#include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stock.h>
 #include <stdexcept>
+
+#include <gtksourceview/gtksourcestyleschememanager.h>
 
 namespace
@@ -206 +209 @@
 void Gobby::PreferencesDialog::Group::add(Gtk::Widget& widget)
 {
-        m_box.pack_start(widget, Gtk::PACK_SHRINK);
+        m_box.pack_start(widget, Gtk::PACK_EXPAND_WIDGET);
 }
 
@@ -220 +223 @@
 }
 
-void Gobby::PreferencesDialog::Page::add(Gtk::Widget& widget)
-{
-        m_box.pack_start(widget, Gtk::PACK_SHRINK);
+void Gobby::PreferencesDialog::Page::add(Gtk::Widget& widget, bool expand)
+{
+        m_box.pack_start(widget, expand ? Gtk::PACK_EXPAND_WIDGET : Gtk::PACK_SHRINK);
 }
 
@@ -290 +293 @@
         // m_group_paths.show();
 
-        add(m_group_settings);
-        add(m_group_paths);
+        add(m_group_settings, false);
+        add(m_group_paths, false);
 }
 
@@ -384 +387 @@
         m_group_saving.show();
 
-        add(m_group_tab);
-        add(m_group_indentation);
-        add(m_group_homeend);
-        add(m_group_saving);
+        add(m_group_tab, false);
+        add(m_group_indentation, false);
+        add(m_group_homeend, false);
+        add(m_group_saving, false);
 }
 
@@ -501 +504 @@
         m_group_spaces.show();
 
-        add(m_group_wrap);
-        add(m_group_linenum);
-        add(m_group_curline);
-        add(m_group_margin);
-        add(m_group_bracket);
-        add(m_group_spaces);
+        add(m_group_wrap, false);
+        add(m_group_linenum, false);
+        add(m_group_curline, false);
+        add(m_group_margin, false);
+        add(m_group_bracket, false);
+        add(m_group_spaces, false);
 }
 
@@ -522 +525 @@
         m_group_toolbar(_("Toolbar") ),
         m_group_font(_("Font") ),
-        m_cmb_toolbar_style(preferences.appearance.toolbar_style)
+        m_group_scheme(_("Color Scheme")),
+        m_cmb_toolbar_style(preferences.appearance.toolbar_style),
+        m_list(Gtk::ListStore::create(m_columns)),
+        m_tree(m_list)
 {
         const Pango::FontDescription& font = preferences.appearance.font;
@@ -546 +552 @@
         m_group_font.show();
 
-        add(m_group_toolbar);
-        add(m_group_font);
+        Gtk::TreeViewColumn column_name;
+        Gtk::CellRendererText renderer_name;
+        column_name.pack_start(renderer_name, false);
+        column_name.add_attribute(renderer_name.property_text(), m_columns.name);
+
+        m_tree.append_column(column_name);//"Scheme Name", m_columns.name);
+        m_tree.append_column("Scheme description", m_columns.description);
+
+        Pango::AttrList list;
+        Pango::Attribute attr(Pango::Attribute::create_attr_weight(Pango::WEIGHT_BOLD));
+        list.insert(attr);
+        renderer_name.property_attributes() = list;
+
+        m_tree.set_headers_visible(false);
+        m_tree.show();
+
+        Gtk::ScrolledWindow* scroll = Gtk::manage(new Gtk::ScrolledWindow);
+        scroll->set_shadow_type(Gtk::SHADOW_IN);
+        scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+        scroll->add(m_tree);
+        scroll->show();
+
+        m_group_scheme.add(*scroll);
+        m_group_scheme.show();
+
+        GtkSourceStyleSchemeManager* manager = gtk_source_style_scheme_manager_get_default();
+        const gchar* const* ids = gtk_source_style_scheme_manager_get_scheme_ids(manager);
+
+        Glib::ustring current_scheme = preferences.appearance.scheme_id;
+
+        for (const gchar* const* id = ids; *id != NULL; ++id)
+        {
+                GtkSourceStyleScheme* scheme = gtk_source_style_scheme_manager_get_scheme(manager, *id);
+                const gchar* name = gtk_source_style_scheme_get_name(scheme);
+                const gchar* desc = gtk_source_style_scheme_get_description(scheme);
+
+                Gtk::TreeIter iter = m_list->append();
+                (*iter)[m_columns.name] = name;
+                (*iter)[m_columns.description] = desc;
+                (*iter)[m_columns.scheme] = scheme;
+
+                if (current_scheme == gtk_source_style_scheme_get_id(scheme))
+                        m_tree.get_selection()->select(iter);
+        }
+
+        m_tree.get_selection()->signal_changed().connect(
+                sigc::bind(
+                        sigc::mem_fun(*this, &Appearance::on_scheme_changed),
+                        sigc::ref(preferences)));
+
+        m_list->set_sort_column_id(m_columns.name, Gtk::SORT_ASCENDING); // This should do it
+
+        add(m_group_toolbar, false);
+        add(m_group_font, false);
+        add(m_group_scheme, true);
+}
+
+void Gobby::PreferencesDialog::Appearance::on_scheme_changed(Preferences& preferences)
+{
+        Gtk::TreeIter iter = m_tree.get_selection()->get_selected();
+        GtkSourceStyleScheme* scheme = (*iter)[m_columns.scheme];
+        preferences.appearance.scheme_id = gtk_source_style_scheme_get_id(scheme);
 }
 
@@ -579 +645 @@
         m_group_connection_policy.show();
 
-        add(m_group_trust_file);
-        add(m_group_connection_policy);
+        add(m_group_trust_file, false);
+        add(m_group_connection_policy, false);
 }
 

code/dialogs/preferences-dialog.hpp

@@ -113 +113 @@
         public:
                 Page();
-                void add(Gtk::Widget& widget);
+                void add(Gtk::Widget& widget, bool expand);
 
         protected:
@@ -212 +212 @@
 
         protected:
+                class Columns: public Gtk::TreeModelColumnRecord
+                {
+                public:
+                        Gtk::TreeModelColumn<GtkSourceStyleScheme*> scheme;
+                        Gtk::TreeModelColumn<Glib::ustring> name;
+                        Gtk::TreeModelColumn<Glib::ustring> description;
+                        Columns()
+                        {
+                                add(scheme);
+                                add(name);
+                                add(description);
+                        }
+                };
+
+                void on_scheme_changed(Preferences& preferences);
+
                 Group m_group_toolbar;
                 Group m_group_font;
+                Group m_group_scheme;
 
                 PreferencesComboBox<Gtk::ToolbarStyle> m_cmb_toolbar_style;
                 Gtk::FontButton m_btn_font;
+
+                Columns m_columns;
+                Glib::RefPtr<Gtk::ListStore> m_list;
+                Gtk::TreeView m_tree;
         };