From 5650f2d7502bf515eb20e9cfd4930a738a7af2c7 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Mon, 15 Nov 2010 21:11:12 -0500 Subject: [PATCH] Finish new prefrences moveover I have renamed libsaria.prefs2 to libsaria.prefs --- libsaria/__init__.py | 18 ++++-------------- libsaria/audio/__init__.py | 2 +- libsaria/audio/audio.py | 4 ++-- libsaria/sources/__init__.py | 2 +- ocarina.py | 8 ++++---- ocarina/button.py | 5 ++--- ocarina/info.py | 6 +++--- ocarina/window.py | 4 ++-- 8 files changed, 19 insertions(+), 30 deletions(-) diff --git a/libsaria/__init__.py b/libsaria/__init__.py index 1fe31355..00919f2f 100644 --- a/libsaria/__init__.py +++ b/libsaria/__init__.py @@ -18,40 +18,30 @@ from cache import Cache # The cache is also saved across sessions prefs = None -prefs2 = None cache = Cache() plugin = None audio = None lastfm = None -init_pref2 = None +init_pref = None # Initialize helpful variables def init(): global prefs - global prefs2 - global init_pref2 + global init_pref global audio global lastfm - prefs = Map("preferences") - prefs2 = trees.get_pref_tree("preferences") - init_pref2 = prefs2.init_pref + prefs = trees.get_pref_tree("preferences") + init_pref = prefs.init_pref import audio import lastfm event.start("POSTINIT") -# If a preference has not already been set, set pref[key] = value -def init_pref(key, value): - global prefs - if prefs.get(key, None) == None: - prefs[key] = value - - def startup(): global plugin import plugin diff --git a/libsaria/audio/__init__.py b/libsaria/audio/__init__.py index b45cd8f4..0d02271b 100644 --- a/libsaria/audio/__init__.py +++ b/libsaria/audio/__init__.py @@ -10,7 +10,7 @@ audio = None tdelta = None def ls_init(): - libsaria.init_pref2("libsaria.audio.volume", 1.0) + libsaria.init_pref("libsaria.audio.volume", 1.0) libsaria.event.invite("POSTINIT", ls_init) def init(): diff --git a/libsaria/audio/audio.py b/libsaria/audio/audio.py index 891ad55e..2c33257b 100644 --- a/libsaria/audio/audio.py +++ b/libsaria/audio/audio.py @@ -20,7 +20,7 @@ def init(): lock.acquire() player = gst.element_factory_make("playbin2", "player") - set_volume_locked(libsaria.prefs2.get_pref("libsaria.audio.volume")) + set_volume_locked(libsaria.prefs.get_pref("libsaria.audio.volume")) time = gst.Format(gst.FORMAT_TIME) bus = player.get_bus() bus.add_signal_watch() @@ -181,7 +181,7 @@ def seek(prcnt): def set_volume_locked(prcnt): global player player.set_property("volume", prcnt) - libsaria.prefs2.set_pref("libsaria.audio.volume", prcnt) + libsaria.prefs.set_pref("libsaria.audio.volume", prcnt) return prcnt def set_volume(prcnt): diff --git a/libsaria/sources/__init__.py b/libsaria/sources/__init__.py index 9f6b89d2..311e6a8a 100644 --- a/libsaria/sources/__init__.py +++ b/libsaria/sources/__init__.py @@ -22,7 +22,7 @@ inc_count = library.inc_count def init(): global prefs - prefs = libsaria.prefs2 + prefs = libsaria.prefs prefs.init_pref("libsaria.random", False) libsaria.event.invite("POSTINIT", init) diff --git a/ocarina.py b/ocarina.py index c48d09c9..09bbdd9d 100755 --- a/ocarina.py +++ b/ocarina.py @@ -10,11 +10,11 @@ import ocarina from ocarina import collection -libsaria.init_pref2("ocarina.window.width", 800) -libsaria.init_pref2("ocarina.window.height", 600) +libsaria.init_pref("ocarina.window.width", 800) +libsaria.init_pref("ocarina.window.height", 600) -prefs2 = libsaria.prefs2 -win_prefs = prefs2.lookup_child(["ocarina", "window"]) +prefs = libsaria.prefs +win_prefs = prefs.lookup_child(["ocarina", "window"]) size = (win_prefs.get_pref("width"), win_prefs.get_pref("height")) win = ocarina.get_window(size) diff --git a/ocarina/button.py b/ocarina/button.py index 00f62bad..55b2bc65 100644 --- a/ocarina/button.py +++ b/ocarina/button.py @@ -5,7 +5,6 @@ import image LS = ocarina.libsaria gtk = ocarina.gtk prefs = LS.prefs -prefs2 = LS.prefs2 class Button(gtk.Button): @@ -116,7 +115,7 @@ class RandomButton(gtk.ToggleButton): img = gtk.image_new_from_file("images/random.png") img.show() self.add(img) - self.set_active(prefs2.get_pref("libsaria.random")) + self.set_active(prefs.get_pref("libsaria.random")) self.set_relief(gtk.RELIEF_NONE) self.connect("toggled", self.toggle) self.show() @@ -146,7 +145,7 @@ class VolumeButton(gtk.VolumeButton): adj = self.get_adjustment() adj.set_page_increment(0.05) - self.set_value(prefs2.get_pref("libsaria.audio.volume")) + self.set_value(prefs.get_pref("libsaria.audio.volume")) self.resize() self.connect("value-changed", self.changed) diff --git a/ocarina/info.py b/ocarina/info.py index 0d11f183..fcfe910c 100644 --- a/ocarina/info.py +++ b/ocarina/info.py @@ -142,7 +142,7 @@ class TwoWayPane(InfoBar): self.bar = self.contents self.tab = InfoTab(self.down_button) self.pack_start(self.tab) - if libsaria.prefs2.get_pref("ocarina.infopane.up") == True: + if libsaria.prefs.get_pref("ocarina.infopane.up") == True: self.up_button() else: self.down_button() @@ -150,12 +150,12 @@ class TwoWayPane(InfoBar): def up_button(self): self.bar.hide() self.tab.show() - libsaria.prefs2.set_pref("ocarina.infopane.up", True) + libsaria.prefs.set_pref("ocarina.infopane.up", True) def down_button(self): self.bar.show() self.tab.hide() - libsaria.prefs2.set_pref("ocarina.infopane.up", False) + libsaria.prefs.set_pref("ocarina.infopane.up", False) def init(): diff --git a/ocarina/window.py b/ocarina/window.py index baceeb8e..3db06212 100644 --- a/ocarina/window.py +++ b/ocarina/window.py @@ -37,8 +37,8 @@ def init(size): def resized(widget, geom): - libsaria.prefs2.set_pref("ocarina.window.width", geom.width) - libsaria.prefs2.set_pref("ocarina.window.height", geom.height) + libsaria.prefs.set_pref("ocarina.window.width", geom.width) + libsaria.prefs.set_pref("ocarina.window.height", geom.height) def dnd_receive(widget, context, x, y, selection, type, time):