Author: rpmcruz
Date: Tue Oct 7 18:53:59 2008
New Revision: 51941
URL: http://svn.opensuse.org/viewcvs/yast?rev=51941&view=rev
Log:
* src/YGPackageSelector.cc: moved details pane back to fit the
all bottom side.
* src/ygtkhtmlwrap.c: added support for WebKit. (compilation seems to
break due to some -l missing.)
Modified:
trunk/gtk/ChangeLog
trunk/gtk/configure.in.in
trunk/gtk/src/Makefile.am
trunk/gtk/src/YGPackageSelector.cc
trunk/gtk/src/ygtkhtmlwrap.c
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51941&r1=51940&r2=51941&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Oct 7 18:53:59 2008
@@ -1,3 +1,11 @@
+2008-10-07 Ricardo Cruz
+
+ * src/YGPackageSelector.cc: moved details pane back to fit the
+ all bottom side.
+
+ * src/ygtkhtmlwrap.c: added support for WebKit. (compilation seems to
+ break due to some -l missing.)
+
2008-10-06 Ricardo Cruz
* src/ygtkwizard.h/.c: collapse all button functions and accept button
Modified: trunk/gtk/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/configure.in.in?rev=51941&r1=51940&r2=51941&view=diff
==============================================================================
--- trunk/gtk/configure.in.in (original)
+++ trunk/gtk/configure.in.in Tue Oct 7 18:53:59 2008
@@ -30,9 +30,6 @@
AC_FUNC_ALLOCA
AC_HEADER_STDC
-PKG_CHECK_MODULES( ZYPP, libzypp )
-AC_SUBST(ZYPP_LIBS)
-
PKG_CHECK_MODULES( GTK, gtk+-2.0 glib-2.0 gthread-2.0 gobject-2.0 )
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -45,6 +42,14 @@
#AC_SUBST(GTKHTML_LIBS)
#AC_DEFINE(USE_GTKHTML, 1, [will use GtkHtml as the HTML renderer])
+# TODO: we may want to check if WebKit is installed and set its flag
+#dnl Check if WebKit is installed
+#AC_MSG_CHECKING([for webkit])
+#PKG_CHECK_MODULES( WEBKIT, webkit-1.0 )
+#AC_SUBST(WEBKIT_CFLAGS)
+#AC_SUBST(WEBKIT_LIBS)
+#AC_DEFINE(USE_WEBKIT, 1, [will use WebKit as the HTML renderer])
+
PKG_CHECK_MODULES( ZYPP, libzypp )
AC_SUBST(ZYPP_LIBS)
Modified: trunk/gtk/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=51941&r1=51940&r2=51941&view=diff
==============================================================================
--- trunk/gtk/src/Makefile.am (original)
+++ trunk/gtk/src/Makefile.am Tue Oct 7 18:53:59 2008
@@ -14,7 +14,7 @@
libpy2gtk_la_LDFLAGS = -version-info 2:0 -Wl,--no-undefined
libpy2gtk_la_LIBADD = -L$(plugindir) -L$(libdir) -lycp -ly2 -lyui -lm \
- $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) -ly2util
+ $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) $(WEBKIT_LIBS) -ly2util
libpy2gtk_la_SOURCES = \
Y2CCGtk.cc \
YGUtils.cc \
@@ -73,7 +73,7 @@
test_SOURCES = test.cc
test_LDADD = $(top_builddir)/src/$(plugin_LTLIBRARIES)
-INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS)
+INCLUDES = -I$(srcdir)/include -I$(includedir) -I$(includedir)/yui $(ZYPP_CFLAGS) $(GTKHTML_CFLAGS) $(WEBKIT_CFLAGS)
EXTRA_DIST = \
icons/pkg-available-locked.xpm \
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=51941&r1=51940&r2=51941&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 7 18:53:59 2008
@@ -2418,20 +2418,20 @@
gtk_box_pack_start (GTK_BOX (m_details_box), m_details->getWidget(), TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (m_details_box), m_control->getWidget(), FALSE, TRUE, 0);
- GtkWidget *packages_pane = gtk_vpaned_new();
- gtk_paned_pack1 (GTK_PANED (packages_pane), packages_box, TRUE, FALSE);
- gtk_paned_pack2 (GTK_PANED (packages_pane), m_details_box, FALSE, FALSE);
- gtk_paned_set_position (GTK_PANED (packages_pane), 30000 /* minimal size */);
-
- GtkWidget *pane = gtk_hpaned_new();
- gtk_paned_pack1 (GTK_PANED (pane), categories_box, FALSE, TRUE);
- gtk_paned_pack2 (GTK_PANED (pane), packages_pane, TRUE, FALSE);
- gtk_paned_set_position (GTK_PANED (pane), 180);
+ GtkWidget *categories_pane = gtk_hpaned_new();
+ gtk_paned_pack1 (GTK_PANED (categories_pane), categories_box, FALSE, TRUE);
+ gtk_paned_pack2 (GTK_PANED (categories_pane), packages_box, TRUE, FALSE);
+ gtk_paned_set_position (GTK_PANED (categories_pane), 180);
+
+ GtkWidget *details_pane = gtk_vpaned_new();
+ gtk_paned_pack1 (GTK_PANED (details_pane), categories_pane, TRUE, FALSE);
+ gtk_paned_pack2 (GTK_PANED (details_pane), m_details_box, FALSE, FALSE);
+ gtk_paned_set_position (GTK_PANED (details_pane), 30000 /* minimal size */);
m_box = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (m_box), m_filters->getStatusesWidget(),
FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (m_box), pane, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (m_box), details_pane, TRUE, TRUE, 0);
gtk_widget_show_all (m_box);
m_changes->startHack();
Modified: trunk/gtk/src/ygtkhtmlwrap.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhtmlwrap.c?rev=51941&r1=51940&r2=51941&view=diff
==============================================================================
--- trunk/gtk/src/ygtkhtmlwrap.c (original)
+++ trunk/gtk/src/ygtkhtmlwrap.c Tue Oct 7 18:53:59 2008
@@ -10,21 +10,21 @@
#include
#include "ygtkhtmlwrap.h"
+//#define USE_YGTKRICHTEXT
+//#define USE_GTKHTML
+//#define USE_WEBKIT
+
// ygutils
#include
void ygutils_scrollView (GtkTextView *view, gboolean top);
void ygutils_scrollAdj (GtkAdjustment *vadj, gboolean top);
-
GtkWidget *ygtk_html_wrap_new (void)
-{
- return g_object_new (ygtk_html_wrap_get_type(), NULL);
-}
+{ return g_object_new (ygtk_html_wrap_get_type(), NULL); }
-// GtkHTML
#ifdef USE_GTKHTML
-#include
-#include
-#include
+#include
+#include
+#include
GType ygtk_html_wrap_get_type (void)
{
@@ -90,7 +90,60 @@
g_signal_connect (G_OBJECT (widget), "link-clicked", callback, data);
}
-// YGtkRichText
+//** WebKit
+#else
+#if USE_WEBKIT
+#include
+
+GType ygtk_html_wrap_get_type()
+{
+ return WEBKIT_TYPE_WEB_VIEW;
+}
+
+void ygtk_html_wrap_init (GtkWidget *widget)
+{
+}
+
+void ygtk_html_wrap_set_text (GtkWidget *widget, const gchar* text, gboolean plain_mode)
+{
+ webkit_web_view_load_html_string (WEBKIT_WEB_VIEW (widget), text, ".");
+}
+
+void ygtk_html_wrap_scroll (GtkWidget *widget, gboolean top)
+{
+ // TODO
+}
+
+gboolean ygtk_html_wrap_search (GtkWidget *widget, const gchar *text)
+{
+ WebKitWebView *view = WEBKIT_WEB_VIEW (widget);
+ gboolean found = webkit_web_view_mark_text_matches (view, text, FALSE, -1);
+ webkit_web_view_set_highlight_text_matches (view, TRUE);
+ return found;
+}
+
+gboolean ygtk_html_wrap_search_next (GtkWidget *widget, const gchar *text)
+{
+ WebKitWebView *view = WEBKIT_WEB_VIEW (widget);
+ return webkit_web_view_search_text (view, text, FALSE, TRUE, TRUE);
+}
+
+static gpointer data2;
+static WebKitNavigationResponse ygtk_webkit_navigation_requested_cb (
+ WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRequest *request, void (*callback) (gpointer d))
+{
+ (*callback) (data2);
+ return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+}
+
+void ygtk_html_wrap_connect_link_clicked (GtkWidget *widget, GCallback callback, gpointer data)
+{
+ data2 = data;
+ g_signal_connect (G_OBJECT (widget), "navigation-requested",
+ G_CALLBACK (ygtk_webkit_navigation_requested_cb), callback);
+}
+
+//** YGtkRichText
#else
#include "ygtkrichtext.h"
@@ -131,4 +184,5 @@
}
#endif
+#endif
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
