Changeset 0d4c360cbbfc5187268be2e67b94a01887ec41ec

Timestamp:

01/06/07 23:42:10 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

5a41a0aff9b1b43c3fdffdac6b31b3d9dbbe1fa0

Children:

8571726ba74bdfebda4c156df2a0b0cc3056f7de

git-committer:

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

Message:

[project @ A cleanup patch to fix hundreds of conflicts]

Original author: Philipp Kern <phil@…>
Date: 2005-07-22 12:56:25+00:00

Files:

• inc/document.hpp (modified) (2 diffs)
• inc/header.hpp (modified) (5 diffs)
• inc/preferencesdialog.hpp (modified) (2 diffs)
• src/document.cpp (modified) (7 diffs)
• src/folder.cpp (modified) (2 diffs)
• src/header.cpp (modified) (13 diffs)
• src/preferencesdialog.cpp (modified) (1 diff)
• src/window.cpp (modified) (2 diffs)

inc/document.hpp

@@ -87 +87 @@
 v v v v v v v
 *************
+v v v v v v v
+*************
         /** Returns whether the document is displayed with the words wrapped
          * to the window's width.
@@ -104 +106 @@
         void set_show_line_numbers(bool show);
 
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         /** Signal which will be emitted if the cursor's position changed.

inc/header.hpp

@@ -60 +60 @@
         typedef sigc::signal<void> signal_user_set_password_type;
 v v v v v v v
+*************
+v v v v v v v
         typedef sigc::signal<void> signal_document_word_wrap_type;
         typedef sigc::signal<void> signal_document_line_numbers_type;
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         typedef sigc::signal<void, const Glib::RefPtr<Gtk::SourceLanguage>&>
@@ -92 +95 @@
         signal_user_set_password_type user_set_password_event() const;
 v v v v v v v
+*************
+v v v v v v v
         signal_document_word_wrap_type document_word_wrap_event() const;
         signal_document_line_numbers_type document_line_numbers_event() const;
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         signal_document_language_type document_language_event() const;
@@ -121 +127 @@
         void on_app_user_set_password();
 v v v v v v v
+*************
+v v v v v v v
         void on_app_document_word_wrap();
         void on_app_document_line_numbers();
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         void on_app_document_language(Glib::RefPtr<Gtk::SourceLanguage> lang);
@@ -145 +154 @@
         bool m_toggle_language;
 v v v v v v v
+*************
+v v v v v v v
         bool m_toggle_line_numbers;
         bool m_toggle_word_wrap;
 *************
 #endif
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
 
@@ -167 +179 @@
         signal_user_set_password_type m_signal_user_set_password;
 v v v v v v v
+*************
+v v v v v v v
         signal_document_word_wrap_type m_signal_document_word_wrap;
         signal_document_line_numbers_type m_signal_document_line_numbers;
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         signal_document_language_type m_signal_document_language;

inc/preferencesdialog.hpp

@@ -106 +106 @@
         };
 
+v v v v v v v
+        class Security : public Page
+        {
+        public:
+                Security(Config& config);
+                ~Security();
+
+                // Fetch the key components
+        protected:
+                virtual void on_response(int response_id);
+
+                Gtk::VBox m_box;
+
+                Gtk::VBox m_box_key;
+                // Display the current public key ID and let the user the
+                // opportunity to regenerate it.
+        };
+
+        PreferencesDialog(Gtk::Window& parent, const Preferences& preferences);
+*************
         class Security : public Page
         {
@@ -122 +142 @@
 
         PreferencesDialog(Gtk::Window& parent, const Preferences& preferences);
+^ ^ ^ ^ ^ ^ ^
         ~PreferencesDialog();
 

src/document.cpp

@@ -29 +29 @@
 
 v v v v v v v
+Gobby::Document::Document(obby::local_document_info& doc, const Folder& folder,
+                          const Preferences& preferences)
+*************
+v v v v v v v
 Gobby::Document::Document(obby::local_document_info& doc, const Folder& folder)
 *************
@@ -35 +39 @@
 #ifdef WITH_GTKSOURCEVIEW
 ^ ^ ^ ^ ^ ^ ^
+^ ^ ^ ^ ^ ^ ^
  : Gtk::SourceView(),
+v v v v v v v
+   m_doc(doc), m_folder(folder), m_preferences(preferences), m_editing(true),
+*************
 v v v v v v v
    m_doc(doc), m_folder(folder), m_editing(true),
@@ -43 +51 @@
 #endif
    m_doc(doc), m_folder(folder), m_preferences(preferences), m_editing(true),
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
    m_btn_subscribe(_("Subscribe") )
@@ -225 +234 @@
 v v v v v v v
 *************
+v v v v v v v
+*************
 bool Gobby::Document::get_word_wrapping() const
 {
@@ -248 +259 @@
 }
 
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
 void Gobby::Document::obby_user_join(obby::user& user)
@@ -375 +387 @@
 
 v v v v v v v
-*************
         // Read settings from preferences
         // Editor
@@ -392 +403 @@
         set_show_line_numbers(m_preferences.view.linenum_display);
 
+*************
+v v v v v v v
+*************
+        // Read settings from preferences
+        // Editor
+        set_tabs_width(m_preferences.editor.tab_width);
+        set_insert_spaces_instead_of_tabs(m_preferences.editor.tab_spaces);
+        set_auto_indent(m_preferences.editor.indentation_auto);
+
+        // View
+        if(m_preferences.view.wrap_text)
+                if(m_preferences.view.wrap_words)
+                        set_wrap_mode(Gtk::WRAP_WORD);
+                else
+                        set_wrap_mode(Gtk::WRAP_CHAR);
+        else
+                set_wrap_mode(Gtk::WRAP_NONE);
+        set_show_line_numbers(m_preferences.view.linenum_display);
+
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         // Enable highlighting

src/folder.cpp

@@ -54 +54 @@
 
 v v v v v v v
+Gobby::Folder::Folder(const Preferences& preferences)
+ : Gtk::Notebook(), m_preferences(preferences), m_running(false)
+*************
+v v v v v v v
 Gobby::Folder::Folder()
  : Gtk::Notebook(), m_running(false),
@@ -63 +67 @@
    , m_lang_manager(Gtk::SourceLanguagesManager::create() )
 #endif
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
 {

src/header.cpp

@@ -53 +53 @@
                 "    <menu action=\"MenuView\">"
 v v v v v v v
+*************
+v v v v v v v
                 "      <menuitem action=\"ViewWordWrap\" />"
                 "      <menuitem action=\"ViewLineNumbers\" />"
@@ -58 +60 @@
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
                 "      <menuitem action=\"ViewLanguageNone\" />"
@@ -127 +130 @@
  : m_ui_manager(Gtk::UIManager::create() ),
 v v v v v v v
+   m_group_app(Gtk::ActionGroup::create() ),
+   m_toggle_language(false)
+*************
+v v v v v v v
    m_group_app(Gtk::ActionGroup::create() )
 #ifdef WITH_GTKSOURCEVIEW
@@ -137 +144 @@
    m_toggle_line_numbers(false)
 ^ ^ ^ ^ ^ ^ ^
+^ ^ ^ ^ ^ ^ ^
 {
         // Add basic menu
@@ -297 +305 @@
 
 v v v v v v v
+*************
+v v v v v v v
         // Toggle word wrapping
         m_group_app->add(
@@ -325 +335 @@
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         // A kind of hack to ensure that
@@ -531 +542 @@
 
 v v v v v v v
+*************
+v v v v v v v
 #ifdef WITH_GTKSOURCEVIEW
 *************
@@ -545 +558 @@
 }
 
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
 Gobby::Header::signal_document_language_type
@@ -683 +697 @@
 
 v v v v v v v
+*************
+v v v v v v v
 #ifdef WITH_GTKSOURCEVIEW
 *************
@@ -702 +718 @@
 ^ ^ ^ ^ ^ ^ ^
 
+^ ^ ^ ^ ^ ^ ^
 void Gobby::Header::on_app_document_language(
         Glib::RefPtr<Gtk::SourceLanguage> lang
@@ -725 +742 @@
         // We are toggling some flags
 v v v v v v v
+*************
+v v v v v v v
         m_toggle_word_wrap = true;
         m_toggle_line_numbers = true;
 *************
 #ifdef WITH_GTKSOURCEVIEW
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
         m_toggle_language = true;
@@ -738 +758 @@
         )->set_active(document.get_word_wrapping() );
 
+v v v v v v v
+^ ^ ^ ^ ^ ^ ^
         // Set current line number state
         Glib::RefPtr<Gtk::ToggleAction>::cast_static<Gtk::Action>(
@@ -757 +779 @@
         m_toggle_language = false;
 v v v v v v v
+*************
+v v v v v v v
         m_toggle_word_wrap = false;
 *************
 #endif
+^ ^ ^ ^ ^ ^ ^
 ^ ^ ^ ^ ^ ^ ^
 }

src/preferencesdialog.cpp

@@ -152 +152 @@
 }
 
-Gobby::PreferencesDialog::Security::Security(const Preferences& preferences)
- : Page(preferences)
-{
-}
-
-Gobby::PreferencesDialog::Security::~Security()
-{
+void Gobby::PreferencesDialog::Appearance::on_response(int response_id)
+{
+        if(response_id == Gtk::RESPONSE_OK)
+        {
+        }
 }
 

src/window.cpp

@@ -75 +75 @@
                 sigc::mem_fun(*this, &Window::on_user_set_password) );
 
-        m_header.document_word_wrap_event().connect(
-                sigc::mem_fun(*this, &Window::on_document_word_wrap) );
-#ifdef WITH_GTKSOURCEVIEW
-        m_header.document_line_numbers_event().connect(
-                sigc::mem_fun(*this, &Window::on_document_line_numbers) );
         m_header.document_language_event().connect(
                 sigc::mem_fun(*this, &Window::on_document_language) );
@@ -471 +466 @@
 }
 
-void Gobby::Window::on_document_word_wrap()
-{
-        // Get current page
-        DocWindow& doc_wnd = *static_cast<DocWindow*>(
-                m_folder.get_nth_page(m_folder.get_current_page() )
-        );
-
-        // Toggle word wrapping flag
-        doc_wnd.get_document().set_word_wrapping(
-                !doc_wnd.get_document().get_word_wrapping()
-        );
-}
-
-#ifdef WITH_GTKSOURCEVIEW
-void Gobby::Window::on_document_line_numbers()
-{
-        // Get current page
-        DocWindow& doc_wnd = *static_cast<DocWindow*>(
-                m_folder.get_nth_page(m_folder.get_current_page() )
-        );
-
-        // Toggle line number flag
-        doc_wnd.get_document().set_show_line_numbers(
-                !doc_wnd.get_document().get_show_line_numbers()
-        );
-}
-
 void Gobby::Window::on_document_language(
         const Glib::RefPtr<Gtk::SourceLanguage>& lang