From e8f633c8638f474e606848b68db77998cd4e4d55 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Wed, 25 May 2011 23:01:17 -0400 Subject: [PATCH] ocarina: Single list attrs I was recreating this list once for each of playlist, library and queue. I expect it is easier to manage from a single location. --- ocarina/library.py | 3 +-- ocarina/playlist.py | 3 +-- ocarina/queue.py | 3 +-- ocarina/sources/column.py | 1 + 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ocarina/library.py b/ocarina/library.py index 48226b9e..2f7f774f 100644 --- a/ocarina/library.py +++ b/ocarina/library.py @@ -13,8 +13,7 @@ def set_label_text(): LIB_PAGE.label.set_text("Library (%s)" % library.num_visible()) def fill_library(): - attrs = ("id", "title", "lenstr", "artist", "album", "year") - songs = libsaria.sources.list_library(*attrs) + songs = libsaria.sources.list_library(*sources.column.attrs) lib_page.insert(songs) set_label_text() fill_library() diff --git a/ocarina/playlist.py b/ocarina/playlist.py index 44e9f118..9b53ed99 100644 --- a/ocarina/playlist.py +++ b/ocarina/playlist.py @@ -13,8 +13,7 @@ def set_label_text(): PLAYLIST_PAGE.label.set_text("Playlist (%s)" % playlist.num_visible()) def fill_playlist(): - attrs = ("id", "title", "lenstr", "artist", "album", "year") - songs = libsaria.sources.list_playlist(*attrs) + songs = libsaria.sources.list_playlist(*sources.column.attrs) playlist_page.insert(songs) set_label_text() fill_playlist() diff --git a/ocarina/queue.py b/ocarina/queue.py index a231249b..1f4785d5 100644 --- a/ocarina/queue.py +++ b/ocarina/queue.py @@ -19,8 +19,7 @@ def set_visible(): body.show_page(QUEUE_PAGE) def fill_queue(): - attrs = ("id", "title", "lenstr", "artist", "album", "year") - songs = libsaria.sources.list_queue(*attrs) + songs = libsaria.sources.list_queue(*sources.column.attrs) queue_page.insert(songs) set_label_text() set_visible() diff --git a/ocarina/sources/column.py b/ocarina/sources/column.py index 69dad5c6..fdb45912 100644 --- a/ocarina/sources/column.py +++ b/ocarina/sources/column.py @@ -2,6 +2,7 @@ import gtk +attrs = ("id", "title", "lenstr", "artist", "album", "year") columns = ["Id", "Title", "Length", "Artist", "Album", "Year"] col_width = [ 2, 300, 60, 125, 125, 50]