Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4693] trunk/plugins/MultiShortcut
|
From: <fr...@us...> - 2013-12-01 22:57:42
|
Revision: 4693
http://sourceforge.net/p/mp-plugins/code/4693
Author: framug
Date: 2013-12-01 22:57:37 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
- MP 1.6 compliant.
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/Properties/AssemblyInfo.cs
trunk/plugins/MultiShortcut/TestServer/TestServer.csproj
Modified: trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj
===================================================================
--- trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/DLLFix/DLLFix.csproj 2013-12-01 22:57:37 UTC (rev 4693)
@@ -16,7 +16,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -52,6 +52,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.0.4.32078, Culture=neutral, processorArchitecture=x86">
@@ -94,6 +95,9 @@
<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 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/MultiShortcut/LocalizeStrings.cs 2013-12-01 22:57:37 UTC (rev 4693)
@@ -396,7 +396,7 @@
/// </summary>
/// <param name="language">Language</param>
/// <returns>Culture</returns>
- static public string GetCultureName(string language)
+ public static string GetCultureName(string language)
{
if (_cultures == null)
{
@@ -406,15 +406,18 @@
for (int i = 0; i < cultureList.Length; i++)
{
- _cultures.Add(cultureList[i].EnglishName, cultureList[i].Name);
+ _cultures[cultureList[i].EnglishName] = cultureList[i].Name;
}
}
+ string cultures = null;
+ if (_cultures.TryGetValue(language, out cultures))
+ {
+ return cultures;
+ }
- if (_cultures.ContainsKey(language))
- return _cultures[language];
-
return null;
}
+
#endregion
}
}
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.cs 2013-12-01 22:57:37 UTC (rev 4693)
@@ -855,10 +855,10 @@
MediaPortal.InputDevices.InputDevices.Init();
// Restore MP Window
Win32Wrapper.ShowWindow(m_MP_WindowHWND, Win32Wrapper.SW_SHOWDEFAULT);
- /* next two lines not yet need.
- Thread.Sleep(2000);
- Win32Wrapper.SetWindowPos(newProcess.MainWindowHandle, Win32Wrapper.HWND_TOPMOST, 0, 0, 0, 0, Win32Wrapper.SWP_NOSIZE | Win32Wrapper.SWP_NOMOVE);
- */
+ // next two lines not yet need.
+ // Thread.Sleep(2000);
+ // Win32Wrapper.SetWindowPos(newProcess.MainWindowHandle, Win32Wrapper.HWND_TOPMOST, 0, 0, 0, 0, Win32Wrapper.SWP_NOSIZE | Win32Wrapper.SWP_NOMOVE);
+
_MPWindowHidden = false;
}
@@ -965,8 +965,8 @@
[LocalizedCategory("4"), LocalizedDisplayName("34")]
public bool MenuHidden
{
- get { return m_MS.m_MenuHidden; }
- set { m_MS.m_MenuHidden = value; }
+ get { return m_MS.m_MenuHidden; }
+ set { m_MS.m_MenuHidden = value; }
}
#endregion
@@ -1016,8 +1016,8 @@
[LocalizedCategory("23"), LocalizedDisplayName("35")]
public bool PreClearProperties
{
- get { return m_MS.m_PreClearProperties; }
- set { m_MS.m_PreClearProperties = value; }
+ get { return m_MS.m_PreClearProperties; }
+ set { m_MS.m_PreClearProperties = value; }
}
#endregion
@@ -1067,15 +1067,15 @@
[LocalizedCategory("0"), LocalizedDisplayName("35")]
public bool ClearProperties
{
- get { return m_MS.m_ClearProperties; }
- set { m_MS.m_ClearProperties = value; }
+ get { return m_MS.m_ClearProperties; }
+ set { m_MS.m_ClearProperties = value; }
}
[LocalizedCategory("0"), LocalizedDisplayName("37")]
public bool RunAfterPreviousExited
{
- get { return m_MS.m_RunAfterPreviousExited; }
- set { m_MS.m_RunAfterPreviousExited = value; }
+ get { return m_MS.m_RunAfterPreviousExited; }
+ set { m_MS.m_RunAfterPreviousExited = value; }
}
#endregion
@@ -1125,8 +1125,8 @@
[LocalizedCategory("24"), LocalizedDisplayName("35")]
public bool PostClearProperties
{
- get { return m_MS.m_PostClearProperties; }
- set { m_MS.m_PostClearProperties = value; }
+ get { return m_MS.m_PostClearProperties; }
+ set { m_MS.m_PostClearProperties = value; }
}
[LocalizedCategory("24"), LocalizedDisplayName("37")]
Modified: trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/MultiShortcut/MultiShortcut.csproj 2013-12-01 22:57:37 UTC (rev 4693)
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -51,6 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
Modified: trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/MultiShortcut/Properties/AssemblyInfo.cs 2013-12-01 22:57:37 UTC (rev 4693)
@@ -37,7 +37,7 @@
[assembly: AssemblyFileVersion("2.4.0.0")]
// MediaPortal plugin version compatibility
-[assembly: CompatibleVersion("1.4.0.0")]
+[assembly: CompatibleVersion("1.5.100.0")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
Modified: trunk/plugins/MultiShortcut/TestServer/TestServer.csproj
===================================================================
--- trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2013-11-30 19:37:18 UTC (rev 4692)
+++ trunk/plugins/MultiShortcut/TestServer/TestServer.csproj 2013-12-01 22:57:37 UTC (rev 4693)
@@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -51,6 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<Reference Include="Core, Version=1.0.4.32078, Culture=neutral, processorArchitecture=x86">
@@ -90,6 +91,9 @@
<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.
|
