[evince/hildon-2-28] Wrap the properties page in a HildonPannableArea
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince/hildon-2-28] Wrap the properties page in a HildonPannableArea
- Date: Mon, 26 Oct 2009 12:12:24 +0000 (UTC)
commit 036a74d19f36e79ed84cc019c3035fe0b06edec4
Author: Christian Persch <chpe gnome org>
Date: Sat Jun 6 15:49:24 2009 +0200
Wrap the properties page in a HildonPannableArea
shell/ev-properties-dialog.c | 24 ++++++++++++++++++++++++
shell/ev-properties-fonts.c | 11 ++++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index f48b967..720a3a8 100644
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -25,6 +25,11 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#ifdef PLATFORM_HILDON
+#include <hildon/hildon-gtk.h>
+#include <hildon/hildon-pannable-area.h>
+#endif
+
#include "ev-document-fonts.h"
#include "ev-page-cache.h"
#include "ev-properties-dialog.h"
@@ -90,9 +95,28 @@ ev_properties_dialog_set_document (EvPropertiesDialog *properties,
if (properties->general_page == NULL) {
label = gtk_label_new (_("General"));
properties->general_page = ev_properties_view_new (uri);
+
+#ifndef PLATFORM_HILDON
gtk_notebook_append_page (GTK_NOTEBOOK (properties->notebook),
properties->general_page, label);
gtk_widget_show (properties->general_page);
+#else
+ {
+ GtkWidget *viewport, *pannable;
+
+ viewport = gtk_viewport_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (viewport), properties->general_page);
+ gtk_widget_show (properties->general_page);
+
+ pannable = hildon_pannable_area_new ();
+ gtk_container_add (GTK_CONTAINER (pannable), viewport);
+ gtk_widget_show (viewport);
+
+ gtk_notebook_append_page (GTK_NOTEBOOK (properties->notebook),
+ pannable, label);
+ gtk_widget_show (pannable);
+ }
+#endif /* !PLATFORM_HILDON */
}
ev_properties_view_set_info (EV_PROPERTIES_VIEW (properties->general_page), info);
diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 1670616..ae7df67 100644
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -25,6 +25,10 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#ifdef PLATFORM_HILDON
+#include <hildon/hildon-gtk.h>
+#endif
+
#include "ev-document-fonts.h"
#include "ev-job-scheduler.h"
#include "ev-jobs.h"
@@ -118,8 +122,13 @@ ev_properties_fonts_init (EvPropertiesFonts *properties)
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow),
GTK_SHADOW_IN);
-
+
+#ifndef PLATFORM_HILDON
properties->fonts_treeview = gtk_tree_view_new ();
+#else
+ properties->fonts_treeview = hildon_gtk_tree_view_new (HILDON_SIZE_AUTO);
+#endif
+
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (properties->fonts_treeview),
FALSE);
column = gtk_tree_view_column_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]