Working on fremantlizing the simple_list

git-svn-id: file:///svnroot/quicknote/trunk@64 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2

diff --git a/src/constants.py b/src/constants.py
index a5f94e3..cf18571 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,6 +3,6 @@ import os
 __pretty_app_name__ = "Quicknote"
 __app_name__ = "quicknote"
 __version__ = "0.7.8"
-__build__ = 1
+__build__ = 2
 _data_path_ = os.path.join(os.path.expanduser("~"), ".quicknote")
 __app_magic__ = 0xdeadbeef

diff --git a/src/notizen.py b/src/notizen.py
index 87bf2de..ccac21a 100644 (file)
--- a/src/notizen.py
+++ b/src/notizen.py
@@ -20,6 +20,7 @@ try:
 except ImportError:
        gtkspell = None
 
+import hildonize
 import simple_list
 
 
@@ -48,10 +49,10 @@ class Notizen(gtk.HBox):
                # Note list
                self._noteslist = simple_list.SimpleList()
                self._noteslist.set_eventfunction_cursor_changed(self._update_noteslist)
-               self._noteslist.set_size_request(250, -1)
+               self._noteslist.widget.set_size_request(250, -1)
 
                frame = gtk.Frame(_("Titles"))
-               frame.add(self._noteslist)
+               frame.add(self._noteslist.widget)
 
                buttonHBox = gtk.HBox()
 
@@ -82,6 +83,7 @@ class Notizen(gtk.HBox):
                self._noteScrollWindow = gtk.ScrolledWindow()
                self._noteScrollWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
                self._noteScrollWindow.add(self._noteBodyView)
+               hildonize.hildonize_scrollwindow_with_viewport(self._noteScrollWindow)
 
                frame = gtk.Frame(_("Note"))
                frame.add(self._noteScrollWindow)

diff --git a/src/simple_list.py b/src/simple_list.py
index 7e1e511..04bedf8 100644 (file)
--- a/src/simple_list.py
+++ b/src/simple_list.py
@@ -22,12 +22,10 @@ except NameError:
        _ = lambda x: x\r
 \r
 \r
-class SimpleList(gtk.ScrolledWindow):\r
+class SimpleList(object):\r
        """\r
        Stellt eine einfache Liste mit Laufbalken dar. Das wird mit\r
        den Objekten ScrolledWindow und TreeView erreicht.\r
-\r
-       @todo Decouple SimpleList from scrolled window to be able to hildonize it\r
        """\r
 \r
        KEY_IDX = 0\r
@@ -37,18 +35,10 @@ class SimpleList(gtk.ScrolledWindow):
                """\r
                Initialisieren\r
                """\r
-\r
-               gtk.ScrolledWindow.__init__(self)\r
                self._selectedItem = None # (<Position>, <Key>, <Value>)\r
 \r
-               # Liste\r
-               self._itemlist = gtk.ListStore(str, str)\r
-\r
-               # ScrolledWindow\r
-               self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)\r
-               self.set_shadow_type(gtk.SHADOW_IN)\r
-\r
                # Treeview\r
+               self._itemlist = gtk.ListStore(str, str)\r
                self._itemView = gtk.TreeView(self._itemlist)\r
                self._itemView.set_headers_visible(False)\r
                self._itemView.get_selection().set_mode(gtk.SELECTION_BROWSE)\r
@@ -77,9 +67,19 @@ class SimpleList(gtk.ScrolledWindow):
                # wie ich das möchte. Deshalb habe ich die Suche abgeschaltet.\r
                self._itemView.set_enable_search(False)\r
 \r
+               # ScrolledWindow\r
+               self._scrolledWindow = gtk.ScrolledWindow()\r
+               self._scrolledWindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)\r
+               self._scrolledWindow.set_shadow_type(gtk.SHADOW_IN)\r
+\r
                # Anzeigen\r
-               self.add(self._itemView)\r
-               self.show()\r
+               self._scrolledWindow.add(self._itemView)\r
+               self._scrolledWindow = hildonize.hildonize_scrollwindow(self._scrolledWindow)\r
+               self._scrolledWindow.show()\r
+\r
+       @property\r
+       def widget(self):\r
+               return self._scrolledWindow\r
 \r
        def append_item(self, value, key = ""):\r
                """\r