Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4815] trunk/plugins/ShortCuter&SkinEditor/Source/ ShortCuter
|
From: <nic...@us...> - 2014-05-25 13:31:48
|
Revision: 4815
http://sourceforge.net/p/mp-plugins/code/4815
Author: nicsergio
Date: 2014-05-25 13:31:45 +0000 (Sun, 25 May 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/KeyboardHook.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LogHandler.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
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/Settings.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
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/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/KeyboardHook.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/KeyboardHook.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/KeyboardHook.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -3,7 +3,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
internal class KeyboardHook //Classe per gestione hook di sistema
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.Designer.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,4 +1,4 @@
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
partial class ShortCuterConfig
{
@@ -212,7 +212,7 @@
//
this.rowDownButton.AutoSize = true;
this.rowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.rowDownButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowDown;
+ this.rowDownButton.Image = global::ShortCuter.Properties.Resources.RowDown;
this.rowDownButton.Location = new System.Drawing.Point(226, 264);
this.rowDownButton.Name = "rowDownButton";
this.rowDownButton.Size = new System.Drawing.Size(38, 38);
@@ -224,7 +224,7 @@
//
this.rowUpButton.AutoSize = true;
this.rowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.rowUpButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowUp;
+ this.rowUpButton.Image = global::ShortCuter.Properties.Resources.RowUp;
this.rowUpButton.Location = new System.Drawing.Point(186, 264);
this.rowUpButton.Name = "rowUpButton";
this.rowUpButton.Size = new System.Drawing.Size(38, 38);
@@ -234,7 +234,7 @@
//
// infoPictureBox
//
- this.infoPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.Info;
+ this.infoPictureBox.Image = global::ShortCuter.Properties.Resources.Info;
this.infoPictureBox.Location = new System.Drawing.Point(990, 5);
this.infoPictureBox.Name = "infoPictureBox";
this.infoPictureBox.Size = new System.Drawing.Size(24, 24);
@@ -247,7 +247,7 @@
//
this.rowRemoveButton.AutoSize = true;
this.rowRemoveButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.rowRemoveButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowRemove;
+ this.rowRemoveButton.Image = global::ShortCuter.Properties.Resources.RowRemove;
this.rowRemoveButton.Location = new System.Drawing.Point(46, 264);
this.rowRemoveButton.Name = "rowRemoveButton";
this.rowRemoveButton.Size = new System.Drawing.Size(38, 38);
@@ -259,7 +259,7 @@
//
this.rowAddButton.AutoSize = true;
this.rowAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.rowAddButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowAdd;
+ this.rowAddButton.Image = global::ShortCuter.Properties.Resources.RowAdd;
this.rowAddButton.Location = new System.Drawing.Point(6, 264);
this.rowAddButton.Name = "rowAddButton";
this.rowAddButton.Size = new System.Drawing.Size(38, 38);
@@ -270,7 +270,7 @@
// propLeftPictureBox
//
this.propLeftPictureBox.Enabled = false;
- this.propLeftPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.ArrowDown;
+ this.propLeftPictureBox.Image = global::ShortCuter.Properties.Resources.ArrowDown;
this.propLeftPictureBox.Location = new System.Drawing.Point(360, 257);
this.propLeftPictureBox.Name = "propLeftPictureBox";
this.propLeftPictureBox.Size = new System.Drawing.Size(131, 56);
@@ -345,7 +345,7 @@
//
this.rowCopyButton.AutoSize = true;
this.rowCopyButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.rowCopyButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowCopy;
+ this.rowCopyButton.Image = global::ShortCuter.Properties.Resources.RowCopy;
this.rowCopyButton.Location = new System.Drawing.Point(96, 264);
this.rowCopyButton.Name = "rowCopyButton";
this.rowCopyButton.Size = new System.Drawing.Size(38, 38);
@@ -357,7 +357,7 @@
//
this.skinNavAddButton.AutoSize = true;
this.skinNavAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
- this.skinNavAddButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.SkinNavAdd;
+ this.skinNavAddButton.Image = global::ShortCuter.Properties.Resources.SkinNavAdd;
this.skinNavAddButton.Location = new System.Drawing.Point(136, 264);
this.skinNavAddButton.Name = "skinNavAddButton";
this.skinNavAddButton.Size = new System.Drawing.Size(38, 38);
@@ -367,7 +367,7 @@
//
// skinNavConfigButton
//
- this.skinNavConfigButton.BackgroundImage = global::ProcessPlugins.ShortCuter.Properties.Resources.SkinNav;
+ this.skinNavConfigButton.BackgroundImage = global::ShortCuter.Properties.Resources.SkinNav;
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/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -7,9 +7,9 @@
using MediaPortal.Profile;
using My.Common;
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
- [PluginIcons("ProcessPlugins.ShortCuter.Resources.Images.ShortCuterEnable.png", "ProcessPlugins.ShortCuter.Resources.Images.ShortCuterDisable.png")]
+ [PluginIcons("ShortCuter.Resources.Images.ShortCuterEnable.png", "ShortCuter.Resources.Images.ShortCuterDisable.png")]
public partial class ShortCuterConfig : Form, ISetupForm //Form per la configurazione del plugin, con implementazione interfaccia ISetupForm (per lancio da configurazione MediaPortal)
{
#region Dati
@@ -263,6 +263,8 @@
//Se inizializzazione classi non completata
if (!mySkin.Initialized || !myShortCuts.Initialized)
{
+ if (myShortCuts != null)
+ myShortCuts.Log -= myShortCuts_Log; //--> annullamento sottoscrizione evento di log shortuts
this.Close();
this.Dispose();
}
@@ -275,7 +277,12 @@
{
//Se presenti modifiche non salvate: richiesta conferma per chiusura applicazione
if (unsavedChanges && !Tools.QuestionMessage("Unsaved changes will be lost...\nDo you want to proceed?"))
+ {
e.Cancel = true; //--> annullamento chiusura form
+ return;
+ }
+ if (myShortCuts != null)
+ myShortCuts.Log -= myShortCuts_Log; //--> annullamento sottoscrizione evento di log shortuts
}
#endregion
#region Evento di Log Shortcuts
@@ -465,7 +472,7 @@
}
private void infoPictureBox_Click(object sender, EventArgs e)
{
- VersionInfo.ShowInfo(ProcessPlugins.ShortCuter.Properties.Resources.ShortCuter, "...a big thank to MoPath for old version of this plugin!",
+ VersionInfo.ShowInfo(ShortCuter.Properties.Resources.ShortCuter, "...a big thank to MoPath for old version of this plugin!",
"http://forum.team-mediaportal.com/threads/shortcuter-plugin-v2.121721/",
"http://wiki.team-mediaportal.com/1_MEDIAPORTAL_1/17_Extensions/3_Plugins/ShortCut'er");
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.Designer.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.Designer.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,4 +1,4 @@
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
partial class ShortCuterKeyConfig
{
@@ -57,7 +57,7 @@
//
// okPictureBox
//
- this.okPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.Ok;
+ this.okPictureBox.Image = global::ShortCuter.Properties.Resources.Ok;
this.okPictureBox.Location = new System.Drawing.Point(193, 15);
this.okPictureBox.Name = "okPictureBox";
this.okPictureBox.Size = new System.Drawing.Size(32, 32);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterKeyConfig.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -2,9 +2,9 @@
using System.Drawing;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
- public partial class ShortCuterKeyConfig : Form //Form per assegnazione key allo shortcut corrente
+ internal partial class ShortCuterKeyConfig : Form //Form per assegnazione key allo shortcut corrente
{
#region Dati
private ShortCut mySc; //Istanza classe ShortCut per gestione shorcut corrente
@@ -21,18 +21,22 @@
keyLabel.Text = mySc.Key; //--> visualizzazione tasto correntemente assegnato
keyboardHook = new KeyboardHook(); //--> creazione oggetto per gestione hook di tastiera
- keyboardHook.KeyDown += new KeyEventHandler(keyboardHook_KeyDown); //--> sottoscrizione evento di KeyDown
}
#endregion
#region Consumazione Eventi
private void ShortCuterKeyConfig_Load(object sender, EventArgs e)
{
+ keyboardHook.KeyDown += new KeyEventHandler(keyboardHook_KeyDown); //--> sottoscrizione evento di KeyDown
keyboardHook.hook(); //--> attivazione hook di tastiera
}
private void ShortCuterKeyConfig_FormClosing(object sender, FormClosingEventArgs e)
{
- keyboardHook.unhook(); //--> disattivazione hook di tastiera
+ if (keyboardHook != null)
+ {
+ keyboardHook.unhook(); //--> disattivazione hook di tastiera
+ keyboardHook.KeyDown -= keyboardHook_KeyDown; //--> annullamento sottoscrizione evento di KeyDown
+ }
}
private void okPictureBox_Click(object sender, EventArgs e)
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,4 +1,4 @@
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
partial class SkinNavigatorConfig
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -7,9 +7,9 @@
using System.Text;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
- public partial class SkinNavigatorConfig : Form
+ internal partial class SkinNavigatorConfig : Form
{
public SkinNavigatorConfig()
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -2,7 +2,7 @@
using System.IO;
using My.Common;
-namespace ProcessPlugins.ShortCuter.Configuration
+namespace ShortCuter.Configuration
{
internal class Skin : MediaPortalSkin //Classe per gestione skin di MediaPortal
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -2,7 +2,7 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter
+namespace ShortCuter
{
internal static class LockKeys //Classe per modifica stato blocco maiuscole/numeri
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LogHandler.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LogHandler.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LogHandler.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,6 +1,6 @@
using System;
-namespace ProcessPlugins.ShortCuter
+namespace ShortCuter
{
internal delegate void LogEventHandler(object sender, LogEventArgs e); //Delegato per evento di log
internal class LogEventArgs : EventArgs //Argomenti per evento di log
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -0,0 +1,31 @@
+using MediaPortal.Dialogs;
+using MediaPortal.GUI.Library;
+using My.Common;
+
+namespace ShortCuter.Plugin
+{
+ public class NavigatorDialog : GUIDialogMenu //Classe per personalizzazione finestra di dialogo
+ {
+ #region Dati
+ public static const int DialogWindowID = 2821976; //Id finestra di dialogo personalizzata
+ public static const string DialogSkinFile = "ShortCuter.Navigator.DialogMenu.xml"; //File della skin per personalizzazione finestra di dialogo
+ #endregion
+
+ #region Metodi Pubblici
+ public override bool Init() //Override metodo Init
+ {
+ return (Load(GUIGraphicsContext.Skin + @"\" + DialogSkinFile));
+ //Load(GUIGraphicsContext.Theme + @"\" + DialogSkinFile) ||
+ // Load(GUIGraphicsContext.Skin + @"\" + 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
+ }
+ #endregion
+
+ #region Proprietà
+ public override int GetID { get { return DialogWindowID; } }
+ #endregion
+ }
+}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -3,9 +3,9 @@
using System.Runtime.InteropServices;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter.Plugin
+namespace ShortCuter.Plugin
{
- public class RawInputHook : IMessageFilter //Classe per gestione hook mediante raw input
+ internal class RawInputHook : IMessageFilter //Classe per gestione hook mediante raw input
{
#region Dati
private const int WM_INPUT = 0x00ff; //Id messaggio per RawInput
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -5,12 +5,13 @@
//using Action = MediaPortal.GUI.Library.Action;
using My.Common;
-namespace ProcessPlugins.ShortCuter.Plugin
+namespace ShortCuter.Plugin
{
- public class ShortCuter : IPlugin //Classe gestore shortcuts
+ public class ShortCuter : GUIInternalWindow //: IPlugin //Classe gestore shortcuts
{
#region Dati
private ShortCuts myShortCuts; //Istanza classe ShortCuts (dati relativi ai shortcuts configurati)
+ private RawInputHook rawInput; //Istanza classe RawInputHook (gestione hook mediante metodo raw input)
private static readonly string LogPrefix; //Prefisso per log eventi
#endregion
@@ -21,8 +22,8 @@
}
#endregion
- #region Implementazione IPlugin
- public void Start() //Avvio del plugin
+ #region Override GUIInternalWindow
+ public override bool Init() //Avvio del plugin
{
MpLog(new LogEventArgs(LogEventArgs.LogLevels.Info, "Plugin started"));
@@ -39,7 +40,7 @@
{
try
{
- RawInputHook rawInput = new RawInputHook(GUIGraphicsContext.form.Handle); //--> creazione hook mediante RawInput
+ rawInput = new RawInputHook(GUIGraphicsContext.form.Handle); //--> creazione hook mediante RawInput
rawInput.KeyDown += new KeyEventHandler(rawInput_KeyDown); //--> sottoscrizione evento KeyDown
}
catch (Exception e)
@@ -59,11 +60,23 @@
}
else
MpLog(new LogEventArgs(LogEventArgs.LogLevels.Error, "Error loading configuration"));
+ return false; //--> nessun file principale per visualizzazione plugin
}
- public void Stop() //Terminazione del plugin
+ public override void DeInit() //Terminazione del plugin
{
MpLog(new LogEventArgs(LogEventArgs.LogLevels.Info, "Plugin stopped"));
+ if (myShortCuts != null)
+ myShortCuts.Log -= myShortCuts_Log; //--> annullamento sottoscrizione evento di log shortuts
+ if (rawInput != null)
+ rawInput.KeyDown -= rawInput_KeyDown; //--> annullamento sottoscrizione evento shortuts
+ GUIWindowManager.OnActivateWindow -= GUIWindowManager_OnActivateWindow; //--> annullamento sottoscrizione evento di attivazione finestra di MediaPortal
+ base.DeInit(); //--> metodo classe base
}
+ public override string GetModuleName() //Valorizzazione proprietà #currentmodule al caricamento
+ {
+ return Tools.MyAssembly.Title;
+ }
+ public override int GetID { get { return 2821976; } } //--> id finestra
#endregion
#region Metodi Privati
@@ -87,7 +100,7 @@
}
}
#endregion
-
+
#region Consumazione Eventi
private void rawInput_KeyDown(object sender, KeyEventArgs e) //Evento di pressione tasto
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Program.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
-namespace ProcessPlugins.ShortCuter
+namespace ShortCuter
{
static class Program
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
-namespace ProcessPlugins.ShortCuter.Properties {
+namespace ShortCuter.Properties {
using System;
@@ -39,7 +39,7 @@
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProcessPlugins.ShortCuter.Properties.Resources", typeof(Resources).Assembly);
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ShortCuter.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Settings.Designer.cs 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Settings.Designer.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.296
+// Versione runtime:4.0.30319.17929
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
-namespace ProcessPlugins.ShortCuter.Properties {
+namespace ShortCuter.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-05-25 13:31:45 UTC (rev 4815)
@@ -189,7 +189,7 @@
<Separator>--------------------------------</Separator>
<ShowNumbers>1</ShowNumbers>
<RemoveDuplicates>1</RemoveDuplicates>
- <UseCustomDialog>0</UseCustomDialog>
+ <UseCustomDialog>1</UseCustomDialog>
</General>
<Items>
<Item>
@@ -223,7 +223,7 @@
<Destinations>
<Destination>
<Caption>Music</Caption>
- <WindowID>502</WindowID>
+ <WindowID>501</WindowID>
<LoadParameter />
<Force>0</Force>
<Icon />
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-05-25 13:31:45 UTC (rev 4815)
@@ -8,7 +8,7 @@
<ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>ProcessPlugins.ShortCuter</RootNamespace>
+ <RootNamespace>ShortCuter</RootNamespace>
<AssemblyName>ShortCuter</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
@@ -32,9 +32,12 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>
+ </DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DebugSymbols>true</DebugSymbols>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup>
<StartupObject>
@@ -43,6 +46,9 @@
<PropertyGroup>
<ApplicationIcon>Resources\Images\ShortCuter.ico</ApplicationIcon>
</PropertyGroup>
+ <PropertyGroup>
+ <SignAssembly>false</SignAssembly>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -96,6 +102,7 @@
<Compile Include="Configuration\KeyboardHook.cs" />
<Compile Include="LockKeys.cs" />
<Compile Include="LogHandler.cs" />
+ <Compile Include="Plugin\NavigatorDialog.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user 2014-05-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj.user 2014-05-25 13:31:45 UTC (rev 4815)
@@ -10,4 +10,9 @@
<FallbackCulture>it-IT</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <StartAction>Project</StartAction>
+ <StartProgram>C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.exe</StartProgram>
+ <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+ </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-23 13:47:11 UTC (rev 4814)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-05-25 13:31:45 UTC (rev 4815)
@@ -13,8 +13,9 @@
using MediaPortal.Profile;
using MediaPortal.Util;
using My.Common;
+using ShortCuter.Plugin;
-namespace ProcessPlugins.ShortCuter
+namespace ShortCuter
{
internal class WindowLink //Classe collegamento ad una finestra di MediaPortal
{
@@ -437,28 +438,6 @@
public BindingList<Destination> Destinations { get { return this._destinations; } }
#endregion
}
- public class NavigatorDialog : GUIDialogMenu //Sotto-classe per eventuale personalizzazione finestra di dialogo
- {
- #region Dati
- public const int DialogWindowID = 2821976; //Id finestra di dialogo personalizzata
- public const string DialogSkinFile = "ShortCuter.SkinNavigator.DialogMenu.xml"; //File della skin per personalizzazione finestra di dialogo
- #endregion
-
- #region Metodi Pubblici
- public override bool Init() //Override metodo Init
- {
- return Load(GUIGraphicsContext.Skin + @"\" + 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
- }
- #endregion
-
- #region Proprietà
- public override int GetID { get { return DialogWindowID; } }
- #endregion
- }
#endregion
#region Dati
@@ -477,14 +456,15 @@
#region Metodi Privati
private Item.Destination ShowMenuDialog(List<Item.Destination> destinations) //Visualizzazione menu di navigazione
{
- GUIDialogMenu dlgMenu;
+ NavigatorDialog dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(333);
- if (_general.UseCustomDialog && File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile))
+ //if (_general.UseCustomDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + "ShortCuter.Navigator.DialogMenu.xml") ||
+ // File.Exists(GUIGraphicsContext.Theme + @"\" + "ShortCuter.Navigator.DialogMenu.xml")))
//Utilizzo della finestra di dialogo personalizzata
- dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
- else
+ //dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(2821976);
+ //else
//Utilizzo della finestra di dialogo predefinita
- dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ //dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
dlgMenu.Reset();
dlgMenu.SetHeading(_general.MenuHeader); //--> intestazione menu
@@ -515,7 +495,7 @@
try
{
XmlDocument xmlFile = new XmlDocument();
- using (Stream defaultConfig = Assembly.GetExecutingAssembly().GetManifestResourceStream("ProcessPlugins.ShortCuter.Resources.XmlFiles.DefaultConfig.xml"))
+ using (Stream defaultConfig = Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.XmlFiles.DefaultConfig.xml"))
{
xmlFile.Load(defaultConfig); //Configurazione predefinita --> lettura file xml incapsulato
}
@@ -845,7 +825,7 @@
{
XmlDocument xmlFile = new XmlDocument();
if (defaultSettings)
- using (Stream defaultConfig = Assembly.GetExecutingAssembly().GetManifestResourceStream("ProcessPlugins.ShortCuter.Resources.XmlFiles.DefaultConfig.xml"))
+ using (Stream defaultConfig = Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.XmlFiles.DefaultConfig.xml"))
{
xmlFile.Load(defaultConfig); //Configurazione predefinita --> lettura file xml incapsulato
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
