--- a/Makefile	Tue Nov 09 22:32:37 2010 -0800
+++ b/Makefile	Sun Nov 14 15:10:02 2010 -0800
@@ -2,12 +2,10 @@
 # Makefile for IpePresenter
 # --------------------------------------------------------------------
 
-IPESOURCE = $(HOME)/Projects/Ipe/otfried-mod/
-
 QT_CFLAGS = -I/usr/include/QtGui -I/usr/include/QtCore
 QT_LIBS = -lQtGui -lQtCore
-CPPFLAGS += -I$(IPESOURCE)/src/ipeqtcanvas $(QT_CFLAGS)
-LIBS += -lipeqtcanvas -lipecairo -lipe $(QT_LIBS) $(CAIRO_LIBS) -L$(IPESOURCE)/build/lib
+CPPFLAGS += $(QT_CFLAGS)
+LIBS += -lipeqtcanvas -lipecairo -lipe $(QT_LIBS) $(CAIRO_LIBS)
 
 OBJECTS = mainwindow.o moc_mainwindow.o canvasview.o moc_canvasview.o \
 		  timelabel.o moc_timelabel.o pagedialog.o moc_pagedialog.o

--- a/mainwindow.cpp	Tue Nov 09 22:32:37 2010 -0800
+++ b/mainwindow.cpp	Sun Nov 14 15:10:02 2010 -0800
@@ -204,7 +204,7 @@
         views.push_back(PageDialog::PageViewPair(i, 0));
     page_dialog = new PageDialog(iDoc, views);
     
-    updateLabel();
+    setView();
     return true;
 }
   
@@ -330,6 +330,7 @@
     updateLabel();
 
     canvas_view->setView(iPageNo, iViewNo);
+    notesText->setPlainText(QIpe(iDoc->page(iPageNo)->notes()));
     
     setNextViewCanvas();
 }

--- a/mainwindow.ui	Tue Nov 09 22:32:37 2010 -0800
+++ b/mainwindow.ui	Sun Nov 14 15:10:02 2010 -0800
@@ -85,7 +85,11 @@
           </widget>
          </item>
          <item>
-          <widget class="QPlainTextEdit" name="plainTextEdit"/>
+          <widget class="QPlainTextEdit" name="notesText">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
          </item>
         </layout>
        </widget>