You can subscribe to this list here.
2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
From: <hwa...@us...> - 2011-02-12 17:45:57
|
Revision: 4107 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4107&view=rev Author: hwahrmann Date: 2011-02-12 17:45:51 +0000 (Sat, 12 Feb 2011) Log Message: ----------- updated setup project Modified Paths: -------------- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 Modified: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 =================================================================== --- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 17:45:16 UTC (rev 4106) +++ trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 17:45:51 UTC (rev 4107) @@ -205,7 +205,7 @@ <ProjectSettings> <FolderGroups /> <ProjectFilename>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.xmp2</ProjectFilename> - <UpdatePath1>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.mpe1</UpdatePath1> + <UpdatePath1>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\update.xml</UpdatePath1> <UpdatePath2 /> <UpdatePath3 /> </ProjectSettings> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hwa...@us...> - 2011-02-12 17:45:22
|
Revision: 4106 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4106&view=rev Author: hwahrmann Date: 2011-02-12 17:45:16 +0000 (Sat, 12 Feb 2011) Log Message: ----------- Added update.xml Added Paths: ----------- trunk/plugins/MusicRatingUpdater/setup/update.xml Added: trunk/plugins/MusicRatingUpdater/setup/update.xml =================================================================== --- trunk/plugins/MusicRatingUpdater/setup/update.xml (rev 0) +++ trunk/plugins/MusicRatingUpdater/setup/update.xml 2011-02-12 17:45:16 UTC (rev 4106) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?> +<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Items> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Default"> + <DisplayName>Default</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Default</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items /> + </Dependencies> + <GeneralInfo> + <Name>Music Rating Updater</Name> + <Id>f11d4e87-8755-4be4-83d6-6509d4cac244</Id> + <Author>Helmut Wahrmann (hwahrmann)</Author> + <HomePage>www.team-mediaportal.com</HomePage> + <ForumPage /> + <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/MusicRatingUpdater/setup/update.xml</UpdateUrl> + <Version> + <Major>1</Major> + <Minor>0</Minor> + <Build>0</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Have you ever wanted the ratings from the Music Now Playing available in the tags of the file, to be used by other applications? + +Now there's a solution. + +With the MusicRatingUpdater Plugin activated you have the ratings instantly available in your files. + +Ratings can be stored in "Star Rating", 1 - 5, or in Windows Media Player Format. + +The plugin has an automatic mode, by which it listens to changes in the ratings, which a user does in the Now Playing screen and will update the file as soon as it finishes. + +The second option is a Batch update, which is available via the plugin's config dialog. This option reads all available ratings for songs found in the MediaPortal Music Database and updates the physical file.</ExtensionDescription> + <VersionDescription /> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.mpe1</OnlineLocation> + <ReleaseDate>2011-02-12T16:35:08.2807162+01:00</ReleaseDate> + <Tags>music rating stars</Tags> + <Location>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.mpe1</Location> + <Params> + <Items> + <SectionParam Name="Icon"> + <Value /> + <ValueType>File</ValueType> + <Description>The icon file of the package (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Online Icon"> + <Value /> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value /> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>yes</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + </PackageClass> + </Items> +</ExtensionCollection> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hwa...@us...> - 2011-02-12 17:25:05
|
Revision: 4105 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4105&view=rev Author: hwahrmann Date: 2011-02-12 17:24:58 +0000 (Sat, 12 Feb 2011) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 Added Paths: ----------- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.mpe1 Added: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 =================================================================== --- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 17:06:24 UTC (rev 4104) +++ trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 17:24:58 UTC (rev 4105) @@ -135,7 +135,7 @@ <Author>Helmut Wahrmann (hwahrmann)</Author> <HomePage>www.team-mediaportal.com</HomePage> <ForumPage /> - <UpdateUrl /> + <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/MusicRatingUpdater/setup/update.xml</UpdateUrl> <Version> <Major>1</Major> <Minor>0</Minor> @@ -155,7 +155,7 @@ The second option is a Batch update, which is available via the plugin's config dialog. This option reads all available ratings for songs found in the MediaPortal Music Database and updates the physical file.</ExtensionDescription> <VersionDescription /> <DevelopmentStatus>Stable</DevelopmentStatus> - <OnlineLocation /> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.mpe1</OnlineLocation> <ReleaseDate>2011-02-12T16:35:08.2807162+01:00</ReleaseDate> <Tags>music rating stars</Tags> <Location>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.mpe1</Location> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hwa...@us...> - 2011-02-12 17:06:30
|
Revision: 4104 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4104&view=rev Author: hwahrmann Date: 2011-02-12 17:06:24 +0000 (Sat, 12 Feb 2011) Log Message: ----------- Adjusted ignore list and changed setup project Modified Paths: -------------- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 Property Changed: ---------------- trunk/plugins/MusicRatingUpdater/ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/ Property changes on: trunk/plugins/MusicRatingUpdater ___________________________________________________________________ Added: svn:ignore + _ReSharper.MusicRatingUpdater Property changes on: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater ___________________________________________________________________ Added: svn:ignore + bin obj Modified: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 =================================================================== --- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 16:50:15 UTC (rev 4103) +++ trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 17:06:24 UTC (rev 4104) @@ -142,16 +142,16 @@ <Build>0</Build> <Revision>0</Revision> </Version> - <ExtensionDescription>Have you ever wanted the ratings from the Music Now Playing available in the tags of the file, to be used by other applications? - -Now there's a solution. - -With the MusicRatingUpdater Plugin activated you have the ratings instantly available in your files. - -Ratings can be stored in "Star Rating", 1 - 5, or in Windows Media Player Format. - -The plugin has an automatic mode, by which it listens to changes in the ratings, which a user does in the Now Playing screen and will update the file as soon as it finishes. - + <ExtensionDescription>Have you ever wanted the ratings from the Music Now Playing available in the tags of the file, to be used by other applications? + +Now there's a solution. + +With the MusicRatingUpdater Plugin activated you have the ratings instantly available in your files. + +Ratings can be stored in "Star Rating", 1 - 5, or in Windows Media Player Format. + +The plugin has an automatic mode, by which it listens to changes in the ratings, which a user does in the Now Playing screen and will update the file as soon as it finishes. + The second option is a Batch update, which is available via the plugin's config dialog. This option reads all available ratings for songs found in the MediaPortal Music Database and updates the physical file.</ExtensionDescription> <VersionDescription /> <DevelopmentStatus>Stable</DevelopmentStatus> @@ -205,7 +205,7 @@ <ProjectSettings> <FolderGroups /> <ProjectFilename>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.xmp2</ProjectFilename> - <UpdatePath1 /> + <UpdatePath1>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.mpe1</UpdatePath1> <UpdatePath2 /> <UpdatePath3 /> </ProjectSettings> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hwa...@us...> - 2011-02-12 16:50:22
|
Revision: 4103 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4103&view=rev Author: hwahrmann Date: 2011-02-12 16:50:15 +0000 (Sat, 12 Feb 2011) Log Message: ----------- Initial import of version 1.0 Added Paths: ----------- trunk/plugins/MusicRatingUpdater/ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.cs trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj.user trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.Designer.cs trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.cs trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.resx trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/Properties/ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/Properties/AssemblyInfo.cs trunk/plugins/MusicRatingUpdater/MusicRatingUpdater.sln trunk/plugins/MusicRatingUpdater/setup/ trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.cs =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.cs (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.cs 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,406 @@ +#region Copyright (C) 2011 Helmut Wahrmann +// Copyright (C) 2011 Helmut Wahrmann +// http://www.team-mediaportal.com +// +// MPTagThat 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 2 of the License, or +// (at your option) any later version. +// +// MPTagThat 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 MediaPortal. If not, see <http://www.gnu.org/licenses/>. +#endregion +#region + +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading; +using MediaPortal.Configuration; +using MediaPortal.GUI.Library; +using MediaPortal.Music.Database; +using MediaPortal.Profile; +using MediaPortal.Services; +using MediaPortal.Threading; +using SQLite.NET; +using TagLib; +using TagLib.Id3v2; +using File = TagLib.File; +using Tag = TagLib.Id3v2.Tag; +using Timer = System.Windows.Forms.Timer; + +#endregion + +namespace MediaPortal.Plugins +{ + public class MusicRatingUpdater : IPlugin, ISetupForm + { + #region Variables + + private delegate void ThreadSafeDelegate(); + + private bool _run; + private string _ratingType; + private readonly bool _updateRealTime; + private readonly MusicDatabase mDB; + private MusicRatingUpdaterSettings _config; + private readonly Dictionary<string, int> _pendingUpdates = new Dictionary<string, int>(); + private Timer _updateTimer; + + #endregion + + #region ctor + + public MusicRatingUpdater() + { + // load settings + using (Settings reader = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + _ratingType = reader.GetValueAsString("musicratingupdater", "ratingtype", "star"); + _updateRealTime = reader.GetValueAsBool("musicratingupdater", "realtimeupdate", false); + } + + mDB = MusicDatabase.Instance; + } + + #endregion + + #region Methods + + /// <summary> + /// The Rating Change event has been fired. + /// Update the file with the rating. + /// </summary> + /// <param name = "sender"></param> + /// <param name = "filePath"></param> + /// <param name = "rating"></param> + private void OnMusicRatingChanged(object sender, string filePath, int rating) + { + if (!_updateRealTime) + { + return; + } + + if (_pendingUpdates.ContainsKey(filePath)) + { + // When we have already the file in the table, then the user changed the rating already before + // remove the old rating + _pendingUpdates.Remove(filePath); + } + _pendingUpdates.Add(filePath, rating); + Log.Info("MusicRatingUpdater: Queued rating for {0}. File will be updated when playback finishes.", filePath); + + if (_updateTimer == null) + { + _updateTimer = new Timer(); + _updateTimer.Interval = 20000; + _updateTimer.Tick += ProcessPendingUpdates; + _updateTimer.Start(); + } + } + + public void StartBatchUpdate() + { + // The rating Type might have been changed on the form + _ratingType = _config.RatingType; + + _run = true; + Work work = new Work(BatchUpdate); + work.ThreadPriority = ThreadPriority.Lowest; + work.Description = "MusicRatingUpdater Thread"; + GlobalServiceProvider.Get<IThreadPool>().Add(work, QueuePriority.Low); + } + + public void StopBatchUpdate() + { + _run = false; + } + + /// <summary> + /// Updates the files in the shares with the ratings of the Music Database + /// </summary> + private void BatchUpdate() + { + //Make calls to our SettiongsForm + if (_config.StatusLabel.InvokeRequired) + { + ThreadSafeDelegate d = BatchUpdate; + _config.StatusLabel.Invoke(d, new object[] {}); + return; + } + + Log.Info("MusicRatingUpdater: Batch Update of ratings started"); + List<Song> songs = new List<Song>(); + mDB.GetSongsWithRating(ref songs); + + int i = 0; + foreach (Song song in songs) + { + if (!_run) + { + Log.Info("MusicRatingUpdater: Update stopped by user"); + break; + } + i++; + _config.StatusLabel.Text = string.Format("Updating ratings for file {0} of {1}", i, songs.Count); + SetRating(song.FileName, song.Rating); + } + Log.Info("MusicRatingUpdater: Batch Update of ratings ended"); + } + + /// <summary> + /// Update the file with the specified rating + /// </summary> + /// <param name = "filePath"></param> + /// <param name = "rating"></param> + private void SetRating(string filePath, int rating) + { + Log.Info("MusicRatingUpdater: Set rating of file {0} to {1}", filePath, rating); + + // Read the Tag + try + { + ByteVector.UseBrokenLatin1Behavior = true; + File file = File.Create(filePath); + + string tagType = file.MimeType.Substring(file.MimeType.IndexOf("/") + 1); + if (tagType.ToLower() == "mp3") + { + Tag id3v2tag = file.GetTag(TagTypes.Id3v2) as Tag; + // Only write POPM tags, if we have an ID3 V2 Tag + // We don't want to have an mp3 file with + if (id3v2tag != null) + { + if (_ratingType == "star") + { + // Look for a POPM Frame written by Mediaportal or MPTagThat first + PopularimeterFrame popmFrame = PopularimeterFrame.Get(id3v2tag, "MediaPortal", + false); + if (popmFrame == null) + { + popmFrame = PopularimeterFrame.Get(id3v2tag, "MPTagThat", false); + if (popmFrame == null) + { + // Lets's create a POPM Frame now + popmFrame = PopularimeterFrame.Get(id3v2tag, "MediaPortal", true); + } + } + + // Now check, if the new rating is different to the stored one and only save it then + if (rating != popmFrame.Rating) + { + popmFrame.Rating = Convert.ToByte(rating); + file.Save(); + } + } + else + { + // Look for POPM written by WMP and create one, if not present + PopularimeterFrame popmFrame = PopularimeterFrame.Get(id3v2tag, + "Windows Media Player 9 Series", + true); + if (popmFrame != null) + { + int i = 0; + if (rating == 5) + i = 255; + else if (rating == 4) + i = 196; + else if (rating == 3) + i = 128; + else if (rating == 2) + i = 64; + else if (rating == 1) + i = 1; + + // Now check, if the new rating is different to the stored one and only save it then + if (i != popmFrame.Rating) + { + popmFrame.Rating = Convert.ToByte(i); + file.Save(); + } + } + } + } + } + } + catch (CorruptFileException) + { + Log.Warn("MusicRatingUpdater: Ignoring track {0} - Corrupt File!", filePath); + } + catch (UnsupportedFormatException) + { + Log.Warn("MusicRatingUpdater: Ignoring track {0} - Unsupported format!", filePath); + } + catch (Exception ex) + { + Log.Error("MusicRatingUpdater: Exception handling rating for: {0} {1} {2}", filePath, ex.Message, ex.StackTrace); + } + } + + private void ProcessPendingUpdates(object sender, EventArgs e) + { + List<string> keysToRemove = new List<string>(); + foreach (KeyValuePair<string, int> item in _pendingUpdates) + { + if (!IsFileOpen(item.Key)) + { + SetRating(item.Key, item.Value); + keysToRemove.Add(item.Key); + } + } + foreach (string item in keysToRemove) + { + _pendingUpdates.Remove(item); + } + } + + private bool IsFileOpen(string filePath) + { + bool rtnvalue = false; + try + { + FileStream fs = System.IO.File.OpenWrite(filePath); + fs.Close(); + } + catch (IOException) + { + rtnvalue = true; + } + return rtnvalue; + } + + #endregion + + #region IPlugin Members + + /// <summary> + /// The plugin is started by Mediaportal + /// </summary> + public void Start() + { + Log.Info("MusicRatingUpdater: listening on rating change events"); + + // Establish Handler to catch rating change events + MusicDatabase.MusicRatingChanged += OnMusicRatingChanged; + } + + /// <summary> + /// The Plugin is stopped + /// </summary> + public void Stop() + { + if (_updateTimer != null) + { + _updateTimer.Stop(); + } + + ProcessPendingUpdates(this, new EventArgs()); + _run = false; + Log.Info("MusicRatingUpdater: stopped"); + } + + #endregion IPlugin Members + + #region ISetupForm methods + + /// <summary> + /// Determines whether this plugin can be enabled. + /// </summary> + /// <returns> + /// <c>true</c> if this plugin can be enabled; otherwise, <c>false</c>. + /// </returns> + public bool CanEnable() + { + return true; + } + + /// <summary> + /// Determines whether this plugin has setup. + /// </summary> + /// <returns> + /// <c>true</c> if this plugin has setup; otherwise, <c>false</c>. + /// </returns> + public bool HasSetup() + { + return true; + } + + /// <summary> + /// Gets the plugin name. + /// </summary> + /// <returns>The plugin name.</returns> + public string PluginName() + { + return "MusicRating Updater"; + } + + /// <summary> + /// Defaults enabled. + /// </summary> + /// <returns>true if this plugin is enabled by default, otherwise false.</returns> + public bool DefaultEnabled() + { + return false; + } + + /// <summary> + /// Gets the window id. + /// </summary> + /// <returns>The window id.</returns> + public int GetWindowId() + { + return 0; + } + + /// <summary> + /// Gets the plugin author. + /// </summary> + /// <returns>The plugin author.</returns> + public string Author() + { + return "Helmut Wahrmann"; + } + + /// <summary> + /// Gets the description of the plugin. + /// </summary> + /// <returns>The plugin description.</returns> + public string Description() + { + return + "Updates the Music File with Ratings, when they're changed inside MP. Ratings can be shared between different Media Players"; + } + + /// <summary> + /// Shows the plugin configuration. + /// </summary> + public void ShowPlugin() + { + _config = new MusicRatingUpdaterSettings(this); + _config.ShowDialog(); + } + + /// <summary> + /// Gets the home screen details for the plugin. + /// </summary> + /// <param name = "strButtonText">The button text.</param> + /// <param name = "strButtonImage">The button image.</param> + /// <param name = "strButtonImageFocus">The button image focus.</param> + /// <param name = "strPictureImage">The picture image.</param> + /// <returns>true if the plugin can be seen, otherwise false.</returns> + public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, + out string strPictureImage) + { + strButtonText = strButtonImage = strButtonImageFocus = strPictureImage = String.Empty; + return false; + } + + #endregion ISetupForm methods + } +} \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,135 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{27F417A4-6D27-4952-B0FC-FDCE9101A7DD}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>MusicRatingUpdater</RootNamespace> + <AssemblyName>MusicRatingUpdater</AssemblyName> + <FileUpgradeFlags> + </FileUpgradeFlags> + <OldToolsVersion>2.0</OldToolsVersion> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> + <InstallFrom>Disk</InstallFrom> + <UpdateEnabled>false</UpdateEnabled> + <UpdateMode>Foreground</UpdateMode> + <UpdateInterval>7</UpdateInterval> + <UpdateIntervalUnits>Days</UpdateIntervalUnits> + <UpdatePeriodically>false</UpdatePeriodically> + <UpdateRequired>false</UpdateRequired> + <MapFileExtensions>true</MapFileExtensions> + <ApplicationRevision>0</ApplicationRevision> + <ApplicationVersion>1.0.0.%2a</ApplicationVersion> + <IsWebBootstrapper>false</IsWebBootstrapper> + <UseApplicationTrust>false</UseApplicationTrust> + <BootstrapperEnabled>true</BootstrapperEnabled> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_1_02|AnyCPU' "> + <OutputPath>bin\Release_1_02\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_1_02|x86' "> + <OutputPath>bin\x86\Release_1_02\</OutputPath> + <DefineConstants>TRACE;Release_1_02</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <ItemGroup> + <Reference Include="Core, Version=0.9.4.25894, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\mediaportal\Core\bin\Debug\Core.dll</HintPath> + </Reference> + <Reference Include="Databases, Version=0.9.4.25896, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\mediaportal\Databases\bin\Debug\Databases.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.Windows.Forms" /> + <Reference Include="System.Xml" /> + <Reference Include="taglib-sharp, Version=2.0.2.17, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\mediaportal\MediaPortal.Base\taglib-sharp.dll</HintPath> + </Reference> + <Reference Include="Utils, Version=2.2.6.30715, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\mediaportal\Utils\bin\Debug\Utils.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="MusicRatingUpdater.cs" /> + <Compile Include="MusicRatingUpdaterSettings.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="MusicRatingUpdaterSettings.designer.cs"> + <DependentUpon>MusicRatingUpdaterSettings.cs</DependentUpon> + </Compile> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> + <Visible>False</Visible> + <ProductName>Microsoft.Net.Framework.2.0</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="MusicRatingUpdaterSettings.resx"> + <DependentUpon>MusicRatingUpdaterSettings.cs</DependentUpon> + </EmbeddedResource> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj.user =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj.user (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdater.csproj.user 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,23 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <PublishUrlHistory> + </PublishUrlHistory> + <InstallUrlHistory> + </InstallUrlHistory> + <SupportUrlHistory> + </SupportUrlHistory> + <UpdateUrlHistory> + </UpdateUrlHistory> + <BootstrapperUrlHistory> + </BootstrapperUrlHistory> + <ErrorReportUrlHistory> + </ErrorReportUrlHistory> + <FallbackCulture>en-US</FallbackCulture> + <VerifyUploadedFiles>false</VerifyUploadedFiles> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <StartAction>Program</StartAction> + <StartProgram>D:\Source\mediaportal\xbmc\bin\debug\Configuration.exe</StartProgram> + <StartWorkingDirectory>D:\Source\mediaportal\xbmc\bin\debug</StartWorkingDirectory> + </PropertyGroup> +</Project> \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.Designer.cs =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.Designer.cs (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.Designer.cs 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,193 @@ +namespace MediaPortal.Plugins +{ + partial class MusicRatingUpdaterSettings + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.mpGroupBoxRatingType = new MediaPortal.UserInterface.Controls.MPGroupBox(); + this.rbWMPRating = new MediaPortal.UserInterface.Controls.MPRadioButton(); + this.rbStarRating = new MediaPortal.UserInterface.Controls.MPRadioButton(); + this.mpGroupBoxBatchUpdate = new MediaPortal.UserInterface.Controls.MPGroupBox(); + this.lbStatus = new MediaPortal.UserInterface.Controls.MPLabel(); + this.btStop = new MediaPortal.UserInterface.Controls.MPButton(); + this.btStart = new MediaPortal.UserInterface.Controls.MPButton(); + this.btCancel = new MediaPortal.UserInterface.Controls.MPButton(); + this.btOk = new MediaPortal.UserInterface.Controls.MPButton(); + this.checkBoxUpdateRealTime = new MediaPortal.UserInterface.Controls.MPCheckBox(); + this.mpGroupBoxRatingType.SuspendLayout(); + this.mpGroupBoxBatchUpdate.SuspendLayout(); + this.SuspendLayout(); + // + // mpGroupBoxRatingType + // + this.mpGroupBoxRatingType.Controls.Add(this.rbWMPRating); + this.mpGroupBoxRatingType.Controls.Add(this.rbStarRating); + this.mpGroupBoxRatingType.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.mpGroupBoxRatingType.Location = new System.Drawing.Point(13, 54); + this.mpGroupBoxRatingType.Name = "mpGroupBoxRatingType"; + this.mpGroupBoxRatingType.Size = new System.Drawing.Size(408, 76); + this.mpGroupBoxRatingType.TabIndex = 0; + this.mpGroupBoxRatingType.TabStop = false; + this.mpGroupBoxRatingType.Text = "Write Ratings to file in ..."; + // + // rbWMPRating + // + this.rbWMPRating.AutoSize = true; + this.rbWMPRating.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.rbWMPRating.Location = new System.Drawing.Point(11, 47); + this.rbWMPRating.Name = "rbWMPRating"; + this.rbWMPRating.Size = new System.Drawing.Size(237, 17); + this.rbWMPRating.TabIndex = 1; + this.rbWMPRating.TabStop = true; + this.rbWMPRating.Text = "Windows Media Player (WMP) Rating Format"; + this.rbWMPRating.UseVisualStyleBackColor = true; + // + // rbStarRating + // + this.rbStarRating.AutoSize = true; + this.rbStarRating.Checked = true; + this.rbStarRating.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.rbStarRating.Location = new System.Drawing.Point(11, 23); + this.rbStarRating.Name = "rbStarRating"; + this.rbStarRating.Size = new System.Drawing.Size(145, 17); + this.rbStarRating.TabIndex = 0; + this.rbStarRating.TabStop = true; + this.rbStarRating.Text = "Star Rating Format ( 1 - 5)"; + this.rbStarRating.UseVisualStyleBackColor = true; + // + // mpGroupBoxBatchUpdate + // + this.mpGroupBoxBatchUpdate.Controls.Add(this.lbStatus); + this.mpGroupBoxBatchUpdate.Controls.Add(this.btStop); + this.mpGroupBoxBatchUpdate.Controls.Add(this.btStart); + this.mpGroupBoxBatchUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.mpGroupBoxBatchUpdate.Location = new System.Drawing.Point(13, 137); + this.mpGroupBoxBatchUpdate.Name = "mpGroupBoxBatchUpdate"; + this.mpGroupBoxBatchUpdate.Size = new System.Drawing.Size(408, 100); + this.mpGroupBoxBatchUpdate.TabIndex = 1; + this.mpGroupBoxBatchUpdate.TabStop = false; + this.mpGroupBoxBatchUpdate.Text = "Batch Update"; + // + // lbStatus + // + this.lbStatus.AutoSize = true; + this.lbStatus.Location = new System.Drawing.Point(8, 30); + this.lbStatus.Name = "lbStatus"; + this.lbStatus.Size = new System.Drawing.Size(0, 13); + this.lbStatus.TabIndex = 2; + // + // btStop + // + this.btStop.Location = new System.Drawing.Point(327, 63); + this.btStop.Name = "btStop"; + this.btStop.Size = new System.Drawing.Size(75, 23); + this.btStop.TabIndex = 1; + this.btStop.Text = "Stop"; + this.btStop.UseVisualStyleBackColor = true; + this.btStop.Click += new System.EventHandler(this.btStop_Click); + // + // btStart + // + this.btStart.Location = new System.Drawing.Point(246, 63); + this.btStart.Name = "btStart"; + this.btStart.Size = new System.Drawing.Size(75, 23); + this.btStart.TabIndex = 0; + this.btStart.Text = "Start"; + this.btStart.UseVisualStyleBackColor = true; + this.btStart.Click += new System.EventHandler(this.btStart_Click); + // + // btCancel + // + this.btCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btCancel.Location = new System.Drawing.Point(340, 277); + this.btCancel.Name = "btCancel"; + this.btCancel.Size = new System.Drawing.Size(75, 23); + this.btCancel.TabIndex = 2; + this.btCancel.Text = "Cancel"; + this.btCancel.UseVisualStyleBackColor = true; + this.btCancel.Click += new System.EventHandler(this.btCancel_Click); + // + // btOk + // + this.btOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btOk.Location = new System.Drawing.Point(259, 277); + this.btOk.Name = "btOk"; + this.btOk.Size = new System.Drawing.Size(75, 23); + this.btOk.TabIndex = 3; + this.btOk.Text = "Ok"; + this.btOk.UseVisualStyleBackColor = true; + this.btOk.Click += new System.EventHandler(this.btOk_Click); + // + // checkBoxUpdateRealTime + // + this.checkBoxUpdateRealTime.AutoSize = true; + this.checkBoxUpdateRealTime.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.checkBoxUpdateRealTime.Location = new System.Drawing.Point(24, 22); + this.checkBoxUpdateRealTime.Name = "checkBoxUpdateRealTime"; + this.checkBoxUpdateRealTime.Size = new System.Drawing.Size(325, 17); + this.checkBoxUpdateRealTime.TabIndex = 4; + this.checkBoxUpdateRealTime.Text = "Update Ratings automatically when changed within MediaPortal"; + this.checkBoxUpdateRealTime.UseVisualStyleBackColor = true; + // + // MusicRatingUpdaterSettings + // + this.AcceptButton = this.btOk; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.btCancel; + this.ClientSize = new System.Drawing.Size(433, 312); + this.Controls.Add(this.checkBoxUpdateRealTime); + this.Controls.Add(this.btOk); + this.Controls.Add(this.btCancel); + this.Controls.Add(this.mpGroupBoxBatchUpdate); + this.Controls.Add(this.mpGroupBoxRatingType); + this.Name = "MusicRatingUpdaterSettings"; + this.Text = "Music Rating Updater - Setup"; + this.mpGroupBoxRatingType.ResumeLayout(false); + this.mpGroupBoxRatingType.PerformLayout(); + this.mpGroupBoxBatchUpdate.ResumeLayout(false); + this.mpGroupBoxBatchUpdate.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBoxRatingType; + private MediaPortal.UserInterface.Controls.MPRadioButton rbWMPRating; + private MediaPortal.UserInterface.Controls.MPRadioButton rbStarRating; + private MediaPortal.UserInterface.Controls.MPGroupBox mpGroupBoxBatchUpdate; + private MediaPortal.UserInterface.Controls.MPButton btStop; + private MediaPortal.UserInterface.Controls.MPButton btStart; + private MediaPortal.UserInterface.Controls.MPButton btCancel; + private MediaPortal.UserInterface.Controls.MPButton btOk; + private MediaPortal.UserInterface.Controls.MPLabel lbStatus; + private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxUpdateRealTime; + } +} \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.cs =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.cs (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.cs 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,129 @@ +#region Copyright (C) 2011 Helmut Wahrmann +// Copyright (C) 2011 Helmut Wahrmann +// http://www.team-mediaportal.com +// +// MPTagThat 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 2 of the License, or +// (at your option) any later version. +// +// MPTagThat 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 MediaPortal. If not, see <http://www.gnu.org/licenses/>. +#endregion +#region + +using System; +using MediaPortal.Configuration; +using MediaPortal.Profile; +using MediaPortal.UserInterface.Controls; + +#endregion + +namespace MediaPortal.Plugins +{ + public partial class MusicRatingUpdaterSettings : MPConfigForm + { + #region Variables + + private readonly MusicRatingUpdater main; + + #endregion + + #region Properties + + public MPLabel StatusLabel + { + get { return lbStatus; } + } + + public string RatingType + { + get { return rbStarRating.Checked ? "star" : "wmp"; } + } + + #endregion + + #region ctor + + public MusicRatingUpdaterSettings(MusicRatingUpdater main) + { + this.main = main; + InitializeComponent(); + LoadSettings(); + } + + #endregion + + #region Serialization + + private void LoadSettings() + { + // load settings + using (Settings reader = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + string type = reader.GetValueAsString("musicratingupdater", "ratingtype", "star"); + rbStarRating.Checked = type == "star" ? true : false; + rbWMPRating.Checked = type == "wmp" ? true : false; + + checkBoxUpdateRealTime.Checked = reader.GetValueAsBool("musicratingupdater", "realtimeupdate", false); + } + } + + private void SaveSettings() + { + // save settings + using (Settings writer = new Settings(Config.GetFile(Config.Dir.Config, "mediaportal.xml"))) + { + string type = "star"; + if (rbWMPRating.Checked) + { + type = "wmp"; + } + writer.SetValue("musicratingupdater", "ratingtype", type); + writer.SetValueAsBool("musicratingupdater", "realtimeupdate", checkBoxUpdateRealTime.Checked); + } + } + + #endregion + + #region Event Handler + + private void btOk_Click(object sender, EventArgs e) + { + // save settings + SaveSettings(); + //close form + Close(); + } + + private void btCancel_Click(object sender, EventArgs e) + { + // restore settings + LoadSettings(); + //close form + Close(); + } + + /// <summary> + /// Start the Batch Updater + /// </summary> + /// <param name = "sender"></param> + /// <param name = "e"></param> + private void btStart_Click(object sender, EventArgs e) + { + main.StartBatchUpdate(); + } + + private void btStop_Click(object sender, EventArgs e) + { + main.StopBatchUpdate(); + } + + #endregion + } +} \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.resx =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.resx (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/MusicRatingUpdaterSettings.resx 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/Properties/AssemblyInfo.cs (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater/Properties/AssemblyInfo.cs 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,43 @@ +#region + +using System.Reflection; +using System.Runtime.InteropServices; + +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. + +[assembly: AssemblyTitle("MusicRatingUpdater")] +[assembly: AssemblyDescription("MediaPortal Plugin to update the Star Ratings in the Files")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Helmut Wahrmann")] +[assembly: AssemblyProduct("MusicRatingUpdater")] +[assembly: AssemblyCopyright("Copyright © 2011")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. + +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM + +[assembly: Guid("e3ad499c-00b5-4114-8799-ac5768fd1c74")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file Added: trunk/plugins/MusicRatingUpdater/MusicRatingUpdater.sln =================================================================== --- trunk/plugins/MusicRatingUpdater/MusicRatingUpdater.sln (rev 0) +++ trunk/plugins/MusicRatingUpdater/MusicRatingUpdater.sln 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicRatingUpdater", "MusicRatingUpdater\MusicRatingUpdater.csproj", "{27F417A4-6D27-4952-B0FC-FDCE9101A7DD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Debug|x86.ActiveCfg = Debug|x86 + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Debug|x86.Build.0 = Debug|x86 + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Release|Any CPU.Build.0 = Release|Any CPU + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Release|x86.ActiveCfg = Release|x86 + {27F417A4-6D27-4952-B0FC-FDCE9101A7DD}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 =================================================================== --- trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 (rev 0) +++ trunk/plugins/MusicRatingUpdater/setup/MusicRatingUpdater.xmp2 2011-02-12 16:50:15 UTC (rev 4103) @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="utf-8"?> +<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Default"> + <ParentGroup /> + <DisplayName>Music Rating Updater</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Music Rating Updater</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>..\MusicRatingUpdater\bin\Release\MusicRatingUpdater.dll</LocalFileName> + <ZipFileName>Installer{CopyFile}\{4c4da61b-2f5a-4fe8-8c87-40a68b1fa96f}-MusicRatingUpdater.dll</ZipFileName> + <DestinationFilename>%Plugins%\process\MusicRatingUpdater.dll</DestinationFilename> + </FileItem> + </Items> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items> + <SectionItem Guid="8b2bba82-51b8-4559-97e5-6c6dee40691d" Name="Welcome Screen" ConditionGroup=""> + <Params> + <Items> + <SectionParam Name="Header text"> + <Value>Welcome to the Extension Installer for [Name]</Value> + <ValueType>String</ValueType> + <Description /> + </SectionParam> + <SectionParam Name="Description"> + <Value>This will install [Name] version [Version] on your computer. +It is recommended that you close all other applications before continuing. +Click Next to continue or Cancel to exit Setup.</Value> + <ValueType>String</ValueType> + <Description /> + </SectionParam> + <SectionParam Name="Left part image"> + <Value /> + <ValueType>File</ValueType> + <Description /> + </SectionParam> + <SectionParam Name="Header image"> + <Value /> + <ValueType>File</ValueType> + <Description>Image in upper right part</Description> + </SectionParam> + </Items> + </Params> + <Actions> + <Items /> + </Actions> + <IncludedGroups /> + <PanelName>Welcome Screen</PanelName> + <WizardButtonsEnum>NextCancel</WizardButtonsEnum> + </SectionItem> + <SectionItem Guid="9d3c22c4-57b0-4109-998f-ece05080cacb" Name="Install Section" ConditionGroup=""> + <Params> + <Items> + <SectionParam Name="Header Title"> + <Value /> + <ValueType>String</ValueType> + <Description>Header title</Description> + </SectionParam> + <SectionParam Name="Header description"> + <Value /> + <ValueType>String</ValueType> + <Description>Description of section, shown in under section title</Description> + </SectionParam> + <SectionParam Name="Header image"> + <Value /> + <ValueType>File</ValueType> + <Description>Image in upper right part</Description> + </SectionParam> + </Items> + </Params> + <Actions> + <Items> + <ActionItem Name="InstallFiles" ActionType="InstallFiles" ConditionGroup=""> + <Params> + <Items /> + </Params> + <ExecuteLocation>AfterPanelShow</ExecuteLocation> + </ActionItem> + </Items> + </Actions> + <IncludedGroups /> + <PanelName>Install Section</PanelName> + <WizardButtonsEnum>Next</WizardButtonsEnum> + </SectionItem> + <SectionItem Guid="ddc37054-1848-4231-8131-358ef51f19a2" Name="Setup Complete" ConditionGroup=""> + <Params> + <Items> + <SectionParam Name="Header text"> + <Value>The Extension Installer Wizard has successfully installed [Name].</Value> + <ValueType>String</ValueType> + <Description /> + </SectionParam> + <SectionParam Name="Left part image"> + <Value /> + <ValueType>File</ValueType> + <Description /> + </SectionParam> + <SectionParam Name="Show radio buttons"> + <Value /> + <ValueType>Bool</ValueType> + <Description>Use radiobutton in place of combobox</Description> + </SectionParam> + <SectionParam Name="Header image"> + <Value /> + <ValueType>File</ValueType> + <Description>Image in upper right part</Description> + </SectionParam> + </Items> + </Params> + <Actions> + <Items /> + </Actions> + <IncludedGroups /> + <PanelName>Setup Complete</PanelName> + <WizardButtonsEnum>Finish</WizardButtonsEnum> + </SectionItem> + </Items> + </Sections> + <Dependencies> + <Items /> + </Dependencies> + <GeneralInfo> + <Name>Music Rating Updater</Name> + <Id>f11d4e87-8755-4be4-83d6-6509d4cac244</Id> + <Author>Helmut Wahrmann (hwahrmann)</Author> + <HomePage>www.team-mediaportal.com</HomePage> + <ForumPage /> + <UpdateUrl /> + <Version> + <Major>1</Major> + <Minor>0</Minor> + <Build>0</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Have you ever wanted the ratings from the Music Now Playing available in the tags of the file, to be used by other applications? + +Now there's a solution. + +With the MusicRatingUpdater Plugin activated you have the ratings instantly available in your files. + +Ratings can be stored in "Star Rating", 1 - 5, or in Windows Media Player Format. + +The plugin has an automatic mode, by which it listens to changes in the ratings, which a user does in the Now Playing screen and will update the file as soon as it finishes. + +The second option is a Batch update, which is available via the plugin's config dialog. This option reads all available ratings for songs found in the MediaPortal Music Database and updates the physical file.</ExtensionDescription> + <VersionDescription /> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation /> + <ReleaseDate>2011-02-12T16:35:08.2807162+01:00</ReleaseDate> + <Tags>music rating stars</Tags> + <Location>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.mpe1</Location> + <Params> + <Items> + <SectionParam Name="Icon"> + <Value /> + <ValueType>File</ValueType> + <Description>The icon file of the package (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Online Icon"> + <Value /> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value /> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>yes</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>..\MusicRatingUpdater\bin\Release\MusicRatingUpdater.dll</LocalFileName> + <ZipFileName>Installer{CopyFile}\{4c4da61b-2f5a-4fe8-8c87-40a68b1fa96f}-MusicRatingUpdater.dll</ZipFileName> + <DestinationFilename>%Plugins%\process\MusicRatingUpdater.dll</DestinationFilename> + </FileItem> + </Items> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + <ProjectFilename>D:\Documents\Source\Mp1\mp-plugins\MusicRatingUpdater\setup\MusicRatingUpdater.xmp2</ProjectFilename> + <UpdatePath1 /> + <UpdatePath2 /> + <UpdatePath3 /> + </ProjectSettings> +</PackageClass> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-09 20:04:14
|
Revision: 4102 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4102&view=rev Author: kroko_koenig Date: 2011-02-09 20:04:05 +0000 (Wed, 09 Feb 2011) Log Message: ----------- add some buttons and docx to doc Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_splash.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/plugins.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowPlaying/NowPlaying.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Picturesfullscreen.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Plugins.java trunk/plugins/AndroidRemote/Release/blue3_remote.jpg trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/SomeUtils.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_blue.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_green.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_red.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_yellow.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_blue.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_green.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_red.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_yellow.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MyImageButton.java trunk/plugins/AndroidRemote/Release/Install Android Remote.doc trunk/plugins/AndroidRemote/Release/Using Android Remote.doc Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-08 12:25:43 UTC (rev 4101) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-09 20:04:05 UTC (rev 4102) @@ -20,177 +20,185 @@ public static final int ic_launcher_icon=0x7f020003; public static final int ic_menu_skin1_back=0x7f020004; public static final int ic_menu_skin1_backward=0x7f020005; - public static final int ic_menu_skin1_channel_m=0x7f020006; - public static final int ic_menu_skin1_channel_p=0x7f020007; - public static final int ic_menu_skin1_document=0x7f020008; - public static final int ic_menu_skin1_down=0x7f020009; - public static final int ic_menu_skin1_forward=0x7f02000a; - public static final int ic_menu_skin1_fullscreen=0x7f02000b; - public static final int ic_menu_skin1_home=0x7f02000c; - public static final int ic_menu_skin1_info=0x7f02000d; - public static final int ic_menu_skin1_left=0x7f02000e; - public static final int ic_menu_skin1_logo=0x7f02000f; - public static final int ic_menu_skin1_menu=0x7f020010; - public static final int ic_menu_skin1_minus=0x7f020011; - public static final int ic_menu_skin1_music=0x7f020012; - public static final int ic_menu_skin1_now_playing=0x7f020013; - public static final int ic_menu_skin1_osd=0x7f020014; - public static final int ic_menu_skin1_pause=0x7f020015; - public static final int ic_menu_skin1_pictures=0x7f020016; - public static final int ic_menu_skin1_play=0x7f020017; - public static final int ic_menu_skin1_plugins=0x7f020018; - public static final int ic_menu_skin1_plus=0x7f020019; - public static final int ic_menu_skin1_power=0x7f02001a; - public static final int ic_menu_skin1_radio=0x7f02001b; - public static final int ic_menu_skin1_ratio=0x7f02001c; - public static final int ic_menu_skin1_remote=0x7f02001d; - public static final int ic_menu_skin1_right=0x7f02001e; - public static final int ic_menu_skin1_select=0x7f02001f; - public static final int ic_menu_skin1_skip_backward=0x7f020020; - public static final int ic_menu_skin1_skip_forward=0x7f020021; - public static final int ic_menu_skin1_stop=0x7f020022; - public static final int ic_menu_skin1_subtitles=0x7f020023; - public static final int ic_menu_skin1_up=0x7f020024; - public static final int ic_menu_skin1_video=0x7f020025; - public static final int ic_menu_skin1_vol_m=0x7f020026; - public static final int ic_menu_skin1_vol_p=0x7f020027; - public static final int ic_menu_skin1_weather=0x7f020028; - public static final int ic_menu_skin2_back=0x7f020029; - public static final int ic_menu_skin2_backward=0x7f02002a; - public static final int ic_menu_skin2_channel_m=0x7f02002b; - public static final int ic_menu_skin2_channel_p=0x7f02002c; - public static final int ic_menu_skin2_document=0x7f02002d; - public static final int ic_menu_skin2_down=0x7f02002e; - public static final int ic_menu_skin2_forward=0x7f02002f; - public static final int ic_menu_skin2_fullscreen=0x7f020030; - public static final int ic_menu_skin2_home=0x7f020031; - public static final int ic_menu_skin2_info=0x7f020032; - public static final int ic_menu_skin2_left=0x7f020033; - public static final int ic_menu_skin2_logo=0x7f020034; - public static final int ic_menu_skin2_menu=0x7f020035; - public static final int ic_menu_skin2_minus=0x7f020036; - public static final int ic_menu_skin2_music=0x7f020037; - public static final int ic_menu_skin2_now_playing=0x7f020038; - public static final int ic_menu_skin2_osd=0x7f020039; - public static final int ic_menu_skin2_pause=0x7f02003a; - public static final int ic_menu_skin2_pictures=0x7f02003b; - public static final int ic_menu_skin2_play=0x7f02003c; - public static final int ic_menu_skin2_plugins=0x7f02003d; - public static final int ic_menu_skin2_plus=0x7f02003e; - public static final int ic_menu_skin2_power=0x7f02003f; - public static final int ic_menu_skin2_radio=0x7f020040; - public static final int ic_menu_skin2_ratio=0x7f020041; - public static final int ic_menu_skin2_remote=0x7f020042; - public static final int ic_menu_skin2_right=0x7f020043; - public static final int ic_menu_skin2_select=0x7f020044; - public static final int ic_menu_skin2_skip_backward=0x7f020045; - public static final int ic_menu_skin2_skip_forward=0x7f020046; - public static final int ic_menu_skin2_stop=0x7f020047; - public static final int ic_menu_skin2_subtitles=0x7f020048; - public static final int ic_menu_skin2_up=0x7f020049; - public static final int ic_menu_skin2_video=0x7f02004a; - public static final int ic_menu_skin2_vol_m=0x7f02004b; - public static final int ic_menu_skin2_vol_p=0x7f02004c; - public static final int ic_menu_skin2_weather=0x7f02004d; - public static final int ic_skin1_border=0x7f02004e; - public static final int ic_skin1_cdcover=0x7f02004f; - public static final int ic_skin1_file_audio=0x7f020050; - public static final int ic_skin1_file_folder=0x7f020051; - public static final int ic_skin1_file_folderback=0x7f020052; - public static final int ic_skin1_file_movie=0x7f020053; - public static final int ic_skin1_file_picture=0x7f020054; - public static final int ic_skin1_file_playlist=0x7f020055; - public static final int ic_skin1_splash=0x7f020056; - public static final int ic_skin2_cdcover=0x7f020057; - public static final int ic_skin2_file_audio=0x7f020058; - public static final int ic_skin2_file_folder=0x7f020059; - public static final int ic_skin2_file_folderback=0x7f02005a; - public static final int ic_skin2_file_movie=0x7f02005b; - public static final int ic_skin2_file_picture=0x7f02005c; - public static final int ic_skin2_file_playlist=0x7f02005d; - public static final int ic_skin2_splash=0x7f02005e; - public static final int ic_tab_album=0x7f02005f; - public static final int ic_tab_album_off=0x7f020060; - public static final int ic_tab_album_on=0x7f020061; - public static final int ic_tab_artist=0x7f020062; - public static final int ic_tab_artist_off=0x7f020063; - public static final int ic_tab_artist_on=0x7f020064; - public static final int ic_tab_music=0x7f020065; - public static final int ic_tab_music_off=0x7f020066; - public static final int ic_tab_music_on=0x7f020067; - public static final int ic_tab_song=0x7f020068; - public static final int ic_tab_song_off=0x7f020069; - public static final int ic_tab_song_on=0x7f02006a; - public static final int ic_weather_0=0x7f02006b; - public static final int ic_weather_1=0x7f02006c; - public static final int ic_weather_10=0x7f02006d; - public static final int ic_weather_11=0x7f02006e; - public static final int ic_weather_12=0x7f02006f; - public static final int ic_weather_13=0x7f020070; - public static final int ic_weather_14=0x7f020071; - public static final int ic_weather_15=0x7f020072; - public static final int ic_weather_16=0x7f020073; - public static final int ic_weather_17=0x7f020074; - public static final int ic_weather_18=0x7f020075; - public static final int ic_weather_19=0x7f020076; - public static final int ic_weather_2=0x7f020077; - public static final int ic_weather_20=0x7f020078; - public static final int ic_weather_21=0x7f020079; - public static final int ic_weather_22=0x7f02007a; - public static final int ic_weather_23=0x7f02007b; - public static final int ic_weather_24=0x7f02007c; - public static final int ic_weather_25=0x7f02007d; - public static final int ic_weather_26=0x7f02007e; - public static final int ic_weather_27=0x7f02007f; - public static final int ic_weather_28=0x7f020080; - public static final int ic_weather_29=0x7f020081; - public static final int ic_weather_3=0x7f020082; - public static final int ic_weather_30=0x7f020083; - public static final int ic_weather_31=0x7f020084; - public static final int ic_weather_32=0x7f020085; - public static final int ic_weather_33=0x7f020086; - public static final int ic_weather_34=0x7f020087; - public static final int ic_weather_35=0x7f020088; - public static final int ic_weather_36=0x7f020089; - public static final int ic_weather_37=0x7f02008a; - public static final int ic_weather_38=0x7f02008b; - public static final int ic_weather_39=0x7f02008c; - public static final int ic_weather_4=0x7f02008d; - public static final int ic_weather_40=0x7f02008e; - public static final int ic_weather_41=0x7f02008f; - public static final int ic_weather_42=0x7f020090; - public static final int ic_weather_43=0x7f020091; - public static final int ic_weather_44=0x7f020092; - public static final int ic_weather_45=0x7f020093; - public static final int ic_weather_46=0x7f020094; - public static final int ic_weather_47=0x7f020095; - public static final int ic_weather_5=0x7f020096; - public static final int ic_weather_6=0x7f020097; - public static final int ic_weather_7=0x7f020098; - public static final int ic_weather_8=0x7f020099; - public static final int ic_weather_9=0x7f02009a; - public static final int ic_weather_na=0x7f02009b; - public static final int ic_weather_weatheralert=0x7f02009c; - public static final int permission=0x7f02009d; + public static final int ic_menu_skin1_blue=0x7f020006; + public static final int ic_menu_skin1_channel_m=0x7f020007; + public static final int ic_menu_skin1_channel_p=0x7f020008; + public static final int ic_menu_skin1_document=0x7f020009; + public static final int ic_menu_skin1_down=0x7f02000a; + public static final int ic_menu_skin1_forward=0x7f02000b; + public static final int ic_menu_skin1_fullscreen=0x7f02000c; + public static final int ic_menu_skin1_green=0x7f02000d; + public static final int ic_menu_skin1_home=0x7f02000e; + public static final int ic_menu_skin1_info=0x7f02000f; + public static final int ic_menu_skin1_left=0x7f020010; + public static final int ic_menu_skin1_logo=0x7f020011; + public static final int ic_menu_skin1_menu=0x7f020012; + public static final int ic_menu_skin1_minus=0x7f020013; + public static final int ic_menu_skin1_music=0x7f020014; + public static final int ic_menu_skin1_now_playing=0x7f020015; + public static final int ic_menu_skin1_osd=0x7f020016; + public static final int ic_menu_skin1_pause=0x7f020017; + public static final int ic_menu_skin1_pictures=0x7f020018; + public static final int ic_menu_skin1_play=0x7f020019; + public static final int ic_menu_skin1_plugins=0x7f02001a; + public static final int ic_menu_skin1_plus=0x7f02001b; + public static final int ic_menu_skin1_power=0x7f02001c; + public static final int ic_menu_skin1_radio=0x7f02001d; + public static final int ic_menu_skin1_ratio=0x7f02001e; + public static final int ic_menu_skin1_red=0x7f02001f; + public static final int ic_menu_skin1_remote=0x7f020020; + public static final int ic_menu_skin1_right=0x7f020021; + public static final int ic_menu_skin1_select=0x7f020022; + public static final int ic_menu_skin1_skip_backward=0x7f020023; + public static final int ic_menu_skin1_skip_forward=0x7f020024; + public static final int ic_menu_skin1_stop=0x7f020025; + public static final int ic_menu_skin1_subtitles=0x7f020026; + public static final int ic_menu_skin1_up=0x7f020027; + public static final int ic_menu_skin1_video=0x7f020028; + public static final int ic_menu_skin1_vol_m=0x7f020029; + public static final int ic_menu_skin1_vol_p=0x7f02002a; + public static final int ic_menu_skin1_weather=0x7f02002b; + public static final int ic_menu_skin1_yellow=0x7f02002c; + public static final int ic_menu_skin2_back=0x7f02002d; + public static final int ic_menu_skin2_backward=0x7f02002e; + public static final int ic_menu_skin2_blue=0x7f02002f; + public static final int ic_menu_skin2_channel_m=0x7f020030; + public static final int ic_menu_skin2_channel_p=0x7f020031; + public static final int ic_menu_skin2_document=0x7f020032; + public static final int ic_menu_skin2_down=0x7f020033; + public static final int ic_menu_skin2_forward=0x7f020034; + public static final int ic_menu_skin2_fullscreen=0x7f020035; + public static final int ic_menu_skin2_green=0x7f020036; + public static final int ic_menu_skin2_home=0x7f020037; + public static final int ic_menu_skin2_info=0x7f020038; + public static final int ic_menu_skin2_left=0x7f020039; + public static final int ic_menu_skin2_logo=0x7f02003a; + public static final int ic_menu_skin2_menu=0x7f02003b; + public static final int ic_menu_skin2_minus=0x7f02003c; + public static final int ic_menu_skin2_music=0x7f02003d; + public static final int ic_menu_skin2_now_playing=0x7f02003e; + public static final int ic_menu_skin2_osd=0x7f02003f; + public static final int ic_menu_skin2_pause=0x7f020040; + public static final int ic_menu_skin2_pictures=0x7f020041; + public static final int ic_menu_skin2_play=0x7f020042; + public static final int ic_menu_skin2_plugins=0x7f020043; + public static final int ic_menu_skin2_plus=0x7f020044; + public static final int ic_menu_skin2_power=0x7f020045; + public static final int ic_menu_skin2_radio=0x7f020046; + public static final int ic_menu_skin2_ratio=0x7f020047; + public static final int ic_menu_skin2_red=0x7f020048; + public static final int ic_menu_skin2_remote=0x7f020049; + public static final int ic_menu_skin2_right=0x7f02004a; + public static final int ic_menu_skin2_select=0x7f02004b; + public static final int ic_menu_skin2_skip_backward=0x7f02004c; + public static final int ic_menu_skin2_skip_forward=0x7f02004d; + public static final int ic_menu_skin2_stop=0x7f02004e; + public static final int ic_menu_skin2_subtitles=0x7f02004f; + public static final int ic_menu_skin2_up=0x7f020050; + public static final int ic_menu_skin2_video=0x7f020051; + public static final int ic_menu_skin2_vol_m=0x7f020052; + public static final int ic_menu_skin2_vol_p=0x7f020053; + public static final int ic_menu_skin2_weather=0x7f020054; + public static final int ic_menu_skin2_yellow=0x7f020055; + public static final int ic_skin1_border=0x7f020056; + public static final int ic_skin1_cdcover=0x7f020057; + public static final int ic_skin1_file_audio=0x7f020058; + public static final int ic_skin1_file_folder=0x7f020059; + public static final int ic_skin1_file_folderback=0x7f02005a; + public static final int ic_skin1_file_movie=0x7f02005b; + public static final int ic_skin1_file_picture=0x7f02005c; + public static final int ic_skin1_file_playlist=0x7f02005d; + public static final int ic_skin1_splash=0x7f02005e; + public static final int ic_skin2_cdcover=0x7f02005f; + public static final int ic_skin2_file_audio=0x7f020060; + public static final int ic_skin2_file_folder=0x7f020061; + public static final int ic_skin2_file_folderback=0x7f020062; + public static final int ic_skin2_file_movie=0x7f020063; + public static final int ic_skin2_file_picture=0x7f020064; + public static final int ic_skin2_file_playlist=0x7f020065; + public static final int ic_skin2_splash=0x7f020066; + public static final int ic_tab_album=0x7f020067; + public static final int ic_tab_album_off=0x7f020068; + public static final int ic_tab_album_on=0x7f020069; + public static final int ic_tab_artist=0x7f02006a; + public static final int ic_tab_artist_off=0x7f02006b; + public static final int ic_tab_artist_on=0x7f02006c; + public static final int ic_tab_music=0x7f02006d; + public static final int ic_tab_music_off=0x7f02006e; + public static final int ic_tab_music_on=0x7f02006f; + public static final int ic_tab_song=0x7f020070; + public static final int ic_tab_song_off=0x7f020071; + public static final int ic_tab_song_on=0x7f020072; + public static final int ic_weather_0=0x7f020073; + public static final int ic_weather_1=0x7f020074; + public static final int ic_weather_10=0x7f020075; + public static final int ic_weather_11=0x7f020076; + public static final int ic_weather_12=0x7f020077; + public static final int ic_weather_13=0x7f020078; + public static final int ic_weather_14=0x7f020079; + public static final int ic_weather_15=0x7f02007a; + public static final int ic_weather_16=0x7f02007b; + public static final int ic_weather_17=0x7f02007c; + public static final int ic_weather_18=0x7f02007d; + public static final int ic_weather_19=0x7f02007e; + public static final int ic_weather_2=0x7f02007f; + public static final int ic_weather_20=0x7f020080; + public static final int ic_weather_21=0x7f020081; + public static final int ic_weather_22=0x7f020082; + public static final int ic_weather_23=0x7f020083; + public static final int ic_weather_24=0x7f020084; + public static final int ic_weather_25=0x7f020085; + public static final int ic_weather_26=0x7f020086; + public static final int ic_weather_27=0x7f020087; + public static final int ic_weather_28=0x7f020088; + public static final int ic_weather_29=0x7f020089; + public static final int ic_weather_3=0x7f02008a; + public static final int ic_weather_30=0x7f02008b; + public static final int ic_weather_31=0x7f02008c; + public static final int ic_weather_32=0x7f02008d; + public static final int ic_weather_33=0x7f02008e; + public static final int ic_weather_34=0x7f02008f; + public static final int ic_weather_35=0x7f020090; + public static final int ic_weather_36=0x7f020091; + public static final int ic_weather_37=0x7f020092; + public static final int ic_weather_38=0x7f020093; + public static final int ic_weather_39=0x7f020094; + public static final int ic_weather_4=0x7f020095; + public static final int ic_weather_40=0x7f020096; + public static final int ic_weather_41=0x7f020097; + public static final int ic_weather_42=0x7f020098; + public static final int ic_weather_43=0x7f020099; + public static final int ic_weather_44=0x7f02009a; + public static final int ic_weather_45=0x7f02009b; + public static final int ic_weather_46=0x7f02009c; + public static final int ic_weather_47=0x7f02009d; + public static final int ic_weather_5=0x7f02009e; + public static final int ic_weather_6=0x7f02009f; + public static final int ic_weather_7=0x7f0200a0; + public static final int ic_weather_8=0x7f0200a1; + public static final int ic_weather_9=0x7f0200a2; + public static final int ic_weather_na=0x7f0200a3; + public static final int ic_weather_weatheralert=0x7f0200a4; + public static final int permission=0x7f0200a5; } public static final class id { public static final int GridView01=0x7f060015; public static final int ImageView01=0x7f06002c; - public static final int LinearLayout00=0x7f060063; - public static final int LinearLayout01=0x7f060033; - public static final int LinearLayout02=0x7f06006e; - public static final int LinearLayout03=0x7f060078; - public static final int LinearLayout04=0x7f060082; - public static final int LinearLayout05=0x7f060088; - public static final int ListView01=0x7f060041; - public static final int RadioGroup01=0x7f0600a5; - public static final int Spinner01=0x7f060097; + public static final int LinearLayout00=0x7f060066; + public static final int LinearLayout01=0x7f060041; + public static final int LinearLayout02=0x7f060071; + public static final int LinearLayout03=0x7f06007b; + public static final int LinearLayout04=0x7f060085; + public static final int LinearLayout05=0x7f06008b; + public static final int ListView01=0x7f060042; + public static final int RadioGroup01=0x7f0600a8; + public static final int Spinner01=0x7f06009a; public static final int SurfaceView01=0x7f060032; public static final int TableLayout01=0x7f060007; - public static final int TableLayout02=0x7f060053; + public static final int TableLayout02=0x7f060056; public static final int TableRow01=0x7f060008; - public static final int TableRow02=0x7f060058; - public static final int TableRow03=0x7f06005d; + public static final int TableRow02=0x7f06005b; + public static final int TableRow03=0x7f060060; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; public static final int btnAlbumSelDown=0x7f06001a; @@ -199,7 +207,7 @@ public static final int btnArtistSelUp=0x7f060020; public static final int btnResultSelDown=0x7f060022; public static final int btnResultSelUp=0x7f060024; - public static final int btnSelectSkin=0x7f060099; + public static final int btnSelectSkin=0x7f06009c; public static final int btnSongSelDown=0x7f060026; public static final int btnSongSelUp=0x7f060028; public static final int btn_main_music=0x7f06000a; @@ -211,88 +219,90 @@ public static final int btn_main_skp_back=0x7f060010; public static final int btn_main_skp_forw=0x7f060012; public static final int btn_main_video=0x7f06000b; - public static final int btn_plugins_radio=0x7f060043; - public static final int btn_plugins_weather=0x7f060042; - public static final int btnkey01=0x7f060064; - public static final int btnkey02=0x7f060065; - public static final int btnkey03=0x7f060066; - public static final int btnkey04=0x7f060067; - public static final int btnkey05=0x7f060068; - public static final int btnkey06=0x7f060069; - public static final int btnkey07=0x7f06006a; - public static final int btnkey08=0x7f06006b; - public static final int btnkey09=0x7f06006c; - public static final int btnkey10=0x7f06006d; - public static final int btnkey11=0x7f06006f; - public static final int btnkey12=0x7f060070; - public static final int btnkey13=0x7f060071; - public static final int btnkey14=0x7f060072; - public static final int btnkey15=0x7f060073; - public static final int btnkey16=0x7f060074; - public static final int btnkey17=0x7f060075; - public static final int btnkey18=0x7f060076; - public static final int btnkey19=0x7f060077; - public static final int btnkey20=0x7f060079; - public static final int btnkey21=0x7f06007a; - public static final int btnkey22=0x7f06007b; - public static final int btnkey23=0x7f06007c; - public static final int btnkey24=0x7f06007d; - public static final int btnkey25=0x7f06007e; - public static final int btnkey26=0x7f06007f; - public static final int btnkey27=0x7f060080; - public static final int btnkey28=0x7f060081; - public static final int btnkey29=0x7f060083; - public static final int btnkey30=0x7f060084; - public static final int btnkey31=0x7f060085; - public static final int btnkey32=0x7f060086; - public static final int btnkey33=0x7f060087; - public static final int btnkey41=0x7f060089; - public static final int btnkey42=0x7f06008a; - public static final int btnkey43=0x7f06008b; - public static final int btnkey44=0x7f06008c; - public static final int btnkey45=0x7f06008d; - public static final int btnkey46=0x7f06008e; - public static final int btnkey47=0x7f06008f; - public static final int btnkey48=0x7f060090; - public static final int btnkey49=0x7f060091; - public static final int btnkey50=0x7f060092; + public static final int btn_plugins_radio=0x7f060046; + public static final int btn_plugins_weather=0x7f060045; + public static final int btnkey01=0x7f060067; + public static final int btnkey02=0x7f060068; + public static final int btnkey03=0x7f060069; + public static final int btnkey04=0x7f06006a; + public static final int btnkey05=0x7f06006b; + public static final int btnkey06=0x7f06006c; + public static final int btnkey07=0x7f06006d; + public static final int btnkey08=0x7f06006e; + public static final int btnkey09=0x7f06006f; + public static final int btnkey10=0x7f060070; + public static final int btnkey11=0x7f060072; + public static final int btnkey12=0x7f060073; + public static final int btnkey13=0x7f060074; + public static final int btnkey14=0x7f060075; + public static final int btnkey15=0x7f060076; + public static final int btnkey16=0x7f060077; + public static final int btnkey17=0x7f060078; + public static final int btnkey18=0x7f060079; + public static final int btnkey19=0x7f06007a; + public static final int btnkey20=0x7f06007c; + public static final int btnkey21=0x7f06007d; + public static final int btnkey22=0x7f06007e; + public static final int btnkey23=0x7f06007f; + public static final int btnkey24=0x7f060080; + public static final int btnkey25=0x7f060081; + public static final int btnkey26=0x7f060082; + public static final int btnkey27=0x7f060083; + public static final int btnkey28=0x7f060084; + public static final int btnkey29=0x7f060086; + public static final int btnkey30=0x7f060087; + public static final int btnkey31=0x7f060088; + public static final int btnkey32=0x7f060089; + public static final int btnkey33=0x7f06008a; + public static final int btnkey41=0x7f06008c; + public static final int btnkey42=0x7f06008d; + public static final int btnkey43=0x7f06008e; + public static final int btnkey44=0x7f06008f; + public static final int btnkey45=0x7f060090; + public static final int btnkey46=0x7f060091; + public static final int btnkey47=0x7f060092; + public static final int btnkey48=0x7f060093; + public static final int btnkey49=0x7f060094; + public static final int btnkey50=0x7f060095; public static final int button_open=0x7f06002f; public static final int button_stream=0x7f060030; public static final int button_stream_stop=0x7f060031; - public static final int crtl_back=0x7f060050; - public static final int crtl_ch_m=0x7f06005c; - public static final int crtl_ch_p=0x7f060057; - public static final int crtl_down=0x7f06004f; - public static final int crtl_full=0x7f060059; - public static final int crtl_info=0x7f060061; - public static final int crtl_left=0x7f06004a; - public static final int crtl_menu=0x7f06005b; - public static final int crtl_mp=0x7f060046; - public static final int crtl_osd=0x7f060060; - public static final int crtl_parent=0x7f06004e; - public static final int crtl_play=0x7f06005a; - public static final int crtl_power=0x7f060048; - public static final int crtl_ratio=0x7f06005f; - public static final int crtl_right=0x7f06004c; - public static final int crtl_select=0x7f06004b; - public static final int crtl_skip_back=0x7f060054; - public static final int crtl_skip_forw=0x7f060056; - public static final int crtl_stop=0x7f060055; - public static final int crtl_sub=0x7f06005e; - public static final int crtl_up=0x7f060047; - public static final int crtl_vol_m=0x7f060052; - public static final int crtl_vol_p=0x7f060051; + public static final int crtl_back=0x7f060053; + public static final int crtl_ch_m=0x7f06005f; + public static final int crtl_ch_p=0x7f06005a; + public static final int crtl_down=0x7f060052; + public static final int crtl_full=0x7f06005c; + public static final int crtl_info=0x7f060064; + public static final int crtl_left=0x7f06004d; + public static final int crtl_menu=0x7f06005e; + public static final int crtl_mp=0x7f060049; + public static final int crtl_osd=0x7f060063; + public static final int crtl_parent=0x7f060051; + public static final int crtl_play=0x7f06005d; + public static final int crtl_power=0x7f06004b; + public static final int crtl_ratio=0x7f060062; + public static final int crtl_right=0x7f06004f; + public static final int crtl_select=0x7f06004e; + public static final int crtl_skip_back=0x7f060057; + public static final int crtl_skip_forw=0x7f060059; + public static final int crtl_stop=0x7f060058; + public static final int crtl_sub=0x7f060061; + public static final int crtl_up=0x7f06004a; + public static final int crtl_vol_m=0x7f060055; + public static final int crtl_vol_p=0x7f060054; public static final int full_text=0x7f06002b; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; - public static final int lay_IPsettings=0x7f06009a; - public static final int lay_global=0x7f060093; + public static final int lay_IPsettings=0x7f06009d; + public static final int lay_global=0x7f060096; public static final int lay_main=0x7f060005; public static final int lay_movies=0x7f060013; public static final int lay_music=0x7f060016; public static final int lay_pictures=0x7f060029; - public static final int lay_remote01=0x7f060044; - public static final int lay_selectSkin=0x7f0600a3; + public static final int lay_playnow=0x7f060033; + public static final int lay_plugins=0x7f060043; + public static final int lay_remote01=0x7f060047; + public static final int lay_selectSkin=0x7f0600a6; public static final int list_album=0x7f060019; public static final int list_artist=0x7f06001d; public static final int list_result=0x7f060021; @@ -313,21 +323,22 @@ public static final int now_progress=0x7f060037; public static final int now_stop=0x7f06003d; public static final int now_title=0x7f06003a; - public static final int radio01=0x7f0600d3; - public static final int radio02=0x7f0600d4; - public static final int radio03=0x7f0600d5; - public static final int radio04=0x7f0600d6; - public static final int radioStop=0x7f0600d7; - public static final int selectSkin1=0x7f0600a6; - public static final int selectSkin2=0x7f0600a8; - public static final int selectSkin3=0x7f0600aa; - public static final int server_ip=0x7f06009e; - public static final int server_macid=0x7f0600a2; - public static final int server_name=0x7f06009c; - public static final int server_port=0x7f0600a0; - public static final int splash=0x7f0600ac; + public static final int plugins_instance=0x7f060044; + public static final int radio01=0x7f0600d6; + public static final int radio02=0x7f0600d7; + public static final int radio03=0x7f0600d8; + public static final int radio04=0x7f0600d9; + public static final int radioStop=0x7f0600da; + public static final int selectSkin1=0x7f0600a9; + public static final int selectSkin2=0x7f0600ab; + public static final int selectSkin3=0x7f0600ad; + public static final int server_ip=0x7f0600a1; + public static final int server_macid=0x7f0600a5; + public static final int server_name=0x7f06009f; + public static final int server_port=0x7f0600a3; + public static final int splash=0x7f0600af; public static final int text_kb_streamed=0x7f06002d; - public static final int title=0x7f0600ad; + public static final int title=0x7f0600b0; public static final int txtDbAlbum=0x7f06001b; public static final int txtDbArtist=0x7f06001f; public static final int txtDbResult=0x7f060023; @@ -336,59 +347,59 @@ public static final int txtDirectoryMusic=0x7f060017; public static final int txtDirectoryPictures=0x7f06002a; public static final int txtFile=0x7f06002e; - public static final int txtGlobal=0x7f060094; - public static final int txtIntanceName=0x7f06009b; - public static final int txtMediaPortalIP=0x7f06009d; - public static final int txtMediaPortalMAC=0x7f0600a1; - public static final int txtMediaPortalPort=0x7f06009f; - public static final int txtPowerMode=0x7f060096; - public static final int txtSelectSkin=0x7f0600a4; - public static final int txtVersion=0x7f060095; - public static final int vibration=0x7f060098; - public static final int visitHome1=0x7f0600a7; - public static final int visitHome2=0x7f0600a9; - public static final int visitHome3=0x7f0600ab; - public static final int weather_0_cond=0x7f0600ce; - public static final int weather_0_date=0x7f0600b5; - public static final int weather_0_day=0x7f0600ba; - public static final int weather_0_hi=0x7f0600bf; - public static final int weather_0_img=0x7f0600c9; - public static final int weather_0_lo=0x7f0600c4; - public static final int weather_1_cond=0x7f0600cf; - public static final int weather_1_date=0x7f0600b6; - public static final int weather_1_day=0x7f0600bb; - public static final int weather_1_hi=0x7f0600c0; - public static final int weather_1_img=0x7f0600ca; - public static final int weather_1_lo=0x7f0600c5; - public static final int weather_2_cond=0x7f0600d0; - public static final int weather_2_date=0x7f0600b7; - public static final int weather_2_day=0x7f0600bc; - public static final int weather_2_hi=0x7f0600c1; - public static final int weather_2_img=0x7f0600cb; - public static final int weather_2_lo=0x7f0600c6; - public static final int weather_3_cond=0x7f0600d1; - public static final int weather_3_date=0x7f0600b8; - public static final int weather_3_day=0x7f0600bd; - public static final int weather_3_hi=0x7f0600c2; - public static final int weather_3_img=0x7f0600cc; - public static final int weather_3_lo=0x7f0600c7; - public static final int weather_4_cond=0x7f0600d2; - public static final int weather_4_date=0x7f0600b9; - public static final int weather_4_day=0x7f0600be; - public static final int weather_4_hi=0x7f0600c3; - public static final int weather_4_img=0x7f0600cd; - public static final int weather_4_lo=0x7f0600c8; - public static final int weather_actFeel=0x7f0600b3; - public static final int weather_actImage=0x7f0600ae; - public static final int weather_actPlace=0x7f0600b1; - public static final int weather_actTemp=0x7f0600b2; - public static final int weather_actText=0x7f0600af; - public static final int weather_actTime=0x7f0600b0; - public static final int weather_actWind=0x7f0600b4; - public static final int widget0=0x7f060062; - public static final int widget00=0x7f060045; - public static final int widget01=0x7f060049; - public static final int widget02=0x7f06004d; + public static final int txtGlobal=0x7f060097; + public static final int txtIntanceName=0x7f06009e; + public static final int txtMediaPortalIP=0x7f0600a0; + public static final int txtMediaPortalMAC=0x7f0600a4; + public static final int txtMediaPortalPort=0x7f0600a2; + public static final int txtPowerMode=0x7f060099; + public static final int txtSelectSkin=0x7f0600a7; + public static final int txtVersion=0x7f060098; + public static final int vibration=0x7f06009b; + public static final int visitHome1=0x7f0600aa; + public static final int visitHome2=0x7f0600ac; + public static final int visitHome3=0x7f0600ae; + public static final int weather_0_cond=0x7f0600d1; + public static final int weather_0_date=0x7f0600b8; + public static final int weather_0_day=0x7f0600bd; + public static final int weather_0_hi=0x7f0600c2; + public static final int weather_0_img=0x7f0600cc; + public static final int weather_0_lo=0x7f0600c7; + public static final int weather_1_cond=0x7f0600d2; + public static final int weather_1_date=0x7f0600b9; + public static final int weather_1_day=0x7f0600be; + public static final int weather_1_hi=0x7f0600c3; + public static final int weather_1_img=0x7f0600cd; + public static final int weather_1_lo=0x7f0600c8; + public static final int weather_2_cond=0x7f0600d3; + public static final int weather_2_date=0x7f0600ba; + public static final int weather_2_day=0x7f0600bf; + public static final int weather_2_hi=0x7f0600c4; + public static final int weather_2_img=0x7f0600ce; + public static final int weather_2_lo=0x7f0600c9; + public static final int weather_3_cond=0x7f0600d4; + public static final int weather_3_date=0x7f0600bb; + public static final int weather_3_day=0x7f0600c0; + public static final int weather_3_hi=0x7f0600c5; + public static final int weather_3_img=0x7f0600cf; + public static final int weather_3_lo=0x7f0600ca; + public static final int weather_4_cond=0x7f0600d5; + public static final int weather_4_date=0x7f0600bc; + public static final int weather_4_day=0x7f0600c1; + public static final int weather_4_hi=0x7f0600c6; + public static final int weather_4_img=0x7f0600d0; + public static final int weather_4_lo=0x7f0600cb; + public static final int weather_actFeel=0x7f0600b6; + public static final int weather_actImage=0x7f0600b1; + public static final int weather_actPlace=0x7f0600b4; + public static final int weather_actTemp=0x7f0600b5; + public static final int weather_actText=0x7f0600b2; + public static final int weather_actTime=0x7f0600b3; + public static final int weather_actWind=0x7f0600b7; + public static final int widget0=0x7f060065; + public static final int widget00=0x7f060048; + public static final int widget01=0x7f06004c; + public static final int widget02=0x7f060050; public static final int widget44=0x7f060000; } public static final class layout { Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_blue.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_green.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_red.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin1_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_blue.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_green.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_red.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_splash.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-08 12:25:43 UTC (rev 4101) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-09 20:04:05 UTC (rev 4102) @@ -73,12 +73,12 @@ <Button android:scaleType="fitXY" android:layout_height="60dip" android:layout_width="60dip" - android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_skip_backward"></Button> + android:id="@+id/btn_main_skp_back" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_marginRight="10dip"></Button> <ImageButton android:scaleType="fitXY" android:layout_height="60dip" android:layout_width="60dip" - android:id="@+id/btn_main_play" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_play"></ImageButton> + android:id="@+id/btn_main_play" android:background="@drawable/ic_menu_skin1_play"></ImageButton> <Button android:scaleType="fitXY" android:layout_height="60dip" android:layout_width="60dip" - android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward"></Button> + android:id="@+id/btn_main_skp_forw" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_marginLeft="10dip"></Button> </LinearLayout> </LinearLayout> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2011-02-08 12:25:43 UTC (rev 4101) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/playingnow.xml 2011-02-09 20:04:05 UTC (rev 4102) @@ -1,7 +1,6 @@ -<LinearLayout android:id="@+id/LinearLayout01" - android:orientation="vertical" android:layout_width="fill_parent" +<LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/lay_playnow"> <TextView android:id="@+id/now_playing" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="NOW PLAYING" @@ -35,12 +34,12 @@ <TextView android:id="@+id/now_playing_t_left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="12dip" android:text="00:00" - android:gravity="left" android:textColor="#FF000000"/> + android:gravity="left" android:textColor="#FFFFFFFF"/> <TextView android:id="@+id/now_playing_right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:textSize="12dip" android:gravity="right" android:text="00:00" - android:singleLine="true" android:textColor="#FF000000"/> + android:singleLine="true" android:textColor="#FFFFFFFF"/> </RelativeLayout> <TextView android:id="@+id/now_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:textSize="16dip" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/plugins.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/plugins.xml 2011-02-08 12:25:43 UTC (rev 4101) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/plugins.xml 2011-02-09 20:04:05 UTC (rev 4102) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_height="fill_parent" android:id="@+id/lay_plugins"> -<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView> +<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/plugins_instance"></TextView> <TableLayout android:id="@+id/TableLayout01" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2011-02-08 12:25:43 UTC (rev 4101) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml 2011-02-09 20:04:05 UTC (rev 4102) @@ -1,19 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/lay_remote01"> +<LinearLayout android:layout_width="fill_parent" + android:layout_height="fill_parent" android:orientation="vertical" + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/lay_remote01"> <LinearLayout android:id="@+id/widget00" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_width="wrap_content"> <ImageButton android:id="@+id/crtl_mp" - android:layout_height="60dip" android:layout_width="100dip" android:background="@drawable/ic_menu_skin1_logo"> + android:layout_height="60dip" android:layout_width="100dip" + android:background="@drawable/ic_menu_skin1_logo"> </ImageButton> <ImageButton android:id="@+id/crtl_up" - android:layout_width="100dip" android:layout_height="60dip" android:background="@drawable/ic_menu_skin1_up"> + android:layout_width="100dip" android:layout_height="60dip" + android:background="@drawable/ic_menu_skin1_up"> </ImageButton> <ImageButton android:id="@+id/crtl_power" - android:layout_height="60dip" android:layout_width="100dip" android:background="@drawable/ic_menu_skin1_power"> + android:layout_height="60dip" android:layout_width="100dip" + android:background="@drawable/ic_menu_skin1_power"> </ImageButton> </LinearLayout> @@ -22,44 +26,54 @@ android:layout_gravity="center_horizontal"> <ImageButton android:layout_height="60dip" - android:layout_width="100dip" android:id="@+id/crtl_left" android:background="@drawable/ic_menu_skin1_left"> + android:layout_width="100dip" android:id="@+id/crtl_left" + android:background="@drawable/ic_menu_skin1_left"> </ImageButton> <ImageButton android:layout_width="100dip" - android:layout_height="60dip" android:id="@+id/crtl_select" android:background="@drawable/ic_menu_skin1_select"> + android:layout_height="60dip" android:id="@+id/crtl_select" + android:background="@drawable/ic_menu_skin1_select"> </ImageButton> <ImageButton android:layout_width="100dip" - android:layout_height="60dip" android:id="@+id/crtl_right" android:background="@drawable/ic_menu_skin1_right"> + android:layout_height="60dip" android:id="@+id/crtl_right" + android:background="@drawable/ic_menu_skin1_right"> </ImageButton> </LinearLayout> <LinearLayout android:id="@+id/widget02" - android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_gravity="center_horizontal"> + android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_gravity="center_horizontal"> <ImageButton android:id="@+id/crtl_parent" - android:layout_height="60dip" android:layout_width="100dip" android:background="@drawable/ic_menu_skin1_home"> + android:layout_height="60dip" android:layout_width="100dip" + android:background="@drawable/ic_menu_skin1_home"> </ImageButton> <ImageButton android:id="@+id/crtl_down" - android:layout_height="60dip" android:layout_width="100dip" android:background="@drawable/ic_menu_skin1_down"> + android:layout_height="60dip" android:layout_width="100dip" + android:background="@drawable/ic_menu_skin1_down"> </ImageButton> <ImageButton android:id="@+id/crtl_back" - android:layout_height="60dip" android:layout_width="100dip" android:background="@drawable/ic_menu_skin1_back"> + android:layout_height="60dip" android:layout_width="100dip" + android:background="@drawable/ic_menu_skin1_back"> </ImageButton> </LinearLayout> <LinearLayout android:id="@+id/LinearLayout01" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" android:layout_gravity="center_horizontal"> + android:orientation="horizontal" android:layout_gravity="center_horizontal" android:paddingBottom="10dip" android:paddingTop="10dip"> <LinearLayout android:id="@+id/LinearLayout01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical"> <ImageButton android:id="@+id/crtl_vol_p" - android:layout_height="90dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_vol_p" android:layout_marginTop="-3dip" android:layout_marginBottom="3dip"> + android:layout_height="90dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_vol_p" + android:layout_marginTop="-3dip" android:layout_marginBottom="3dip"> </ImageButton> <ImageButton android:id="@+id/crtl_vol_m" - android:layout_height="90dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_vol_m"> + android:layout_height="90dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_vol_m"> </ImageButton> </LinearLayout> @@ -71,16 +85,20 @@ android:layout_height="wrap_content"> <ImageButton android:id="@+id/crtl_skip_back" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_skip_backward"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_skip_backward"> </ImageButton> <ImageButton android:id="@+id/crtl_stop" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_stop"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_stop"> </ImageButton> <ImageButton android:id="@+id/crtl_skip_forw" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_skip_forward"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_skip_forward"> </ImageButton> <ImageButton android:id="@+id/crtl_ch_p" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_channel_p"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_channel_p"> </ImageButton> </TableRow> @@ -88,16 +106,20 @@ android:layout_height="wrap_content"> <ImageButton android:id="@+id/crtl_full" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_fullscreen"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_fullscreen"> </ImageButton> <ImageButton android:id="@+id/crtl_play" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_play"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_play"> </ImageButton> <ImageButton android:id="@+id/crtl_menu" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_menu"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_menu"> </ImageButton> <ImageButton android:id="@+id/crtl_ch_m" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_channel_m"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_channel_m"> </ImageButton> </TableRow> @@ -105,20 +127,46 @@ android:layout_height="wrap_content"> <ImageButton android:id="@+id/crtl_sub" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_subtitles"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_subtitles"> </ImageButton> <ImageButton android:id="@+id/crtl_ratio" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_ratio"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_ratio"> </ImageButton> <ImageButton android:id="@+id/crtl_osd" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_osd"> + android:layout_height="60dip" android:layout_width="60dip" + android:background="@drawable/ic_menu_skin1_osd"> </ImageButton> <ImageButton android:id="@+id/crtl_info" - android:layout_height="60dip" android:layout_width="60dip" android:background="@drawable/ic_menu_skin1_info"> + android:layout_height="60dip" android:layout_width="60dip" + androi... [truncated message content] |
From: <kro...@us...> - 2011-02-08 12:25:55
|
Revision: 4101 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4101&view=rev Author: kroko_koenig Date: 2011-02-08 12:25:43 +0000 (Tue, 08 Feb 2011) Log Message: ----------- more skins and so on Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/movies/Movies.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-08 12:25:43 UTC (rev 4101) @@ -175,33 +175,33 @@ } public static final class id { public static final int GridView01=0x7f060015; - public static final int ImageView01=0x7f06002a; - public static final int LinearLayout00=0x7f060060; - public static final int LinearLayout01=0x7f060031; - public static final int LinearLayout02=0x7f06006b; - public static final int LinearLayout03=0x7f060075; - public static final int LinearLayout04=0x7f06007f; - public static final int LinearLayout05=0x7f060085; - public static final int ListView01=0x7f06003f; - public static final int RadioGroup01=0x7f060099; - public static final int Spinner01=0x7f060091; - public static final int SurfaceView01=0x7f060030; + public static final int ImageView01=0x7f06002c; + public static final int LinearLayout00=0x7f060063; + public static final int LinearLayout01=0x7f060033; + public static final int LinearLayout02=0x7f06006e; + public static final int LinearLayout03=0x7f060078; + public static final int LinearLayout04=0x7f060082; + public static final int LinearLayout05=0x7f060088; + public static final int ListView01=0x7f060041; + public static final int RadioGroup01=0x7f0600a5; + public static final int Spinner01=0x7f060097; + public static final int SurfaceView01=0x7f060032; public static final int TableLayout01=0x7f060007; - public static final int TableLayout02=0x7f060051; + public static final int TableLayout02=0x7f060053; public static final int TableRow01=0x7f060008; - public static final int TableRow02=0x7f060056; - public static final int TableRow03=0x7f06005b; + public static final int TableRow02=0x7f060058; + public static final int TableRow03=0x7f06005d; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; - public static final int btnAlbumSelDown=0x7f060019; - public static final int btnAlbumSelUp=0x7f06001b; - public static final int btnArtistSelDown=0x7f06001d; - public static final int btnArtistSelUp=0x7f06001f; - public static final int btnResultSelDown=0x7f060021; - public static final int btnResultSelUp=0x7f060023; - public static final int btnSelectSkin=0x7f060093; - public static final int btnSongSelDown=0x7f060025; - public static final int btnSongSelUp=0x7f060027; + public static final int btnAlbumSelDown=0x7f06001a; + public static final int btnAlbumSelUp=0x7f06001c; + public static final int btnArtistSelDown=0x7f06001e; + public static final int btnArtistSelUp=0x7f060020; + public static final int btnResultSelDown=0x7f060022; + public static final int btnResultSelUp=0x7f060024; + public static final int btnSelectSkin=0x7f060099; + public static final int btnSongSelDown=0x7f060026; + public static final int btnSongSelUp=0x7f060028; public static final int btn_main_music=0x7f06000a; public static final int btn_main_now_playing=0x7f06000d; public static final int btn_main_pictures=0x7f060009; @@ -211,172 +211,184 @@ public static final int btn_main_skp_back=0x7f060010; public static final int btn_main_skp_forw=0x7f060012; public static final int btn_main_video=0x7f06000b; - public static final int btn_plugins_radio=0x7f060041; - public static final int btn_plugins_weather=0x7f060040; - public static final int btnkey01=0x7f060061; - public static final int btnkey02=0x7f060062; - public static final int btnkey03=0x7f060063; - public static final int btnkey04=0x7f060064; - public static final int btnkey05=0x7f060065; - public static final int btnkey06=0x7f060066; - public static final int btnkey07=0x7f060067; - public static final int btnkey08=0x7f060068; - public static final int btnkey09=0x7f060069; - public static final int btnkey10=0x7f06006a; - public static final int btnkey11=0x7f06006c; - public static final int btnkey12=0x7f06006d; - public static final int btnkey13=0x7f06006e; - public static final int btnkey14=0x7f06006f; - public static final int btnkey15=0x7f060070; - public static final int btnkey16=0x7f060071; - public static final int btnkey17=0x7f060072; - public static final int btnkey18=0x7f060073; - public static final int btnkey19=0x7f060074; - public static final int btnkey20=0x7f060076; - public static final int btnkey21=0x7f060077; - public static final int btnkey22=0x7f060078; - public static final int btnkey23=0x7f060079; - public static final int btnkey24=0x7f06007a; - public static final int btnkey25=0x7f06007b; - public static final int btnkey26=0x7f06007c; - public static final int btnkey27=0x7f06007d; - public static final int btnkey28=0x7f06007e; - public static final int btnkey29=0x7f060080; - public static final int btnkey30=0x7f060081; - public static final int btnkey31=0x7f060082; - public static final int btnkey32=0x7f060083; - public static final int btnkey33=0x7f060084; - public static final int btnkey41=0x7f060086; - public static final int btnkey42=0x7f060087; - public static final int btnkey43=0x7f060088; - public static final int btnkey44=0x7f060089; - public static final int btnkey45=0x7f06008a; - public static final int btnkey46=0x7f06008b; - public static final int btnkey47=0x7f06008c; - public static final int btnkey48=0x7f06008d; - public static final int btnkey49=0x7f06008e; - public static final int btnkey50=0x7f06008f; - public static final int button_open=0x7f06002d; - public static final int button_stream=0x7f06002e; - public static final int button_stream_stop=0x7f06002f; - public static final int crtl_back=0x7f06004e; - public static final int crtl_ch_m=0x7f06005a; - public static final int crtl_ch_p=0x7f060055; - public static final int crtl_down=0x7f06004d; - public static final int crtl_full=0x7f060057; - public static final int crtl_info=0x7f06005f; - public static final int crtl_left=0x7f060048; - public static final int crtl_menu=0x7f060059; - public static final int crtl_mp=0x7f060044; - public static final int crtl_osd=0x7f06005e; - public static final int crtl_parent=0x7f06004c; - public static final int crtl_play=0x7f060058; - public static final int crtl_power=0x7f060046; - public static final int crtl_ratio=0x7f06005d; - public static final int crtl_right=0x7f06004a; - public static final int crtl_select=0x7f060049; - public static final int crtl_skip_back=0x7f060052; - public static final int crtl_skip_forw=0x7f060054; - public static final int crtl_stop=0x7f060053; - public static final int crtl_sub=0x7f06005c; - public static final int crtl_up=0x7f060045; - public static final int crtl_vol_m=0x7f060050; - public static final int crtl_vol_p=0x7f06004f; - public static final int full_text=0x7f060029; + public static final int btn_plugins_radio=0x7f060043; + public static final int btn_plugins_weather=0x7f060042; + public static final int btnkey01=0x7f060064; + public static final int btnkey02=0x7f060065; + public static final int btnkey03=0x7f060066; + public static final int btnkey04=0x7f060067; + public static final int btnkey05=0x7f060068; + public static final int btnkey06=0x7f060069; + public static final int btnkey07=0x7f06006a; + public static final int btnkey08=0x7f06006b; + public static final int btnkey09=0x7f06006c; + public static final int btnkey10=0x7f06006d; + public static final int btnkey11=0x7f06006f; + public static final int btnkey12=0x7f060070; + public static final int btnkey13=0x7f060071; + public static final int btnkey14=0x7f060072; + public static final int btnkey15=0x7f060073; + public static final int btnkey16=0x7f060074; + public static final int btnkey17=0x7f060075; + public static final int btnkey18=0x7f060076; + public static final int btnkey19=0x7f060077; + public static final int btnkey20=0x7f060079; + public static final int btnkey21=0x7f06007a; + public static final int btnkey22=0x7f06007b; + public static final int btnkey23=0x7f06007c; + public static final int btnkey24=0x7f06007d; + public static final int btnkey25=0x7f06007e; + public static final int btnkey26=0x7f06007f; + public static final int btnkey27=0x7f060080; + public static final int btnkey28=0x7f060081; + public static final int btnkey29=0x7f060083; + public static final int btnkey30=0x7f060084; + public static final int btnkey31=0x7f060085; + public static final int btnkey32=0x7f060086; + public static final int btnkey33=0x7f060087; + public static final int btnkey41=0x7f060089; + public static final int btnkey42=0x7f06008a; + public static final int btnkey43=0x7f06008b; + public static final int btnkey44=0x7f06008c; + public static final int btnkey45=0x7f06008d; + public static final int btnkey46=0x7f06008e; + public static final int btnkey47=0x7f06008f; + public static final int btnkey48=0x7f060090; + public static final int btnkey49=0x7f060091; + public static final int btnkey50=0x7f060092; + public static final int button_open=0x7f06002f; + public static final int button_stream=0x7f060030; + public static final int button_stream_stop=0x7f060031; + public static final int crtl_back=0x7f060050; + public static final int crtl_ch_m=0x7f06005c; + public static final int crtl_ch_p=0x7f060057; + public static final int crtl_down=0x7f06004f; + public static final int crtl_full=0x7f060059; + public static final int crtl_info=0x7f060061; + public static final int crtl_left=0x7f06004a; + public static final int crtl_menu=0x7f06005b; + public static final int crtl_mp=0x7f060046; + public static final int crtl_osd=0x7f060060; + public static final int crtl_parent=0x7f06004e; + public static final int crtl_play=0x7f06005a; + public static final int crtl_power=0x7f060048; + public static final int crtl_ratio=0x7f06005f; + public static final int crtl_right=0x7f06004c; + public static final int crtl_select=0x7f06004b; + public static final int crtl_skip_back=0x7f060054; + public static final int crtl_skip_forw=0x7f060056; + public static final int crtl_stop=0x7f060055; + public static final int crtl_sub=0x7f06005e; + public static final int crtl_up=0x7f060047; + public static final int crtl_vol_m=0x7f060052; + public static final int crtl_vol_p=0x7f060051; + public static final int full_text=0x7f06002b; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; + public static final int lay_IPsettings=0x7f06009a; + public static final int lay_global=0x7f060093; public static final int lay_main=0x7f060005; - public static final int lay_pictures=0x7f060028; - public static final int lay_remote01=0x7f060042; - public static final int list_album=0x7f060018; - public static final int list_artist=0x7f06001c; - public static final int list_result=0x7f060020; - public static final int list_song=0x7f060024; + public static final int lay_movies=0x7f060013; + public static final int lay_music=0x7f060016; + public static final int lay_pictures=0x7f060029; + public static final int lay_remote01=0x7f060044; + public static final int lay_selectSkin=0x7f0600a3; + public static final int list_album=0x7f060019; + public static final int list_artist=0x7f06001d; + public static final int list_result=0x7f060021; + public static final int list_song=0x7f060025; public static final int main_instance=0x7f060006; public static final int main_now_playing=0x7f06000f; - public static final int music_grid=0x7f060017; - public static final int now_album=0x7f060033; - public static final int now_artist=0x7f060039; - public static final int now_cd=0x7f060034; - public static final int now_list=0x7f06003e; - public static final int now_next=0x7f06003d; - public static final int now_play=0x7f06003c; - public static final int now_playing=0x7f060032; - public static final int now_playing_right=0x7f060037; - public static final int now_playing_t_left=0x7f060036; - public static final int now_prev=0x7f06003a; - public static final int now_progress=0x7f060035; - public static final int now_stop=0x7f06003b; - public static final int now_title=0x7f060038; - public static final int radio01=0x7f0600c7; - public static final int radio02=0x7f0600c8; - public static final int radio03=0x7f0600c9; - public static final int radio04=0x7f0600ca; - public static final int radioStop=0x7f0600cb; - public static final int selectSkin1=0x7f06009a; - public static final int selectSkin2=0x7f06009c; - public static final int selectSkin3=0x7f06009e; - public static final int server_ip=0x7f060096; - public static final int server_macid=0x7f060098; - public static final int server_name=0x7f060095; - public static final int server_port=0x7f060097; - public static final int splash=0x7f0600a0; - public static final int text_kb_streamed=0x7f06002b; - public static final int title=0x7f0600a1; - public static final int txtDbAlbum=0x7f06001a; - public static final int txtDbArtist=0x7f06001e; - public static final int txtDbResult=0x7f060022; - public static final int txtDbSong=0x7f060026; - public static final int txtDirMusic=0x7f060016; - public static final int txtDirectory=0x7f060014; - public static final int txtFile=0x7f06002c; - public static final int txtIntanceName=0x7f060094; - public static final int txtVersion=0x7f060090; - public static final int vibration=0x7f060092; - public static final int visitHome1=0x7f06009b; - public static final int visitHome2=0x7f06009d; - public static final int visitHome3=0x7f06009f; - public static final int weather_0_cond=0x7f0600c2; - public static final int weather_0_date=0x7f0600a9; - public static final int weather_0_day=0x7f0600ae; - public static final int weather_0_hi=0x7f0600b3; - public static final int weather_0_img=0x7f0600bd; - public static final int weather_0_lo=0x7f0600b8; - public static final int weather_1_cond=0x7f0600c3; - public static final int weather_1_date=0x7f0600aa; - public static final int weather_1_day=0x7f0600af; - public static final int weather_1_hi=0x7f0600b4; - public static final int weather_1_img=0x7f0600be; - public static final int weather_1_lo=0x7f0600b9; - public static final int weather_2_cond=0x7f0600c4; - public static final int weather_2_date=0x7f0600ab; - public static final int weather_2_day=0x7f0600b0; - public static final int weather_2_hi=0x7f0600b5; - public static final int weather_2_img=0x7f0600bf; - public static final int weather_2_lo=0x7f0600ba; - public static final int weather_3_cond=0x7f0600c5; - public static final int weather_3_date=0x7f0600ac; - public static final int weather_3_day=0x7f0600b1; - public static final int weather_3_hi=0x7f0600b6; - public static final int weather_3_img=0x7f0600c0; - public static final int weather_3_lo=0x7f0600bb; - public static final int weather_4_cond=0x7f0600c6; - public static final int weather_4_date=0x7f0600ad; - public static final int weather_4_day=0x7f0600b2; - public static final int weather_4_hi=0x7f0600b7; - public static final int weather_4_img=0x7f0600c1; - public static final int weather_4_lo=0x7f0600bc; - public static final int weather_actFeel=0x7f0600a7; - public static final int weather_actImage=0x7f0600a2; - public static final int weather_actPlace=0x7f0600a5; - public static final int weather_actTemp=0x7f0600a6; - public static final int weather_actText=0x7f0600a3; - public static final int weather_actTime=0x7f0600a4; - public static final int weather_actWind=0x7f0600a8; - public static final int widget0=0x7f060013; - public static final int widget00=0x7f060043; - public static final int widget01=0x7f060047; - public static final int widget02=0x7f06004b; + public static final int music_grid=0x7f060018; + public static final int now_album=0x7f060035; + public static final int now_artist=0x7f06003b; + public static final int now_cd=0x7f060036; + public static final int now_list=0x7f060040; + public static final int now_next=0x7f06003f; + public static final int now_play=0x7f06003e; + public static final int now_playing=0x7f060034; + public static final int now_playing_right=0x7f060039; + public static final int now_playing_t_left=0x7f060038; + public static final int now_prev=0x7f06003c; + public static final int now_progress=0x7f060037; + public static final int now_stop=0x7f06003d; + public static final int now_title=0x7f06003a; + public static final int radio01=0x7f0600d3; + public static final int radio02=0x7f0600d4; + public static final int radio03=0x7f0600d5; + public static final int radio04=0x7f0600d6; + public static final int radioStop=0x7f0600d7; + public static final int selectSkin1=0x7f0600a6; + public static final int selectSkin2=0x7f0600a8; + public static final int selectSkin3=0x7f0600aa; + public static final int server_ip=0x7f06009e; + public static final int server_macid=0x7f0600a2; + public static final int server_name=0x7f06009c; + public static final int server_port=0x7f0600a0; + public static final int splash=0x7f0600ac; + public static final int text_kb_streamed=0x7f06002d; + public static final int title=0x7f0600ad; + public static final int txtDbAlbum=0x7f06001b; + public static final int txtDbArtist=0x7f06001f; + public static final int txtDbResult=0x7f060023; + public static final int txtDbSong=0x7f060027; + public static final int txtDirectoryMovies=0x7f060014; + public static final int txtDirectoryMusic=0x7f060017; + public static final int txtDirectoryPictures=0x7f06002a; + public static final int txtFile=0x7f06002e; + public static final int txtGlobal=0x7f060094; + public static final int txtIntanceName=0x7f06009b; + public static final int txtMediaPortalIP=0x7f06009d; + public static final int txtMediaPortalMAC=0x7f0600a1; + public static final int txtMediaPortalPort=0x7f06009f; + public static final int txtPowerMode=0x7f060096; + public static final int txtSelectSkin=0x7f0600a4; + public static final int txtVersion=0x7f060095; + public static final int vibration=0x7f060098; + public static final int visitHome1=0x7f0600a7; + public static final int visitHome2=0x7f0600a9; + public static final int visitHome3=0x7f0600ab; + public static final int weather_0_cond=0x7f0600ce; + public static final int weather_0_date=0x7f0600b5; + public static final int weather_0_day=0x7f0600ba; + public static final int weather_0_hi=0x7f0600bf; + public static final int weather_0_img=0x7f0600c9; + public static final int weather_0_lo=0x7f0600c4; + public static final int weather_1_cond=0x7f0600cf; + public static final int weather_1_date=0x7f0600b6; + public static final int weather_1_day=0x7f0600bb; + public static final int weather_1_hi=0x7f0600c0; + public static final int weather_1_img=0x7f0600ca; + public static final int weather_1_lo=0x7f0600c5; + public static final int weather_2_cond=0x7f0600d0; + public static final int weather_2_date=0x7f0600b7; + public static final int weather_2_day=0x7f0600bc; + public static final int weather_2_hi=0x7f0600c1; + public static final int weather_2_img=0x7f0600cb; + public static final int weather_2_lo=0x7f0600c6; + public static final int weather_3_cond=0x7f0600d1; + public static final int weather_3_date=0x7f0600b8; + public static final int weather_3_day=0x7f0600bd; + public static final int weather_3_hi=0x7f0600c2; + public static final int weather_3_img=0x7f0600cc; + public static final int weather_3_lo=0x7f0600c7; + public static final int weather_4_cond=0x7f0600d2; + public static final int weather_4_date=0x7f0600b9; + public static final int weather_4_day=0x7f0600be; + public static final int weather_4_hi=0x7f0600c3; + public static final int weather_4_img=0x7f0600cd; + public static final int weather_4_lo=0x7f0600c8; + public static final int weather_actFeel=0x7f0600b3; + public static final int weather_actImage=0x7f0600ae; + public static final int weather_actPlace=0x7f0600b1; + public static final int weather_actTemp=0x7f0600b2; + public static final int weather_actText=0x7f0600af; + public static final int weather_actTime=0x7f0600b0; + public static final int weather_actWind=0x7f0600b4; + public static final int widget0=0x7f060062; + public static final int widget00=0x7f060045; + public static final int widget01=0x7f060049; + public static final int widget02=0x7f06004d; public static final int widget44=0x7f060000; } public static final class layout { Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -4,7 +4,11 @@ android:id="@+id/lay_main" android:layout_height="fill_parent"> -<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView> +<TextView android:layout_height="wrap_content" android:text="HTPC" + android:textColor="#FF000000" android:textStyle="bold" + android:textSize="20dip" android:gravity="center_horizontal" + android:background="#FFA9A9A9" android:layout_width="fill_parent" + android:id="@+id/main_instance"></TextView> <TableLayout android:id="@+id/TableLayout01" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/movies.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,12 +1,12 @@ -<LinearLayout android:id="@+id/widget0" - android:layout_width="fill_parent" android:layout_height="wrap_content" +<LinearLayout android:id="@+id/lay_movies" + android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="Actual: ..." android:textColor="#FFFFFFFF" android:textSize="20dip" - android:id="@+id/txtDirectory" android:paddingBottom="5dip"></TextView> + android:id="@+id/txtDirectoryMovies" android:paddingBottom="5dip"></TextView> <GridView android:layout_y="0dip" android:layout_x="0dip" android:id="@+id/GridView01" android:layout_width="fill_parent" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,11 +1,11 @@ -<LinearLayout android:id="@+id/widget0" - android:layout_width="fill_parent" android:layout_height="wrap_content" +<LinearLayout android:id="@+id/lay_music" + android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="Actual: ..." - android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirMusic" + android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirectoryMusic" android:paddingBottom="5dip"></TextView> <GridView android:layout_y="0dip" android:layout_x="0dip" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,5 +1,5 @@ <LinearLayout android:id="@+id/lay_pictures" - android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:text="Actual: ..." android:textColor="#FFFFFFFF" android:textSize="20dip" - android:id="@+id/txtDirectory" android:paddingBottom="5dip"></TextView> + android:id="@+id/txtDirectoryPictures" android:paddingBottom="5dip"></TextView> <GridView android:layout_y="0dip" android:layout_x="0dip" android:id="@+id/GridView01" android:layout_width="fill_parent" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" android:padding="15dip"> + android:orientation="vertical" android:padding="15dip" android:id="@+id/lay_global"> <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF"></TextView> + android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF" android:id="@+id/txtGlobal"></TextView> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" android:text="Version" android:id="@+id/txtVersion"></TextView> <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip"></TextView> + android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip" android:id="@+id/txtPowerMode"></TextView> <Spinner android:id="@+id/Spinner01" android:layout_width="fill_parent" android:layout_height="wrap_content"></Spinner> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup_ip.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,26 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" android:padding="15dip"> + android:orientation="vertical" android:padding="15dip" android:id="@+id/lay_IPsettings"> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txtIntanceName" android:text="Instance Name : 0" android:textSize="20dip" android:textColor="#FFFFFFFF"></TextView> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/txtIntanceName" android:text="Instance Name : 0" android:textSize="20dip"></TextView> <EditText android:id="@+id/server_name" android:layout_height="wrap_content" android:layout_width="fill_parent" android:inputType="text" android:text="HTPC"></EditText> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="MediaPortal IP" - android:textSize="18dip" android:textColor="#FFFFFFFF"> + android:textSize="18dip" android:id="@+id/txtMediaPortalIP"> </TextView> <EditText android:id="@+id/server_ip" android:layout_height="wrap_content" android:layout_width="fill_parent" android:text="192.168.0.30" android:inputType="text"></EditText> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="MediaPortal Port" - android:textSize="18dip" android:textColor="#FFFFFFFF"></TextView> + android:textSize="18dip" android:id="@+id/txtMediaPortalPort"></TextView> <EditText android:id="@+id/server_port" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="8200" android:inputType="phone"></EditText> <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="18dip" android:text="MediaPortal MAC (WakeOnLan)" android:textColor="#FFFFFFFF"></TextView> + android:layout_height="wrap_content" android:textSize="18dip" android:text="MediaPortal MAC (WakeOnLan)" android:id="@+id/txtMediaPortalMAC"></TextView> <EditText android:id="@+id/server_macid" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="12-34-56-78-90-12" android:inputType="text"></EditText> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -1,5 +1,5 @@ -<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> -<TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="Select skin" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip" android:textSize="24dip"></TextView> +<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:id="@+id/lay_selectSkin"> +<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="Select skin" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip" android:textSize="24dip" android:id="@+id/txtSelectSkin"></TextView> <RadioGroup android:id="@+id/RadioGroup01" android:layout_height="wrap_content" android:layout_width="fill_parent"> Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:id="@+id/lay_main" + android:layout_height="fill_parent"> + +<TextView android:layout_height="wrap_content" android:text="HTPC" + android:textColor="#FF000000" android:textStyle="bold" + android:textSize="20dip" android:gravity="center_horizontal" + android:background="#FFA9A9A9" android:layout_width="fill_parent" + android:id="@+id/main_instance"></TextView> + +<TableLayout + android:id="@+id/TableLayout01" + xmlns:android="http://schemas.android.com/apk/res/android" + + android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center_horizontal"> + + +<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip" android:layout_gravity="center_horizontal"> + + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginRight="20dip"> + </Button> + + <Button android:scaleType="fitXY" android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="60dip" android:layout_width="60dip"> + </Button> + <Button android:background="@drawable/ic_menu_skin1_video" android:id="@+id/btn_main_video" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginLeft="20dip"></Button> + + </TableRow> + + <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="5dip"> + + <Button android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginRight="20dip"> + </Button> + <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:id="@+id/btn_main_now_playing" android:layout_height="60dip" android:layout_width="60dip"></Button> + <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="60dip" android:layout_width="60dip" android:layout_marginLeft="20dip"></Button> + + +</TableRow> + +</TableLayout> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="nothing playing" + android:gravity="center_horizontal" android:textSize="15dip" + android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing"> + </TextView> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip"> + + + <Button android:scaleType="fitXY" + android:layout_height="60dip" android:layout_width="60dip" + android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_skip_backward"></Button> + <ImageButton android:scaleType="fitXY" + android:layout_height="60dip" android:layout_width="60dip" + android:id="@+id/btn_main_play" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_play"></ImageButton> + <Button android:scaleType="fitXY" + android:layout_height="60dip" android:layout_width="60dip" + android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward"></Button> +</LinearLayout> +</LinearLayout> Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:layout_height="fill_parent"> + +<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance" android:textSize="28dip"></TextView> + +<TableLayout + android:id="@+id/TableLayout01" + xmlns:android="http://schemas.android.com/apk/res/android" + + android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center_horizontal"> + + +<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01"> + + <Button android:scaleType="fitXY" + android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="110dip" android:layout_width="110dip"> + </Button> + + <Button android:scaleType="fitXY" android:padding="5dip" + android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip"> + </Button> + <Button android:layout_marginRight="40dip" android:id="@+id/btn_main_video" android:padding="5dip" android:background="@drawable/ic_menu_skin1_video" android:layout_height="110dip" android:layout_width="110dip"></Button> + + </TableRow> + + <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01"> + + <Button android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip"> + </Button> + <Button android:layout_marginRight="40dip" android:id="@+id/btn_main_now_playing" android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:layout_height="100dip" android:layout_width="110dip"></Button> + <Button android:id="@+id/btn_main_plugins" android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:layout_marginRight="40dip" android:layout_height="110dip" android:layout_width="110dip"></Button> + + +</TableRow> + +</TableLayout> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="nothing playing" + android:gravity="center_horizontal" android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing" android:textSize="24dip"> + </TextView> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip"> + + + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_back" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></Button> + <ImageButton android:scaleType="fitXY" + android:id="@+id/btn_main_play" android:padding="2dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></ImageButton> + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_height="80dip" android:layout_width="80dip" android:layout_marginRight="15dip"></Button> +</LinearLayout> +</LinearLayout> Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small-land/main.xml 2011-02-08 12:25:43 UTC (rev 4101) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:layout_height="fill_parent"> + +<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView> + +<TableLayout + android:id="@+id/TableLayout01" + xmlns:android="http://schemas.android.com/apk/res/android" + + android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center_horizontal"> + + +<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="3dip"> + + <Button android:scaleType="fitXY" + android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginRight="10dip"> + </Button> + + <Button android:scaleType="fitXY" android:padding="5dip" + android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="70dip" android:layout_width="70dip"> + </Button> + <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_video" android:id="@+id/btn_main_video" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginLeft="10dip"></Button> + + </TableRow> + + <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/TableRow01" android:padding="3dip"> + + <Button android:scaleType="fitXY" android:id="@+id/btn_main_remote" android:padding="5dip" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginRight="10dip"> + </Button> + <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_now_playing" android:id="@+id/btn_main_now_playing" android:layout_height="70dip" android:layout_width="70dip"></Button> + <Button android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="70dip" android:layout_width="70dip" android:layout_marginLeft="10dip"></Button> + + </TableRow> + +</TableLayout> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="nothing playing" + android:gravity="center_horizontal" android:textSize="15dip" + android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:id="@+id/main_now_playing" android:padding="3dip"> + </TextView> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="2dip"> + + + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_back" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_marginRight="5dip" android:layout_height="55dip" android:layout_width="55dip"></Button> + <ImageButton android:scaleType="fitXY" + android:id="@+id/btn_main_play" android:layout_marginRight="0dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="55dip" android:layout_width="55dip"></ImageButton> + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_forw" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_marginLeft="5dip" android:layout_height="55dip" android:layout_width="55dip"></Button> +</LinearLayout> +</LinearLayout> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/PostWebserver.java 2011-02-08 12:25:43 UTC (rev 4101) @@ -27,7 +27,9 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.Socket; +import java.net.SocketAddress; import mediaportal.remote.utils.AppSettings; @@ -60,8 +62,11 @@ try { InetAddress addr = InetAddress.getByName(AppSettings.getServer()); - Socket socket = new Socket(addr, Integer.parseInt(AppSettings.getPort())); - + + Socket socket = new Socket(); + SocketAddress adr = new InetSocketAddress(addr, Integer.parseInt(AppSettings.getPort())); + socket.connect(adr, 5000); + // Send header String String path = "/"; BufferedWriter wr = new BufferedWriter(new OutputStreamWriter( Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/SendCommand.java 2011-02-08 12:25:43 UTC (rev 4101) @@ -40,8 +40,10 @@ manager = asset; } - public static void PostCommandButton(String button) + public static boolean PostCommandButton(String button) { + boolean result = false; + Log.d("MediaPortal", "PostCommandButton :" + button); Vibration.vibrateShort(); @@ -59,12 +61,13 @@ xml = xml + (char) x; x = inputStream.read(); } - post.Post(xml); + result = post.Post(xml); } catch (IOException e) { e.printStackTrace(); } + return result; } - public static void PostKey(String Key) { + public static boolean PostKey(String Key) { Log.d("MediaPortal", "PostKey :" + Key); @@ -79,7 +82,7 @@ xml += "<key>" + Key + "</key>\r\n"; xml += "</message>\r\n"; - post.Post(xml); + return post.Post(xml); } public static void PostClearPlaylist() { Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-07 21:41:27 UTC (rev 4100) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-08 12:25:43 UTC (rev 4101) @@ -32,6 +32,7 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.Color; +import android.os.AsyncTask; import android.os.Bundle; import android.util.Log; import android.view.KeyEvent; @@ -43,39 +44,42 @@ public class Remote_01 extends Activity { private static String action; - + private LinearLayout layout; - + private ImageButton btnPower; - + private ImageButton btnUp; private ImageButton btnDown; private ImageButton btnLeft; private ImageButton btnRight; private ImageButton btnOk; - + private ImageButton btnVolUp; private ImageButton btnVolDown; - + private ImageButton btnBack; private ImageButton btnHome; - + private ImageButton btnSkipBack; private ImageButton btnStop; private ImageButton btnSkipForw; private ImageButton btnChannel_p; - + private ImageButton btnFull; private ImageButton btnPlay; private ImageButton btnMenu; private ImageButton btnChannel_m; - + private ImageButton btnSub; private ImageButton btnAspect; private ImageButton btnOsd; private ImageButton btnInfo; - - + + private sendKeystroke taskSendKeyStroke; + private static boolean active; + private static boolean result; + /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { @@ -85,7 +89,7 @@ Log.d("MediaPortal", "start remote 1"); layout = (LinearLayout) findViewById(R.id.lay_remote01); - + btnPower = (ImageButton) findViewById(R.id.crtl_power); btnUp = (ImageButton) findViewById(R.id.crtl_up); @@ -93,93 +97,96 @@ btnLeft = (ImageButton) findViewById(R.id.crtl_left); btnRight = (ImageButton) findViewById(R.id.crtl_right); btnOk = (ImageButton) findViewById(R.id.crtl_select); - + btnVolUp = (ImageButton) findViewById(R.id.crtl_vol_p); btnVolDown = (ImageButton) findViewById(R.id.crtl_vol_m); - + btnBack = (ImageButton) findViewById(R.id.crtl_back); btnHome = (ImageButton) findViewById(R.id.crtl_parent); - + btnSkipBack = (ImageButton) findViewById(R.id.crtl_skip_back); btnStop = (ImageButton) findViewById(R.id.crtl_stop); btnSkipForw = (ImageButton) findViewById(R.id.crtl_skip_forw); btnChannel_p = (ImageButton) findViewById(R.id.crtl_ch_p); - + btnFull = (ImageButton) findViewById(R.id.crtl_full); btnPlay = (ImageButton) findViewById(R.id.crtl_play); btnMenu = (ImageButton) findViewById(R.id.crtl_menu); btnChannel_m = (ImageButton) findViewById(R.id.crtl_ch_m); - + btnSub = (ImageButton) findViewById(R.id.crtl_sub); btnAspect = (ImageButton) findViewById(R.id.crtl_ratio); btnOsd = (ImageButton) findViewById(R.id.crtl_osd); btnInfo = (ImageButton) findViewById(R.id.crtl_info); - + // buttons // first row - + btnUp.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("moveUp"); } }); - + ImageButton power = (ImageButton) findViewById(R.id.crtl_power); - + power.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - + Wol w = new Wol(); w.sendMagicPacket(AppSettings.getMacId(), 9); - - Toast.makeText(Remote_01.this, "power on", Toast.LENGTH_SHORT).show(); + + Toast.makeText(Remote_01.this, "power on", Toast.LENGTH_SHORT) + .show(); } }); power.setOnLongClickListener(new View.OnLongClickListener() { public boolean onLongClick(View view) { - + int x = AppSettings.getPowerMode(); - + Resources res = getResources(); String[] actions = res.getStringArray(R.array.shutdown); - + action = actions[x]; - - AlertDialog.Builder builder = new AlertDialog.Builder(Remote_01.this); - builder.setMessage("Do you really want to " + action + " ?") + + AlertDialog.Builder builder = new AlertDialog.Builder( + Remote_01.this); + builder.setMessage("Do you really want to " + action + " ?") .setTitle("Please confirm") .setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { - - switch (AppSettings.getPowerMode()) - { + + switch (AppSettings.getPowerMode()) { case 0: // Exit - SendCommand.PostCommandButton("exit"); + sendKeyStroke("exit"); break; case 1: // Suspend - SendCommand.PostCommandButton("suspend"); + sendKeyStroke("suspend"); break; case 2: // Hibernate - SendCommand.PostCommandButton("hibernate"); + sendKeyStroke("hibernate"); break; case 3: // Restart - SendCommand.PostCommandButton("restart"); + sendKeyStroke("restart"); break; case 4: // Shut Off - SendCommand.PostCommandButton("shutoff"); + sendKeyStroke("shutoff"); break; } - - Toast.makeText(Remote_01.this, "Please wait , " + action, Toast.LENGTH_SHORT).show(); - + + Toast.makeText(Remote_01.this, + "Please wait , " + action, + Toast.LENGTH_SHORT).show(); + } }) .setNegativeButton("No", @@ -193,132 +200,132 @@ return true; } }); - - + // second row - + btnLeft.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("moveLeft"); + sendKeyStroke("moveLeft"); } }); - + btnOk.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("selectItem"); + sendKeyStroke("selectItem"); } }); btnRight.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("moveRight"); + sendKeyStroke("moveRight"); } }); - + // third row - + btnHome.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("parentDir"); + sendKeyStroke("parentDir"); } - }); + }); btnDown.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("moveDown"); + sendKeyStroke("moveDown"); } }); btnBack.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("previousMenu"); + sendKeyStroke("previousMenu"); } }); - + // volume btnVolUp.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("volumeUp"); + sendKeyStroke("volumeUp"); } }); btnVolDown.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("volumeDown"); + sendKeyStroke("volumeDown"); } }); - + // fourth row - + btnSkipBack.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("prevItem"); + sendKeyStroke("prevItem"); } - }); + }); btnStop.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("stop"); + sendKeyStroke("stop"); } - }); + }); btnSkipForw.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("nextItem"); + sendKeyStroke("nextItem"); } }); btnChannel_p.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("nextChannel"); + sendKeyStroke("nextChannel"); } }); - + // fifth row - + btnFull.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("fullscreen"); + sendKeyStroke("fullscreen"); } }); btnPlay.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - SendCommand.PostCommandButton("play"); + sendKeyStroke("play"); } }); btnMenu.setOnClickListener(new View.OnClickLis... [truncated message content] |
From: <kro...@us...> - 2011-02-07 21:41:36
|
Revision: 4100 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4100&view=rev Author: kroko_koenig Date: 2011-02-07 21:41:27 +0000 (Mon, 07 Feb 2011) Log Message: ----------- skin blue3 almost finished Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_back.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_down.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_home.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_left.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pause.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_play.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_right.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_up.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_m.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_p.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/icon.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/remote01.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java trunk/plugins/AndroidRemote/Release/blue3.jpg trunk/plugins/AndroidRemote/Release/blue3_remote.jpg Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/backgroundimage.jpg trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_backward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_m.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_p.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_document.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_forward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_fullscreen.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_info.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_logo.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_menu.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_minus.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_osd.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plus.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_power.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_radio.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_ratio.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_select.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_stop.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_subtitles.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_weather.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_cdcover.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_audio.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folder.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folderback.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_movie.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_picture.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_playlist.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_splash.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/remote01.xml trunk/plugins/AndroidRemote/Release/MediaPortalRemote.png trunk/plugins/AndroidRemote/Release/blue3_pictures.jpg Removed Paths: ------------- trunk/plugins/AndroidRemote/Release/MediaPortalRemote.apk trunk/plugins/AndroidRemote/Release/blue3_2.jpg Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-07 13:31:59 UTC (rev 4099) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-07 21:41:27 UTC (rev 4100) @@ -15,154 +15,182 @@ } public static final class drawable { public static final int back_blue3=0x7f020000; - public static final int empty=0x7f020001; - public static final int ic_launcher_icon=0x7f020002; - public static final int ic_menu_skin1_back=0x7f020003; - public static final int ic_menu_skin1_backward=0x7f020004; - public static final int ic_menu_skin1_channel_m=0x7f020005; - public static final int ic_menu_skin1_channel_p=0x7f020006; - public static final int ic_menu_skin1_document=0x7f020007; - public static final int ic_menu_skin1_down=0x7f020008; - public static final int ic_menu_skin1_forward=0x7f020009; - public static final int ic_menu_skin1_fullscreen=0x7f02000a; - public static final int ic_menu_skin1_home=0x7f02000b; - public static final int ic_menu_skin1_info=0x7f02000c; - public static final int ic_menu_skin1_left=0x7f02000d; - public static final int ic_menu_skin1_logo=0x7f02000e; - public static final int ic_menu_skin1_menu=0x7f02000f; - public static final int ic_menu_skin1_minus=0x7f020010; - public static final int ic_menu_skin1_music=0x7f020011; - public static final int ic_menu_skin1_now_playing=0x7f020012; - public static final int ic_menu_skin1_osd=0x7f020013; - public static final int ic_menu_skin1_pause=0x7f020014; - public static final int ic_menu_skin1_pictures=0x7f020015; - public static final int ic_menu_skin1_play=0x7f020016; - public static final int ic_menu_skin1_plugins=0x7f020017; - public static final int ic_menu_skin1_plus=0x7f020018; - public static final int ic_menu_skin1_power=0x7f020019; - public static final int ic_menu_skin1_radio=0x7f02001a; - public static final int ic_menu_skin1_ratio=0x7f02001b; - public static final int ic_menu_skin1_remote=0x7f02001c; - public static final int ic_menu_skin1_right=0x7f02001d; - public static final int ic_menu_skin1_select=0x7f02001e; - public static final int ic_menu_skin1_skip_backward=0x7f02001f; - public static final int ic_menu_skin1_skip_forward=0x7f020020; - public static final int ic_menu_skin1_stop=0x7f020021; - public static final int ic_menu_skin1_subtitles=0x7f020022; - public static final int ic_menu_skin1_up=0x7f020023; - public static final int ic_menu_skin1_video=0x7f020024; - public static final int ic_menu_skin1_vol_m=0x7f020025; - public static final int ic_menu_skin1_vol_p=0x7f020026; - public static final int ic_menu_skin1_weather=0x7f020027; - public static final int ic_menu_skin2_back=0x7f020028; - public static final int ic_menu_skin2_down=0x7f020029; - public static final int ic_menu_skin2_home=0x7f02002a; - public static final int ic_menu_skin2_left=0x7f02002b; - public static final int ic_menu_skin2_music=0x7f02002c; - public static final int ic_menu_skin2_now_playing=0x7f02002d; - public static final int ic_menu_skin2_pause=0x7f02002e; - public static final int ic_menu_skin2_pictures=0x7f02002f; - public static final int ic_menu_skin2_play=0x7f020030; - public static final int ic_menu_skin2_plugins=0x7f020031; - public static final int ic_menu_skin2_remote=0x7f020032; - public static final int ic_menu_skin2_right=0x7f020033; - public static final int ic_menu_skin2_skip_backward=0x7f020034; - public static final int ic_menu_skin2_skip_forward=0x7f020035; - public static final int ic_menu_skin2_up=0x7f020036; - public static final int ic_menu_skin2_video=0x7f020037; - public static final int ic_menu_skin2_vol_m=0x7f020038; - public static final int ic_menu_skin2_vol_p=0x7f020039; - public static final int ic_skin1_border=0x7f02003a; - public static final int ic_skin1_cdcover=0x7f02003b; - public static final int ic_skin1_file_audio=0x7f02003c; - public static final int ic_skin1_file_folder=0x7f02003d; - public static final int ic_skin1_file_folderback=0x7f02003e; - public static final int ic_skin1_file_movie=0x7f02003f; - public static final int ic_skin1_file_picture=0x7f020040; - public static final int ic_skin1_file_playlist=0x7f020041; - public static final int ic_skin1_splash=0x7f020042; - public static final int ic_tab_album=0x7f020043; - public static final int ic_tab_album_off=0x7f020044; - public static final int ic_tab_album_on=0x7f020045; - public static final int ic_tab_artist=0x7f020046; - public static final int ic_tab_artist_off=0x7f020047; - public static final int ic_tab_artist_on=0x7f020048; - public static final int ic_tab_music=0x7f020049; - public static final int ic_tab_music_off=0x7f02004a; - public static final int ic_tab_music_on=0x7f02004b; - public static final int ic_tab_song=0x7f02004c; - public static final int ic_tab_song_off=0x7f02004d; - public static final int ic_tab_song_on=0x7f02004e; - public static final int ic_weather_0=0x7f02004f; - public static final int ic_weather_1=0x7f020050; - public static final int ic_weather_10=0x7f020051; - public static final int ic_weather_11=0x7f020052; - public static final int ic_weather_12=0x7f020053; - public static final int ic_weather_13=0x7f020054; - public static final int ic_weather_14=0x7f020055; - public static final int ic_weather_15=0x7f020056; - public static final int ic_weather_16=0x7f020057; - public static final int ic_weather_17=0x7f020058; - public static final int ic_weather_18=0x7f020059; - public static final int ic_weather_19=0x7f02005a; - public static final int ic_weather_2=0x7f02005b; - public static final int ic_weather_20=0x7f02005c; - public static final int ic_weather_21=0x7f02005d; - public static final int ic_weather_22=0x7f02005e; - public static final int ic_weather_23=0x7f02005f; - public static final int ic_weather_24=0x7f020060; - public static final int ic_weather_25=0x7f020061; - public static final int ic_weather_26=0x7f020062; - public static final int ic_weather_27=0x7f020063; - public static final int ic_weather_28=0x7f020064; - public static final int ic_weather_29=0x7f020065; - public static final int ic_weather_3=0x7f020066; - public static final int ic_weather_30=0x7f020067; - public static final int ic_weather_31=0x7f020068; - public static final int ic_weather_32=0x7f020069; - public static final int ic_weather_33=0x7f02006a; - public static final int ic_weather_34=0x7f02006b; - public static final int ic_weather_35=0x7f02006c; - public static final int ic_weather_36=0x7f02006d; - public static final int ic_weather_37=0x7f02006e; - public static final int ic_weather_38=0x7f02006f; - public static final int ic_weather_39=0x7f020070; - public static final int ic_weather_4=0x7f020071; - public static final int ic_weather_40=0x7f020072; - public static final int ic_weather_41=0x7f020073; - public static final int ic_weather_42=0x7f020074; - public static final int ic_weather_43=0x7f020075; - public static final int ic_weather_44=0x7f020076; - public static final int ic_weather_45=0x7f020077; - public static final int ic_weather_46=0x7f020078; - public static final int ic_weather_47=0x7f020079; - public static final int ic_weather_5=0x7f02007a; - public static final int ic_weather_6=0x7f02007b; - public static final int ic_weather_7=0x7f02007c; - public static final int ic_weather_8=0x7f02007d; - public static final int ic_weather_9=0x7f02007e; - public static final int ic_weather_na=0x7f02007f; - public static final int ic_weather_weatheralert=0x7f020080; - public static final int permission=0x7f020081; + public static final int backgroundimage=0x7f020001; + public static final int empty=0x7f020002; + public static final int ic_launcher_icon=0x7f020003; + public static final int ic_menu_skin1_back=0x7f020004; + public static final int ic_menu_skin1_backward=0x7f020005; + public static final int ic_menu_skin1_channel_m=0x7f020006; + public static final int ic_menu_skin1_channel_p=0x7f020007; + public static final int ic_menu_skin1_document=0x7f020008; + public static final int ic_menu_skin1_down=0x7f020009; + public static final int ic_menu_skin1_forward=0x7f02000a; + public static final int ic_menu_skin1_fullscreen=0x7f02000b; + public static final int ic_menu_skin1_home=0x7f02000c; + public static final int ic_menu_skin1_info=0x7f02000d; + public static final int ic_menu_skin1_left=0x7f02000e; + public static final int ic_menu_skin1_logo=0x7f02000f; + public static final int ic_menu_skin1_menu=0x7f020010; + public static final int ic_menu_skin1_minus=0x7f020011; + public static final int ic_menu_skin1_music=0x7f020012; + public static final int ic_menu_skin1_now_playing=0x7f020013; + public static final int ic_menu_skin1_osd=0x7f020014; + public static final int ic_menu_skin1_pause=0x7f020015; + public static final int ic_menu_skin1_pictures=0x7f020016; + public static final int ic_menu_skin1_play=0x7f020017; + public static final int ic_menu_skin1_plugins=0x7f020018; + public static final int ic_menu_skin1_plus=0x7f020019; + public static final int ic_menu_skin1_power=0x7f02001a; + public static final int ic_menu_skin1_radio=0x7f02001b; + public static final int ic_menu_skin1_ratio=0x7f02001c; + public static final int ic_menu_skin1_remote=0x7f02001d; + public static final int ic_menu_skin1_right=0x7f02001e; + public static final int ic_menu_skin1_select=0x7f02001f; + public static final int ic_menu_skin1_skip_backward=0x7f020020; + public static final int ic_menu_skin1_skip_forward=0x7f020021; + public static final int ic_menu_skin1_stop=0x7f020022; + public static final int ic_menu_skin1_subtitles=0x7f020023; + public static final int ic_menu_skin1_up=0x7f020024; + public static final int ic_menu_skin1_video=0x7f020025; + public static final int ic_menu_skin1_vol_m=0x7f020026; + public static final int ic_menu_skin1_vol_p=0x7f020027; + public static final int ic_menu_skin1_weather=0x7f020028; + public static final int ic_menu_skin2_back=0x7f020029; + public static final int ic_menu_skin2_backward=0x7f02002a; + public static final int ic_menu_skin2_channel_m=0x7f02002b; + public static final int ic_menu_skin2_channel_p=0x7f02002c; + public static final int ic_menu_skin2_document=0x7f02002d; + public static final int ic_menu_skin2_down=0x7f02002e; + public static final int ic_menu_skin2_forward=0x7f02002f; + public static final int ic_menu_skin2_fullscreen=0x7f020030; + public static final int ic_menu_skin2_home=0x7f020031; + public static final int ic_menu_skin2_info=0x7f020032; + public static final int ic_menu_skin2_left=0x7f020033; + public static final int ic_menu_skin2_logo=0x7f020034; + public static final int ic_menu_skin2_menu=0x7f020035; + public static final int ic_menu_skin2_minus=0x7f020036; + public static final int ic_menu_skin2_music=0x7f020037; + public static final int ic_menu_skin2_now_playing=0x7f020038; + public static final int ic_menu_skin2_osd=0x7f020039; + public static final int ic_menu_skin2_pause=0x7f02003a; + public static final int ic_menu_skin2_pictures=0x7f02003b; + public static final int ic_menu_skin2_play=0x7f02003c; + public static final int ic_menu_skin2_plugins=0x7f02003d; + public static final int ic_menu_skin2_plus=0x7f02003e; + public static final int ic_menu_skin2_power=0x7f02003f; + public static final int ic_menu_skin2_radio=0x7f020040; + public static final int ic_menu_skin2_ratio=0x7f020041; + public static final int ic_menu_skin2_remote=0x7f020042; + public static final int ic_menu_skin2_right=0x7f020043; + public static final int ic_menu_skin2_select=0x7f020044; + public static final int ic_menu_skin2_skip_backward=0x7f020045; + public static final int ic_menu_skin2_skip_forward=0x7f020046; + public static final int ic_menu_skin2_stop=0x7f020047; + public static final int ic_menu_skin2_subtitles=0x7f020048; + public static final int ic_menu_skin2_up=0x7f020049; + public static final int ic_menu_skin2_video=0x7f02004a; + public static final int ic_menu_skin2_vol_m=0x7f02004b; + public static final int ic_menu_skin2_vol_p=0x7f02004c; + public static final int ic_menu_skin2_weather=0x7f02004d; + public static final int ic_skin1_border=0x7f02004e; + public static final int ic_skin1_cdcover=0x7f02004f; + public static final int ic_skin1_file_audio=0x7f020050; + public static final int ic_skin1_file_folder=0x7f020051; + public static final int ic_skin1_file_folderback=0x7f020052; + public static final int ic_skin1_file_movie=0x7f020053; + public static final int ic_skin1_file_picture=0x7f020054; + public static final int ic_skin1_file_playlist=0x7f020055; + public static final int ic_skin1_splash=0x7f020056; + public static final int ic_skin2_cdcover=0x7f020057; + public static final int ic_skin2_file_audio=0x7f020058; + public static final int ic_skin2_file_folder=0x7f020059; + public static final int ic_skin2_file_folderback=0x7f02005a; + public static final int ic_skin2_file_movie=0x7f02005b; + public static final int ic_skin2_file_picture=0x7f02005c; + public static final int ic_skin2_file_playlist=0x7f02005d; + public static final int ic_skin2_splash=0x7f02005e; + public static final int ic_tab_album=0x7f02005f; + public static final int ic_tab_album_off=0x7f020060; + public static final int ic_tab_album_on=0x7f020061; + public static final int ic_tab_artist=0x7f020062; + public static final int ic_tab_artist_off=0x7f020063; + public static final int ic_tab_artist_on=0x7f020064; + public static final int ic_tab_music=0x7f020065; + public static final int ic_tab_music_off=0x7f020066; + public static final int ic_tab_music_on=0x7f020067; + public static final int ic_tab_song=0x7f020068; + public static final int ic_tab_song_off=0x7f020069; + public static final int ic_tab_song_on=0x7f02006a; + public static final int ic_weather_0=0x7f02006b; + public static final int ic_weather_1=0x7f02006c; + public static final int ic_weather_10=0x7f02006d; + public static final int ic_weather_11=0x7f02006e; + public static final int ic_weather_12=0x7f02006f; + public static final int ic_weather_13=0x7f020070; + public static final int ic_weather_14=0x7f020071; + public static final int ic_weather_15=0x7f020072; + public static final int ic_weather_16=0x7f020073; + public static final int ic_weather_17=0x7f020074; + public static final int ic_weather_18=0x7f020075; + public static final int ic_weather_19=0x7f020076; + public static final int ic_weather_2=0x7f020077; + public static final int ic_weather_20=0x7f020078; + public static final int ic_weather_21=0x7f020079; + public static final int ic_weather_22=0x7f02007a; + public static final int ic_weather_23=0x7f02007b; + public static final int ic_weather_24=0x7f02007c; + public static final int ic_weather_25=0x7f02007d; + public static final int ic_weather_26=0x7f02007e; + public static final int ic_weather_27=0x7f02007f; + public static final int ic_weather_28=0x7f020080; + public static final int ic_weather_29=0x7f020081; + public static final int ic_weather_3=0x7f020082; + public static final int ic_weather_30=0x7f020083; + public static final int ic_weather_31=0x7f020084; + public static final int ic_weather_32=0x7f020085; + public static final int ic_weather_33=0x7f020086; + public static final int ic_weather_34=0x7f020087; + public static final int ic_weather_35=0x7f020088; + public static final int ic_weather_36=0x7f020089; + public static final int ic_weather_37=0x7f02008a; + public static final int ic_weather_38=0x7f02008b; + public static final int ic_weather_39=0x7f02008c; + public static final int ic_weather_4=0x7f02008d; + public static final int ic_weather_40=0x7f02008e; + public static final int ic_weather_41=0x7f02008f; + public static final int ic_weather_42=0x7f020090; + public static final int ic_weather_43=0x7f020091; + public static final int ic_weather_44=0x7f020092; + public static final int ic_weather_45=0x7f020093; + public static final int ic_weather_46=0x7f020094; + public static final int ic_weather_47=0x7f020095; + public static final int ic_weather_5=0x7f020096; + public static final int ic_weather_6=0x7f020097; + public static final int ic_weather_7=0x7f020098; + public static final int ic_weather_8=0x7f020099; + public static final int ic_weather_9=0x7f02009a; + public static final int ic_weather_na=0x7f02009b; + public static final int ic_weather_weatheralert=0x7f02009c; + public static final int permission=0x7f02009d; } public static final class id { public static final int GridView01=0x7f060015; - public static final int ImageView01=0x7f060029; - public static final int LinearLayout00=0x7f06005e; - public static final int LinearLayout01=0x7f060030; - public static final int LinearLayout02=0x7f060069; - public static final int LinearLayout03=0x7f060073; - public static final int LinearLayout04=0x7f06007d; - public static final int LinearLayout05=0x7f060083; - public static final int ListView01=0x7f06003e; - public static final int RadioGroup01=0x7f060097; - public static final int Spinner01=0x7f06008f; - public static final int SurfaceView01=0x7f06002f; + public static final int ImageView01=0x7f06002a; + public static final int LinearLayout00=0x7f060060; + public static final int LinearLayout01=0x7f060031; + public static final int LinearLayout02=0x7f06006b; + public static final int LinearLayout03=0x7f060075; + public static final int LinearLayout04=0x7f06007f; + public static final int LinearLayout05=0x7f060085; + public static final int ListView01=0x7f06003f; + public static final int RadioGroup01=0x7f060099; + public static final int Spinner01=0x7f060091; + public static final int SurfaceView01=0x7f060030; public static final int TableLayout01=0x7f060007; - public static final int TableLayout02=0x7f06004f; + public static final int TableLayout02=0x7f060051; public static final int TableRow01=0x7f060008; - public static final int TableRow02=0x7f060054; - public static final int TableRow03=0x7f060059; + public static final int TableRow02=0x7f060056; + public static final int TableRow03=0x7f06005b; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; public static final int btnAlbumSelDown=0x7f060019; @@ -171,7 +199,7 @@ public static final int btnArtistSelUp=0x7f06001f; public static final int btnResultSelDown=0x7f060021; public static final int btnResultSelUp=0x7f060023; - public static final int btnSelectSkin=0x7f060091; + public static final int btnSelectSkin=0x7f060093; public static final int btnSongSelDown=0x7f060025; public static final int btnSongSelUp=0x7f060027; public static final int btn_main_music=0x7f06000a; @@ -183,81 +211,83 @@ public static final int btn_main_skp_back=0x7f060010; public static final int btn_main_skp_forw=0x7f060012; public static final int btn_main_video=0x7f06000b; - public static final int btn_plugins_radio=0x7f060040; - public static final int btn_plugins_weather=0x7f06003f; - public static final int btnkey01=0x7f06005f; - public static final int btnkey02=0x7f060060; - public static final int btnkey03=0x7f060061; - public static final int btnkey04=0x7f060062; - public static final int btnkey05=0x7f060063; - public static final int btnkey06=0x7f060064; - public static final int btnkey07=0x7f060065; - public static final int btnkey08=0x7f060066; - public static final int btnkey09=0x7f060067; - public static final int btnkey10=0x7f060068; - public static final int btnkey11=0x7f06006a; - public static final int btnkey12=0x7f06006b; - public static final int btnkey13=0x7f06006c; - public static final int btnkey14=0x7f06006d; - public static final int btnkey15=0x7f06006e; - public static final int btnkey16=0x7f06006f; - public static final int btnkey17=0x7f060070; - public static final int btnkey18=0x7f060071; - public static final int btnkey19=0x7f060072; - public static final int btnkey20=0x7f060074; - public static final int btnkey21=0x7f060075; - public static final int btnkey22=0x7f060076; - public static final int btnkey23=0x7f060077; - public static final int btnkey24=0x7f060078; - public static final int btnkey25=0x7f060079; - public static final int btnkey26=0x7f06007a; - public static final int btnkey27=0x7f06007b; - public static final int btnkey28=0x7f06007c; - public static final int btnkey29=0x7f06007e; - public static final int btnkey30=0x7f06007f; - public static final int btnkey31=0x7f060080; - public static final int btnkey32=0x7f060081; - public static final int btnkey33=0x7f060082; - public static final int btnkey41=0x7f060084; - public static final int btnkey42=0x7f060085; - public static final int btnkey43=0x7f060086; - public static final int btnkey44=0x7f060087; - public static final int btnkey45=0x7f060088; - public static final int btnkey46=0x7f060089; - public static final int btnkey47=0x7f06008a; - public static final int btnkey48=0x7f06008b; - public static final int btnkey49=0x7f06008c; - public static final int btnkey50=0x7f06008d; - public static final int button_open=0x7f06002c; - public static final int button_stream=0x7f06002d; - public static final int button_stream_stop=0x7f06002e; - public static final int crtl_back=0x7f06004c; - public static final int crtl_ch_m=0x7f060058; - public static final int crtl_ch_p=0x7f060053; - public static final int crtl_down=0x7f06004b; - public static final int crtl_full=0x7f060055; - public static final int crtl_info=0x7f06005d; - public static final int crtl_left=0x7f060046; - public static final int crtl_menu=0x7f060057; - public static final int crtl_mp=0x7f060042; - public static final int crtl_osd=0x7f06005c; - public static final int crtl_parent=0x7f06004a; - public static final int crtl_play=0x7f060056; - public static final int crtl_power=0x7f060044; - public static final int crtl_ratio=0x7f06005b; - public static final int crtl_right=0x7f060048; - public static final int crtl_select=0x7f060047; - public static final int crtl_skip_back=0x7f060050; - public static final int crtl_skip_forw=0x7f060052; - public static final int crtl_stop=0x7f060051; - public static final int crtl_sub=0x7f06005a; - public static final int crtl_up=0x7f060043; - public static final int crtl_vol_m=0x7f06004e; - public static final int crtl_vol_p=0x7f06004d; - public static final int full_text=0x7f060028; + public static final int btn_plugins_radio=0x7f060041; + public static final int btn_plugins_weather=0x7f060040; + public static final int btnkey01=0x7f060061; + public static final int btnkey02=0x7f060062; + public static final int btnkey03=0x7f060063; + public static final int btnkey04=0x7f060064; + public static final int btnkey05=0x7f060065; + public static final int btnkey06=0x7f060066; + public static final int btnkey07=0x7f060067; + public static final int btnkey08=0x7f060068; + public static final int btnkey09=0x7f060069; + public static final int btnkey10=0x7f06006a; + public static final int btnkey11=0x7f06006c; + public static final int btnkey12=0x7f06006d; + public static final int btnkey13=0x7f06006e; + public static final int btnkey14=0x7f06006f; + public static final int btnkey15=0x7f060070; + public static final int btnkey16=0x7f060071; + public static final int btnkey17=0x7f060072; + public static final int btnkey18=0x7f060073; + public static final int btnkey19=0x7f060074; + public static final int btnkey20=0x7f060076; + public static final int btnkey21=0x7f060077; + public static final int btnkey22=0x7f060078; + public static final int btnkey23=0x7f060079; + public static final int btnkey24=0x7f06007a; + public static final int btnkey25=0x7f06007b; + public static final int btnkey26=0x7f06007c; + public static final int btnkey27=0x7f06007d; + public static final int btnkey28=0x7f06007e; + public static final int btnkey29=0x7f060080; + public static final int btnkey30=0x7f060081; + public static final int btnkey31=0x7f060082; + public static final int btnkey32=0x7f060083; + public static final int btnkey33=0x7f060084; + public static final int btnkey41=0x7f060086; + public static final int btnkey42=0x7f060087; + public static final int btnkey43=0x7f060088; + public static final int btnkey44=0x7f060089; + public static final int btnkey45=0x7f06008a; + public static final int btnkey46=0x7f06008b; + public static final int btnkey47=0x7f06008c; + public static final int btnkey48=0x7f06008d; + public static final int btnkey49=0x7f06008e; + public static final int btnkey50=0x7f06008f; + public static final int button_open=0x7f06002d; + public static final int button_stream=0x7f06002e; + public static final int button_stream_stop=0x7f06002f; + public static final int crtl_back=0x7f06004e; + public static final int crtl_ch_m=0x7f06005a; + public static final int crtl_ch_p=0x7f060055; + public static final int crtl_down=0x7f06004d; + public static final int crtl_full=0x7f060057; + public static final int crtl_info=0x7f06005f; + public static final int crtl_left=0x7f060048; + public static final int crtl_menu=0x7f060059; + public static final int crtl_mp=0x7f060044; + public static final int crtl_osd=0x7f06005e; + public static final int crtl_parent=0x7f06004c; + public static final int crtl_play=0x7f060058; + public static final int crtl_power=0x7f060046; + public static final int crtl_ratio=0x7f06005d; + public static final int crtl_right=0x7f06004a; + public static final int crtl_select=0x7f060049; + public static final int crtl_skip_back=0x7f060052; + public static final int crtl_skip_forw=0x7f060054; + public static final int crtl_stop=0x7f060053; + public static final int crtl_sub=0x7f06005c; + public static final int crtl_up=0x7f060045; + public static final int crtl_vol_m=0x7f060050; + public static final int crtl_vol_p=0x7f06004f; + public static final int full_text=0x7f060029; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; public static final int lay_main=0x7f060005; + public static final int lay_pictures=0x7f060028; + public static final int lay_remote01=0x7f060042; public static final int list_album=0x7f060018; public static final int list_artist=0x7f06001c; public static final int list_result=0x7f060020; @@ -265,88 +295,88 @@ public static final int main_instance=0x7f060006; public static final int main_now_playing=0x7f06000f; public static final int music_grid=0x7f060017; - public static final int now_album=0x7f060032; - public static final int now_artist=0x7f060038; - public static final int now_cd=0x7f060033; - public static final int now_list=0x7f06003d; - public static final int now_next=0x7f06003c; - public static final int now_play=0x7f06003b; - public static final int now_playing=0x7f060031; - public static final int now_playing_right=0x7f060036; - public static final int now_playing_t_left=0x7f060035; - public static final int now_prev=0x7f060039; - public static final int now_progress=0x7f060034; - public static final int now_stop=0x7f06003a; - public static final int now_title=0x7f060037; - public static final int radio01=0x7f0600c5; - public static final int radio02=0x7f0600c6; - public static final int radio03=0x7f0600c7; - public static final int radio04=0x7f0600c8; - public static final int radioStop=0x7f0600c9; - public static final int selectSkin1=0x7f060098; - public static final int selectSkin2=0x7f06009a; - public static final int selectSkin3=0x7f06009c; - public static final int server_ip=0x7f060094; - public static final int server_macid=0x7f060096; - public static final int server_name=0x7f060093; - public static final int server_port=0x7f060095; - public static final int splash=0x7f06009e; - public static final int text_kb_streamed=0x7f06002a; - public static final int title=0x7f06009f; + public static final int now_album=0x7f060033; + public static final int now_artist=0x7f060039; + public static final int now_cd=0x7f060034; + public static final int now_list=0x7f06003e; + public static final int now_next=0x7f06003d; + public static final int now_play=0x7f06003c; + public static final int now_playing=0x7f060032; + public static final int now_playing_right=0x7f060037; + public static final int now_playing_t_left=0x7f060036; + public static final int now_prev=0x7f06003a; + public static final int now_progress=0x7f060035; + public static final int now_stop=0x7f06003b; + public static final int now_title=0x7f060038; + public static final int radio01=0x7f0600c7; + public static final int radio02=0x7f0600c8; + public static final int radio03=0x7f0600c9; + public static final int radio04=0x7f0600ca; + public static final int radioStop=0x7f0600cb; + public static final int selectSkin1=0x7f06009a; + public static final int selectSkin2=0x7f06009c; + public static final int selectSkin3=0x7f06009e; + public static final int server_ip=0x7f060096; + public static final int server_macid=0x7f060098; + public static final int server_name=0x7f060095; + public static final int server_port=0x7f060097; + public static final int splash=0x7f0600a0; + public static final int text_kb_streamed=0x7f06002b; + public static final int title=0x7f0600a1; public static final int txtDbAlbum=0x7f06001a; public static final int txtDbArtist=0x7f06001e; public static final int txtDbResult=0x7f060022; public static final int txtDbSong=0x7f060026; public static final int txtDirMusic=0x7f060016; public static final int txtDirectory=0x7f060014; - public static final int txtFile=0x7f06002b; - public static final int txtIntanceName=0x7f060092; - public static final int txtVersion=0x7f06008e; - public static final int vibration=0x7f060090; - public static final int visitHome1=0x7f060099; - public static final int visitHome2=0x7f06009b; - public static final int visitHome3=0x7f06009d; - public static final int weather_0_cond=0x7f0600c0; - public static final int weather_0_date=0x7f0600a7; - public static final int weather_0_day=0x7f0600ac; - public static final int weather_0_hi=0x7f0600b1; - public static final int weather_0_img=0x7f0600bb; - public static final int weather_0_lo=0x7f0600b6; - public static final int weather_1_cond=0x7f0600c1; - public static final int weather_1_date=0x7f0600a8; - public static final int weather_1_day=0x7f0600ad; - public static final int weather_1_hi=0x7f0600b2; - public static final int weather_1_img=0x7f0600bc; - public static final int weather_1_lo=0x7f0600b7; - public static final int weather_2_cond=0x7f0600c2; - public static final int weather_2_date=0x7f0600a9; - public static final int weather_2_day=0x7f0600ae; - public static final int weather_2_hi=0x7f0600b3; - public static final int weather_2_img=0x7f0600bd; - public static final int weather_2_lo=0x7f0600b8; - public static final int weather_3_cond=0x7f0600c3; - public static final int weather_3_date=0x7f0600aa; - public static final int weather_3_day=0x7f0600af; - public static final int weather_3_hi=0x7f0600b4; - public static final int weather_3_img=0x7f0600be; - public static final int weather_3_lo=0x7f0600b9; - public static final int weather_4_cond=0x7f0600c4; - public static final int weather_4_date=0x7f0600ab; - public static final int weather_4_day=0x7f0600b0; - public static final int weather_4_hi=0x7f0600b5; - public static final int weather_4_img=0x7f0600bf; - public static final int weather_4_lo=0x7f0600ba; - public static final int weather_actFeel=0x7f0600a5; - public static final int weather_actImage=0x7f0600a0; - public static final int weather_actPlace=0x7f0600a3; - public static final int weather_actTemp=0x7f0600a4; - public static final int weather_actText=0x7f0600a1; - public static final int weather_actTime=0x7f0600a2; - public static final int weather_actWind=0x7f0600a6; + public static final int txtFile=0x7f06002c; + public static final int txtIntanceName=0x7f060094; + public static final int txtVersion=0x7f060090; + public static final int vibration=0x7f060092; + public static final int visitHome1=0x7f06009b; + public static final int visitHome2=0x7f06009d; + public static final int visitHome3=0x7f06009f; + public static final int weather_0_cond=0x7f0600c2; + public static final int weather_0_date=0x7f0600a9; + public static final int weather_0_day=0x7f0600ae; + public static final int weather_0_hi=0x7f0600b3; + public static final int weather_0_img=0x7f0600bd; + public static final int weather_0_lo=0x7f0600b8; + public static final int weather_1_cond=0x7f0600c3; + public static final int weather_1_date=0x7f0600aa; + public static final int weather_1_day=0x7f0600af; + public static final int weather_1_hi=0x7f0600b4; + public static final int weather_1_img=0x7f0600be; + public static final int weather_1_lo=0x7f0600b9; + public static final int weather_2_cond=0x7f0600c4; + public static final int weather_2_date=0x7f0600ab; + public static final int weather_2_day=0x7f0600b0; + public static final int weather_2_hi=0x7f0600b5; + public static final int weather_2_img=0x7f0600bf; + public static final int weather_2_lo=0x7f0600ba; + public static final int weather_3_cond=0x7f0600c5; + public static final int weather_3_date=0x7f0600ac; + public static final int weather_3_day=0x7f0600b1; + public static final int weather_3_hi=0x7f0600b6; + public static final int weather_3_img=0x7f0600c0; + public static final int weather_3_lo=0x7f0600bb; + public static final int weather_4_cond=0x7f0600c6; + public static final int weather_4_date=0x7f0600ad; + public static final int weather_4_day=0x7f0600b2; + public static final int weather_4_hi=0x7f0600b7; + public static final int weather_4_img=0x7f0600c1; + public static final int weather_4_lo=0x7f0600bc; + public static final int weather_actFeel=0x7f0600a7; + public static final int weather_actImage=0x7f0600a2; + public static final int weather_actPlace=0x7f0600a5; + public static final int weather_actTemp=0x7f0600a6; + public static final int weather_actText=0x7f0600a3; + public static final int weather_actTime=0x7f0600a4; + public static final int weather_actWind=0x7f0600a8; public static final int widget0=0x7f060013; - public static final int widget00=0x7f060041; - public static final int widget01=0x7f060045; - public static final int widget02=0x7f060049; + public static final int widget00=0x7f060043; + public static final int widget01=0x7f060047; + public static final int widget02=0x7f06004b; public static final int widget44=0x7f060000; } public static final class layout { Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/backgroundimage.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/backgroundimage.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_back.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_backward.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_backward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_m.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_m.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_p.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_channel_p.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_document.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_document.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_down.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_forward.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_forward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_fullscreen.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_fullscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_home.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_info.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_info.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_left.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_logo.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_menu.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_menu.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_minus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_minus.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_osd.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_osd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pause.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_play.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plus.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_power.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_power.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_radio.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_radio.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_ratio.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_ratio.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_right.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_select.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_select.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_stop.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_subtitles.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_subtitles.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_up.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_m.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_p.png =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_weather.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_weather.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_cdcover.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_cdcover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_audio.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_audio.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folder.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folder.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folderback.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_folderback.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_movie.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_movie.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_picture.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_playlist.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_file_playlist.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_splash.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin2_splash.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/icon.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/icon.xml 2011-02-07 13:31:59 UTC (rev 4099) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/icon.xml 2011-02-07 21:41:27 UTC (rev 4100) @@ -2,8 +2,8 @@ android:id="@+id/widget44" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:layout_x="201px" android:layout_y="165px" android:gravity="center_horizontal"> - <ImageView android:id="@+id/icon_image" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + <ImageView android:id="@+id/icon_image" android:layout_height="90dip" + android:layout_width="90dip" android:scaleType="centerInside"> </ImageView> <TextView android:id="@+id/icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="TextView" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-07 13:31:59 UTC (rev 4099) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-07 21:41:27 UTC (rev 4100) @@ -10,10 +10,7 @@ <GridView android:layout_y="0dip" android:layout_x="0dip" android:id="@+id/music_grid" android:layout_width="fill_parent" - android:layout_height="fill_parent" android:columnWidth="90dp" - android:numColumns="auto_fit" android:verticalSpacing="10dp" - android:horizontalSpacing="10dp" android:stretchMode="columnWidth" - android:gravity="center"> + android:layout_height="fill_parent" android:numColumns="auto_fit" android:gravity="center" android:stretchMode="columnWidth" android:verticalSpacing="10dp" android:horizontalSpacing="10dp" android:columnWidth="90dp"> </GridView> </LinearLayout> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-07 13:31:59 UTC (rev 4099) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-07 21:41:27 UTC (rev 4100) @@ -1,4 +1,4 @@ -<LinearLayo... [truncated message content] |
From: <kro...@us...> - 2011-02-07 13:32:07
|
Revision: 4099 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4099&view=rev Author: kroko_koenig Date: 2011-02-07 13:31:59 +0000 (Mon, 07 Feb 2011) Log Message: ----------- add weather Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_music.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pictures.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plugins.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_remote.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_backward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_forward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_video.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/weather.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Weather.java trunk/plugins/AndroidRemote/Server/AndroidRemote/AndroidRemote.csproj trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back_blue3.jpg trunk/plugins/AndroidRemote/Release/MediaPortalRemote.apk trunk/plugins/AndroidRemote/Release/blue3_2.jpg trunk/plugins/AndroidRemote/Server/AndroidRemote/Plugins/ trunk/plugins/AndroidRemote/Server/AndroidRemote/Plugins/Weather.cs Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-06 11:16:03 UTC (rev 4098) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-07 13:31:59 UTC (rev 4099) @@ -14,301 +14,339 @@ public static final class attr { } public static final class drawable { - public static final int empty=0x7f020000; - public static final int ic_launcher_icon=0x7f020001; - public static final int ic_menu_skin1_back=0x7f020002; - public static final int ic_menu_skin1_backward=0x7f020003; - public static final int ic_menu_skin1_channel_m=0x7f020004; - public static final int ic_menu_skin1_channel_p=0x7f020005; - public static final int ic_menu_skin1_document=0x7f020006; - public static final int ic_menu_skin1_down=0x7f020007; - public static final int ic_menu_skin1_forward=0x7f020008; - public static final int ic_menu_skin1_fullscreen=0x7f020009; - public static final int ic_menu_skin1_home=0x7f02000a; - public static final int ic_menu_skin1_info=0x7f02000b; - public static final int ic_menu_skin1_left=0x7f02000c; - public static final int ic_menu_skin1_logo=0x7f02000d; - public static final int ic_menu_skin1_menu=0x7f02000e; - public static final int ic_menu_skin1_minus=0x7f02000f; - public static final int ic_menu_skin1_music=0x7f020010; - public static final int ic_menu_skin1_now_playing=0x7f020011; - public static final int ic_menu_skin1_osd=0x7f020012; - public static final int ic_menu_skin1_pause=0x7f020013; - public static final int ic_menu_skin1_pictures=0x7f020014; - public static final int ic_menu_skin1_play=0x7f020015; - public static final int ic_menu_skin1_plugins=0x7f020016; - public static final int ic_menu_skin1_plus=0x7f020017; - public static final int ic_menu_skin1_power=0x7f020018; - public static final int ic_menu_skin1_radio=0x7f020019; - public static final int ic_menu_skin1_ratio=0x7f02001a; - public static final int ic_menu_skin1_remote=0x7f02001b; - public static final int ic_menu_skin1_right=0x7f02001c; - public static final int ic_menu_skin1_select=0x7f02001d; - public static final int ic_menu_skin1_skip_backward=0x7f02001e; - public static final int ic_menu_skin1_skip_forward=0x7f02001f; - public static final int ic_menu_skin1_stop=0x7f020020; - public static final int ic_menu_skin1_subtitles=0x7f020021; - public static final int ic_menu_skin1_up=0x7f020022; - public static final int ic_menu_skin1_video=0x7f020023; - public static final int ic_menu_skin1_vol_m=0x7f020024; - public static final int ic_menu_skin1_vol_p=0x7f020025; - public static final int ic_menu_skin1_weather=0x7f020026; - public static final int ic_menu_skin2_back=0x7f020027; - public static final int ic_menu_skin2_down=0x7f020028; - public static final int ic_menu_skin2_home=0x7f020029; - public static final int ic_menu_skin2_left=0x7f02002a; - public static final int ic_menu_skin2_music=0x7f02002b; - public static final int ic_menu_skin2_now_playing=0x7f02002c; - public static final int ic_menu_skin2_pause=0x7f02002d; - public static final int ic_menu_skin2_pictures=0x7f02002e; - public static final int ic_menu_skin2_play=0x7f02002f; - public static final int ic_menu_skin2_plugins=0x7f020030; - public static final int ic_menu_skin2_remote=0x7f020031; - public static final int ic_menu_skin2_right=0x7f020032; - public static final int ic_menu_skin2_skip_backward=0x7f020033; - public static final int ic_menu_skin2_skip_forward=0x7f020034; - public static final int ic_menu_skin2_up=0x7f020035; - public static final int ic_menu_skin2_video=0x7f020036; - public static final int ic_menu_skin2_vol_m=0x7f020037; - public static final int ic_menu_skin2_vol_p=0x7f020038; - public static final int ic_skin1_border=0x7f020039; - public static final int ic_skin1_cdcover=0x7f02003a; - public static final int ic_skin1_file_audio=0x7f02003b; - public static final int ic_skin1_file_folder=0x7f02003c; - public static final int ic_skin1_file_folderback=0x7f02003d; - public static final int ic_skin1_file_movie=0x7f02003e; - public static final int ic_skin1_file_picture=0x7f02003f; - public static final int ic_skin1_file_playlist=0x7f020040; - public static final int ic_skin1_splash=0x7f020041; - public static final int ic_tab_album=0x7f020042; - public static final int ic_tab_album_off=0x7f020043; - public static final int ic_tab_album_on=0x7f020044; - public static final int ic_tab_artist=0x7f020045; - public static final int ic_tab_artist_off=0x7f020046; - public static final int ic_tab_artist_on=0x7f020047; - public static final int ic_tab_music=0x7f020048; - public static final int ic_tab_music_off=0x7f020049; - public static final int ic_tab_music_on=0x7f02004a; - public static final int ic_tab_song=0x7f02004b; - public static final int ic_tab_song_off=0x7f02004c; - public static final int ic_tab_song_on=0x7f02004d; - public static final int ic_weather_0=0x7f02004e; - public static final int ic_weather_1=0x7f02004f; - public static final int ic_weather_10=0x7f020050; - public static final int ic_weather_11=0x7f020051; - public static final int ic_weather_12=0x7f020052; - public static final int ic_weather_13=0x7f020053; - public static final int ic_weather_14=0x7f020054; - public static final int ic_weather_15=0x7f020055; - public static final int ic_weather_16=0x7f020056; - public static final int ic_weather_17=0x7f020057; - public static final int ic_weather_18=0x7f020058; - public static final int ic_weather_19=0x7f020059; - public static final int ic_weather_2=0x7f02005a; - public static final int ic_weather_20=0x7f02005b; - public static final int ic_weather_21=0x7f02005c; - public static final int ic_weather_22=0x7f02005d; - public static final int ic_weather_23=0x7f02005e; - public static final int ic_weather_24=0x7f02005f; - public static final int ic_weather_25=0x7f020060; - public static final int ic_weather_26=0x7f020061; - public static final int ic_weather_27=0x7f020062; - public static final int ic_weather_28=0x7f020063; - public static final int ic_weather_29=0x7f020064; - public static final int ic_weather_3=0x7f020065; - public static final int ic_weather_30=0x7f020066; - public static final int ic_weather_31=0x7f020067; - public static final int ic_weather_32=0x7f020068; - public static final int ic_weather_33=0x7f020069; - public static final int ic_weather_34=0x7f02006a; - public static final int ic_weather_35=0x7f02006b; - public static final int ic_weather_36=0x7f02006c; - public static final int ic_weather_37=0x7f02006d; - public static final int ic_weather_38=0x7f02006e; - public static final int ic_weather_39=0x7f02006f; - public static final int ic_weather_4=0x7f020070; - public static final int ic_weather_40=0x7f020071; - public static final int ic_weather_41=0x7f020072; - public static final int ic_weather_42=0x7f020073; - public static final int ic_weather_43=0x7f020074; - public static final int ic_weather_44=0x7f020075; - public static final int ic_weather_45=0x7f020076; - public static final int ic_weather_46=0x7f020077; - public static final int ic_weather_47=0x7f020078; - public static final int ic_weather_5=0x7f020079; - public static final int ic_weather_6=0x7f02007a; - public static final int ic_weather_7=0x7f02007b; - public static final int ic_weather_8=0x7f02007c; - public static final int ic_weather_9=0x7f02007d; - public static final int ic_weather_na=0x7f02007e; - public static final int ic_weather_weatheralert=0x7f02007f; - public static final int permission=0x7f020080; + public static final int back_blue3=0x7f020000; + public static final int empty=0x7f020001; + public static final int ic_launcher_icon=0x7f020002; + public static final int ic_menu_skin1_back=0x7f020003; + public static final int ic_menu_skin1_backward=0x7f020004; + public static final int ic_menu_skin1_channel_m=0x7f020005; + public static final int ic_menu_skin1_channel_p=0x7f020006; + public static final int ic_menu_skin1_document=0x7f020007; + public static final int ic_menu_skin1_down=0x7f020008; + public static final int ic_menu_skin1_forward=0x7f020009; + public static final int ic_menu_skin1_fullscreen=0x7f02000a; + public static final int ic_menu_skin1_home=0x7f02000b; + public static final int ic_menu_skin1_info=0x7f02000c; + public static final int ic_menu_skin1_left=0x7f02000d; + public static final int ic_menu_skin1_logo=0x7f02000e; + public static final int ic_menu_skin1_menu=0x7f02000f; + public static final int ic_menu_skin1_minus=0x7f020010; + public static final int ic_menu_skin1_music=0x7f020011; + public static final int ic_menu_skin1_now_playing=0x7f020012; + public static final int ic_menu_skin1_osd=0x7f020013; + public static final int ic_menu_skin1_pause=0x7f020014; + public static final int ic_menu_skin1_pictures=0x7f020015; + public static final int ic_menu_skin1_play=0x7f020016; + public static final int ic_menu_skin1_plugins=0x7f020017; + public static final int ic_menu_skin1_plus=0x7f020018; + public static final int ic_menu_skin1_power=0x7f020019; + public static final int ic_menu_skin1_radio=0x7f02001a; + public static final int ic_menu_skin1_ratio=0x7f02001b; + public static final int ic_menu_skin1_remote=0x7f02001c; + public static final int ic_menu_skin1_right=0x7f02001d; + public static final int ic_menu_skin1_select=0x7f02001e; + public static final int ic_menu_skin1_skip_backward=0x7f02001f; + public static final int ic_menu_skin1_skip_forward=0x7f020020; + public static final int ic_menu_skin1_stop=0x7f020021; + public static final int ic_menu_skin1_subtitles=0x7f020022; + public static final int ic_menu_skin1_up=0x7f020023; + public static final int ic_menu_skin1_video=0x7f020024; + public static final int ic_menu_skin1_vol_m=0x7f020025; + public static final int ic_menu_skin1_vol_p=0x7f020026; + public static final int ic_menu_skin1_weather=0x7f020027; + public static final int ic_menu_skin2_back=0x7f020028; + public static final int ic_menu_skin2_down=0x7f020029; + public static final int ic_menu_skin2_home=0x7f02002a; + public static final int ic_menu_skin2_left=0x7f02002b; + public static final int ic_menu_skin2_music=0x7f02002c; + public static final int ic_menu_skin2_now_playing=0x7f02002d; + public static final int ic_menu_skin2_pause=0x7f02002e; + public static final int ic_menu_skin2_pictures=0x7f02002f; + public static final int ic_menu_skin2_play=0x7f020030; + public static final int ic_menu_skin2_plugins=0x7f020031; + public static final int ic_menu_skin2_remote=0x7f020032; + public static final int ic_menu_skin2_right=0x7f020033; + public static final int ic_menu_skin2_skip_backward=0x7f020034; + public static final int ic_menu_skin2_skip_forward=0x7f020035; + public static final int ic_menu_skin2_up=0x7f020036; + public static final int ic_menu_skin2_video=0x7f020037; + public static final int ic_menu_skin2_vol_m=0x7f020038; + public static final int ic_menu_skin2_vol_p=0x7f020039; + public static final int ic_skin1_border=0x7f02003a; + public static final int ic_skin1_cdcover=0x7f02003b; + public static final int ic_skin1_file_audio=0x7f02003c; + public static final int ic_skin1_file_folder=0x7f02003d; + public static final int ic_skin1_file_folderback=0x7f02003e; + public static final int ic_skin1_file_movie=0x7f02003f; + public static final int ic_skin1_file_picture=0x7f020040; + public static final int ic_skin1_file_playlist=0x7f020041; + public static final int ic_skin1_splash=0x7f020042; + public static final int ic_tab_album=0x7f020043; + public static final int ic_tab_album_off=0x7f020044; + public static final int ic_tab_album_on=0x7f020045; + public static final int ic_tab_artist=0x7f020046; + public static final int ic_tab_artist_off=0x7f020047; + public static final int ic_tab_artist_on=0x7f020048; + public static final int ic_tab_music=0x7f020049; + public static final int ic_tab_music_off=0x7f02004a; + public static final int ic_tab_music_on=0x7f02004b; + public static final int ic_tab_song=0x7f02004c; + public static final int ic_tab_song_off=0x7f02004d; + public static final int ic_tab_song_on=0x7f02004e; + public static final int ic_weather_0=0x7f02004f; + public static final int ic_weather_1=0x7f020050; + public static final int ic_weather_10=0x7f020051; + public static final int ic_weather_11=0x7f020052; + public static final int ic_weather_12=0x7f020053; + public static final int ic_weather_13=0x7f020054; + public static final int ic_weather_14=0x7f020055; + public static final int ic_weather_15=0x7f020056; + public static final int ic_weather_16=0x7f020057; + public static final int ic_weather_17=0x7f020058; + public static final int ic_weather_18=0x7f020059; + public static final int ic_weather_19=0x7f02005a; + public static final int ic_weather_2=0x7f02005b; + public static final int ic_weather_20=0x7f02005c; + public static final int ic_weather_21=0x7f02005d; + public static final int ic_weather_22=0x7f02005e; + public static final int ic_weather_23=0x7f02005f; + public static final int ic_weather_24=0x7f020060; + public static final int ic_weather_25=0x7f020061; + public static final int ic_weather_26=0x7f020062; + public static final int ic_weather_27=0x7f020063; + public static final int ic_weather_28=0x7f020064; + public static final int ic_weather_29=0x7f020065; + public static final int ic_weather_3=0x7f020066; + public static final int ic_weather_30=0x7f020067; + public static final int ic_weather_31=0x7f020068; + public static final int ic_weather_32=0x7f020069; + public static final int ic_weather_33=0x7f02006a; + public static final int ic_weather_34=0x7f02006b; + public static final int ic_weather_35=0x7f02006c; + public static final int ic_weather_36=0x7f02006d; + public static final int ic_weather_37=0x7f02006e; + public static final int ic_weather_38=0x7f02006f; + public static final int ic_weather_39=0x7f020070; + public static final int ic_weather_4=0x7f020071; + public static final int ic_weather_40=0x7f020072; + public static final int ic_weather_41=0x7f020073; + public static final int ic_weather_42=0x7f020074; + public static final int ic_weather_43=0x7f020075; + public static final int ic_weather_44=0x7f020076; + public static final int ic_weather_45=0x7f020077; + public static final int ic_weather_46=0x7f020078; + public static final int ic_weather_47=0x7f020079; + public static final int ic_weather_5=0x7f02007a; + public static final int ic_weather_6=0x7f02007b; + public static final int ic_weather_7=0x7f02007c; + public static final int ic_weather_8=0x7f02007d; + public static final int ic_weather_9=0x7f02007e; + public static final int ic_weather_na=0x7f02007f; + public static final int ic_weather_weatheralert=0x7f020080; + public static final int permission=0x7f020081; } public static final class id { - public static final int GridView01=0x7f060014; - public static final int ImageView01=0x7f060028; - public static final int ImageView02=0x7f06009f; - public static final int LinearLayout00=0x7f06005d; - public static final int LinearLayout01=0x7f06002f; - public static final int LinearLayout02=0x7f060068; - public static final int LinearLayout03=0x7f060072; - public static final int LinearLayout04=0x7f06007c; - public static final int LinearLayout05=0x7f060082; - public static final int ListView01=0x7f06003d; - public static final int RadioGroup01=0x7f060096; - public static final int Spinner01=0x7f06008e; - public static final int SurfaceView01=0x7f06002e; - public static final int TableLayout01=0x7f060006; - public static final int TableLayout02=0x7f06004e; - public static final int TableRow01=0x7f060007; - public static final int TableRow02=0x7f060053; - public static final int TableRow03=0x7f060058; + public static final int GridView01=0x7f060015; + public static final int ImageView01=0x7f060029; + public static final int LinearLayout00=0x7f06005e; + public static final int LinearLayout01=0x7f060030; + public static final int LinearLayout02=0x7f060069; + public static final int LinearLayout03=0x7f060073; + public static final int LinearLayout04=0x7f06007d; + public static final int LinearLayout05=0x7f060083; + public static final int ListView01=0x7f06003e; + public static final int RadioGroup01=0x7f060097; + public static final int Spinner01=0x7f06008f; + public static final int SurfaceView01=0x7f06002f; + public static final int TableLayout01=0x7f060007; + public static final int TableLayout02=0x7f06004f; + public static final int TableRow01=0x7f060008; + public static final int TableRow02=0x7f060054; + public static final int TableRow03=0x7f060059; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; - public static final int btnAlbumSelDown=0x7f060018; - public static final int btnAlbumSelUp=0x7f06001a; - public static final int btnArtistSelDown=0x7f06001c; - public static final int btnArtistSelUp=0x7f06001e; - public static final int btnResultSelDown=0x7f060020; - public static final int btnResultSelUp=0x7f060022; - public static final int btnSelectSkin=0x7f060090; - public static final int btnSongSelDown=0x7f060024; - public static final int btnSongSelUp=0x7f060026; - public static final int btn_main_music=0x7f060009; - public static final int btn_main_now_playing=0x7f06000c; - public static final int btn_main_pictures=0x7f060008; - public static final int btn_main_play=0x7f060010; - public static final int btn_main_plugins=0x7f06000d; - public static final int btn_main_remote=0x7f06000b; - public static final int btn_main_skp_back=0x7f06000f; - public static final int btn_main_skp_forw=0x7f060011; - public static final int btn_main_video=0x7f06000a; - public static final int btn_plugins_radio=0x7f06003f; - public static final int btn_plugins_weather=0x7f06003e; - public static final int btnkey01=0x7f06005e; - public static final int btnkey02=0x7f06005f; - public static final int btnkey03=0x7f060060; - public static final int btnkey04=0x7f060061; - public static final int btnkey05=0x7f060062; - public static final int btnkey06=0x7f060063; - public static final int btnkey07=0x7f060064; - public static final int btnkey08=0x7f060065; - public static final int btnkey09=0x7f060066; - public static final int btnkey10=0x7f060067; - public static final int btnkey11=0x7f060069; - public static final int btnkey12=0x7f06006a; - public static final int btnkey13=0x7f06006b; - public static final int btnkey14=0x7f06006c; - public static final int btnkey15=0x7f06006d; - public static final int btnkey16=0x7f06006e; - public static final int btnkey17=0x7f06006f; - public static final int btnkey18=0x7f060070; - public static final int btnkey19=0x7f060071; - public static final int btnkey20=0x7f060073; - public static final int btnkey21=0x7f060074; - public static final int btnkey22=0x7f060075; - public static final int btnkey23=0x7f060076; - public static final int btnkey24=0x7f060077; - public static final int btnkey25=0x7f060078; - public static final int btnkey26=0x7f060079; - public static final int btnkey27=0x7f06007a; - public static final int btnkey28=0x7f06007b; - public static final int btnkey29=0x7f06007d; - public static final int btnkey30=0x7f06007e; - public static final int btnkey31=0x7f06007f; - public static final int btnkey32=0x7f060080; - public static final int btnkey33=0x7f060081; - public static final int btnkey41=0x7f060083; - public static final int btnkey42=0x7f060084; - public static final int btnkey43=0x7f060085; - public static final int btnkey44=0x7f060086; - public static final int btnkey45=0x7f060087; - public static final int btnkey46=0x7f060088; - public static final int btnkey47=0x7f060089; - public static final int btnkey48=0x7f06008a; - public static final int btnkey49=0x7f06008b; - public static final int btnkey50=0x7f06008c; - public static final int button_open=0x7f06002b; - public static final int button_stream=0x7f06002c; - public static final int button_stream_stop=0x7f06002d; - public static final int crtl_back=0x7f06004b; - public static final int crtl_ch_m=0x7f060057; - public static final int crtl_ch_p=0x7f060052; - public static final int crtl_down=0x7f06004a; - public static final int crtl_full=0x7f060054; - public static final int crtl_info=0x7f06005c; - public static final int crtl_left=0x7f060045; - public static final int crtl_menu=0x7f060056; - public static final int crtl_mp=0x7f060041; - public static final int crtl_osd=0x7f06005b; - public static final int crtl_parent=0x7f060049; - public static final int crtl_play=0x7f060055; - public static final int crtl_power=0x7f060043; - public static final int crtl_ratio=0x7f06005a; - public static final int crtl_right=0x7f060047; - public static final int crtl_select=0x7f060046; - public static final int crtl_skip_back=0x7f06004f; - public static final int crtl_skip_forw=0x7f060051; - public static final int crtl_stop=0x7f060050; - public static final int crtl_sub=0x7f060059; - public static final int crtl_up=0x7f060042; - public static final int crtl_vol_m=0x7f06004d; - public static final int crtl_vol_p=0x7f06004c; - public static final int full_text=0x7f060027; + public static final int btnAlbumSelDown=0x7f060019; + public static final int btnAlbumSelUp=0x7f06001b; + public static final int btnArtistSelDown=0x7f06001d; + public static final int btnArtistSelUp=0x7f06001f; + public static final int btnResultSelDown=0x7f060021; + public static final int btnResultSelUp=0x7f060023; + public static final int btnSelectSkin=0x7f060091; + public static final int btnSongSelDown=0x7f060025; + public static final int btnSongSelUp=0x7f060027; + public static final int btn_main_music=0x7f06000a; + public static final int btn_main_now_playing=0x7f06000d; + public static final int btn_main_pictures=0x7f060009; + public static final int btn_main_play=0x7f060011; + public static final int btn_main_plugins=0x7f06000e; + public static final int btn_main_remote=0x7f06000c; + public static final int btn_main_skp_back=0x7f060010; + public static final int btn_main_skp_forw=0x7f060012; + public static final int btn_main_video=0x7f06000b; + public static final int btn_plugins_radio=0x7f060040; + public static final int btn_plugins_weather=0x7f06003f; + public static final int btnkey01=0x7f06005f; + public static final int btnkey02=0x7f060060; + public static final int btnkey03=0x7f060061; + public static final int btnkey04=0x7f060062; + public static final int btnkey05=0x7f060063; + public static final int btnkey06=0x7f060064; + public static final int btnkey07=0x7f060065; + public static final int btnkey08=0x7f060066; + public static final int btnkey09=0x7f060067; + public static final int btnkey10=0x7f060068; + public static final int btnkey11=0x7f06006a; + public static final int btnkey12=0x7f06006b; + public static final int btnkey13=0x7f06006c; + public static final int btnkey14=0x7f06006d; + public static final int btnkey15=0x7f06006e; + public static final int btnkey16=0x7f06006f; + public static final int btnkey17=0x7f060070; + public static final int btnkey18=0x7f060071; + public static final int btnkey19=0x7f060072; + public static final int btnkey20=0x7f060074; + public static final int btnkey21=0x7f060075; + public static final int btnkey22=0x7f060076; + public static final int btnkey23=0x7f060077; + public static final int btnkey24=0x7f060078; + public static final int btnkey25=0x7f060079; + public static final int btnkey26=0x7f06007a; + public static final int btnkey27=0x7f06007b; + public static final int btnkey28=0x7f06007c; + public static final int btnkey29=0x7f06007e; + public static final int btnkey30=0x7f06007f; + public static final int btnkey31=0x7f060080; + public static final int btnkey32=0x7f060081; + public static final int btnkey33=0x7f060082; + public static final int btnkey41=0x7f060084; + public static final int btnkey42=0x7f060085; + public static final int btnkey43=0x7f060086; + public static final int btnkey44=0x7f060087; + public static final int btnkey45=0x7f060088; + public static final int btnkey46=0x7f060089; + public static final int btnkey47=0x7f06008a; + public static final int btnkey48=0x7f06008b; + public static final int btnkey49=0x7f06008c; + public static final int btnkey50=0x7f06008d; + public static final int button_open=0x7f06002c; + public static final int button_stream=0x7f06002d; + public static final int button_stream_stop=0x7f06002e; + public static final int crtl_back=0x7f06004c; + public static final int crtl_ch_m=0x7f060058; + public static final int crtl_ch_p=0x7f060053; + public static final int crtl_down=0x7f06004b; + public static final int crtl_full=0x7f060055; + public static final int crtl_info=0x7f06005d; + public static final int crtl_left=0x7f060046; + public static final int crtl_menu=0x7f060057; + public static final int crtl_mp=0x7f060042; + public static final int crtl_osd=0x7f06005c; + public static final int crtl_parent=0x7f06004a; + public static final int crtl_play=0x7f060056; + public static final int crtl_power=0x7f060044; + public static final int crtl_ratio=0x7f06005b; + public static final int crtl_right=0x7f060048; + public static final int crtl_select=0x7f060047; + public static final int crtl_skip_back=0x7f060050; + public static final int crtl_skip_forw=0x7f060052; + public static final int crtl_stop=0x7f060051; + public static final int crtl_sub=0x7f06005a; + public static final int crtl_up=0x7f060043; + public static final int crtl_vol_m=0x7f06004e; + public static final int crtl_vol_p=0x7f06004d; + public static final int full_text=0x7f060028; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; - public static final int list_album=0x7f060017; - public static final int list_artist=0x7f06001b; - public static final int list_result=0x7f06001f; - public static final int list_song=0x7f060023; - public static final int main_instance=0x7f060005; - public static final int main_now_playing=0x7f06000e; - public static final int music_grid=0x7f060016; - public static final int now_album=0x7f060031; - public static final int now_artist=0x7f060037; - public static final int now_cd=0x7f060032; - public static final int now_list=0x7f06003c; - public static final int now_next=0x7f06003b; - public static final int now_play=0x7f06003a; - public static final int now_playing=0x7f060030; - public static final int now_playing_right=0x7f060035; - public static final int now_playing_t_left=0x7f060034; - public static final int now_prev=0x7f060038; - public static final int now_progress=0x7f060033; - public static final int now_stop=0x7f060039; - public static final int now_title=0x7f060036; - public static final int radio01=0x7f0600a0; - public static final int radio02=0x7f0600a1; - public static final int radio03=0x7f0600a2; - public static final int radio04=0x7f0600a3; - public static final int radioStop=0x7f0600a4; - public static final int selectSkin1=0x7f060097; - public static final int selectSkin2=0x7f060099; - public static final int selectSkin3=0x7f06009b; - public static final int server_ip=0x7f060093; - public static final int server_macid=0x7f060095; - public static final int server_name=0x7f060092; - public static final int server_port=0x7f060094; - public static final int splash=0x7f06009d; - public static final int text_kb_streamed=0x7f060029; - public static final int title=0x7f06009e; - public static final int txtDbAlbum=0x7f060019; - public static final int txtDbArtist=0x7f06001d; - public static final int txtDbResult=0x7f060021; - public static final int txtDbSong=0x7f060025; - public static final int txtDirMusic=0x7f060015; - public static final int txtDirectory=0x7f060013; - public static final int txtFile=0x7f06002a; - public static final int txtIntanceName=0x7f060091; - public static final int txtVersion=0x7f06008d; - public static final int vibration=0x7f06008f; - public static final int visitHome1=0x7f060098; - public static final int visitHome2=0x7f06009a; - public static final int visitHome3=0x7f06009c; - public static final int widget0=0x7f060012; - public static final int widget00=0x7f060040; - public static final int widget01=0x7f060044; - public static final int widget02=0x7f060048; + public static final int lay_main=0x7f060005; + public static final int list_album=0x7f060018; + public static final int list_artist=0x7f06001c; + public static final int list_result=0x7f060020; + public static final int list_song=0x7f060024; + public static final int main_instance=0x7f060006; + public static final int main_now_playing=0x7f06000f; + public static final int music_grid=0x7f060017; + public static final int now_album=0x7f060032; + public static final int now_artist=0x7f060038; + public static final int now_cd=0x7f060033; + public static final int now_list=0x7f06003d; + public static final int now_next=0x7f06003c; + public static final int now_play=0x7f06003b; + public static final int now_playing=0x7f060031; + public static final int now_playing_right=0x7f060036; + public static final int now_playing_t_left=0x7f060035; + public static final int now_prev=0x7f060039; + public static final int now_progress=0x7f060034; + public static final int now_stop=0x7f06003a; + public static final int now_title=0x7f060037; + public static final int radio01=0x7f0600c5; + public static final int radio02=0x7f0600c6; + public static final int radio03=0x7f0600c7; + public static final int radio04=0x7f0600c8; + public static final int radioStop=0x7f0600c9; + public static final int selectSkin1=0x7f060098; + public static final int selectSkin2=0x7f06009a; + public static final int selectSkin3=0x7f06009c; + public static final int server_ip=0x7f060094; + public static final int server_macid=0x7f060096; + public static final int server_name=0x7f060093; + public static final int server_port=0x7f060095; + public static final int splash=0x7f06009e; + public static final int text_kb_streamed=0x7f06002a; + public static final int title=0x7f06009f; + public static final int txtDbAlbum=0x7f06001a; + public static final int txtDbArtist=0x7f06001e; + public static final int txtDbResult=0x7f060022; + public static final int txtDbSong=0x7f060026; + public static final int txtDirMusic=0x7f060016; + public static final int txtDirectory=0x7f060014; + public static final int txtFile=0x7f06002b; + public static final int txtIntanceName=0x7f060092; + public static final int txtVersion=0x7f06008e; + public static final int vibration=0x7f060090; + public static final int visitHome1=0x7f060099; + public static final int visitHome2=0x7f06009b; + public static final int visitHome3=0x7f06009d; + public static final int weather_0_cond=0x7f0600c0; + public static final int weather_0_date=0x7f0600a7; + public static final int weather_0_day=0x7f0600ac; + public static final int weather_0_hi=0x7f0600b1; + public static final int weather_0_img=0x7f0600bb; + public static final int weather_0_lo=0x7f0600b6; + public static final int weather_1_cond=0x7f0600c1; + public static final int weather_1_date=0x7f0600a8; + public static final int weather_1_day=0x7f0600ad; + public static final int weather_1_hi=0x7f0600b2; + public static final int weather_1_img=0x7f0600bc; + public static final int weather_1_lo=0x7f0600b7; + public static final int weather_2_cond=0x7f0600c2; + public static final int weather_2_date=0x7f0600a9; + public static final int weather_2_day=0x7f0600ae; + public static final int weather_2_hi=0x7f0600b3; + public static final int weather_2_img=0x7f0600bd; + public static final int weather_2_lo=0x7f0600b8; + public static final int weather_3_cond=0x7f0600c3; + public static final int weather_3_date=0x7f0600aa; + public static final int weather_3_day=0x7f0600af; + public static final int weather_3_hi=0x7f0600b4; + public static final int weather_3_img=0x7f0600be; + public static final int weather_3_lo=0x7f0600b9; + public static final int weather_4_cond=0x7f0600c4; + public static final int weather_4_date=0x7f0600ab; + public static final int weather_4_day=0x7f0600b0; + public static final int weather_4_hi=0x7f0600b5; + public static final int weather_4_img=0x7f0600bf; + public static final int weather_4_lo=0x7f0600ba; + public static final int weather_actFeel=0x7f0600a5; + public static final int weather_actImage=0x7f0600a0; + public static final int weather_actPlace=0x7f0600a3; + public static final int weather_actTemp=0x7f0600a4; + public static final int weather_actText=0x7f0600a1; + public static final int weather_actTime=0x7f0600a2; + public static final int weather_actWind=0x7f0600a6; + public static final int widget0=0x7f060013; + public static final int widget00=0x7f060041; + public static final int widget01=0x7f060045; + public static final int widget02=0x7f060049; public static final int widget44=0x7f060000; } public static final class layout { Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back_blue3.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/back_blue3.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_music.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pictures.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plugins.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_remote.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_backward.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_forward.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_video.png =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-06 11:16:03 UTC (rev 4098) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/main.xml 2011-02-07 13:31:59 UTC (rev 4099) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" + android:id="@+id/lay_main" android:layout_height="fill_parent"> <TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:textSize="20dip" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance"></TextView> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/weather.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/weather.xml 2011-02-06 11:16:03 UTC (rev 4098) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/weather.xml 2011-02-07 13:31:59 UTC (rev 4099) @@ -7,27 +7,34 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" android:layout_marginTop="10dip" android:layout_gravity="center_horizontal"> <LinearLayout android:id="@+id/LinearLayout02" + android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <ImageView android:id="@+id/ImageView02" - android:background="@drawable/ic_weather_30" android:layout_width="100dip" - android:layout_height="100dip"> + <ImageView android:background="@drawable/ic_weather_30" android:layout_width="100dip" + android:layout_height="100dip" android:id="@+id/weather_actImage"> </ImageView> + <TextView android:text="N/A" android:id="@+id/weather_actText" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> + </TextView> </LinearLayout> <LinearLayout android:id="@+id/LinearLayout03" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginLeft="10dip"> - <TextView android:text="Itzehoe, Germany" android:id="@+id/TextView02" + <TextView android:text="Actual time" android:id="@+id/weather_actTime" android:layout_width="wrap_content" android:layout_height="wrap_content"> </TextView> - <TextView android:text="Temperature: 4°" android:id="@+id/TextView02" + <TextView android:text="Itzehoe, Germany" android:id="@+id/weather_actPlace" android:layout_width="wrap_content" android:layout_height="wrap_content"> </TextView> - <TextView android:text="Feels like: 5°" android:id="@+id/TextView02" - android:layout_width="wrap_content" android:layout_height="wrap_content"> + <TextView android:id="@+id/weather_actTemp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Temperature: N/A"> </TextView> - <TextView android:id="@+id/TextView02" - android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Wind: from WSW at 3 bft"> + <TextView android:id="@+id/weather_actFeel" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Feels like: N/A"> </TextView> + <TextView android:id="@+id/weather_actWind" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:text="Wind: from WSW at 3 bft"> + </TextView> </LinearLayout> </LinearLayout> <TableLayout android:id="@+id/TableLayout01" @@ -36,53 +43,80 @@ <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_width="wrap_content"> - <TextView android:text="Monday" android:id="@+id/TextView01" + <TextView android:text="01.Feb" android:id="@+id/weather_0_date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:width="50dip" android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="Thuesday" android:id="@+id/TextView01" + <TextView android:text="02.Feb" android:id="@+id/weather_1_date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:width="50dip" android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="Wednesday" android:id="@+id/TextView01" + <TextView android:text="03.Feb" android:id="@+id/weather_2_date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:width="50dip" android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="Thursday" android:id="@+id/TextView01" + <TextView android:text="04.Feb" android:id="@+id/weather_3_date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:width="50dip" android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="Friday" android:id="@+id/TextView01" + <TextView android:text="05.Feb" android:id="@+id/weather_4_date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:textSize="10dip" android:width="50dip"> </TextView> </TableRow> - <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" - android:layout_marginTop="10dip" android:layout_width="wrap_content"> + <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_width="wrap_content"> - <TextView android:text="1°" android:id="@+id/TextView01" + <TextView android:text="Monday" android:id="@+id/weather_0_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" android:width="50dip" + android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="2°" android:id="@+id/TextView01" + <TextView android:text="Thuesday" android:id="@+id/weather_1_day" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"> + android:layout_gravity="center_horizontal" android:width="50dip" + android:layout_marginRight="5dip" android:textSize="9dip"> </TextView> - <TextView android:text="3°" android:id="@+id/TextView01" + <TextView android:text="Wednesday" android:id="@+id/weather_2_day" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" android:width="50dip" + android:layout_marginRight="5dip" android:textSize="9dip"> + </TextView> + <TextView android:text="Thursday" android:id="@+id/weather_3_day" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" android:width="50dip" + android:layout_marginRight="5dip" android:textSize="9dip"> + </TextView> + <TextView android:text="Friday" android:id="@+id/weather_4_day" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" android:textSize="10dip" android:width="50dip"> + </TextView> + + </TableRow> + + <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" + android:layout_marginTop="10dip" android:layout_width="wrap_content"> + + <TextView android:text="1°" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" android:id="@+id/weather_0_hi"> + </TextView> + <TextView android:text="2°" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" android:id="@+id/weather_1_hi"> + </TextView> + <TextView android:text="3°" android:id="@+id/weather_2_hi" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="4°" android:id="@+id/TextView01" + <TextView android:text="4°" android:id="@+id/weather_3_hi" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="5°" android:id="@+id/TextView01" + <TextView android:text="5°" android:id="@+id/weather_4_hi" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> @@ -91,23 +125,23 @@ <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_width="wrap_content"> - <TextView android:text="5°" android:id="@+id/TextView01" + <TextView android:text="5°" android:id="@+id/weather_0_lo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="4°" android:id="@+id/TextView01" + <TextView android:text="4°" android:id="@+id/weather_1_lo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="3°" android:id="@+id/TextView01" + <TextView android:text="3°" android:id="@+id/weather_2_lo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="2°" android:id="@+id/TextView01" + <TextView android:text="2°" android:id="@+id/weather_3_lo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> - <TextView android:text="1°" android:id="@+id/TextView01" + <TextView android:text="1°" android:id="@+id/weather_4_lo" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> </TextView> @@ -117,20 +151,20 @@ <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_marginTop="10dip" android:layout_width="wrap_content"> - <ImageView android:id="@+id/ImageView01" - android:background="@drawable/ic_weather_30" android:layout_width="50dip" android:layout_height="50dip"> + <ImageView android:id="@+id/weather_0_img" + android:background="@drawable/ic_weather_na" android:layout_width="50dip" android:layout_height="50dip"> </ImageView> - <ImageView android:id="@+id/ImageView01" - android:background="@drawable/ic_weather_30" android:layout_width="50dip" android:layout_height="50dip"> + <ImageView android:id="@+id/weather_1_img" + android:background="@drawable/ic_weather_na" android:layout_width="50dip" android:layout_height="50dip"> </ImageView> - <ImageView android:id="@+id/ImageView01" - android:background="@drawable/ic_weather_30" android:layout_width="50dip" android:layout_height="50dip"> + <ImageView android:id="@+id/weather_2_img" + android:background="@drawable/ic_weather_na" android:layout_width="50dip" android:layout_height="50dip"> </ImageView> - <ImageView android:id="@+id/ImageView01" - android:background="@drawable/ic_weather_30" android:layout_width="50dip" android:layout_height="50dip"> + <ImageView android:id="@+id/weather_3_img" + android:background="@drawable/ic_weather_na" android:layout_width="50dip" android:layout_height="50dip"> </ImageView> - <ImageView android:id="@+id/ImageView01" - android:background="@drawable/ic_weather_30" android:layout_width="50dip" android:layout_height="50dip"> + <ImageView android:id="@+id/weather_4_img" + android:background="@drawable/ic_weather_na" android:layout_width="50dip" android:layout_height="50dip"> </ImageView> </TableRow> @@ -138,23 +172,23 @@ <TableRow android:id="@+id/TableRow01" android:layout_height="wrap_content" android:layout_marginTop="10dip" android:layout_width="wrap_content"> - <TextView android:text="Cloudy and rain" android:id="@+id/TextView01" + <TextView android:text="Cloudy and rain" android:id="@+id/weather_0_cond" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginRight="5dip" android:textSize="10dip" android:width="50dip"> </TextView> - <TextView android:text="Mostly sunny" android:id="@+id/TextView01" + <TextView android:text="Mostly sunny" android:id="@+id/weather_1_cond" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginRight="5dip" android:textSize="10dip" android:width="50dip"> </TextView> - <TextView android:text="Sometimes rain" android:id="@+id/TextView01" + <TextView android:text="Sometimes rain" android:id="@+id/weather_2_cond" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginRight="5dip" android:textSize="10dip" android:width="50dip"> </TextView> - <TextView android:text="We dont know" android:id="@+id/TextView01" + <TextView android:text="We dont know" android:id="@+id/weather_3_cond" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginRight="5dip" android:textSize="10dip" android:width="50dip"> </TextView> - <TextView android:text="We dont give a" android:id="@+id/TextView01" + <TextView android:text="We dont give a" android:id="@+id/weather_4_cond" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:textSize="10dip" android:width="50dip"> </TextView> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-06 11:16:03 UTC (rev 4098) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-07 13:31:59 UTC (rev 4099) @@ -72,6 +72,8 @@ private static boolean firstRunDone; + private LinearLayout layout; + private Button btnPictures; private Button btnMusic; private Button btnMovies; @@ -91,6 +93,8 @@ super.onCreate(savedInstanceState); setContentView(R.layout.main); + layout = (LinearLayout) findViewById(R.id.lay_main); + btnPictures = (Button) findViewById(R.id.btn_main_pictures); btnMusic = (Button) findViewById(R.id.btn_main_music); btnMovies = (Button) findViewById(R.id.btn_main_video); @@ -477,6 +481,8 @@ int skin = AppSettings.getActualSkin(); switch (skin) { case 0: + layout.setBackgroundColor(Color.parseColor("#FF000000")); + btnPictures .setBackgroundResource(R.drawable.ic_menu_skin1_pictures); btnMusic.setBackgroundResource(R.drawable.ic_menu_skin1_music); @@ -498,6 +504,8 @@ txtPlaying.setTextColor(Color.parseColor("#FF000000")); break; case 1: + layout.setBackgroundResource(R.drawable.back_blue3); + btnPictures .setBackgroundResource(R.drawable.ic_menu_skin2_pictures); btnMusic.setBackgroundResource(R.drawable.ic_menu_skin2_music); Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Weather.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Weather.java 2011-02-06 11:16:03 UTC (rev 4098) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Weather.java 2011-02-07 13:31:59 UTC (rev 4099) @@ -21,9 +21,20 @@ package mediaportal.remote.plugins; +import java.io.InputStream; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; import mediaportal.remote.R; +import mediaportal.remote.communication.HttpHandler; +import mediaportal.remote.utils.AppSettings; import android.app.Activity; import android.os.Bundle; +import android.widget.ImageView; +import android.widget.TextView; public class Weather extends Activity { @@ -31,7 +42,224 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.weather); - + + TextView a0 = (TextView) findViewById(R.id.weather_actText); + TextView a1 = (TextView) findViewById(R.id.weather_actTime); + TextView a2 = (TextView) findViewById(R.id.weather_actPlace); + TextView a3 = (TextView) findViewById(R.id.weather_actTemp); + TextView a4 = (TextView) findViewById(R.id.weather_actFeel); + TextView a5 = (TextView) findViewById(R.id.weather_actWind); + + TextView t0 = null; + TextView t1 = null; + TextView t2 = null; + TextView t3 = null; + TextView t4 = null; + ImageView i0 = null; + + HttpHandler h = new HttpHandler(); + InputStream stream = h.openHttpConnection("http://" + + AppSettings.getServer() + ":" + AppSettings.getPort() + + "/weather/now.xml"); + + DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); + DocumentBuilder dBuilder; + try { + dBuilder = dbFactory.newDocumentBuilder(); + Document doc = dBuilder.parse(stream); + + String actLocation = "N/A"; + String actTime = "N/A"; + String actTemp = "N/A"; + String actFeel = "N/A"; + String actText = "N/A"; + String actIcon = ""; + String actWind = "N/A"; + + NodeList actual = doc.getElementsByTagName("Actual"); + for (int temp = 0; temp < actual.getLength(); temp++) { + + Node nNode = actual.item(temp); + + if (nNode.getNodeType() == Node.ELEMENT_NODE) { + + Element item = (Element) nNode; + + NodeList list = item.getElementsByTagName("Location"); + Element entry = (Element) list.item(0); + NodeList text = entry.getChildNodes(); + actLocation = ((Node) text.item(0)).getNodeValue().trim(); + + list = item.getElementsByTagName("UpdateTime"); + entry = (Element) list.item(0); + text = entry.getChildNodes(); + actTime = ((Node) text.item(0)).getNodeValue().trim(); + + list = item.getElementsByTagName("Temperature"); + entry = (Element) list.item(0); + text = entry.getChildNodes(); + actTemp = ((Node) text.item(0)).getNodeValue().trim(); + + list = item.getElementsByTagName("FeelLike"); + entry = (Element) list.item(0); + text = entry.getChildNodes(); + actFeel = ((Node) text.item(0)).getNodeValue().trim(); + + list = item.getElementsByTagName("Condition");... [truncated message content] |
From: <kro...@us...> - 2011-02-06 11:16:09
|
Revision: 4098 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4098&view=rev Author: kroko_koenig Date: 2011-02-06 11:16:03 +0000 (Sun, 06 Feb 2011) Log Message: ----------- more skinning Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java Added Paths: ----------- trunk/plugins/AndroidRemote/Release/blue3_remote.jpg Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-06 09:56:55 UTC (rev 4097) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/control/Remote_01.java 2011-02-06 11:16:03 UTC (rev 4098) @@ -42,6 +42,17 @@ private static String action; + private ImageButton btnUp; + private ImageButton btnDown; + private ImageButton btnLeft; + private ImageButton btnRight; + + private ImageButton btnVolUp; + private ImageButton btnVolDown; + + private ImageButton btnBack; + private ImageButton btnHome; + /** Called when the activity is first created. */ @Override public void onCreate(Bundle savedInstanceState) { @@ -50,12 +61,21 @@ Log.d("MediaPortal", "start remote 1"); + btnUp = (ImageButton) findViewById(R.id.crtl_up); + btnDown = (ImageButton) findViewById(R.id.crtl_down); + btnLeft = (ImageButton) findViewById(R.id.crtl_left); + btnRight = (ImageButton) findViewById(R.id.crtl_right); + + btnVolUp = (ImageButton) findViewById(R.id.crtl_vol_p); + btnVolDown = (ImageButton) findViewById(R.id.crtl_vol_m); + + btnBack = (ImageButton) findViewById(R.id.crtl_back); + btnHome = (ImageButton) findViewById(R.id.crtl_parent); // buttons // first row - ImageButton up = (ImageButton) findViewById(R.id.crtl_up); - up.setOnClickListener(new View.OnClickListener() { + btnUp.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("moveUp"); } @@ -133,8 +153,7 @@ // second row - ImageButton left = (ImageButton) findViewById(R.id.crtl_left); - left.setOnClickListener(new View.OnClickListener() { + btnLeft.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("moveLeft"); } @@ -147,47 +166,39 @@ } }); - ImageButton right = (ImageButton) findViewById(R.id.crtl_right); - right.setOnClickListener(new View.OnClickListener() { + btnRight.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("moveRight"); } }); // third row - - ImageButton home = (ImageButton) findViewById(R.id.crtl_parent); - home.setOnClickListener(new View.OnClickListener() { + + btnHome.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("parentDir"); } }); - ImageButton down = (ImageButton) findViewById(R.id.crtl_down); - down.setOnClickListener(new View.OnClickListener() { + btnDown.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("moveDown"); } }); - ImageButton can = (ImageButton) findViewById(R.id.crtl_back); - can.setOnClickListener(new View.OnClickListener() { + btnBack.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("previousMenu"); } }); - // volume - - ImageButton btnVolumeUp = (ImageButton) findViewById(R.id.crtl_vol_p); - btnVolumeUp.setOnClickListener(new View.OnClickListener() { + btnVolUp.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("volumeUp"); } }); - ImageButton btnVolumeDown = (ImageButton) findViewById(R.id.crtl_vol_m); - btnVolumeDown.setOnClickListener(new View.OnClickListener() { + btnVolDown.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { SendCommand.PostCommandButton("volumeDown"); } @@ -320,4 +331,42 @@ return super.onKeyDown(keyCode, event); } + + @Override + public void onStart() { + super.onStart(); + + setSkin(); + } + + private void setSkin() + { + int skin = AppSettings.getActualSkin(); + switch (skin) { + case 0: + btnUp.setBackgroundResource(R.drawable.ic_menu_skin1_up); + btnDown.setBackgroundResource(R.drawable.ic_menu_skin1_down); + btnLeft.setBackgroundResource(R.drawable.ic_menu_skin1_left); + btnRight.setBackgroundResource(R.drawable.ic_menu_skin1_right); + + btnVolUp.setBackgroundResource(R.drawable.ic_menu_skin1_vol_p); + btnVolDown.setBackgroundResource(R.drawable.ic_menu_skin1_vol_m); + + btnBack.setBackgroundResource(R.drawable.ic_menu_skin1_back); + btnHome.setBackgroundResource(R.drawable.ic_menu_skin1_home); + break; + case 1: + btnUp.setBackgroundResource(R.drawable.ic_menu_skin2_up); + btnDown.setBackgroundResource(R.drawable.ic_menu_skin2_down); + btnLeft.setBackgroundResource(R.drawable.ic_menu_skin2_left); + btnRight.setBackgroundResource(R.drawable.ic_menu_skin2_right); + + btnVolUp.setBackgroundResource(R.drawable.ic_menu_skin2_vol_p); + btnVolDown.setBackgroundResource(R.drawable.ic_menu_skin2_vol_m); + + btnBack.setBackgroundResource(R.drawable.ic_menu_skin2_back); + btnHome.setBackgroundResource(R.drawable.ic_menu_skin2_home); + break; + } + } } \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-06 09:56:55 UTC (rev 4097) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-06 11:16:03 UTC (rev 4098) @@ -72,6 +72,13 @@ private static boolean firstRunDone; + private Button btnPictures; + private Button btnMusic; + private Button btnMovies; + private Button btnRemote; + private Button btnPlaying; + private Button btnPlugins; + private ImageButton btnPlay; private Button btnSkipBack; private Button btnSkipForw; @@ -84,6 +91,13 @@ super.onCreate(savedInstanceState); setContentView(R.layout.main); + btnPictures = (Button) findViewById(R.id.btn_main_pictures); + btnMusic = (Button) findViewById(R.id.btn_main_music); + btnMovies = (Button) findViewById(R.id.btn_main_video); + btnRemote = (Button) findViewById(R.id.btn_main_remote); + btnPlaying = (Button) findViewById(R.id.btn_main_now_playing); + btnPlugins = (Button) findViewById(R.id.btn_main_plugins); + btnPlay = (ImageButton) findViewById(R.id.btn_main_play); btnSkipBack = (Button) findViewById(R.id.btn_main_skp_back); btnSkipForw = (Button) findViewById(R.id.btn_main_skp_forw); @@ -91,12 +105,10 @@ txtInstance = (TextView) findViewById(R.id.main_instance); txtPlaying = (TextView) findViewById(R.id.main_now_playing); + // init all services Thread.setDefaultUncaughtExceptionHandler(new TopExceptionHandler(this)); - KeyLock.setKeyguardManager((KeyguardManager) getSystemService(Activity.KEYGUARD_SERVICE)); - Vibration - .setVibrator((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)); - + Vibration.setVibrator((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)); SendCommand.setAssetManager(getAssets()); // splash screen just once @@ -141,8 +153,6 @@ } // Navigation Buttons - - Button btnPictures = (Button) findViewById(R.id.btn_main_pictures); btnPictures.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Vibration.vibrateShort(); @@ -151,7 +161,6 @@ } }); - Button btnMusic = (Button) findViewById(R.id.btn_main_music); btnMusic.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { // Vibration.vibrateShort(); done in album, song etc. @@ -160,8 +169,7 @@ } }); - Button btnVideo = (Button) findViewById(R.id.btn_main_video); - btnVideo.setOnClickListener(new View.OnClickListener() { + btnMovies.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Vibration.vibrateShort(); Intent myIntent = new Intent(view.getContext(), Movies.class); @@ -169,7 +177,6 @@ } }); - Button btnRemote = (Button) findViewById(R.id.btn_main_remote); btnRemote.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Vibration.vibrateShort(); @@ -178,8 +185,7 @@ } }); - Button btnNowPlaying = (Button) findViewById(R.id.btn_main_now_playing); - btnNowPlaying.setOnClickListener(new View.OnClickListener() { + btnPlaying.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Vibration.vibrateShort(); Intent myIntent = new Intent(view.getContext(), @@ -188,8 +194,7 @@ } }); - Button btnSettings = (Button) findViewById(R.id.btn_main_plugins); - btnSettings.setOnClickListener(new View.OnClickListener() { + btnPlugins.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Vibration.vibrateShort(); Intent myIntent = new Intent(view.getContext(), Plugins.class); @@ -439,7 +444,8 @@ protected void onPostExecute(final Void unused) { txtPlaying.setText(display); - + setPlayButton(); + if (AppSettings.getActualSkin() == 0) { if (state.equals("playing")) { btnPlay.setImageDrawable(getResources().getDrawable( @@ -465,52 +471,78 @@ } private void setSkin() { - Button pictures = (Button) findViewById(R.id.btn_main_pictures); - Button music = (Button) findViewById(R.id.btn_main_music); - Button movies = (Button) findViewById(R.id.btn_main_video); - Button remote = (Button) findViewById(R.id.btn_main_remote); - - Button now = (Button) findViewById(R.id.btn_main_now_playing); - Button plugins = (Button) findViewById(R.id.btn_main_plugins); - - Button back = (Button) findViewById(R.id.btn_main_skp_back); - ImageButton play = (ImageButton) findViewById(R.id.btn_main_play); - Button forw = (Button) findViewById(R.id.btn_main_skp_forw); - + setPlayButton(); + int skin = AppSettings.getActualSkin(); switch (skin) { case 0: - pictures.setBackgroundResource(R.drawable.ic_menu_skin1_pictures); - music.setBackgroundResource(R.drawable.ic_menu_skin1_music); - movies.setBackgroundResource(R.drawable.ic_menu_skin1_video); - remote.setBackgroundResource(R.drawable.ic_menu_skin1_remote); - now.setBackgroundResource(R.drawable.ic_menu_skin1_now_playing); - plugins.setBackgroundResource(R.drawable.ic_menu_skin1_plugins); + btnPictures + .setBackgroundResource(R.drawable.ic_menu_skin1_pictures); + btnMusic.setBackgroundResource(R.drawable.ic_menu_skin1_music); + btnMovies.setBackgroundResource(R.drawable.ic_menu_skin1_video); + btnRemote.setBackgroundResource(R.drawable.ic_menu_skin1_remote); + btnPlaying + .setBackgroundResource(R.drawable.ic_menu_skin1_now_playing); + btnPlugins.setBackgroundResource(R.drawable.ic_menu_skin1_plugins); - back.setBackgroundResource(R.drawable.ic_menu_skin1_skip_backward); - play.setBackgroundResource(R.drawable.ic_menu_skin1_play); - forw.setBackgroundResource(R.drawable.ic_menu_skin1_skip_forward); - + btnSkipBack + .setBackgroundResource(R.drawable.ic_menu_skin1_skip_backward); + btnPlay.setBackgroundResource(R.drawable.ic_menu_skin1_play); + btnSkipForw + .setBackgroundResource(R.drawable.ic_menu_skin1_skip_forward); + txtInstance.setBackgroundColor(Color.parseColor("#FFA9A9A9")); + txtInstance.setTextColor(Color.parseColor("#FF000000")); txtPlaying.setBackgroundColor(Color.parseColor("#FFA9A9A9")); + txtPlaying.setTextColor(Color.parseColor("#FF000000")); break; case 1: - pictures.setBackgroundResource(R.drawable.ic_menu_skin2_pictures); - music.setBackgroundResource(R.drawable.ic_menu_skin2_music); - movies.setBackgroundResource(R.drawable.ic_menu_skin2_video); - remote.setBackgroundResource(R.drawable.ic_menu_skin2_remote); - now.setBackgroundResource(R.drawable.ic_menu_skin2_now_playing); - plugins.setBackgroundResource(R.drawable.ic_menu_skin2_plugins); + btnPictures + .setBackgroundResource(R.drawable.ic_menu_skin2_pictures); + btnMusic.setBackgroundResource(R.drawable.ic_menu_skin2_music); + btnMovies.setBackgroundResource(R.drawable.ic_menu_skin2_video); + btnRemote.setBackgroundResource(R.drawable.ic_menu_skin2_remote); + btnPlaying + .setBackgroundResource(R.drawable.ic_menu_skin2_now_playing); + btnPlugins.setBackgroundResource(R.drawable.ic_menu_skin2_plugins); - back.setBackgroundResource(R.drawable.ic_menu_skin2_skip_backward); - play.setBackgroundResource(R.drawable.ic_menu_skin2_play); - forw.setBackgroundResource(R.drawable.ic_menu_skin2_skip_forward); - - txtInstance.setBackgroundColor(Color.parseColor("#FF003399")); - txtPlaying.setBackgroundColor(Color.parseColor("#FF003399")); + btnSkipBack + .setBackgroundResource(R.drawable.ic_menu_skin2_skip_backward); + btnPlay.setBackgroundResource(R.drawable.ic_menu_skin2_play); + btnSkipForw + .setBackgroundResource(R.drawable.ic_menu_skin2_skip_forward); + + txtInstance.setBackgroundColor(Color.parseColor("#FF003366")); + txtInstance.setTextColor(Color.parseColor("#FFFFFFFF")); + txtPlaying.setBackgroundColor(Color.parseColor("#FF003366")); + txtPlaying.setTextColor(Color.parseColor("#FFFFFFFF")); break; } } + + private void setPlayButton() { + int skin = AppSettings.getActualSkin(); + switch (skin) { + case 0: + if (state.equals("playing")) { + btnPlay.setImageDrawable(getResources().getDrawable( + R.drawable.ic_menu_skin1_pause)); + } else { + btnPlay.setImageDrawable(getResources().getDrawable( + R.drawable.ic_menu_skin1_play)); + } + break; + case 1: + if (state.equals("playing")) { + btnPlay.setImageDrawable(getResources().getDrawable( + R.drawable.ic_menu_skin2_pause)); + } else { + btnPlay.setImageDrawable(getResources().getDrawable( + R.drawable.ic_menu_skin2_play)); + } + break; + } + } } \ No newline at end of file Added: trunk/plugins/AndroidRemote/Release/blue3_remote.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/blue3_remote.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-06 09:57:04
|
Revision: 4097 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4097&view=rev Author: kroko_koenig Date: 2011-02-06 09:56:55 +0000 (Sun, 06 Feb 2011) Log Message: ----------- weather plugins started, add second skin Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_back.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_down.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_home.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_left.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_music.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pause.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pictures.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_play.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plugins.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_remote.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_right.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_backward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_forward.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_up.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_video.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_m.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_p.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_0.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_1.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_10.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_11.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_12.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_13.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_14.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_15.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_16.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_17.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_18.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_19.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_2.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_20.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_21.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_22.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_23.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_24.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_25.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_26.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_27.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_28.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_29.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_3.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_30.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_31.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_32.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_33.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_34.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_35.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_36.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_37.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_38.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_39.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_4.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_40.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_41.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_42.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_43.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_44.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_45.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_46.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_47.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_5.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_6.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_7.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_8.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_9.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_na.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_weatheralert.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/permission.txt trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/plugins.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/weather.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Plugins.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/plugins/Weather.java trunk/plugins/AndroidRemote/Release/blue3.jpg trunk/plugins/AndroidRemote/Release/dark.jpg trunk/plugins/AndroidRemote/Release/weather.jpg Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2011-02-05 12:11:44 UTC (rev 4096) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2011-02-06 09:56:55 UTC (rev 4097) @@ -33,6 +33,8 @@ <activity android:name=".MediaPlayerControl" android:launchMode="singleInstance"></activity> <activity android:name=".movies.Movies" android:launchMode="singleInstance"></activity> <activity android:launchMode="singleInstance" android:name=".setup.SelectSkin"></activity> + <activity android:launchMode="singleInstance" android:name=".plugins.Plugins"></activity> + <activity android:launchMode="singleInstance" android:name=".plugins.Weather"></activity> </application> <uses-sdk android:minSdkVersion="3" /> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-05 12:11:44 UTC (rev 4096) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-06 09:56:55 UTC (rev 4097) @@ -53,46 +53,116 @@ public static final int ic_menu_skin1_vol_m=0x7f020024; public static final int ic_menu_skin1_vol_p=0x7f020025; public static final int ic_menu_skin1_weather=0x7f020026; - public static final int ic_skin1_border=0x7f020027; - public static final int ic_skin1_cdcover=0x7f020028; - public static final int ic_skin1_file_audio=0x7f020029; - public static final int ic_skin1_file_folder=0x7f02002a; - public static final int ic_skin1_file_folderback=0x7f02002b; - public static final int ic_skin1_file_movie=0x7f02002c; - public static final int ic_skin1_file_picture=0x7f02002d; - public static final int ic_skin1_file_playlist=0x7f02002e; - public static final int ic_skin1_splash=0x7f02002f; - public static final int ic_tab_album=0x7f020030; - public static final int ic_tab_album_off=0x7f020031; - public static final int ic_tab_album_on=0x7f020032; - public static final int ic_tab_artist=0x7f020033; - public static final int ic_tab_artist_off=0x7f020034; - public static final int ic_tab_artist_on=0x7f020035; - public static final int ic_tab_music=0x7f020036; - public static final int ic_tab_music_off=0x7f020037; - public static final int ic_tab_music_on=0x7f020038; - public static final int ic_tab_song=0x7f020039; - public static final int ic_tab_song_off=0x7f02003a; - public static final int ic_tab_song_on=0x7f02003b; + public static final int ic_menu_skin2_back=0x7f020027; + public static final int ic_menu_skin2_down=0x7f020028; + public static final int ic_menu_skin2_home=0x7f020029; + public static final int ic_menu_skin2_left=0x7f02002a; + public static final int ic_menu_skin2_music=0x7f02002b; + public static final int ic_menu_skin2_now_playing=0x7f02002c; + public static final int ic_menu_skin2_pause=0x7f02002d; + public static final int ic_menu_skin2_pictures=0x7f02002e; + public static final int ic_menu_skin2_play=0x7f02002f; + public static final int ic_menu_skin2_plugins=0x7f020030; + public static final int ic_menu_skin2_remote=0x7f020031; + public static final int ic_menu_skin2_right=0x7f020032; + public static final int ic_menu_skin2_skip_backward=0x7f020033; + public static final int ic_menu_skin2_skip_forward=0x7f020034; + public static final int ic_menu_skin2_up=0x7f020035; + public static final int ic_menu_skin2_video=0x7f020036; + public static final int ic_menu_skin2_vol_m=0x7f020037; + public static final int ic_menu_skin2_vol_p=0x7f020038; + public static final int ic_skin1_border=0x7f020039; + public static final int ic_skin1_cdcover=0x7f02003a; + public static final int ic_skin1_file_audio=0x7f02003b; + public static final int ic_skin1_file_folder=0x7f02003c; + public static final int ic_skin1_file_folderback=0x7f02003d; + public static final int ic_skin1_file_movie=0x7f02003e; + public static final int ic_skin1_file_picture=0x7f02003f; + public static final int ic_skin1_file_playlist=0x7f020040; + public static final int ic_skin1_splash=0x7f020041; + public static final int ic_tab_album=0x7f020042; + public static final int ic_tab_album_off=0x7f020043; + public static final int ic_tab_album_on=0x7f020044; + public static final int ic_tab_artist=0x7f020045; + public static final int ic_tab_artist_off=0x7f020046; + public static final int ic_tab_artist_on=0x7f020047; + public static final int ic_tab_music=0x7f020048; + public static final int ic_tab_music_off=0x7f020049; + public static final int ic_tab_music_on=0x7f02004a; + public static final int ic_tab_song=0x7f02004b; + public static final int ic_tab_song_off=0x7f02004c; + public static final int ic_tab_song_on=0x7f02004d; + public static final int ic_weather_0=0x7f02004e; + public static final int ic_weather_1=0x7f02004f; + public static final int ic_weather_10=0x7f020050; + public static final int ic_weather_11=0x7f020051; + public static final int ic_weather_12=0x7f020052; + public static final int ic_weather_13=0x7f020053; + public static final int ic_weather_14=0x7f020054; + public static final int ic_weather_15=0x7f020055; + public static final int ic_weather_16=0x7f020056; + public static final int ic_weather_17=0x7f020057; + public static final int ic_weather_18=0x7f020058; + public static final int ic_weather_19=0x7f020059; + public static final int ic_weather_2=0x7f02005a; + public static final int ic_weather_20=0x7f02005b; + public static final int ic_weather_21=0x7f02005c; + public static final int ic_weather_22=0x7f02005d; + public static final int ic_weather_23=0x7f02005e; + public static final int ic_weather_24=0x7f02005f; + public static final int ic_weather_25=0x7f020060; + public static final int ic_weather_26=0x7f020061; + public static final int ic_weather_27=0x7f020062; + public static final int ic_weather_28=0x7f020063; + public static final int ic_weather_29=0x7f020064; + public static final int ic_weather_3=0x7f020065; + public static final int ic_weather_30=0x7f020066; + public static final int ic_weather_31=0x7f020067; + public static final int ic_weather_32=0x7f020068; + public static final int ic_weather_33=0x7f020069; + public static final int ic_weather_34=0x7f02006a; + public static final int ic_weather_35=0x7f02006b; + public static final int ic_weather_36=0x7f02006c; + public static final int ic_weather_37=0x7f02006d; + public static final int ic_weather_38=0x7f02006e; + public static final int ic_weather_39=0x7f02006f; + public static final int ic_weather_4=0x7f020070; + public static final int ic_weather_40=0x7f020071; + public static final int ic_weather_41=0x7f020072; + public static final int ic_weather_42=0x7f020073; + public static final int ic_weather_43=0x7f020074; + public static final int ic_weather_44=0x7f020075; + public static final int ic_weather_45=0x7f020076; + public static final int ic_weather_46=0x7f020077; + public static final int ic_weather_47=0x7f020078; + public static final int ic_weather_5=0x7f020079; + public static final int ic_weather_6=0x7f02007a; + public static final int ic_weather_7=0x7f02007b; + public static final int ic_weather_8=0x7f02007c; + public static final int ic_weather_9=0x7f02007d; + public static final int ic_weather_na=0x7f02007e; + public static final int ic_weather_weatheralert=0x7f02007f; + public static final int permission=0x7f020080; } public static final class id { public static final int GridView01=0x7f060014; public static final int ImageView01=0x7f060028; - public static final int LinearLayout00=0x7f06005b; + public static final int ImageView02=0x7f06009f; + public static final int LinearLayout00=0x7f06005d; public static final int LinearLayout01=0x7f06002f; - public static final int LinearLayout02=0x7f060066; - public static final int LinearLayout03=0x7f060070; - public static final int LinearLayout04=0x7f06007a; - public static final int LinearLayout05=0x7f060080; + public static final int LinearLayout02=0x7f060068; + public static final int LinearLayout03=0x7f060072; + public static final int LinearLayout04=0x7f06007c; + public static final int LinearLayout05=0x7f060082; public static final int ListView01=0x7f06003d; - public static final int RadioGroup01=0x7f060094; - public static final int Spinner01=0x7f06008c; + public static final int RadioGroup01=0x7f060096; + public static final int Spinner01=0x7f06008e; public static final int SurfaceView01=0x7f06002e; public static final int TableLayout01=0x7f060006; - public static final int TableLayout02=0x7f06004c; + public static final int TableLayout02=0x7f06004e; public static final int TableRow01=0x7f060007; - public static final int TableRow02=0x7f060051; - public static final int TableRow03=0x7f060056; + public static final int TableRow02=0x7f060053; + public static final int TableRow03=0x7f060058; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; public static final int btnAlbumSelDown=0x7f060018; @@ -101,7 +171,7 @@ public static final int btnArtistSelUp=0x7f06001e; public static final int btnResultSelDown=0x7f060020; public static final int btnResultSelUp=0x7f060022; - public static final int btnSelectSkin=0x7f06008e; + public static final int btnSelectSkin=0x7f060090; public static final int btnSongSelDown=0x7f060024; public static final int btnSongSelUp=0x7f060026; public static final int btn_main_music=0x7f060009; @@ -113,75 +183,77 @@ public static final int btn_main_skp_back=0x7f06000f; public static final int btn_main_skp_forw=0x7f060011; public static final int btn_main_video=0x7f06000a; - public static final int btnkey01=0x7f06005c; - public static final int btnkey02=0x7f06005d; - public static final int btnkey03=0x7f06005e; - public static final int btnkey04=0x7f06005f; - public static final int btnkey05=0x7f060060; - public static final int btnkey06=0x7f060061; - public static final int btnkey07=0x7f060062; - public static final int btnkey08=0x7f060063; - public static final int btnkey09=0x7f060064; - public static final int btnkey10=0x7f060065; - public static final int btnkey11=0x7f060067; - public static final int btnkey12=0x7f060068; - public static final int btnkey13=0x7f060069; - public static final int btnkey14=0x7f06006a; - public static final int btnkey15=0x7f06006b; - public static final int btnkey16=0x7f06006c; - public static final int btnkey17=0x7f06006d; - public static final int btnkey18=0x7f06006e; - public static final int btnkey19=0x7f06006f; - public static final int btnkey20=0x7f060071; - public static final int btnkey21=0x7f060072; - public static final int btnkey22=0x7f060073; - public static final int btnkey23=0x7f060074; - public static final int btnkey24=0x7f060075; - public static final int btnkey25=0x7f060076; - public static final int btnkey26=0x7f060077; - public static final int btnkey27=0x7f060078; - public static final int btnkey28=0x7f060079; - public static final int btnkey29=0x7f06007b; - public static final int btnkey30=0x7f06007c; - public static final int btnkey31=0x7f06007d; - public static final int btnkey32=0x7f06007e; - public static final int btnkey33=0x7f06007f; - public static final int btnkey41=0x7f060081; - public static final int btnkey42=0x7f060082; - public static final int btnkey43=0x7f060083; - public static final int btnkey44=0x7f060084; - public static final int btnkey45=0x7f060085; - public static final int btnkey46=0x7f060086; - public static final int btnkey47=0x7f060087; - public static final int btnkey48=0x7f060088; - public static final int btnkey49=0x7f060089; - public static final int btnkey50=0x7f06008a; + public static final int btn_plugins_radio=0x7f06003f; + public static final int btn_plugins_weather=0x7f06003e; + public static final int btnkey01=0x7f06005e; + public static final int btnkey02=0x7f06005f; + public static final int btnkey03=0x7f060060; + public static final int btnkey04=0x7f060061; + public static final int btnkey05=0x7f060062; + public static final int btnkey06=0x7f060063; + public static final int btnkey07=0x7f060064; + public static final int btnkey08=0x7f060065; + public static final int btnkey09=0x7f060066; + public static final int btnkey10=0x7f060067; + public static final int btnkey11=0x7f060069; + public static final int btnkey12=0x7f06006a; + public static final int btnkey13=0x7f06006b; + public static final int btnkey14=0x7f06006c; + public static final int btnkey15=0x7f06006d; + public static final int btnkey16=0x7f06006e; + public static final int btnkey17=0x7f06006f; + public static final int btnkey18=0x7f060070; + public static final int btnkey19=0x7f060071; + public static final int btnkey20=0x7f060073; + public static final int btnkey21=0x7f060074; + public static final int btnkey22=0x7f060075; + public static final int btnkey23=0x7f060076; + public static final int btnkey24=0x7f060077; + public static final int btnkey25=0x7f060078; + public static final int btnkey26=0x7f060079; + public static final int btnkey27=0x7f06007a; + public static final int btnkey28=0x7f06007b; + public static final int btnkey29=0x7f06007d; + public static final int btnkey30=0x7f06007e; + public static final int btnkey31=0x7f06007f; + public static final int btnkey32=0x7f060080; + public static final int btnkey33=0x7f060081; + public static final int btnkey41=0x7f060083; + public static final int btnkey42=0x7f060084; + public static final int btnkey43=0x7f060085; + public static final int btnkey44=0x7f060086; + public static final int btnkey45=0x7f060087; + public static final int btnkey46=0x7f060088; + public static final int btnkey47=0x7f060089; + public static final int btnkey48=0x7f06008a; + public static final int btnkey49=0x7f06008b; + public static final int btnkey50=0x7f06008c; public static final int button_open=0x7f06002b; public static final int button_stream=0x7f06002c; public static final int button_stream_stop=0x7f06002d; - public static final int crtl_back=0x7f060049; - public static final int crtl_ch_m=0x7f060055; - public static final int crtl_ch_p=0x7f060050; - public static final int crtl_down=0x7f060048; - public static final int crtl_full=0x7f060052; - public static final int crtl_info=0x7f06005a; - public static final int crtl_left=0x7f060043; - public static final int crtl_menu=0x7f060054; - public static final int crtl_mp=0x7f06003f; - public static final int crtl_osd=0x7f060059; - public static final int crtl_parent=0x7f060047; - public static final int crtl_play=0x7f060053; - public static final int crtl_power=0x7f060041; - public static final int crtl_ratio=0x7f060058; - public static final int crtl_right=0x7f060045; - public static final int crtl_select=0x7f060044; - public static final int crtl_skip_back=0x7f06004d; - public static final int crtl_skip_forw=0x7f06004f; - public static final int crtl_stop=0x7f06004e; - public static final int crtl_sub=0x7f060057; - public static final int crtl_up=0x7f060040; - public static final int crtl_vol_m=0x7f06004b; - public static final int crtl_vol_p=0x7f06004a; + public static final int crtl_back=0x7f06004b; + public static final int crtl_ch_m=0x7f060057; + public static final int crtl_ch_p=0x7f060052; + public static final int crtl_down=0x7f06004a; + public static final int crtl_full=0x7f060054; + public static final int crtl_info=0x7f06005c; + public static final int crtl_left=0x7f060045; + public static final int crtl_menu=0x7f060056; + public static final int crtl_mp=0x7f060041; + public static final int crtl_osd=0x7f06005b; + public static final int crtl_parent=0x7f060049; + public static final int crtl_play=0x7f060055; + public static final int crtl_power=0x7f060043; + public static final int crtl_ratio=0x7f06005a; + public static final int crtl_right=0x7f060047; + public static final int crtl_select=0x7f060046; + public static final int crtl_skip_back=0x7f06004f; + public static final int crtl_skip_forw=0x7f060051; + public static final int crtl_stop=0x7f060050; + public static final int crtl_sub=0x7f060059; + public static final int crtl_up=0x7f060042; + public static final int crtl_vol_m=0x7f06004d; + public static final int crtl_vol_p=0x7f06004c; public static final int full_text=0x7f060027; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; @@ -205,21 +277,21 @@ public static final int now_progress=0x7f060033; public static final int now_stop=0x7f060039; public static final int now_title=0x7f060036; - public static final int radio01=0x7f06009d; - public static final int radio02=0x7f06009e; - public static final int radio03=0x7f06009f; - public static final int radio04=0x7f0600a0; - public static final int radioStop=0x7f0600a1; - public static final int selectSkin1=0x7f060095; - public static final int selectSkin2=0x7f060097; - public static final int selectSkin3=0x7f060099; - public static final int server_ip=0x7f060091; - public static final int server_macid=0x7f060093; - public static final int server_name=0x7f060090; - public static final int server_port=0x7f060092; - public static final int splash=0x7f06009b; + public static final int radio01=0x7f0600a0; + public static final int radio02=0x7f0600a1; + public static final int radio03=0x7f0600a2; + public static final int radio04=0x7f0600a3; + public static final int radioStop=0x7f0600a4; + public static final int selectSkin1=0x7f060097; + public static final int selectSkin2=0x7f060099; + public static final int selectSkin3=0x7f06009b; + public static final int server_ip=0x7f060093; + public static final int server_macid=0x7f060095; + public static final int server_name=0x7f060092; + public static final int server_port=0x7f060094; + public static final int splash=0x7f06009d; public static final int text_kb_streamed=0x7f060029; - public static final int title=0x7f06009c; + public static final int title=0x7f06009e; public static final int txtDbAlbum=0x7f060019; public static final int txtDbArtist=0x7f06001d; public static final int txtDbResult=0x7f060021; @@ -227,16 +299,16 @@ public static final int txtDirMusic=0x7f060015; public static final int txtDirectory=0x7f060013; public static final int txtFile=0x7f06002a; - public static final int txtIntanceName=0x7f06008f; - public static final int txtVersion=0x7f06008b; - public static final int vibration=0x7f06008d; - public static final int visitHome1=0x7f060096; - public static final int visitHome2=0x7f060098; - public static final int visitHome3=0x7f06009a; + public static final int txtIntanceName=0x7f060091; + public static final int txtVersion=0x7f06008d; + public static final int vibration=0x7f06008f; + public static final int visitHome1=0x7f060098; + public static final int visitHome2=0x7f06009a; + public static final int visitHome3=0x7f06009c; public static final int widget0=0x7f060012; - public static final int widget00=0x7f06003e; - public static final int widget01=0x7f060042; - public static final int widget02=0x7f060046; + public static final int widget00=0x7f060040; + public static final int widget01=0x7f060044; + public static final int widget02=0x7f060048; public static final int widget44=0x7f060000; } public static final class layout { @@ -255,15 +327,17 @@ public static final int player=0x7f03000c; public static final int playingnow=0x7f03000d; public static final int playnowlist=0x7f03000e; - public static final int remote01=0x7f03000f; - public static final int remote03=0x7f030010; - public static final int remote03b=0x7f030011; - public static final int setup=0x7f030012; - public static final int setup_ip=0x7f030013; - public static final int skin=0x7f030014; - public static final int splash=0x7f030015; - public static final int title=0x7f030016; - public static final int webradio=0x7f030017; + public static final int plugins=0x7f03000f; + public static final int remote01=0x7f030010; + public static final int remote03=0x7f030011; + public static final int remote03b=0x7f030012; + public static final int setup=0x7f030013; + public static final int setup_ip=0x7f030014; + public static final int skin=0x7f030015; + public static final int splash=0x7f030016; + public static final int title=0x7f030017; + public static final int weather=0x7f030018; + public static final int webradio=0x7f030019; } public static final class string { public static final int app_name=0x7f040000; Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_back.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_back.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_down.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_home.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_home.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_left.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_music.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_music.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_now_playing.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pause.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pause.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pictures.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_pictures.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_play.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_play.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plugins.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_plugins.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_remote.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_remote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_right.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_backward.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_backward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_forward.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_skip_forward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_up.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_video.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_video.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_m.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_m.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_p.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_menu_skin2_vol_p.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_0.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_0.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_1.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_10.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_10.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_11.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_11.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_12.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_12.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_13.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_13.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_14.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_14.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_15.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_15.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_16.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_17.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_17.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_18.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_18.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_19.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_19.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_2.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_20.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_20.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_21.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_21.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_22.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_22.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_23.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_23.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_24.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_24.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_25.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_25.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_26.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_26.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_27.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_27.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_28.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_28.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_29.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_29.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_3.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_30.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_30.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_31.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_31.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_32.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_32.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_33.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_33.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_34.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_34.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_35.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_35.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_36.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_36.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_37.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_37.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_38.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_38.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_39.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_39.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_4.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_4.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_40.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_40.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_41.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_41.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_42.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_42.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_43.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_43.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_44.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_44.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_45.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_45.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_46.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_46.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_47.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_47.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_5.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_5.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_6.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_6.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_7.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_7.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_8.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_8.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_9.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_9.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_na.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_na.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_weatheralert.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_weather_weatheralert.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/permission.txt =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/permission.txt (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/permission.txt 2011-02-06 09:56:55 UTC (rev 4097) @@ -0,0 +1,37 @@ +Weather Images shiny 2004 rev.4 by JyriK +These weather images are designed to provide the various weather +conditions reported by internet weather services. These images +were originally created for use with Serious Samurize. +http://www.samurize.com +And now are included in MediaPortal, an open source media centre software. +http://www.team-mediaportal.com + + +Changes: +rev.1 Filenames changed. +rev.2 Again, a few moonphase names were wrong. +rev.3 Still, naming wrong. +rev.4 Added 2 moonphases (really cloudy & fog), Sunny with thunderstorms and heavy thunderstorms. + + +You are free: +1. to copy, distribute and display these images as long as these are +provided free of charge and are not connected to a commercial software +product. You may use these images for skins, themes, and other content +for freeware software as long as the copyright notices are included. +2. to make derivative works + +Under the following conditions: +Attribution. You must give the original author credit. +Noncommercial. You may not use this work for commercial purposes. +Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under a license identical to this one. + *For any reuse or distribution, you must make clear to others the license terms of this work. + *Any of these condit... [truncated message content] |
From: <fr...@us...> - 2011-02-05 12:11:50
|
Revision: 4096 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4096&view=rev Author: framug Date: 2011-02-05 12:11:44 +0000 (Sat, 05 Feb 2011) Log Message: ----------- WebEPGfr : - Update Zip library with the MP one since there is a dll for that, now. Modified Paths: -------------- trunk/plugins/WebEPGfr/bin/ICSharpCode.SharpZipLib.dll Modified: trunk/plugins/WebEPGfr/bin/ICSharpCode.SharpZipLib.dll =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-05 11:19:13
|
Revision: 4095 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4095&view=rev Author: kroko_koenig Date: 2011-02-05 11:19:07 +0000 (Sat, 05 Feb 2011) Log Message: ----------- fixed setup bug Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/setup.xml trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-05 09:36:53 UTC (rev 4094) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-05 11:19:07 UTC (rev 4095) @@ -85,7 +85,7 @@ public static final int LinearLayout04=0x7f06007a; public static final int LinearLayout05=0x7f060080; public static final int ListView01=0x7f06003d; - public static final int RadioGroup01=0x7f060095; + public static final int RadioGroup01=0x7f060094; public static final int Spinner01=0x7f06008c; public static final int SurfaceView01=0x7f06002e; public static final int TableLayout01=0x7f060006; @@ -99,7 +99,6 @@ public static final int btnAlbumSelUp=0x7f06001a; public static final int btnArtistSelDown=0x7f06001c; public static final int btnArtistSelUp=0x7f06001e; - public static final int btnIpSettings=0x7f06008f; public static final int btnResultSelDown=0x7f060020; public static final int btnResultSelUp=0x7f060022; public static final int btnSelectSkin=0x7f06008e; @@ -206,21 +205,21 @@ public static final int now_progress=0x7f060033; public static final int now_stop=0x7f060039; public static final int now_title=0x7f060036; - public static final int radio01=0x7f06009e; - public static final int radio02=0x7f06009f; - public static final int radio03=0x7f0600a0; - public static final int radio04=0x7f0600a1; - public static final int radioStop=0x7f0600a2; - public static final int selectSkin1=0x7f060096; - public static final int selectSkin2=0x7f060098; - public static final int selectSkin3=0x7f06009a; - public static final int server_ip=0x7f060092; - public static final int server_macid=0x7f060094; - public static final int server_name=0x7f060091; - public static final int server_port=0x7f060093; - public static final int splash=0x7f06009c; + public static final int radio01=0x7f06009d; + public static final int radio02=0x7f06009e; + public static final int radio03=0x7f06009f; + public static final int radio04=0x7f0600a0; + public static final int radioStop=0x7f0600a1; + public static final int selectSkin1=0x7f060095; + public static final int selectSkin2=0x7f060097; + public static final int selectSkin3=0x7f060099; + public static final int server_ip=0x7f060091; + public static final int server_macid=0x7f060093; + public static final int server_name=0x7f060090; + public static final int server_port=0x7f060092; + public static final int splash=0x7f06009b; public static final int text_kb_streamed=0x7f060029; - public static final int title=0x7f06009d; + public static final int title=0x7f06009c; public static final int txtDbAlbum=0x7f060019; public static final int txtDbArtist=0x7f06001d; public static final int txtDbResult=0x7f060021; @@ -228,12 +227,12 @@ public static final int txtDirMusic=0x7f060015; public static final int txtDirectory=0x7f060013; public static final int txtFile=0x7f06002a; - public static final int txtIntanceName=0x7f060090; + public static final int txtIntanceName=0x7f06008f; public static final int txtVersion=0x7f06008b; public static final int vibration=0x7f06008d; - public static final int visitHome1=0x7f060097; - public static final int visitHome2=0x7f060099; - public static final int visitHome3=0x7f06009b; + public static final int visitHome1=0x7f060096; + public static final int visitHome2=0x7f060098; + public static final int visitHome3=0x7f06009a; public static final int widget0=0x7f060012; public static final int widget00=0x7f06003e; public static final int widget01=0x7f060042; Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-05 09:36:53 UTC (rev 4094) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-02-05 11:19:07 UTC (rev 4095) @@ -6,7 +6,9 @@ <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF"></TextView> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" android:text="Version" android:id="@+id/txtVersion"></TextView><TextView android:layout_width="fill_parent" + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" android:text="Version" android:id="@+id/txtVersion"></TextView> + + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip"></TextView> <Spinner android:id="@+id/Spinner01" android:layout_width="fill_parent" android:layout_height="wrap_content"></Spinner> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/setup.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/setup.xml 2011-02-05 09:36:53 UTC (rev 4094) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-small/setup.xml 2011-02-05 11:19:07 UTC (rev 4095) @@ -2,17 +2,31 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" android:padding="15dip"> - + <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF"></TextView> - + android:layout_height="wrap_content" android:textSize="24dip" + android:text="Global settings" android:paddingBottom="10dip" + android:textColor="#FFFFFFFF"></TextView> + + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" android:textColor="#FFFFFFFF" + android:text="Version" android:id="@+id/txtVersion"></TextView> + <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF"></TextView> + android:layout_height="wrap_content" android:textSize="18dip" + android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip"></TextView> <Spinner android:id="@+id/Spinner01" android:layout_width="fill_parent" android:layout_height="wrap_content"></Spinner> - + <CheckBox android:layout_width="wrap_content" - android:layout_height="wrap_content" android:textSize="18dip" android:id="@+id/vibration" android:text="use vibration feedback" android:textColor="#FFFFFFFF"></CheckBox><Button android:layout_height="wrap_content" android:id="@+id/btnIpSettings" android:text="IP settings" android:layout_width="fill_parent" android:layout_marginTop="20dip"></Button> + android:layout_height="wrap_content" android:textSize="18dip" + android:id="@+id/vibration" android:text="use vibration feedback" + android:textColor="#FFFFFFFF"></CheckBox> + <Button android:layout_height="wrap_content" android:id="@+id/btnSelectSkin" + android:text="Select skin" android:layout_width="fill_parent" + android:layout_marginTop="20dip" android:textSize="18dip"> + </Button> + </LinearLayout> Modified: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fr...@us...> - 2011-02-05 09:37:00
|
Revision: 4094 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4094&view=rev Author: framug Date: 2011-02-05 09:36:53 +0000 (Sat, 05 Feb 2011) Log Message: ----------- WebEPGfr : - Fix Kazer Url Website change. - Fix date/time overlap in B3W for Kazer and ZguideTV. - Update References for MP 1.2. Modified Paths: -------------- trunk/plugins/WebEPGfr/InfosSuivantSites.cs trunk/plugins/WebEPGfr/WebEPGfr.csproj trunk/plugins/WebEPGfr/WebEPGfrSetup.cs trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj trunk/plugins/WebEPGfr/XmlToolBox.cs trunk/plugins/WebEPGfr/skin/Blue3wide/ZguideTV.xml trunk/plugins/WebEPGfr/skin/Blue3wide/kazer.xml Modified: trunk/plugins/WebEPGfr/InfosSuivantSites.cs =================================================================== --- trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/InfosSuivantSites.cs 2011-02-05 09:36:53 UTC (rev 4094) @@ -154,7 +154,7 @@ sURL_de_download = @"http://www.google.fr"; break; case Grabber.Kazer: - sURL_de_download = @"http://www.kazer.org/gen_xml.php?u=" + ReadValueByKey( Grabber.Kazer.ToString() ); + sURL_de_download = @"http://kazer.org/tvguide.xml?u=" + ReadValueByKey( Grabber.Kazer.ToString() ); break; case Grabber.ZGuideTV: sURL_de_download = ReadValueByKey(Grabber.ZGuideTV.ToString()); Modified: trunk/plugins/WebEPGfr/WebEPGfr.csproj =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/WebEPGfr.csproj 2011-02-05 09:36:53 UTC (rev 4094) @@ -35,9 +35,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.1.9976, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath> + <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=1.0.2.42467, Culture=neutral, processorArchitecture=x86"> @@ -45,9 +45,9 @@ <HintPath>bin\Databases.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Dialogs, Version=1.0.4.17718, Culture=neutral, processorArchitecture=x86"> + <Reference Include="Dialogs, Version=1.1.6.13177, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath> + <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\plugins\Windows\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Gentle.Common, Version=1.5.0.29053, Culture=neutral, PublicKeyToken=80b5de62e27be49b, processorArchitecture=MSIL"> @@ -72,19 +72,19 @@ <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="TvBusinessLayer, Version=1.0.1.10483, Culture=neutral, processorArchitecture=x86"> + <Reference Include="TvBusinessLayer, Version=1.1.6.13236, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\TvEngine3\TVLibrary\TVLibrary\bin\Release\TvBusinessLayer.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="TVDatabase, Version=1.0.4.20297, Culture=neutral, processorArchitecture=x86"> + <Reference Include="TVDatabase, Version=1.1.6.13249, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> <HintPath>..\..\TvEngine3\TVLibrary\TVDatabase\bin\Release\TVDatabase.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="Utils, Version=2.2.7.9975, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Utils, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath> + <HintPath>..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -198,6 +198,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent> + <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows"</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/WebEPGfr/WebEPGfrSetup.cs =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/WebEPGfrSetup.cs 2011-02-05 09:36:53 UTC (rev 4094) @@ -237,7 +237,7 @@ string sTempUri = InfosSuivantSites.URL_de_download(InfosSuivantSites.Grabber.Kazer); if (sTempUri.Length > 0) { - string sBAseUri = @"http://www.kazer.org/gen_xml.php?u="; + string sBAseUri = @"http://kazer.org/tvguide.xml?u="; kazer_UserName.Text = sTempUri.Substring(sBAseUri.Length, sTempUri.Length - sBAseUri.Length); } sTempUri = InfosSuivantSites.URL_de_download(InfosSuivantSites.Grabber.ZGuideTV); @@ -346,7 +346,7 @@ if (oUsedGrabber == InfosSuivantSites.Grabber.Kazer) { if (kazer_UserName.Text.Length > 0) - oGrabber.Configuration.DownloadUri = new Uri(@"http://www.kazer.org/gen_xml.php?u=" + kazer_UserName.Text.ToString()); + oGrabber.Configuration.DownloadUri = new Uri(@"http://kazer.org/tvguide.xml?u=" + kazer_UserName.Text.ToString()); } else { @@ -403,7 +403,7 @@ if (oUsedGrabber == InfosSuivantSites.Grabber.Kazer) { if (kazer_UserName.Text.Length>0) - oGrabber.Configuration.DownloadUri = new Uri(@"http://www.kazer.org/gen_xml.php?u=" + kazer_UserName.Text.ToString()); + oGrabber.Configuration.DownloadUri = new Uri(@"http://kazer.org/tvguide.xml?u=" + kazer_UserName.Text.ToString()); } else { @@ -722,7 +722,7 @@ { GuiResetButton(); - string sDownloadUri = @"http://www.kazer.org/gen_xml.php?u=" + kazer_UserName.Text.ToString(); + string sDownloadUri = @"http://kazer.org/tvguide.xml?u=" + kazer_UserName.Text.ToString(); if (TestGrabber(sDownloadUri) == true) { Modified: trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj =================================================================== --- trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/WebEPGfr_planification/WebEPGfr_planification.csproj 2011-02-05 09:36:53 UTC (rev 4094) @@ -33,17 +33,17 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.1.9976, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Core, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath> + <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Xml" /> - <Reference Include="Utils, Version=2.2.7.9975, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Utils, Version=1.1.6.13175, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath> + <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -73,6 +73,6 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy $(ProjectName).dll "C:\Program Files\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent> + <PostBuildEvent>rem copy $(ProjectName).dll "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\process"</PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/WebEPGfr/XmlToolBox.cs =================================================================== --- trunk/plugins/WebEPGfr/XmlToolBox.cs 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/XmlToolBox.cs 2011-02-05 09:36:53 UTC (rev 4094) @@ -29,7 +29,7 @@ { if ((_sUserHash != null) && (_oDownloadUri == null)) { - _oDownloadUri = new Uri(@"http://www.kazer.org/gen_xml.php?u=" + _sUserHash); + _oDownloadUri = new Uri(@"http://kazer.org/tvguide.xml?u=" + _sUserHash); } return _oDownloadUri; } @@ -137,7 +137,7 @@ { if (_sUserHash != null) { - _oDownloadUri = new Uri(@"http://www.kazer.org/gen_xml.php?u=" + _sUserHash); + _oDownloadUri = new Uri(@"http://kazer.org/tvguide.xml?u=" + _sUserHash); } return _sUserHash; } Modified: trunk/plugins/WebEPGfr/skin/Blue3wide/ZguideTV.xml =================================================================== --- trunk/plugins/WebEPGfr/skin/Blue3wide/ZguideTV.xml 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/skin/Blue3wide/ZguideTV.xml 2011-02-05 09:36:53 UTC (rev 4094) @@ -1,243 +1,243 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<window> - <id>10124</id> - <defaultcontrol>2</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <controls> - <!-- Description de l'écran --> - <control> - <description>BG</description> - <type>image</type> - <id>0</id> - <width>1280</width> - <height>720</height> - </control> - <!-- Description du logo du nom du plugin en haut à gauche --> - <control> - <type>image</type> - <id>0</id> - <posX>80</posX> - <posY>60</posY> - <texture flipY="true" diffuse="Thumb_Mask.png">ZguideTV_logo.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Libellé Guide Télé --> - <control> - <description>Libellé Guide Télé</description> - <type>label</type> - <id>0</id> - <posX>400</posX> - <posY>144</posY> - <label>Guide Télé</label> - <font>font16</font> - <align>right</align> - <textcolor>FFFFFFFF</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> - </control> - <!-- Description du logo en bas à gauche --> - <control> - <type>image</type> - <id>0</id> - <posX>100</posX> - <posY>520</posY> - <width>300</width> - <height>200</height> - <texture>hover_ZguideTV.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Description de la date --> - <control> - <description>Date</description> - <type>label</type> - <id>0</id> - <posX>1150</posX> - <posY>80</posY> - <label>#date</label> - <align>right</align> - <font>font14</font> - <textcolor>ffa9d0f7</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Description de l'heure --> - <control> - <description>Time</description> - <type>label</type> - <id>0</id> - <posX>1250</posX> - <posY>80</posY> - <label>#time</label> - <align>right</align> - <font>font14</font> - <textcolor>ffa9d0f7</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!--**** menu ****--> - <control> - <type>group</type> - <description>group element</description> - <posX>70</posX> - <posY>260</posY> - <layout>StackLayout</layout> - <control> - <description>Guide Télé</description> - <type>button</type> - <id>99</id> - <label>Voir le Guide Télé</label> - <hyperlink>600</hyperlink> - <onleft>99</onleft> - <onright>99</onright> - <onup>99</onup> - <ondown>2</ondown> - </control> - <control> - <description>Download</description> - <type>button</type> - <id>2</id> - <label>Télécharger</label> - <onleft>2</onleft> - <onright>2</onright> - <onup>99</onup> - <ondown>3</ondown> - </control> - <control> - <description>Update</description> - <type>button</type> - <id>3</id> - <label>Mettre à jour</label> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - <onleft>3</onleft> - <onright>3</onright> - <onup>2</onup> - <ondown>9</ondown> - </control> - <control> - <description>Restaurer</description> - <type>button</type> - <id>9</id> - <label>Restaurer</label> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - <onleft>9</onleft> - <onright>9</onright> - <onup>3</onup> - <ondown>99</ondown> - </control> - </control> - <!-- Libellé date tvguide MP --> - <control> - <description>Libellé date tvguide MP</description> - <type>label</type> - <id>4</id> - <posX>350</posX> - <posY>260</posY> - <label>Date du guide télé de MediaPortal : </label> - <align>left</align> - <textcolor>White</textcolor> - </control> - <!-- Libellé date tvguide ZguideTV (caché par défaut) --> - <control> - <description>Libellé date tvguide ZguideTV</description> - <type>label</type> - <id>5</id> - <posX>350</posX> - <posY>290</posY> - <label>Date du guide télé de ZguideTV : </label> - <align>left</align> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé date de la sauvegarde (caché par défaut) --> - <control> - <description>Libellé date de la sauvegarde</description> - <type>label</type> - <id>10</id> - <posX>350</posX> - <posY>320</posY> - <label>Date de la dernière sauvegarde : </label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> - <control> - <description>Libellé date du guide télé dans la sauvegarde</description> - <type>label</type> - <id>11</id> - <posX>350</posX> - <posY>350</posY> - <label>Date du guide Télé dans la sauvegarde : </label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date tvguide MediaPortal --> - <control> - <description>date tvguide MediaPortal</description> - <type>label</type> - <id>6</id> - <posX>850</posX> - <posY>260</posY> - <label>-</label> - <align>left</align> - <textcolor>White</textcolor> - </control> - <!-- date tvguide ZguideTV (caché par défaut) --> - <control> - <description>date tvguide ZguideTV</description> - <type>label</type> - <id>7</id> - <posX>850</posX> - <posY>290</posY> - <label>-</label> - <align>left</align> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date de la sauvegarde (caché par défaut) --> - <control> - <description>date de la sauvegarde</description> - <type>label</type> - <id>12</id> - <posX>850</posX> - <posY>320</posY> - <label>-</label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date du guide télé dans la sauvegarde (caché par défaut) --> - <control> - <description>date du guide télé dans la sauvegarde</description> - <type>label</type> - <id>13</id> - <posX>850</posX> - <posY>350</posY> - <label>-</label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé d'information --> - <control> - <description>Libellé d'information</description> - <type>label</type> - <id>8</id> - <posX>500</posX> - <posY>600</posY> - <label>-</label> - <align>left</align> - <textcolor>White</textcolor> - </control> - </controls> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<window> + <id>10124</id> + <defaultcontrol>2</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <controls> + <!-- Description de l'écran --> + <control> + <description>BG</description> + <type>image</type> + <id>0</id> + <width>1280</width> + <height>720</height> + </control> + <!-- Description du logo du nom du plugin en haut à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>80</posX> + <posY>60</posY> + <texture flipY="true" diffuse="Thumb_Mask.png">ZguideTV_logo.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Libellé Guide Télé --> + <control> + <description>Libellé Guide Télé</description> + <type>label</type> + <id>0</id> + <posX>400</posX> + <posY>144</posY> + <label>Guide Télé</label> + <font>font16</font> + <align>right</align> + <textcolor>FFFFFFFF</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> + <!-- Description du logo en bas à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>100</posX> + <posY>520</posY> + <width>300</width> + <height>200</height> + <texture>hover_ZguideTV.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de la date --> + <control> + <description>Date</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>20</posY> + <label>#date</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de l'heure --> + <control> + <description>Time</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>50</posY> + <label>#time</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!--**** menu ****--> + <control> + <type>group</type> + <description>group element</description> + <posX>70</posX> + <posY>260</posY> + <layout>StackLayout</layout> + <control> + <description>Guide Télé</description> + <type>button</type> + <id>99</id> + <label>Voir le Guide Télé</label> + <hyperlink>600</hyperlink> + <onleft>99</onleft> + <onright>99</onright> + <onup>99</onup> + <ondown>2</ondown> + </control> + <control> + <description>Download</description> + <type>button</type> + <id>2</id> + <label>Télécharger</label> + <onleft>2</onleft> + <onright>2</onright> + <onup>99</onup> + <ondown>3</ondown> + </control> + <control> + <description>Update</description> + <type>button</type> + <id>3</id> + <label>Mettre à jour</label> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>3</onleft> + <onright>3</onright> + <onup>2</onup> + <ondown>9</ondown> + </control> + <control> + <description>Restaurer</description> + <type>button</type> + <id>9</id> + <label>Restaurer</label> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>9</onleft> + <onright>9</onright> + <onup>3</onup> + <ondown>99</ondown> + </control> + </control> + <!-- Libellé date tvguide MP --> + <control> + <description>Libellé date tvguide MP</description> + <type>label</type> + <id>4</id> + <posX>350</posX> + <posY>260</posY> + <label>Date du guide télé de MediaPortal : </label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- Libellé date tvguide ZguideTV (caché par défaut) --> + <control> + <description>Libellé date tvguide ZguideTV</description> + <type>label</type> + <id>5</id> + <posX>350</posX> + <posY>290</posY> + <label>Date du guide télé de ZguideTV : </label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date de la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date de la sauvegarde</description> + <type>label</type> + <id>10</id> + <posX>350</posX> + <posY>320</posY> + <label>Date de la dernière sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>11</id> + <posX>350</posX> + <posY>350</posY> + <label>Date du guide Télé dans la sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date tvguide MediaPortal --> + <control> + <description>date tvguide MediaPortal</description> + <type>label</type> + <id>6</id> + <posX>850</posX> + <posY>260</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- date tvguide ZguideTV (caché par défaut) --> + <control> + <description>date tvguide ZguideTV</description> + <type>label</type> + <id>7</id> + <posX>850</posX> + <posY>290</posY> + <label>-</label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date de la sauvegarde (caché par défaut) --> + <control> + <description>date de la sauvegarde</description> + <type>label</type> + <id>12</id> + <posX>850</posX> + <posY>320</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>13</id> + <posX>850</posX> + <posY>350</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé d'information --> + <control> + <description>Libellé d'information</description> + <type>label</type> + <id>8</id> + <posX>500</posX> + <posY>600</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + </controls> </window> \ No newline at end of file Modified: trunk/plugins/WebEPGfr/skin/Blue3wide/kazer.xml =================================================================== --- trunk/plugins/WebEPGfr/skin/Blue3wide/kazer.xml 2011-02-05 03:37:40 UTC (rev 4093) +++ trunk/plugins/WebEPGfr/skin/Blue3wide/kazer.xml 2011-02-05 09:36:53 UTC (rev 4094) @@ -1,243 +1,243 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<window> - <id>10124</id> - <defaultcontrol>2</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <controls> - <!-- Description de l'écran --> - <control> - <description>BG</description> - <type>image</type> - <id>0</id> - <width>1280</width> - <height>720</height> - </control> - <!-- Description du logo du nom du plugin en haut à gauche --> - <control> - <type>image</type> - <id>0</id> - <posX>80</posX> - <posY>60</posY> - <texture flipY="true" diffuse="Thumb_Mask.png">kazer_logo.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Libellé Guide Télé --> - <control> - <description>Libellé Guide Télé</description> - <type>label</type> - <id>0</id> - <posX>365</posX> - <posY>144</posY> - <label>Guide Télé</label> - <font>font16</font> - <align>right</align> - <textcolor>FFFFFFFF</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="250">WindowClose</animation> - </control> - <!-- Description du logo en bas à gauche --> - <control> - <type>image</type> - <id>0</id> - <posX>100</posX> - <posY>520</posY> - <width>300</width> - <height>200</height> - <texture>hover_kazer.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Description de la date --> - <control> - <description>Date</description> - <type>label</type> - <id>0</id> - <posX>1150</posX> - <posY>80</posY> - <label>#date</label> - <align>right</align> - <font>font14</font> - <textcolor>ffa9d0f7</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!-- Description de l'heure --> - <control> - <description>Time</description> - <type>label</type> - <id>0</id> - <posX>1250</posX> - <posY>80</posY> - <label>#time</label> - <align>right</align> - <font>font14</font> - <textcolor>ffa9d0f7</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <!--**** menu ****--> - <control> - <type>group</type> - <description>group element</description> - <posX>70</posX> - <posY>260</posY> - <layout>StackLayout</layout> - <control> - <description>Guide Télé</description> - <type>button</type> - <id>99</id> - <label>Voir le Guide Télé</label> - <hyperlink>600</hyperlink> - <onleft>99</onleft> - <onright>99</onright> - <onup>99</onup> - <ondown>2</ondown> - </control> - <control> - <description>Download</description> - <type>button</type> - <id>2</id> - <label>Télécharger</label> - <onleft>2</onleft> - <onright>2</onright> - <onup>99</onup> - <ondown>3</ondown> - </control> - <control> - <description>Update</description> - <type>button</type> - <id>3</id> - <label>Mettre à jour</label> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - <onleft>3</onleft> - <onright>3</onright> - <onup>2</onup> - <ondown>9</ondown> - </control> - <control> - <description>Restaurer</description> - <type>button</type> - <id>9</id> - <label>Restaurer</label> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - <onleft>9</onleft> - <onright>9</onright> - <onup>3</onup> - <ondown>99</ondown> - </control> - </control> - <!-- Libellé date tvguide MP --> - <control> - <description>Libellé date tvguide MP</description> - <type>label</type> - <id>4</id> - <posX>350</posX> - <posY>260</posY> - <label>Date du guide télé de MediaPortal : </label> - <align>left</align> - <textcolor>White</textcolor> - </control> - <!-- Libellé date tvguide kazer (caché par défaut) --> - <control> - <description>Libellé date tvguide kazer</description> - <type>label</type> - <id>5</id> - <posX>350</posX> - <posY>290</posY> - <label>Date du guide télé de kazer : </label> - <align>left</align> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé date de la sauvegarde (caché par défaut) --> - <control> - <description>Libellé date de la sauvegarde</description> - <type>label</type> - <id>10</id> - <posX>350</posX> - <posY>320</posY> - <label>Date de la dernière sauvegarde : </label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> - <control> - <description>Libellé date du guide télé dans la sauvegarde</description> - <type>label</type> - <id>11</id> - <posX>350</posX> - <posY>350</posY> - <label>Date du guide Télé dans la sauvegarde : </label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date tvguide MediaPortal --> - <control> - <description>date tvguide MediaPortal</description> - <type>label</type> - <id>6</id> - <posX>850</posX> - <posY>260</posY> - <label>-</label> - <align>left</align> - <textcolor>White</textcolor> - </control> - <!-- date tvguide kazer (caché par défaut) --> - <control> - <description>date tvguide kazer</description> - <type>label</type> - <id>7</id> - <posX>850</posX> - <posY>290</posY> - <label>-</label> - <align>left</align> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date de la sauvegarde (caché par défaut) --> - <control> - <description>date de la sauvegarde</description> - <type>label</type> - <id>12</id> - <posX>850</posX> - <posY>320</posY> - <label>-</label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- date du guide télé dans la sauvegarde (caché par défaut) --> - <control> - <description>date du guide télé dans la sauvegarde</description> - <type>label</type> - <id>13</id> - <posX>850</posX> - <posY>350</posY> - <label>-</label> - <align>left</align> - <font>font13</font> - <textcolor>ffffffff</textcolor> - <colordiffuse>ffffffff</colordiffuse> - </control> - <!-- Libellé d'information --> - <control> - <description>Libellé d'information</description> - <type>label</type> - <id>8</id> - <posX>500</posX> - <posY>600</posY> - <label>-</label> - <align>left</align> - <textcolor>White</textcolor> - </control> - </controls> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<window> + <id>10124</id> + <defaultcontrol>2</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <controls> + <!-- Description de l'écran --> + <control> + <description>BG</description> + <type>image</type> + <id>0</id> + <width>1280</width> + <height>720</height> + </control> + <!-- Description du logo du nom du plugin en haut à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>80</posX> + <posY>60</posY> + <texture flipY="true" diffuse="Thumb_Mask.png">kazer_logo.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Libellé Guide Télé --> + <control> + <description>Libellé Guide Télé</description> + <type>label</type> + <id>0</id> + <posX>365</posX> + <posY>144</posY> + <label>Guide Télé</label> + <font>font16</font> + <align>right</align> + <textcolor>FFFFFFFF</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="250">WindowClose</animation> + </control> + <!-- Description du logo en bas à gauche --> + <control> + <type>image</type> + <id>0</id> + <posX>100</posX> + <posY>520</posY> + <width>300</width> + <height>200</height> + <texture>hover_kazer.png</texture> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de la date --> + <control> + <description>Date</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>20</posY> + <label>#date</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!-- Description de l'heure --> + <control> + <description>Time</description> + <type>label</type> + <id>0</id> + <posX>1250</posX> + <posY>50</posY> + <label>#time</label> + <align>right</align> + <font>font14</font> + <textcolor>ffa9d0f7</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <!--**** menu ****--> + <control> + <type>group</type> + <description>group element</description> + <posX>70</posX> + <posY>260</posY> + <layout>StackLayout</layout> + <control> + <description>Guide Télé</description> + <type>button</type> + <id>99</id> + <label>Voir le Guide Télé</label> + <hyperlink>600</hyperlink> + <onleft>99</onleft> + <onright>99</onright> + <onup>99</onup> + <ondown>2</ondown> + </control> + <control> + <description>Download</description> + <type>button</type> + <id>2</id> + <label>Télécharger</label> + <onleft>2</onleft> + <onright>2</onright> + <onup>99</onup> + <ondown>3</ondown> + </control> + <control> + <description>Update</description> + <type>button</type> + <id>3</id> + <label>Mettre à jour</label> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>3</onleft> + <onright>3</onright> + <onup>2</onup> + <ondown>9</ondown> + </control> + <control> + <description>Restaurer</description> + <type>button</type> + <id>9</id> + <label>Restaurer</label> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <onleft>9</onleft> + <onright>9</onright> + <onup>3</onup> + <ondown>99</ondown> + </control> + </control> + <!-- Libellé date tvguide MP --> + <control> + <description>Libellé date tvguide MP</description> + <type>label</type> + <id>4</id> + <posX>350</posX> + <posY>260</posY> + <label>Date du guide télé de MediaPortal : </label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- Libellé date tvguide kazer (caché par défaut) --> + <control> + <description>Libellé date tvguide kazer</description> + <type>label</type> + <id>5</id> + <posX>350</posX> + <posY>290</posY> + <label>Date du guide télé de kazer : </label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date de la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date de la sauvegarde</description> + <type>label</type> + <id>10</id> + <posX>350</posX> + <posY>320</posY> + <label>Date de la dernière sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>Libellé date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>11</id> + <posX>350</posX> + <posY>350</posY> + <label>Date du guide Télé dans la sauvegarde : </label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date tvguide MediaPortal --> + <control> + <description>date tvguide MediaPortal</description> + <type>label</type> + <id>6</id> + <posX>850</posX> + <posY>260</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + <!-- date tvguide kazer (caché par défaut) --> + <control> + <description>date tvguide kazer</description> + <type>label</type> + <id>7</id> + <posX>850</posX> + <posY>290</posY> + <label>-</label> + <align>left</align> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date de la sauvegarde (caché par défaut) --> + <control> + <description>date de la sauvegarde</description> + <type>label</type> + <id>12</id> + <posX>850</posX> + <posY>320</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- date du guide télé dans la sauvegarde (caché par défaut) --> + <control> + <description>date du guide télé dans la sauvegarde</description> + <type>label</type> + <id>13</id> + <posX>850</posX> + <posY>350</posY> + <label>-</label> + <align>left</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + </control> + <!-- Libellé d'information --> + <control> + <description>Libellé d'information</description> + <type>label</type> + <id>8</id> + <posX>500</posX> + <posY>600</posY> + <label>-</label> + <align>left</align> + <textcolor>White</textcolor> + </control> + </controls> </window> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vi...@us...> - 2011-02-05 03:37:48
|
Revision: 4093 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4093&view=rev Author: vityar Date: 2011-02-05 03:37:40 +0000 (Sat, 05 Feb 2011) Log Message: ----------- Update for new API-format v2.0 of etvnet.com Modified Paths: -------------- trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs trunk/plugins/ETVNet/ETVNet/ETVNet.csproj trunk/plugins/ETVNet/ETVNet/ETVNetStreamInfo.cs trunk/plugins/ETVNet/ETVNet/PathNode.cs trunk/plugins/ETVNet/ETVNet/PathPage.cs trunk/plugins/ETVNet/ETVNet/PathTerminal.cs trunk/plugins/ETVNet/ETVNet/Plugin.cs trunk/plugins/ETVNet/ETVNet/QueryString.cs trunk/plugins/ETVNet/ETVNet/TopList.cs trunk/plugins/ETVNet/ETVNet/skinfiles/DialogETVNetStreamInfo.xml trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogETVNetStreamInfo.xml trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogRuKeyboard.xml trunk/plugins/ETVNet/ETVNet/skinfiles/wide/etvnet.main.xml Added Paths: ----------- trunk/plugins/ETVNet/ETVNet/API_2.0.txt trunk/plugins/ETVNet/ETVNet/API_DOCS_v2.0.doc trunk/plugins/ETVNet/ETVNet/ETVBrows.cs trunk/plugins/ETVNet/ETVNet/ETVNet.sln trunk/plugins/ETVNet/ETVNet/app.config trunk/plugins/ETVNet/ETVNet/bin/ trunk/plugins/ETVNet/ETVNet/bin/Release/ trunk/plugins/ETVNet/ETVNet/bin/Release/ETVNet.dll Added: trunk/plugins/ETVNet/ETVNet/API_2.0.txt =================================================================== --- trunk/plugins/ETVNet/ETVNet/API_2.0.txt (rev 0) +++ trunk/plugins/ETVNet/ETVNet/API_2.0.txt 2011-02-05 03:37:40 UTC (rev 4093) @@ -0,0 +1,249 @@ +API eTVnet позволяет програмистам интегрировать сервис eTVnet в свои программы, а также создавать плагины для WMC, Front Row и т.д. + +Корень API находится по адресу http://etvnet.com/api/v2.0/ + +На данный момент имплементированы следующие сервисы: +1. Авторизация +a. SessionBased +Количество запросов на следующие URL ограничено до 10 запросов в 10 минут, при привышении лимита будет возвращаться http код 503 +Создание сессии: + URL: /session.{format=xml|json} + Метод: POST + Список параметров: +format – формат ответа(xml или json) +username – имя пользователя +password – пароль пользователя + +POST /api/v2.0/session.xml HTTP/1.1 +Host: etvnet.com + +username=username&password=password + Ответ: + +<response> + <sessid>359d8f909019d0dbf28490bdbf63b3dc</sessid> +</response> +Данный sessid необходимо передавать при каждом последующем запросе в Cookie с именем “sessid” + Удаление сессии: + URL: /session.{format=xml|json} + Метод: DELETE +Список параметров: +format – формат ответа(xml или json) +sessid – идентификатор сесии +DELETE /api/v2.0/session.xml HTTP/1.1 +Host: etvnet.com +Cookie: sessid=359d8f909019d0dbf28490bdbf63b3dc + + + +b. Http Basic Auth (Deprecated) +Крайне не рекомендуется использовать данный метод авторизации, так как его поддержка со временем будет удалена. +Для авторизации пользователя в системе используется Http Basic Auth. То есть необходимо при каждом запросе передавать username и password например: +GET /api/v2.0/channel/all.xml HTTP/1.1 +Host: etvnet.com +Authorization: Basic base64(“username:password”) + + +2. Каналы +a. Список каналов +URL: /channel_list.{format=xml|json} +Метод: GET +Список параметров: +format – формат ответа(xml или json) +Example: +Запрос: http://etvnet.com/api/v2.0/channel/all.xml +Ответ: +<?xml version=”1.0” encoding=”utf-8” ?> +<response> + <resource> + <name>Первый</name> + <slug>pervyij</id> + </resource> + <resource> + <name>Россия 1</name> + <slug>rossiya</slug> + </resource> +</response> + +b. Список передач канала +URL(Архив): /channel/{slug}.{format=xml|json}?page={page}&per_page={per_page}& sort={sort}&dir={dir}&first_letter={first_letter} + +URL(Сегодня в эфире): /channel/{slug}.{format=xml|json}?page={page}& per_page={per_page}&sort={sort}&dir={dir}&first_letter={first_letter} +Метод: GET +Список параметров: +slug – slug канала, полученный из метода “Каналы” +format – формат ответа(xml или json) +page – номер страницы(default=1) +per_page – количество передач на страницу(default=30) +sort – поле, по которому производится сортировка(}, default=on_air) +dir – направление сортировки {asc|desc} (default=desc) +first_letter – фильтр по первой букве в названии передачи + +Example: +Запрос: http://etvnet.com/api/v2.0/channel/pervyij.xml +Ответ: +<response> + <header> + <page_info> + <current>1</current> + <per_page>30</per_page> + <total>3</total> + </page_info> + <categories> + <resource> + <count>380</count> + <parent_id/> + <slug>serialyi</slug> + <name>Сериалы</name> + </resource> + <resource> + <count>2430</count> + <parent_id/> + <slug>hudozhestvennyie-filmyi</slug> + <name>Художественные фильмы</name> + </resource> + </categories> + <results> + <resource> + <production_year>2008</production_year> + <is_hq>False</is_hq> + <name>Герцогиня</name> + <channel_slug>mirovoe-kino</channel_slug> + <id>242652</id> + <children_count>0</children_count> + <class>MediaObject</class> + <mark_count>4</mark_count> + <on_air>2010-09-12T12:45:00Z</on_air> + <precalc_rating>4</precalc_rating> + <mark_total>7</mark_total> + <duration>108</duration> + <slug>gertsoginya</slug> + <channel>Мировое кино</channel> + </resource> + </results> +</response> + +3. Медиа +a. Каталог +URL: /catalog.{format=xml|json}?page={page}&per_page={per_page}& sort={sort}&dir={dir}&first_letter={first_letter} +URL: /catalog/{category_slug}.{format=xml|json}?page={page}&per_page={per_page}& sort={sort}&dir={dir}&first_letter={first_letter} +Метод: GET +Список параметров: +categoryslug – slug категории, полученный из метода “Каналы” +format – формат ответа(xml или json) +page – номер страницы(default=1) +per_page – количество передач на страницу(default=30) +sort – поле, по которому производится сортировка(}, default=on_air) +dir – направление сортировки {asc|desc} (default=desc) +first_letter – фильтр по первой букве в названии передачи + +Eample: +Запрос: http://etvnet.com/api/v2.0/catalog/serialyi.xml +Ответ: +<response> + <header> + <page_info> + <current>1</current> + <per_page>30</per_page> + <total>55</total> + </page_info> + <categories> + <resource> + <count>2381</count> + <slug>boevik</slug> + <name>Боевик</name> + </resource> + <resource> + <count>9492</count> + <slug>detektiv</slug> + <name>Детектив</name> + </resource> + … + </header> + <results> + <resource> + <production_year>2010</production_year> + <is_hq>False</is_hq> + <name>Банды</name> + <element_type_name>серия</element_type_name> + <element_type_name_plural1>серии</element_type_name_plural1> + <channel_slug>novyij-illyuzion</channel_slug> + <id>329749</id> + <element_type_name_plural2>серий</element_type_name_plural2> + <class>Container</class> + <mark_count>99</mark_count> + <tag>сериал</tag> + <on_air>2010-09-17T00:30:00Z</on_air> + <precalc_rating>17</precalc_rating> + <mark_total>8</mark_total> + <duration>102</duration> + <children_count>2</children_count> + <slug>bandyi</slug> + <channel>Новый Иллюзион</channel> + </resource> + … + </results> +</response> + + + + +b. Поиск +URL: /media/search.{format=xml|json}?q={query} +Метод: GET +Список параметров: +format – формат ответа(xml или json) +query – строка поиска +c. Детали передачи (Включает в себя элементы контейнера) +URL: /media/details/{id}.{format=xml|json}?page={page}&per_page={per_page}& sort={sort}&dir={dir}&first_letter={first_letter} + +Метод: GET +Список параметров: +id – id передачи +format – формат ответа(xml или json) +page – номер страницы(default=1) +per_page – количество передач на страницу(default=30) +sort – поле, по которому производится сортировка(}, default=on_air) +dir – направление сортировки {asc|desc} (default=desc) + +d. Просмотр передачи +URL: /media/watch/{id}/{bitrate}.{format=xml|json}?is_preview=0&other_server=0 +Метод: GET +Список параметров: +id – id канала, полученный из метода “Каналы” +format – формат ответа(xml или json) +bitrate – жалаемый битрейт(полученный из списка доступных битрейтов) +is_preview – Бесплатный отрывок +other_server – Просмотр с другого сервера +Example: +Запрос: http://etvnet.com/api/v1.0/media/watch/1234/600.xml?is_preview=0 +Ответ: +<response> + <url>mms://example.com/1.wmv</url> + <status>ok</status> + <id>291445</id> + <msg>OK</msg> + <name>Правда скрывает ложь. 6 серия</name> +</response> + + +4.Bookmarks +1. Список +URL: /media/bookmarks.{format=xml|json}?page=1 +Метод: GET +Список параметров: +format – формат ответа(xml или json) +page – страница +2. Добавить в избранное +URL: /media/bookmarks.{format=xml|json} +Метод: POST +Список параметров: +format – формат ответа(xml или json) +media_id – должен находиться в POST +3. Удалить из избранного +URL: /media/bookmarks.{format=xml|json}?media_id=84054 +Метод: DELETE +Список параметров: +format – формат ответа(xml или json) +media_id – должен находиться в QueryString + Added: trunk/plugins/ETVNet/ETVNet/API_DOCS_v2.0.doc =================================================================== (Binary files differ) Property changes on: trunk/plugins/ETVNet/ETVNet/API_DOCS_v2.0.doc ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs =================================================================== --- trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs 2011-02-04 21:16:48 UTC (rev 4092) +++ trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs 2011-02-05 03:37:40 UTC (rev 4093) @@ -101,6 +101,7 @@ keyTable.Add(9061, "Э"); keyTable.Add(9062, "Ю"); keyTable.Add(9063, "Я"); + keyTable.Add(9064, " "); } public override bool Init() @@ -228,10 +229,14 @@ void Update() { - if(inputString.Length>0) + if (inputString.Length > 0) + { inputLabel.Label = inputString; + } else + { inputLabel.Label = "<...>"; + } } public override void Render(float timePassed) Added: trunk/plugins/ETVNet/ETVNet/ETVBrows.cs =================================================================== (Binary files differ) Property changes on: trunk/plugins/ETVNet/ETVNet/ETVBrows.cs ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs =================================================================== --- trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs 2011-02-04 21:16:48 UTC (rev 4092) +++ trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs 2011-02-05 03:37:40 UTC (rev 4093) @@ -1,378 +1,1361 @@ -#region Copyright (C) 2005-2007 Team MediaPortal - -/* - * Copyright (C) 2005-2007 Team MediaPortal - * http://www.team-mediaportal.com - * - * 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 2, 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 GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -#endregion - -using System; -using System.IO; -using System.Collections.Generic; -using System.Text; -using System.Net; -using System.Xml; -using System.Web; -using System.Collections; -using System.Text.RegularExpressions; -using MediaPortal.GUI.Library; // for log - -namespace ETVNet -{ - // the component that goes to etvnet.ca and returns structured data - // most of the site intricacies is hidden here - class ETVBrowser - { - CookieContainer cookies; - Regex regexJSOpen; - Regex regexDeQuote; - bool traceHTML; - - public ETVBrowser(bool pTraceHTML) - { - traceHTML = pTraceHTML; - cookies = new CookieContainer(); - regexJSOpen = new Regex( - @"open\(([^,]+),", - RegexOptions.IgnoreCase - | RegexOptions.Singleline - | RegexOptions.CultureInvariant - | RegexOptions.IgnorePatternWhitespace - | RegexOptions.Compiled - ); - regexDeQuote = new Regex( - @"'([^']+)'", - RegexOptions.IgnoreCase - | RegexOptions.Singleline - | RegexOptions.CultureInvariant - | RegexOptions.IgnorePatternWhitespace - | RegexOptions.Compiled - ); - } - - public void login(string username, string password) - { - System.Collections.Hashtable postData = new System.Collections.Hashtable(3); - postData.Add("action", "login"); - postData.Add("login", username); - postData.Add("pwd", password); - Stream s = getHTML("http://www.etvnet.ca/cgi-bin/video/eitv_login.cgi", null, postData); // non-compliant - // how to check result ??? - byte[] buffer = new byte[1024]; - s.Read(buffer, 0, 1024); - String x = System.Text.Encoding.UTF8.GetString(buffer); - } - - // get and parse top directory page, return tree of hash tables - public Hashtable getTopDirectoryPage() - { - // fetch - Uri baseUrl = new Uri("http://www.etvnet.ca/cgi-bin/video/eitv_browse.fcgi?action=channels&skin=XML"); - XmlDocument todayPage = getXML(baseUrl.AbsoluteUri, null, null); - // find all stream types - archive, today, live - Hashtable streams = new Hashtable(5); - System.Collections.ArrayList list; - Hashtable entry; - XmlNodeList nodelist; - // fill in stream directory links (today) - list = new System.Collections.ArrayList(); - nodelist = todayPage.SelectNodes("/opt/PARAMETERS/all_channels[@has_programs_for_today=\"1\"]"); - foreach (XmlNode node in nodelist) - { - entry = new Hashtable(2); - entry.Add("name", StripHTML(node.Attributes.GetNamedItem("label").Value)); - entry.Add("realtime", false); - entry.Add("url", new Uri(baseUrl, "eitv_browse.fcgi?action=today&skin=XML&channel=" + node.Attributes.GetNamedItem("id").Value).AbsoluteUri); - list.Add(entry); - } - streams["\xD1\xE5\xE3\xEE\xE4\xED\xFF \xE2 \xFD\xF4\xE8\xF0\xE5"] = list; - // fill in stream directory links (archive) - list = new System.Collections.ArrayList(); - nodelist = todayPage.SelectNodes("/opt/PARAMETERS/all_channels[@has_programs_in_archive=\"1\"]"); - foreach (XmlNode node in nodelist) - { - entry = new Hashtable(2); - entry.Add("name", StripHTML(node.Attributes.GetNamedItem("label").Value)); - entry.Add("realtime", false); - entry.Add("url", new Uri(baseUrl, "eitv_browse.fcgi?skin=XML&channel=" + node.Attributes.GetNamedItem("id").Value).AbsoluteUri); - list.Add(entry); - } - streams["\xC0\xF0\xF5\xE8\xE2 \xEA\xE0\xED\xE0\xEB\xEE\xE2"] = list; - // fill in stream directory links (live) - list = new System.Collections.ArrayList(); - nodelist = todayPage.SelectNodes("/opt/PARAMETERS/all_channels[@realtime_stream_url and not(@realtime_stream_url=\"\")]"); - foreach (XmlNode node in nodelist) - { - entry = new Hashtable(2); - entry.Add("name", StripHTML(node.Attributes.GetNamedItem("label").Value)); - entry.Add("realtime", true); - entry.Add("url", new Uri(baseUrl, dequoteJSOpen(node.Attributes.GetNamedItem("realtime_stream_url").Value)).AbsoluteUri + "&skin=XML"); - list.Add(entry); - } - streams["\xCF\xF0\xFF\xEC\xEE\xE9 \xFD\xF4\xE8\xF0"] = list; - - list = new System.Collections.ArrayList(); - entry = new Hashtable(2); - entry.Add("name", "\xD1\xE5\xE3\xEE\xE4\xED\xFF \xE2 \xFD\xF4\xE8\xF0\xE5 - \xC2\xF1\xE5 \xEA\xE0\xED\xE0\xEB\xFB"); - entry.Add("realtime", false); - entry.Add("url", new Uri(baseUrl, "eitv_browse.fcgi?action=today&skin=XML").AbsoluteUri); - list.Add(entry); - - entry = new Hashtable(2); - entry.Add("name", "\xC0\xF0\xF5\xE8\xE2 \xE2\xF1\xE5\xF5 \xEA\xE0\xED\xE0\xEB\xEE\xE2"); - entry.Add("realtime", false); - entry.Add("url", new Uri(baseUrl, "eitv_browse.fcgi?skin=XML").AbsoluteUri); - list.Add(entry); - - streams["\xC2\xF1\xE5 \xEA\xE0\xED\xE0\xEB\xFB"] = list; - - return streams; - } - - public Hashtable getDirectoryPage(string url) - { - Uri baseUrl = new Uri(url); - XmlDocument dirPageXML = getXML(baseUrl.AbsoluteUri, null, null); - - Hashtable dirPage = new Hashtable(5); - System.Collections.ArrayList list; - Hashtable entry; - XmlNodeList nodelist; - - // fill in category links - list = new System.Collections.ArrayList(); - nodelist = dirPageXML.SelectNodes("/opt/PARAMETERS/TABLECATEGORIESLIST"); - foreach (XmlNode node in nodelist) - { - entry = new Hashtable(2); - entry.Add("name", StripHTML(node.Attributes.GetNamedItem("name").Value)); - entry.Add("url", new Uri(baseUrl, node.Attributes.GetNamedItem("ref").Value).AbsoluteUri + "&skin=XML"); - list.Add(entry); - } - dirPage.Add("categories", list); - - // alphabet links - string alphabet = "\xC0\xC1\xC2\xC3\xC4Ũ\xC6\xC7\xD2\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDC\xDB\xDA\xDD\xDE\xDF"; - list = new ArrayList(); - QueryString qsLetter = QueryString.FromUrl(url); - qsLetter.Add("order_by", "name"); - for (int i = 0; i < alphabet.Length; i++) - { - entry = new Hashtable(2); - entry.Add("name", alphabet[i].ToString()); - qsLetter.Add("start_letter",alphabet[i].ToString()); - entry.Add("url", qsLetter.ToString(true)); - list.Add(entry); - } - dirPage.Add("letters", list); - - // channel links - list = new System.Collections.ArrayList(); - nodelist = dirPageXML.SelectNodes("/opt/PARAMETERS/table_loop"); - foreach (XmlNode node in nodelist) - { - entry = new Hashtable(2); - entry.Add("datetime", node.Attributes.GetNamedItem("DATETIME").Value); - entry.Add("rating", node.Attributes.GetNamedItem("rating").Value); - entry.Add("infoUrl", node.Attributes.GetNamedItem("url_info").Value + "&skin=XML"); - entry.Add("name", StripHTML(node.Attributes.GetNamedItem("name").Value)); - entry.Add("is_container", node.Attributes.GetNamedItem("cond_is_container").Value == "1"); - if((bool)entry["is_container"]) - entry.Add("url", node.Attributes.GetNamedItem("url_container").Value + "&skin=XML"); - else - entry.Add("url", node.Attributes.GetNamedItem("url_direct").Value + "&skin=XML"); - list.Add(entry); - } - dirPage.Add("entries", list); - - // prev and next links - XmlNode pageNode = dirPageXML.SelectSingleNode("/opt/PARAMETERS"); - int page = 1; - int pageCount = 1; - try // for cases when "" is returned instead of "1" - { - page = Int32.Parse(pageNode.Attributes.GetNamedItem("CURRENT_PAGE").Value); - pageCount = Int32.Parse(pageNode.Attributes.GetNamedItem("PAGE_COUNT").Value); - } - catch (System.FormatException ex) { } - QueryString qsUrl = QueryString.FromUrl(url); - if (page > 1) - { - qsUrl.Add("block", (100 * (page - 2)).ToString()); // Note: page size is hardcoded here at 100, although it can be set in URL params - dirPage.Add("prev", qsUrl.ToString(true)); - } - if (page < pageCount) - { - qsUrl.Add("block", (100 * (page)).ToString()); - dirPage.Add("next", qsUrl.ToString(true)); - } - - return dirPage; - } - - public String getInfoPage(string url) - { - Uri baseUrl = new Uri(url); - XmlDocument infoPage = getXML(baseUrl.AbsoluteUri, null, null); - XmlNode node = infoPage.SelectSingleNode("/opt/PARAMETERS"); - - string info = ""; - - info += node.Attributes.GetNamedItem("HTML_DATETIME").Value + "\r\n\r\n"; - info += node.Attributes.GetNamedItem("META_DESCRIPTION").Value + "\r\n\r\n"; - info += "\xD6\xE5\xED\xE0: " + node.Attributes.GetNamedItem("ACCESS_PRICE_FORMATTED").Value + "\r\n\r\n"; - - return info; - } - - public string getMMSURL(string paramUrl) - { - XmlDocument mmsPage = getXML(paramUrl, null, null); - XmlNode node = mmsPage.SelectSingleNode("/opt/PARAMETERS"); - return node.Attributes.GetNamedItem("REDIRECT_URL").Value; - } - - public String dequoteJSOpen(string paramUrl) - { - string url = paramUrl; - // try dequoting if javascript: window open - Match match = regexJSOpen.Match(paramUrl, 0); - if (match.Groups[1].Success) - { - string tempUrl = ""; - MatchCollection matches = regexDeQuote.Matches(match.Groups[1].Value); - foreach (Match stringMatch in matches) - tempUrl += stringMatch.Groups[1].Value; - if (tempUrl.Length > 0) - url = tempUrl; - } - return url; - } - - public String getHTMLAsString(string URL, Hashtable GETData, Hashtable POSTData) - { - Stream responseStream = getHTML(URL, GETData, POSTData); - // UTF-8 - StreamReader urlRdr = new StreamReader(new StreamReader(responseStream).BaseStream, Encoding.UTF8); - string result = urlRdr.ReadToEnd(); - if (traceHTML) - { - StreamWriter writer; - writer = File.CreateText("htmltrace-" + HttpUtility.UrlEncode(URL)); - writer.Write(result); - writer.Close(); - } - return result; - } - - public XmlDocument getXML(string URL, Hashtable GETData, Hashtable POSTData) - { - Stream responseStream = getHTML(URL, GETData, POSTData); - XmlTextReader reader = new XmlTextReader(responseStream); - reader.XmlResolver = null; - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.Load(reader); - return xmlDoc; - } - - public Stream getHTML(string URL, Hashtable GETData, Hashtable POSTData) - { - Log.Info("etvnet navigate: "+URL); - // URL encode GET querystring data, if any - string GETDataString = ""; - if (GETData != null && GETData.Count > 0) - { - foreach (string key in GETData.Keys) - { - if (GETDataString.Length > 0) - GETDataString += "&"; - GETDataString += HttpUtility.UrlEncode(key, Encoding.UTF8) - + "=" + HttpUtility.UrlEncode(GETData[key].ToString(), Encoding.UTF8); - } - } - // URL encode POST data, if any - string POSTDataString = ""; - if (POSTData != null && POSTData.Count > 0) - { - foreach (string key in POSTData.Keys) - { - if (POSTDataString.Length > 0) - POSTDataString += "&"; - POSTDataString += HttpUtility.UrlEncode(key, Encoding.UTF8) - + "=" + HttpUtility.UrlEncode(POSTData[key].ToString(), Encoding.UTF8); - } - } - - HttpWebRequest webRequest; - Uri url; - if (GETData != null && GETData.Count > 0) - { - url = new Uri(URL); - if (url.Query.Length > 0) // some querystring is present already - url = new Uri(URL + "?" + GETDataString); - else - url = new Uri(URL + "&" + GETDataString); - } - else - { - url = new Uri(URL); - } - - if (POSTData != null && POSTData.Count > 0) - { - webRequest = (HttpWebRequest)WebRequest.Create(url); - webRequest.CookieContainer = cookies; - webRequest.ContentType = "application/x-www-form-urlencoded"; // no file uploads supported so far - webRequest.Method = "POST"; - webRequest.UserAgent = "MediaPortal-ETVNet-Plugin/1.0"; - webRequest.ContentLength = POSTDataString.Length; - Stream postStream = webRequest.GetRequestStream(); - byte[] postBuffer = System.Text.Encoding.UTF8.GetBytes(POSTDataString); - postStream.Write(postBuffer, 0, postBuffer.Length); - postStream.Close(); - } - else - { - webRequest = (HttpWebRequest)WebRequest.Create(url); - webRequest.CookieContainer = cookies; - webRequest.Method = "GET"; - webRequest.UserAgent = "MediaPortal-ETVNet-Plugin/1.0"; - } - - WebResponse response = webRequest.GetResponse(); - return response.GetResponseStream(); - } - - // http://weblogs.asp.net/rosherove/archive/2003/05/13/6963.aspx - private string StripHTML(string htmlString) - { - //This pattern Matches everything found inside html tags; - //(.|\n) - > Look for any character or a new line - // *? -> 0 or more occurences, and make a non-greedy search meaning - //That the match will stop at the first available '>' it sees, and not at the last one - //(if it stopped at the last one we could have overlooked - //nested HTML tags inside a bigger HTML tag..) - // Thanks to Oisin and Hugh Brown for helping on this one... - - string pattern = @"<(.|\n)*?>"; - return Regex.Replace(htmlString, pattern, string.Empty); - } - } -} +\xFF\xFE# |
From: <kro...@us...> - 2011-02-04 21:16:54
|
Revision: 4092 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4092&view=rev Author: kroko_koenig Date: 2011-02-04 21:16:48 +0000 (Fri, 04 Feb 2011) Log Message: ----------- version server 0.2.4, remote 1.2 Modified Paths: -------------- trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs trunk/plugins/AndroidRemote/Server/AndroidRemote/SocketHandler.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Removed Paths: ------------- trunk/plugins/AndroidRemote/Release/MediaPortalRemote.001 trunk/plugins/AndroidRemote/Release/MediaPortalRemote.011 Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 =================================================================== (Binary files differ) Deleted: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.001 =================================================================== (Binary files differ) Deleted: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.011 =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2011-02-03 12:17:39 UTC (rev 4091) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2011-02-04 21:16:48 UTC (rev 4092) @@ -318,15 +318,15 @@ #region some test how to accces the gui else if (req.StartsWith("/onlinevideos")) { - GUIWindowManager.ActivateWindow(4755); + GUIWindowManager.ActivateWindow(4755); } else if (req.StartsWith("/items")) { GUIWindow window = GUIWindowManager.GetWindow(4755); - GUIFacadeControl cont = (GUIFacadeControl) window.GetControl(50); + GUIFacadeControl cont = (GUIFacadeControl)window.GetControl(50); cont.SelectedListItemIndex = 2; - GUIListItem i = cont.SelectedListItem; + GUIListItem i = cont.SelectedListItem; // header string msg = "HTTP/1.0 200 Ok\r\n"; @@ -336,8 +336,8 @@ // content msg += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"; msg += "<OnlineVideos>\r\n"; - + msg += "<OnlineVideos>\r\n"; } #endregion Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/SocketHandler.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/SocketHandler.cs 2011-02-03 12:17:39 UTC (rev 4091) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/SocketHandler.cs 2011-02-04 21:16:48 UTC (rev 4092) @@ -87,7 +87,7 @@ } byte[] tosend = new byte[buffersize]; Array.Copy(Bytes, actual, tosend, 0, buffersize); - + sock.Send(tosend); System.Threading.Thread.Sleep(2); } Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-03 12:17:48
|
Revision: 4091 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4091&view=rev Author: kroko_koenig Date: 2011-02-03 12:17:39 +0000 (Thu, 03 Feb 2011) Log Message: ----------- upate to 0.4.1 Modified Paths: -------------- trunk/plugins/MyHexxagon/Release/language/MyHexxagon/strings_de.xml trunk/plugins/MyHexxagon/Release/skin/Blue3/MyHexxagon.xml trunk/plugins/MyHexxagon/Release/skin/Blue3wide/MyHexxagon.xml trunk/plugins/MyHexxagon/Source/MyHexxagon/LocalizeStrings.cs trunk/plugins/MyHexxagon/Source/MyHexxagon/MyHexxagon.cs trunk/plugins/MyHexxagon/Source/MyHexxagon/MyHexxagon.csproj trunk/plugins/MyHexxagon/Source/MyHexxagon/Properties/AssemblyInfo.cs trunk/plugins/MyHexxagon/readme.txt Added Paths: ----------- trunk/plugins/MyHexxagon/Release/Hexxagon.mpe1 trunk/plugins/MyHexxagon/Release/Hexxagon.xmp2 trunk/plugins/MyHexxagon/Release/plugins/Windows/Hexxagon.dll Removed Paths: ------------- trunk/plugins/MyHexxagon/MyHexxagon.xmp trunk/plugins/MyHexxagon/Release/plugins/Windows/MyHexxagon.dll Deleted: trunk/plugins/MyHexxagon/MyHexxagon.xmp =================================================================== --- trunk/plugins/MyHexxagon/MyHexxagon.xmp 2011-02-03 08:33:22 UTC (rev 4090) +++ trunk/plugins/MyHexxagon/MyHexxagon.xmp 2011-02-03 12:17:39 UTC (rev 4091) @@ -1,446 +0,0 @@ -<MPinstaler> - <ver>1.00.000</ver> - <FileList> - <File> - <FileName>HexxDouble.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3\Sounds\HexxDouble.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>c21db709-f0a3-4276-9045-9e30bc9b6d15</Guid> - </File> - <File> - <FileName>HexxDouble.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3wide</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3wide\Sounds\HexxDouble.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>afbd9298-17c1-43f4-b30d-1dee3b83366a</Guid> - </File> - <File> - <FileName>HexxMove.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3\Sounds\HexxMove.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>964b5508-cb0e-49c5-b48a-c5a09384f11c</Guid> - </File> - <File> - <FileName>HexxMove.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3wide</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3wide\Sounds\HexxMove.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>3ac1a3c5-6e8a-49ae-b192-a3d6717b44e1</Guid> - </File> - <File> - <FileName>HexxSelect.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3\Sounds\HexxSelect.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>fd08b2be-ce94-4806-9d7d-2e9570730aac</Guid> - </File> - <File> - <FileName>HexxSelect.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3wide</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3wide\Sounds\HexxSelect.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>0920b6a2-cc0d-4934-a0db-bbb0a196db8d</Guid> - </File> - <File> - <FileName>HexxZap.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3\Sounds\HexxZap.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>a9fbb133-ccf1-4f43-9830-8c7a42c46370</Guid> - </File> - <File> - <FileName>HexxZap.wav</FileName> - <Type>Sounds</Type> - <SubType>Blue3wide</SubType> - <Source>C:\Prog\MediaPlugins\MyHexxagon\Release\skin\Blue3wide\Sounds\HexxZap.wav</Source> - <Id>02030</Id> - <Option /> - <Guid>8644009c-b713-4626-8922-003daedfb0dd</Guid> - </File> - <File> - <FileName>hover_my hexxagon.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\hover_my hexxagon.png</Source> - <Id>02020</Id> - <Option /> - <Guid>4385265b-f45b-458f-b211-9601ed0899be</Guid> - </File> - <File> - <FileName>hover_my hexxagon.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\hover_my hexxagon.png</Source> - <Id>02020</Id> - <Option>OutputFileName=|DefaultFile=False|</Option> - <Guid>e55195a9-1527-4810-a09b-9c5b2bcf6cc2</Guid> - </File> - <File> - <FileName>MyHexx01.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx01.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx01.png|DefaultFile=False|</Option> - <Guid>0a7b5e32-c3ef-463e-a19f-924eb2231bc5</Guid> - </File> - <File> - <FileName>MyHexx01.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx01.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx01.png|DefaultFile=False|</Option> - <Guid>661de664-c32f-44ec-a5d8-5ac84f2d74b7</Guid> - </File> - <File> - <FileName>MyHexx01F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx01F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx01F.png|DefaultFile=False|</Option> - <Guid>419e329f-e6f1-4fe4-8fdf-40d15a7fc8fe</Guid> - </File> - <File> - <FileName>MyHexx01F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx01F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx01F.png|DefaultFile=False|</Option> - <Guid>685a322f-145b-4f96-8d46-4f6ebea09629</Guid> - </File> - <File> - <FileName>MyHexx02.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx02.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx02.png|DefaultFile=False|</Option> - <Guid>34b5cd9e-34e6-4fa0-a7b0-c6bf3fb2d7cd</Guid> - </File> - <File> - <FileName>MyHexx02.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx02.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx02.png|DefaultFile=False|</Option> - <Guid>290c2c4a-f3cc-43a6-a350-924e14d2f1e2</Guid> - </File> - <File> - <FileName>MyHexx02F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx02F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx02F.png|DefaultFile=False|</Option> - <Guid>c56f2e56-154f-47cc-a637-7b3e490f47b1</Guid> - </File> - <File> - <FileName>MyHexx02F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx02F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx02F.png|DefaultFile=False|</Option> - <Guid>c050beda-6ad4-49eb-aa3a-c59c172e3611</Guid> - </File> - <File> - <FileName>MyHexx03.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx03.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx03.png|DefaultFile=False|</Option> - <Guid>ffe56851-9f09-4888-9bbd-e1bfec277317</Guid> - </File> - <File> - <FileName>MyHexx03.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx03.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx03.png|DefaultFile=False|</Option> - <Guid>67b41d70-713d-4c2f-b9b6-4482816d643c</Guid> - </File> - <File> - <FileName>MyHexx03F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx03F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx03F.png|DefaultFile=False|</Option> - <Guid>2a0e3f56-15fc-461b-9d4f-8318200c4910</Guid> - </File> - <File> - <FileName>MyHexx03F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx03F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx03F.png|DefaultFile=False|</Option> - <Guid>a202a37d-8aaa-4c90-b6fe-31f205a2b64f</Guid> - </File> - <File> - <FileName>MyHexx04.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx04.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx04.png|DefaultFile=False|</Option> - <Guid>3fa9320f-cb6a-47f1-a9c6-61959a6e066b</Guid> - </File> - <File> - <FileName>MyHexx04.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx04.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx04.png|DefaultFile=False|</Option> - <Guid>c4dd73f1-5b11-427d-a2c7-16ea42473cdd</Guid> - </File> - <File> - <FileName>MyHexx04F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx04F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx04F.png|DefaultFile=False|</Option> - <Guid>94459fc5-1038-4efa-a8d6-945d8b8613fb</Guid> - </File> - <File> - <FileName>MyHexx04F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx04F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx04F.png|DefaultFile=False|</Option> - <Guid>392775df-dab0-4ce1-962d-4a749471cd53</Guid> - </File> - <File> - <FileName>MyHexx05.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx05.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx05.png|DefaultFile=False|</Option> - <Guid>bb7656c0-3f93-4d75-a47f-9ac7c2028642</Guid> - </File> - <File> - <FileName>MyHexx05.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx05.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx05.png|DefaultFile=False|</Option> - <Guid>ea55a373-5aab-4484-8141-c1bcdd22b616</Guid> - </File> - <File> - <FileName>MyHexx05F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx05F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx05F.png|DefaultFile=False|</Option> - <Guid>3bb8ec85-1b58-46aa-8388-392e8cbd3441</Guid> - </File> - <File> - <FileName>MyHexx05F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx05F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx05F.png|DefaultFile=False|</Option> - <Guid>9e208f05-b19d-4b5b-95fc-efcf6b8c7e60</Guid> - </File> - <File> - <FileName>MyHexx06.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx06.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx06.png|DefaultFile=False|</Option> - <Guid>cf3bf4a8-659d-432d-b4a8-a6b3936c6558</Guid> - </File> - <File> - <FileName>MyHexx06.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx06.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx06.png|DefaultFile=False|</Option> - <Guid>46a98125-6fdf-418b-a564-21aea7395068</Guid> - </File> - <File> - <FileName>MyHexx06F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx06F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx06F.png|DefaultFile=False|</Option> - <Guid>bc8113d6-1087-437d-a5f4-95a4935b02e6</Guid> - </File> - <File> - <FileName>MyHexx06F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx06F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx06F.png|DefaultFile=False|</Option> - <Guid>b412330d-64ed-403e-af50-2e0d5970876b</Guid> - </File> - <File> - <FileName>MyHexx07.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx07.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx07.png|DefaultFile=False|</Option> - <Guid>3c9bc819-6c61-4f67-b75a-25293349fbf5</Guid> - </File> - <File> - <FileName>MyHexx07.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx07.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx07.png|DefaultFile=False|</Option> - <Guid>803bcf03-92d3-4144-b053-bc37ee4d0a8f</Guid> - </File> - <File> - <FileName>MyHexx07F.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx07F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx07F.png|DefaultFile=False|</Option> - <Guid>92fb5e9a-84b2-4f50-8c37-fd0a15c4d18d</Guid> - </File> - <File> - <FileName>MyHexx07F.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx07F.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx07F.png|DefaultFile=False|</Option> - <Guid>4ba73481-4851-4293-bfda-f11097aa222a</Guid> - </File> - <File> - <FileName>MyHexx0X.png</FileName> - <Type>Media</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\Media\Hexxagon\MyHexx0X.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx0x.png|DefaultFile=False|</Option> - <Guid>5ed7ebe6-57df-4434-b5c7-3faf9a2185e3</Guid> - </File> - <File> - <FileName>MyHexx0X.png</FileName> - <Type>Media</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\Media\Hexxagon\MyHexx0X.png</Source> - <Id>02020</Id> - <Option>OutputFileName=\hexxagon\MyHexx0x.png|DefaultFile=False|</Option> - <Guid>bc68b2d4-dc8a-4345-9aa5-262de9934fd0</Guid> - </File> - <File> - <FileName>MyHexxagon.dll</FileName> - <Type>Plugin</Type> - <SubType>Window</SubType> - <Source>Release\plugins\Windows\MyHexxagon.dll</Source> - <Id>01010</Id> - <Option /> - <Guid>42868c17-3ee0-4891-8195-f1fd4a882d03</Guid> - </File> - <File> - <FileName>MyHexxagon.xml</FileName> - <Type>Skin</Type> - <SubType>Blue3</SubType> - <Source>Release\skin\Blue3\MyHexxagon.xml</Source> - <Id>02010</Id> - <Option>OutputFileName=|DefaultFile=False|</Option> - <Guid>379e04eb-58a2-4a77-9de2-2d88de77457c</Guid> - </File> - <File> - <FileName>MyHexxagon.xml</FileName> - <Type>Skin</Type> - <SubType>Blue3wide</SubType> - <Source>Release\skin\Blue3wide\MyHexxagon.xml</Source> - <Id>02010</Id> - <Option /> - <Guid>83967509-369e-4959-8c28-0519969d572c</Guid> - </File> - <File> - <FileName>strings_de.xml</FileName> - <Type>Other</Type> - <SubType>%Language%\MyHexxagon</SubType> - <Source>Release\language\MyHexxagon\strings_de.xml</Source> - <Id>04010</Id> - <Option /> - <Guid>78e7a425-2366-434d-9bb1-89c53e9fb841</Guid> - </File> - <File> - <FileName>strings_en.xml</FileName> - <Type>Other</Type> - <SubType>%Language%\MyHexxagon</SubType> - <Source>Release\language\MyHexxagon\strings_en.xml</Source> - <Id>04010</Id> - <Option /> - <Guid>c8516983-98fc-4075-b87d-46e47fe250ea</Guid> - </File> - <File> - <FileName>strings_fr.xml</FileName> - <Type>Other</Type> - <SubType>%Language%\MyHexxagon</SubType> - <Source>Release\language\MyHexxagon\strings_fr.xml</Source> - <Id>04010</Id> - <Option /> - <Guid>808c9eec-d3d4-4ed1-9623-b6b85e14f4e5</Guid> - </File> - </FileList> - <StringList /> - <Actions /> - <SetupGroups /> - <SetupGroupMappings /> - <Option> - <BuildFileName>Hexxagon.mpi</BuildFileName> - <ProiectFileName>c:\Prog\MediaPlugins\MyHexxagon\MyHexxagon.xmp</ProiectFileName> - <ProiectName>Hexxagon</ProiectName> - <Author>Mark Koenig (kroko)</Author> - <UpdateURL>http://www.team-mediaportal.com</UpdateURL> - <Version>0.4</Version> - <Description>Hexxagon is one of the most popular animated board games of strategy, loosely based upon Othello and Attaxx!. -The original version was written in 1992 by Argo Games. Finally I updated it for the MP.</Description> - <Group>Games</Group> - <Release>Stable </Release> - <Logo>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</Logo> - </Option> - <Properties> - <MPMaxVersion /> - <MPMinVersion /> - <MinExtensionVersion /> - <MaxExtensionVersion /> - <ForumURL>http://forum.team-mediaportal.com/plugins-47/my-hexxagon-52771/#post361475</ForumURL> - <WebURL /> - <CreationDate>15-01-09</CreationDate> - <SingleGroupSelect>False</SingleGroupSelect> - </Properties> -</MPinstaler> \ No newline at end of file Added: trunk/plugins/MyHexxagon/Release/Hexxagon.mpe1 =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyHexxagon/Release/Hexxagon.mpe1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/MyHexxagon/Release/Hexxagon.xmp2 =================================================================== --- trunk/plugins/MyHexxagon/Release/Hexxagon.xmp2 (rev 0) +++ trunk/plugins/MyHexxagon/Release/Hexxagon.xmp2 2011-02-03 12:17:39 UTC (rev 4091) @@ -0,0 +1,886 @@ +<?xml version="1.0" encoding="utf-8"?> +<PackageClass xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Default"> + <ParentGroup /> + <DisplayName>Default</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Default</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>plugins\Windows\Hexxagon.dll</LocalFileName> + <ZipFileName>Installer{CopyFile}\{66967048-a8d6-4f75-abb9-f277c0c75784}-MyHexxagon.dll</ZipFileName> + <DestinationFilename>%Plugins%\Windows\Hexxagon.dll</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>language\MyHexxagon\strings_de.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{eddbbbc5-007f-441e-a6f6-271529762c2b}-strings_de.xml</ZipFileName> + <DestinationFilename>%Language%\MyHexxagon\strings_de.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>language\MyHexxagon\strings_en.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{ea5e66d7-2409-41f8-abc1-d449843239b0}-strings_en.xml</ZipFileName> + <DestinationFilename>%Language%\MyHexxagon\strings_en.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>language\MyHexxagon\strings_fr.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{411e8150-ee72-4977-8e2a-bdac6ab2153c}-strings_fr.xml</ZipFileName> + <DestinationFilename>%Language%\MyHexxagon\strings_fr.xml</DestinationFilename> + </FileItem> + </Items> + </Files> + </GroupItem> + <GroupItem Name="Blue3"> + <DisplayName>Blue3</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Blue3</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\MyHexxagon.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{a54be079-ecaa-4677-9012-5914d95932b2}-MyHexxagon.xml</ZipFileName> + <DestinationFilename>%Skin%\Blue3\MyHexxagon.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Sounds\HexxDouble.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{9bbfa43b-b4e2-4437-9804-fd01bf8d3321}-HexxDouble.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Sounds\HexxDouble.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Sounds\HexxMove.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{3cc65ad9-df7b-4505-9bd0-47973115b033}-HexxMove.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Sounds\HexxMove.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Sounds\HexxSelect.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{9c7ed26e-703c-4fb0-b733-0a77eb8bca8f}-HexxSelect.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Sounds\HexxSelect.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Sounds\HexxZap.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{83a2e1cf-079d-4eb6-89c6-b7435f464c0c}-HexxZap.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Sounds\HexxZap.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\hover_my hexxagon.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{ab34e77f-7cb0-4304-8041-54f1c5e5e904}-hover_my hexxagon.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\hover_my hexxagon.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx01.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{5f4be744-8bb8-4508-9ab6-bb2042e9e7c7}-MyHexx01.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx01.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx01F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{7ae1e56a-db8a-4ee8-b522-8fee9ce9aa6d}-MyHexx01F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx01F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx02.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{dd94e88e-558d-4df9-a22a-d60956f74528}-MyHexx02.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx02.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx02F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{fea68eea-8a14-4309-a604-0266e7d49491}-MyHexx02F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx02F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx03.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{4f649697-d466-4dba-a881-fc380d62e4a9}-MyHexx03.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx03.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx03F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{cb1af3ee-3f61-4a9a-9e23-93eedf332a62}-MyHexx03F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx03F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx04.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{85b2b040-93e7-4284-b68b-e54ee9c2a109}-MyHexx04.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx04.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx04F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{6d6396a0-da73-4854-a39f-7eff71155d14}-MyHexx04F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx04F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx05.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{75385546-0490-4ae4-8ef9-dfc67791f7d5}-MyHexx05.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx05.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx05F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{4ea11f68-c232-4810-8d12-055913304f39}-MyHexx05F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx05F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx06.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{cef81c49-e2bc-46db-8824-5c15085bd506}-MyHexx06.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx06.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx06F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{477da2b3-411f-4286-b9df-0fc57ae43382}-MyHexx06F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx06F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx07.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{992d87f1-605e-4e48-8963-e26cde0e94c6}-MyHexx07.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx07.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx07F.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{68fa1a56-8e1c-43ac-88ea-5e17ace98186}-MyHexx07F.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx07F.png</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3\Media\Hexxagon\MyHexx0X.png</LocalFileName> + <ZipFileName>Installer{CopyFile}\{f753e220-ef55-49ff-b390-81c0f5c0b18f}-MyHexx0X.png</ZipFileName> + <DestinationFilename>%Skin%\Blue3\Media\Hexxagon\MyHexx0X.png</DestinationFilename> + </FileItem> + </Items> + </Files> + </GroupItem> + <GroupItem Name="Blue3wide"> + <DisplayName>Blue3wide</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Blue3wide</Description> + <Files> + <Items> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\MyHexxagon.xml</LocalFileName> + <ZipFileName>Installer{CopyFile}\{da3bcd25-e700-49a5-9280-1e891ed98aff}-MyHexxagon.xml</ZipFileName> + <DestinationFilename>%Skin%\Blue3wide\MyHexxagon.xml</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\Sounds\HexxDouble.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{12777ffc-6378-441f-9a47-0fda57b3cdc5}-HexxDouble.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3wide\Sounds\HexxDouble.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\Sounds\HexxMove.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{8441dcc5-6243-4037-9e5b-2b74d5c0a71a}-HexxMove.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3wide\Sounds\HexxMove.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\Sounds\HexxSelect.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{fe984e24-b0c7-4010-a38e-050e6b6949df}-HexxSelect.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3wide\Sounds\HexxSelect.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\Sounds\HexxZap.wav</LocalFileName> + <ZipFileName>Installer{CopyFile}\{5dd71e3e-7753-4254-8444-73ece3f43b08}-HexxZap.wav</ZipFileName> + <DestinationFilename>%Skin%\Blue3wide\Sounds\HexxZap.wav</DestinationFilename> + </FileItem> + <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> + <Param1 /> + <UpdateOption>OverwriteIfOlder</UpdateOption> + <LocalFileName>skin\Blue3wide\Media\... [truncated message content] |
From: <kro...@us...> - 2011-02-03 08:33:29
|
Revision: 4090 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4090&view=rev Author: kroko_koenig Date: 2011-02-03 08:33:22 +0000 (Thu, 03 Feb 2011) Log Message: ----------- small tweak for some pages Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 15:18:54 UTC (rev 4089) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-03 08:33:22 UTC (rev 4090) @@ -1032,7 +1032,11 @@ { if (!id.Link.StartsWith("http://") && !id.Link.StartsWith("https://") && !id.Link.StartsWith("ftp://") && !id.Link.StartsWith("ftps://")) { - string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host + webBrowser.Url.AbsolutePath + id.Link; + string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host; + if (webBrowser.Url.AbsolutePath != "/") + result += webBrowser.Url.AbsolutePath; + result += id.Link; + id.Link = result; hln = id; return true; Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-02 15:19:01
|
Revision: 4089 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4089&view=rev Author: kroko_koenig Date: 2011-02-02 15:18:54 +0000 (Wed, 02 Feb 2011) Log Message: ----------- fix the link bug ?page2 and some small fix Modified Paths: -------------- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo Removed Paths: ------------- trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 =================================================================== --- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2011-02-02 13:55:02 UTC (rev 4088) +++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2011-02-02 15:18:54 UTC (rev 4089) @@ -17,13 +17,6 @@ <ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName> <DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename> </FileItem> - <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> - <Param1 /> - <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Files\unzip.exe</LocalFileName> - <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName> - <DestinationFilename>%Cache%\unzip.exe</DestinationFilename> - </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> @@ -268,13 +261,13 @@ <Version> <Major>0</Major> <Minor>2</Minor> - <Build>7</Build> + <Build>8</Build> <Revision>0</Revision> </Version> <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / " Webbrowser. </ExtensionDescription> - <VersionDescription>moved dir to thumbs</VersionDescription> + <VersionDescription>used Ionic.ZIP for extract xulrunner</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.mpe1</OnlineLocation> <ReleaseDate>2010-11-06T15:09:04.5514802+01:00</ReleaseDate> @@ -321,13 +314,6 @@ <ZipFileName>Installer{CopyFile}\{c9cda48b-d308-439e-9997-5d29e02e898d}-xulrunner.zip</ZipFileName> <DestinationFilename>%Cache%\xulrunner.zip</DestinationFilename> </FileItem> - <FileItem InstallType="CopyFile" SystemFile="false" Modified="true"> - <Param1 /> - <UpdateOption>OverwriteIfOlder</UpdateOption> - <LocalFileName>Files\unzip.exe</LocalFileName> - <ZipFileName>Installer{CopyFile}\{f8239056-5461-4664-99ae-baedfed8cc25}-unzip.exe</ZipFileName> - <DestinationFilename>%Cache%\unzip.exe</DestinationFilename> - </FileItem> <FileItem InstallType="CopyFile" SystemFile="false" Modified="false"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> @@ -395,7 +381,7 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>..\Source\BrowseTheWeb\xulrunner.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{9b38eb10-4fb2-45fd-a4c1-4d77e7de92b6}-xulrunner.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{69d2dbe3-4672-4700-8c8f-a915eebcf953}-xulrunner.png</ZipFileName> <DestinationFilename /> </FileItem> </Items> Deleted: trunk/plugins/BrowseTheWeb/Release/Files/unzip.exe =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll =================================================================== (Binary files differ) Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-02-02 13:55:02 UTC (rev 4088) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj.user 2011-02-02 15:18:54 UTC (rev 4089) @@ -4,6 +4,6 @@ <StartProgram>C:\Program Files\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram> </PropertyGroup> <PropertyGroup> - <ProjectView>ProjectFiles</ProjectView> + <ProjectView>ShowAllFiles</ProjectView> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 13:55:02 UTC (rev 4088) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2011-02-02 15:18:54 UTC (rev 4089) @@ -189,6 +189,7 @@ webBrowser = new GeckoWebBrowser(); webBrowser.Name = "BrowseTheWeb"; webBrowser.NoDefaultContextMenu = true; + GUIGraphicsContext.form.Controls.Add(webBrowser); webBrowser.Enabled = false; @@ -554,6 +555,9 @@ if (linkId.Length > 4) linkId = linkId.Substring(0, 1); } break; + case Action.ActionType.ACTION_PREVIOUS_MENU: + linkId = string.Empty; + break; case Action.ActionType.ACTION_PLAY: case Action.ActionType.ACTION_MUSIC_PLAY: OnEnterNewLink(); @@ -594,6 +598,7 @@ OnMoveUp(); return; case Action.ActionType.ACTION_MOVE_DOWN: + OnMoveDown(); return; case Action.ActionType.ACTION_SELECT_ITEM: if (mouse.Visible) @@ -817,9 +822,13 @@ { string str = DateTime.Now.ToLongTimeString(); str += " "; - str += web.StatusText.Substring(0, 50); - if (web.StatusText.Length > 50) str += "..."; + int l = web.StatusText.Length; + if (l > 50) l = 47; + + str += web.StatusText.Substring(0, l); + if (l > 50) str += "..."; + GUIPropertyManager.SetProperty("#btWeb.status", str); } } @@ -1021,6 +1030,21 @@ { case HtmlInputType.Link: { + if (!id.Link.StartsWith("http://") && !id.Link.StartsWith("https://") && !id.Link.StartsWith("ftp://") && !id.Link.StartsWith("ftps://")) + { + string result = webBrowser.Url.Scheme + "://" + webBrowser.Url.Host + webBrowser.Url.AbsolutePath + id.Link; + id.Link = result; + hln = id; + return true; + } + else + { + hln = id; + return true; + } + /* old code fails sometimes + * http://www.ftd.de/finanzen/maerkte/marktberichte/:boersenausblick-hoffnung-auf-jahresendrally-schwindet/50199183.html#utm_source=rss2&utm_medium=rss_feed&utm_campaign= + * Uri uri; if (Uri.TryCreate(webBrowser.Url, id.Link, out uri)) { @@ -1028,6 +1052,7 @@ hln = id; return true; } + */ } break; case HtmlInputType.Input: Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln =================================================================== --- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2011-02-02 13:55:02 UTC (rev 4088) +++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2011-02-02 15:18:54 UTC (rev 4089) @@ -3,16 +3,32 @@ # Visual Studio 2008 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseTheWeb", "BrowseTheWeb\BrowseTheWeb.csproj", "{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Skybound.Gecko", "Skybound.Gecko\Skybound.Gecko.csproj", "{877D1A24-2D5E-4C46-A933-FCF11EA0403B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug 1.8|Any CPU = Debug 1.8|Any CPU + Debug 1.9|Any CPU = Debug 1.9|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.ActiveCfg = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.8|Any CPU.Build.0 = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.ActiveCfg = Debug|Any CPU + {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug 1.9|Any CPU.Build.0 = Debug|Any CPU {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.Build.0 = Debug|Any CPU {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.ActiveCfg = Release|Any CPU {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Release|Any CPU.Build.0 = Release|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.ActiveCfg = Debug 1.8|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.8|Any CPU.Build.0 = Debug 1.8|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.ActiveCfg = Debug 1.9|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug 1.9|Any CPU.Build.0 = Debug 1.9|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {877D1A24-2D5E-4C46-A933-FCF11EA0403B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-02 13:55:09
|
Revision: 4088 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4088&view=rev Author: kroko_koenig Date: 2011-02-02 13:55:02 +0000 (Wed, 02 Feb 2011) Log Message: ----------- fixed settings, forwarding still not working Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java 2011-02-01 14:33:14 UTC (rev 4087) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java 2011-02-02 13:55:02 UTC (rev 4088) @@ -55,7 +55,7 @@ txtInstance.setText("Instance name (" + AppSettings.getInstance() + ")"); txtName.setText(AppSettings.getName()); - txtServer.setText(AppSettings.getServer()); + txtServer.setText(AppSettings.getSavedServer()); txtPort.setText(AppSettings.getPort()); txtMac.setText(AppSettings.getMacId()); } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-01 14:33:14 UTC (rev 4087) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-02 13:55:02 UTC (rev 4088) @@ -44,7 +44,20 @@ { return settings.getInt("Instance", 1); } - + public static String getSavedServer() + { + switch(getInstance()) + { + case 1: + return getServer1(); + case 2: + return getServer2(); + case 3: + return getServer3(); + } + + return null; + } public static String getServer() { String dns = ""; @@ -53,10 +66,13 @@ { case 1: dns = getServer1(); + break; case 2: dns = getServer2(); + break; case 3: dns = getServer3(); + break; } InetAddress in; Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java 2011-02-01 14:33:14 UTC (rev 4087) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/SAX_Parser.java 2011-02-02 13:55:02 UTC (rev 4088) @@ -49,8 +49,8 @@ try { HttpURLConnection conn = (HttpURLConnection) myFileUrl .openConnection(); - conn.setConnectTimeout(5000); - conn.setReadTimeout(10000); + //conn.setConnectTimeout(5000); + //conn.setReadTimeout(10000); conn.setRequestMethod("GET"); conn.setDoInput(true); conn.connect(); Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-01 14:33:22
|
Revision: 4087 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4087&view=rev Author: kroko_koenig Date: 2011-02-01 14:33:14 +0000 (Tue, 01 Feb 2011) Log Message: ----------- show dir also in music dirs, more doc Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 trunk/plugins/AndroidRemote/Release/Using Android Remote.docx trunk/plugins/AndroidRemote/Release/setup2.jpg trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-02-01 14:33:14 UTC (rev 4087) @@ -77,34 +77,34 @@ } public static final class id { public static final int GridView01=0x7f060014; - public static final int ImageView01=0x7f060027; - public static final int LinearLayout00=0x7f06005a; - public static final int LinearLayout01=0x7f06002e; - public static final int LinearLayout02=0x7f060065; - public static final int LinearLayout03=0x7f06006f; - public static final int LinearLayout04=0x7f060079; - public static final int LinearLayout05=0x7f06007f; - public static final int ListView01=0x7f06003c; - public static final int RadioGroup01=0x7f060094; - public static final int Spinner01=0x7f06008b; - public static final int SurfaceView01=0x7f06002d; + public static final int ImageView01=0x7f060028; + public static final int LinearLayout00=0x7f06005b; + public static final int LinearLayout01=0x7f06002f; + public static final int LinearLayout02=0x7f060066; + public static final int LinearLayout03=0x7f060070; + public static final int LinearLayout04=0x7f06007a; + public static final int LinearLayout05=0x7f060080; + public static final int ListView01=0x7f06003d; + public static final int RadioGroup01=0x7f060095; + public static final int Spinner01=0x7f06008c; + public static final int SurfaceView01=0x7f06002e; public static final int TableLayout01=0x7f060006; - public static final int TableLayout02=0x7f06004b; + public static final int TableLayout02=0x7f06004c; public static final int TableRow01=0x7f060007; - public static final int TableRow02=0x7f060050; - public static final int TableRow03=0x7f060055; + public static final int TableRow02=0x7f060051; + public static final int TableRow03=0x7f060056; public static final int TextView01=0x7f060003; public static final int TextView02=0x7f060004; - public static final int btnAlbumSelDown=0x7f060017; - public static final int btnAlbumSelUp=0x7f060019; - public static final int btnArtistSelDown=0x7f06001b; - public static final int btnArtistSelUp=0x7f06001d; - public static final int btnIpSettings=0x7f06008e; - public static final int btnResultSelDown=0x7f06001f; - public static final int btnResultSelUp=0x7f060021; - public static final int btnSelectSkin=0x7f06008d; - public static final int btnSongSelDown=0x7f060023; - public static final int btnSongSelUp=0x7f060025; + public static final int btnAlbumSelDown=0x7f060018; + public static final int btnAlbumSelUp=0x7f06001a; + public static final int btnArtistSelDown=0x7f06001c; + public static final int btnArtistSelUp=0x7f06001e; + public static final int btnIpSettings=0x7f06008f; + public static final int btnResultSelDown=0x7f060020; + public static final int btnResultSelUp=0x7f060022; + public static final int btnSelectSkin=0x7f06008e; + public static final int btnSongSelDown=0x7f060024; + public static final int btnSongSelUp=0x7f060026; public static final int btn_main_music=0x7f060009; public static final int btn_main_now_playing=0x7f06000c; public static final int btn_main_pictures=0x7f060008; @@ -114,129 +114,130 @@ public static final int btn_main_skp_back=0x7f06000f; public static final int btn_main_skp_forw=0x7f060011; public static final int btn_main_video=0x7f06000a; - public static final int btnkey01=0x7f06005b; - public static final int btnkey02=0x7f06005c; - public static final int btnkey03=0x7f06005d; - public static final int btnkey04=0x7f06005e; - public static final int btnkey05=0x7f06005f; - public static final int btnkey06=0x7f060060; - public static final int btnkey07=0x7f060061; - public static final int btnkey08=0x7f060062; - public static final int btnkey09=0x7f060063; - public static final int btnkey10=0x7f060064; - public static final int btnkey11=0x7f060066; - public static final int btnkey12=0x7f060067; - public static final int btnkey13=0x7f060068; - public static final int btnkey14=0x7f060069; - public static final int btnkey15=0x7f06006a; - public static final int btnkey16=0x7f06006b; - public static final int btnkey17=0x7f06006c; - public static final int btnkey18=0x7f06006d; - public static final int btnkey19=0x7f06006e; - public static final int btnkey20=0x7f060070; - public static final int btnkey21=0x7f060071; - public static final int btnkey22=0x7f060072; - public static final int btnkey23=0x7f060073; - public static final int btnkey24=0x7f060074; - public static final int btnkey25=0x7f060075; - public static final int btnkey26=0x7f060076; - public static final int btnkey27=0x7f060077; - public static final int btnkey28=0x7f060078; - public static final int btnkey29=0x7f06007a; - public static final int btnkey30=0x7f06007b; - public static final int btnkey31=0x7f06007c; - public static final int btnkey32=0x7f06007d; - public static final int btnkey33=0x7f06007e; - public static final int btnkey41=0x7f060080; - public static final int btnkey42=0x7f060081; - public static final int btnkey43=0x7f060082; - public static final int btnkey44=0x7f060083; - public static final int btnkey45=0x7f060084; - public static final int btnkey46=0x7f060085; - public static final int btnkey47=0x7f060086; - public static final int btnkey48=0x7f060087; - public static final int btnkey49=0x7f060088; - public static final int btnkey50=0x7f060089; - public static final int button_open=0x7f06002a; - public static final int button_stream=0x7f06002b; - public static final int button_stream_stop=0x7f06002c; - public static final int crtl_back=0x7f060048; - public static final int crtl_ch_m=0x7f060054; - public static final int crtl_ch_p=0x7f06004f; - public static final int crtl_down=0x7f060047; - public static final int crtl_full=0x7f060051; - public static final int crtl_info=0x7f060059; - public static final int crtl_left=0x7f060042; - public static final int crtl_menu=0x7f060053; - public static final int crtl_mp=0x7f06003e; - public static final int crtl_osd=0x7f060058; - public static final int crtl_parent=0x7f060046; - public static final int crtl_play=0x7f060052; - public static final int crtl_power=0x7f060040; - public static final int crtl_ratio=0x7f060057; - public static final int crtl_right=0x7f060044; - public static final int crtl_select=0x7f060043; - public static final int crtl_skip_back=0x7f06004c; - public static final int crtl_skip_forw=0x7f06004e; - public static final int crtl_stop=0x7f06004d; - public static final int crtl_sub=0x7f060056; - public static final int crtl_up=0x7f06003f; - public static final int crtl_vol_m=0x7f06004a; - public static final int crtl_vol_p=0x7f060049; - public static final int full_text=0x7f060026; + public static final int btnkey01=0x7f06005c; + public static final int btnkey02=0x7f06005d; + public static final int btnkey03=0x7f06005e; + public static final int btnkey04=0x7f06005f; + public static final int btnkey05=0x7f060060; + public static final int btnkey06=0x7f060061; + public static final int btnkey07=0x7f060062; + public static final int btnkey08=0x7f060063; + public static final int btnkey09=0x7f060064; + public static final int btnkey10=0x7f060065; + public static final int btnkey11=0x7f060067; + public static final int btnkey12=0x7f060068; + public static final int btnkey13=0x7f060069; + public static final int btnkey14=0x7f06006a; + public static final int btnkey15=0x7f06006b; + public static final int btnkey16=0x7f06006c; + public static final int btnkey17=0x7f06006d; + public static final int btnkey18=0x7f06006e; + public static final int btnkey19=0x7f06006f; + public static final int btnkey20=0x7f060071; + public static final int btnkey21=0x7f060072; + public static final int btnkey22=0x7f060073; + public static final int btnkey23=0x7f060074; + public static final int btnkey24=0x7f060075; + public static final int btnkey25=0x7f060076; + public static final int btnkey26=0x7f060077; + public static final int btnkey27=0x7f060078; + public static final int btnkey28=0x7f060079; + public static final int btnkey29=0x7f06007b; + public static final int btnkey30=0x7f06007c; + public static final int btnkey31=0x7f06007d; + public static final int btnkey32=0x7f06007e; + public static final int btnkey33=0x7f06007f; + public static final int btnkey41=0x7f060081; + public static final int btnkey42=0x7f060082; + public static final int btnkey43=0x7f060083; + public static final int btnkey44=0x7f060084; + public static final int btnkey45=0x7f060085; + public static final int btnkey46=0x7f060086; + public static final int btnkey47=0x7f060087; + public static final int btnkey48=0x7f060088; + public static final int btnkey49=0x7f060089; + public static final int btnkey50=0x7f06008a; + public static final int button_open=0x7f06002b; + public static final int button_stream=0x7f06002c; + public static final int button_stream_stop=0x7f06002d; + public static final int crtl_back=0x7f060049; + public static final int crtl_ch_m=0x7f060055; + public static final int crtl_ch_p=0x7f060050; + public static final int crtl_down=0x7f060048; + public static final int crtl_full=0x7f060052; + public static final int crtl_info=0x7f06005a; + public static final int crtl_left=0x7f060043; + public static final int crtl_menu=0x7f060054; + public static final int crtl_mp=0x7f06003f; + public static final int crtl_osd=0x7f060059; + public static final int crtl_parent=0x7f060047; + public static final int crtl_play=0x7f060053; + public static final int crtl_power=0x7f060041; + public static final int crtl_ratio=0x7f060058; + public static final int crtl_right=0x7f060045; + public static final int crtl_select=0x7f060044; + public static final int crtl_skip_back=0x7f06004d; + public static final int crtl_skip_forw=0x7f06004f; + public static final int crtl_stop=0x7f06004e; + public static final int crtl_sub=0x7f060057; + public static final int crtl_up=0x7f060040; + public static final int crtl_vol_m=0x7f06004b; + public static final int crtl_vol_p=0x7f06004a; + public static final int full_text=0x7f060027; public static final int icon_image=0x7f060001; public static final int icon_text=0x7f060002; - public static final int list_album=0x7f060016; - public static final int list_artist=0x7f06001a; - public static final int list_result=0x7f06001e; - public static final int list_song=0x7f060022; + public static final int list_album=0x7f060017; + public static final int list_artist=0x7f06001b; + public static final int list_result=0x7f06001f; + public static final int list_song=0x7f060023; public static final int main_instance=0x7f060005; public static final int main_now_playing=0x7f06000e; - public static final int music_grid=0x7f060015; - public static final int now_album=0x7f060030; - public static final int now_artist=0x7f060036; - public static final int now_cd=0x7f060031; - public static final int now_list=0x7f06003b; - public static final int now_next=0x7f06003a; - public static final int now_play=0x7f060039; - public static final int now_playing=0x7f06002f; - public static final int now_playing_right=0x7f060034; - public static final int now_playing_t_left=0x7f060033; - public static final int now_prev=0x7f060037; - public static final int now_progress=0x7f060032; - public static final int now_stop=0x7f060038; - public static final int now_title=0x7f060035; - public static final int radio01=0x7f06009d; - public static final int radio02=0x7f06009e; - public static final int radio03=0x7f06009f; - public static final int radio04=0x7f0600a0; - public static final int radioStop=0x7f0600a1; - public static final int selectSkin1=0x7f060095; - public static final int selectSkin2=0x7f060097; - public static final int selectSkin3=0x7f060099; - public static final int server_ip=0x7f060091; - public static final int server_macid=0x7f060093; - public static final int server_name=0x7f060090; - public static final int server_port=0x7f060092; - public static final int splash=0x7f06009b; - public static final int text_kb_streamed=0x7f060028; - public static final int title=0x7f06009c; - public static final int txtDbAlbum=0x7f060018; - public static final int txtDbArtist=0x7f06001c; - public static final int txtDbResult=0x7f060020; - public static final int txtDbSong=0x7f060024; + public static final int music_grid=0x7f060016; + public static final int now_album=0x7f060031; + public static final int now_artist=0x7f060037; + public static final int now_cd=0x7f060032; + public static final int now_list=0x7f06003c; + public static final int now_next=0x7f06003b; + public static final int now_play=0x7f06003a; + public static final int now_playing=0x7f060030; + public static final int now_playing_right=0x7f060035; + public static final int now_playing_t_left=0x7f060034; + public static final int now_prev=0x7f060038; + public static final int now_progress=0x7f060033; + public static final int now_stop=0x7f060039; + public static final int now_title=0x7f060036; + public static final int radio01=0x7f06009e; + public static final int radio02=0x7f06009f; + public static final int radio03=0x7f0600a0; + public static final int radio04=0x7f0600a1; + public static final int radioStop=0x7f0600a2; + public static final int selectSkin1=0x7f060096; + public static final int selectSkin2=0x7f060098; + public static final int selectSkin3=0x7f06009a; + public static final int server_ip=0x7f060092; + public static final int server_macid=0x7f060094; + public static final int server_name=0x7f060091; + public static final int server_port=0x7f060093; + public static final int splash=0x7f06009c; + public static final int text_kb_streamed=0x7f060029; + public static final int title=0x7f06009d; + public static final int txtDbAlbum=0x7f060019; + public static final int txtDbArtist=0x7f06001d; + public static final int txtDbResult=0x7f060021; + public static final int txtDbSong=0x7f060025; + public static final int txtDirMusic=0x7f060015; public static final int txtDirectory=0x7f060013; - public static final int txtFile=0x7f060029; - public static final int txtIntanceName=0x7f06008f; - public static final int txtVersion=0x7f06008a; - public static final int vibration=0x7f06008c; - public static final int visitHome1=0x7f060096; - public static final int visitHome2=0x7f060098; - public static final int visitHome3=0x7f06009a; + public static final int txtFile=0x7f06002a; + public static final int txtIntanceName=0x7f060090; + public static final int txtVersion=0x7f06008b; + public static final int vibration=0x7f06008d; + public static final int visitHome1=0x7f060097; + public static final int visitHome2=0x7f060099; + public static final int visitHome3=0x7f06009b; public static final int widget0=0x7f060012; - public static final int widget00=0x7f06003d; - public static final int widget01=0x7f060041; - public static final int widget02=0x7f060045; + public static final int widget00=0x7f06003e; + public static final int widget01=0x7f060042; + public static final int widget02=0x7f060046; public static final int widget44=0x7f060000; } public static final class layout { Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music.xml 2011-02-01 14:33:14 UTC (rev 4087) @@ -1,6 +1,13 @@ -<AbsoluteLayout android:id="@+id/widget0" +<LinearLayout android:id="@+id/widget0" android:layout_width="fill_parent" android:layout_height="wrap_content" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical"> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="Actual: ..." + android:textColor="#FFFFFFFF" android:textSize="20dip" android:id="@+id/txtDirMusic" + android:paddingBottom="5dip"></TextView> + <GridView android:layout_y="0dip" android:layout_x="0dip" android:id="@+id/music_grid" android:layout_width="fill_parent" android:layout_height="fill_parent" android:columnWidth="90dp" @@ -8,5 +15,5 @@ android:horizontalSpacing="10dp" android:stretchMode="columnWidth" android:gravity="center"> </GridView> -</AbsoluteLayout> +</LinearLayout> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/pictures.xml 2011-02-01 14:33:14 UTC (rev 4087) @@ -1,6 +1,7 @@ <LinearLayout android:id="@+id/widget0" android:layout_width="fill_parent" android:layout_height="wrap_content" - xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical"> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout-large/main.xml 2011-02-01 14:33:14 UTC (rev 4087) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="fill_parent" + android:layout_height="fill_parent"> + +<TextView android:layout_height="wrap_content" android:text="HTPC" android:textColor="#FF000000" android:textStyle="bold" android:gravity="center_horizontal" android:background="#FFA9A9A9" android:layout_width="fill_parent" android:id="@+id/main_instance" android:textSize="28dip"></TextView> + +<TableLayout + android:id="@+id/TableLayout01" + xmlns:android="http://schemas.android.com/apk/res/android" + + android:layout_height="wrap_content" + android:layout_width="wrap_content" android:layout_gravity="center_horizontal"> + + +<TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01"> + + <Button android:scaleType="fitXY" + android:layout_marginRight="40dip" android:padding="5dip" android:id="@+id/btn_main_pictures" android:background="@drawable/ic_menu_skin1_pictures" android:layout_height="120dip" android:layout_width="120dip"> + </Button> + + <Button android:scaleType="fitXY" android:padding="5dip" + android:id="@+id/btn_main_music" android:background="@drawable/ic_menu_skin1_music" android:layout_height="120dip" android:layout_width="120dip"> + </Button> + + </TableRow> + + <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01"> + + <Button android:scaleType="fitXY" + android:padding="5dip" android:layout_marginRight="40dip" android:id="@+id/btn_main_video" android:background="@drawable/ic_menu_skin1_video" android:layout_height="120dip" android:layout_width="120dip"> + </Button> + + <Button android:layout_width="80dip" + android:scaleType="fitXY" android:padding="5dip" android:id="@+id/btn_main_remote" android:background="@drawable/ic_menu_skin1_remote" android:layout_height="120dip"> + </Button> + + +</TableRow> + + <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dip" android:id="@+id/TableRow01"> + + <Button android:scaleType="fitXY" + android:padding="5dip" android:layout_marginRight="40dip" android:id="@+id/btn_main_now_playing" android:background="@drawable/ic_menu_skin1_now_playing" android:layout_height="120dip" android:layout_width="120dip"> + </Button> + + <Button android:scaleType="fitXY" android:padding="5dip" android:background="@drawable/ic_menu_skin1_plugins" android:id="@+id/btn_main_plugins" android:layout_height="120dip" android:layout_width="120dip"> + </Button> + + </TableRow> + +</TableLayout> + + <TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="nothing playing" + android:gravity="center_horizontal" android:textColor="#FF000000" android:textColorHighlight="#FFFFFFFF" android:background="#FFA9A9A9" android:padding="5dip" android:id="@+id/main_now_playing" android:textSize="24dip"> + </TextView> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="wrap_content" android:layout_gravity="center_horizontal" android:layout_height="wrap_content" android:padding="5dip"> + + + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_back" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_skip_backward" android:layout_height="80dip" android:layout_width="80dip"></Button> + <ImageButton android:scaleType="fitXY" + android:id="@+id/btn_main_play" android:padding="2dip" android:layout_marginRight="5dip" android:background="@drawable/ic_menu_skin1_play" android:layout_height="80dip" android:layout_width="80dip"></ImageButton> + <Button android:scaleType="fitXY" + android:id="@+id/btn_main_skp_forw" android:padding="2dip" android:background="@drawable/ic_menu_skin1_skip_forward" android:layout_height="80dip" android:layout_width="80dip"></Button> +</LinearLayout> +</LinearLayout> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-02-01 14:33:14 UTC (rev 4087) @@ -81,7 +81,7 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.main); - + btnPlay = (ImageButton) findViewById(R.id.btn_main_play); btnSkipBack = (Button) findViewById(R.id.btn_main_skp_back); btnSkipForw = (Button) findViewById(R.id.btn_main_skp_forw); Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-02-01 14:33:14 UTC (rev 4087) @@ -281,6 +281,17 @@ } } + String dsp = actualDir; + int len = dsp.length(); + + if (dsp == "") + dsp = "root"; + if (len > 25) + dsp = "..." + dsp.substring(len - 20, len); + + TextView txt = (TextView) findViewById(R.id.txtDirMusic); + txt.setText("Act: " + dsp); + if (musicList == null) { Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT).show(); Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/AppSettings.java 2011-02-01 14:33:14 UTC (rev 4087) @@ -21,7 +21,11 @@ package mediaportal.remote.utils; +import java.net.InetAddress; +import java.net.UnknownHostException; + import android.content.SharedPreferences; +import android.util.Log; public class AppSettings{ @@ -43,16 +47,31 @@ public static String getServer() { + String dns = ""; + switch(getInstance()) { case 1: - return getServer1(); + dns = getServer1(); case 2: - return getServer2(); + dns = getServer2(); case 3: - return getServer3(); + dns = getServer3(); } - return ""; + + InetAddress in; + try { + in = InetAddress.getByName(dns); + Log.d("MediaPortal", "IP lookup : " + in.getHostAddress()); + + dns = in.getHostAddress(); + + } catch (UnknownHostException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + return dns; } public static String getPort() { Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/Using Android Remote.docx =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/setup2.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.Designer.cs 2011-02-01 14:33:14 UTC (rev 4087) @@ -39,8 +39,9 @@ this.btnSave = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.txtVlc = new System.Windows.Forms.Label(); this.btnBrowse = new System.Windows.Forms.Button(); - this.txtVlc = new System.Windows.Forms.Label(); + this.txtVersion = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.SuspendLayout(); @@ -160,16 +161,6 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "Streaming Profile"; // - // btnBrowse - // - this.btnBrowse.Location = new System.Drawing.Point(287, 19); - this.btnBrowse.Name = "btnBrowse"; - this.btnBrowse.Size = new System.Drawing.Size(137, 23); - this.btnBrowse.TabIndex = 0; - this.btnBrowse.Text = "Browse profiles"; - this.btnBrowse.UseVisualStyleBackColor = true; - this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); - // // txtVlc // this.txtVlc.BackColor = System.Drawing.Color.White; @@ -182,11 +173,31 @@ this.txtVlc.Text = "Profile"; this.txtVlc.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // btnBrowse + // + this.btnBrowse.Location = new System.Drawing.Point(287, 19); + this.btnBrowse.Name = "btnBrowse"; + this.btnBrowse.Size = new System.Drawing.Size(137, 23); + this.btnBrowse.TabIndex = 0; + this.btnBrowse.Text = "Browse profiles"; + this.btnBrowse.UseVisualStyleBackColor = true; + this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click); + // + // txtVersion + // + this.txtVersion.Location = new System.Drawing.Point(385, 189); + this.txtVersion.Name = "txtVersion"; + this.txtVersion.Size = new System.Drawing.Size(117, 23); + this.txtVersion.TabIndex = 4; + this.txtVersion.Text = "Version 0.1.0.0"; + this.txtVersion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // Setup // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(514, 227); + this.Controls.Add(this.txtVersion); this.Controls.Add(this.groupBox2); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); @@ -223,5 +234,6 @@ private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Button btnBrowse; private System.Windows.Forms.Label txtVlc; + private System.Windows.Forms.Label txtVersion; } } \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-02-01 07:07:30 UTC (rev 4086) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Setup.cs 2011-02-01 14:33:14 UTC (rev 4087) @@ -54,6 +54,8 @@ txtMyIP.Text = IPHost.AddressList[0].ToString(); else txtMyIP.Text = "no IP adress !"; + + txtVersion.Text = GetVersion(); } private void LoadSettings() @@ -96,7 +98,7 @@ private void Setup_FormClosing(object sender, FormClosingEventArgs e) { - + } private void btnBrowse_Click(object sender, EventArgs e) @@ -113,7 +115,13 @@ { txtVlc.Text = Path.GetFileName(openFile1.FileName); } + } + private string GetVersion() + { + Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + return ("Version : " + v.Major + "." + v.Minor + "." + v.Build + "." + v.Revision); } + } } Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-02-01 07:07:37
|
Revision: 4086 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4086&view=rev Author: kroko_koenig Date: 2011-02-01 07:07:30 +0000 (Tue, 01 Feb 2011) Log Message: ----------- add installer for MP Modified Paths: -------------- trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Added Paths: ----------- trunk/plugins/AndroidRemote/Release/AndroidRemote.xml Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1 =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Release/AndroidRemote.xml =================================================================== --- trunk/plugins/AndroidRemote/Release/AndroidRemote.xml (rev 0) +++ trunk/plugins/AndroidRemote/Release/AndroidRemote.xml 2011-02-01 07:07:30 UTC (rev 4086) @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="utf-8"?> +<ExtensionCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <Items> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Default"> + <DisplayName>Default</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Default</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items /> + </Dependencies> + <GeneralInfo> + <Name>Android Remote</Name> + <Id>d29419c3-1176-48fd-bed5-599a4ec93b7b</Id> + <Author>Mark Koenig (kroko) 2010</Author> + <HomePage>http://forum.team-mediaportal.com/</HomePage> + <ForumPage>http://forum.team-mediaportal.com/webservice-mobile-access-537/plugin-android-remote-89895/</ForumPage> + <UpdateUrl /> + <Version> + <Major>0</Major> + <Minor>2</Minor> + <Build>3</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control. +Gfx has been done by oddfella and some additional coding is from rolls1400. + +Have fun.</ExtensionDescription> + <VersionDescription>add support for huge databases +/- buttons, prepare 2nd skin</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation /> + <ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate> + <Tags>android,remote</Tags> + <Location>C:\AAA\AndroidRemote2\Release\AndroidRemote.mpe1</Location> + <Params> + <Items> + <SectionParam Name="Icon"> + <Value /> + <ValueType>File</ValueType> + <Description>The icon file of the package (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Online Icon"> + <Value /> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value /> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>yes</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Default"> + <DisplayName>Default</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Default</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items /> + </Dependencies> + <GeneralInfo> + <Name>Android Remote</Name> + <Id>d29419c3-1176-48fd-bed5-599a4ec93b7b</Id> + <Author>Mark Koenig (kroko) 2010</Author> + <HomePage>http://forum.team-mediaportal.com/</HomePage> + <ForumPage>http://forum.team-mediaportal.com/webservice-mobile-access-537/plugin-android-remote-89895/</ForumPage> + <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/AndroidRemote/Release/AndroidRemote.xml</UpdateUrl> + <Version> + <Major>0</Major> + <Minor>2</Minor> + <Build>4</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control. +Gfx has been done by oddfella and some additional coding is from rolls1400. + +Have fun.</ExtensionDescription> + <VersionDescription>small fixes</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1</OnlineLocation> + <ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate> + <Tags>android,remote</Tags> + <Location>C:\AAA\AndroidRemote2\Release\AndroidRemote.mpe1</Location> + <Params> + <Items> + <SectionParam Name="Icon"> + <Value /> + <ValueType>File</ValueType> + <Description>The icon file of the package (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Online Icon"> + <Value /> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value /> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If have .exe extension the will be executed + If have .dll extension used like MP plugin configuration</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value /> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>yes</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + </PackageClass> + </Items> +</ExtensionCollection> \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 =================================================================== --- trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2011-01-31 22:03:04 UTC (rev 4085) +++ trunk/plugins/AndroidRemote/Release/AndroidRemote.xmp2 2011-02-01 07:07:30 UTC (rev 4086) @@ -156,20 +156,20 @@ <Author>Mark Koenig (kroko) 2010</Author> <HomePage>http://forum.team-mediaportal.com/</HomePage> <ForumPage>http://forum.team-mediaportal.com/webservice-mobile-access-537/plugin-android-remote-89895/</ForumPage> - <UpdateUrl /> + <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/AndroidRemote/Release/AndroidRemote.xml</UpdateUrl> <Version> <Major>0</Major> <Minor>2</Minor> - <Build>3</Build> + <Build>4</Build> <Revision>0</Revision> </Version> <ExtensionDescription>Control your MediaPortal with yout Android. It can be used as a remote control or doing many other things like music, pictures and video control. Gfx has been done by oddfella and some additional coding is from rolls1400. Have fun.</ExtensionDescription> - <VersionDescription>add support for huge databases +/- buttons, prepare 2nd skin</VersionDescription> + <VersionDescription>small fixes</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> - <OnlineLocation /> + <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/AndroidRemote/Release/AndroidRemote.mpe1</OnlineLocation> <ReleaseDate>2010-12-09T16:17:18.1693243+01:00</ReleaseDate> <Tags>android,remote</Tags> <Location>C:\AAA\AndroidRemote2\Release\AndroidRemote.mpe1</Location> @@ -240,5 +240,8 @@ <ProjectSettings> <FolderGroups /> <ProjectFilename>C:\AAA\AndroidRemote2\Release\AndroidRemote.xmp2</ProjectFilename> + <UpdatePath1>C:\AAA\AndroidRemote2\Release\AndroidRemote.xml</UpdatePath1> + <UpdatePath2 /> + <UpdatePath3 /> </ProjectSettings> </PackageClass> \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2011-01-31 22:03:04 UTC (rev 4085) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2011-02-01 07:07:30 UTC (rev 4086) @@ -32,5 +32,5 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.1.0")] -[assembly: AssemblyFileVersion("0.2.1.0")] +[assembly: AssemblyVersion("0.2.4.0")] +[assembly: AssemblyFileVersion("0.2.4.0")] Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-01-31 22:03:10
|
Revision: 4085 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4085&view=rev Author: kroko_koenig Date: 2011-01-31 22:03:04 +0000 (Mon, 31 Jan 2011) Log Message: ----------- Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowPlaying/NowPlayingList.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java trunk/plugins/AndroidRemote/Release/remote3.jpg trunk/plugins/AndroidRemote/Release/settings.jpg trunk/plugins/AndroidRemote/Release/settings2.jpg Added Paths: ----------- trunk/plugins/AndroidRemote/Release/Using Android Remote.docx trunk/plugins/AndroidRemote/Release/options.jpg trunk/plugins/AndroidRemote/Release/pictures_folder.jpg trunk/plugins/AndroidRemote/Release/playlist_option.jpg trunk/plugins/AndroidRemote/Release/settings3.jpg Removed Paths: ------------- trunk/plugins/AndroidRemote/Release/main_menu.jpg Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2011-01-30 19:59:10 UTC (rev 4084) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/readme 2011-01-31 22:03:04 UTC (rev 4085) @@ -1,23 +1,28 @@ General ------- Control up to 3 Mediaportal -Wake On Lan from the remote -switch off / hibernate etc. your MP from the remote -vibration feedback +WakeOnLan from the remote control (press short on power button) +switch off / hibernate etc. your MP from the remote (press long on power button) +optional vibration feedback show what actual playing on the main screen and pause / skip control -uses VLC to stream to the phone -send crash report +uses VLC on the pc side to stream video to the phone (fast processor needed) +send crash report if terminated by exception +different skins Pictures section ---------------- browse folders (MP shares) display thumbs (threaded) -save to sd -open browser +save pictures to SD card +open browser with picture send picture via MMS -slide show -random slide show +slide show of a folder +random slide show of all pictures +in fullscreen you can swipe left right in the directory +touch long for options +touch short to stop slideshow + Music section ------------- browse folders (MP shares) @@ -56,16 +61,11 @@ Main issues ------------ switch WIFI on (just msg now) -save files from Android to MP -progress task for downloads +progress task for downloads (0...100%) NowPlaying list show actual / count of items on top bar -add gfx +add skins +browsing pictues make slideshow available onlongclick a folder +adjustable time delay for slideshow +sending commands threaded -- fix for folder like //pictures//pictures//bla... -- fix display folder %20 -- pointer for thumb caching always to zero on execute fetching -- removed brush to have better contrast -- add profiles for vlc (server) -- use video extensions list - Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-01-30 19:59:10 UTC (rev 4084) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-01-31 22:03:04 UTC (rev 4085) @@ -222,7 +222,7 @@ switch (keyCode) { case KeyEvent.KEYCODE_MENU: { - final CharSequence[] items = { "Global Settings", "IP Settings", + final CharSequence[] items = { "Global settings", "IP settings", "Switch HTPC", "Exit" }; AlertDialog.Builder builder = new AlertDialog.Builder(Main.this); Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowPlaying/NowPlayingList.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowPlaying/NowPlayingList.java 2011-01-30 19:59:10 UTC (rev 4084) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowPlaying/NowPlayingList.java 2011-01-31 22:03:04 UTC (rev 4085) @@ -49,7 +49,7 @@ private Handler mHandler = new Handler(); final CharSequence[] items = { "Play item", "Remove item", - "Clear playlist", "Cancel" }; + "Clear playlist"}; private static ArrayList<PlayListItem> PlayListItems; private NowPlayingListXmlHandler.PlayListItem selectedItem; Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java 2011-01-30 19:59:10 UTC (rev 4084) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/utils/TopExceptionHandler.java 2011-01-31 22:03:04 UTC (rev 4085) @@ -59,7 +59,7 @@ } report += "-------------------------------\n\n"; - report += "Remote Version : 26.01 / 21:00\n\n"; + report += "Remote Version : 1.2\n\n"; report += "-------------------------------\n\n"; report += "--------- Device ---------\n\n"; report += "Brand: " + Build.BRAND + "\n"; Added: trunk/plugins/AndroidRemote/Release/Using Android Remote.docx =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/Using Android Remote.docx ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/plugins/AndroidRemote/Release/main_menu.jpg =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Release/options.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/options.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Release/pictures_folder.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/pictures_folder.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/plugins/AndroidRemote/Release/playlist_option.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/playlist_option.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Release/remote3.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/settings.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/settings2.jpg =================================================================== (Binary files differ) Added: trunk/plugins/AndroidRemote/Release/settings3.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/settings3.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-01-30 19:59:20
|
Revision: 4084 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4084&view=rev Author: kroko_koenig Date: 2011-01-30 19:59:10 +0000 (Sun, 30 Jan 2011) Log Message: ----------- some fixes and playlist (not 100%) Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/HttpHandler.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/MusicHandler.cs trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Added Paths: ----------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin1_file_playlist.png trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java trunk/plugins/AndroidRemote/Release/skins.jpg Removed Paths: ------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Setup_ip.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2011-01-30 19:59:10 UTC (rev 4084) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="mediaportal.remote" android:versionName="1.1" android:versionCode="1"> + package="mediaportal.remote" android:versionCode="1" android:versionName="1.2"> <application android:icon="@drawable/ic_launcher_icon" android:theme="@android:style/Theme.NoTitleBar" @@ -15,13 +15,13 @@ </activity> <activity android:launchMode="singleInstance" android:name=".Splash"></activity> <activity android:launchMode="singleInstance" android:name=".control.Remote_01"></activity> - <activity android:launchMode="singleInstance" android:name=".control.Remote_02"></activity> + <activity android:launchMode="singleInstance" android:name=".control.Remote_03"></activity> <activity android:launchMode="singleInstance" android:name=".pictures.Pictures"></activity> <activity android:launchMode="singleInstance" android:name=".pictures.Picturesfullscreen"></activity> <activity android:launchMode="singleInstance" android:name=".music.MusicDir"></activity> - <activity android:launchMode="singleInstance" android:name="Setup"></activity> - <activity android:launchMode="singleInstance" android:name="Setup_ip"></activity> + <activity android:launchMode="singleInstance" android:name=".setup.Setup"></activity> + <activity android:launchMode="singleInstance" android:name=".setup.Setup_ip"></activity> <activity android:launchMode="singleInstance" android:name=".nowPlaying.NowPlaying"></activity> <activity android:launchMode="singleInstance" android:name=".nowPlaying.NowPlayingList"></activity> <activity android:launchMode="singleInstance" android:name=".music.MusicArtist"></activity> @@ -32,6 +32,7 @@ <activity android:launchMode="singleInstance" android:name=".multimedia.Webradio"></activity> <activity android:name=".MediaPlayerControl" android:launchMode="singleInstance"></activity> <activity android:name=".movies.Movies" android:launchMode="singleInstance"></activity> + <activity android:launchMode="singleInstance" android:name=".setup.SelectSkin"></activity> </application> <uses-sdk android:minSdkVersion="3" /> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/gen/mediaportal/remote/R.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -60,19 +60,20 @@ public static final int ic_skin1_file_folderback=0x7f02002b; public static final int ic_skin1_file_movie=0x7f02002c; public static final int ic_skin1_file_picture=0x7f02002d; - public static final int ic_skin1_splash=0x7f02002e; - public static final int ic_tab_album=0x7f02002f; - public static final int ic_tab_album_off=0x7f020030; - public static final int ic_tab_album_on=0x7f020031; - public static final int ic_tab_artist=0x7f020032; - public static final int ic_tab_artist_off=0x7f020033; - public static final int ic_tab_artist_on=0x7f020034; - public static final int ic_tab_music=0x7f020035; - public static final int ic_tab_music_off=0x7f020036; - public static final int ic_tab_music_on=0x7f020037; - public static final int ic_tab_song=0x7f020038; - public static final int ic_tab_song_off=0x7f020039; - public static final int ic_tab_song_on=0x7f02003a; + public static final int ic_skin1_file_playlist=0x7f02002e; + public static final int ic_skin1_splash=0x7f02002f; + public static final int ic_tab_album=0x7f020030; + public static final int ic_tab_album_off=0x7f020031; + public static final int ic_tab_album_on=0x7f020032; + public static final int ic_tab_artist=0x7f020033; + public static final int ic_tab_artist_off=0x7f020034; + public static final int ic_tab_artist_on=0x7f020035; + public static final int ic_tab_music=0x7f020036; + public static final int ic_tab_music_off=0x7f020037; + public static final int ic_tab_music_on=0x7f020038; + public static final int ic_tab_song=0x7f020039; + public static final int ic_tab_song_off=0x7f02003a; + public static final int ic_tab_song_on=0x7f02003b; } public static final class id { public static final int GridView01=0x7f060014; @@ -84,7 +85,8 @@ public static final int LinearLayout04=0x7f060079; public static final int LinearLayout05=0x7f06007f; public static final int ListView01=0x7f06003c; - public static final int Spinner01=0x7f06008a; + public static final int RadioGroup01=0x7f060094; + public static final int Spinner01=0x7f06008b; public static final int SurfaceView01=0x7f06002d; public static final int TableLayout01=0x7f060006; public static final int TableLayout02=0x7f06004b; @@ -97,9 +99,10 @@ public static final int btnAlbumSelUp=0x7f060019; public static final int btnArtistSelDown=0x7f06001b; public static final int btnArtistSelUp=0x7f06001d; - public static final int btnIpSettings=0x7f06008c; + public static final int btnIpSettings=0x7f06008e; public static final int btnResultSelDown=0x7f06001f; public static final int btnResultSelUp=0x7f060021; + public static final int btnSelectSkin=0x7f06008d; public static final int btnSongSelDown=0x7f060023; public static final int btnSongSelUp=0x7f060025; public static final int btn_main_music=0x7f060009; @@ -203,26 +206,33 @@ public static final int now_progress=0x7f060032; public static final int now_stop=0x7f060038; public static final int now_title=0x7f060035; - public static final int radio01=0x7f060094; - public static final int radio02=0x7f060095; - public static final int radio03=0x7f060096; - public static final int radio04=0x7f060097; - public static final int radioStop=0x7f060098; - public static final int server_ip=0x7f06008f; - public static final int server_macid=0x7f060091; - public static final int server_name=0x7f06008e; - public static final int server_port=0x7f060090; - public static final int splash=0x7f060092; + public static final int radio01=0x7f06009d; + public static final int radio02=0x7f06009e; + public static final int radio03=0x7f06009f; + public static final int radio04=0x7f0600a0; + public static final int radioStop=0x7f0600a1; + public static final int selectSkin1=0x7f060095; + public static final int selectSkin2=0x7f060097; + public static final int selectSkin3=0x7f060099; + public static final int server_ip=0x7f060091; + public static final int server_macid=0x7f060093; + public static final int server_name=0x7f060090; + public static final int server_port=0x7f060092; + public static final int splash=0x7f06009b; public static final int text_kb_streamed=0x7f060028; - public static final int title=0x7f060093; + public static final int title=0x7f06009c; public static final int txtDbAlbum=0x7f060018; public static final int txtDbArtist=0x7f06001c; public static final int txtDbResult=0x7f060020; public static final int txtDbSong=0x7f060024; public static final int txtDirectory=0x7f060013; public static final int txtFile=0x7f060029; - public static final int txtIntanceName=0x7f06008d; - public static final int vibration=0x7f06008b; + public static final int txtIntanceName=0x7f06008f; + public static final int txtVersion=0x7f06008a; + public static final int vibration=0x7f06008c; + public static final int visitHome1=0x7f060096; + public static final int visitHome2=0x7f060098; + public static final int visitHome3=0x7f06009a; public static final int widget0=0x7f060012; public static final int widget00=0x7f06003d; public static final int widget01=0x7f060041; @@ -250,9 +260,10 @@ public static final int remote03b=0x7f030011; public static final int setup=0x7f030012; public static final int setup_ip=0x7f030013; - public static final int splash=0x7f030014; - public static final int title=0x7f030015; - public static final int webradio=0x7f030016; + public static final int skin=0x7f030014; + public static final int splash=0x7f030015; + public static final int title=0x7f030016; + public static final int webradio=0x7f030017; } public static final class string { public static final int app_name=0x7f040000; Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin1_file_playlist.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/drawable/ic_skin1_file_playlist.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/setup.xml 2011-01-30 19:59:10 UTC (rev 4084) @@ -6,13 +6,19 @@ <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:textSize="24dip" android:text="Global settings" android:paddingBottom="10dip" android:textColor="#FFFFFFFF"></TextView> - <TextView android:layout_width="fill_parent" - android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF"></TextView> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFFFF" android:text="Version" android:id="@+id/txtVersion"></TextView><TextView android:layout_width="fill_parent" + android:layout_height="wrap_content" android:textSize="18dip" android:text="Power Mode" android:textColor="#FFFFFFFF" android:layout_marginTop="10dip"></TextView> <Spinner android:id="@+id/Spinner01" android:layout_width="fill_parent" android:layout_height="wrap_content"></Spinner> <CheckBox android:layout_width="wrap_content" - android:layout_height="wrap_content" android:textSize="18dip" android:id="@+id/vibration" android:text="use vibration feedback" android:textColor="#FFFFFFFF"></CheckBox><Button android:layout_height="wrap_content" android:id="@+id/btnIpSettings" android:text="IP settings" android:layout_width="fill_parent" android:layout_marginTop="20dip"></Button> + android:layout_height="wrap_content" android:textSize="18dip" android:id="@+id/vibration" android:text="use vibration feedback" android:textColor="#FFFFFFFF"></CheckBox> + <Button android:layout_height="wrap_content" android:id="@+id/btnSelectSkin" + android:text="Select skin" android:layout_width="fill_parent" + android:layout_marginTop="20dip" android:textSize="18dip"> + </Button> + + </LinearLayout> Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/skin.xml 2011-01-30 19:59:10 UTC (rev 4084) @@ -0,0 +1,30 @@ +<LinearLayout android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> +<TextView android:id="@+id/TextView01" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="Select skin" android:textColor="#FFFFFFFF" android:layout_marginTop="5dip" android:textSize="24dip"></TextView> + + <RadioGroup android:id="@+id/RadioGroup01" android:layout_height="wrap_content" android:layout_width="fill_parent"> + + <LinearLayout android:id="@+id/LinearLayout02" android:layout_height="wrap_content" android:layout_width="fill_parent"> + <RadioButton android:id="@+id/selectSkin1" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left" android:layout_weight="1" android:checked="true" android:text="dark skin ( by inspirement )"> + </RadioButton> + <Button android:id="@+id/visitHome1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Homepage" android:layout_marginLeft="10dip" android:layout_gravity="right"></Button> + +</LinearLayout> + + <LinearLayout android:id="@+id/LinearLayout02" android:layout_height="wrap_content" android:layout_width="fill_parent"> + <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="left" android:layout_weight="1" android:id="@+id/selectSkin2" android:text="Skin2 ( by someone )"> + </RadioButton> + <Button android:id="@+id/visitHome2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Homepage" android:layout_marginLeft="10dip" android:layout_gravity="right"></Button> + </LinearLayout> + + <LinearLayout android:id="@+id/LinearLayout02" android:layout_height="wrap_content" android:layout_width="fill_parent"> + <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="left" android:layout_weight="1" android:id="@+id/selectSkin3" android:text="Skin3 ( by someone )"> + </RadioButton> + <Button android:id="@+id/visitHome3" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Homepage" android:layout_marginLeft="10dip" android:layout_gravity="right"></Button> + </LinearLayout> + +</RadioGroup> + +</LinearLayout> Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Setup_ip.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Setup_ip.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Setup_ip.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2005-2011 Team MediaPortal - * http://www.team-mediaportal.com - * - * 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 2, 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 GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -package mediaportal.remote; - -import mediaportal.remote.R; -import mediaportal.remote.utils.AppSettings; -import android.app.Activity; -import android.os.Bundle; -import android.widget.EditText; -import android.widget.TextView; - -public class Setup_ip extends Activity { - - private TextView txtInstance; - private EditText txtName; - private EditText txtServer; - private EditText txtPort; - private EditText txtMac; - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - setContentView(R.layout.setup_ip); - - txtInstance = (TextView) findViewById(R.id.txtIntanceName); - txtName = (EditText) findViewById(R.id.server_name); - txtServer = (EditText) findViewById(R.id.server_ip); - txtPort = (EditText) findViewById(R.id.server_port); - txtMac = (EditText) findViewById(R.id.server_macid); - } - - @Override - public void onResume() { - super.onResume(); - - txtInstance.setText("Instance name (" + AppSettings.getInstance() + ")"); - txtName.setText(AppSettings.getName()); - txtServer.setText(AppSettings.getServer()); - txtPort.setText(AppSettings.getPort()); - txtMac.setText(AppSettings.getMacId()); - } - - @Override - public void onPause() { - super.onPause(); - - AppSettings.setName(txtName.getText().toString()); - AppSettings.setServer(txtServer.getText().toString()); - AppSettings.setPort(txtPort.getText().toString()); - AppSettings.setMacId(txtMac.getText().toString()); - } -} Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/HttpHandler.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/HttpHandler.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/communication/HttpHandler.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -27,10 +27,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.net.URLEncoder; import mediaportal.remote.utils.AppSettings; import android.graphics.Bitmap; @@ -80,13 +82,22 @@ public Bitmap DownloadImage(String urlStr) { - final String url = urlStr.replaceAll(" ","%20"); + try { + urlStr = URLEncoder.encode(urlStr, "UTF-8"); + } catch (UnsupportedEncodingException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + urlStr = urlStr.replaceAll("%2F", "/"); + urlStr = urlStr.replaceAll("%3A", ":"); + Bitmap bitmap = null; InputStream in = null; try { - in = openHttpConnection(url); + in = openHttpConnection(urlStr); bitmap = BitmapFactory.decodeStream(in); if (in != null) in.close(); @@ -147,6 +158,7 @@ .toString(); try { + InputStream in = openHttpConnection("http://" + AppSettings.getServer() + ":" + AppSettings.getPort() + "/music/" + Path + Filename.replaceAll(" ", "%20")); Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -35,6 +35,8 @@ import mediaportal.remote.nowPlaying.NowPlaying; import mediaportal.remote.nowPlaying.NowPlayingXmlHandler; import mediaportal.remote.pictures.Pictures; +import mediaportal.remote.setup.Setup; +import mediaportal.remote.setup.Setup_ip; import mediaportal.remote.utils.AppSettings; import mediaportal.remote.utils.KeyLock; import mediaportal.remote.utils.SAX_Parser; @@ -103,7 +105,7 @@ Intent myIntent = new Intent(this, Splash.class); startActivity(myIntent); } - + // create MP folder try { File fPath = new File(Environment.getExternalStorageDirectory(), @@ -220,7 +222,8 @@ switch (keyCode) { case KeyEvent.KEYCODE_MENU: { - final CharSequence[] items = { "Settings", "Switch HTPC", "Exit" }; + final CharSequence[] items = { "Global Settings", "IP Settings", + "Switch HTPC", "Exit" }; AlertDialog.Builder builder = new AlertDialog.Builder(Main.this); builder.setTitle("Select option"); @@ -228,11 +231,15 @@ builder.setItems(items, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { switch (item) { - case 0: // settings - Intent myIntent = new Intent(Main.this, Setup.class); - startActivityForResult(myIntent, 0); + case 0: // global settings + Intent myIntent1 = new Intent(Main.this, Setup.class); + startActivityForResult(myIntent1, 0); break; - case 1: // switch instance + case 1: // ip settings + Intent myIntent2 = new Intent(Main.this, Setup_ip.class); + startActivityForResult(myIntent2, 0); + break; + case 2: // switch instance final CharSequence[] items2 = AppSettings.getNames(); AlertDialog.Builder builder = new AlertDialog.Builder( @@ -255,7 +262,8 @@ break; } - txtInstance.setText(AppSettings.getName()); + txtInstance.setText(AppSettings + .getName()); Pictures.actualDir = ""; } @@ -264,7 +272,7 @@ AlertDialog alert = builder.create(); alert.show(); break; - case 2: // exit + case 3: // exit android.os.Process.killProcess(android.os.Process .myPid()); break; @@ -380,7 +388,7 @@ @Override public void onPause() { super.onPause(); - + doUpdate = false; mHandler.removeCallbacks(mUpdateTimeTask); } @@ -394,7 +402,7 @@ private class update extends AsyncTask<String, Void, Void> { // can use UI thread here protected void onPreExecute() { - + } // automatically done on worker thread (separate from UI thread) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicDir.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -70,8 +70,10 @@ final CharSequence[] items = { "Add to playlist", "Clear playlist", "Save to SD card", "Play locally" }; + final CharSequence[] itemsPlaylist = { "Add to playlist", "Clear playlist" }; - final CharSequence[] itemsLong = { "Add folder to playlist", "Clear playlist" }; + final CharSequence[] itemsLong = { "Add folder to playlist", + "Clear playlist" }; @Override public void onCreate(Bundle savedInstanceState) { @@ -79,7 +81,7 @@ setContentView(R.layout.music); myParent = this.getApplicationContext(); - + mHandler.removeCallbacks(mUpdateTimeTask); mHandler.postDelayed(mUpdateTimeTask, 100); @@ -100,15 +102,22 @@ AlertDialog.Builder builder = new AlertDialog.Builder( parent.getContext()); + CharSequence[] tmp = items; + if(!selectedItem.File.toLowerCase().contains(".mp3")) + { + tmp = itemsPlaylist; + } + builder.setTitle(selectedItem.File); - builder.setItems(items, + builder.setItems(tmp, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { switch (item) { case 0: SendCommand.PostAddFile(actualDir - + selectedItem.File.replaceAll(" ", "%20")); + + selectedItem.File.replaceAll( + " ", "%20")); Toast.makeText( MusicDir.this, selectedItem.File @@ -125,22 +134,28 @@ SavetoSDCard(selectedItem.File); break; case 3: - - String link = "http://" + AppSettings.getServer() - + ":" + AppSettings.getPort() + "/music/"; - - String file = actualDir + selectedItem.File; + + String link = "http://" + + AppSettings.getServer() + ":" + + AppSettings.getPort() + + "/music/"; + + String file = actualDir + + selectedItem.File; try { - file = URLEncoder.encode(file, "UTF-8"); + file = URLEncoder.encode(file, + "UTF-8"); } catch (UnsupportedEncodingException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } link = link + file; - - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setDataAndType(Uri.parse(link), "audio/mpeg"); - + + Intent intent = new Intent( + Intent.ACTION_VIEW); + intent.setDataAndType(Uri.parse(link), + "audio/mpeg"); + startActivity(intent); break; } @@ -185,7 +200,7 @@ Vibration.vibrateShort(); selectedItem = musicList.get(position - 1); - + AlertDialog.Builder builder = new AlertDialog.Builder( parent.getContext()); @@ -197,7 +212,9 @@ switch (item) { case 0: // add folder - SendCommand.PostAddFolder(actualDir + selectedItem.File.replaceAll(" ", "%20")); + SendCommand.PostAddFolder(actualDir + + selectedItem.File.replaceAll( + " ", "%20")); break; case 1: SendCommand.PostClearPlaylist(); @@ -216,7 +233,7 @@ }); } - + @Override public void onResume() { super.onResume(); @@ -368,7 +385,15 @@ item.typ = "folder"; iv.setTag(item); } else { + + if(txtName.toLowerCase().contains(".mp3")) + { iv.setImageResource(R.drawable.ic_skin1_file_audio); + } + else + { + iv.setImageResource(R.drawable.ic_skin1_file_playlist); + } musicItem item = new musicItem(); item.title = txtName; item.typ = "item"; Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -208,8 +208,7 @@ DirItems item = pictureList.get(picNo); if (!item.isFolder) { if (item.Picture == null) { - String file = server + actualDir.replaceAll(" ", "%20") - + item.File + ".thb"; + String file = server + actualDir + item.File + ".thb"; item.Picture = http.DownloadImage(file); if (picNo < pictureList.size()) // very strange exeption happens here 10/10 pictureList.set(picNo, item); Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/SelectSkin.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2005-2011 Team MediaPortal + * http://www.team-mediaportal.com + * + * 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 2, 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 GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +package mediaportal.remote.setup; + +import mediaportal.remote.R; +import mediaportal.remote.utils.Vibration; +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.CompoundButton; +import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.RadioButton; + +public class SelectSkin extends Activity { + + private RadioButton radio1; + private RadioButton radio2; + private RadioButton radio3; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.skin); + + radio1 = (RadioButton) findViewById(R.id.selectSkin1); + radio2 = (RadioButton) findViewById(R.id.selectSkin2); + radio3 = (RadioButton) findViewById(R.id.selectSkin3); + + radio1.setOnCheckedChangeListener(new OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton buttonView, + boolean isChecked) { + Vibration.vibrateShort(); + if (isChecked) { + radio2.setChecked(false); + radio3.setChecked(false); + } + } + }); + radio2.setOnCheckedChangeListener(new OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton buttonView, + boolean isChecked) { + Vibration.vibrateShort(); + if (isChecked) { + radio1.setChecked(false); + radio3.setChecked(false); + } + } + }); + radio3.setOnCheckedChangeListener(new OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton buttonView, + boolean isChecked) { + Vibration.vibrateShort(); + if (isChecked) { + radio1.setChecked(false); + radio2.setChecked(false); + } + } + }); + + + Button btnVisitHome1 = (Button) findViewById(R.id.visitHome1); + btnVisitHome1.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Vibration.vibrateShort(); + OpenURL("http://www.kleiner-schelm.de"); + } + }); + Button btnVisitHome2 = (Button) findViewById(R.id.visitHome2); + btnVisitHome2.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Vibration.vibrateShort(); + OpenURL("http://www.kleiner-schelm.de"); + } + }); + Button btnVisitHome3 = (Button) findViewById(R.id.visitHome3); + btnVisitHome3.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Vibration.vibrateShort(); + OpenURL("http://www.kleiner-schelm.de"); + } + }); + + } + + private void OpenURL(String Url) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(Url)); + startActivity(i); + } + +} \ No newline at end of file Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2005-2011 Team MediaPortal + * http://www.team-mediaportal.com + * + * 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 2, 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 GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +package mediaportal.remote.setup; + +import mediaportal.remote.R; +import mediaportal.remote.utils.AppSettings; +import mediaportal.remote.utils.Vibration; +import android.app.Activity; +import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.Spinner; +import android.widget.TextView; + +public class Setup extends Activity { + + private Spinner powerMode; + private CheckBox vibrate; + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + setContentView(R.layout.setup); + + TextView version = (TextView)findViewById(R.id.txtVersion); + version.setText("Version : " + getSoftwareVersion()); + + vibrate = (CheckBox) findViewById(R.id.vibration); + vibrate.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton buttonView, + boolean isChecked) { + if (isChecked) { + Vibration.vibrateShort(); + } + } + }); + + powerMode = (Spinner) findViewById(R.id.Spinner01); + ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource( + this, R.array.shutdown, + android.R.layout.simple_spinner_item); + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + powerMode.setAdapter(adapter); + + Button selectSkin = (Button) findViewById(R.id.btnSelectSkin); + selectSkin.setOnClickListener(new View.OnClickListener() { + public void onClick(View view) { + Vibration.vibrateShort(); + + Intent myIntent = new Intent(view.getContext(), + SelectSkin.class); + startActivity(myIntent); + } + }); + + } + + @Override + public void onResume() { + super.onResume(); + + vibrate.setChecked(AppSettings.getVibrate()); + powerMode.setSelection(AppSettings.getPowerMode()); + } + + @Override + public void onPause() { + super.onPause(); + + AppSettings.setVibrate(vibrate.isChecked()); + AppSettings.setPowerMode(powerMode.getSelectedItemPosition()); + } + + private String getSoftwareVersion() { + try { + PackageInfo packageInfo = getPackageManager().getPackageInfo( + getPackageName(), 0); + return packageInfo.versionName; + } catch (PackageManager.NameNotFoundException e) { + Log.e("MediaPortal", "Package name not found", e); + } + return "not found"; + } +} Added: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java (rev 0) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup/Setup_ip.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2005-2011 Team MediaPortal + * http://www.team-mediaportal.com + * + * 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 2, 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 GNU Make; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +package mediaportal.remote.setup; + +import mediaportal.remote.R; +import mediaportal.remote.utils.AppSettings; +import android.app.Activity; +import android.os.Bundle; +import android.widget.EditText; +import android.widget.TextView; + +public class Setup_ip extends Activity { + + private TextView txtInstance; + private EditText txtName; + private EditText txtServer; + private EditText txtPort; + private EditText txtMac; + + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + setContentView(R.layout.setup_ip); + + txtInstance = (TextView) findViewById(R.id.txtIntanceName); + txtName = (EditText) findViewById(R.id.server_name); + txtServer = (EditText) findViewById(R.id.server_ip); + txtPort = (EditText) findViewById(R.id.server_port); + txtMac = (EditText) findViewById(R.id.server_macid); + } + + @Override + public void onResume() { + super.onResume(); + + txtInstance.setText("Instance name (" + AppSettings.getInstance() + ")"); + txtName.setText(AppSettings.getName()); + txtServer.setText(AppSettings.getServer()); + txtPort.setText(AppSettings.getPort()); + txtMac.setText(AppSettings.getMacId()); + } + + @Override + public void onPause() { + super.onPause(); + + AppSettings.setName(txtName.getText().toString()); + AppSettings.setServer(txtServer.getText().toString()); + AppSettings.setPort(txtPort.getText().toString()); + AppSettings.setMacId(txtMac.getText().toString()); + } +} Deleted: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2011-01-30 19:59:10 UTC (rev 4084) @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2005-2011 Team MediaPortal - * http://www.team-mediaportal.com - * - * 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 2, 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 GNU Make; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - * http://www.gnu.org/copyleft/gpl.html - * - */ - -package mediaportal.remote; - -import mediaportal.remote.R; -import mediaportal.remote.utils.AppSettings; -import mediaportal.remote.utils.Vibration; -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.Spinner; - -public class Setup extends Activity { - - private Spinner powerMode; - private CheckBox vibrate; - - /** Called when the activity is first created. */ - @Override - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - setContentView(R.layout.setup); - - vibrate = (CheckBox) findViewById(R.id.vibration); - vibrate.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - public void onCheckedChanged(CompoundButton buttonView, - boolean isChecked) { - if (isChecked) { - Vibration.vibrateShort(); - } - } - }); - - powerMode = (Spinner) findViewById(R.id.Spinner01); - ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource( - this, R.array.shutdown, - android.R.layout.simple_spinner_item); - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - powerMode.setAdapter(adapter); - - Button settings = (Button) findViewById(R.id.btnIpSettings); - settings.setOnClickListener(new View.OnClickListener() { - public void onClick(View view) { - Vibration.vibrateShort(); - - Intent myIntent = new Intent(view.getContext(), - Setup_ip.class); - startActivity(myIntent); - } - }); - - } - - @Override - public void onResume() { - super.onResume(); - - vibrate.setChecked(AppSettings.getVibrate()); - powerMode.setSelection(AppSettings.getPowerMode()); - } - - @Override - public void onPause() { - super.onPause(); - - AppSettings.setVibrate(vibrate.isChecked()); - AppSettings.setPowerMode(powerMode.getSelectedItemPosition()); - } -} Added: trunk/plugins/AndroidRemote/Release/skins.jpg =================================================================== (Binary files differ) Property changes on: trunk/plugins/AndroidRemote/Release/skins.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/ExecuteCommand.cs 2011-01-30 19:59:10 UTC (rev 4084) @@ -368,47 +368,72 @@ PlayList playList = playlistPlayer.GetPlaylist(PlayListType.PLAYLIST_MUSIC); - bool found = false; - string fileName = data["filename"]; - fileName = fileName.Replace("%20", " "); - fileName = fileName.Replace("/", "\\"); - string artist = data["artist"].Replace("%20", " "); - string title = data["title"].Replace("%20", " "); + if (fileName.ToLower().Contains(".mp3")) + { + bool found = false; - directoryList = GetMpShare("music"); - string local = GetLocalDir(fileName, directoryList); + fileName = fileName.Replace("%20", " "); + fileName = fileName.Replace("/", "\\"); - foreach (PlayListItem item in playList) - { - if (item.FileName == local) + string artist = data["artist"].Replace("%20", " "); + string title = data["title"].Replace("%20", " "); + + directoryList = GetMpShare("music"); + string local = GetLocalDir(fileName, directoryList); + + foreach (PlayListItem item in playList) { - found = true; - break; + if (item.FileName == local) + { + found = true; + break; + } } + + if (!found) + { + AndroidServer.logDebug("add music : " + artist + " - " + title); + + PlayListItem playlistItem = new PlayListItem(); + playlistItem.Type = PlayListItem.PlayListItemType.Audio; + playlistItem.FileName = local; + playlistItem.Description = artist + " - " + title; + playlistItem.Duration = 0; + + MusicTag readTag = TagReader.ReadTag(local); + playlistItem.MusicTag = readTag; + + playList.Add(playlistItem); + + if (!g_Player.Playing) + { + StartPlaylistPlayer del = new StartPlaylistPlayer(StartPlayerLast); + GUIGraphicsContext.form.Invoke(del, new object[] { }); + } + } } - - if (!found) + else { - AndroidServer.logDebug("add music : " + artist + " - " + title); + playList.Clear(); + fileName = fileName.Replace("%20", " "); + fileName = fileName.Replace("/", "\\"); + directoryList = GetMpShare("music"); + string local = GetLocalDir(fileName, directoryList); + PlayListItem playlistItem = new PlayListItem(); - playlistItem.Type = PlayListItem.PlayListItemType.Audio; + playlistItem.Type = PlayListItem.PlayListItemType.Unknown; playlistItem.FileName = local; - playlistItem.Description = artist + " - " + title; + playlistItem.Description = Path.GetFileNameWithoutExtension(local); playlistItem.Duration = 0; - MusicTag readTag = TagReader.ReadTag(local); - playlistItem.MusicTag = readTag; - playList.Add(playlistItem); - if (!g_Player.Playing) - { - StartPlaylistPlayer del = new StartPlaylistPlayer(StartPlayerLast); - GUIGraphicsContext.form.Invoke(del, new object[] { }); - } + StartPlaylistPlayer del = new StartPlaylistPlayer(StartPlayer); + GUIGraphicsContext.form.Invoke(del, new object[] { }); + } } #endregion Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/MusicHandler.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/MusicHandler.cs 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Content/MusicHandler.cs 2011-01-30 19:59:10 UTC (rev 4084) @@ -259,13 +259,16 @@ msg += "<Folder>" + SomeUtils.EncodeString(Path.GetFileName(f)) + "</Folder>\r\n"; } - //files - string[] files = Directory.GetFiles(dir, "*.mp3", SearchOption.TopDirectoryOnly); - foreach (string f in files) + ArrayList fileList = getAllpattern(dir); + fileList.Sort(); + + for (int i = 0; i < fileList.Count; i++) { - string fName = Path.GetFileName(f); + string file = (string)fileList[i]; + string fName = Path.GetFileName(file); msg += "<File>" + SomeUtils.EncodeString(fName) + "</File>\r\n"; } + msg += "</Directory>\r\n"; // send @@ -687,5 +690,18 @@ } return string.Empty; } + + private static ArrayList getAllpattern(string Dir) + { + string[] filters = { ".mp3", ".m3u", ".pls", ".wpl" }; + + ArrayList files = new ArrayList(); + foreach (string filter in filters) + { + files.AddRange(Directory.GetFiles(Dir, "*" + filter)); + } + + return files; + } } } Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Properties/AssemblyInfo.cs 2011-01-30 19:59:10 UTC (rev 4084) @@ -32,5 +32,5 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.2.1.0")] +[assembly: AssemblyFileVersion("0.2.1.0")] Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs =================================================================== --- trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2011-01-28 09:25:28 UTC (rev 4083) +++ trunk/plugins/AndroidRemote/Server/AndroidRemote/Request.cs 2011-01-30 19:59:10 UTC (rev 4084) @@ -314,6 +314,34 @@ { PictureHandler.ReplyRandomPicture(socket); } + + #region some test how to accces the gui + else if (req.StartsWith("/onlinevideos")) + { + GUIWindowManager.ActivateWindow(4755); + } + else if (req.StartsWith("/items")) + { + GUIWindow window = GUIWindowManager.GetWindow(4755); + GUIFacadeControl cont = (GUIFacadeControl) window.GetControl(50); + + cont.SelectedListItemIndex = 2; + GUIListItem i = cont.SelectedListItem; + + // header + string msg = "HTTP/1.0 200 Ok\r\n"; + msg += "Content-Type: application/xml; charset=utf-8; filename=info.xml" + "\r\n"; + msg += "Proxy-Connection: close" + "\r\n"; + msg += "\r\n"; + // content + msg += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"; + msg += "<OnlineVideos>\r\n"; + + + msg += "<OnlineVideos>\r\n"; + } + #endregion + else { handler.SendErrorURL(socket, req); Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kro...@us...> - 2011-01-28 09:25:35
|
Revision: 4083 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4083&view=rev Author: kroko_koenig Date: 2011-01-28 09:25:28 +0000 (Fri, 28 Jan 2011) Log Message: ----------- fix for Android bug, fix for pictures caching Modified Paths: -------------- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip trunk/plugins/AndroidRemote/Release/album.jpg trunk/plugins/AndroidRemote/Release/artist.jpg trunk/plugins/AndroidRemote/Release/folder.jpg trunk/plugins/AndroidRemote/Release/main.jpg trunk/plugins/AndroidRemote/Release/nowplaying.jpg trunk/plugins/AndroidRemote/Release/remote.jpg trunk/plugins/AndroidRemote/Release/song.jpg trunk/plugins/AndroidRemote/Server/AndroidRemote.suo Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml 2011-01-28 09:25:28 UTC (rev 4083) @@ -3,14 +3,20 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <ListView android:id="@+id/list_album" android:layout_height="wrap_content" - android:layout_width="fill_parent" android:fastScrollEnabled="true" - android:layout_weight="1"> - </ListView> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_weight="1"> + <ListView android:id="@+id/list_album" android:layout_height="wrap_content" + android:layout_width="fill_parent" android:fastScrollEnabled="true"> + </ListView> + + </LinearLayout> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_gravity="center_horizontal" android:layout_width="wrap_content"> + android:layout_height="80dip" android:layout_weight="1" + android:orientation="horizontal" android:layout_gravity="center_horizontal" + android:layout_width="wrap_content"> <Button android:background="@drawable/ic_menu_skin1_minus" android:id="@+id/btnAlbumSelDown" android:layout_height="40dip" Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml 2011-01-28 09:25:28 UTC (rev 4083) @@ -3,30 +3,36 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <ListView android:id="@+id/list_artist" android:layout_height="wrap_content" - android:layout_width="fill_parent" android:fastScrollEnabled="true" - android:layout_weight="1"> - </ListView> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_weight="1"> + <ListView android:id="@+id/list_artist" + android:layout_height="wrap_content" android:layout_width="fill_parent" + android:fastScrollEnabled="true"> + </ListView> + + </LinearLayout> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_gravity="center_horizontal" android:layout_width="wrap_content"> + android:orientation="horizontal" android:layout_width="wrap_content" + android:layout_height="80dip" android:layout_weight="1" + android:layout_gravity="center_horizontal"> <Button android:background="@drawable/ic_menu_skin1_minus" android:id="@+id/btnArtistSelDown" android:layout_height="40dip" android:layout_width="60dip"> </Button> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="--- / --- items" android:textColor="#FFFFFFFF" android:id="@+id/txtDbArtist" android:textSize="18dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip"> </TextView> - <Button android:background="@drawable/ic_menu_skin1_plus" android:id="@+id/btnArtistSelUp" android:layout_height="40dip" android:layout_width="60dip"> </Button> </LinearLayout> + </LinearLayout> \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml 2011-01-28 09:25:28 UTC (rev 4083) @@ -3,14 +3,22 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <ListView android:id="@+id/list_result" android:layout_height="wrap_content" - android:layout_width="fill_parent" android:fastScrollEnabled="true" android:layout_weight="1"> - </ListView> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_gravity="center_horizontal" android:layout_width="wrap_content"> + android:orientation="horizontal" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_weight="1"> + <ListView android:id="@+id/list_result" + android:layout_height="wrap_content" android:layout_width="fill_parent" + android:fastScrollEnabled="true"> + </ListView> + + </LinearLayout> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="80dip" android:orientation="horizontal" + android:layout_gravity="center_horizontal" android:layout_width="wrap_content" + android:layout_weight="1"> + <Button android:background="@drawable/ic_menu_skin1_minus" android:id="@+id/btnResultSelDown" android:layout_height="40dip" android:layout_width="60dip"> Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml 2011-01-28 09:25:28 UTC (rev 4083) @@ -3,23 +3,36 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent"> - <ListView android:id="@+id/list_song" android:layout_height="wrap_content" - android:layout_width="fill_parent" android:fastScrollEnabled="true" android:layout_weight="1"> - </ListView> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="wrap_content" - android:orientation="horizontal" android:layout_gravity="center_horizontal" android:layout_width="wrap_content"> - - <Button android:background="@drawable/ic_menu_skin1_minus" android:id="@+id/btnSongSelDown" android:layout_height="40dip" android:layout_width="60dip"> - </Button> - - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="--- / --- items" android:textColor="#FFFFFFFF" - android:id="@+id/txtDbSong" android:textSize="18dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip"> - </TextView> + android:orientation="horizontal" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_weight="1"> - <Button android:background="@drawable/ic_menu_skin1_plus" android:id="@+id/btnSongSelUp" android:layout_height="40dip" android:layout_width="60dip"> - </Button> - </LinearLayout> + <ListView android:id="@+id/list_song" android:layout_height="wrap_content" + android:layout_width="fill_parent" android:fastScrollEnabled="true"> + </ListView> + + </LinearLayout> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="80dip" android:orientation="horizontal" + android:layout_gravity="center_horizontal" android:layout_width="wrap_content" + android:layout_weight="1"> + + <Button android:background="@drawable/ic_menu_skin1_minus" + android:id="@+id/btnSongSelDown" android:layout_height="40dip" + android:layout_width="60dip"> + </Button> + + <TextView android:layout_width="wrap_content" + android:layout_height="wrap_content" android:text="--- / --- items" + android:textColor="#FFFFFFFF" android:id="@+id/txtDbSong" + android:textSize="18dip" android:layout_marginLeft="10dip" + android:layout_marginRight="10dip"> + </TextView> + + <Button android:background="@drawable/ic_menu_skin1_plus" + android:id="@+id/btnSongSelUp" android:layout_height="40dip" + android:layout_width="60dip"> + </Button> + </LinearLayout> </LinearLayout> \ No newline at end of file Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java 2011-01-28 09:25:28 UTC (rev 4083) @@ -45,6 +45,8 @@ import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; +import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.TextView; @@ -64,6 +66,8 @@ private static HashMap<String, Integer> alphaIndexer; private static String[] sections; + + private boolean FLAG_THUMB_PLUS; public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -209,6 +213,18 @@ listview.setAdapter(new EfficientAdapter(MusicAlbum.this)); listview.setFastScrollEnabled(true); + + // tweak as described in many post, not very nice but work + int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT + : listview.getWidth() - 1; + + LinearLayout.LayoutParams l = new LinearLayout.LayoutParams( + newWidth, FrameLayout.LayoutParams.FILL_PARENT); + + listview.setLayoutParams(l); + + FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true; + // tweak finished } } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java 2011-01-28 09:25:28 UTC (rev 4083) @@ -45,6 +45,8 @@ import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; +import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.TextView; @@ -55,20 +57,22 @@ private Handler mHandler = new Handler(); private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList; - + private static int startList; private static int countList; private static int countItems; - + private TextView dbCount; private static HashMap<String, Integer> alphaIndexer; private static String[] sections; + private boolean FLAG_THUMB_PLUS; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.music_artist); - + dbCount = (TextView) findViewById(R.id.txtDbArtist); startList = 0; @@ -132,7 +136,7 @@ Vibration.vibrateShort(); } - + private Runnable mUpdateTimeTask = new Runnable() { public void run() { new update().execute(); @@ -159,7 +163,7 @@ artistList = result.data; countList = result.results; countItems = result.count; - + return null; } @@ -203,14 +207,28 @@ Collections.sort(sectionList); sections = new String[sectionList.size()]; sectionList.toArray(sections); - + ListView listview = (ListView) findViewById(R.id.list_artist); - listview.setFastScrollEnabled(false); + listview.setFastScrollEnabled(false); // we need it, otherwise exception out of bound... + + listview.setAdapter(new EfficientAdapter(MusicArtist.this)); + listview.setFastScrollEnabled(true); + + // tweak as described in many post, not very nice but work + int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT + : listview.getWidth() - 1; + + LinearLayout.LayoutParams l = new LinearLayout.LayoutParams( + newWidth, FrameLayout.LayoutParams.FILL_PARENT); + + listview.setLayoutParams(l); - listview.setAdapter(new EfficientAdapter(MusicArtist.this)); - listview.setFastScrollEnabled(true); + FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true; + // tweak finished + } } + } private static class EfficientAdapter extends BaseAdapter implements @@ -284,8 +302,6 @@ public Object[] getSections() { return sections; } - - } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java 2011-01-28 09:25:28 UTC (rev 4083) @@ -55,6 +55,8 @@ import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; +import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.TextView; @@ -90,6 +92,8 @@ final CharSequence[] items = { "Add to playlist", "Clear playlist", "Save to SD card", "Play locally" }; + private boolean FLAG_THUMB_PLUS; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.music_results); @@ -290,6 +294,18 @@ listview.setAdapter(new EfficientAdapter(MusicResults.this)); listview.setFastScrollEnabled(true); + + // tweak as described in many post, not very nice but work + int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT + : listview.getWidth() - 1; + + LinearLayout.LayoutParams l = new LinearLayout.LayoutParams( + newWidth, FrameLayout.LayoutParams.FILL_PARENT); + + listview.setLayoutParams(l); + + FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true; + // tweak finished } } } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java 2011-01-28 09:25:28 UTC (rev 4083) @@ -55,6 +55,8 @@ import android.widget.AdapterView; import android.widget.BaseAdapter; import android.widget.Button; +import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.TextView; @@ -85,6 +87,8 @@ final CharSequence[] items = { "Add to playlist", "Clear playlist", "Save to SD card", "Play locally" }; + private boolean FLAG_THUMB_PLUS; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.music_song); @@ -276,6 +280,18 @@ listview.setAdapter(new EfficientAdapter(MusicSong.this)); listview.setFastScrollEnabled(true); + + // tweak as described in many post, not very nice but work + int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT + : listview.getWidth() - 1; + + LinearLayout.LayoutParams l = new LinearLayout.LayoutParams( + newWidth, FrameLayout.LayoutParams.FILL_PARENT); + + listview.setLayoutParams(l); + + FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true; + // tweak finished } } } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-27 15:34:00 UTC (rev 4082) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java 2011-01-28 09:25:28 UTC (rev 4083) @@ -95,6 +95,7 @@ if (pic.typ == "folder") { actualDir += pic.title + "/"; + picNo = 0; taskFetchData = new update(); taskFetchData.execute(); } @@ -110,6 +111,7 @@ } else actualDir = ""; + picNo = 0; taskFetchData = new update(); taskFetchData.execute(); } @@ -195,14 +197,14 @@ // can use UI thread here protected void onPreExecute() { - picNo = 0; + } // automatically done on worker thread (separate from UI thread) protected Void doInBackground(final String... args) { while (picNo < pictureList.size()) { - + DirItems item = pictureList.get(picNo); if (!item.isFolder) { if (item.Picture == null) { @@ -211,9 +213,10 @@ item.Picture = http.DownloadImage(file); if (picNo < pictureList.size()) // very strange exeption happens here 10/10 pictureList.set(picNo, item); + picNo++; break; } - } + } picNo++; } Modified: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/album.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/artist.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/folder.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/main.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/nowplaying.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/remote.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Release/song.jpg =================================================================== (Binary files differ) Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |