From c544a52e18c5aae130002d05aca62940ba744597 Mon Sep 17 00:00:00 2001 From: Mirko Lindner Date: Fri, 26 Mar 2010 15:27:29 +0100 Subject: [PATCH] fix commands Signed-off-by: Mirko Lindner --- src/vido.cc | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/vido.cc b/src/vido.cc index 5320c99..969317c 100644 --- a/src/vido.cc +++ b/src/vido.cc @@ -111,6 +111,7 @@ void show_help() txt += "Ctrl + Q = Quit Vido\n"; txt += "F1 = Display this help\n"; show_message(title, txt); + window2->connect_all(); } // fill gtkhtml widget with new content @@ -155,7 +156,6 @@ void fill_gtkhtml(std::string& html_str, std::string url, std::string title){ } // gtk_html_get_selection_html(GTK_HTML(html_wg), ) - window2->resize(320,240); while( Gtk::Main::events_pending() ){ Gtk::Main::iteration(); } @@ -234,7 +234,7 @@ void show_random() // window2->disconnect_all(); screenblock(1); - log_debug("random called. window all disconnected"); +// log_debug("random called. window all disconnected"); zim::File m = get_file(); zim::Article article; do @@ -278,6 +278,7 @@ void GoToTop() log_debug("go to top called"); std::string term = "top"; bool success = gtk_html_jump_to_anchor(GTK_HTML(html_wg), const_cast(term.c_str())); + window2->connect_all(); } // // // meta functions @@ -446,10 +447,6 @@ bool scrolled(GtkHTML *cb_html, GtkOrientation orientation, GtkScrollType scroll //static void gtk_html_adjust_cursor_position (GtkHTML *html) } -void motion( GdkEventMotion *event) -{ - log_debug("motion"); -} // // main function int main(int argc, char **argv) { @@ -477,15 +474,9 @@ int main(int argc, char **argv) g_signal_connect( G_OBJECT( html_wg ), "link_clicked", G_CALLBACK( on_link_clicked ), NULL ); g_signal_connect( G_OBJECT( html_wg ), "scroll", G_CALLBACK( scrolled ), NULL ); gtk_html_set_caret_mode(GTK_HTML(html_wg),false); - gtk_widget_set_events(html_wg, 0x3FFFFE); - gtk_signal_connect (GTK_OBJECT (html_wg), "resize", - GTK_SIGNAL_FUNC (motion), NULL); -// g_signal_connect( G_OBJECT( html_wg ), "event", G_CALLBACK( motion ), NULL ); - // gtk_html_adjust_cursor_position(GTK_HTML(html_wg)); Gtk::ScrolledWindow scrolled_window; scrolled_window2 = &scrolled_window; - scrolled_window.set_resize_mode(Gtk::RESIZE_PARENT); scrolled_window.add(*html); scrolled_window.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -494,8 +485,6 @@ int main(int argc, char **argv) position = 0; show_random(); gtk_html_edit_make_cursor_visible(GTK_HTML(html_wg)); -// html.add_events (Gdk::ALL_EVENTS_MASK); -// html.signal_motion_notify_event().connect_notify(sigc::ptr_fun(motion)); Gtk::Main::run(window); } else