Changeset 5843bef6491135d10a76ef9cfcff060e6fed5b76

Timestamp:

01/06/07 23:54:54 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

1a0b6bc09de14029de094c8310a865f46f664179

Children:

da7de63fd4f82cb0f1078a0f954c3f09e2ee50bc

git-committer:

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

Message:

[project @ Goto line Dialog [fixes #79]]

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

Files:

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

Makefile.am

@@ -48 +48 @@
 noinst_HEADERS += inc/entrydialog.hpp
 noinst_HEADERS += inc/finddialog.hpp
+noinst_HEADERS += inc/gotodialog.hpp
 noinst_HEADERS += inc/dragdrop.hpp
 noinst_HEADERS += inc/window.hpp 
@@ -102 +103 @@
 gobby_SOURCES += src/entrydialog.cpp
 gobby_SOURCES += src/finddialog.cpp
+gobby_SOURCES += src/gotodialog.cpp
 gobby_SOURCES += src/dragdrop.cpp
 gobby_SOURCES += src/window.cpp

inc/finddialog.hpp

@@ -45 +45 @@
         void set_search_only(bool search_only);
 protected:
+        virtual void on_show();
+
         virtual void on_find();
         virtual void on_replace();
@@ -123 +125 @@
 }
 
-#endif // _GOBBY_JOINDIALOG_HPP_
+#endif // _GOBBY_FINDDIALOG_HPP_

inc/header.hpp

@@ -103 +103 @@
         const Glib::RefPtr<Gtk::Action> action_edit_search;
         const Glib::RefPtr<Gtk::Action> action_edit_search_replace;
+        const Glib::RefPtr<Gtk::Action> action_edit_goto_line;
         const Glib::RefPtr<Gtk::Action> action_edit_preferences;
 

inc/window.hpp

@@ -30 +30 @@
 #include "header.hpp"
 #include "docwindow.hpp"
-#include "folder.hpp"
-#include "finddialog.hpp"
 #include "userlist.hpp"
 #include "documentlist.hpp"
+#include "finddialog.hpp"
+#include "gotodialog.hpp"
+#include "folder.hpp"
 #include "chat.hpp"
 #include "statusbar.hpp"
@@ -86 +87 @@
         void on_edit_search();
         void on_edit_search_replace();
+        void on_edit_goto_line();
         void on_edit_preferences();
 
@@ -138 +140 @@
 
         Header m_header;
-        FindDialog m_finddialog;
         UserList m_userlist;
         DocumentList m_documentlist;
+
+        FindDialog m_finddialog;
+        GotoDialog m_gotodialog;
 
         Folder m_folder;

src/finddialog.cpp

@@ -47 +47 @@
         m_check_regex(_("Match as regular expression")),
         m_frame_direction(_("Direction")),
-        m_radio_up(m_group_direction, _("Up")),
-        m_radio_down(m_group_direction, _("Down")),
+        m_radio_up(m_group_direction, _("_Up"), true),
+        m_radio_down(m_group_direction, _("_Down"), true),
         m_btn_find(Gtk::Stock::FIND),
-        m_btn_replace(_("Replace") ),
-        m_btn_replace_all(_("Replace all") ),
+        m_btn_replace(_("_Replace") ),
+        m_btn_replace_all(_("Replace _all") ),
         m_btn_close(Gtk::Stock::CLOSE),
         m_regex("")
@@ -93 +93 @@
         m_hbox.pack_start(m_box_options);
         m_hbox.pack_start(m_frame_direction, Gtk::PACK_SHRINK);
+        m_hbox.set_spacing(10);
 
         m_box_options.pack_start(m_check_whole_word, Gtk::PACK_EXPAND_WIDGET);
@@ -133 +134 @@
                 sigc::mem_fun(*this, &FindDialog::on_replace_all) );
 
-        set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
+        GTK_WIDGET_SET_FLAGS(m_btn_find.gobj(), GTK_CAN_DEFAULT);
+        set_default(m_btn_find);
+
         set_border_width(16);
 
-//      set_skip_pager_hint(true);
-//      set_skip_taskbar_hint(true);
-
         set_resizable(false);
-        set_transient_for(parent);
         show_all_children();
 
@@ -158 +157 @@
 
         set_title(search_only ? _("Search") : _("Search and replace") );
+}
+
+void Gobby::FindDialog::on_show()
+{
+        ToolWindow::on_show();
+        m_entry_find.grab_focus();
 }
 

src/header.cpp

@@ -47 +47 @@
                 "      <menuitem action=\"EditSearchReplace\" />"
                 "      <separator />"
+                "      <menuitem action=\"EditGotoLine\" />"
+                "      <separator />"
                 "      <menuitem action=\"EditPreferences\" />"
                 "    </menu>"
@@ -281 +283 @@
         ),
 
+        action_edit_goto_line(
+                Gtk::Action::create(
+                        "EditGotoLine",
+                        Gtk::Stock::JUMP_TO,
+                        _("Go to line..."),
+                        _("Move cursor to a specified line")
+                )
+        ),
+
         action_edit_preferences(
                 Gtk::Action::create(
@@ -379 +390 @@
         group_edit->add(action_edit_search);
         group_edit->add(action_edit_search_replace);
+        group_edit->add(action_edit_goto_line, Gtk::AccelKey("<control>I") );
         group_edit->add(action_edit_preferences);
 

src/toolwindow.cpp

@@ -22 +22 @@
         Gtk::Window(Gtk::WINDOW_TOPLEVEL)
 {
-        set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
+        set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
         set_transient_for(parent);
         set_position(Gtk::WIN_POS_CENTER_ON_PARENT);

src/window.cpp

@@ -57 +57 @@
 #endif
    m_header(),
-   m_finddialog(*this),
    m_userlist(*this, m_header, m_preferences, config["windows"]),
    m_documentlist(*this, m_header, m_preferences, config["windows"]),
+   m_finddialog(*this), m_gotodialog(*this),
    m_folder(m_header, m_preferences),
    m_statusbar(m_header, m_folder)
@@ -90 +90 @@
         m_header.action_edit_search_replace->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_edit_search_replace) );
+        m_header.action_edit_goto_line->signal_activate().connect(
+                sigc::mem_fun(*this, &Window::on_edit_goto_line) );
         m_header.action_edit_preferences->signal_activate().connect(
                 sigc::mem_fun(*this, &Window::on_edit_preferences) );
@@ -755 +757 @@
 }
 
+void Gobby::Window::on_edit_goto_line()
+{
+        m_gotodialog.show();
+        m_gotodialog.grab_focus();
+}
+
 void Gobby::Window::on_edit_preferences()
 {