Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4266] trunk/plugins/MultiShortcut
|
From: <fr...@us...> - 2011-08-12 17:45:41
|
Revision: 4266
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4266&view=rev
Author: framug
Date: 2011-08-12 17:45:35 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Fix language problem.
Modified Paths:
--------------
trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj
trunk/plugins/MultiShortcut/MultiShortcut/LocalizeStrings.cs
trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj
trunk/plugins/MultiShortcut/MultiShortcut.sln
trunk/plugins/MultiShortcut/TestServer/TestServer.csproj
Modified: trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj
===================================================================
--- trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2011-08-12 17:45:35 UTC (rev 4266)
@@ -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>
@@ -12,9 +13,26 @@
<ApplicationIcon>DLLFix.ico</ApplicationIcon>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <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>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -24,6 +42,7 @@
<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,11 +51,12 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.0.4.32078, 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" />
@@ -57,6 +77,26 @@
<ItemGroup>
<Content Include="DLLFix.ico" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</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 Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </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/MultiShortcut/MultiShortcut/LocalizeStrings.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/LocalizeStrings.cs 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/MultiShortcut/LocalizeStrings.cs 2011-08-12 17:45:35 UTC (rev 4266)
@@ -197,7 +197,7 @@
bool isPrefixEnabled = true;
using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Config, "MediaPortal.xml")))
- isPrefixEnabled = reader.GetValueAsBool("general", "myprefix", true);
+ isPrefixEnabled = reader.GetValueAsBool("gui", "myprefix", true);
string directory = MediaPortal.Configuration.Config.GetSubFolder(MediaPortal.Configuration.Config.Dir.Language, "MultiShortcut");
string cultureName = null;
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2011-08-12 17:45:35 UTC (rev 4266)
@@ -199,7 +199,7 @@
if (_PluginLangFileExist)
{
MediaPortal.Profile.Settings s = new MediaPortal.Profile.Settings(MediaPortal.Configuration.Config.GetFile(MediaPortal.Configuration.Config.Dir.Config, "MediaPortal.xml"));
- string strLanguage = s.GetValueAsString("skin", "language", "English");
+ string strLanguage = s.GetValueAsString("gui", "language", "English");
LocalizeStrings.Load(strLanguage);
}
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2011-08-12 17:45:35 UTC (rev 4266)
@@ -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>
@@ -11,9 +12,26 @@
<AssemblyName>MultiShortcut00</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <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>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,37 +50,28 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.4.32078, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Core.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Core">
+ <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Core.dll</HintPath>
</Reference>
- <Reference Include="Databases, Version=1.0.4.32079, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Databases.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Databases">
+ <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Databases.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=1.0.4.32079, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\xbmc\bin\Release\plugins\Windows\Dialogs.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Dialogs">
+ <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\plugins\Windows\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="RemotePlugins, Version=1.0.5.34910, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\xbmc\bin\Release\RemotePlugins.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="RemotePlugins">
+ <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\RemotePlugins.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="Utils, Version=2.2.7.32077, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\mediaportal\xbmc\bin\Release\Utils.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Utils">
+ <HintPath>..\..\..\mediaportal\MediaPortal.Application\bin\Release\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -90,6 +100,23 @@
<Content Include="Language\strings_en.xml" />
<Content Include="Language\strings_fr.xml" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</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 Installer 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.
@@ -99,6 +126,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>copy $(TargetName).dll "D:\SVN\MediaPortal\xbmc\bin\Release\plugins\Windows"</PostBuildEvent>
+ <PostBuildEvent>rem copy $(TargetName).dll "D:\SVN\MediaPortal\xbmc\bin\Release\plugins\Windows"</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/MultiShortcut/MultiShortcut.sln
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut.sln 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/MultiShortcut.sln 2011-08-12 17:45:35 UTC (rev 4266)
@@ -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}") = "TestServer", "TestServer\TestServer.csproj", "{D2159E0B-44FA-41D8-B701-081D2C931CC0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiShortcut", "MultiShortcut\MultiShortcut.csproj", "{7CBDA33F-E11F-400B-8B3F-ABB0B54462AC}"
Modified: trunk/plugins/MultiShortcut/TestServer/TestServer.csproj
===================================================================
--- trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2011-08-12 17:44:13 UTC (rev 4265)
+++ trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2011-08-12 17:45:35 UTC (rev 4266)
@@ -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>
@@ -11,9 +12,26 @@
<AssemblyName>TestServer</AssemblyName>
<FileUpgradeFlags>
</FileUpgradeFlags>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <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>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -31,11 +50,12 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.0.4.32078, 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" />
@@ -53,6 +73,26 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</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 Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="app.config" />
+ </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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
