Changeset 4a12852956b8c9d65420066459277f873f6247ee

Timestamp:

09/21/10 21:41:04 (3 years ago)

Author:

Armin Burgmeier <armin@…>

git-author:

Armin Burgmeier <armin@arbur.net> / 2010-09-21T21:27:16Z+0200

Parents:

edf70bfbfed7be742f6fabb0740f88e7a83081d6

Children:

ecfdae11289287fec91513ba406f03d044dc56d9

git-committer:

Armin Burgmeier <armin@arbur.net> / 2010-09-21T21:41:04Z+0200

Message:

Add preferences options for showing remote user info

2010-09-21 Armin Burgmeier <armin@…>

• code/core/preferences.hpp:
• code/core/preferences.cpp: Add preferences options for showing remote cursors, selections, current lines and cursor positions in the scrollbar.

• code/core/textsessionview.hpp:
• code/core/textsessionview.cpp: Apply the new settings on the underlying objects.

• code/dialogs/preferences-dialog.hpp:
• code/dialogs/preferences-dialog.cpp: Add the new options to the preferences dialog.

Files:

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

ChangeLog

@@ +1 @@
+2010-09-21  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/preferences.hpp:
+        * code/core/preferences.cpp: Add preferences options for showing
+        remote cursors, selections, current lines and cursor positions in the
+        scrollbar.
+
+        * code/core/textsessionview.hpp:
+        * code/core/textsessionview.cpp: Apply the new settings on the
+        underlying objects.
+
+        * code/dialogs/preferences-dialog.hpp:
+        * code/dialogs/preferences-dialog.cpp: Add the new options to the
+        preferences dialog.
+
 2010-06-04  Armin Burgmeier  <armin@arbur.net>
 

code/core/preferences.cpp

@@ -26 +26 @@
         hue(entry.get_value<double>("hue", Glib::Rand().get_double())),
         host_directory(entry.get_value<std::string>("host-directory",
-                Glib::build_filename(Glib::get_home_dir(), ".infinote")))
+                Glib::build_filename(Glib::get_home_dir(), ".infinote"))),
+        show_remote_cursors(entry.get_value<bool>(
+                "show-remote-users", true)),
+        show_remote_selections(entry.get_value<bool>(
+                "show-remote-selections", true)),
+        show_remote_current_lines(entry.get_value<bool>(
+                "show-remote-current-lines", true)),
+        show_remote_cursor_positions(entry.get_value<bool>(
+                "show-remote-cursor-positions", true))
 {
 }
@@ -35 +43 @@
         entry.set_value("hue", hue);
         entry.set_value("host-directory", host_directory);
+        
+        entry.set_value("show-remote-cursors", show_remote_cursors);
+        entry.set_value("show-remote-selections", show_remote_selections);
+        entry.set_value("show-remote-current-lines", show_remote_current_lines);
+        entry.set_value("show-remote-cursor-positions",
+                        show_remote_cursor_positions);
 }
 

code/core/preferences.hpp

@@ -106 +106 @@
                 Option<double> hue;
                 Option<std::string> host_directory;
+
+                Option<bool> show_remote_cursors;
+                Option<bool> show_remote_selections;
+                Option<bool> show_remote_current_lines;
+                Option<bool> show_remote_cursor_positions;
         };
 

code/core/textsessionview.cpp

@@ -165 +165 @@
                 sigc::mem_fun(
                         *this, &TextSessionView::on_user_color_changed));
+        m_preferences.user.show_remote_cursors.signal_changed().connect(
+                sigc::mem_fun(
+                        *this, &TextSessionView::on_show_remote_cursors_changed));
+        m_preferences.user.show_remote_selections.signal_changed().connect(
+                sigc::mem_fun(
+                        *this, &TextSessionView::on_show_remote_selections_changed));
+        m_preferences.user.show_remote_current_lines.signal_changed().connect(
+                sigc::mem_fun(
+                        *this, &TextSessionView::on_show_remote_current_lines_changed));
+        m_preferences.user.show_remote_cursor_positions.signal_changed().connect(
+                sigc::mem_fun(
+                        *this, &TextSessionView::on_show_remote_cursor_positions_changed));
         m_preferences.editor.tab_width.signal_changed().connect(
                 sigc::mem_fun(
@@ -206 +218 @@
         m_preferences.appearance.scheme_id.signal_changed().connect(
                 sigc::mem_fun(*this, &TextSessionView::on_scheme_changed));
+
+        inf_text_gtk_view_set_show_remote_cursors(
+                m_infview,
+                m_preferences.user.show_remote_cursors
+        );
+        inf_text_gtk_view_set_show_remote_selections(
+                m_infview,
+                m_preferences.user.show_remote_selections
+        );
+        inf_text_gtk_view_set_show_remote_current_lines(
+                m_infview,
+                m_preferences.user.show_remote_current_lines
+        );
+
         gtk_source_view_set_tab_width(m_view, m_preferences.editor.tab_width);
         gtk_source_view_set_insert_spaces_instead_of_tabs(
@@ -243 +269 @@
 
         m_infviewport = inf_text_gtk_viewport_new(scroll->gobj(), user_table);
+        inf_text_gtk_viewport_set_show_user_markers(
+                m_infviewport,
+                m_preferences.user.show_remote_cursor_positions
+        );
 
         pack_start(*scroll, Gtk::PACK_EXPAND_WIDGET);
@@ -392 +422 @@
 }
 
+
+void Gobby::TextSessionView::on_show_remote_cursors_changed()
+{
+        inf_text_gtk_view_set_show_remote_cursors(
+                m_infview,
+                m_preferences.user.show_remote_cursors
+        );
+}
+
+void Gobby::TextSessionView::on_show_remote_selections_changed()
+{
+        inf_text_gtk_view_set_show_remote_selections(
+                m_infview,
+                m_preferences.user.show_remote_selections
+        );
+}
+
+void Gobby::TextSessionView::on_show_remote_current_lines_changed()
+{
+        inf_text_gtk_view_set_show_remote_current_lines(
+                m_infview,
+                m_preferences.user.show_remote_current_lines
+        );
+}
+
+void Gobby::TextSessionView::on_show_remote_cursor_positions_changed()
+{
+        inf_text_gtk_viewport_set_show_user_markers(
+                m_infviewport,
+                m_preferences.user.show_remote_cursor_positions
+        );
+}
+
 void Gobby::TextSessionView::on_tab_width_changed()
 {

code/core/textsessionview.hpp

@@ -86 +86 @@
         void on_user_color_changed();
 
+        void on_show_remote_cursors_changed();
+        void on_show_remote_selections_changed();
+        void on_show_remote_current_lines_changed();
+        void on_show_remote_cursor_positions_changed();
+
         void on_tab_width_changed();
         void on_tab_spaces_changed();

code/dialogs/preferences-dialog.cpp

@@ -232 +232 @@
         m_group_settings(_("Settings")),
         m_group_paths(_("Paths")),
+        m_group_remote(_("Remote Users")),
         m_box_user_name(false, 6),
         m_lbl_user_name(_("User name:"), Gtk::ALIGN_LEFT),
@@ -240 +241 @@
         m_btn_path_host_directory(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER),
         m_lbl_path_host_directory(_("Host directory:")),
+        m_btn_remote_show_cursors(_("Show cursors of remote users")),
+        m_btn_remote_show_selections(_("Show selections of remote users")),
+        m_btn_remote_show_current_lines(
+                _("Highlight current line of remote users")),
+        m_btn_remote_show_cursor_positions(
+                _("Indicate remote users' cursor position in the scrollbar")),
         m_size_group(Gtk::SizeGroup::create(Gtk::SIZE_GROUP_HORIZONTAL))
 {
@@ -293 +300 @@
         // m_group_paths.show();
 
+        m_btn_remote_show_cursors.set_active(
+                preferences.user.show_remote_cursors);
+        m_btn_remote_show_cursors.show();
+        connect_option(m_btn_remote_show_cursors,
+                       preferences.user.show_remote_cursors);
+
+        m_btn_remote_show_selections.set_active(
+                preferences.user.show_remote_selections);
+        m_btn_remote_show_selections.show();
+        connect_option(m_btn_remote_show_selections,
+                       preferences.user.show_remote_selections);
+
+        m_btn_remote_show_current_lines.set_active(
+                preferences.user.show_remote_current_lines);
+        m_btn_remote_show_current_lines.show();
+        connect_option(m_btn_remote_show_current_lines,
+                       preferences.user.show_remote_current_lines);
+
+        m_btn_remote_show_cursor_positions.set_active(
+                preferences.user.show_remote_cursor_positions);
+        m_btn_remote_show_cursor_positions.show();
+        connect_option(m_btn_remote_show_cursor_positions,
+                       preferences.user.show_remote_cursor_positions);
+
+        m_group_remote.add(m_btn_remote_show_cursors);
+        m_group_remote.add(m_btn_remote_show_selections);
+        m_group_remote.add(m_btn_remote_show_current_lines);
+        m_group_remote.add(m_btn_remote_show_cursor_positions);
+        m_group_remote.show();
+
         add(m_group_settings, false);
         add(m_group_paths, false);
+        add(m_group_remote, false);
 }
 

code/dialogs/preferences-dialog.hpp

@@ -127 +127 @@
                 Group m_group_settings;
                 Group m_group_paths;
+                Group m_group_remote;
 
                 Gtk::HBox m_box_user_name;
@@ -139 +140 @@
                 Gtk::Label m_lbl_path_host_directory;
                 Gtk::FileChooserButton m_btn_path_host_directory;
+
+                Gtk::CheckButton m_btn_remote_show_cursors;
+                Gtk::CheckButton m_btn_remote_show_selections;
+                Gtk::CheckButton m_btn_remote_show_current_lines;
+                Gtk::CheckButton m_btn_remote_show_cursor_positions;
 
                 Glib::RefPtr<Gtk::SizeGroup> m_size_group;