From 3de6e94db181327190b301c3095603b9c4442608 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 30 Oct 2010 13:09:15 -0400 Subject: [PATCH] Generic window icon function I made a function to set the window icon, rather than doing it only when the window is constructed. --- ocarina.py | 1 + ocarina/__init__.py | 5 +++++ ocarina/window.py | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ocarina.py b/ocarina.py index b3422475..f9409be7 100755 --- a/ocarina.py +++ b/ocarina.py @@ -17,6 +17,7 @@ prefs = libsaria.prefs win = ocarina.get_window(prefs["window_size"]) ocarina.set_window_title(ocarina.__vers__) +ocarina.set_window_icon("images/ocarina.png") ocarina.add_tab("Playlist", collection.Playlist()) ocarina.add_tab("Library", collection.Library()) diff --git a/ocarina/__init__.py b/ocarina/__init__.py index 389e6323..83a71b5d 100644 --- a/ocarina/__init__.py +++ b/ocarina/__init__.py @@ -79,3 +79,8 @@ get_window = get_window_once def set_window_title(text): window = get_window() window.set_title(text) + +def set_window_icon(path): + if libsaria.path.exists(path): + window = get_window() + window.set_icon_from_file(path) diff --git a/ocarina/window.py b/ocarina/window.py index 5a30f420..79ef78a6 100644 --- a/ocarina/window.py +++ b/ocarina/window.py @@ -31,7 +31,6 @@ def init(size): mask = gtk.DEST_DEFAULT_MOTION | gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP dnd_list = [("text/uri-list", 0, TARGET_TYPE_URI_LIST)] window.drag_dest_set(mask, dnd_list, gtk.gdk.ACTION_COPY) - window.set_icon_from_file("images/ocarina.png") window.resize(size[0], size[1]) window.show()