Changeset 35 for trunk/src/gtk/MainView.cxx

Timestamp:

04/12/06 05:27:57 (3 years ago)

Author:

jordi

Message:

Now the shell shows the first page, but to do so the Main presenter had to make sure the document page is not destroyed until the call to shell's showPage() is done, as the shells mantains a copy of it.

Files:

• trunk/src/gtk/MainView.cxx (modified) (7 diffs)

trunk/src/gtk/MainView.cxx

@@ -20 +20 @@
 #include <IMainView.h>
 #include <MainPter.h>
+#include <DocumentPage.h>
 #include "MainView.h"
 
@@ -52 +53 @@
     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
+    // Create the page view
+    GtkWidget *pageView = createPageView ();
+    gtk_box_pack_start (GTK_BOX (m_MainBox), pageView, TRUE, TRUE, 0);
 }
 
@@ -82 +86 @@
 MainView::promptPasswordDialog ()
 {
+    return g_strdup("");
 }
 
@@ -154 +159 @@
 MainView::showPage (DocumentPage *page)
 {
+    gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageView), NULL);
+    GdkPixbuf *pixbuf = getPixbufFromPage (page); 
+    gtk_image_set_from_pixbuf (GTK_IMAGE (m_PageView), pixbuf);
+    gdk_pixbuf_unref (pixbuf);
 }
 
@@ -169 +178 @@
 MainView::getGoToPageText (void)
 {
+    return "1";
 }
 
@@ -185 +195 @@
 // GTK+ Functions.
 ////////////////////////////////////////////////////////////////
+
+GtkWidget *
+MainView::createPageView ()
+{
+    GtkWidget *scrolledWindow = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    m_PageView = gtk_image_new  ();
+    gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledWindow),
+                                           m_PageView);
+    return scrolledWindow;
+}
 
 void
@@ -268 +291 @@
 }
 
+GdkPixbuf *
+MainView::getPixbufFromPage (DocumentPage *page)
+{
+    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (page->getData (),
+            GDK_COLORSPACE_RGB, FALSE, 8, page->getWidth (), page->getHeight (),
+            page->getRowStride (), NULL, NULL);
+
+    return pixbuf;
+}
+
 ////////////////////////////////////////////////////////////////
 // GTK+ Callbacks.