From 14d6f12d8cfaaf41c36772c7fef2cfd3c8687a99 Mon Sep 17 00:00:00 2001 From: mutantturkey Date: Thu, 19 May 2011 21:13:06 -0400 Subject: hmmm messed around with gtk3, it sucks LOL. back to gtk2, shouldnt be be any real changes here. --- sb.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/sb.c b/sb.c index b924d6a..972f8bf 100644 --- a/sb.c +++ b/sb.c @@ -178,23 +178,10 @@ gtk_container_add(GTK_CONTAINER(t->scroll), GTK_WIDGET(t->view)); int index = gtk_notebook_append_page(w.notebook, t->scroll, t->label); gtk_notebook_set_tab_reorderable(w.notebook, t->scroll, TRUE); -//if ( gtk_notebook_get_n_pages(w.notebook) == 1) { } if (index == 0) { gtk_notebook_set_show_tabs(w.notebook, FALSE); } else { gtk_notebook_set_show_tabs(w.notebook, TRUE); } -stylesheet = g_strconcat("file://", g_get_home_dir(), "/", DEFAULT_STYLE_SHEET, NULL); - -g_object_set(G_OBJECT(w.webkitsettings), "enable-page-cache", TRUE, - "enable-java-applet", FALSE, - "user-stylesheet-uri", stylesheet , NULL); - -g_free(stylesheet); - -gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, ""); -gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER); - -webkit_web_view_set_zoom_level(t->view, DEFAULT_ZOOM_LEVEL); /*callbacks*/ g_object_connect (G_OBJECT (t->view), "signal::title-changed", G_CALLBACK (cb_title_changed), t, @@ -204,6 +191,21 @@ g_object_connect (G_OBJECT (t->view), "signal::title-changed", G_CALLBACK (cb_ti "signal::create-web-view", G_CALLBACK (tab_new_requested), NULL, NULL); /*settings*/ +webkit_web_view_set_highlight_text_matches(t->view, TRUE); +webkit_web_view_set_zoom_level(t->view, DEFAULT_ZOOM_LEVEL); +gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(t->scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER); + +stylesheet = g_strconcat("file://", g_get_home_dir(), "/", DEFAULT_STYLE_SHEET, NULL); + +g_object_set(G_OBJECT(w.webkitsettings), "enable-page-cache", TRUE, + "enable-java-applet", FALSE, + "user-stylesheet-uri", stylesheet , NULL); +g_free(stylesheet); + + +/* setup widgets */ + +gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, ""); g_object_set_qdata_full(G_OBJECT(gtk_notebook_get_nth_page((GtkNotebook*)w.notebook, index)), term_data_id, t, NULL); gtk_widget_show_all(w.win); @@ -228,7 +230,7 @@ g_free(command); /*focus on tab after switching, aka title, statusbar, view, etc */ -void tab_focus(GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data) { +void tab_focus(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data) { gtk_statusbar_push(GTK_STATUSBAR(w.status), 0, ""); struct tab *t = get_tab(NULL, page_num); @@ -269,7 +271,7 @@ gtk_entry_set_has_frame(GTK_ENTRY(w.bar), FALSE); gtk_notebook_set_scrollable(w.notebook, TRUE); gtk_notebook_set_show_border(w.notebook, FALSE); -gtk_notebook_set_tab_border(w.notebook, 0); +//gtk_notebook_set_tab_border(w.notebook, 0); gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(w.status), FALSE); -- cgit v1.2.1