Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <nic...@us...> - 2014-06-16 17:28:24
|
Revision: 4840
http://sourceforge.net/p/mp-plugins/code/4840
Author: nicsergio
Date: 2014-06-16 17:28:20 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -67,7 +67,7 @@
{
if (!Directory.Exists(_paths.Skin))
{
- Tools.ErrorMessage("Skin folder not found!", _paths.Skin);
+ DialogHelper.Error("Skin folder not found!", _paths.Skin);
return false;
}
string[] files = Directory.GetFiles(_paths.Skin); //--> lettura file da disco
@@ -96,7 +96,7 @@
return true; //--> raccolta files effettuata
else
{
- Tools.ErrorMessage("No skin files found.", _paths.Skin);
+ DialogHelper.Error("No skin files found.", _paths.Skin);
return false;
}
}
@@ -113,7 +113,7 @@
}
catch (Exception e)
{
- Tools.ErrorMessage("Error loading PopularSkinLinks.xml.", e.Message);
+ DialogHelper.Error("Error loading PopularSkinLinks.xml.", e.Message);
return false;
}
@@ -131,7 +131,7 @@
return true; //--> raccolta links effettuata
else
{
- Tools.ErrorMessage("No skin links found loading PopularSkinLinks.xml.");
+ DialogHelper.Error("No skin links found loading PopularSkinLinks.xml.");
return false;
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -9,110 +9,92 @@
namespace My.Common
{
- internal static class Tools //Collezione utilità
+ internal static class ExecutingAssembly //Classe per accesso alle proprietà assembly in esecuzione
{
- #region Classi
- public static class MyAssembly //Classe per accesso alle proprietà assembly in esecuzione
+ #region Dati
+ public static readonly string Name; //Nome progetto
+ public static readonly string Title; //Titolo
+ public static readonly string File; //File binario
+ public static readonly string Path; //Percorso del file binario
+ public static readonly string Version; //Versione
+ public static readonly string Description; //Descrizione (breve)
+ public static readonly string Author; //Autore
+ public static readonly string BuildDate; //Data & ora di compilazione
+ #endregion
+
+ #region Costruttore
+ static ExecutingAssembly()
{
- #region Dati
- public static readonly string Name; //Nome progetto
- public static readonly string Title; //Titolo
- public static readonly string File; //File binario
- public static readonly string Path; //Percorso del file binario
- public static readonly string Version; //Versione
- public static readonly string Description; //Descrizione (breve)
- public static readonly string Author; //Autore
- public static readonly string BuildDate; //Data & ora di compilazione
- #endregion
+ Assembly myAssembly = Assembly.GetExecutingAssembly(); //Raccolta informazioni assembly in esecuzione
+ Name = myAssembly.GetName().Name.ToString();
+ Title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title;
+ File = System.IO.Path.GetFileName(myAssembly.Location);
+ Path = System.IO.Path.GetDirectoryName(myAssembly.Location) + @"\";
+ Version = myAssembly.GetName().Version.ToString();
+ Description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description;
+ Author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company;
+ BuildDate = RetrieveLinkerTimestamp(myAssembly.Location);
+ }
+ #endregion
- #region Costruttore
- static MyAssembly()
+ #region Metodi Privati
+ private static string RetrieveLinkerTimestamp(string filePath) //Lettura data & ora di compilazione di un assembly
+ {
+ const int c_PeHeaderOffset = 60;
+ const int c_LinkerTimestampOffset = 8;
+ byte[] b = new byte[2048];
+ System.IO.Stream s = null;
+
+ try
{
- Assembly myAssembly = Assembly.GetExecutingAssembly(); //Raccolta informazioni assembly in esecuzione
- Name = myAssembly.GetName().Name.ToString();
- Title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title;
- File = System.IO.Path.GetFileName(myAssembly.Location);
- Path = System.IO.Path.GetDirectoryName(myAssembly.Location) + @"\";
- Version = myAssembly.GetName().Version.ToString();
- Description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description;
- Author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company;
- BuildDate = RetrieveLinkerTimestamp(myAssembly.Location);
+ s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+ s.Read(b, 0, 2048);
}
- #endregion
-
- #region Metodi Privati
- private static string RetrieveLinkerTimestamp(string filePath) //Lettura data & ora di compilazione di un assembly
+ finally
{
- const int c_PeHeaderOffset = 60;
- const int c_LinkerTimestampOffset = 8;
- byte[] b = new byte[2048];
- System.IO.Stream s = null;
+ if (s != null)
+ s.Close();
+ }
- try
- {
- s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read);
- s.Read(b, 0, 2048);
- }
- finally
- {
- if (s != null)
- s.Close();
- }
-
- int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset);
- int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset);
- DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0);
- dt = dt.AddSeconds(secondsSince1970);
- dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours);
- return dt.ToString();
- }
- #endregion
+ int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset);
+ int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset);
+ DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0);
+ dt = dt.AddSeconds(secondsSince1970);
+ dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours);
+ return dt.ToString();
}
#endregion
-
+ }
+ internal static class DialogHelper //Classe per gestire velocemente finestre di dialogo
+ {
#region Dati
- private static readonly string MessageHeader = MyAssembly.Title; //Intestazione messaggi (titolo assembly)
+ private static readonly string MessageHeader = ExecutingAssembly.Title; //Intestazione messaggi (titolo assembly)
#endregion
#region Metodi Pubblici
- #region Finestre di Dialogo
- public static void ErrorMessage(string description) //Emissione messaggio di errore (senza errore specifico)
+ public static void Error(string description) //Emissione messaggio di errore (senza errore specifico)
{
- ErrorMessage(description, string.Empty); //--> override metodo per parametro opzionale
+ Error(description, string.Empty); //--> override metodo per parametro opzionale
}
- public static void ErrorMessage(string description, string error) //Emissione messaggio di errore (con errore specifico)
+ public static void Error(string description, string error) //Emissione messaggio di errore (con errore specifico)
{
if (error.Length > 0)
description += string.Format("\n\n[{0}]", error); //--> composizione stringa descrizione per errore specifico
MessageBox.Show(description, MessageHeader, MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
}
- public static void InfoMessage(string description) //Emissione messaggio informativo
+ public static void Info(string description) //Emissione messaggio informativo
{
MessageBox.Show(description, MessageHeader, MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1);
}
- public static bool QuestionMessage(string question) //Emissione messaggio di conferma
+ public static bool Question(string question) //Emissione messaggio di conferma
{
DialogResult ret = MessageBox.Show(question, MessageHeader, MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2);
return (ret == DialogResult.OK);
}
#endregion
- #region Metodi Grafici
- public static void RoundEdges(Control winControl, int radius) //Arrotondamento spigoli controllo grafico (raggiature simmetriche)
- {
- RoundEdges(winControl, radius, radius);
- }
- public static void RoundEdges(Control winControl, int wRadius, int hRadius) //Arrotondamento spigoli controllo grafico
- {
- Rectangle r = new Rectangle(-1, -1, winControl.Width + 1, winControl.Height + 1);
- GraphicsPath gp = new GraphicsPath();
- gp.AddArc(r.X, r.Y, wRadius, hRadius, 180, 90);
- gp.AddArc(r.X + r.Width - wRadius, r.Y, wRadius, hRadius, 270, 90);
- gp.AddArc(r.X + r.Width - wRadius, r.Y + r.Height - hRadius, wRadius, hRadius, 0, 90);
- gp.AddArc(r.X, r.Y + r.Height - hRadius, wRadius, hRadius, 90, 90);
- winControl.Region = new Region(gp);
- }
- #endregion
- #region Enum con Descrizioni
+ }
+ internal static class EnumHelper //Classe per gestione enumerativi con descrizione
+ {
public static string GetEnumDescription(Enum enumValue) //Ottenimento descrizione enumerativo
{
FieldInfo fi = enumValue.GetType().GetField(enumValue.ToString());
@@ -140,7 +122,22 @@
strings.Add(GetEnumDescription(e));
return strings;
}
- #endregion
- #endregion
}
+ internal static class GraphTools //Classe di utilità grafiche
+ {
+ public static void RoundEdges(Control winControl, int radius) //Arrotondamento spigoli controllo grafico (raggiature simmetriche)
+ {
+ RoundEdges(winControl, radius, radius);
+ }
+ public static void RoundEdges(Control winControl, int wRadius, int hRadius) //Arrotondamento spigoli controllo grafico
+ {
+ Rectangle r = new Rectangle(-1, -1, winControl.Width + 1, winControl.Height + 1);
+ GraphicsPath gp = new GraphicsPath();
+ gp.AddArc(r.X, r.Y, wRadius, hRadius, 180, 90);
+ gp.AddArc(r.X + r.Width - wRadius, r.Y, wRadius, hRadius, 270, 90);
+ gp.AddArc(r.X + r.Width - wRadius, r.Y + r.Height - hRadius, wRadius, hRadius, 0, 90);
+ gp.AddArc(r.X, r.Y + r.Height - hRadius, wRadius, hRadius, 90, 90);
+ winControl.Region = new Region(gp);
+ }
+ }
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -28,14 +28,14 @@
{ //Visualizzazione informazioni sulla versione
myVersionInfo = new VersionInfo();
myVersionInfo.logoPictureBox.Image = logo; //--> logo applicazione
- Tools.RoundEdges(myVersionInfo, 75, 50); //--> arrotondamento spigoli form
+ GraphTools.RoundEdges(myVersionInfo, 75, 50); //--> arrotondamento spigoli form
- myVersionInfo.versionLabel.Text = Tools.MyAssembly.Version;
- myVersionInfo.fileLabel.Text = Tools.MyAssembly.File;
- myVersionInfo.titleLabel.Text = Tools.MyAssembly.Title;
- myVersionInfo.descriptionLabel.Text = Tools.MyAssembly.Description;
- myVersionInfo.authorLabel.Text = Tools.MyAssembly.Author;
- myVersionInfo.buildDateLabel.Text = Tools.MyAssembly.BuildDate;
+ myVersionInfo.versionLabel.Text = ExecutingAssembly.Version;
+ myVersionInfo.fileLabel.Text = ExecutingAssembly.File;
+ myVersionInfo.titleLabel.Text = ExecutingAssembly.Title;
+ myVersionInfo.descriptionLabel.Text = ExecutingAssembly.Description;
+ myVersionInfo.authorLabel.Text = ExecutingAssembly.Author;
+ myVersionInfo.buildDateLabel.Text = ExecutingAssembly.BuildDate;
if (comment.Length > 0) //Eventuale visualizzazione commento
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -247,7 +247,7 @@
}
if (mySkin.Initialized)
{
- string settingsFile = Config.GetFile(Config.Dir.Config, Tools.MyAssembly.Name + ".xml");
+ string settingsFile = Config.GetFile(Config.Dir.Config, ExecutingAssembly.Name + ".xml");
myShortCuts = new ShortCuts(settingsFile); //Creazione classe per gestione shorcuts
myShortCuts.Log += new LogEventHandler(myShortCuts_Log); //Sottoscrizione evento di log shortuts
@@ -276,7 +276,7 @@
private void ShortCuterConfig_FormClosing(object sender, FormClosingEventArgs e)
{
//Se presenti modifiche non salvate: richiesta conferma per chiusura applicazione
- if (unsavedChanges && !Tools.QuestionMessage("Unsaved changes will be lost...\nDo you want to proceed?"))
+ if (unsavedChanges && !DialogHelper.Question("Unsaved changes will be lost...\nDo you want to proceed?"))
{
e.Cancel = true; //--> annullamento chiusura form
return;
@@ -292,12 +292,12 @@
{
case LogEventArgs.LogLevels.Error:
if (e.LogException != null)
- Tools.ErrorMessage(e.LogMessage, e.LogException.Message); //--> emissione finestra di errore (con descrizione errore)
+ DialogHelper.Error(e.LogMessage, e.LogException.Message); //--> emissione finestra di errore (con descrizione errore)
else
- Tools.ErrorMessage(e.LogMessage); //--> emissione finestra di errore
+ DialogHelper.Error(e.LogMessage); //--> emissione finestra di errore
break;
case LogEventArgs.LogLevels.Info:
- Tools.InfoMessage(e.LogMessage); //--> emissione finestra informativa
+ DialogHelper.Info(e.LogMessage); //--> emissione finestra informativa
break;
}
}
@@ -461,7 +461,7 @@
}
private void resetButton_Click(object sender, EventArgs e)
{
- if (Tools.QuestionMessage("Configuration data will be overwritten...\nDo you want to proceed?"))
+ if (DialogHelper.Question("Configuration data will be overwritten...\nDo you want to proceed?"))
{
myShortCuts.LoadConfig(true);
}
@@ -481,15 +481,15 @@
#region Implementazione ISetupForm
public string PluginName()
{
- return Tools.MyAssembly.Title;
+ return ExecutingAssembly.Title;
}
public string Description()
{
- return Tools.MyAssembly.Description;
+ return ExecutingAssembly.Description;
}
public string Author()
{
- return Tools.MyAssembly.Author;
+ return ExecutingAssembly.Author;
}
public void ShowPlugin()
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -23,7 +23,7 @@
DirectoryInfo dInfo = new DirectoryInfo(_paths.Sounds);
if (!dInfo.Exists)
{
- Tools.ErrorMessage("Skin sounds folder not found!", _paths.Sounds);
+ DialogHelper.Error("Skin sounds folder not found!", _paths.Sounds);
return false;
}
foreach (FileInfo fInfo in dInfo.GetFiles()) //Iterazione per applicazione filtro e memorizzazione dati
@@ -38,7 +38,7 @@
}
else
{
- Tools.ErrorMessage("No sounds found.", _paths.Sounds);
+ DialogHelper.Error("No sounds found.", _paths.Sounds);
return false;
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -41,7 +41,7 @@
}
public override string GetModuleName() //Override metodo GetModuleName
{
- return Tools.MyAssembly.Title; //--> ritorno del titolo dell'assembly
+ return ExecutingAssembly.Title; //--> ritorno del titolo dell'assembly
}
protected override void OnWindowLoaded() //Override metodo OnWindowLoaded
{
@@ -69,7 +69,7 @@
protected override void OnPageLoad() //Override metodo OnPageLoad
{
base.OnPageLoad();
- lblHeading2.Label = Tools.MyAssembly.Title; //--> forzatura label "Menu"
+ lblHeading2.Label = ExecutingAssembly.Title; //--> forzatura label "Menu"
int navControlId = 0;
if (!_panelView) //Visualizzazione a lista
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -18,7 +18,7 @@
#region Costruttore
static ShortCuter() //Costruttore classe ShortCuter
{
- LogPrefix = Tools.MyAssembly.Title + ": "; //Header per log su file (titolo assembly)
+ LogPrefix = ExecutingAssembly.Title + ": "; //Header per log su file (titolo assembly)
}
#endregion
@@ -27,7 +27,7 @@
{
MpLog(new LogEventArgs(LogEventArgs.LogLevels.Info, "Plugin started"));
- string settingsFile = Config.GetFile(Config.Dir.Config, Tools.MyAssembly.Name + ".xml");
+ string settingsFile = Config.GetFile(Config.Dir.Config, ExecutingAssembly.Name + ".xml");
myShortCuts = new ShortCuts(settingsFile); //Creazione classe per gestione shorcuts
myShortCuts.Log += new LogEventHandler(myShortCuts_Log); //--> sottoscrizione evento di log shortuts
@@ -74,7 +74,7 @@
}
public override string GetModuleName() //Valorizzazione proprietà #currentmodule al caricamento
{
- return Tools.MyAssembly.Title;
+ return ExecutingAssembly.Title;
}
public override int GetID { get { return (NavigatorDialog.DialogWindowID + 1); } } //--> id finestra (deve avere un valore >0 e diverso da NavigatorDialog)
#endregion
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -80,7 +80,7 @@
fanartHandlerPictureBox.Parent = backgroundPictureBox;
fanartHandlerPictureBox.Location = new Point(fanartHandlerPictureBox.Location.X - backgroundPictureBox.Location.X,
fanartHandlerPictureBox.Location.Y - backgroundPictureBox.Location.Y);
- Tools.RoundEdges(backgroundPictureBox, 45);
+ GraphTools.RoundEdges(backgroundPictureBox, 45);
toolTip.SetToolTip(menuRowAddButton, "Add menu item to list");
toolTip.SetToolTip(menuRowRemoveButton, "Remove selected menu item from list");
@@ -385,7 +385,7 @@
{
if (captionTextBox.Text.Length == 0)
{
- Tools.InfoMessage("A caption is requested.");
+ DialogHelper.Info("A caption is requested.");
return;
}
MenuItem mItem = new MenuItem();
@@ -430,12 +430,12 @@
{
if (captionTextBox.Text.Length == 0)
{
- Tools.InfoMessage("A caption is requested.");
+ DialogHelper.Info("A caption is requested.");
return;
}
if (contextTextBox.Text.Length > 0 || multiImageRadioButton.Checked || fanartRadioButton.Checked || overlayComboBox.SelectedIndex > 0)
- Tools.InfoMessage("Sub-menu items limitations:\n" +
+ DialogHelper.Info("Sub-menu items limitations:\n" +
" - only support single background image (no multi-image, no fanart)\n" +
" - do not support overlay\n" +
" - do not display context labels" );
@@ -504,7 +504,7 @@
myMediaPortal = new MediaPortal(SkinName);
if (myMediaPortal.Initialized)
{
- string settingsFile = MediaPortal.ConfigPath + Tools.MyAssembly.Name + ".xml";
+ string settingsFile = MediaPortal.ConfigPath + ExecutingAssembly.Name + ".xml";
//Lettura impostazioni e gestione menu
myMenu = new MenuItems(settingsFile, MenuItemsMinNum, MenuItemsMaxNum, SubMenuItemsMaxNum);
if (myMenu.Initialized)
@@ -530,7 +530,7 @@
{
if (unsavedChanges) //Se presenti modifiche non salvate
{ //Richiesta conferma per chiusura applicazione
- if (!Tools.QuestionMessage("Unsaved changes will be lost...\nDo you want to proceed?"))
+ if (!DialogHelper.Question("Unsaved changes will be lost...\nDo you want to proceed?"))
{
e.Cancel = true; //--> annullamento chiusura form
return;
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -67,7 +67,7 @@
DirectoryInfo dInfo = new DirectoryInfo(_paths.Media);
if (!dInfo.Exists)
{
- Tools.ErrorMessage("Skin media folder not found!", _paths.Media);
+ DialogHelper.Error("Skin media folder not found!", _paths.Media);
return false;
}
string fName, fExt;
@@ -101,7 +101,7 @@
return true; //--> raccolta immagini effettuata
else
{
- Tools.ErrorMessage("No background images found.", _paths.Media);
+ DialogHelper.Error("No background images found.", _paths.Media);
return false;
}
}
@@ -110,7 +110,7 @@
DirectoryInfo dInfo = new DirectoryInfo(_paths.Animations);
if (!dInfo.Exists)
{
- Tools.ErrorMessage("Skin animations folder not found!", _paths.Animations);
+ DialogHelper.Error("Skin animations folder not found!", _paths.Animations);
return false;
}
foreach (DirectoryInfo subdInfo in dInfo.GetDirectories()) //Iterazione per applicazione filtro e memorizzazione dati
@@ -122,7 +122,7 @@
return true; //--> raccolta cartelle effettuata
else
{
- Tools.ErrorMessage("No animation folders found.", _paths.Animations);
+ DialogHelper.Error("No animation folders found.", _paths.Animations);
return false;
}
}
@@ -131,7 +131,7 @@
DirectoryInfo dInfo = new DirectoryInfo(_paths.Icons);
if (!dInfo.Exists)
{
- Tools.ErrorMessage("Skin icons folder not found!", _paths.Icons);
+ DialogHelper.Error("Skin icons folder not found!", _paths.Icons);
return false;
}
string fExt;
@@ -145,7 +145,7 @@
return true; //--> raccolta icone effettuata
else
{
- Tools.ErrorMessage("No icons found.", _paths.Icons);
+ DialogHelper.Error("No icons found.", _paths.Icons);
return false;
}
}
@@ -188,7 +188,7 @@
}
else
{
- Tools.ErrorMessage("No BasicHome overlay found.", _paths.Skin);
+ DialogHelper.Error("No BasicHome overlay found.", _paths.Skin);
return false;
}
}
@@ -275,13 +275,13 @@
}
catch (Exception e)
{
- _paths.Install = string.Empty;
- Tools.ErrorMessage("MediaPortal installation not found.\nMediaPortal must be installed!", e.Message);
+ _paths.Install = string.Empty;
+ DialogHelper.Error("MediaPortal installation not found.\nMediaPortal must be installed!", e.Message);
return false;
}
if ((_paths.Install.Length == 0) || (!Directory.Exists(_paths.Install)))
{
- Tools.ErrorMessage("MediaPortal installation folder not found!", _paths.Install);
+ DialogHelper.Error("MediaPortal installation folder not found!", _paths.Install);
return false;
}
else
@@ -297,7 +297,7 @@
XmlDocument xmlDirs = new XmlDocument();
if (!File.Exists(dirs))
{
- Tools.ErrorMessage("MediaPortal directories file not found!", dirs);
+ DialogHelper.Error("MediaPortal directories file not found!", dirs);
return false;
}
xmlDirs.Load(dirs);
@@ -328,25 +328,25 @@
}
if ((_paths.Config.Length == 0) || (!Directory.Exists(_paths.Config)))
{
- Tools.ErrorMessage("MediaPortal configuration folder not found!", _paths.Config);
+ DialogHelper.Error("MediaPortal configuration folder not found!", _paths.Config);
return false;
}
else
if ((_paths.Skins.Length == 0) || (!Directory.Exists(_paths.Skins)))
{
- Tools.ErrorMessage("MediaPortal skins folder not found!", _paths.Skins);
+ DialogHelper.Error("MediaPortal skins folder not found!", _paths.Skins);
return false;
}
else
if ((_paths.Thumbs.Length == 0) | (!Directory.Exists(_paths.Thumbs)))
{
- Tools.ErrorMessage("MediaPortal thumbs folder not found!", _paths.Thumbs);
+ DialogHelper.Error("MediaPortal thumbs folder not found!", _paths.Thumbs);
return false;
}
else
if ((_paths.Caches.Length == 0) | (!Directory.Exists(_paths.Caches)))
{
- Tools.ErrorMessage("MediaPortal skins cache folder not found!", _paths.Caches);
+ DialogHelper.Error("MediaPortal skins cache folder not found!", _paths.Caches);
return false;
}
else
@@ -364,7 +364,7 @@
}
catch (Exception e)
{
- Tools.ErrorMessage("Error loading FanartList.xml.", e.Message);
+ DialogHelper.Error("Error loading FanartList.xml.", e.Message);
return false;
}
XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/Items/Item");
@@ -386,7 +386,7 @@
return true; //--> raccolta effettuata
else
{
- Tools.ErrorMessage("No fanart types found loading FanartList.xml.");
+ DialogHelper.Error("No fanart types found loading FanartList.xml.");
return false;
}
}
@@ -406,7 +406,7 @@
}
private bool GetUserConfig(ref string skinName, ref string mediaFolder) //Procedura di lettura eventuale configurazione utente per l'assembly
{
- string configFile = _paths.Config + Tools.MyAssembly.Name + ".Config.xml";
+ string configFile = _paths.Config + ExecutingAssembly.Name + ".Config.xml";
if (!File.Exists(configFile)) //Verifica presenza del file di configurazione
return false;
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2014-06-16 14:56:35 UTC (rev 4839)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2014-06-16 17:28:20 UTC (rev 4840)
@@ -68,7 +68,7 @@
_initialized = GetMenu(false); //--> lettura impostazioni di menu
if (!_initialized)
{
- Tools.InfoMessage("Settings file not found or wrong: default menu will be loaded..");
+ DialogHelper.Info("Settings file not found or wrong: default menu will be loaded..");
_initialized = GetMenu(true); //Se lettura menu fallita --> caricamento menu predefinito
}
}
@@ -187,20 +187,20 @@
if (_items.Count > 0)
{
if (_items.Count < ItemsMinNum)
- Tools.InfoMessage("Invalid menu: the number of items should be at least " + ItemsMinNum.ToString() + ".");
+ DialogHelper.Info("Invalid menu: the number of items should be at least " + ItemsMinNum.ToString() + ".");
return true; //--> lettura menu effettuata
}
else
{
if (defaultSettings) //Se nessun elemento trovato nel menu predefinito: emissione messaggio
- Tools.ErrorMessage("No menu items found loading DefaultMenu.xml.");
+ DialogHelper.Error("No menu items found loading DefaultMenu.xml.");
return false;
}
}
catch (Exception e)
{
if (defaultSettings) //Se lettura menu predefinito fallita: emissione messaggio di errore
- Tools.ErrorMessage("Error loading DefaultMenu.xml.", e.Message);
+ DialogHelper.Error("Error loading DefaultMenu.xml.", e.Message);
return false;
}
finally
@@ -216,7 +216,7 @@
string skinMenuFile = skinPath + SkinSettingsFile;
if (!File.Exists(skinMenuFile))
{
- Tools.ErrorMessage("Skin settings file not found!", skinMenuFile);
+ DialogHelper.Error("Skin settings file not found!", skinMenuFile);
return false; //--> file impostazioni di skin non trovato
}
@@ -249,7 +249,7 @@
if (menuSectionIndex < 0)
{
- Tools.ErrorMessage("Section \"stringsettings\" not found!", skinMenuFile);
+ DialogHelper.Error("Section \"stringsettings\" not found!", skinMenuFile);
return false; //--> sezione per la scrittura impostazioni di menu non trovata
}
@@ -299,7 +299,7 @@
}
catch (Exception e)
{
- Tools.ErrorMessage("Error writing menu settings in SkinSettings.xml.", e.Message);
+ DialogHelper.Error("Error writing menu settings in SkinSettings.xml.", e.Message);
return false; //--> procedura terminata con errori
}
finally
@@ -347,7 +347,7 @@
}
catch (Exception e)
{
- Tools.ErrorMessage("Error writing multi-image settings in " + file, e.Message);
+ DialogHelper.Error("Error writing multi-image settings in " + file, e.Message);
return false; //--> procedura terminata con errori
}
finally
@@ -375,7 +375,7 @@
{
if (_items.Count < ItemsMinNum) //Controllo della validità del menu
{
- Tools.ErrorMessage("Invalid menu: the number of items should be at least " + ItemsMinNum.ToString() + ".");
+ DialogHelper.Error("Invalid menu: the number of items should be at least " + ItemsMinNum.ToString() + ".");
return false;
}
@@ -448,7 +448,7 @@
}
catch (Exception e)
{
- Tools.ErrorMessage("Error saving menu settings.", e.Message);
+ DialogHelper.Error("Error saving menu settings.", e.Message);
return false;
}
finally
@@ -458,7 +458,7 @@
}
if (WriteSkinSettings(skinPath) && WriteSkinMultiImages(skinPath)) //--> scrittura impostazioni e controlli multi-image skin
{
- Tools.InfoMessage("Procedure completed successfully.");
+ DialogHelper.Info("Procedure completed successfully.");
return true; //--> procedura terminata correttamente
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-16 14:56:43
|
Revision: 4839
http://sourceforge.net/p/mp-plugins/code/4839
Author: nicsergio
Date: 2014-06-16 14:56:35 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 08:52:05 UTC (rev 4838)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 14:56:35 UTC (rev 4839)
@@ -1,4 +1,7 @@
using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Reflection;
@@ -108,7 +111,36 @@
gp.AddArc(r.X, r.Y + r.Height - hRadius, wRadius, hRadius, 90, 90);
winControl.Region = new Region(gp);
}
- #endregion
#endregion
+ #region Enum con Descrizioni
+ public static string GetEnumDescription(Enum enumValue) //Ottenimento descrizione enumerativo
+ {
+ FieldInfo fi = enumValue.GetType().GetField(enumValue.ToString());
+
+ if (fi != null)
+ {
+ object[] attrs = fi.GetCustomAttributes(typeof(DescriptionAttribute), true);
+ if (attrs != null && attrs.Length > 0)
+ return ((DescriptionAttribute)attrs[0]).Description;
+ }
+
+ return enumValue.ToString(); //--> se attributo non trovato: si ritorna il valore
+ }
+ public static T GetEnumFromDescription<T>(string stringValue) where T : struct //Ottenimento enumerativo da descrizione
+ {
+ foreach (object e in Enum.GetValues(typeof(T)))
+ if (GetEnumDescription((Enum)e).Equals(stringValue))
+ return (T)e;
+ throw new ArgumentException("No matching enum value found."); //--> se enumerativo non trovato: eccezione
+ }
+ public static IEnumerable<string> GetEnumDescriptions(Type enumType) //Ottenimento descrizioni per riempimento liste
+ {
+ var strings = new Collection<string>();
+ foreach (Enum e in Enum.GetValues(enumType))
+ strings.Add(GetEnumDescription(e));
+ return strings;
+ }
+ #endregion
+ #endregion
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 08:52:05 UTC (rev 4838)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 14:56:35 UTC (rev 4839)
@@ -31,7 +31,7 @@
{
skinItems.Populate(mySkin.SkinFiles, mySkin.SkinLinks, false, true);
FormatShortCutsGrid();
-
+
capsLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
capsLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.General.ForcingCapsLock);
numLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-16 08:52:05 UTC (rev 4838)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-16 14:56:35 UTC (rev 4839)
@@ -448,9 +448,12 @@
#region Dati
public enum DialogTypes //Tipologie di finestre di dialogo
{
+ [Description("Default Menu Dialog")]
DefaultDialog = 0, //--> finestra di dialogo predefinita (DialogMenu)
- CustomList = 1, //--> finestra di dialogo personalizzata - lista
- CustomPanel = 2 //--> finestra di dialogo personalizzata - pannello icone
+ [Description("Custom Menu Dialog - List")]
+ CustomList = 1, //--> finestra di dialogo personalizzata - lista
+ [Description("Custom Menu Dialog - Icons Panel")]
+ CustomPanel = 2 //--> finestra di dialogo personalizzata - pannello icone
}
private GeneralSettings _general; //Impostazioni generali
private BindingList<Item> _items; //Lista (con associazione dati) elementi di navigazione
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-16 08:52:08
|
Revision: 4838
http://sourceforge.net/p/mp-plugins/code/4838
Author: nicsergio
Date: 2014-06-16 08:52:05 +0000 (Mon, 16 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -22,23 +22,23 @@
}
public class SkinFile //Classe file della skin (con ID)
{
- public string Name = ""; //Nome del file
+ public string Name = string.Empty; //Nome del file
public int Id = 0; //WindowID del file (link da MediaPortal)
public override string ToString() { return Name; } //Override metodo ToString per riempire classi ListControl
}
public class SkinLink //Classe link per la skin
{
- public string Context = ""; //Eventuale testo aggiuntivo ("guarda"-"ascolta"-ecc.)
- public string Caption = ""; //Titolo
- public string XmlFile = ""; //Nome del file xml della skin
- public int WindowID = 0; //Id finestra per visualizzazione in MediaPortal
- public string LoadParameter = ""; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.)
- public string BackgroundImage = ""; //File immagine di background
- public string BackgroundFolder = ""; //Cartella per multi-image di background
- public string FanartHandler = ""; //Tipologia di fanart per background
- public string Overlay = ""; //Eventuale riquadro visualizzato in sovrapposizione all'immagine di background
- public string IconList = ""; //Eventuale icona per rappresentazione in lista/treeview
- public bool IsFather = false; //Il link è un nodo padre (visualizzazione a treeview)
+ public string Context = string.Empty; //Eventuale testo aggiuntivo ("guarda"-"ascolta"-ecc.)
+ public string Caption = string.Empty; //Titolo
+ public string XmlFile = string.Empty; //Nome del file xml della skin
+ public int WindowID = 0; //Id finestra per visualizzazione in MediaPortal
+ public string LoadParameter = string.Empty; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.)
+ public string BackgroundImage = string.Empty; //File immagine di background
+ public string BackgroundFolder = string.Empty; //Cartella per multi-image di background
+ public string FanartHandler = string.Empty; //Tipologia di fanart per background
+ public string Overlay = string.Empty; //Eventuale riquadro visualizzato in sovrapposizione all'immagine di background
+ public string IconList = string.Empty; //Eventuale icona per rappresentazione in lista/treeview
+ public bool IsFather = false; //Il link è un nodo padre (visualizzazione a treeview)
public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl
}
protected Folders _paths = new Folders(); //Percorsi
@@ -83,7 +83,7 @@
if (node.InnerText.Length > 0)
{
SkinFile skF = new SkinFile();
- skF.Name = file.Remove(0, file.LastIndexOf(@"\") + 1).Replace(".xml", "");
+ skF.Name = file.Remove(0, file.LastIndexOf(@"\") + 1).Replace(".xml", string.Empty);
skF.Id = Convert.ToInt32(node.InnerText);
if (skF.Id >= 0)
_skinFiles.Add(skF); //--> aggiunta file nella lista
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -75,12 +75,12 @@
#region Finestre di Dialogo
public static void ErrorMessage(string description) //Emissione messaggio di errore (senza errore specifico)
{
- ErrorMessage(description, ""); //--> override metodo per parametro opzionale
+ ErrorMessage(description, string.Empty); //--> override metodo per parametro opzionale
}
- public static void ErrorMessage(string description, string error) //Emissione messaggio di errore (senza errore specifico)
+ public static void ErrorMessage(string description, string error) //Emissione messaggio di errore (con errore specifico)
{
if (error.Length > 0)
- description += "\n\n[" + error + "]";
+ description += string.Format("\n\n[{0}]", error); //--> composizione stringa descrizione per errore specifico
MessageBox.Show(description, MessageHeader, MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1);
}
public static void InfoMessage(string description) //Emissione messaggio informativo
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -432,7 +432,7 @@
if (skinItems.SelectedTab == SkinItems.SkinItemsType.Files)
{
shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[skinItems.SelectedIndex].Id.ToString();
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = "";
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = string.Empty;
}
else
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinWithSounds.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -33,7 +33,7 @@
}
if (_skinSounds.Count > 0)
{
- _skinSounds.Insert(0, ""); //--> aggiunta della selezione per nessun effetto sonoro
+ _skinSounds.Insert(0, string.Empty); //--> aggiunta della selezione per nessun effetto sonoro
return true; //--> raccolta effetti sonori effettuata
}
else
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -28,7 +28,7 @@
{
if (!_panelView && listView.SelectedListItem != null && selectedListIcon != null)
if (btnClose != null && btnClose.IsFocused)
- selectedListIcon.SetFileName(""); //--> nessuna icona se posizionati sul pulsante di chiusura
+ selectedListIcon.SetFileName(string.Empty); //--> nessuna icona se posizionati sul pulsante di chiusura
else
selectedListIcon.SetFileName(listView.SelectedListItem.IconImageBig); //--> impostazione icona elemento della lista selezionato
}
@@ -82,7 +82,7 @@
if (selectedListIcon != null)
{
GUIControl.ShowControl(GetID, selectedListIcon.GetID); //--> controllo icona elemento lista selezionato visualizzato
- selectedListIcon.SetFileName(""); //--> inizializzazione immagine
+ selectedListIcon.SetFileName(string.Empty); //--> inizializzazione immagine
}
if (panelView != null)
GUIControl.HideControl(GetID, panelView.GetID); //--> controllo pannello icone nascosto
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -42,7 +42,7 @@
_caption = "Link"; //--> inizializzazione titolo
_windowID = 0; //--> inizializzazione Id finestra
}
- _loadParameter = ""; //--> inizializzazione parametri di caricamento per visualizzazione
+ _loadParameter = string.Empty; //--> inizializzazione parametri di caricamento per visualizzazione
}
#endregion
@@ -144,11 +144,13 @@
public void Reset() //Reset destinazione (invalidazione)
{
_windowID = InvalidID; //--> invalidazione Id finestra
- _loadParameter = ""; //--> reset parametri di caricamento
+ _loadParameter = string.Empty; //--> reset parametri di caricamento
}
public override string ToString() //Override metodo ToString per stampare le proprietà del link
{
- return ((_caption.Length > 0) ? "Link \"" + _caption + "\" " : "") + "--> WindowID=" + _windowID.ToString() + ((_loadParameter.Length > 0) ? " LoadParameter=[" + _loadParameter + "]" : "");
+ return string.Format("{0}-->WindowID={1}{2}", (_caption.Length > 0) ? string.Format("Link \"{0}\" ", _caption) : string.Empty,
+ _windowID.ToString(),
+ (_loadParameter.Length > 0) ? string.Format(" LoadParameter=[{0}]", _loadParameter) : string.Empty);
}
#endregion
@@ -207,7 +209,10 @@
}
public override string ToString() //Override metodo ToString per stampare la combinazione di tasti
{
- return "Key=" + ((_ctrl) ? "<CTRL>" : "") + ((_alt) ? "<ALT>" : "") + ((_shift) ? "<SHIFT>" : "") + "<" + _key + ">";
+ return string.Format("Key={0}<{1}>", string.Format("{0}{1}{2}", (_ctrl) ? "<CTRL>" : string.Empty,
+ (_alt) ? "<ALT>" : string.Empty,
+ (_shift) ? "<SHIFT>" : string.Empty),
+ _key);
}
#endregion
@@ -246,7 +251,7 @@
_caption = (skinNavigator ? "Skin Navigator" : "ShortCut"); //--> inizializzazione titolo
_keys = new KeyCombination(); //--> istanziazione classe KeyCombination
_destination = new WindowLink(skinNavigator); //--> istanziazione classe WindowLink
- _destination.Caption = ""; //--> reset caption destinazione (gestita caption shortcut)
+ _destination.Caption = string.Empty; //--> reset caption destinazione (gestita caption shortcut)
_return = false; //--> inizializzazione ritorno a finestra precedente se si è già a destinazione
_soundEffect = "click.wav"; //--> inizializzazione effetto sonoro
}
@@ -304,7 +309,7 @@
}
public override string ToString() //Override metodo ToString per stampare le proprietà dello shortcut
{
- return "ShortCut " + _caption + " " + _keys.ToString() + " " + _destination.ToString();
+ return string.Format("ShortCut \"{0}\" {1} {2}", _caption, _keys.ToString(), _destination.ToString());
}
#endregion
@@ -375,7 +380,7 @@
#region Costruttore
public Window() //Costruttore classe Window
{
- _caption = ""; //--> inizializzazione titolo
+ _caption = string.Empty; //--> inizializzazione titolo
_windowID = 0; //--> inizializzazione Id finestra
}
#endregion
@@ -400,6 +405,7 @@
public Destination() : base() //Costruttore classe Destination
{
_force = false; //--> inizializzazione forzatura destinazione
+ _icon = string.Empty; //--> inizializzazione icona
}
#endregion
@@ -777,8 +783,8 @@
for (int i = 1; i <= 20; i++) //Iterazione di lettura shortcut
{
ShortCut sc = new ShortCut();
- sc.Caption = confReader.GetValueAsString(sectionName, capPrefix + string.Format("{0:00}", i), "");
- sc.Key = confReader.GetValueAsString(sectionName, keyPrefix + string.Format("{0:00}", i), "").ToUpper();
+ sc.Caption = confReader.GetValueAsString(sectionName, capPrefix + string.Format("{0:00}", i), string.Empty);
+ sc.Key = confReader.GetValueAsString(sectionName, keyPrefix + string.Format("{0:00}", i), string.Empty).ToUpper();
sc.WindowID = confReader.GetValueAsInt(sectionName, widPrefix + string.Format("{0:00}", i), -1);
sc.Ctrl = ctrl;
sc.Alt = false;
@@ -1048,7 +1054,7 @@
}
}
if (scList[scIndex].Go(Log)) //--> visualizzazione finestra di destinazione shortcut
- lastDestination.GetData(scList[0].Destination); //--> aggiornamento ultima destinazione
+ lastDestination.GetData(scList[scIndex].Destination); //--> aggiornamento ultima destinazione
}
}
else //Combinazione di tasti non corrispondente a nessuno shortcut
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -108,18 +108,18 @@
case ShowItemType.SkinFile: //File della skin
propertiesGroupBox.Text = propBoxText + " (Skin Files)";
contextTextBox.Enabled= true;
- contextTextBox.Text = "";
- captionTextBox.Text = "";
+ contextTextBox.Text = string.Empty;
+ captionTextBox.Text = string.Empty;
skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Name;
windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Id.ToString();
- loadParameterTextBox.Text = "";
+ loadParameterTextBox.Text = string.Empty;
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
singleImageRadioButton.Checked = true;
singleImageComboBox.Text = "hover_extensions.png";
multiImageComboBox.SelectedIndex = 0;
fanartComboBox.SelectedIndex = 0;
- iconComboBox.Text = "";
+ iconComboBox.Text = string.Empty;
overlayGroupBox.Enabled = true;
overlayComboBox.SelectedIndex = 0;
propLeftPictureBox.Visible = true;
@@ -165,7 +165,7 @@
}
}
- iconComboBox.Text = "";
+ iconComboBox.Text = string.Empty;
overlayGroupBox.Enabled = true;
overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[index].Overlay));
propLeftPictureBox.Visible = true;
@@ -230,7 +230,7 @@
return;
propertiesGroupBox.Text = propBoxText + " (Sub Menu)";
contextTextBox.Enabled = false;
- contextTextBox.Text = "";
+ contextTextBox.Text = string.Empty;
captionTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Caption;
skinFileShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].XmlFile;
windowIdShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Hyperlink.ToString();
@@ -875,7 +875,7 @@
private void infoPictureBox_Click(object sender, EventArgs e)
{
VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor, "...a big thank to Marduk65 for this skin!",
- "http://forum.team-mediaportal.com/threads/skin-xtreme-widescreen-16-9-11-10-2013-new-version-1-3-0-1-released.109707/", "");
+ "http://forum.team-mediaportal.com/threads/skin-xtreme-widescreen-16-9-11-10-2013-new-version-1-3-0-1-released.109707/", string.Empty);
}
#endregion
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -168,8 +168,8 @@
if (node.InnerText.Contains("OverlayLabel"))
{
Overlay ovl = new Overlay();
- ovl.Description = node.InnerText.Remove(0, node.InnerText.IndexOf("\"") + 1).Replace("\"","").Trim();
- ovl.Value = file.Remove(0, file.IndexOf(OverlayPrefix) + OverlayPrefix.Length).Replace(".xml", "");
+ ovl.Description = node.InnerText.Remove(0, node.InnerText.IndexOf("\"") + 1).Replace("\"",string.Empty).Trim();
+ ovl.Value = file.Remove(0, file.IndexOf(OverlayPrefix) + OverlayPrefix.Length).Replace(".xml", string.Empty);
if (ovl.Description.Length > 0 && ovl.Value.Length > 0)
_skinOverlays.Add(ovl); //--> aggiunta overlay nella lista
}
@@ -182,7 +182,7 @@
{
Overlay ovl = new Overlay();
ovl.Description = "- None - ";
- ovl.Value = "";
+ ovl.Value = string.Empty;
_skinOverlays.Insert(0, ovl); //--> inserimento della scelta per "nessun overlay"
return true; //--> raccolta overlay effettuata
}
@@ -218,7 +218,7 @@
{
return (Path.IsPathRooted(iconPath) ? iconPath : iconPath.Remove(0, @"Icons\".Length));
}
- catch { return ""; }
+ catch { return string.Empty; }
}
#endregion
@@ -270,12 +270,12 @@
if (mpKey != null)
_paths.Install = mpKey.GetValue("ApplicationDir").ToString();
else
- _paths.Install = "";
+ _paths.Install = string.Empty;
}
}
catch (Exception e)
{
- _paths.Install = "";
+ _paths.Install = string.Empty;
Tools.ErrorMessage("MediaPortal installation not found.\nMediaPortal must be installed!", e.Message);
return false;
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2014-06-15 17:41:39 UTC (rev 4837)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2014-06-16 08:52:05 UTC (rev 4838)
@@ -11,20 +11,20 @@
{
internal class SubMenuItem //Classe elemento di sotto-menu
{
- public string Caption = ""; //Titolo
- public string XmlFile = ""; //Nome del file xml della skin
- public int Hyperlink = 0; //Id finestra per visualizzazione in MediaPortal
- public string HyperlinkParameter = ""; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.)
- public string BackgroundImage = ""; //File immagine di background
- public string Icon = ""; //Eventuale icona
+ public string Caption = string.Empty; //Titolo
+ public string XmlFile = string.Empty; //Nome del file xml della skin
+ public int Hyperlink = 0; //Id finestra per visualizzazione in MediaPortal
+ public string HyperlinkParameter = string.Empty; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.)
+ public string BackgroundImage = string.Empty; //File immagine di background
+ public string Icon = string.Empty; //Eventuale icona
public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl
}
internal class SimpleMenuItem : SubMenuItem //Classe elemento di menu semplificato
{
- public string Context = ""; //Eventuale testo aggiuntivo ("guarda"-"ascolta"-ecc.)
- public string BackgroundFolder = ""; //Cartella per multi-image di background
- public string FanartHandler = ""; //Tipologia di fanart per background
- public string Overlay = ""; //Eventuale riquadro visualizzato in sovrapposizione all'immagine di background
+ public string Context = string.Empty; //Eventuale testo aggiuntivo ("guarda"-"ascolta"-ecc.)
+ public string BackgroundFolder = string.Empty; //Cartella per multi-image di background
+ public string FanartHandler = string.Empty; //Tipologia di fanart per background
+ public string Overlay = string.Empty; //Eventuale riquadro visualizzato in sovrapposizione all'immagine di background
}
internal class MenuItem : SimpleMenuItem //Classe elemento di menu (completo)
{
@@ -336,9 +336,8 @@
{
if (control.SelectSingleNode("type").InnerText.ToLower() == "multiimage" && i < ItemsMaxNum)
{
- control.SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : "");
+ control.SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : string.Empty);
control.SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString();
- i++;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-15 17:41:50
|
Revision: 4837
http://sourceforge.net/p/mp-plugins/code/4837
Author: nicsergio
Date: 2014-06-15 17:41:39 +0000 (Sun, 15 Jun 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-06-14 21:34:40 UTC (rev 4836)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-15 17:41:39 UTC (rev 4837)
@@ -1,10 +1,10 @@
-using System.Drawing;
+using System;
+using System.Drawing;
using System.Reflection;
using MediaPortal.Dialogs;
using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
using My.Common;
-using System;
using Action = MediaPortal.GUI.Library.Action;
namespace ShortCuter.Plugin
@@ -27,19 +27,11 @@
private void UpdateSelectedListIcon() //Aggiornamento icona elemento della lista selezionato
{
if (!_panelView && listView.SelectedListItem != null && selectedListIcon != null)
- selectedListIcon.SetFileName(listView.SelectedListItem.IconImageBig); //--> impostazione icona elemento della lista selezionato
+ if (btnClose != null && btnClose.IsFocused)
+ selectedListIcon.SetFileName(""); //--> nessuna icona se posizionati sul pulsante di chiusura
+ else
+ selectedListIcon.SetFileName(listView.SelectedListItem.IconImageBig); //--> impostazione icona elemento della lista selezionato
}
- private void SetDefaultControl(int controlId) //Impostazione ID controllo grafico con posizione predefinita
- {
- this._defaultControlId=controlId;
- if (btnClose != null) //--> impostazione navigazione dal pulsante di chiusura
- {
- btnClose.NavigateUp = controlId;
- btnClose.NavigateDown = controlId;
- btnClose.NavigateLeft = controlId;
- btnClose.NavigateRight = controlId;
- }
- }
#endregion
#region Metodi Pubblici
@@ -51,17 +43,41 @@
{
return Tools.MyAssembly.Title; //--> ritorno del titolo dell'assembly
}
+ protected override void OnWindowLoaded() //Override metodo OnWindowLoaded
+ {
+ base.OnWindowLoaded();
+ try { _defaultControlId = (_panelView ? panelView.GetID : listView.GetID); } //--> impostazione controllo con fuoco all'avvio a seconda del tipo di visualizzazione
+ catch { }
+ }
+ public override bool OnMessage(GUIMessage message) //Override metodo OnMessage
+ {
+ int selectedIndex = selectedItemIndex;
+ bool rtn = base.OnMessage(message);
+
+ if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT && _panelView && panelView != null)
+ {
+ panelView.Clear();
+ for (int i = 0; i < listItems.Count; i++)
+ panelView.Add((GUIListItem)listItems[i]); //--> aggiunta elementi nel pannello
+ if (selectedIndex >= 0)
+ OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECT, GetID, 0, panelView.GetID, selectedIndex, 0, null));
+ }
+
+ UpdateSelectedListIcon(); //--> aggiornamento icona elemento della lista selezionato
+ return rtn;
+ }
protected override void OnPageLoad() //Override metodo OnPageLoad
{
base.OnPageLoad();
- base.lblHeading2.Label = Tools.MyAssembly.Title; //--> forzatura label "Menu"
+ lblHeading2.Label = Tools.MyAssembly.Title; //--> forzatura label "Menu"
+ int navControlId = 0;
if (!_panelView) //Visualizzazione a lista
{
if (listView != null)
{
GUIControl.ShowControl(GetID, listView.GetID); //--> controllo lista visualizzato
- SetDefaultControl(listView.GetID); //--> lista: controllo predefinito
+ navControlId = listView.GetID; //--> lista: controllo per navigazione
}
if (selectedListIcon != null)
{
@@ -76,47 +92,31 @@
if (panelView != null)
{
GUIControl.ShowControl(GetID, panelView.GetID); //--> controllo pannello icone visualizzato
- SetDefaultControl(panelView.GetID); //--> pannello: controllo predefinito
+ navControlId = panelView.GetID; //--> pannello: controllo per navigazione
}
if (listView != null)
GUIControl.HideControl(GetID, listView.GetID); //--> controllo lista nascosto
if (selectedListIcon != null)
GUIControl.HideControl(GetID, selectedListIcon.GetID); //--> controllo icona elemento lista selezionato nascosto
}
+ if (btnClose != null && navControlId > 0) //--> impostazione navigazione dal pulsante di chiusura
+ {
+ btnClose.NavigateUp = navControlId;
+ btnClose.NavigateDown = navControlId;
+ btnClose.NavigateLeft = navControlId;
+ btnClose.NavigateRight = navControlId;
+ }
- try
+ if (logo != null)
{
- if (logo != null)
+ try
{
logo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
logo.SetFileName("[ShortCuter:NavigatorLogo]"); //--> impostazione immagine logo Skin Navigator
}
+ catch { }
}
- catch { }
}
- public override void Dispose() //Override metodo Dispose
- {
- selectedListIcon.SafeDispose();
- panelView.SafeDispose();
- logo.SafeDispose();
- base.Dispose();
- }
- public override bool OnMessage(GUIMessage message) //Override metodo OnMessage
- {
- this._defaultControlId = 11;
- int selectedIndex = selectedItemIndex;
- bool rtn = base.OnMessage(message);
- if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT && _panelView && panelView != null)
- {
- panelView.Clear();
- for (int i = 0; i < listItems.Count; i++)
- panelView.Add((GUIListItem)listItems[i]); //--> aggiunta elementi nel pannello
- if (selectedIndex >= 0)
- OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECT, GetID, 0, panelView.GetID, selectedIndex, 0, null));
- }
- UpdateSelectedListIcon(); //--> aggiornamento icona elemento della lista selezionato
- return rtn;
- }
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
{ //Override metodo OnClicked
base.OnClicked(controlId, control, actionType);
@@ -156,6 +156,13 @@
else
base.selectOption(keySelected); //--> altrimenti selezione elemento lista
}
+ public override void Dispose() //Override metodo Dispose
+ {
+ selectedListIcon.SafeDispose();
+ panelView.SafeDispose();
+ logo.SafeDispose();
+ base.Dispose();
+ }
#endregion
#region Proprietà
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-06-14 21:34:40 UTC (rev 4836)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/ShortCuter.cs 2014-06-15 17:41:39 UTC (rev 4837)
@@ -76,7 +76,7 @@
{
return Tools.MyAssembly.Title;
}
- public override int GetID { get { return NavigatorDialog.DialogWindowID + 1; } } //--> id finestra (deve avere un valore >0 e diverso da NavigatorDialog)
+ 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/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-14 21:34:40 UTC (rev 4836)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-15 17:41:39 UTC (rev 4837)
@@ -81,7 +81,7 @@
break;
}
if (loadParameterChange && Log != null)
- Log(this, new LogEventArgs(LogEventArgs.LogLevels.Debug, "GUIProperties replaced, LoadParameter=[" + loadParameter + "]"));
+ Log(this, new LogEventArgs(LogEventArgs.LogLevels.Debug, string.Format("GUIProperties replaced, LoadParameter=[{0}]", loadParameter)));
GUIWindowManager.ActivateWindow(_windowID, loadParameter, true); //--> richiamo schermata con parametri di caricamento
}
@@ -148,7 +148,7 @@
}
public override string ToString() //Override metodo ToString per stampare le proprietà del link
{
- return ((_caption.Length > 0) ? "Link " + _caption + " " : "") + "--> WindowID=" + _windowID.ToString() + ((_loadParameter.Length > 0) ? " LoadParameter=[" + _loadParameter + "]" : "");
+ return ((_caption.Length > 0) ? "Link \"" + _caption + "\" " : "") + "--> WindowID=" + _windowID.ToString() + ((_loadParameter.Length > 0) ? " LoadParameter=[" + _loadParameter + "]" : "");
}
#endregion
@@ -463,13 +463,15 @@
{
GUIDialogMenu dlg;
- if (_general.DialogType != DialogTypes.DefaultDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile) ||
- File.Exists(GUIGraphicsContext.Theme + @"\" + NavigatorDialog.DialogSkinFile)))
+ bool customDialog = (_general.DialogType != DialogTypes.DefaultDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile) ||
+ File.Exists(GUIGraphicsContext.Theme + @"\" + NavigatorDialog.DialogSkinFile)));
+ if (customDialog)
{
//Utilizzo della finestra di dialogo personalizzata
NavigatorDialog dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
- dlgMenu.PanelView = (_general.DialogType == DialogTypes.CustomPanel);
- dlg = dlgMenu;
+ if (dlgMenu != null)
+ dlgMenu.PanelView = (_general.DialogType == DialogTypes.CustomPanel); //--> eventuale visualizzazione a pannello di icone
+ dlg = dlgMenu;
}
else
{
@@ -477,9 +479,19 @@
GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
dlg = dlgMenu;
}
+
+ if (dlg == null) //--> finestra di dialogo non agganciata
+ throw new NullReferenceException(String.Format("Dialog menu window reference is null! (ID:{0})", (customDialog ? NavigatorDialog.DialogWindowID : (int)GUIWindow.Window.WINDOW_DIALOG_MENU)));
+ dlg.Reset();
+ try { dlg.SetHeading(_general.MenuHeader); } //--> intestazione menu (+ allocazione risorse e caricamento file skin)
+ catch (NullReferenceException e)
+ {
+ if (!dlg.WindowLoaded)
+ throw new NullReferenceException(String.Format("Dialog menu skin file not loaded! (Class:{0})", dlg.ToString()), e);
+ else
+ throw;
+ }
- dlg.Reset();
- dlg.SetHeading(_general.MenuHeader); //--> intestazione menu
dlg.ShowQuickNumbers = _general.ShowNumbers; //--> visualizzazione numeri per accesso diretto
foreach (Item.Destination dst in destinations) //Iterazione per popolamento lista
{
@@ -642,7 +654,7 @@
public WindowLink Go(LogEventHandler Log) //Gestione finestra di dialogo e navigazione alla destinazione selezionata
{
if (Log != null)
- Log(this, new LogEventArgs(LogEventArgs.LogLevels.Info, "Request Skin Navigator dialog menu"));
+ Log(this, new LogEventArgs(LogEventArgs.LogLevels.Info, string.Format("Request Skin Navigator dialog menu ({0})", Enum.GetName(typeof(SkinNavigator.DialogTypes), _general.DialogType))));
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-14 21:34:48
|
Revision: 4836
http://sourceforge.net/p/mp-plugins/code/4836
Author: nicsergio
Date: 2014-06-14 21:34:40 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
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-06-09 19:18:12 UTC (rev 4835)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-14 21:34:40 UTC (rev 4836)
@@ -14,13 +14,33 @@
#region Dati
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
+ private bool _panelView; //Visualizzazione finestra di dialogo come pannello di icone
#endregion
#region Controlli Grafici
- [SkinControl(10)] protected GUIImage selectedIcon = null; //Icona elemento selezionato
- [SkinControl(11)] protected GUIThumbnailPanel panelView = null; //Pannello icone per visualizzazione alternativa a lista
- [SkinControl(20)] protected GUIImage logo = null; //Logo Skin Navigator
+ [SkinControl(10)] protected GUIImage selectedListIcon = null; //Icona elemento selezionato (visualizzazione lista)
+ [SkinControl(11)] protected GUIThumbnailPanel panelView = null; //Pannello icone per visualizzazione alternativa a lista
+ [SkinControl(20)] protected GUIImage logo = null; //Logo Skin Navigator
#endregion
+
+ #region Metodi Privati
+ private void UpdateSelectedListIcon() //Aggiornamento icona elemento della lista selezionato
+ {
+ if (!_panelView && listView.SelectedListItem != null && selectedListIcon != null)
+ selectedListIcon.SetFileName(listView.SelectedListItem.IconImageBig); //--> impostazione icona elemento della lista selezionato
+ }
+ private void SetDefaultControl(int controlId) //Impostazione ID controllo grafico con posizione predefinita
+ {
+ this._defaultControlId=controlId;
+ if (btnClose != null) //--> impostazione navigazione dal pulsante di chiusura
+ {
+ btnClose.NavigateUp = controlId;
+ btnClose.NavigateDown = controlId;
+ btnClose.NavigateLeft = controlId;
+ btnClose.NavigateRight = controlId;
+ }
+ }
+ #endregion
#region Metodi Pubblici
public override bool Init() //Override metodo Init
@@ -36,86 +56,111 @@
base.OnPageLoad();
base.lblHeading2.Label = Tools.MyAssembly.Title; //--> forzatura label "Menu"
+ if (!_panelView) //Visualizzazione a lista
+ {
+ if (listView != null)
+ {
+ GUIControl.ShowControl(GetID, listView.GetID); //--> controllo lista visualizzato
+ SetDefaultControl(listView.GetID); //--> lista: controllo predefinito
+ }
+ if (selectedListIcon != null)
+ {
+ GUIControl.ShowControl(GetID, selectedListIcon.GetID); //--> controllo icona elemento lista selezionato visualizzato
+ selectedListIcon.SetFileName(""); //--> inizializzazione immagine
+ }
+ if (panelView != null)
+ GUIControl.HideControl(GetID, panelView.GetID); //--> controllo pannello icone nascosto
+ }
+ else //Visualizzazione a pannello icone
+ {
+ if (panelView != null)
+ {
+ GUIControl.ShowControl(GetID, panelView.GetID); //--> controllo pannello icone visualizzato
+ SetDefaultControl(panelView.GetID); //--> pannello: controllo predefinito
+ }
+ if (listView != null)
+ GUIControl.HideControl(GetID, listView.GetID); //--> controllo lista nascosto
+ if (selectedListIcon != null)
+ GUIControl.HideControl(GetID, selectedListIcon.GetID); //--> controllo icona elemento lista selezionato nascosto
+ }
+
try
{
- logo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
- logo.SetFileName("[ShortCuter:NavigatorLogo]"); //--> impostazione immagine logo Skin Navigator
+ if (logo != null)
+ {
+ logo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
+ logo.SetFileName("[ShortCuter:NavigatorLogo]"); //--> impostazione immagine logo Skin Navigator
+ }
}
catch { }
}
public override void Dispose() //Override metodo Dispose
{
- selectedIcon.SafeDispose();
+ selectedListIcon.SafeDispose();
panelView.SafeDispose();
logo.SafeDispose();
base.Dispose();
}
- public override bool OnMessage(GUIMessage message)
+ public override bool OnMessage(GUIMessage message) //Override metodo OnMessage
{
-
- /*if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT) //& alternativeView
+ this._defaultControlId = 11;
+ int selectedIndex = selectedItemIndex;
+ bool rtn = base.OnMessage(message);
+ if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT && _panelView && panelView != null)
{
- //base.base.OnMessage();
-
- return true;
+ panelView.Clear();
+ for (int i = 0; i < listItems.Count; i++)
+ panelView.Add((GUIListItem)listItems[i]); //--> aggiunta elementi nel pannello
+ if (selectedIndex >= 0)
+ OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECT, GetID, 0, panelView.GetID, selectedIndex, 0, null));
}
- else*/
- return base.OnMessage(message);
+ UpdateSelectedListIcon(); //--> aggiornamento icona elemento della lista selezionato
+ return rtn;
}
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
- {
+ { //Override metodo OnClicked
base.OnClicked(controlId, control, actionType);
+ if (control == panelView && panelView.SelectedListItem != null) //Gestione caso visualizzazione a pannello
+ {
+ selectedItemIndex = panelView.SelectedListItemIndex;
+ selectedItemLabel = panelView.SelectedListItem.Label;
+ int pos = selectedItemLabel.IndexOf(" ");
+ if (pos > 0)
+ {
+ selectedItemLabel = selectedItemLabel.Substring(pos + 1);
+ }
+ selectedId = panelView.SelectedListItem.ItemId;
+ PageDestroy();
+ }
}
- //public override void selectOption(string keySelected)
- //{
- // base.selectOption(keySelected);
- //}
-
- public override void OnAction(Action action)
+ public override void OnAction(Action action) //Override metodo OnAction
{
- char key = (char)0;
-
- // if we have a keypress or a remote button press
- if ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) ||
- ((Action.ActionType.REMOTE_0 <= action.wID) && (Action.ActionType.REMOTE_9 >= action.wID)))
+ base.OnAction(action);
+ UpdateSelectedListIcon(); //--> aggiornamento icona elemento della lista selezionato
+ }
+ public new void selectOption(string keySelected) //Nuova implementazione metodo selectOption
+ {
+ if (_panelView) //Con visualizzazione a pannello --> selezione elemento pannello
{
- if (action.m_key != null)
+ int selected;
+ try { selected = int.Parse(keySelected) - 1; }
+ catch (Exception) { selected = -1; }
+ if (selected >= 0 && selected < listItems.Count && panelView != null)
{
- if (action.m_key.KeyChar >= '0' && action.m_key.KeyChar <= '9')
- {
- // Get offset to item
- key = (char)action.m_key.KeyChar;
- }
+ OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_SETFOCUS, GetID, 0, panelView.GetID, 0, 0, null));
+ OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_ITEM_SELECT, GetID, 0, panelView.GetID, selected, 0, null));
+ OnMessage(new GUIMessage(GUIMessage.MessageType.GUI_MSG_CLICKED, GetID, panelView.GetID, 0, 0, 0, null));
+ selectedItemIndex = selected;
}
- else
- {
- key = ((char)('0' + action.wID - Action.ActionType.REMOTE_0));
- }
- if (key == (char)0)
- {
- return;
- }
- keySelection += key;
- if (keySelection.Length == listItems.Count.ToString().Length)
- {
- selectOption(keySelection);
- keySelection = string.Empty;
- return;
- }
- keyTimer = DateTime.Now;
- return;
}
-
- base.OnAction(action);
- //base.OnAction(action);
+ else
+ base.selectOption(keySelected); //--> altrimenti selezione elemento lista
}
#endregion
- #region Consumazione Eventi
- #endregion
-
#region Proprietà
public override int GetID { get { return DialogWindowID; } }
+ public bool PanelView { get { return this._panelView; } set { this._panelView = value; } }
#endregion
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-06-09 19:18:12 UTC (rev 4835)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-06-14 21:34:40 UTC (rev 4836)
@@ -189,7 +189,7 @@
<Separator>--------------------------------</Separator>
<ShowNumbers>1</ShowNumbers>
<RemoveDuplicates>1</RemoveDuplicates>
- <UseCustomDialog>1</UseCustomDialog>
+ <DialogType>1</DialogType>
</General>
<Items>
<Item>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-09 19:18:12 UTC (rev 4835)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-14 21:34:40 UTC (rev 4836)
@@ -333,12 +333,12 @@
public class GeneralSettings //Sotto-classe di gestione impostazioni generali Skin Navigator
{
#region Dati
- private string _menuHeader; //Titolo menu di navigazione
- private bool _showSeparator; //Visualizzazione separatore gruppi di destinazioni
- private string _separator; //Eventuale separatore da visualizzare
- private bool _showNumbers; //Visualizzazione numeri cossispondenti a voci menu (per accesso da telecomando)
- private bool _removeDuplicates; //Rimozione destinazioni duplicate
- private bool _useCustomDialog; //Utilizzo della finestra di dialogo personalizzata (se presente)
+ private string _menuHeader; //Titolo menu di navigazione
+ private bool _showSeparator; //Visualizzazione separatore gruppi di destinazioni
+ private string _separator; //Eventuale separatore da visualizzare
+ private bool _showNumbers; //Visualizzazione numeri cossispondenti a voci menu (per accesso da telecomando)
+ private bool _removeDuplicates; //Rimozione destinazioni duplicate
+ private DialogTypes _dialogType; //Tipologia della finestra di dialogo da utilizzare
#endregion
#region Costruttore
@@ -349,17 +349,17 @@
_separator = "-- -- -- -- -- --"; //--> separatore da visualizzare
_showNumbers = true; //--> visualizzazione numeri cossispondenti a voci menu
_removeDuplicates = true; //--> rimozione di destinazioni duplicate
- _useCustomDialog = false; //--> utilizzo della finestra di dialogo predefinita
+ _dialogType = DialogTypes.DefaultDialog; //--> utilizzo della finestra di dialogo predefinita
}
#endregion
#region Proprietà
- public string MenuHeader { get { return this._menuHeader; } set { this._menuHeader = value; } }
- public bool ShowSeparator { get { return this._showSeparator; } set { this._showSeparator = value; } }
- public string Separator { get { return this._separator; } set { this._separator = value; } }
- public bool ShowNumbers { get { return this._showNumbers; } set { this._showNumbers = value; } }
- public bool RemoveDuplicates { get { return this._removeDuplicates; } set { this._removeDuplicates = value; } }
- public bool UseCustomDialog { get { return this._useCustomDialog; } set { this._useCustomDialog = value; } }
+ public string MenuHeader { get { return this._menuHeader; } set { this._menuHeader = value; } }
+ public bool ShowSeparator { get { return this._showSeparator; } set { this._showSeparator = value; } }
+ public string Separator { get { return this._separator; } set { this._separator = value; } }
+ public bool ShowNumbers { get { return this._showNumbers; } set { this._showNumbers = value; } }
+ public bool RemoveDuplicates { get { return this._removeDuplicates; } set { this._removeDuplicates = value; } }
+ public DialogTypes DialogType { get { return this._dialogType; } set { this._dialogType = value; } }
#endregion
}
public class Item //Sotto-classe elemento per navigazione
@@ -440,6 +440,12 @@
#endregion
#region Dati
+ public enum DialogTypes //Tipologie di finestre di dialogo
+ {
+ DefaultDialog = 0, //--> finestra di dialogo predefinita (DialogMenu)
+ CustomList = 1, //--> finestra di dialogo personalizzata - lista
+ CustomPanel = 2 //--> finestra di dialogo personalizzata - pannello icone
+ }
private GeneralSettings _general; //Impostazioni generali
private BindingList<Item> _items; //Lista (con associazione dati) elementi di navigazione
#endregion
@@ -455,33 +461,42 @@
#region Metodi Privati
private Item.Destination ShowMenuDialog(List<Item.Destination> destinations) //Visualizzazione menu di navigazione
{
- GUIDialogMenu dlgMenu;
- if (_general.UseCustomDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile) ||
- File.Exists(GUIGraphicsContext.Theme + @"\" + NavigatorDialog.DialogSkinFile)))
+ GUIDialogMenu dlg;
+
+ if (_general.DialogType != DialogTypes.DefaultDialog && (File.Exists(GUIGraphicsContext.Skin + @"\" + NavigatorDialog.DialogSkinFile) ||
+ File.Exists(GUIGraphicsContext.Theme + @"\" + NavigatorDialog.DialogSkinFile)))
+ {
//Utilizzo della finestra di dialogo personalizzata
- dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
+ NavigatorDialog dlgMenu = (NavigatorDialog)GUIWindowManager.GetWindow(NavigatorDialog.DialogWindowID);
+ dlgMenu.PanelView = (_general.DialogType == DialogTypes.CustomPanel);
+ dlg = dlgMenu;
+ }
else
+ {
//Utilizzo della finestra di dialogo predefinita
- dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ GUIDialogMenu dlgMenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+ dlg = dlgMenu;
+ }
- dlgMenu.Reset();
- dlgMenu.SetHeading(_general.MenuHeader); //--> intestazione menu
- dlgMenu.ShowQuickNumbers = _general.ShowNumbers; //--> visualizzazione numeri per accesso diretto
+ dlg.Reset();
+ dlg.SetHeading(_general.MenuHeader); //--> intestazione menu
+ dlg.ShowQuickNumbers = _general.ShowNumbers; //--> visualizzazione numeri per accesso diretto
foreach (Item.Destination dst in destinations) //Iterazione per popolamento lista
{
if (dst != null)
{
GUIListItem lstItem = new GUIListItem(dst.Caption); //--> creazione elemento GUIListItem
- lstItem.PinImage = dst.Icon; //--> percorso eventuale icona destinazione
- dlgMenu.Add(lstItem); //--> aggiunta elemento nella lista
+ lstItem.PinImage = dst.Icon; //--> percorso eventuale icona destinazione (visualizzazione in lista)
+ lstItem.IconImageBig = dst.Icon; //--> percorso eventuale icona destinazione (visualizzazione pannello/elemento lista selezionato)
+ dlg.Add(lstItem); //--> aggiunta elemento nella lista
}
else
- dlgMenu.Add(_general.Separator); //--> se destinazione nulla: aggiunta separatore
+ dlg.Add(_general.Separator); //--> se destinazione nulla: aggiunta separatore
}
- dlgMenu.DoModal(GUIWindowManager.ActiveWindow); //--> visualizzazione menu
+ dlg.DoModal(GUIWindowManager.ActiveWindow); //--> visualizzazione menu
- if (dlgMenu.SelectedLabel >= 0 && dlgMenu.SelectedLabel < destinations.Count)
- return destinations[dlgMenu.SelectedLabel]; //--> ritorno destinazione selezionata
+ if (dlg.SelectedLabel >= 0 && dlg.SelectedLabel < destinations.Count)
+ return destinations[dlg.SelectedLabel]; //--> ritorno destinazione selezionata
else
return null; //--> nessun elemento selezionato
}
@@ -527,9 +542,9 @@
innerNode = generalNode.SelectSingleNode("RemoveDuplicates");
if (innerNode != null)
_general.RemoveDuplicates = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
- innerNode = generalNode.SelectSingleNode("UseCustomDialog");
+ innerNode = generalNode.SelectSingleNode("DialogType");
if (innerNode != null)
- _general.UseCustomDialog = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
+ _general.DialogType = (SkinNavigator.DialogTypes)Enum.Parse(typeof(SkinNavigator.DialogTypes), innerNode.InnerText);
}
else
return false; //--> impostazioni non caricate (sezione General non presente)
@@ -585,11 +600,12 @@
{
xmlSettings.WriteStartElement("Navigator");
xmlSettings.WriteStartElement("General");
- xmlSettings.WriteElementString("MenuHeader", _general.MenuHeader);
- xmlSettings.WriteElementString("ShowSeparator", Convert.ToInt16(_general.ShowSeparator).ToString());
- xmlSettings.WriteElementString("Separator", _general.Separator);
- xmlSettings.WriteElementString("ShowNumbers", Convert.ToInt16(_general.ShowNumbers).ToString());
- xmlSettings.WriteElementString("RemoveDuplicates", Convert.ToInt16(_general.RemoveDuplicates).ToString());
+ xmlSettings.WriteElementString("MenuHeader", _general.MenuHeader);
+ xmlSettings.WriteElementString("ShowSeparator", Convert.ToInt16(_general.ShowSeparator).ToString());
+ xmlSettings.WriteElementString("Separator", _general.Separator);
+ xmlSettings.WriteElementString("ShowNumbers", Convert.ToInt16(_general.ShowNumbers).ToString());
+ xmlSettings.WriteElementString("RemoveDuplicates", Convert.ToInt16(_general.RemoveDuplicates).ToString());
+ xmlSettings.WriteElementString("DialogType", _general.DialogType.ToString());
xmlSettings.WriteEndElement();
xmlSettings.WriteStartElement("Items");
@@ -601,7 +617,7 @@
foreach (Item.Window wnd in navItem.Windows) //Iterazione per salvataggio finestre di abilitazione
{
xmlSettings.WriteStartElement("Window");
- xmlSettings.WriteElementString("Caption", wnd.Caption);
+ xmlSettings.WriteElementString("Caption", wnd.Caption);
xmlSettings.WriteElementString("WindowID", wnd.WindowID.ToString());
xmlSettings.WriteEndElement();
}
@@ -610,10 +626,10 @@
foreach (Item.Destination dst in navItem.Destinations) //Iterazione per salvataggio destinazioni
{
xmlSettings.WriteStartElement("Destination");
- xmlSettings.WriteElementString("Caption", dst.Caption);
- xmlSettings.WriteElementString("WindowID", dst.WindowID.ToString());
+ xmlSettings.WriteElementString("Caption", dst.Caption);
+ xmlSettings.WriteElementString("WindowID", dst.WindowID.ToString());
xmlSettings.WriteElementString("LoadParameter", dst.LoadParameter);
- xmlSettings.WriteElementString("Force", Convert.ToInt16(dst.Force).ToString());
+ xmlSettings.WriteElementString("Force", Convert.ToInt16(dst.Force).ToString());
xmlSettings.WriteEndElement();
}
xmlSettings.WriteEndElement();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-09 19:18:16
|
Revision: 4835
http://sourceforge.net/p/mp-plugins/code/4835
Author: nicsergio
Date: 2014-06-09 19:18:12 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 14:16:11 UTC (rev 4834)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 19:18:12 UTC (rev 4835)
@@ -4,6 +4,8 @@
using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
using My.Common;
+using System;
+using Action = MediaPortal.GUI.Library.Action;
namespace ShortCuter.Plugin
{
@@ -15,12 +17,9 @@
#endregion
#region Controlli Grafici
- [SkinControl(10)]
- protected GUIImage selectedIcon; //Icona elemento selezionato
- [SkinControl(11)]
- protected GUIThumbnailPanel panelView; //Pannello icone per visualizzazione alternativa a lista
- [SkinControl(20)]
- protected GUIImage logo; //Immagine logo Skin Navigator
+ [SkinControl(10)] protected GUIImage selectedIcon = null; //Icona elemento selezionato
+ [SkinControl(11)] protected GUIThumbnailPanel panelView = null; //Pannello icone per visualizzazione alternativa a lista
+ [SkinControl(20)] protected GUIImage logo = null; //Logo Skin Navigator
#endregion
#region Metodi Pubblici
@@ -54,22 +53,61 @@
public override bool OnMessage(GUIMessage message)
{
- if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT) //& alternativeView
+ /*if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT) //& alternativeView
{
//base.base.OnMessage();
return true;
}
- else
+ else*/
return base.OnMessage(message);
}
protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
{
base.OnClicked(controlId, control, actionType);
}
- public override void selectOption(string keySelected)
+ //public override void selectOption(string keySelected)
+ //{
+ // base.selectOption(keySelected);
+ //}
+
+ public override void OnAction(Action action)
{
- base.selectOption(keySelected);
+ char key = (char)0;
+
+ // if we have a keypress or a remote button press
+ if ((action.wID == Action.ActionType.ACTION_KEY_PRESSED) ||
+ ((Action.ActionType.REMOTE_0 <= action.wID) && (Action.ActionType.REMOTE_9 >= action.wID)))
+ {
+ if (action.m_key != null)
+ {
+ if (action.m_key.KeyChar >= '0' && action.m_key.KeyChar <= '9')
+ {
+ // Get offset to item
+ key = (char)action.m_key.KeyChar;
+ }
+ }
+ else
+ {
+ key = ((char)('0' + action.wID - Action.ActionType.REMOTE_0));
+ }
+ if (key == (char)0)
+ {
+ return;
+ }
+ keySelection += key;
+ if (keySelection.Length == listItems.Count.ToString().Length)
+ {
+ selectOption(keySelection);
+ keySelection = string.Empty;
+ return;
+ }
+ keyTimer = DateTime.Now;
+ return;
+ }
+
+ base.OnAction(action);
+ //base.OnAction(action);
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-09 14:16:16
|
Revision: 4834
http://sourceforge.net/p/mp-plugins/code/4834
Author: nicsergio
Date: 2014-06-09 14:16:11 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 06:57:05 UTC (rev 4833)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 14:16:11 UTC (rev 4834)
@@ -16,7 +16,11 @@
#region Controlli Grafici
[SkinControl(10)]
- protected GUIImage logo; //Immagine logo Skin Navigator
+ protected GUIImage selectedIcon; //Icona elemento selezionato
+ [SkinControl(11)]
+ protected GUIThumbnailPanel panelView; //Pannello icone per visualizzazione alternativa a lista
+ [SkinControl(20)]
+ protected GUIImage logo; //Immagine logo Skin Navigator
#endregion
#region Metodi Pubblici
@@ -42,9 +46,31 @@
}
public override void Dispose() //Override metodo Dispose
{
+ selectedIcon.SafeDispose();
+ panelView.SafeDispose();
logo.SafeDispose();
base.Dispose();
}
+ public override bool OnMessage(GUIMessage message)
+ {
+
+ if (message.Message == GUIMessage.MessageType.GUI_MSG_WINDOW_INIT) //& alternativeView
+ {
+ //base.base.OnMessage();
+
+ return true;
+ }
+ else
+ return base.OnMessage(message);
+ }
+ protected override void OnClicked(int controlId, GUIControl control, Action.ActionType actionType)
+ {
+ base.OnClicked(controlId, control, actionType);
+ }
+ public override void selectOption(string keySelected)
+ {
+ base.selectOption(keySelected);
+ }
#endregion
#region Consumazione Eventi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-09 06:57:08
|
Revision: 4833
http://sourceforge.net/p/mp-plugins/code/4833
Author: nicsergio
Date: 2014-06-09 06:57:05 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 06:54:11 UTC (rev 4832)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 06:57:05 UTC (rev 4833)
@@ -1,6 +1,5 @@
using System.Drawing;
using System.Reflection;
-using System.Timers;
using MediaPortal.Dialogs;
using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-09 06:54:20
|
Revision: 4832
http://sourceforge.net/p/mp-plugins/code/4832
Author: nicsergio
Date: 2014-06-09 06:54:11 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage 2014-06-09 06:53:28 UTC (rev 4831)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage 2014-06-09 06:54:11 UTC (rev 4832)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnim.pspimage
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-09 06:53:36
|
Revision: 4831
http://sourceforge.net/p/mp-plugins/code/4831
Author: nicsergio
Date: 2014-06-09 06:53:28 +0000 (Mon, 09 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-08 19:28:49 UTC (rev 4830)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-09 06:53:28 UTC (rev 4831)
@@ -13,32 +13,18 @@
#region Dati
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
- 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(20)]
- protected GUIImage animationLogo; //Immagine logo animato Skin Navigator
+ [SkinControl(10)]
+ protected GUIImage logo; //Immagine logo 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
@@ -50,63 +36,19 @@
try
{
- 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*/
+ logo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
+ logo.SetFileName("[ShortCuter:NavigatorLogo]"); //--> impostazione immagine logo Skin Navigator
}
catch { }
}
- protected override void OnPageDestroy(int new_windowId) //Override metodo OnPageDestroy
- {
- if (animationTimer != null)
- {
- animationTimer.Enabled = false; //--> diabilitazione timer
- animationTimer.Elapsed -= animationTimer_Elapsed; //--> annullamento sottoscrizione evento Elapsed
- animationTimer = null; //--> annullamento istanza timer
- }
- base.OnPageDestroy(new_windowId);
- }
public override void Dispose() //Override metodo Dispose
{
- animationTimer.SafeDispose();
- animationLogo.SafeDispose();
+ logo.SafeDispose();
base.Dispose();
}
#endregion
#region Consumazione Eventi
- private void animationTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
- {
- animationTimer.Stop();
-
- int imageID = animationCycle % 2;
-
-
- //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)
- dir = false;
- if (animationCycle <= 0)
- dir = true;
-
-
- if (dir)
- animationCycle++;
- else
- animationCycle--;
- */
-
- animationCycle++;
- animationTimer.Start();
- }
#endregion
#region Proprietà
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-08 19:28:49 UTC (rev 4830)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-09 06:53:28 UTC (rev 4831)
@@ -180,6 +180,7 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
+ <None Include="Resources\Images\SkinNavAnim.pspimage" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -200,16 +201,6 @@
</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" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame3.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame4.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame5.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame6.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame7.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame8.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-08 19:28:55
|
Revision: 4830
http://sourceforge.net/p/mp-plugins/code/4830
Author: nicsergio
Date: 2014-06-08 19:28:49 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-08 19:05:56 UTC (rev 4829)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-08 19:28:49 UTC (rev 4830)
@@ -87,8 +87,8 @@
//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.MemoryImage = animationImages[imageID]; //.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + imageID + ".png"));
+ //animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + imageID + "]");
//animationLogo.DoUpdate();
//animationLogo.UpdateLayout();
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo.gif
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogo22.gif
===================================================================
(Binary files differ)
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif 2014-06-08 19:05:56 UTC (rev 4829)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif 2014-06-08 19:28:49 UTC (rev 4830)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/AnimLogoX.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-08 19:06:01
|
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.
|
|
From: <nic...@us...> - 2014-06-06 15:11:06
|
Revision: 4828
http://sourceforge.net/p/mp-plugins/code/4828
Author: nicsergio
Date: 2014-06-06 15:10:58 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 14:57:24 UTC (rev 4827)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 15:10:58 UTC (rev 4828)
@@ -44,7 +44,6 @@
animationTimer = new Timer(2000); //--> creazione timer animazione logo
animationTimer.Elapsed += new ElapsedEventHandler(animationTimer_Elapsed); //--> sottoscrizione evento Elapsed
- dir = true;
animationTimer.Enabled = true; //--> abilitazione timer
}
catch { }
@@ -72,17 +71,21 @@
{
animationTimer.Stop();
- int imageID = animationCycle % 3;
- if (animationCycle > 8)
- dir = false;
- if (animationCycle < 0)
- dir = true;
+ int imageID = animationCycle % 9;
+
+ animationTimer.Interval = 100 + (dir ? animationCycle : 36 - animationCycle) * 10;
- animationTimer.Interval = 300;
animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + imageID + ".png"));
animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + imageID + "]");
-
+
+
+ if (animationCycle >= 36)
+ dir = false;
+ if (animationCycle <= 0)
+ dir = true;
+
+
if (dir)
animationCycle++;
else
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-06 14:57:24 UTC (rev 4827)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-06 15:10:58 UTC (rev 4828)
@@ -200,9 +200,15 @@
</ItemGroup>
<ItemGroup>
<Content Include="ExternalResources\Dialogs.dll" />
- <Content Include="Resources\Images\SkinNavAnimLogo\Frame0.png" />
- <Content Include="Resources\Images\SkinNavAnimLogo\Frame1.png" />
- <Content Include="Resources\Images\SkinNavAnimLogo\Frame2.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame0.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame1.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame2.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame3.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame4.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame5.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame6.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame7.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavAnimLogo\Frame8.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-06 14:57:34
|
Revision: 4827
http://sourceforge.net/p/mp-plugins/code/4827
Author: nicsergio
Date: 2014-06-06 14:57:24 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-06 14:56:52
|
Revision: 4826
http://sourceforge.net/p/mp-plugins/code/4826
Author: nicsergio
Date: 2014-06-06 14:56:49 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame3.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame4.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame5.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame6.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame7.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame8.png
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
___________________________________________________________________
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/Frame1.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
___________________________________________________________________
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/Frame2.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
___________________________________________________________________
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/Frame3.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame3.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame3.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame3.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame3.png
___________________________________________________________________
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/Frame4.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame4.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame4.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame4.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame4.png
___________________________________________________________________
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/Frame5.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame5.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame5.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame5.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame5.png
___________________________________________________________________
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/Frame6.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame6.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame6.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame6.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame6.png
___________________________________________________________________
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/Frame7.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame7.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame7.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame7.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame7.png
___________________________________________________________________
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/Frame8.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame8.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame8.png 2014-06-06 14:32:06 UTC (rev 4825)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame8.png 2014-06-06 14:56:49 UTC (rev 4826)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame8.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-06 14:32:09
|
Revision: 4825
http://sourceforge.net/p/mp-plugins/code/4825
Author: nicsergio
Date: 2014-06-06 14:32:06 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frames.pspimage
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 14:32:06 UTC (rev 4825)
@@ -15,6 +15,7 @@
public const string DialogSkinFile = "ShortCuter.Navigator.DialogMenu.xml"; //File della skin per personalizzazione finestra di dialogo
private Timer animationTimer; //Timer per animazione logo Skin Navigator
private int animationCycle; //Id ciclo per animazione logo Skin Navigator
+ bool dir;
#endregion
#region Controlli Grafici
@@ -43,6 +44,7 @@
animationTimer = new Timer(2000); //--> creazione timer animazione logo
animationTimer.Elapsed += new ElapsedEventHandler(animationTimer_Elapsed); //--> sottoscrizione evento Elapsed
+ dir = true;
animationTimer.Enabled = true; //--> abilitazione timer
}
catch { }
@@ -69,10 +71,23 @@
private void animationTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
animationTimer.Stop();
+
+ int imageID = animationCycle % 3;
+ if (animationCycle > 8)
+ dir = false;
+ if (animationCycle < 0)
+ dir = true;
+
+
animationTimer.Interval = 300;
- animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + animationCycle.ToString() + ".png"));
- animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + animationCycle.ToString() + "]");
- animationCycle++;
+ animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + imageID + ".png"));
+ animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + imageID + "]");
+
+ if (dir)
+ animationCycle++;
+ else
+ animationCycle--;
+
animationTimer.Start();
}
#endregion
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame00.png
___________________________________________________________________
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/Frame05.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame05.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame10.png
___________________________________________________________________
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/Frame15.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame15.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
===================================================================
(Binary files differ)
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame20.png
___________________________________________________________________
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/Frame25.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame25.png
___________________________________________________________________
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/Frame30.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame30.png
___________________________________________________________________
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/Frame35.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame35.png
___________________________________________________________________
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/Frame40.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame40.png
___________________________________________________________________
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/Frames.pspimage
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frames.pspimage
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frames.pspimage 2014-06-06 07:28:53 UTC (rev 4824)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frames.pspimage 2014-06-06 14:32:06 UTC (rev 4825)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frames.pspimage
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-06 07:29:05
|
Revision: 4824
http://sourceforge.net/p/mp-plugins/code/4824
Author: nicsergio
Date: 2014-06-06 07:28:53 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 06:48:22 UTC (rev 4823)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-06 07:28:53 UTC (rev 4824)
@@ -5,7 +5,6 @@
using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
using My.Common;
-using System;
namespace ShortCuter.Plugin
{
@@ -14,62 +13,70 @@
#region Dati
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
- private Timer animationLogo;
- private bool anCyc;
+ private Timer animationTimer; //Timer per animazione logo Skin Navigator
+ private int animationCycle; //Id ciclo per animazione logo Skin Navigator
#endregion
- [SkinControl(20)]
- protected GUIImage tega;
+ #region Controlli Grafici
+ [SkinControl(10)]
+ protected GUIImage animationLogo; //Immagine logo animato Skin Navigator
+ #endregion
#region Metodi Pubblici
public override bool Init() //Override metodo Init
{
- return Load(GUIGraphicsContext.Theme + @"\" + DialogSkinFile); //--> inizializzazione solo se presente il file della skin per personalizzare la finestra di dialogo
+ return Load(GUIGraphicsContext.GetThemedSkinFile(@"\" + 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()
+ protected override void OnPageLoad() //Override metodo OnPageLoad
{
- animationLogo.SafeDispose();
- tega.SafeDispose();
- base.Dispose();
- }
- protected override void OnPageLoad()
- {
base.OnPageLoad();
- tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
- tega.SetFileName("[ShortCuter:NavigatorLogo]");
- base.lblHeading2.Label = Tools.MyAssembly.Title;
+ base.lblHeading2.Label = Tools.MyAssembly.Title; //--> forzatura label "Menu"
- animationLogo = new Timer(2000);
- animationLogo.Elapsed += new ElapsedEventHandler(animationLogoElapsed);
- animationLogo.Enabled = true;
-
+ 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
+ animationTimer.Elapsed += new ElapsedEventHandler(animationTimer_Elapsed); //--> sottoscrizione evento Elapsed
+ animationTimer.Enabled = true; //--> abilitazione timer
+ }
+ catch { }
}
- protected override void OnPageDestroy(int new_windowId)
+ protected override void OnPageDestroy(int new_windowId) //Override metodo OnPageDestroy
{
- if (animationLogo != null)
+ if (animationTimer != null)
{
- animationLogo.Enabled = false;
- animationLogo.Elapsed -= animationLogoElapsed;
- animationLogo = null;
+ animationTimer.Enabled = false; //--> diabilitazione timer
+ animationTimer.Elapsed -= animationTimer_Elapsed; //--> annullamento sottoscrizione evento Elapsed
+ animationTimer = null; //--> annullamento istanza timer
}
base.OnPageDestroy(new_windowId);
}
+ public override void Dispose() //Override metodo Dispose
+ {
+ animationTimer.SafeDispose();
+ animationLogo.SafeDispose();
+ base.Dispose();
+ }
#endregion
- void animationLogoElapsed(object sender, System.Timers.ElapsedEventArgs e)
+ #region Consumazione Eventi
+ private void animationTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{
- animationLogo.Stop();
- animationLogo.Interval = 300;
- tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator" + Convert.ToInt16(anCyc).ToString() + ".png"));
- tega.SetFileName("[ShortCuter:NavigatorLogo" + Convert.ToInt16(anCyc).ToString() + "]");
- anCyc = !anCyc;
- animationLogo.Start();
+ animationTimer.Stop();
+ animationTimer.Interval = 300;
+ animationLogo.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavAnimLogo.Frame" + animationCycle.ToString() + ".png"));
+ animationLogo.SetFileName("[ShortCuter:NavigatorLogo" + animationCycle.ToString() + "]");
+ animationCycle++;
+ animationTimer.Start();
}
-
+ #endregion
+
#region Proprietà
public override int GetID { get { return DialogWindowID; } }
#endregion
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png
===================================================================
(Binary files differ)
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-06 06:48:22 UTC (rev 4823)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-06 07:28:53 UTC (rev 4824)
@@ -203,8 +203,6 @@
<Content Include="Resources\Images\SkinNavAnimLogo\Frame0.png" />
<Content Include="Resources\Images\SkinNavAnimLogo\Frame1.png" />
<Content Include="Resources\Images\SkinNavAnimLogo\Frame2.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavigator0.png" />
- <EmbeddedResource Include="Resources\Images\SkinNavigator1.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-06 06:48:53
|
Revision: 4823
http://sourceforge.net/p/mp-plugins/code/4823
Author: nicsergio
Date: 2014-06-06 06:48:22 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png 2014-06-05 20:37:57 UTC (rev 4822)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png 2014-06-06 06:48:22 UTC (rev 4823)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame0.png
___________________________________________________________________
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/Frame1.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png 2014-06-05 20:37:57 UTC (rev 4822)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png 2014-06-06 06:48:22 UTC (rev 4823)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame1.png
___________________________________________________________________
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/Frame2.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png 2014-06-05 20:37:57 UTC (rev 4822)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.png 2014-06-06 06:48:22 UTC (rev 4823)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAnimLogo/Frame2.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-06-05 20:37:57 UTC (rev 4822)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-06 06:48:22 UTC (rev 4823)
@@ -200,6 +200,9 @@
</ItemGroup>
<ItemGroup>
<Content Include="ExternalResources\Dialogs.dll" />
+ <Content Include="Resources\Images\SkinNavAnimLogo\Frame0.png" />
+ <Content Include="Resources\Images\SkinNavAnimLogo\Frame1.png" />
+ <Content Include="Resources\Images\SkinNavAnimLogo\Frame2.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator0.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator1.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-05 20:38:02
|
Revision: 4822
http://sourceforge.net/p/mp-plugins/code/4822
Author: nicsergio
Date: 2014-06-05 20:37:57 +0000 (Thu, 05 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/SkinNavigator0.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-05 19:04:01 UTC (rev 4821)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-05 20:37:57 UTC (rev 4822)
@@ -1,9 +1,11 @@
using System.Drawing;
using System.Reflection;
+using System.Timers;
using MediaPortal.Dialogs;
using MediaPortal.ExtensionMethods;
using MediaPortal.GUI.Library;
using My.Common;
+using System;
namespace ShortCuter.Plugin
{
@@ -12,6 +14,8 @@
#region Dati
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
+ private Timer animationLogo;
+ private bool anCyc;
#endregion
[SkinControl(20)]
@@ -28,6 +32,7 @@
}
public override void Dispose()
{
+ animationLogo.SafeDispose();
tega.SafeDispose();
base.Dispose();
}
@@ -36,21 +41,34 @@
base.OnPageLoad();
tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
tega.SetFileName("[ShortCuter:NavigatorLogo]");
+ base.lblHeading2.Label = Tools.MyAssembly.Title;
+ animationLogo = new Timer(2000);
+ animationLogo.Elapsed += new ElapsedEventHandler(animationLogoElapsed);
+ animationLogo.Enabled = true;
- System.Timers.Timer timer = new System.Timers.Timer(100);
- timer.Elapsed += new System.Timers.ElapsedEventHandler(_timer_Elapsed);
- timer.Enabled = true; // Enable it
-
}
protected override void OnPageDestroy(int new_windowId)
{
-
+ if (animationLogo != null)
+ {
+ animationLogo.Enabled = false;
+ animationLogo.Elapsed -= animationLogoElapsed;
+ animationLogo = null;
+ }
base.OnPageDestroy(new_windowId);
}
#endregion
- void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) { }
+ void animationLogoElapsed(object sender, System.Timers.ElapsedEventArgs e)
+ {
+ animationLogo.Stop();
+ animationLogo.Interval = 300;
+ tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator" + Convert.ToInt16(anCyc).ToString() + ".png"));
+ tega.SetFileName("[ShortCuter:NavigatorLogo" + Convert.ToInt16(anCyc).ToString() + "]");
+ anCyc = !anCyc;
+ animationLogo.Start();
+ }
#region Proprietà
public override int GetID { get { return DialogWindowID; } }
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png 2014-06-05 19:04:01 UTC (rev 4821)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png 2014-06-05 20:37:57 UTC (rev 4822)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator0.png
___________________________________________________________________
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/SkinNavigator1.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png 2014-06-05 19:04:01 UTC (rev 4821)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png 2014-06-05 20:37:57 UTC (rev 4822)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator1.png
___________________________________________________________________
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/SkinNavigator2.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png 2014-06-05 19:04:01 UTC (rev 4821)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.png 2014-06-05 20:37:57 UTC (rev 4822)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavigator2.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-06-05 19:04:01 UTC (rev 4821)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-06-05 20:37:57 UTC (rev 4822)
@@ -200,6 +200,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="ExternalResources\Dialogs.dll" />
+ <EmbeddedResource Include="Resources\Images\SkinNavigator0.png" />
+ <EmbeddedResource Include="Resources\Images\SkinNavigator1.png" />
<EmbeddedResource Include="Resources\Images\SkinNavigator.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-05 19:04:19
|
Revision: 4821
http://sourceforge.net/p/mp-plugins/code/4821
Author: nicsergio
Date: 2014-06-05 19:04:01 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-04 19:05:26 UTC (rev 4820)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-05 19:04:01 UTC (rev 4821)
@@ -37,14 +37,21 @@
tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
tega.SetFileName("[ShortCuter:NavigatorLogo]");
+
+ System.Timers.Timer timer = new System.Timers.Timer(100);
+ timer.Elapsed += new System.Timers.ElapsedEventHandler(_timer_Elapsed);
+ timer.Enabled = true; // Enable it
+
}
- public override void DoModal(int dwParentId)
+ protected override void OnPageDestroy(int new_windowId)
{
-
- base.DoModal(dwParentId);
+
+ base.OnPageDestroy(new_windowId);
}
#endregion
+ void _timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e) { }
+
#region Proprietà
public override int GetID { get { return DialogWindowID; } }
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-04 19:05:33
|
Revision: 4820
http://sourceforge.net/p/mp-plugins/code/4820
Author: nicsergio
Date: 2014-06-04 19:05:26 +0000 (Wed, 04 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-03 20:03:03 UTC (rev 4819)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-04 19:05:26 UTC (rev 4820)
@@ -35,10 +35,8 @@
{
base.OnPageLoad();
tega.MemoryImage = Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ShortCuter.Resources.Images.SkinNavigator.png"));
- tega.UpdateLayout();
-
+ tega.SetFileName("[ShortCuter:NavigatorLogo]");
- ;tega.SetFileName(@"C:\ProgramData\Team MediaPortal\MediaPortal\ShortCuter\Icons\movies.png");
}
public override void DoModal(int dwParentId)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-03 20:03:08
|
Revision: 4819
http://sourceforge.net/p/mp-plugins/code/4819
Author: nicsergio
Date: 2014-06-03 20:03:03 +0000 (Tue, 03 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-02 17:46:30 UTC (rev 4818)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-03 20:03:03 UTC (rev 4819)
@@ -37,6 +37,7 @@
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-06-02 17:46:38
|
Revision: 4818
http://sourceforge.net/p/mp-plugins/code/4818
Author: nicsergio
Date: 2014-06-02 17:46:30 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-02 17:33:14 UTC (rev 4817)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-02 17:46:30 UTC (rev 4818)
@@ -36,6 +36,7 @@
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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <nic...@us...> - 2014-05-27 06:34:18
|
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.
|
2 messages has been excluded from this view by a project administrator.
