Changeset a78113f8b06bcdc8bc7c7355d36814b7cc1145c7

Timestamp:

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

Author:

Philipp Kern <phil@…>

Parents:

e6056f860d6b4e233fc2344816c066cc53e3d089

Children:

0586368ef50fee5ed7de7b6e77e1118c58e6b267

git-committer:

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

Message:

[project @ Non-working FindDialog?]

Original author: Armin Burgmeier <armin@…>
Date: 2005-11-13 17:13:20+00:00

Files:

• Makefile.am (modified) (4 diffs)
• inc/finddialog.hpp (added)
• inc/header.hpp (modified) (1 diff)
• inc/window.hpp (modified) (4 diffs)
• src/finddialog.cpp (added)
• src/header.cpp (modified) (3 diffs)
• src/window.cpp (modified) (14 diffs)

Makefile.am

@@ -22 +22 @@
 noinst_HEADERS += inc/encoding.hpp
 noinst_HEADERS += inc/mimemap.hpp
+noinst_HEADERS += inc/regex.hpp
 noinst_HEADERS += inc/defaultdialog.hpp
 noinst_HEADERS += inc/historyentry.hpp
@@ -45 +46 @@
 noinst_HEADERS += inc/hostprogressdialog.hpp
 noinst_HEADERS += inc/entrydialog.hpp
+noinst_HEADERS += inc/finddialog.hpp
 noinst_HEADERS += inc/window.hpp 
 noinst_HEADERS += inc/sourceview/sourceview.hpp
@@ -72 +74 @@
 gobby_SOURCES += src/encoding.cpp
 gobby_SOURCES += src/mimemap.cpp
+gobby_SOURCES += src/regex.cpp
 gobby_SOURCES += src/defaultdialog.cpp
 gobby_SOURCES += src/historyentry.cpp
@@ -95 +98 @@
 gobby_SOURCES += src/hostprogressdialog.cpp
 gobby_SOURCES += src/entrydialog.cpp
+gobby_SOURCES += src/finddialog.cpp
 gobby_SOURCES += src/window.cpp
 gobby_SOURCES += src/main.cpp

inc/header.hpp

@@ -101 +101 @@
 
         const Glib::RefPtr<Gtk::Action> action_edit;
+        const Glib::RefPtr<Gtk::Action> action_edit_search;
+        const Glib::RefPtr<Gtk::Action> action_edit_search_replace;
         const Glib::RefPtr<Gtk::Action> action_edit_preferences;
 

inc/window.hpp

@@ -29 +29 @@
 #include "docwindow.hpp"
 #include "folder.hpp"
+#include "finddialog.hpp"
 #include "userlist.hpp"
 #include "documentlist.hpp"
@@ -47 +48 @@
         ~Window();
 
-        Document& get_current_document();
+        Document* get_current_document();
 protected:
         // Gtk::Window overrides
@@ -68 +69 @@
         void on_document_close();
 
+        void on_edit_search();
+        void on_edit_search_replace();
         void on_edit_preferences();
 
@@ -129 +132 @@
 
         Header m_header;
+        FindDialog m_finddialog;
         UserList m_userlist;
         DocumentList m_documentlist;

src/header.cpp

@@ -44 +44 @@
                 "    </menu>"
                 "    <menu action=\"MenuEdit\">"
+                "      <menuitem action=\"EditSearch\" />"
+                "      <menuitem action=\"EditSearchReplace\" />"
+                "      <separator />"
                 "      <menuitem action=\"EditPreferences\" />"
                 "    </menu>"
@@ -260 +263 @@
         action_edit(Gtk::Action::create("MenuEdit", _("Edit")) ),
 
+        action_edit_search(
+                Gtk::Action::create(
+                        "EditSearch",
+                        Gtk::Stock::FIND,
+                        _("Find..."),
+                        _("Search for text in the a document")
+                )
+        ),
+
+        action_edit_search_replace(
+                Gtk::Action::create(
+                        "EditSearchReplace",
+                        Gtk::Stock::FIND_AND_REPLACE,
+                        _("Find and replace..."),
+                        _("Search for text and replace it with another one")
+                )
+        ),
+
         action_edit_preferences(
                 Gtk::Action::create(
@@ -356 +377 @@
 
         group_edit->add(action_edit);
+        group_edit->add(action_edit_search);
+        group_edit->add(action_edit_search_replace);
         group_edit->add(action_edit_preferences);
 

src/window.cpp

@@ -57 +57 @@
 #endif
    m_header(),
+   m_finddialog(*this),
    m_userlist(*this, m_header),
    m_documentlist(*this, m_header),
@@ -85 +86 @@
                 sigc::mem_fun(*this, &Window::on_document_close) );
 
+        m_header.action_edit_search->signal_activate().connect(
+                sigc::mem_fun(*this, &Window::on_edit_search) );
+        m_header.action_edit_search_replace->signal_activate().connect(
+                sigc::mem_fun(*this, &Window::on_edit_search_replace) );
         m_header.action_edit_preferences->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_edit_preferences) );
@@ -603 +608 @@
 {
         // Get page
-        Document& doc = get_current_document();
+        Document* doc = get_current_document();
+        if(doc == NULL)
+                throw std::logic_error("Gobby::Window::on_document_save");
 
         // Is there already a path for this document?
-        if(!doc.get_path().empty() )
+        if(!doc->get_path().empty() )
                 // Yes, so save the document there
-                save_local_file(doc, doc.get_path() );
+                save_local_file(*doc, doc->get_path() );
         else
                 // Open save as dialog otherwise
@@ -617 +624 @@
 {
         // Get page
-        Document& doc = get_current_document();
+        Document* doc = get_current_document();
+        if(doc == NULL)
+                throw std::logic_error("Gobby::Window::on_document_save_as");
 
         // Setup dialog
@@ -628 +637 @@
 
         // Does the document have already a path?
-        if(!doc.get_path().empty() )
+        if(!doc->get_path().empty() )
         {
                 // Yes, so set it as filename
-                dlg.set_filename(doc.get_path() );
+                dlg.set_filename(doc->get_path() );
         }
         else
@@ -639 +648 @@
                         dlg.set_current_folder(m_last_path);
                 // Set current title as proposed file name
-                dlg.set_current_name(doc.get_title() );
+                dlg.set_current_name(doc->get_title() );
         }
 
@@ -651 +660 @@
                 m_last_path = dlg.get_current_folder();
                 // Save document
-                save_local_file(doc, dlg.get_filename() );
+                save_local_file(*doc, dlg.get_filename() );
         }
 }
@@ -661 +670 @@
         // Close it
         close_document(*static_cast<DocWindow*>(page) );
+}
+
+void Gobby::Window::on_edit_search()
+{
+        m_finddialog.set_search_only(true);
+        m_finddialog.show();
+        m_finddialog.grab_focus();
+}
+
+void Gobby::Window::on_edit_search_replace()
+{
+        m_finddialog.set_search_only(false);
+        m_finddialog.show();
+        m_finddialog.grab_focus();
 }
 
@@ -754 +777 @@
 {
         // Get current page
-        Document& doc = get_current_document();
+        Document* doc = get_current_document();
+        if(doc == NULL)
+                throw std::logic_error("Gobby::Window::on_view_preferences");
 
         // Add preferences dialog
-        PreferencesDialog dlg(*this, doc.get_preferences(), true);
+        PreferencesDialog dlg(*this, doc->get_preferences(), true);
 
         // Label text
@@ -767 +792 @@
 
         // Get title
-        str << doc.get_title();
+        str << doc->get_title();
 
         // Info label
@@ -782 +807 @@
         {
                 // Apply new preferences to the document
-                doc.set_preferences(dlg.preferences() );
+                doc->set_preferences(dlg.preferences() );
         }
 }
@@ -790 +815 @@
 {
         // Set language of current document
-        get_current_document().set_language(lang);
+        Document* doc = get_current_document();
+        if(doc == NULL)
+                throw std::logic_error("Gobby::Window::on_view_language");
+
+        doc->set_language(lang);
 }
 
@@ -900 +929 @@
 }
 
-Gobby::Document& Gobby::Window::get_current_document()
-{
+Gobby::Document* Gobby::Window::get_current_document()
+{
+        // No document open
+        if(m_folder.get_n_pages() == 0) return NULL;
+
         // Get currently selected page
         Widget* page = m_folder.get_nth_page(m_folder.get_current_page() );
         // Convert to document
-        return static_cast<DocWindow*>(page)->get_document();
+        return &static_cast<DocWindow*>(page)->get_document();
 }
 
@@ -924 +956 @@
 
         // Get currently active document
-        const Document& document = get_current_document();
+        const Document& document = *get_current_document();
         // Get title of current document
         const Glib::ustring& file = document.get_document().get_title();