Changeset 6eef44e8de0bbc7a63172c7ad06877a8dda58917 for src/window.cpp

Timestamp:

04/12/08 16:58:39 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

b464e34a10c0c8d04d40e60feccf21292deff7af

Children:

36fa5fe45a5f19487d82bff9bb2c33e39175041a

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-04-12T16:58:39Z+0200

Message:

Changed Folder and DocWindow? to be used with infinote instead of obby

2008-04-12 Armin Burgmeier <armin@…>

• src/preferences.cpp: Changed default value for homeend_smart to false.

• inc/resolv.hpp:
• src/resolv.cpp: Changed signature of callbacks to include the ResolvHandle?.

• inc/browser.hpp:
• src/browser.cpp: Added resolv map to correctly cancel pending resolvs on destruction.

• inc/statusbar.hpp:
• src/statusbar.cpp: Correctly remove the timeout connection on destruction of a statusbar message.

• inc/folder.hpp:
• inc/docwindow.hpp:
• src/folder.cpp:
• src/docwindow.cpp: Changed Folder and DocWindow? to be used with InfTextSession? instead of obby::local_document_info.

• inc/window.hpp:
• src/finddialog.cpp:
• src/gotodialog.cpp:
• src/window.cpp: Adapted to Folder and DocWindow? changes.

Files:

• src/window.cpp (modified) (25 diffs)

src/window.cpp

@@ -57 +57 @@
                     InfXmlConnection* sync_connection)
         {
-                GtkTextBuffer* textbuffer = gtk_text_buffer_new(NULL);
+                GtkSourceBuffer* textbuffer = gtk_source_buffer_new(NULL);
                 InfUserTable* user_table = inf_user_table_new();
                 InfTextGtkBuffer* buffer =
-                        inf_text_gtk_buffer_new(textbuffer, user_table);
+                        inf_text_gtk_buffer_new(GTK_TEXT_BUFFER(textbuffer),
+                                                user_table);
                 InfTextSession* session =
                         inf_text_session_new_with_user_table(
@@ -82 +83 @@
         m_document_settings(*this),
         m_header(m_preferences, m_lang_manager),
-        m_folder(m_header, m_preferences, m_lang_manager),
+        m_folder(m_preferences, m_lang_manager),
         m_statusbar(m_folder),
         m_browser(*this, &TEXT_PLUGIN, m_statusbar, m_preferences)
@@ -138 +139 @@
         m_browser.show();
 
+#if 0
         // Folder
         m_folder.document_add_event().connect(
@@ -147 +149 @@
         m_folder.tab_switched_event().connect(
                 sigc::mem_fun(*this, &Window::on_folder_tab_switched) );
-
+#endif
         // Settings
         m_document_settings.document_insert_event().connect(
@@ -317 +319 @@
 
         // Delegate start of obby session
-        m_folder.obby_start(*m_buffer);
         m_document_settings.obby_start(*m_buffer);
 
@@ -390 +391 @@
 
         // Tell GUI components that the session ended
-        m_folder.obby_end();
         m_document_settings.obby_end();
 
@@ -539 +539 @@
 }
 
+#if 0
 void Gobby::Window::on_folder_document_add(DocWindow& window)
 {
@@ -600 +601 @@
         update_title_bar();
 }
+#endif
 
 void Gobby::Window::on_settings_document_insert(LocalDocumentInfo& info)
@@ -703 +705 @@
                 );
         }
-
+#if 0
         // Is there already a path for this document?
         std::string path = m_document_settings.get_path(doc->get_info() );
@@ -723 +725 @@
                 return handle_document_save_as();
         }
+#endif
 }
 
@@ -749 +752 @@
         );
 
+#if 0
         // TODO: Preselect document's encoding
         dlg.get_selector().set_encoding(
@@ -794 +798 @@
         }
         return false;
+#endif
 }
 
@@ -983 +988 @@
 {
         // Tell user join to components
-        m_folder.obby_user_join(user);
+        //m_folder.obby_user_join(user);
 }
 
@@ -989 +994 @@
 {
         // Tell user part to components
-        m_folder.obby_user_part(user);
+        //m_folder.obby_user_part(user);
 }
 
 void Gobby::Window::on_obby_user_colour(const obby::user& user)
 {
-        m_folder.obby_user_colour(user);
+        //m_folder.obby_user_colour(user);
 }
 
@@ -1007 +1012 @@
                 dynamic_cast<LocalDocumentInfo&>(document);
 
-        m_folder.obby_document_insert(local_doc);
+        //m_folder.obby_document_insert(local_doc);
 }
 
@@ -1015 +1020 @@
                 dynamic_cast<LocalDocumentInfo&>(document);
 
-        m_folder.obby_document_remove(local_doc);
+        //m_folder.obby_document_remove(local_doc);
 }
 
@@ -1069 +1074 @@
         const DocWindow& window = *get_current_document();
         // Get title of current document
-        const Glib::ustring& file = window.get_info().get_suffixed_title();
+        const Glib::ustring& file = window.get_title();
         // Get path of current document
-        Glib::ustring path = m_document_settings.get_path(window.get_info() );
+        Glib::ustring path;// = m_document_settings.get_path(window.get_info() );
 
         // Show path in title, if we know it
@@ -1082 +1087 @@
 
                 // Set title with file and path
-                obby::format_string title_str("%0% (%1%) - Gobby");
+                obby::format_string title_str("%0% (%1%)");
                 title_str << file << Glib::path_get_dirname(path);
                 set_title(title_str.str() );
@@ -1089 +1094 @@
         {
                 // Path not known: Set title with file only
-                obby::format_string title_str("%0% - Gobby");
+                obby::format_string title_str("%0%");
                 title_str << file;
                 set_title(title_str.str() );
@@ -1303 +1308 @@
                                     const std::string& encoding)
 {
+#if 0
         try
         {
@@ -1345 +1351 @@
                 display_error(e.what() );
         }
+#endif
 }
 
@@ -1351 +1358 @@
                                     const std::string& encoding)
 {
+#if 0
         try
         {
@@ -1381 +1389 @@
                 // Unset modifified flag
                 gtk_text_buffer_set_modified(
-                        GTK_TEXT_BUFFER(doc.get_document().get_buffer()),
+                        GTK_TEXT_BUFFER(doc.get_text_buffer()),
                         FALSE);
         }
@@ -1392 +1400 @@
                 display_error(e.what() );
         }
+#endif
 }
 
 void Gobby::Window::close_document(DocWindow& window)
 {
+#if 0
         /* Cannot unsubscribe when not subscribed (e.g. unsubscription request
          * has already been sent. */
@@ -1477 +1487 @@
 
         window.get_info().unsubscribe();
+#endif
 }