Merge lp:~jconti/exaile/lyrics_font into lp:exaile/0.3.3

[Jason Conti]

I was in the process of patching the ubuntu package to have a larger font in the lyrics viewer (it is very difficult to read Japanese fonts at 9pt, for me anyway), but decided to add a preference instead.

Adds a single preference to the lyrics viewer plugin: 'plugin/lyricsviewer/lyrics_font'.

[Adam Olsen (arolsen)]

Looks good to me

review: Approve

=== modified file 'plugins/lyricsviewer/__init__.py'
--- plugins/lyricsviewer/__init__.py	2011-12-19 04:30:33 +0000
+++ plugins/lyricsviewer/__init__.py	2012-03-26 22:35:31 +0000
@@ -28,9 +28,11 @@
 import os
 import webbrowser
 from xl.nls import gettext as _
-from xl import common, event, player
+from xl import common, event, player, settings
 from xl.lyrics import LyricsNotFoundException
 
+import lyricsviewerprefs
+
 LYRICSPANEL = None
 CURPATH = os.path.realpath(__file__)
 BASEDIR = os.path.dirname(CURPATH)+os.path.sep
@@ -51,6 +53,7 @@
 #I set the style of the text view containing the lyrics here cause
 #the style of the top level is not really available until the panel is added.
     LYRICSVIEWER.set_lyrics_text_style()
+    event.add_callback(on_option_set, 'plugin_lyricsviewer_option_set')
 
 def disable(exaile):
     global LYRICSPANEL
@@ -60,6 +63,14 @@
     LYRICSVIEWER = None
     LYRICSPANEL = None
 
+def get_preferences_pane():
+    return lyricsviewerprefs
+
+def on_option_set(event, settings, option):
+    if option == 'plugin/lyricsviewer/lyrics_font':
+        value = settings.get_option(option, LYRICSVIEWER.lyrics_font)
+        LYRICSVIEWER.lyrics_text.modify_font(pango.FontDescription(value))
+
 class LyricsViewer(object):
 
     track_title_font='sans bold 10'
@@ -120,8 +131,9 @@
        #trackname end
 
        #the textview which cointains the lyrics
+        user_lyrics_font = settings.get_option('plugin/lyricsviewer/lyrics_font', self.lyrics_font)
         self.lyrics_text=builder.get_object('LyricsText')
-        self.lyrics_text.modify_font(pango.FontDescription(self.lyrics_font))
+        self.lyrics_text.modify_font(pango.FontDescription(user_lyrics_font))
         self.lyrics_text_buffer = builder.get_object('LyricsTextBuffer')
        #end lyrictextview
 

=== added file 'plugins/lyricsviewer/lyricsviewer_prefs.ui'
--- plugins/lyricsviewer/lyricsviewer_prefs.ui	1970-01-01 00:00:00 +0000
+++ plugins/lyricsviewer/lyricsviewer_prefs.ui	2012-03-26 22:35:31 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkWindow" id="prefs_window">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkVBox" id="preferences_pane">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Lyrics font:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFontButton" id="plugin/lyricsviewer/lyrics_font">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== added file 'plugins/lyricsviewer/lyricsviewerprefs.py'
--- plugins/lyricsviewer/lyricsviewerprefs.py	1970-01-01 00:00:00 +0000
+++ plugins/lyricsviewer/lyricsviewerprefs.py	2012-03-26 22:35:31 +0000
@@ -0,0 +1,26 @@
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 1, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from xlgui.preferences import widgets
+from xl import xdg
+from xl.nls import gettext as _
+import os
+
+name = _('Lyrics Viewer')
+basedir = os.path.dirname(os.path.realpath(__file__))
+ui = os.path.join(basedir, 'lyricsviewer_prefs.ui')
+
+class LyricsFontPreference(widgets.FontButtonPreference):
+    default = 'Sans 9'
+    name = 'plugin/lyricsviewer/lyrics_font'