Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4723] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-01-13 16:49:54
|
Revision: 4723
http://sourceforge.net/p/mp-plugins/code/4723
Author: nicsergio
Date: 2014-01-13 16:49:51 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.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.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2014-01-13 16:49:51 UTC (rev 4723)
@@ -215,42 +215,6 @@
<metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="buildDateLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="authorLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="descriptionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="titleLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="versionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="versionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="buildDateHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="authorHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="descriptionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="titleHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="forumLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -317,7 +281,4 @@
<metadata name="commentLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs 2014-01-13 16:49:51 UTC (rev 4723)
@@ -10,7 +10,7 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new ShortCuterForm());
+ Application.Run(new ShortCuterConfig());
}
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-13 16:49:51 UTC (rev 4723)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.17929
+// Versione runtime:4.0.30319.18052
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
@@ -83,6 +83,16 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ internal static System.Drawing.Bitmap Ok {
+ get {
+ object obj = ResourceManager.GetObject("Ok", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap RowAdd {
get {
object obj = ResourceManager.GetObject("RowAdd", resourceCulture);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-13 16:49:51 UTC (rev 4723)
@@ -124,6 +124,10 @@
<data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\info.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="Ok" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\..\common\resources\images\ok.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="RowAdd" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\rowadd.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -136,7 +140,6 @@
<data name="RowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\rowup.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="ShortCuter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\images\shortcuterenable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-01-13 16:49:51 UTC (rev 4723)
@@ -5,7 +5,7 @@
using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
using MediaPortal.Util;
-using Action = MediaPortal.GUI.Library.Action;
+//using Action = MediaPortal.GUI.Library.Action;
using My.Common;
namespace ProcessPlugins.ShortCuter
@@ -15,9 +15,10 @@
#region Dati
private ShortCuts myShortCuts; //Istanza classe ShortCuts (dati relativi ai shortcuts configurati)
private static readonly string LogPrefix; //Prefisso per log eventi
- private const int TrailersPluginControlID = 11899; //ID controllo per attivazione plugin Trailers
- private int lastWindowID; //Id finestra per visualizzazione in MediaPortal
- private string lastLoadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
+ private const int TrailersPluginControlID = 11899; //Id controllo per attivazione plugin Trailers
+ private const int InvalidWindowID = -1; //Id finestra invalido
+ private int lastWindowID; //Id ultima finestra attivata dal plugin
+ private string lastLoadParameter; //Eventuali ultimi parametri di caricamento usati dal plugin
#endregion
#region Costruttore
@@ -51,12 +52,19 @@
{
MpLog(true, "Error creating raw input hook");
}
+
+ try
+ {
+ //Sottoscrizione evento di attivazione finestra di MediaPortal
+ GUIWindowManager.OnActivateWindow += new GUIWindowManager.WindowActivationHandler(GUIWindowManager_OnActivateWindow);
+ }
+ catch
+ {
+ MpLog(true, "Error subscription ActivateWindow event");
+ }
}
else
- MpLog(true, "Error loading configuration");
-
- //GUIWindowManager.OnNewAction += new OnActionHandler(this.OnKeyPress);
- //GUIWindowManager.OnActivateWindow += new GUIWindowManager.WindowActivationHandler(GUIWindowManager_OnActivateWindow);
+ MpLog(true, "Error loading configuration");
}
public void Stop() //Terminazione del plugin
{
@@ -140,7 +148,7 @@
}
private bool AlreadyAtDestination(ShortCut sc) //Verifica se finestra attuale corrispondente a destinazione shortcut
{
- if ((int)GUIWindowManager.ActiveWindow == sc.WindowID) //Prima verifica: da gestore finestra di mediaPortal
+ if ((int)GUIWindowManager.ActiveWindow == sc.WindowID) //Prima verifica: da gestore finestre di mediaPortal
{
if (lastWindowID == sc.WindowID) //Seconda verifica: utilizzo dei parametri memorizzati dal plugin se attendibili
if (lastLoadParameter == sc.LoadParameter) //--> verifica corrispondenza eventuali parametri di caricamento per visualizzazione
@@ -222,6 +230,11 @@
MpLog(false, "Key not mapped: Key=" + (e.Control ? "<CTRL>" : "") + (e.Alt ? "<ALT>" : "") + (e.Shift ? "<SHIFT>" : "") + "<" + e.KeyCode.ToString() + ">");
}
}
+ private void GUIWindowManager_OnActivateWindow(int windowID) //Evento di attivazione finestra di MediaPortal
+ {
+ if (windowID != lastWindowID) //Se attivata una finestra non corrispondente all'ultima destinazione del plugin
+ lastWindowID = InvalidWindowID; //--> invalidazione parametri memorizzati dal plugin
+ }
#endregion
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-13 16:49:51 UTC (rev 4723)
@@ -98,12 +98,18 @@
</Compile>
<Compile Include="RawInputHook.cs" />
<Compile Include="ShortCuter.cs" />
- <Compile Include="ShortCuterForm.cs">
+ <Compile Include="ShortCuterConfig.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="ShortCuterForm.Designer.cs">
- <DependentUpon>ShortCuterForm.cs</DependentUpon>
+ <Compile Include="ShortCuterConfig.Designer.cs">
+ <DependentUpon>ShortCuterConfig.cs</DependentUpon>
</Compile>
+ <Compile Include="ShortCuterKeyConfig.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ShortCuterKeyConfig.Designer.cs">
+ <DependentUpon>ShortCuterKeyConfig.cs</DependentUpon>
+ </Compile>
<Compile Include="ShortCuts.cs" />
<Compile Include="SkinWithSounds.cs" />
</ItemGroup>
@@ -116,9 +122,12 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="ShortCuterForm.resx">
- <DependentUpon>ShortCuterForm.cs</DependentUpon>
+ <EmbeddedResource Include="ShortCuterConfig.resx">
+ <DependentUpon>ShortCuterConfig.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ShortCuterKeyConfig.resx">
+ <DependentUpon>ShortCuterKeyConfig.cs</DependentUpon>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Properties\Settings.settings">
@@ -151,6 +160,9 @@
<Content Include="..\Common\Resources\Images\Info.png">
<Link>Resources\Images\Info.png</Link>
</Content>
+ <Content Include="..\Common\Resources\Images\Ok.png">
+ <Link>Resources\Images\Ok.png</Link>
+ </Content>
<Content Include="..\Common\Resources\Images\RowAdd.png">
<Link>Resources\Images\RowAdd.png</Link>
</Content>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-01-12 19:08:05 UTC (rev 4722)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-01-13 16:49:51 UTC (rev 4723)
@@ -11,7 +11,7 @@
namespace ProcessPlugins.ShortCuter
{
- internal class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
+ public class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
{
#region Dati
private string _caption; //Titolo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
