move the canvastextview to jarabe/view

3 files changed, 41 insertions, 18 deletions

diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index f57b89c..3d6757c 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -33,6 +33,7 @@ from jarabe.journal.keepicon import KeepIcon
 from jarabe.journal.palettes import ObjectPalette, BuddyPalette
 from jarabe.journal import misc
 from jarabe.journal import model
+from jarabe.view.canvastextview import CanvasTextView
 
 class Separator(hippo.CanvasBox, hippo.CanvasItem):
     def __init__(self, orientation):
@@ -44,24 +45,6 @@ class Separator(hippo.CanvasBox, hippo.CanvasItem):
         else:
             self.props.box_height = style.LINE_WIDTH
 
-class CanvasTextView(hippo.CanvasWidget):
-    def __init__(self, text, **kwargs):
-        hippo.CanvasWidget.__init__(self, **kwargs)
-        self.text_view_widget = gtk.TextView()
-        self.text_view_widget.props.buffer.props.text = text
-        self.text_view_widget.props.left_margin = style.DEFAULT_SPACING
-        self.text_view_widget.props.right_margin = style.DEFAULT_SPACING
-        self.text_view_widget.props.wrap_mode = gtk.WRAP_WORD
-        self.text_view_widget.show()
-        
-        # TODO: These fields should expand vertically instead of scrolling
-        scrolled_window = gtk.ScrolledWindow()
-        scrolled_window.set_shadow_type(gtk.SHADOW_OUT)
-        scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-        scrolled_window.add(self.text_view_widget)
-        
-        self.props.widget = scrolled_window
-
 class BuddyList(hippo.CanvasBox):
     def __init__(self, buddies):
         hippo.CanvasBox.__init__(self, xalign=hippo.ALIGNMENT_START,
diff --git a/src/jarabe/view/Makefile.am b/src/jarabe/view/Makefile.am
index 21e7a91..da238cf 100644
--- a/src/jarabe/view/Makefile.am
+++ b/src/jarabe/view/Makefile.am
@@ -3,6 +3,7 @@ sugar_PYTHON =				\
 	__init__.py			\
 	buddyicon.py			\
 	buddymenu.py			\
+	canvastextview.py		\
 	keyhandler.py			\
 	launcher.py			\
 	palettes.py			\
diff --git a/src/jarabe/view/canvastextview.py b/src/jarabe/view/canvastextview.py
new file mode 100644
index 0000000..481248d
--- /dev/null
+++ b/src/jarabe/view/canvastextview.py
@@ -0,0 +1,39 @@
+# Copyright (C) 2008 One Laptop Per Child
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import gtk
+import hippo
+
+from sugar.graphics import style
+
+class CanvasTextView(hippo.CanvasWidget):
+    def __init__(self, text, **kwargs):
+        hippo.CanvasWidget.__init__(self, **kwargs)
+        self.text_view_widget = gtk.TextView()
+        self.text_view_widget.props.buffer.props.text = text
+        self.text_view_widget.props.left_margin = style.DEFAULT_SPACING
+        self.text_view_widget.props.right_margin = style.DEFAULT_SPACING
+        self.text_view_widget.props.wrap_mode = gtk.WRAP_WORD
+        self.text_view_widget.show()
+        
+        # TODO: These fields should expand vertically instead of scrolling
+        scrolled_window = gtk.ScrolledWindow()
+        scrolled_window.set_shadow_type(gtk.SHADOW_OUT)
+        scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        scrolled_window.add(self.text_view_widget)
+        
+        self.props.widget = scrolled_window