[Slim-Checkins] r10815 - in /trunk/server/Plugins/xPL: HTML/
HTML/EN/ HTML/EN/plugins/
HTML/EN/plugins/xPL/ HTML/EN/plugins/xPL/settings/
HTML/EN/plugins/xPL/settings/basic.html Plugin.pm Settings.pm
dsully at svn.slimdevices.com
dsully at svn.slimdevices.com
Fri Dec 1 10:57:22 PST 2006
Author: dsully
Date: Fri Dec 1 10:57:22 2006
New Revision: 10815
URL: http://svn.slimdevices.com?rev=10815&view=rev
Log:
Bug: N/A
Description: Convert xPL
Added:
trunk/server/Plugins/xPL/HTML/
trunk/server/Plugins/xPL/HTML/EN/
trunk/server/Plugins/xPL/HTML/EN/plugins/
trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/
trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/
trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html (with props)
trunk/server/Plugins/xPL/Settings.pm (with props)
Modified:
trunk/server/Plugins/xPL/Plugin.pm
Added: trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html
URL: http://svn.slimdevices.com/trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html?rev=10815&view=auto
==============================================================================
--- trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html (added)
+++ trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html Fri Dec 1 10:57:22 2006
@@ -1,0 +1,33 @@
+[% PROCESS settings/header.html %]
+
+ <div class="settingSection">
+ <div class="groupHead">[% "SETUP_GROUP_XPL" | string | upper %]</div>
+ <div class="groupDesc">[% "SETUP_GROUP_XPL_DESC" | string %]</div>
+
+ <table border="0" cellspacing="7" cellpaddding="7">
+
+ <tr>
+ <td><label for="xplinterval">[% "SETUP_XPLINTERVAL_CHOOSE" | string %]</label></td>
+ <td>
+ <input type="text" class="stdedit" name="xplinterval" id="xplinterval" value="[% prefs.xplinterval %]" size="5">
+ </td>
+ </tr>
+
+ <tr>
+ <td><label for="xplir">[% "SETUP_XPLIR_CHOOSE" | string %]</label></td>
+ <td>
+ <select name="xplir">
+
+ <option value="none" [% IF prefs.xplir == "none" %]selected[% END %]>[% "SETUP_XPLIR_NONE" | string %]</option>
+ <option value="buttons" [% IF prefs.xplir == "buttons" %]selected[% END %]>[% "SETUP_XPLIR_BUTTONS" | string %]</option>
+ <option value="raw" [% IF prefs.xplir == "raw" %]selected[% END %]>[% "SETUP_XPLIR_RAW" | string %]</option>
+ <option value="both" [% IF prefs.xplir == "both" %]selected[% END %]>[% "SETUP_XPLIR_BOTH" | string %]</option>
+
+ </select>
+ </td>
+ </tr>
+
+ </table>
+ </div>
+
+[% PROCESS settings/footer.html %]
Propchange: trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html
------------------------------------------------------------------------------
svn:keywords = Id Author LastChangedDate LastChangedBy
Propchange: trunk/server/Plugins/xPL/HTML/EN/plugins/xPL/settings/basic.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: trunk/server/Plugins/xPL/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/xPL/Plugin.pm?rev=10815&r1=10814&r2=10815&view=diff
==============================================================================
--- trunk/server/Plugins/xPL/Plugin.pm (original)
+++ trunk/server/Plugins/xPL/Plugin.pm Fri Dec 1 10:57:22 2006
@@ -20,6 +20,8 @@
use IO::Socket;
use Scalar::Util qw(blessed);
+use Plugins::xPL::Settings;
+
use Slim::Music::Info;
use Slim::Utils::Log;
use Slim::Utils::Misc;
@@ -46,6 +48,8 @@
# plugin: initialize xPL support
sub initPlugin {
+ Plugins::xPL::Settings->new;
+
my $computername = Slim::Utils::Network::hostName();
$localip = inet_ntoa((gethostbyname($computername))[4]);
@@ -100,44 +104,6 @@
sub enabled {
return ($::VERSION ge '6.5');
}
-
-# plugin: manage the CLI preference
-sub setupGroup {
- my $client = shift;
-
- my %setupGroup = (
- 'PrefOrder' => ['xplinterval', 'xplir']
- ,'PrefsInTable' => 1
- ,'Suppress_PrefHead' => 1
- ,'Suppress_PrefDesc' => 1
- ,'Suppress_PrefLine' => 1
- ,'Suppress_PrefSub' => 1
- ,'GroupHead' => Slim::Utils::Strings::string('SETUP_GROUP_XPL')
- ,'GroupDesc' => Slim::Utils::Strings::string('SETUP_GROUP_XPL_DESC')
- ,'GroupLine' => 1
- ,'GroupSub' => 1
- );
-
- my %setupPrefs = (
- 'xplinterval' => {
- 'validate' => \&Slim::Utils::Validate::isInt
- ,'validateArgs' => [5,30,1,1]
- }
- ,'xplir' => {
- 'options' => {
- 'none' => Slim::Utils::Strings::string('SETUP_XPLIR_NONE')
- ,'buttons' => Slim::Utils::Strings::string('SETUP_XPLIR_BUTTONS')
- ,'raw' => Slim::Utils::Strings::string('SETUP_XPLIR_RAW')
- ,'both' => Slim::Utils::Strings::string('SETUP_XPLIR_BOTH')
- }
- }
- );
-
- return (\%setupGroup, \%setupPrefs);
-
-
-}
-
# This routine ensures an xPL instance is valid
# by removing any invalid characters and trimming to
Added: trunk/server/Plugins/xPL/Settings.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/xPL/Settings.pm?rev=10815&view=auto
==============================================================================
--- trunk/server/Plugins/xPL/Settings.pm (added)
+++ trunk/server/Plugins/xPL/Settings.pm Fri Dec 1 10:57:22 2006
@@ -1,0 +1,26 @@
+package Plugins::xPL::Settings;
+
+# SlimServer Copyright (C) 2001-2006 Slim Devices Inc.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License,
+# version 2.
+
+use strict;
+use base qw(Slim::Web::Settings);
+
+sub name {
+ return 'PLUGIN_XPL';
+}
+
+sub page {
+ return 'plugins/xPL/settings/basic.html';
+}
+
+sub prefs {
+
+ return qw(xplinterval xplir);
+}
+
+1;
+
+__END__
Propchange: trunk/server/Plugins/xPL/Settings.pm
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/server/Plugins/xPL/Settings.pm
------------------------------------------------------------------------------
svn:keywords = Id Author LastChangedDate LastChangedBy
Propchange: trunk/server/Plugins/xPL/Settings.pm
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the checkins
mailing list