From: <eda...@us...> - 2013-07-16 18:39:33
|
Revision: 4608 http://sourceforge.net/p/mp-plugins/code/4608 Author: edalex86 Date: 2013-07-16 18:39:31 +0000 (Tue, 16 Jul 2013) Log Message: ----------- Added MP 1.4.0 compatibility Fixed loading and saving configuration Modified Paths: -------------- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs 2013-07-16 18:39:31 UTC (rev 4608) @@ -50,7 +50,9 @@ //using for token processing using System.IO; using System.Text; +using Action = MediaPortal.GUI.Library.Action; + namespace MediaPortal.GUI.MyStreamRadio { [PluginIcons("MyStreamRadio.StreamRadio.png", "MyStreamRadio.StreamRadioDisabled.png")] @@ -139,7 +141,7 @@ [SkinControlAttribute(7)] protected GUIButtonControl btnNext = null; [SkinControlAttribute(9)] - protected GUIToggleButtonControl btnRecord = null; + protected GUICheckButton btnRecord = null; [SkinControlAttribute(11)] protected GUIButtonControl btnRecordings = null; Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs 2013-07-16 18:39:31 UTC (rev 4608) @@ -39,6 +39,7 @@ using System.Xml.Serialization; using System.IO; using System.Data; +using Action = MediaPortal.GUI.Library.Action; namespace MediaPortal.GUI.MyStreamRadio { Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2013-07-16 18:39:31 UTC (rev 4608) @@ -1,4 +1,5 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -13,16 +14,34 @@ </FileUpgradeFlags> <UpgradeBackupLocation> </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> + <OldToolsVersion>3.5</OldToolsVersion> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <TargetFrameworkProfile /> + <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>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath> + <OutputPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -32,31 +51,32 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> <Reference Include="Bass.Net, Version=2.4.4.3, Culture=neutral, PublicKeyToken=b7566c273e6ef480, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Core, Version=1.0.5.32056, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Databases, Version=1.0.5.32058, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Dialogs, Version=1.0.5.32061, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="System" /> @@ -67,7 +87,7 @@ <Reference Include="System.Xml" /> <Reference Include="Utils, Version=2.2.7.32052, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath> + <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> @@ -117,6 +137,23 @@ <ItemGroup> <EmbeddedResource Include="Template.xml" /> </ItemGroup> + <ItemGroup> + <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> + <Visible>False</Visible> + <ProductName>Клиентский профиль .NET Framework 3.5 SP1</ProductName> + <Install>false</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> + <Visible>False</Visible> + <ProductName>.NET Framework 3.5 SP1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> + <Visible>False</Visible> + <ProductName>Установщик Windows 3.1</ProductName> + <Install>true</Install> + </BootstrapperPackage> + </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. Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2013-07-16 18:39:31 UTC (rev 4608) @@ -3,10 +3,7 @@ using System.Runtime.InteropServices; using MediaPortal.Common.Utils; -[assembly: CompatibleVersion("1.1.7.0")] -[assembly: UsesSubsystem("MP.SkinEngine")] -[assembly: UsesSubsystem("MP.Config")] - +[assembly: CompatibleVersion("1.1.6.27644")] // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs 2013-07-16 18:39:31 UTC (rev 4608) @@ -29,6 +29,7 @@ using System.Text; using System.Windows.Forms; using System.Xml; +using MediaPortal.Configuration; namespace MediaPortal.GUI.MyStreamRadio { @@ -103,7 +104,7 @@ void LoadSettings() { - using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml")) + using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { edtRadio.Text = xmlreader.GetValueAsString("mystreamradio", "Radiopath", Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\Radio"); edtRecord.Text = xmlreader.GetValueAsString("mystreamradio", "Record", xmlreader.GetValueAsString("mystreamradio", "Record", Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\Record")); @@ -144,7 +145,7 @@ if (edtRecord.Text.Length == 0) return; - using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MediaPortal.xml")) + using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { xmlwriter.SetValue("mystreamradio", "Radiopath", edtRadio.Text); xmlwriter.SetValue("mystreamradio", "Record", edtRecord.Text); Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln =================================================================== --- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln 2013-07-16 09:53:43 UTC (rev 4607) +++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln 2013-07-16 18:39:31 UTC (rev 4608) @@ -1,6 +1,6 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyStreamRadio", "MyStreamRadio\MyStreamRadio.csproj", "{C24ED28B-D6D1-4D0D-AF06-F10BAC35528F}" EndProject Global This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |