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

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

Revision: 4829
          http://sourceforge.net/p/mp-plugins/code/4829
Author:   nicsergio
Date:     2014-06-08 19:05:56 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------


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

Added Paths:
-----------
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
    trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif

Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs	2014-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs	2014-06-08 19:05:56 UTC (rev 4829)
@@ -16,18 +16,29 @@
         private Timer       animationTimer;                                                //Timer per animazione logo Skin Navigator
         private int         animationCycle;                                                //Id ciclo per animazione logo Skin Navigator
         bool dir;
+        Image[] animationImages = new Image[9];
+
         #endregion
 
         #region Controlli Grafici
-        [SkinControl(10)]
+        [SkinControl(20)]
         protected GUIImage animationLogo;                                                  //Immagine logo animato Skin Navigator
         #endregion
 
         #region Metodi Pubblici
         public override bool Init()                                                        //Override metodo Init
         {
+            for (int i = 0; i < animationImages.Length; i++)                                   //Iterazione di ricerca impostazioni di tipo stringa
+            {
+                animationImages[i]=Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + i.ToString() + ".png"));
+            }
             return Load(GUIGraphicsContext.GetThemedSkinFile(@"\" + DialogSkinFile));      //--> inizializzazione solo se presente il file della skin per personalizzare la finestra di dialogo
         }
+        public override void DeInit()
+        {
+            animationImages.DisposeAndClear();
+            base.DeInit();
+        }
         public override string GetModuleName()                                             //Override metodo GetModuleName
         {
             return Tools.MyAssembly.Title;                                                 //--> ritorno del titolo dell'assembly
@@ -39,12 +50,12 @@
 
             try
             {
-                animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
-                animationLogo.SetFileName("[ShortCuter:NavigatorLogo]");                   //--> impostaziopne immagine logo Skin Navigator
-
-                animationTimer          = new Timer(2000);                                 //--> creazione timer animazione logo
+                animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.AnimLogo.gif"));
+                animationLogo.SetFileName("[ShortCuter:NavigatorLogo]");                   //--> impostazione immagine logo Skin Navigator
+                
+                /*animationTimer          = new Timer(500);                                 //--> creazione timer animazione logo
                 animationTimer.Elapsed += new ElapsedEventHandler(animationTimer_Elapsed); //--> sottoscrizione evento Elapsed
-                animationTimer.Enabled  = true;                                            //--> abilitazione timer
+                animationTimer.Enabled  = true;                                            //--> abilitazione timer*/
             }
             catch { }
         }
@@ -71,16 +82,17 @@
         {
             animationTimer.Stop();
 
-            int imageID = animationCycle % 9;
+            int imageID = animationCycle % 2;
 
 
-            animationTimer.Interval = 100 + (dir ? animationCycle : 36 - animationCycle) * 10;
-            
-            animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + imageID + ".png"));
+            //animationTimer.Interval = 500; // 50 + (dir ? animationCycle : 36 - animationCycle) * 5;
+
+            animationLogo.MemoryImage = animationImages[imageID]; //.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + imageID + ".png"));
             animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + imageID + "]");
+            //animationLogo.DoUpdate();
+            //animationLogo.UpdateLayout();
 
-
-            if (animationCycle >= 36)
+            /*if (animationCycle >= 36)
                 dir = false;
             if (animationCycle <= 0)
                 dir = true;
@@ -90,7 +102,9 @@
                 animationCycle++;
             else
                 animationCycle--;
-
+            */
+  
+            animationCycle++;
             animationTimer.Start();
         }
         #endregion

Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
===================================================================
(Binary files differ)

Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif	2014-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif	2014-06-08 19:05:56 UTC (rev 4829)

Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif
===================================================================
(Binary files differ)

Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif	2014-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif	2014-06-08 19:05:56 UTC (rev 4829)

Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo2.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
===================================================================
(Binary files differ)

Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif	2014-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif	2014-06-08 19:05:56 UTC (rev 4829)

Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif
===================================================================
(Binary files differ)

Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif	2014-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif	2014-06-08 19:05:56 UTC (rev 4829)

Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.gif
___________________________________________________________________
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-06-06 15:10:58 UTC (rev 4828)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj	2014-06-08 19:05:56 UTC (rev 4829)
@@ -200,6 +200,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="ExternalResources\Dialogs.dll" />
+    <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\AnimLogo.gif" />
     <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame0.png" />
     <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame1.png" />
     <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame2.png" />

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