Changeset 9c8b8080dc4d007fd27de778666221b86fe62b54

Timestamp:

01/06/07 23:40:53 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

81402324f4abc1a14b70b14781657362fbea5269

Children:

56383089e5ae1d12c04e5c0b67699e31eae062e0

git-committer:

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

Message:

[project @ Display current document in title bar]

Original author: Armin Burgmeier <armin@…>
Date: 2005-07-20 11:30:28+00:00

Files:

• inc/document.hpp (modified) (2 diffs)
• inc/window.hpp (modified) (2 diffs)
• src/document.cpp (modified) (1 diff)
• src/window.cpp (modified) (9 diffs)

inc/document.hpp

@@ -66 +66 @@
         unsigned int get_revision() const;
 
+        /** Returns the path to the file.
+         */
+        const Glib::ustring& get_path() const;
+
+        /** Changes the path to the file.
+         */
+        void set_path(const Glib::ustring& new_path);
+
         /** Returns whether the local user is subscribed to this document.
          */
@@ -196 +204 @@
         Gtk::Button m_btn_subscribe;
 
+        /** Path to the file on the local disc.
+         */
+        Glib::ustring m_path;
+
         signal_cursor_moved_type m_signal_cursor_moved;
         signal_content_changed_type m_signal_content_changed;

inc/window.hpp

@@ -73 +73 @@
 #endif
 
+        void on_folder_tab_switched(Document& document);
+
         void on_about();
         void on_quit();
@@ -79 +81 @@
 
         // Obby signal handlers
-        void on_obby_login_failed(obby::login::error error);
-        bool on_obby_global_password(std::string& password);
-        bool on_obby_user_password(std::string& password);
         void on_obby_close();
-        void on_obby_sync();
 
         void on_obby_user_join(obby::user& user);

src/document.cpp

@@ -192 +192 @@
 }
 
+const Glib::ustring& Gobby::Document::get_path() const
+{
+        return m_path;
+}
+
+void Gobby::Document::set_path(const Glib::ustring& new_path)
+{
+        m_path = new_path;
+}
+
 #ifdef WITH_GTKSOURCEVIEW
 Glib::RefPtr<Gtk::SourceLanguage> Gobby::Document::get_language() const

src/window.cpp

@@ -84 +84 @@
                 sigc::mem_fun(*this, &Window::on_quit) );
 
+        m_folder.tab_switched_event().connect(
+                sigc::mem_fun(*this, &Window::on_folder_tab_switched) );
+
         // Build UI
         add_accel_group(m_header.get_accel_group() );
@@ -316 +319 @@
 }
 
+void Gobby::Window::on_folder_tab_switched(Document& document)
+{
+        const Glib::ustring& file = document.get_document().get_title();
+        Glib::ustring path = document.get_path();
+                
+        if(!path.empty() )
+        {
+                // Replace home dir by ~
+                Glib::ustring home = Glib::get_home_dir();
+                if(path.compare(0, home.length(), home) == 0)
+                        path.replace(0, home.length(), "~");
+
+                // Set title with file and path
+                obby::format_string title_str("%0 (%1) - Gobby");
+                title_str << file << path;
+                set_title(title_str.str() );
+        }
+        else
+        {
+                // Path not known: Set title with file only
+                obby::format_string title_str("%0 - Gobby");
+                title_str << file;
+                set_title(title_str.str() );
+        }
+}
+
 void Gobby::Window::on_document_create()
 {
@@ -333 +362 @@
         if(dlg.run() == Gtk::RESPONSE_OK)
         {
+                // TODO: Set path in newly generated document
                 m_buffer->create_document(
                         Glib::path_get_basename(dlg.get_filename()),
@@ -357 +387 @@
                 {
                         stream << doc.get_document().get_content() << std::endl;
+                        doc.get_document().set_path(dlg.get_filename() );
+                        on_folder_tab_switched(doc.get_document() );
                 }
                 else
                 {
-                        display_error(
-                                "Could not open file " +
-                                dlg.get_filename() +
-                                " for writing"
-                        );
+                        obby::format_string str("Could not open file "
+                                                "%0 for writing");
+                        str << dlg.get_filename();
+                        display_error(str.str() );
                 }
         }
@@ -473 +504 @@
 }
 
+/*
 void Gobby::Window::on_obby_login_failed(obby::login::error error)
 {
@@ -530 +562 @@
                 return false;
         }
-}
+}*/
 
 void Gobby::Window::on_obby_close()
@@ -538 +570 @@
 }
 
-void Gobby::Window::on_obby_sync()
+/*void Gobby::Window::on_obby_sync()
 {
         // Send documents to components
@@ -548 +580 @@
         if(m_buffer->document_count() > 0)
                 m_folder.set_current_page(m_buffer->document_count() - 1);
-}
+}*/
 
 void Gobby::Window::on_obby_chat(obby::user& user, const Glib::ustring& message)
@@ -602 +634 @@
         m_chat.obby_document_remove(local_doc);
         m_statusbar.obby_document_remove(local_doc);
+
+        // Reset title if last document has been closed
+        if(m_buffer->document_count() == 1)
+                set_title("Gobby");
 }