From: epage Date: Fri, 6 Nov 2009 13:21:25 +0000 (+0000) Subject: Working on fremantlizing the simple_list X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=commitdiff_plain;h=bef6345b9d91e1b43a0ca599cecaa25789fde9cc 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 --- 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 --- 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 --- a/src/simple_list.py +++ b/src/simple_list.py @@ -22,12 +22,10 @@ except NameError: _ = lambda x: x -class SimpleList(gtk.ScrolledWindow): +class SimpleList(object): """ Stellt eine einfache Liste mit Laufbalken dar. Das wird mit den Objekten ScrolledWindow und TreeView erreicht. - - @todo Decouple SimpleList from scrolled window to be able to hildonize it """ KEY_IDX = 0 @@ -37,18 +35,10 @@ class SimpleList(gtk.ScrolledWindow): """ Initialisieren """ - - gtk.ScrolledWindow.__init__(self) self._selectedItem = None # (, , ) - # Liste - self._itemlist = gtk.ListStore(str, str) - - # ScrolledWindow - self.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) - self.set_shadow_type(gtk.SHADOW_IN) - # Treeview + self._itemlist = gtk.ListStore(str, str) self._itemView = gtk.TreeView(self._itemlist) self._itemView.set_headers_visible(False) self._itemView.get_selection().set_mode(gtk.SELECTION_BROWSE) @@ -77,9 +67,19 @@ class SimpleList(gtk.ScrolledWindow): # wie ich das möchte. Deshalb habe ich die Suche abgeschaltet. self._itemView.set_enable_search(False) + # ScrolledWindow + self._scrolledWindow = gtk.ScrolledWindow() + self._scrolledWindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) + self._scrolledWindow.set_shadow_type(gtk.SHADOW_IN) + # Anzeigen - self.add(self._itemView) - self.show() + self._scrolledWindow.add(self._itemView) + self._scrolledWindow = hildonize.hildonize_scrollwindow(self._scrolledWindow) + self._scrolledWindow.show() + + @property + def widget(self): + return self._scrolledWindow def append_item(self, value, key = ""): """