Changeset cfeaba1cd10e7c3fa4201bfe898f2b6b17386cc0

Timestamp:

08/24/08 18:46:20 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

3bb782a97a760f078c127f35d7bbb94f7ebd6655

Children:

3bb736dc8aaca0b06ecd8cd17b594c34c828759e

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-08-24T18:46:20Z+0200

Message:

Focus opened DocWindow? on subscription

2008-08-24 Armin Burgmeier <armin@…>

• inc/core/browser.hpp:
• src/core/browser.cpp: Added the get_selected() and set_selected() methods, using the new inf_gtk_browser_view_set_selected().

• src/commands/browser-commands.cpp: When subscribing to a session, then change the BrowserView? selection to the corresponding note, and give focus to the DocWindow?, so the user can start typing immediately.

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (2 diffs)
• inc/core/browser.hpp (modified) (1 diff)
• src/commands/browser-commands.cpp (modified) (1 diff)
• src/core/browser.cpp (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-08-24  Armin Burgmeier  <armin@arbur.net>
+
+        * inc/core/browser.hpp:
+        * src/core/browser.cpp: Added the get_selected() and set_selected()
+        methods, using the new inf_gtk_browser_view_set_selected().
+
+        * src/commands/browser-commands.cpp: When subscribing to a session,
+        then change the BrowserView selection to the corresponding note, and
+        give focus to the DocWindow, so the user can start typing immediately.
+
 2008-08-14  Armin Burgmeier  <armin@arbur.net>
 

TODO

@@ -4 +4 @@
  - Subscribing to a for the first time document and clicking into it scrolls
    the view all way down. Perhaps it is enough to keep the cursor initially at
-   the beginning of the document.
+   the beginning of the document, which we should do anyway (in infinote)
  - ^W should close the window
  - Remove references to doclist, userlist and chat in the icon manager
@@ -16 +16 @@
  - Add close buttons to browser in left pane, user lists and docwindow infos,
    and a way to re-show the former two.
+
+These things need to be implemented in infinote, but again would be nice
+to have:
+
+ - Show other user's cursors
+ - Show other user's selections
+ - Show other user's viewport position (perhaps in a separate widget)

inc/core/browser.hpp

@@ -66 +66 @@
         }
 
+        bool get_selected(InfcBrowser** browser, InfcBrowserIter* iter);
+        void set_selected(InfcBrowser* browser, InfcBrowserIter* iter);
+
         SignalActivate signal_activate() const { return m_signal_activate; }
 

src/commands/browser-commands.cpp

@@ -289 +289 @@
                 infc_browser_iter_get_name(browser, iter),
                 m_info_storage.get_key(browser, iter));
+
+        // For now we always highlight the newly created session...
+        // TODO: If the user issued other browserview events in the meanwhile,
+        // then don't select the item, and if the user did issue other folder
+        // events, then don't switch to the document in the folder.
         m_folder.switch_to_document(window);
+        gtk_widget_grab_focus(GTK_WIDGET(window.get_text_view()));
+        m_browser.set_selected(browser, iter);
 
         SessionNode& node = m_session_map[session];

src/core/browser.cpp

@@ -269 +269 @@
         m_status_bar.add_message(StatusBar::ERROR, error.what(), 5);
 }
+
+bool Gobby::Browser::get_selected(InfcBrowser** browser,
+                                  InfcBrowserIter* iter)
+{
+        GtkTreeIter tree_iter;
+        if(!inf_gtk_browser_view_get_selected(m_browser_view, &tree_iter))
+                return false;
+
+        InfcBrowser* tmp_browser;
+        InfcBrowserIter* tmp_iter;
+
+        gtk_tree_model_get(
+                GTK_TREE_MODEL(m_browser_store), &tree_iter,
+                INF_GTK_BROWSER_MODEL_COL_BROWSER, &tmp_browser,
+                INF_GTK_BROWSER_MODEL_COL_NODE, &tmp_iter, -1);
+
+        *browser = tmp_browser;
+        *iter = *tmp_iter;
+
+        infc_browser_iter_free(tmp_iter);
+        g_object_unref(tmp_browser);
+
+        return true;
+}
+
+void Gobby::Browser::set_selected(InfcBrowser* browser, InfcBrowserIter* iter)
+{
+        GtkTreeIter tree_iter;
+
+        gboolean has_iter = inf_gtk_browser_model_browser_iter_to_tree_iter(
+                INF_GTK_BROWSER_MODEL(m_browser_store),
+                browser, iter, &tree_iter);
+        g_assert(has_iter == TRUE);
+
+        inf_gtk_browser_view_set_selected(m_browser_view, &tree_iter);
+}