Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4817] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-06-02 17:33:16
|
Revision: 4817
http://sourceforge.net/p/mp-plugins/code/4817
Author: nicsergio
Date: 2014-06-02 17:33:14 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-06-02 17:33:14 UTC (rev 4817)
@@ -41,8 +41,8 @@
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|x86.ActiveCfg = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Any CPU.Build.0 = Release|Any CPU
- {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
- {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
+ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|x86.ActiveCfg = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs 2014-06-02 17:33:14 UTC (rev 4817)
@@ -367,7 +367,7 @@
//
// skinNavConfigButton
//
- this.skinNavConfigButton.BackgroundImage = global::ShortCuter.Properties.Resources.SkinNav;
+ this.skinNavConfigButton.BackgroundImage = global::ShortCuter.Properties.Resources.SkinNavigator;
this.skinNavConfigButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.skinNavConfigButton.Location = new System.Drawing.Point(726, 220);
this.skinNavConfigButton.Name = "skinNavConfigButton";
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-02 17:33:14 UTC (rev 4817)
@@ -1,4 +1,7 @@
-using MediaPortal.Dialogs;
+using System.Drawing;
+using System.Reflection;
+using MediaPortal.Dialogs;
+using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
using My.Common;
@@ -11,16 +14,35 @@
public const string DialogSkinFile = "ShortCuter.Navigator.DialogMenu.xml"; //File della skin per personalizzazione finestra di dialogo
#endregion
+ [SkinControl(20)]
+ protected GUIImage tega;
+
#region Metodi Pubblici
public override bool Init() //Override metodo Init
{
- return (Load(GUIGraphicsContext.Theme + @"\" + DialogSkinFile) ||
- Load(GUIGraphicsContext.Skin + @"\" + DialogSkinFile)); //--> inizializzazione solo se presente il file della skin per personalizzare la finestra di dialogo
+ return Load(GUIGraphicsContext.Theme + @"\" + DialogSkinFile); //--> inizializzazione solo se presente il file della skin per personalizzare la finestra di dialogo
}
public override string GetModuleName() //Override metodo GetModuleName
{
return Tools.MyAssembly.Title; //--> ritorno del titolo dell'assembly
}
+ public override void Dispose()
+ {
+ tega.SafeDispose();
+ base.Dispose();
+ }
+ protected override void OnPageLoad()
+ {
+ base.OnPageLoad();
+ tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
+ tega.UpdateLayout();
+ ;tega.SetFileName(@"C:\ProgramData\Team MediaPortal\MediaPortal\ShortCuter\Icons\movies.png");
+ }
+ public override void DoModal(int dwParentId)
+ {
+
+ base.DoModal(dwParentId);
+ }
#endregion
#region Proprietà
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-06-02 17:33:14 UTC (rev 4817)
@@ -76,7 +76,7 @@
{
return Tools.MyAssembly.Title;
}
- public override int GetID { get { return NavigatorDialog.DialogWindowID; } } //--> id finestra
+ public override int GetID { get { return NavigatorDialog.DialogWindowID + 1; } } //--> id finestra (deve avere un valore >0 e diverso da NavigatorDialog)
#endregion
#region Metodi Privati
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-06-02 17:33:14 UTC (rev 4817)
@@ -153,9 +153,9 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap SkinNav {
+ internal static System.Drawing.Bitmap SkinNavAdd {
get {
- object obj = ResourceManager.GetObject("SkinNav", resourceCulture);
+ object obj = ResourceManager.GetObject("SkinNavAdd", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -163,9 +163,9 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap SkinNavAdd {
+ internal static System.Drawing.Bitmap SkinNavigator {
get {
- object obj = ResourceManager.GetObject("SkinNavAdd", resourceCulture);
+ object obj = ResourceManager.GetObject("SkinNavigator", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-06-02 17:33:14 UTC (rev 4817)
@@ -145,11 +145,11 @@
<data name="RowCopy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\rowcopy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="SkinNav" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\resources\images\skinnav.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="SkinNavAdd" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\images\skinnavadd.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="SkinNavigator" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\resources\images\skinnavigator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png 2014-06-02 17:33:14 UTC (rev 4817)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-02 17:33:14 UTC (rev 4817)
@@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ShortCuter</RootNamespace>
<AssemblyName>ShortCuter</AssemblyName>
@@ -30,7 +30,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>
</DefineConstants>
@@ -49,6 +49,17 @@
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DebugType>full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -189,7 +200,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="ExternalResources\Dialogs.dll" />
- <Content Include="Resources\Images\SkinNav.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
<Link>Resources\Images\ArrowDown.png</Link>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user 2014-06-02 17:33:14 UTC (rev 4817)
@@ -15,4 +15,7 @@
<StartProgram>C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <StartProgram>C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ </PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-05-27 06:34:15 UTC (rev 4816)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-02 17:33:14 UTC (rev 4817)
@@ -456,9 +456,8 @@
private Item.Destination ShowMenuDialog(List<Item.Destination> destinations) //Visualizzazione menu di navigazione
{
GUIDialogMenu dlgMenu;
-
- if (_general.UseCustomDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + "ShortCuter.Navigator.DialogMenu.xml") ||
- File.Exists(GUIGraphicsContext.Theme + @"\" + "ShortCuter.Navigator.DialogMenu.xml")))
+ if (_general.UseCustomDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile) ||
+ File.Exists(GUIGraphicsContext.Theme + @"\" + NavigatorDialog.DialogSkinFile)))
//Utilizzo della finestra di dialogo personalizzata
dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
