Changeset 50c17ccd97678c0e4b7cf718b0c74fd410b1a4c0

Timestamp:

11/17/09 22:04:09 (4 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

83d7081d3d98bcf0b5f7c21f8f5636ebb80e89be

Children:

614d0889e1ce6a96593948aa77f299b21bf8623b

git-committer:

Armin Burgmeier <armin@arbur.net> / 2009-11-17T22:04:09Z+0100

Message:

Switch to chat on Ctrl+M, switch back on Ctrl+Shift+M

2009-11-17 Armin Burgmeier <armin@…>

• code/core/chatsessionview.hpp: Added get_chat().

• code/window.hpp:
• code/window.cpp: Added Ctrl+M and Ctrl+Shift+M shortcuts to easily jump between chat and document.

Files:

• ChangeLog (modified) (1 diff)
• code/core/chatsessionview.hpp (modified) (1 diff)
• code/window.cpp (modified) (2 diffs)
• code/window.hpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2009-11-17  Armin Burgmeier  <armin@arbur.net>
+
+        * code/core/chatsessionview.hpp: Added get_chat().
+
+        * code/window.hpp:
+        * code/window.cpp: Added Ctrl+M and Ctrl+Shift+M shortcuts to easily
+        jump between chat and document.
+
 2009-11-17  Armin Burgmeier  <armin@arbur.net>
 

code/core/chatsessionview.hpp

@@ -41 +41 @@
         // Override base class covariantly
         InfChatSession* get_session() { return INF_CHAT_SESSION(m_session); }
+        InfGtkChat* get_chat() { return m_chat; }
 
         InfUser* get_active_user() const;

code/window.cpp

@@ -87 +87 @@
 
         // Build UI
-        add_accel_group(m_header.get_accel_group() );
+        Glib::RefPtr<Gtk::AccelGroup> group = m_header.get_accel_group();
+        // Add focus shortcuts; unfortunately gtkmm does not wrap that API
+        GClosure* closure = g_cclosure_new(
+                G_CALLBACK(on_switch_to_chat_static), this, NULL);
+        gtk_accel_group_connect(group->gobj(), GDK_m, GDK_CONTROL_MASK,
+                                static_cast<GtkAccelFlags>(0), closure);
+        //g_closure_unref(closure);
+        GClosure* closure2 = g_cclosure_new(
+                G_CALLBACK(on_switch_to_text_static), this, NULL);
+        gtk_accel_group_connect(group->gobj(), GDK_m,
+                                static_cast<GdkModifierType>(
+                                        GDK_CONTROL_MASK | GDK_SHIFT_MASK),
+                                static_cast<GtkAccelFlags>(0), closure2);
+        //g_closure_unref(closure2);
+        add_accel_group(group);
 
         Gtk::Frame* frame_browser = Gtk::manage(new ClosableFrame(
@@ -249 +263 @@
         // Don't show again
         m_config.get_root()["initial"].set_value("run", true);
+}
+
+bool Gobby::Window::on_switch_to_chat()
+{
+        SessionView* view = m_chat_folder.get_current_document();
+        if(!view) return false;
+
+        ChatSessionView* chat_view = dynamic_cast<ChatSessionView*>(view);
+        if(!chat_view) return false;
+
+        m_preferences.appearance.show_chat = true;
+        InfGtkChat* chat = chat_view->get_chat();
+        GtkWidget* entry = inf_gtk_chat_get_entry(chat);
+        gtk_widget_grab_focus(GTK_WIDGET(entry));
+        return true;
+}
+
+bool Gobby::Window::on_switch_to_text()
+{
+        SessionView* view = m_text_folder.get_current_document();
+        if(!view) return false;
+
+        TextSessionView* text_view = dynamic_cast<TextSessionView*>(view);
+        if(!text_view) return false;
+
+        GtkSourceView* gtk_view = text_view->get_text_view();
+        gtk_widget_grab_focus(GTK_WIDGET(gtk_view));
+        // TODO: Turn chat back off if previously activated
+        // via on_switch_to_chat()?
+        return true;
 }
 

code/window.hpp

@@ -108 +108 @@
         void on_initial_dialog_hide();
 
+        static gboolean on_switch_to_chat_static(GtkAccelGroup* group,
+                                                 GObject* acceleratable,
+                                                 guint keyval,
+                                                 GdkModifierType modifier,
+                                                 gpointer user_data)
+        {
+                return static_cast<Window*>(user_data)->on_switch_to_chat();
+        }
+
+        static gboolean on_switch_to_text_static(GtkAccelGroup* group,
+                                                 GObject* acceleratable,
+                                                 guint keyval,
+                                                 GdkModifierType modifier,
+                                                 gpointer user_data)
+        {
+                return static_cast<Window*>(user_data)->on_switch_to_text();
+        }
+
+        bool on_switch_to_chat();
+        bool on_switch_to_text();
+
 #ifdef WITH_UNIQUE
         UniqueResponse on_message_received(UniqueCommand command,