[Mp-plugins-svn] SF.net SVN: mp-plugins:[4816] trunk/plugins/ShortCuter&SkinEditor/Source/ ShortCuter

[<nic...@us...>]

Revision: 4816
          http://sourceforge.net/p/mp-plugins/code/4816
Author:   nicsergio
Date:     2014-05-27 06:34:15 +0000 (Tue, 27 May 2014)
Log Message:
-----------


Modified Paths:
--------------
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs

Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs	2014-05-25 13:31:45 UTC (rev 4815)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs	2014-05-27 06:34:15 UTC (rev 4816)
@@ -7,16 +7,15 @@
     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
+        public const int    DialogWindowID = 2821976;                                      //Id finestra di dialogo personalizzata
+        public 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
+            return (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
         {

Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs	2014-05-25 13:31:45 UTC (rev 4815)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs	2014-05-27 06:34:15 UTC (rev 4816)
@@ -76,7 +76,7 @@
         {
             return Tools.MyAssembly.Title;
         }
-        public override int GetID { get { return 2821976; } }                                  //--> id finestra
+        public override int GetID { get { return NavigatorDialog.DialogWindowID; } }           //--> id finestra
         #endregion
 
         #region Metodi Privati

Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs	2014-05-25 13:31:45 UTC (rev 4815)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs	2014-05-27 06:34:15 UTC (rev 4816)
@@ -12,7 +12,6 @@
 using MediaPortal.Player;
 using MediaPortal.Profile;
 using MediaPortal.Util;
-using My.Common;
 using ShortCuter.Plugin;
 
 namespace ShortCuter
@@ -456,15 +455,15 @@
         #region Metodi Privati
         private Item.Destination ShowMenuDialog(List<Item.Destination> destinations)           //Visualizzazione menu di navigazione
         {
-            NavigatorDialog dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(333);
+            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  + @"\" + "ShortCuter.Navigator.DialogMenu.xml") ||
+                                             File.Exists(GUIGraphicsContext.Theme + @"\" + "ShortCuter.Navigator.DialogMenu.xml")))
                 //Utilizzo della finestra di dialogo personalizzata
-                //dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(2821976);
-            //else
+                dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
+            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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.