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-04-28 17:43:52
|
Revision: 4790
http://sourceforge.net/p/mp-plugins/code/4790
Author: nicsergio
Date: 2014-04-28 17:43:49 +0000 (Mon, 28 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-04-27 19:40:27 UTC (rev 4789)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-04-28 17:43:49 UTC (rev 4790)
@@ -20,7 +20,7 @@
private string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
private const int TrailersPluginControlID = 11899; //Id controllo per attivazione plugin Trailers
- internal delegate void LoadParamChgEventHandler(string loadParam); //Delegato per evento di modifica parametri di caricamento
+ internal delegate string NotifyLoadParamChanged(); //Delegato per evento di modifica parametri di caricamento
#endregion
#region Costruttore
@@ -33,7 +33,8 @@
#endregion
#region Metodi Pubblici
- public void Go() //Visualizzazione finestra del collegamento
+
+ public void Go(NotifyLoadParamChanged eee) //Visualizzazione finestra del collegamento
{
if (_loadParameter.Length > 0) //Se richiesti parametri di caricamento
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-04-27 19:40:30
|
Revision: 4789
http://sourceforge.net/p/mp-plugins/code/4789
Author: nicsergio
Date: 2014-04-27 19:40:27 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-04-27 19:40:27 UTC (rev 4789)
@@ -24,7 +24,7 @@
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Any CPU.ActiveCfg = DLL|x86
- {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.ActiveCfg = DLL|x86
+ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.ActiveCfg = EXE|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-27 19:40:27 UTC (rev 4789)
@@ -196,7 +196,7 @@
#region Consumazione Eventi
private void rawInput_KeyDown(object sender, KeyEventArgs e) //Evento di pressione tasto
{
- if (!ShortCut.ModifierKeys.Contains(e.KeyCode)) //Verifica se il tasto premuto non corrisponde ad un modificatore
+ if (!KeyCombination.IsModifier(e.KeyCode)) //Verifica se il tasto premuto non corrisponde ad un modificatore
{
List<ShortCut> scList = myShortCuts.Items.ToList().FindAll(x =>
x.Key == e.KeyCode.ToString()
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-04-27 19:40:27 UTC (rev 4789)
@@ -175,7 +175,9 @@
<ItemGroup>
<Content Include="Resources\Images\SkinNav.png" />
<Content Include="Resources\Images\SkinNavAdd.png" />
- <EmbeddedResource Include="Resources\XmlFiles\DefaultConfig.xml" />
+ <EmbeddedResource Include="Resources\XmlFiles\DefaultConfig.xml">
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<Content Include="..\Common\Resources\Images\ArrowDown.png">
<Link>Resources\Images\ArrowDown.png</Link>
</Content>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-04-27 19:40:27 UTC (rev 4789)
@@ -12,7 +12,7 @@
#endregion
#region Costruttore
- public ShortCuterKeyConfig(ShortCut currentShortCut, Point startLocation)
+ internal ShortCuterKeyConfig(ShortCut currentShortCut, Point startLocation)
{
InitializeComponent();
Location = startLocation; //--> impostazione posizione form
@@ -41,7 +41,7 @@
}
private void keyboardHook_KeyDown(object sender, KeyEventArgs e) //Evento KeyDown intercettato dall'hook
{
- if (!ShortCut.ModifierKeys.Contains(e.KeyCode))
+ if (!KeyCombination.IsModifier(e.KeyCode))
keyLabel.Text = e.KeyCode.ToString(); //--> visualizzazione tasto premuto, se non corrisponde ad un modificatore
e.Handled = true; //--> il tasto premuto viene ignorato
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-04-27 19:40:27 UTC (rev 4789)
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
+using MediaPortal.GUI.Library;
using System.IO;
using System.Reflection;
using System.Text;
@@ -11,63 +12,105 @@
namespace ProcessPlugins.ShortCuter
{
- private struct Destination
+ internal class ScreenLink //Classe collegamento ad una finestra di MediaPortal
{
- public int _windowID; //Id finestra per visualizzazione in MediaPortal
- public string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
- public override string ToString()
+ #region Dati
+ private string _caption; //Titolo link
+ private int _windowID; //Id finestra per visualizzazione in MediaPortal
+ private string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
+
+ private const int TrailersPluginControlID = 11899; //Id controllo per attivazione plugin Trailers
+ internal delegate void LoadParamChgEventHandler(string loadParam); //Delegato per evento di modifica parametri di caricamento
+ #endregion
+
+ #region Costruttore
+ public ScreenLink() //Costruttore classe ScreenLink
{
- return "WindowID=" + _windowID.ToString() + ((_loadParameter.Length > 0) ? " LoadParameter=[" + _loadParameter + "]" : "");
+ _caption = "Link"; //--> inizializzazione titolo
+ _windowID = 0; //--> inizializzazione window ID
+ _loadParameter = ""; //--> inizializzazione parametri di caricamento per visualizzazione
}
- }
+ #endregion
- private struct KeyCombination
- {
- public string _key; //Tasto (stringa corrispondente a KeyCode)
- public bool _ctrl; //Utilizzo del modificatore "Ctrl" - combinazione di tasti
- public bool _alt; //Utilizzo del modificatore "Alt" - combinazione di tasti
- public bool _shift; //Utilizzo del modificatore "Shift" - combinazione di tasti
- public override string ToString()
+ #region Metodi Pubblici
+ public void Go() //Visualizzazione finestra del collegamento
{
- return "Key=" + ((_ctrl) ? "<CTRL>" : "")
- + ((_alt) ? "<ALT>" : "")
- + ((_shift) ? "<SHIFT>" : "")
- + "<" + _key + ">";
+ if (_loadParameter.Length > 0) //Se richiesti parametri di caricamento
+ {
+ bool loadParameterChange = false;
+ string loadParameter = _loadParameter;
+ while (true) //Ricerca eventuali GUIProperties
+ {
+ int i = loadParameter.IndexOf("(#"), ii = 0;
+ if (i >= 0)
+ ii = loadParameter.IndexOf(")", i);
+ if (i >= 0 && (ii > i))
+ {
+ string propName = loadParameter.Remove(ii).Remove(0, i + 1);
+ if (propName.Length > 0)
+ {
+ loadParameter = loadParameter.Remove(i) + GUIPropertyManager.GetProperty(propName).Trim() + loadParameter.Remove(0, ii + 1);
+ loadParameterChange = true;
+ }
+ else
+ break;
+ }
+ else
+ break;
+ }
+ if (loadParameterChange && (LoadParamChg != null))
+ LoadParamChg(loadParameter); //--> richiamo dell'evento di modifica parametri di caricamento
+
+ GUIWindowManager.ActivateWindow(_windowID, loadParameter, true); //--> richiamo schermata con parametri di caricamento
+ }
+ else //Richiamo schermata senza parametri di caricamento
+ {
+ GUIMessage msg;
+ if (_windowID == TrailersPluginControlID) //Se richiesta di attivazione plugin Trailers
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_CLICKED, 0, TrailersPluginControlID, TrailersPluginControlID, 0, 0, null);
+ else //Caso normale di attivazione finesta MediaPortal
+ msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, _windowID, 0, null);
+
+ GUIWindowManager.SendMessage(msg); //--> invio messaggio per attivazione finestra
+ }
}
- }
-
- internal class SimpleShortCut
- {
- protected string _caption; //Titolo
- protected Destination _destination;
+ 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 + "]" : "");
+ }
+ #endregion
- public override string ToString()
+ #region Eventi
+ public event LoadParamChgEventHandler LoadParamChg; //Evento di modifica parametri di caricamento
+ #endregion
+
+ #region Proprietà
+ public bool IsValid
{
- return "ShortCut " + _caption + " --> " + _destination.ToString();
+ get
+ {
+ return (this._windowID >= 0); //L'ID della finestra di MediaPortal deve essere valido
+ }
}
-
+ public string Caption { get { return this._caption; } set { this._caption = value; } }
+ public int WindowID { get { return this._windowID; } set { this._windowID = value; } }
+ public string LoadParameter { get { return this._loadParameter; } set { this._loadParameter = value; } }
+ #endregion
}
-
-
- public class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
+ internal class KeyCombination //Classe combinazione di tasti
{
#region Dati
- private string _caption; //Titolo
private string _key; //Tasto (stringa corrispondente a KeyCode)
private bool _ctrl; //Utilizzo del modificatore "Ctrl" - combinazione di tasti
private bool _alt; //Utilizzo del modificatore "Alt" - combinazione di tasti
private bool _shift; //Utilizzo del modificatore "Shift" - combinazione di tasti
- private int _windowID; //Id finestra per visualizzazione in MediaPortal
- private string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
- private bool _return; //Ritorno a finestra precedente se si è già a destinazione
- private string _soundEffect; //File relativo all'eventuale effetto sonoro
- private Destination _destination;
- public static readonly List<Keys> ModifierKeys = new List<Keys>(); //Lista dei tasti modificatori
+
+ private static readonly List<Keys> ModifierKeys = new List<Keys>(); //Lista dei tasti modificatori
#endregion
#region Costruttore
- static ShortCut() //Costruttore statico classe ShortCut
+ static KeyCombination() //Costruttore statico classe KeyCombination
{
ModifierKeys.Add(Keys.ControlKey); //--> aggiunta del tasto Control tra i modificatori
ModifierKeys.Add(Keys.LControlKey); //--> aggiunta del tasto Control (sinistro) tra i modificatori
@@ -79,102 +122,127 @@
ModifierKeys.Add(Keys.LShiftKey); //--> aggiunta del tasto Shift (sinistro) tra i modificatori
ModifierKeys.Add(Keys.RShiftKey); //--> aggiunta del tasto Shift (destro) tra i modificatori
}
- public ShortCut() //Costruttore classe ShortCut
+ public KeyCombination() //Costruttore classe KeyCombination
{
- _caption = "ShortCut"; //--> inizializzazione titolo
- _key = "A"; //--> inizializzazione tasto
- _ctrl = true; //--> inizializzazione utilizzo del modificatore "Ctrl"
- _alt = false; //--> inizializzazione utilizzo del modificatore "Alt"
- _shift = true; //--> inizializzazione utilizzo del modificatore "Shift"
- _windowID = 0; //--> inizializzazione window ID
- _loadParameter = ""; //--> inizializzazione parametri di caricamento per visualizzazione
- _return = false; //--> inizializzazione ritorno a finestra precedente se si è già a destinazione
- _soundEffect = "click.wav"; //--> inizializzazione effetto sonoro
+ _key = "A"; //--> inizializzazione tasto
+ _ctrl = true; //--> inizializzazione utilizzo del modificatore "Ctrl"
+ _alt = false; //--> inizializzazione utilizzo del modificatore "Alt"
+ _shift = true; //--> inizializzazione utilizzo del modificatore "Shift" }
}
#endregion
-
- #region Metodi Privati
- private void NotifyPropertyChanged(string name) //Notifica variazione proprietà
+
+ #region Metodi Pubblici
+ public static bool IsModifier(Keys key) //Verifica se un tasto corrisponde ad un modificatore
{
- if (PropertyChanged != null)
- PropertyChanged(this, new PropertyChangedEventArgs(name)); //--> pubblicazione evento
+ return ModifierKeys.Contains(key);
}
+ public override string ToString() //Override metodo ToString per stampare la combinazione di tasti
+ {
+ return "Key=" + ((_ctrl) ? "<CTRL>" : "") + ((_alt) ? "<ALT>" : "") + ((_shift) ? "<SHIFT>" : "") + "<" + _key + ">";
+ }
#endregion
- #region Metodi Pubblici & Eventi
- public bool IsValid() //Verifica validità dello shortcut
- {
- //if ((_ctrl || _alt || _shift) && _windowID >= 0) //(fino a V2.0.1) Per validare lo shortcut deve esserci almeno un modificatore nella combinazione di tasti e l'ID della finestra di MediaPortal deve essere valido
- if (_windowID >= 0) //Per validare lo shortcut l'ID della finestra di MediaPortal deve essere valido
+ #region Proprietà
+ public bool IsValid
+ {
+ get
{
KeysConverter kc = new KeysConverter();
Keys key = new Keys();
- try { key = (Keys)kc.ConvertFromString(_key); }
+ try { key = (Keys)kc.ConvertFromString(_key); }
catch { }
return (key != Keys.None && !ModifierKeys.Contains(key)); //--> verifica se la stringa corrisponde ad un tasto e che il tasto non sia un modificatore
}
- else
- return false;
}
+ public string Key { get { return this._key; } set { this._key = value; } }
+ public bool Ctrl { get { return this._ctrl; } set { this._ctrl = value; } }
+ public bool Alt { get { return this._alt; } set { this._alt = value; } }
+ public bool Shift { get { return this._shift; } set { this._shift = value; } }
+ #endregion
+ }
+
+ internal class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
+ {
+ #region Dati
+ private string _caption; //Titolo link
+ private KeyCombination _keys; //Combinazione di tasti per attivazione shortcut
+ private ScreenLink _destination; //Destinazione dello shortcut
+ private bool _return; //Ritorno a finestra precedente se si è già a destinazione
+ private string _soundEffect; //File relativo all'eventuale effetto sonoro
+ #endregion
+
+ #region Costruttore
+ public ShortCut() //Costruttore classe ShortCut
+ {
+ _caption = "ShortCut"; //--> inizializzazione titolo
+ _keys = new KeyCombination(); //--> istanziazione classe KeyCombination
+ _destination = new ScreenLink(); //--> istanziazione classe Screenlink
+ _destination.Caption = ""; //--> reset caption destinazione (gestita caption shortcut)
+ _return = false; //--> inizializzazione ritorno a finestra precedente se si è già a destinazione
+ _soundEffect = "click.wav"; //--> inizializzazione effetto sonoro
+ }
+ #endregion
+
+ #region Metodi Privati
+ private void NotifyPropertyChanged(string name) //Notifica variazione proprietà
+ {
+ if (PropertyChanged != null)
+ PropertyChanged(this, new PropertyChangedEventArgs(name)); //--> pubblicazione evento
+ }
+ #endregion
+
+ #region Metodi Pubblici
public ShortCut Clone() //Clonazione shortcut
{
ShortCut sc = new ShortCut();
- sc.Caption = _caption;
- sc.Key = _key;
- sc.Ctrl = _ctrl;
- sc.Alt = _alt;
- sc.Shift = _shift;
- sc.WindowID = _windowID;
- sc.LoadParameter = _loadParameter;
- sc.Return = _return;
- sc.SoundEffect = _soundEffect;
+ sc.Caption = _caption;
+ sc.Key = _keys.Key;
+ sc.Ctrl = _keys.Ctrl;
+ sc.Alt = _keys.Alt;
+ sc.Shift = _keys.Shift;
+ sc.WindowID = _destination.WindowID;
+ sc.LoadParameter = _destination.LoadParameter;
+ sc.Return = _return;
+ sc.SoundEffect = _soundEffect;
return sc;
}
public override string ToString() //Override metodo ToString per stampare le proprietà dello shortcut
{
- string ret;
- ret = "ShortCut " + _caption + ": Key=";
- if (_ctrl)
- ret += "<CTRL>";
- if (_alt)
- ret += "<ALT>";
- if (_shift)
- ret += "<SHIFT>";
- ret += "<" + _key + ">" + " --> WindowID=" + _windowID.ToString();
- if (_loadParameter.Length > 0)
- ret += " LoadParameter=[" + _loadParameter + "]";
- if (_soundEffect.Length > 0)
- ret += " SoundEffect=" + _soundEffect;
- return ret;
+ return "ShortCut " + _caption + " " + _keys.ToString() + " " + _destination.ToString();
}
+ #endregion
+
+ #region Eventi
public event PropertyChangedEventHandler PropertyChanged; //Implementazione INotifyPropertyChanged: evento di notifica variazione proprietà
#endregion
#region Proprietà
- public string Caption { get { return this._caption; } set { this._caption = value; this.NotifyPropertyChanged("Caption"); } }
- public string Key { get { return this._key; } set { this._key = value; this.NotifyPropertyChanged("Key"); } }
- public bool Ctrl { get { return this._ctrl; } set { this._ctrl = value; this.NotifyPropertyChanged("Ctrl"); } }
- public bool Alt { get { return this._alt; } set { this._alt = value; this.NotifyPropertyChanged("Alt"); } }
- public bool Shift { get { return this._shift; } set { this._shift = value; this.NotifyPropertyChanged("Shift"); } }
- public int WindowID { get { return this._destination._windowID; } set { this._destination._windowID = value; this.NotifyPropertyChanged("WindowID"); } }
- public string LoadParameter { get { return this._loadParameter; } set { this._loadParameter = value; this.NotifyPropertyChanged("LoadParameter"); } }
- public bool Return { get { return this._return; } set { this._return = value; this.NotifyPropertyChanged("Return"); } }
- public string SoundEffect { get { return this._soundEffect; } set { this._soundEffect = value; this.NotifyPropertyChanged("SoundEffect"); } }
+ public bool IsValid { get { return this._keys.IsValid && _destination.IsValid; } }
+ public string Caption { get { return this._caption; } set { this._caption = value; this.NotifyPropertyChanged("Caption"); } }
+ public string Key { get { return this._keys.Key; } set { this._keys.Key = value; this.NotifyPropertyChanged("Key"); } }
+ public bool Ctrl { get { return this._keys.Ctrl; } set { this._keys.Ctrl = value; this.NotifyPropertyChanged("Ctrl"); } }
+ public bool Alt { get { return this._keys.Alt; } set { this._keys.Alt = value; this.NotifyPropertyChanged("Alt"); } }
+ public bool Shift { get { return this._keys.Shift; } set { this._keys.Shift = value; this.NotifyPropertyChanged("Shift"); } }
+ public int WindowID { get { return this._destination.WindowID; } set { this._destination.WindowID = value; this.NotifyPropertyChanged("WindowID"); } }
+ public string LoadParameter { get { return this._destination.LoadParameter; } set { this._destination.LoadParameter = value; this.NotifyPropertyChanged("LoadParameter"); } }
+ public bool Return { get { return this._return; } set { this._return = value; this.NotifyPropertyChanged("Return"); } }
+ public string SoundEffect { get { return this._soundEffect; } set { this._soundEffect = value; this.NotifyPropertyChanged("SoundEffect"); } }
#endregion
}
-
-
-
+
internal class ShortCuts //Classe di gestione degli shortcuts configurati
{
- #region Dati
- private readonly string SettingsFile; //File di salvataggio impostazioni
- private readonly bool ConfigContext; //Utilizzo nella fase di configurazione (altrimenti plugin in esecuzione)
+ #region Strutture
private struct GeneralSettings //Struttura impostazioni generali
{
public LockKeys.LockKeyActions ForcingCapsLock; //Tipologia di forzatura Caps-Lock all'avvio
public LockKeys.LockKeyActions ForcingNumLock; //Tipologia di forzatura Num-Lock all'avvio
}
+ #endregion
+
+ #region Dati
+ private readonly string SettingsFile; //File di salvataggio impostazioni
+ private readonly bool ConfigContext; //Utilizzo nella fase di configurazione (altrimenti plugin in esecuzione)
private GeneralSettings _general = new GeneralSettings(); //Impostazioni generali plugin
private BindingList<ShortCut> _items = new BindingList<ShortCut>(); //Lista (con associazione dati) degli shortcuts configurati
private bool _initialized; //Classe inizializzata
@@ -227,7 +295,7 @@
sc.Ctrl = ctrl;
sc.Alt = false;
sc.Shift = shift;
- if (sc.IsValid()) //Se shortcut valido
+ if (sc.IsValid) //Se shortcut valido
_items.Add(sc); //--> aggiunta dello shortcut nella lista
}
return (_items.Count > 0);
@@ -338,7 +406,7 @@
innerNode = node.SelectSingleNode("SoundEffect");
if (innerNode != null)
sc.SoundEffect = innerNode.InnerText;
- if (sc.IsValid()) //Se shortcut valido
+ if (sc.IsValid) //Se shortcut valido
_items.Add(sc); //--> aggiunta dello shortcut nella lista
}
if (_items.Count > 0)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-04-27 19:13:03 UTC (rev 4788)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-04-27 19:40:27 UTC (rev 4789)
@@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid>
- <OutputType>Library</OutputType>
+ <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace>
<AssemblyName>XtremeMenuEditor</AssemblyName>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-27 19:13:05
|
Revision: 4788
http://sourceforge.net/p/mp-plugins/code/4788
Author: doskabouter
Date: 2014-04-27 19:13:03 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
Fixed duplicate link-numbers for iframes
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-04-21 19:48:57 UTC (rev 4787)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-04-27 19:13:03 UTC (rev 4788)
@@ -85,7 +85,7 @@
return new Point(0, 0);
}
- private static void AddLinksToPage(GeckoDocument document, int id)
+ private static int AddLinksToPage(GeckoDocument document, int id)
{
Dictionary<string, int> hrefs = new Dictionary<string, int>();
GeckoElementCollection links = document.Links;
@@ -253,7 +253,8 @@
GeckoElementCollection iframes = document.GetElementsByTagName("iframe");
MyLog.debug("page iframes cnt : " + iframes.Count<GeckoHtmlElement>());
foreach (GeckoIFrameElement element in iframes)
- AddLinksToPage(element.ContentDocument, id);
+ id = AddLinksToPage(element.ContentDocument, id);
+ return id;
}
private static int GetMaxId(GeckoDocument document)
@@ -282,7 +283,7 @@
private static GeckoHtmlElement CreateSpan(GeckoDocument owner, int geckoId, string className, string extra)
{
GeckoHtmlElement result = owner.CreateHtmlElement("span");
- result.SetAttribute("style", _spanstyle + extra);
+ result.SetAttribute("style", _spanstyle + extra);
result.InnerHtml = geckoId.ToString();
if (!String.IsNullOrEmpty(className))
result.SetAttribute("class", className);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hor...@us...> - 2014-04-21 19:49:02
|
Revision: 4787
http://sourceforge.net/p/mp-plugins/code/4787
Author: horned-reaper
Date: 2014-04-21 19:48:57 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/FritzBox/Build/Build.log
trunk/plugins/FritzBox/Docs/Changes.txt
trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
trunk/plugins/FritzBox/FritzBox/FritzBox.cs
trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
trunk/plugins/FritzBox/FritzBox/Settings.cs
trunk/plugins/FritzBox/FritzBox/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/FritzBox/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferences.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.dll
trunk/plugins/FritzBox/FritzBox/obj/Debug/FritzBox.pdb
trunk/plugins/FritzBox/FritzBox/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.EditPhoneBook.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.FritzBoxConfig.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.Properties.Resources.resources
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csproj.GenerateResource.Cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/FritzBox/obj/Release/FritzBox.dll
trunk/plugins/FritzBox/MpeRelease/FritzBox.xmp2
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/FritzBoxConfigTester.csproj
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/app.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Bass.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassRegistration.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/BassVisAPI.Net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Common.Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Core.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/DirectShowLib.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/MediaPortal.Support.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Utils.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/log4net.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/taglib-sharp.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Debug/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csproj.FileListAbsolute.txt
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.exe
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/obj/Release/FritzBoxConfigTester.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/FritzBoxDebugger.csproj
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/app.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/Dialogs.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBox.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.exe.config
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/bin/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.csprojResolveAssemblyReference.cache
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Debug/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.DebugForm.resources
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.exe
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/Release/FritzBoxDebugger.pdb
trunk/plugins/FritzBox/releases/update.xml
Added Paths:
-----------
trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/CSScriptLibrary.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.Shell.dll
trunk/plugins/FritzBox/Tools/FritzBoxConfigTester/bin/Release/Microsoft.WindowsAPICodePack.dll
trunk/plugins/FritzBox/Tools/FritzBoxDebugger/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4564.mpe1
trunk/plugins/FritzBox/releases/FritzBox_v1.0.0.4786.mpe1
Modified: trunk/plugins/FritzBox/Build/Build.log
===================================================================
--- trunk/plugins/FritzBox/Build/Build.log 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Build/Build.log 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,17 +1,17 @@
Running : C:\Program Files\TortoiseSVN\bin\SubWCRev.exe
-SVN Version: 4563
+SVN Version: 4786
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxConfigTester\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\Tools\FritzBoxDebugger\Properties\AssemblyInfo.cs
Microsoft (R)-Buildmodul, Version 4.0.30319.17929
-[Microsoft .NET Framework, Version 4.0.30319.18033]
+[Microsoft .NET Framework, Version 4.0.30319.18449]
Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
Die Projekte in dieser Projektmappe werden nacheinander erstellt. Um eine parallele Erstellung zu erm\x94glichen, m\x81ssen Sie den Schalter "/m" hinzuf\x81gen.
-Der Buildvorgang wurde am 18.04.2013 23:11:23 gestartet.
+Der Buildvorgang wurde am 21.04.2014 21:24:13 gestartet.
Projekt "D:\FritzBox\FritzBox.sln" auf Knoten "1", Rebuild Ziel(e).
ValidateSolutionConfiguration:
Die Projektmappenkonfiguration "Release|Any CPU" wird erstellt.
@@ -26,9 +26,14 @@
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.dll" wird gel\x94scht.
Die Datei "D:\FritzBox\FritzBox\obj\Release\FritzBox.csprojResolveAssemblyReference.cache" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\Release\FritzBox.FritzBoxConfig.resources
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /r:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /compile EditPhoneBook.resx,obj\Release\FritzBox.EditPhoneBook.resources Properties\Resources.resx,obj\Release\FritzBox.Properties.Resources.resources FritzBoxConfig.resx,obj\Release\FritzBox.FritzBoxConfig.resources
+ Die Ressourcendatei "EditPhoneBook.resx" wird zu "obj\Release\FritzBox.EditPhoneBook.resources" verarbeitet.
+ Die Ressourcendatei "Properties\Resources.resx" wird zu "obj\Release\FritzBox.Properties.Resources.resources" verarbeitet.
+ Die Ressourcendatei "FritzBoxConfig.resx" wird zu "obj\Release\FritzBox.FritzBoxConfig.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Data.Linq.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /baseaddress:4194304 /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Common.Utils.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.Linq.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.Linq.dll" /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Utils.dll" /filealign:4096 /out:obj\Release\FritzBox.dll /resource:obj\Release\FritzBox.EditPhoneBook.resources /resource:obj\Release\FritzBox.Properties.Resources.resources /resource:obj\Release\FritzBox.FritzBoxConfig.resources /resource:FritzBox.png,FritzBox.FritzBox.png /resource:FritzBoxDisabled.png,FritzBox.FritzBoxDisabled.png /target:library /warnaserror- /utf8output EditPhoneBook.cs EditPhoneBook.Designer.cs FritzCallMonitor\FritzBoxClient.cs FritzManager\LocalizeStrings.cs FritzManager\StringEncryption.cs FritzManager\UNCAccessWithCredentials.cs FritzManager\VBReader.cs FritzManager\BackGroundWorker.cs FritzManager\BlockingQueue.cs FritzManager\CallItem.cs FritzManager\Fritz.cs FritzManager\FritzboxPhoneBook.cs FritzManager\Logger.cs FritzManager\LoggerFactory.cs FritzManager\MyBinaryReader.cs FritzManager\PhoneBookItem.cs FritzManager\Task.cs FritzManager\VoiceBoxItem.cs Properties\AssemblyInfo.cs FritzCallMonitor\Caller.cs FritzCallMonitor\CallAction.cs FritzBoxConfig.cs FritzBoxConfig.Designer.cs FritzBox.cs FritzManager\PhoneBook.cs Properties\Resources.Designer.cs Settings.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
CopyFilesToOutputDirectory:
@@ -60,8 +65,10 @@
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.csprojResolveAssemblyReference.cache" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxConfigTester\obj\Release\FritzBoxConfigTester.pdb" wird gel\x94scht.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:"C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxConfigTester.exe /target:winexe /utf8output Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Core.dll" in "bin\Release\Core.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
@@ -72,13 +79,16 @@
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\DirectShowLib.dll" in "bin\Release\DirectShowLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassVisAPI.Net.dll" in "bin\Release\BassVisAPI.Net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\taglib-sharp.dll" in "bin\Release\taglib-sharp.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\CSScriptLibrary.dll" in "bin\Release\CSScriptLibrary.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\AxInterop.WMPLib.dll" in "bin\Release\AxInterop.WMPLib.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\edtftpnet-1.2.2.dll" in "bin\Release\edtftpnet-1.2.2.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\BassRegistration.dll" in "bin\Release\BassRegistration.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\MediaPortal.Support.dll" in "bin\Release\MediaPortal.Support.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Interop.WMPLib.dll" in "bin\Release\Interop.WMPLib.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.Shell.dll" in "bin\Release\Microsoft.WindowsAPICodePack.Shell.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\log4net.dll" in "bin\Release\log4net.dll" kopiert.
Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Ionic.Zip.dll" in "bin\Release\Ionic.Zip.dll" kopiert.
+ Die Datei wird von "C:\Program Files (x86)\Team MediaPortal\MediaPortal\Microsoft.WindowsAPICodePack.dll" in "bin\Release\Microsoft.WindowsAPICodePack.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.pdb" in "bin\Release\FritzBox.pdb" kopiert.
_CopyAppConfigFile:
Die Datei wird von "app.config" in "bin\Release\FritzBoxConfigTester.exe.config" kopiert.
@@ -100,9 +110,12 @@
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.exe" wird gel\x94scht.
Die Datei "D:\FritzBox\Tools\FritzBoxDebugger\obj\Release\FritzBoxDebugger.pdb" wird gel\x94scht.
CoreResGen:
- C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\ResGen.exe /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /r:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\resgen.exe" /useSourcePath /r:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /r:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /compile DebugForm.resx,obj\Release\FritzBoxDebugger.DebugForm.resources
+ Die Ressourcendatei "DebugForm.resx" wird zu "obj\Release\FritzBoxDebugger.DebugForm.resources" verarbeitet.
+GenerateTargetFrameworkMonikerAttribute:
+Das Ziel "GenerateTargetFrameworkMonikerAttribute" wird \x81bersprungen, da alle Ausgabedateien hinsichtlich der Eingabedateien aktuell sind.
CoreCompile:
- C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\mscorlib.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\v3.5\System.Core.dll" /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Data.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Drawing.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Windows.Forms.dll /reference:C:\Windows\Microsoft.NET\Framework\v2.0.50727\System.Xml.dll /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs
+ C:\Windows\Microsoft.NET\Framework\v4.0.30319\Csc.exe /noconfig /unsafe+ /nowarn:1701,1702 /nostdlib+ /platform:x86 /define:TRACE /highentropyva- /reference:D:\FritzBox\FritzBox\bin\Release\FritzBox.dll /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\mscorlib.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Core.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Data.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Drawing.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.dll" /reference:"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Xml.dll" /debug:pdbonly /optimize+ /out:obj\Release\FritzBoxDebugger.exe /resource:obj\Release\FritzBoxDebugger.DebugForm.resources /target:winexe /utf8output DebugForm.cs DebugForm.Designer.cs Program.cs Properties\AssemblyInfo.cs "C:\Users\Test\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cs"
_CopyFilesMarkedCopyLocal:
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\FritzBox.dll" in "bin\Release\FritzBox.dll" kopiert.
Die Datei wird von "D:\FritzBox\FritzBox\bin\Release\Dialogs.dll" in "bin\Release\Dialogs.dll" kopiert.
@@ -120,7 +133,7 @@
0 Warnung(en)
0 Fehler
-Verstrichene Zeit 00:00:02.14
+Verstrichene Zeit 00:00:04.54
Reverting to build 0
Updating: D:\FritzBox\FritzBox\Properties\AssemblyInfo.cs
Updating: D:\FritzBox\MP2version\Listeners\FritzBox\Properties\AssemblyInfo.cs
@@ -270,8 +283,8 @@
..\FritzBox\Languages\Unsupported\strings_uk.xml
..\FritzBox\Languages\Unsupported\strings_zh-CN.xml
37 Datei(en) kopiert
-MpeMaker version: 1.3.0.0
-Build started at 23:11:27
+MpeMaker version: 1.7.0.0
+Build started at 21:24:21
Building "D:\FritzBox\MpeRelease\FritzBox.xmp2"
Output: "..\MpeRelease\FritzBox.mpe1"
Writing UpdateXML to "update.xml"
Modified: trunk/plugins/FritzBox/Docs/Changes.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Changes.txt 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Changes.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,3 +1,5 @@
-1.0.0.4563:
-Fixed bug:
-- incoming call notifications aren't shown when option "Show on outgoing call" is disabled and an outgoing call has been done (thanks to Django.edwards!)
\ No newline at end of file
+1.0.0.4786:
+Optimizations:
+- FRITZ!OS 6 and MediaPortal 1.6/1.6 compatibility
+- FRITZ!OS version display format (e. g. 06.05) in log file
+- login test in Configuration menu
\ No newline at end of file
Modified: trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt
===================================================================
--- trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/Docs/Vorgehensweise beim Update.txt 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,5 @@
1. \xC4nderungen in Visual Studio vornehmen
-2. Build.bat ausf\xFChren
+2. "Build FritzBoxManager.bat" ausf\xFChren
3. Pr\xFCfen, ob Installer-Datei mit der korrekten Versionsnummer unter "D:\FritzBox\releases" angelegt wurde. Beispiel:
- OK: FritzBox_v0.3.5.4364.mpe1
- Falsch: FritzBox_v0.3.5.0.mpe1
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -68,6 +68,7 @@
private int notificationCount = 0;
private CallAction.CallType lastCallActionType; // necessary to avoid that notification window isn't closed on quick sequent call actions
private string currentConnectionID;
+ private UNCAccessWithCredentials nASShareConnection;
#endregion Variables
@@ -161,13 +162,38 @@
}
private void OnConnectedAction()
- {
+ {
updateTimer.Start();
+
+ string nASSharePath = @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName;
+ if (!Directory.Exists(nASSharePath) && Settings.NASShareIsEnabled)
+ {
+ Log.Debug("Connecting with FRITZ!Box NAS share");
+
+ nASShareConnection = new UNCAccessWithCredentials();
+
+ if (nASShareConnection.NetUseWithCredentials(nASSharePath, Settings.UserName, "", Settings.Password))
+ {
+ Log.Info("Connected with FRITZ!Box NAS share");
+ }
+ else
+ {
+ Log.Error("Failed to connect with FRITZ!Box NAS share");
+ }
+ }
}
private void OnDisconnectedAction()
{
updateTimer.Stop();
+ if (_tempNotification != null && isNotificationWindowOpened()) closeNotificationWindow();
+ currentConnectionID = null;
+
+ if (nASShareConnection != null)
+ {
+ Log.Debug("Disconnecting from FRITZ!Box NAS share");
+ nASShareConnection.NetUseDelete(); // disconnecting is done asynchronously and takes about 15 seconds
+ }
}
private void OnLoggedInAction()
@@ -803,9 +829,9 @@
BackGroundWorker worker = thePlugin.worker;
worker.EnqueueTask(new Task(Task.TaskAction.LoadCallListItems, null));
- if (!String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
+ if (Settings.NASShareIsEnabled && !String.IsNullOrEmpty(Settings.VBPath)) worker.EnqueueTask(new Task(Task.TaskAction.LoadVoiceBoxItems, null));
if (Settings.SynchronizePhoneBook) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizePhoneBook, null));
- if (!Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
+ if (Settings.NASShareIsEnabled && !Settings.ManualContactImagePathEntry && !String.IsNullOrEmpty(Settings.NASShareName)) worker.EnqueueTask(new Task(Task.TaskAction.SynchronizeContactImages, null));
worker.EnqueueTask(new Task(Task.TaskAction.UpdateGUIProperties, null));
// reset update timer to get the timer countdown reset
Modified: trunk/plugins/FritzBox/FritzBox/FritzBox.csproj
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBox.csproj 2014-04-21 19:48:57 UTC (rev 4787)
@@ -18,7 +18,7 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\sr\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@@ -105,6 +105,7 @@
<Compile Include="FritzManager\StringEncryption.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="FritzManager\UNCAccessWithCredentials.cs" />
<Compile Include="FritzManager\VBReader.cs" />
<Compile Include="FritzManager\BackGroundWorker.cs" />
<Compile Include="FritzManager\BlockingQueue.cs" />
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.Designer.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -70,13 +70,17 @@
this.checkBoxPauseMediaOnIncomingCall = new MediaPortal.UserInterface.Controls.MPCheckBox();
this.tabPageConnection = new System.Windows.Forms.TabPage();
this.numericUpDownDialPort = new System.Windows.Forms.NumericUpDown();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.checkBoxEnableNASShare = new System.Windows.Forms.CheckBox();
this.label6 = new System.Windows.Forms.Label();
this.textBoxNASShareName = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
- this.vBPath = new System.Windows.Forms.TextBox();
- this.passwd = new System.Windows.Forms.TextBox();
+ this.textBoxVBPath = new System.Windows.Forms.TextBox();
+ this.textBoxUserName = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.textBoxPasswd = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
this.numericUpDownPort = new System.Windows.Forms.NumericUpDown();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.textBoxAddress = new MediaPortal.UserInterface.Controls.MPTextBox();
@@ -96,6 +100,7 @@
this.groupBoxMedia.SuspendLayout();
this.tabPageConnection.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).BeginInit();
+ this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.tabControlConfiguration.SuspendLayout();
@@ -594,13 +599,12 @@
// tabPageConnection
//
this.tabPageConnection.Controls.Add(this.numericUpDownDialPort);
- this.tabPageConnection.Controls.Add(this.label6);
- this.tabPageConnection.Controls.Add(this.textBoxNASShareName);
- this.tabPageConnection.Controls.Add(this.label2);
- this.tabPageConnection.Controls.Add(this.vBPath);
- this.tabPageConnection.Controls.Add(this.passwd);
+ this.tabPageConnection.Controls.Add(this.groupBox1);
+ this.tabPageConnection.Controls.Add(this.textBoxUserName);
+ this.tabPageConnection.Controls.Add(this.label7);
+ this.tabPageConnection.Controls.Add(this.textBoxPasswd);
+ this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.label3);
- this.tabPageConnection.Controls.Add(this.label1);
this.tabPageConnection.Controls.Add(this.numericUpDownPort);
this.tabPageConnection.Controls.Add(this.pictureBox1);
this.tabPageConnection.Controls.Add(this.textBoxAddress);
@@ -616,7 +620,7 @@
//
// numericUpDownDialPort
//
- this.numericUpDownDialPort.Location = new System.Drawing.Point(129, 152);
+ this.numericUpDownDialPort.Location = new System.Drawing.Point(449, 57);
this.numericUpDownDialPort.Maximum = new decimal(new int[] {
99,
0,
@@ -624,70 +628,111 @@
0});
this.numericUpDownDialPort.Name = "numericUpDownDialPort";
this.numericUpDownDialPort.Size = new System.Drawing.Size(44, 20);
- this.numericUpDownDialPort.TabIndex = 36;
+ this.numericUpDownDialPort.TabIndex = 42;
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.checkBoxEnableNASShare);
+ this.groupBox1.Controls.Add(this.label6);
+ this.groupBox1.Controls.Add(this.textBoxNASShareName);
+ this.groupBox1.Controls.Add(this.label2);
+ this.groupBox1.Controls.Add(this.textBoxVBPath);
+ this.groupBox1.Location = new System.Drawing.Point(15, 145);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(538, 153);
+ this.groupBox1.TabIndex = 39;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "FRITZ! NAS";
+ //
+ // checkBoxEnableNASShare
+ //
+ this.checkBoxEnableNASShare.AutoSize = true;
+ this.checkBoxEnableNASShare.Location = new System.Drawing.Point(23, 28);
+ this.checkBoxEnableNASShare.Name = "checkBoxEnableNASShare";
+ this.checkBoxEnableNASShare.Size = new System.Drawing.Size(335, 17);
+ this.checkBoxEnableNASShare.TabIndex = 42;
+ this.checkBoxEnableNASShare.Text = "Enable NAS share (used for voice box function and caller images)";
+ this.checkBoxEnableNASShare.UseVisualStyleBackColor = true;
+ this.checkBoxEnableNASShare.CheckedChanged += new System.EventHandler(this.checkBoxEnableNASShare_CheckedChanged);
+ //
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(15, 260);
+ this.label6.Location = new System.Drawing.Point(22, 117);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(87, 13);
- this.label6.TabIndex = 35;
+ this.label6.TabIndex = 41;
this.label6.Text = "NAS share name";
//
// textBoxNASShareName
//
- this.textBoxNASShareName.Location = new System.Drawing.Point(110, 257);
+ this.textBoxNASShareName.Location = new System.Drawing.Point(117, 114);
this.textBoxNASShareName.Name = "textBoxNASShareName";
this.textBoxNASShareName.Size = new System.Drawing.Size(119, 20);
- this.textBoxNASShareName.TabIndex = 34;
+ this.textBoxNASShareName.TabIndex = 40;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(15, 196);
+ this.label2.Location = new System.Drawing.Point(22, 59);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(354, 13);
- this.label2.TabIndex = 32;
- this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\USBStore\\FRITZ\\voicebox)";
+ this.label2.Size = new System.Drawing.Size(302, 13);
+ this.label2.TabIndex = 39;
+ this.label2.Text = "Voice box path (e. g. \\\\fritz.box\\FRITZ.NAS\\FRITZ\\voicebox)";
//
- // vBPath
+ // textBoxVBPath
//
- this.vBPath.Location = new System.Drawing.Point(17, 216);
- this.vBPath.Name = "vBPath";
- this.vBPath.Size = new System.Drawing.Size(369, 20);
- this.vBPath.TabIndex = 29;
+ this.textBoxVBPath.Location = new System.Drawing.Point(24, 79);
+ this.textBoxVBPath.Name = "textBoxVBPath";
+ this.textBoxVBPath.Size = new System.Drawing.Size(369, 20);
+ this.textBoxVBPath.TabIndex = 37;
//
- // passwd
+ // textBoxUserName
//
- this.passwd.Location = new System.Drawing.Point(206, 97);
- this.passwd.Name = "passwd";
- this.passwd.PasswordChar = '*';
- this.passwd.Size = new System.Drawing.Size(100, 20);
- this.passwd.TabIndex = 27;
- this.passwd.Text = "passwd";
+ this.textBoxUserName.Location = new System.Drawing.Point(209, 97);
+ this.textBoxUserName.Name = "textBoxUserName";
+ this.textBoxUserName.Size = new System.Drawing.Size(100, 20);
+ this.textBoxUserName.TabIndex = 37;
//
- // label3
+ // label7
//
- this.label3.Location = new System.Drawing.Point(15, 145);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(108, 23);
- this.label3.TabIndex = 31;
- this.label3.Text = "Dial port (telephone)";
- this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ this.label7.Location = new System.Drawing.Point(142, 91);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 23);
+ this.label7.TabIndex = 38;
+ this.label7.Text = "User name";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // textBoxPasswd
+ //
+ this.textBoxPasswd.Location = new System.Drawing.Point(393, 97);
+ this.textBoxPasswd.Name = "textBoxPasswd";
+ this.textBoxPasswd.PasswordChar = '*';
+ this.textBoxPasswd.Size = new System.Drawing.Size(100, 20);
+ this.textBoxPasswd.TabIndex = 27;
+ this.textBoxPasswd.Text = "passwd";
+ //
// label1
//
- this.label1.Location = new System.Drawing.Point(142, 91);
+ this.label1.Location = new System.Drawing.Point(329, 91);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(58, 23);
this.label1.TabIndex = 28;
this.label1.Text = "Password";
this.label1.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
//
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(331, 50);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(108, 23);
+ this.label3.TabIndex = 38;
+ this.label3.Text = "Dial port (telephone)";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+ //
// numericUpDownPort
//
- this.numericUpDownPort.Location = new System.Drawing.Point(206, 58);
+ this.numericUpDownPort.Location = new System.Drawing.Point(209, 58);
this.numericUpDownPort.Maximum = new decimal(new int[] {
999999,
0,
@@ -718,7 +763,7 @@
this.textBoxAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxAddress.BorderColor = System.Drawing.Color.Empty;
- this.textBoxAddress.Location = new System.Drawing.Point(206, 18);
+ this.textBoxAddress.Location = new System.Drawing.Point(209, 18);
this.textBoxAddress.Name = "textBoxAddress";
this.textBoxAddress.Size = new System.Drawing.Size(138, 20);
this.textBoxAddress.TabIndex = 10;
@@ -847,6 +892,8 @@
this.tabPageConnection.ResumeLayout(false);
this.tabPageConnection.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownDialPort)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownPort)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.tabControlConfiguration.ResumeLayout(false);
@@ -890,10 +937,7 @@
private System.Windows.Forms.TabPage tabPageMiscellaneous;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label2;
- private System.Windows.Forms.TextBox vBPath;
- private System.Windows.Forms.TextBox passwd;
- private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.TextBox textBoxPasswd;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericUpDownPort;
private System.Windows.Forms.PictureBox pictureBox1;
@@ -904,9 +948,6 @@
private MediaPortal.UserInterface.Controls.MPNumericUpDown updateInterval;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnOutgoingCall;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowNotificationOnIncomingCall;
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.TextBox textBoxNASShareName;
- private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowPhoneTypeOnNotification;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxShowUnknownCaller;
private MediaPortal.UserInterface.Controls.MPCheckBox checkBoxUsePhonebook;
@@ -917,5 +958,15 @@
private MediaPortal.UserInterface.Controls.MPComboBox comboBoxExtensions;
private System.Windows.Forms.CheckBox checkBoxManualContactImagePathEntry;
private System.Windows.Forms.CheckBox checkBoxSynchronizePhoneBook;
+ private System.Windows.Forms.TextBox textBoxUserName;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.NumericUpDown numericUpDownDialPort;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox checkBoxEnableNASShare;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox textBoxNASShareName;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox textBoxVBPath;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -38,10 +38,14 @@
{
InitializeComponent();
LoadSettings();
- FritzBoxClient.LogEvent += OnLogAction;
+ FritzBoxClient.LogEvent += new FritzBoxClient.LogEventHandler(OnLogAction);
+ FritzBoxClient.ConnectedEvent += new FritzBoxClient.ConnectedEventHandler(OnConnectedAction);
+
+ Fritz.LoggedInEvent += OnLoggedInAction;
}
private static Logger Log = LoggerFactory.getLogger("FritzBoxConfig");
+ private static Fritz fritz;
#region Settings
@@ -56,16 +60,20 @@
// connection settings
textBoxAddress.Text = FritzBoxClient.Address;
numericUpDownPort.Value = FritzBoxClient.Port;
- passwd.Text = Settings.Password;
+ textBoxUserName.Text = Settings.UserName;
+ textBoxPasswd.Text = Settings.Password;
+
numericUpDownDialPort.Text = Settings.DialPort;
ToolTip toolTipNumericUpDownDialPort = new ToolTip();
toolTipNumericUpDownDialPort.SetToolTip(numericUpDownDialPort, "Be sure to configure the correct dial port in the FRITZ!Box Manager settings to choose the appropriate telephone connected with the FRITZ!Box." + Environment.NewLine + "You may refer to the following list:" + Environment.NewLine + "1 & 2: analog phone outlets on the FRITZ!Box" + Environment.NewLine + "50: ISDN- & cordless phones (group)" + Environment.NewLine + "60: DECT phone");
- vBPath.Text = Settings.VBPath;
-
+ // NAS share settings
+ checkBoxEnableNASShare.Checked = Settings.NASShareIsEnabled;
textBoxNASShareName.Text = Settings.NASShareName;
+ textBoxVBPath.Text = Settings.VBPath;
+ checkBoxEnableNASShare_CheckedChanged(this, null);
// call notification settings
checkBoxShowNotificationOnIncomingCall.Checked = Settings.ShowNotificationOnIncomingCall;
@@ -129,13 +137,16 @@
// connection settings
FritzBoxClient.Address = textBoxAddress.Text;
FritzBoxClient.Port = (int)numericUpDownPort.Value;
- Settings.Password = passwd.Text;
+ Settings.UserName = textBoxUserName.Text;
+ Settings.Password = textBoxPasswd.Text;
+
Settings.DialPort = numericUpDownDialPort.Text;
- Settings.VBPath = vBPath.Text;
-
+ // NAS share settings
+ Settings.NASShareIsEnabled = checkBoxEnableNASShare.Checked;
Settings.NASShareName = textBoxNASShareName.Text;
+ Settings.VBPath = textBoxVBPath.Text;
// call notification settings
Settings.ShowNotificationOnIncomingCall = checkBoxShowNotificationOnIncomingCall.Checked;
@@ -318,6 +329,8 @@
FritzBoxClient.Port = (int)numericUpDownPort.Value;
// run tests
+ if (fritz == null) fritz = new Fritz(Settings.Password, Config.GetFolder(Config.Dir.Config), FritzBoxClient.Address, Settings.DialPort);
+
if (FritzBoxClient.TestConnection()) FritzBoxClient.StartClient();
}
@@ -352,7 +365,19 @@
}
else labelHelp.Text += logMessage + Environment.NewLine;
}
-
+
+ private void OnConnectedAction()
+ {
+ // log in to FRITZ!Box
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Logging in to FRITZ!Box (see Configuration log for details!)");
+ }
+
+ private void OnLoggedInAction()
+ {
+ OnLogAction(FritzBoxClient.LogLevel.Info, "Successfully logged in. Logging off...");
+ fritz.LogOff();
+ }
+
private void buttonEditPhoneBook_Click(object sender, EventArgs e)
{
EditPhoneBook editPhoneBook = new EditPhoneBook();
@@ -372,6 +397,12 @@
Settings.SynchronizePhoneBook = checkBoxSynchronizePhoneBook.Checked;
}
+ private void checkBoxEnableNASShare_CheckedChanged(object sender, EventArgs e)
+ {
+ textBoxNASShareName.Enabled = checkBoxEnableNASShare.Checked;
+ textBoxVBPath.Enabled = checkBoxEnableNASShare.Checked;
+ }
+
#region Nested type: SetTextCallback
private delegate void SetTextCallback(FritzBoxClient.LogLevel logLevel, string logMessage);
Modified: trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzBoxConfig.resx 2014-04-21 19:48:57 UTC (rev 4787)
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAwAEBAQAAAAAAAoAQAAxgAAABAQAAABAAgAaAUAAO4BAAAgIBAAAAAAAOgCAABWBwAAICAAAAEA
Modified: trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzCallMonitor/FritzBoxClient.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -306,7 +306,7 @@
Connected = true;
// raise event
- if (ConnectedEvent != null) ConnectedEvent(); // the Configuration tool doesn't use this event
+ ConnectedEvent();
// start connection monitoring. Since the socket does not detect connection interruptions it's necessary to monitor it by another thread
connectionCheckTimer.Start();
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/CallItem.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -1,5 +1,4 @@
-
-using System;
+using System;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/Fritz.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -109,7 +109,7 @@
public void LogOff()
{
loggedIn = false;
- LoggedOffEvent(); // raise event
+ if (LoggedOffEvent != null) LoggedOffEvent(); // the Configuration tool doesn't use this event
}
public void KeepAlive()
@@ -185,7 +185,7 @@
"-----------------------------88612920297--\r\n" +
"\r\n";
- returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "ISO-8859-15");
+ returnData = PostRequest("http://" + hostname + "/cgi-bin/firmwarecfg", postdata, "multipart/form-data; boundary=---------------------------88612920297", "UTF-8");
if (!returnData.StartsWith("<!DOCTYPE html")) return returnData;
}
@@ -367,7 +367,7 @@
// get FRITZ!Box name
FritzBox.Settings.FritzBoxName = getXMLValue(doc, "Name", "http://jason.avm.de/updatecheck/");
- Log.Debug("FRITZ!Box firmware version is " + FritzBox.Settings.FritzBoxFirmwareMainVersion + "." + FritzBox.Settings.FritzBoxFirmwareSubVersion + " on " + FritzBox.Settings.FritzBoxName);
+ Log.Debug("FRITZ!Box firmware version is " + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareMainVersion) + "." + string.Format("{0:00}", FritzBox.Settings.FritzBoxFirmwareSubVersion) + " on " + FritzBox.Settings.FritzBoxName);
}
catch
{
Modified: trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-12 09:50:54 UTC (rev 4786)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/PhoneBook.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -633,14 +633,11 @@
string contactImagePathRemote;
// convert to UNC format
- if (imageURL.Contains("file:///var/media/ftp/"))
- {
- contactImagePathRemote = imageURL.Replace("file:///var/media/ftp/", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName + "\\");
- contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
+ contactImagePathRemote = imageURL.Replace("file:///var/media/ftp", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("file:///var/InternerSpeicher", @"\\" + FritzBoxClient.Address + "\\" + Settings.NASShareName);
+ contactImagePathRemote = contactImagePathRemote.Replace("/", "\\");
- return contactImagePathRemote;
- }
- else return String.Empty;
+ return contactImagePathRemote;
}
#endregion private methods
Added: trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs
===================================================================
--- trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs (rev 0)
+++ trunk/plugins/FritzBox/FritzBox/FritzManager/UNCAccessWithCredentials.cs 2014-04-21 19:48:57 UTC (rev 4787)
@@ -0,0 +1,138 @@
+using System;
+using System.Runtime.InteropServices;
+using BOOL = System.Boolean;
+using DWORD = System.UInt32;
+using LPWSTR = System.String;
+using NET_API_STATUS = System.UInt32;
+
+namespace FritzBox
+{
+ public class UNCAccessWithCredentials : IDisposable
+ {
+ [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+ internal struct USE_INFO_2
+ {
+ internal LPWSTR ui2_local;
+ internal LPWSTR ui2_remote;
+ internal LPWSTR ui2_password;
+ internal DWORD ui2_status;
+ internal DWORD ui2_asg_type;
+ internal DWORD ui2_refcount;
+ internal DWORD ui2_usecount;
+ internal LPWSTR ui2_username;
+ internal LPWSTR ui2_domainname;
+ }
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseAdd(
+ LPWSTR UncServerName,
+ DWORD Level,
+ ref USE_INFO_2 Buf,
+ out DWORD ParmError);
+
+ [DllImport("NetApi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+ internal static extern NET_API_STATUS NetUseDel(
+ LPWSTR UncServerName,
+ LPWSTR UseName,
+ DWORD ForceCond);
+
+ private bool disposed = false;
+
+ private string sUNCPath;
+ private string sUser;
+ private string sPassword;
+ private string sDomain;
+ private int iLastError;
+
+ /// <summary>
+ /// A disposeable class that allows access to a UNC resource with credentials.
+ /// </summary>
+ public UNCAccessWithCredentials()
+ {
+ }
+
+ /// <summary>
+ /// The last system error code returned from NetUseAdd or NetUseDel. Success = 0
+ /// </summary>
+ public int LastError
+ {
+ get { return iLastError; }
+ }
+
+ public void Dispose()
+ {
+ if (!this.disposed)
+ {
+ NetUseDelete();
+ }
+ disposed = true;
+ GC.SuppressFinalize(this);
+ }
+
+ /// <summary>
+ /// Connects to a UNC path using the credenti...
[truncated message content] |
|
From: <nic...@us...> - 2014-04-12 09:50:56
|
Revision: 4786
http://sourceforge.net/p/mp-plugins/code/4786
Author: nicsergio
Date: 2014-04-12 09:50:54 +0000 (Sat, 12 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-12 09:49:22 UTC (rev 4785)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-12 09:50:54 UTC (rev 4786)
@@ -83,7 +83,6 @@
GUIGraphicsContext.ResetLastActivity();
if (sc.SoundEffect.Length > 0 && !g_Player.Playing)
Utils.PlaySound(sc.SoundEffect, false, true); //--> eventuale effetto sonoro
-
if (sc.LoadParameter.Length > 0) //Se richiesti parametri di caricamento
{
bool loadParameterChange = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-04-12 09:49:25
|
Revision: 4785
http://sourceforge.net/p/mp-plugins/code/4785
Author: nicsergio
Date: 2014-04-12 09:49:22 +0000 (Sat, 12 Apr 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-04 11:16:26 UTC (rev 4784)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2014-04-12 09:49:22 UTC (rev 4785)
@@ -5,6 +5,7 @@
using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
using MediaPortal.Util;
+using MediaPortal.Player;
//using Action = MediaPortal.GUI.Library.Action;
using My.Common;
@@ -80,9 +81,9 @@
MpLog(false, "Go to screen accepted, " + sc.ToString());
GUIGraphicsContext.ResetLastActivity();
- if (sc.SoundEffect.Length > 0)
+ if (sc.SoundEffect.Length > 0 && !g_Player.Playing)
Utils.PlaySound(sc.SoundEffect, false, true); //--> eventuale effetto sonoro
-
+
if (sc.LoadParameter.Length > 0) //Se richiesti parametri di caricamento
{
bool loadParameterChange = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-04-04 11:16:30
|
Revision: 4784
http://sourceforge.net/p/mp-plugins/code/4784
Author: framug
Date: 2014-04-04 11:16:26 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
bad manip, sorry
Removed Paths:
-------------
trunk/Desktop.ini
Deleted: trunk/Desktop.ini
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fr...@us...> - 2014-04-04 10:11:23
|
Revision: 4783
http://sourceforge.net/p/mp-plugins/code/4783
Author: framug
Date: 2014-04-04 10:11:21 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Added Paths:
-----------
trunk/Desktop.ini
Added: trunk/Desktop.ini
===================================================================
(Binary files differ)
Index: trunk/Desktop.ini
===================================================================
--- trunk/Desktop.ini 2014-04-02 21:07:03 UTC (rev 4782)
+++ trunk/Desktop.ini 2014-04-04 10:11:21 UTC (rev 4783)
Property changes on: trunk/Desktop.ini
___________________________________________________________________
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: <dos...@us...> - 2014-04-02 21:07:09
|
Revision: 4782
http://sourceforge.net/p/mp-plugins/code/4782
Author: doskabouter
Date: 2014-04-02 21:07:03 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Fixed bug: thumbs were not created when bookmark was added in mediaportal
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 21:05:35 UTC (rev 4781)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 21:07:03 UTC (rev 4782)
@@ -226,7 +226,7 @@
return true;
}
- public static void SaveSnap(Bitmap Snap, string Url)
+ private static void SaveSnap(Bitmap Snap, string Url)
{
try
{
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-04-02 21:05:35 UTC (rev 4781)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-04-02 21:07:03 UTC (rev 4782)
@@ -738,29 +738,7 @@
if (hasSaved)
{
ShowAlert("Bookmark has been saved !", "Title : " + title, "URL : " + actualUrl, "");
- #region save snapshot
-
- if (webBrowser.Url.ToString() != "about:blank")
- {
- int y = webBrowser.Height;
- int x = y / 4 * 3;
-
- int offset = (webBrowser.Width - x) / 2;
-
- Bitmap snap = new Bitmap(webBrowser.Width, webBrowser.Height);
- webBrowser.DrawToBitmap(snap, new Rectangle(0, 0, webBrowser.Width, webBrowser.Height));
-
- snap = CopyBitmap(snap, new Rectangle(offset, 0, x, y));
-
- snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
-
- Graphics g = Graphics.FromImage((Image)snap);
- g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
-
- Bookmark.SaveSnap(snap, actualUrl);
- }
- #endregion
-
+ Bookmark.GetAndSaveSnap(webBrowser, actualUrl);
}
else
ShowAlert("Bookmark could not be saved !", "Title : " + title, "URL : " + actualUrl, "");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-02 21:05:38
|
Revision: 4781
http://sourceforge.net/p/mp-plugins/code/4781
Author: doskabouter
Date: 2014-04-02 21:05:35 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.cs
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 20:30:44 UTC (rev 4780)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 21:05:35 UTC (rev 4781)
@@ -292,7 +292,7 @@
return result;
}
- public static bool GetAndSaveSnap(GeckoWebBrowser browser)
+ public static bool GetAndSaveSnap(GeckoWebBrowser browser, string url)
{
if (browser.Url.ToString() != "about:blank")
{
@@ -303,7 +303,7 @@
Graphics g = Graphics.FromImage((Image)snap);
g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
- Bookmark.SaveSnap(snap, browser.Url.ToString());
+ Bookmark.SaveSnap(snap, url);
return true;
}
return false;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2014-04-02 20:30:44 UTC (rev 4780)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2014-04-02 21:05:35 UTC (rev 4781)
@@ -61,7 +61,7 @@
private void browser_DocumentCompleted(object sender, EventArgs e)
{
- if (Bookmark.GetAndSaveSnap(browser))
+ if (Bookmark.GetAndSaveSnap(browser, SelectedUrl))
{
received = true;
chkGetThumb.Checked = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-02 20:30:47
|
Revision: 4780
http://sourceforge.net/p/mp-plugins/code/4780
Author: doskabouter
Date: 2014-04-02 20:30:44 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.cs
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 20:27:51 UTC (rev 4779)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 20:30:44 UTC (rev 4780)
@@ -33,6 +33,7 @@
using Gecko;
using Gecko.Utils;
+using TreeView = System.Windows.Forms.TreeView;
namespace BrowseTheWeb
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-02 20:27:55
|
Revision: 4779
http://sourceforge.net/p/mp-plugins/code/4779
Author: doskabouter
Date: 2014-04-02 20:27:51 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.cs
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-01 20:13:04 UTC (rev 4778)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-02 20:27:51 UTC (rev 4779)
@@ -31,6 +31,9 @@
using System.Drawing;
+using Gecko;
+using Gecko.Utils;
+
namespace BrowseTheWeb
{
@@ -181,6 +184,8 @@
public class Bookmark
{
+ private static string ThumbDir = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb";
+
public static TreeNode FindNode(TreeView Treeview, string Name)
{
foreach (TreeNode t in Treeview.Nodes[0].Nodes)
@@ -224,8 +229,7 @@
{
try
{
- string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ string filename = GetSnapPath(Url);
Snap.Save(filename);
}
catch (Exception e)
@@ -233,22 +237,20 @@
MyLog.debug("Exception: " + e.ToString());
}
}
+
public static Bitmap GetSnap(string Url)
{
- Bitmap snap = null;
try
{
- string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ string filename = GetSnapPath(Url);
if (File.Exists(filename))
{
- snap = (Bitmap)Bitmap.FromFile(filename);
- return snap;
+ return (Bitmap)Bitmap.FromFile(filename);
}
else
- MyLog.debug("Getsnap does not exist");
+ MyLog.debug("Getsnap " + filename + " does not exist");
}
catch (Exception e)
@@ -256,31 +258,19 @@
MyLog.debug("Exception: " + e.ToString());
}
- return snap;
+ return null;
}
public static string GetSnapPath(string Url)
{
string filename = GetThumbString(Url);
- filename = Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + filename;
+ return Path.Combine(ThumbDir, filename);
+ }
- return filename;
- }
public static void InitCachePath()
{
- if (!Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb"))
- Directory.CreateDirectory(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb");
-
-
- if (Directory.Exists(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb"))
- {
- string[] files = Directory.GetFiles(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Cache) + "\\BrowseTheWeb", "*.*");
- foreach (string f in files)
- {
- File.Move(f, Config.GetFolder(MediaPortal.Configuration.Config.Dir.Thumbs) + "\\BrowseTheWeb\\" + Path.GetFileName(f));
- }
- }
-
+ if (!Directory.Exists(ThumbDir))
+ Directory.CreateDirectory(ThumbDir);
}
private static string GetThumbString(string Name)
@@ -300,5 +290,22 @@
result = result + ".png";
return result;
}
+
+ public static bool GetAndSaveSnap(GeckoWebBrowser browser)
+ {
+ if (browser.Url.ToString() != "about:blank")
+ {
+ Bitmap snap = browser.GetBitmap((uint)browser.Width, (uint)browser.Height);
+
+ snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
+
+ Graphics g = Graphics.FromImage((Image)snap);
+ g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
+
+ Bookmark.SaveSnap(snap, browser.Url.ToString());
+ return true;
+ }
+ return false;
+ }
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2014-04-01 20:13:04 UTC (rev 4778)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2014-04-02 20:27:51 UTC (rev 4779)
@@ -27,7 +27,6 @@
using System.Windows.Forms;
using Gecko;
-using Gecko.Utils;
namespace BrowseTheWeb.Setup
{
@@ -62,16 +61,8 @@
private void browser_DocumentCompleted(object sender, EventArgs e)
{
- if (browser.Url.ToString() != "about:blank")
+ if (Bookmark.GetAndSaveSnap(browser))
{
- Bitmap snap = browser.GetBitmap((uint)browser.Width, (uint)browser.Height);
-
- snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
-
- Graphics g = Graphics.FromImage((Image)snap);
- g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
-
- Bookmark.SaveSnap(snap, SelectedUrl);
received = true;
chkGetThumb.Checked = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-01 20:13:07
|
Revision: 4778
http://sourceforge.net/p/mp-plugins/code/4778
Author: doskabouter
Date: 2014-04-01 20:13:04 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Remember currently selected bookmark-item
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-04-01 20:04:56 UTC (rev 4777)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-04-01 20:13:04 UTC (rev 4778)
@@ -43,6 +43,9 @@
[SkinControlAttribute(3)]
protected GUISortButtonControl btnSortBy = null;
+ BookmarkFolder currentList;
+ BookmarkBase selectedBookmark;
+
public const int BookmarkWindowId = 54537688;
public override int GetID
@@ -62,16 +65,29 @@
MyLog.debug("Init Browse the web bookmarks");
bool result = Load(GUIGraphicsContext.Skin + @"\BrowseTheWebBook.xml");
Bookmarks.Instance.LoadFromXml(Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\bookmarks.xml");
+ currentList = Bookmarks.Instance.root;
+ selectedBookmark = null;
return result;
}
protected override void OnPageLoad()
{
- LoadFacade(null);
+ LoadFacade();
Bookmark.InitCachePath();
base.OnPageLoad();
}
+
+ protected override void OnPageDestroy(int newWindowId)
+ {
+ BtwebGuiListItem item = facade.SelectedListItem as BtwebGuiListItem;
+ if (item != null)
+ {
+ selectedBookmark = item.bookmark;
+ }
+ base.OnPageDestroy(newWindowId);
+ }
+
protected override void OnClicked(int controlId, GUIControl control, MediaPortal.GUI.Library.Action.ActionType actionType)
{
if (actionType == MediaPortal.GUI.Library.Action.ActionType.ACTION_SELECT_ITEM)
@@ -81,10 +97,16 @@
{
if (item.IsFolder)
{
- LoadFacade((BookmarkFolder)item.bookmark);
+ if (item.Path == "..")
+ {
+ selectedBookmark = currentList;
+ }
+ currentList = (BookmarkFolder)item.bookmark;
+ LoadFacade();
}
else
{
+ selectedBookmark = item.bookmark;
GUIPlugin.StartupLink = item.Path;
if (GUIWindowManager.GetPreviousActiveWindow() == GUIPlugin.PluginWindowId)
GUIWindowManager.ShowPreviousWindow();
@@ -92,6 +114,7 @@
GUIWindowManager.ActivateWindow(GUIPlugin.PluginWindowId);
}
}
+
}
if (control == btnViewAs)
@@ -118,14 +141,15 @@
}
}
- public void LoadFacade(BookmarkFolder parent)
+ public void LoadFacade()
{
+ BookmarkFolder bmf = currentList;
facade.CurrentLayout = Settings.Instance.View;
facade.Clear();
- if (parent != null)
+ if (bmf.Parent != null)
{
BtwebGuiListItem item = new BtwebGuiListItem();
- item.bookmark = parent.Parent;
+ item.bookmark = bmf.Parent;
item.IsFolder = true;
item.Label = "..";
item.Path = "..";
@@ -134,7 +158,7 @@
facade.Add(item);
}
- BookmarkFolder bmf = parent == null ? Bookmarks.Instance.root : parent;
+ facade.SelectedListItemIndex = 0;
foreach (BookmarkBase bookmark in bmf.Items)
{
@@ -157,9 +181,11 @@
}
facade.Add(item);
+ if (bookmark == selectedBookmark)
+ facade.SelectedListItemIndex = facade.Count - 1;
}
+
GUIPropertyManager.SetProperty("#itemcount", facade.Count.ToString());
- facade.SelectedListItemIndex = 0;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-04-01 20:04:59
|
Revision: 4777
http://sourceforge.net/p/mp-plugins/code/4777
Author: doskabouter
Date: 2014-04-01 20:04:56 +0000 (Tue, 01 Apr 2014)
Log Message:
-----------
Refactor Bookmarks.Instance.root to BookmarkFolder
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -23,7 +23,6 @@
#endregion
using System;
-using System.Collections.Generic;
using System.Xml;
using System.IO;
using System.Windows.Forms;
@@ -38,7 +37,7 @@
public class Bookmarks
{
public static string SavedByMp = "Saved by MP";
- public List<BookmarkBase> root;
+ public BookmarkFolder root;
#region singleton
private static Bookmarks instance;
@@ -56,12 +55,13 @@
private Bookmarks()
{
- root = new List<BookmarkBase>();
+ root = new BookmarkFolder();
+ root.Parent = null;
}
public void Clear()
{
- root.Clear();
+ root.Items.Clear();
}
private void LoadOldVersion(XmlDocument doc)
@@ -69,24 +69,24 @@
try
{
- List<BookmarkBase> last = root;
+ BookmarkFolder last = root;
foreach (XmlNode node in doc.DocumentElement.SelectNodes("//Entry"))
{
if (Convert.ToBoolean(node.SelectSingleNode("isFolder").InnerText))
{
BookmarkFolder bmf = new BookmarkFolder();
bmf.FromXml(node);
- last = bmf.Items;
- root.Add(bmf);
+ last = bmf;
+ root.Items.Add(bmf);
}
else
{
BookmarkItem item = new BookmarkItem();
item.FromXml(node);
if (Convert.ToBoolean(node.SelectSingleNode("isSubFolder").InnerText))
- last.Add(item);
+ last.Items.Add(item);
else
- root.Add(item);
+ root.Items.Add(item);
}
}
@@ -97,15 +97,15 @@
}
}
- private void SetParent(List<BookmarkBase> items, BookmarkFolder parent)
+ private void SetParent(BookmarkFolder item)
{
- foreach (BookmarkBase sub in items)
+ foreach (BookmarkBase sub in item.Items)
{
BookmarkFolder bmf = sub as BookmarkFolder;
if (bmf != null)
{
- bmf.Parent = parent;
- SetParent(bmf.Items, bmf);
+ bmf.Parent = item;
+ SetParent(bmf);
}
}
@@ -126,18 +126,16 @@
}
else
{
- BookmarkFolder dummy = new BookmarkFolder();
- dummy.Items = root;
- dummy.FromXml(doc.DocumentElement);
+ root.FromXml(doc.DocumentElement);
}
- SetParent(root, null);
+ SetParent(root);
}
else
{
BookmarkFolder bmf = new BookmarkFolder();
bmf.Name = SavedByMp;
- root.Add(bmf);
+ root.Items.Add(bmf);
}
}
@@ -151,7 +149,7 @@
textWriter.Formatting = Formatting.Indented;
textWriter.WriteStartDocument();
textWriter.WriteStartElement("Bookmarks");
- foreach (BookmarkBase item in root)
+ foreach (BookmarkBase item in root.Items)
{
item.ToXml(textWriter);
}
@@ -170,7 +168,7 @@
public bool AddBookmark(string title, string url, string path)
{
- BookmarkFolder bmf = root.Find(x => x.Name == SavedByMp && x is BookmarkFolder) as BookmarkFolder;
+ BookmarkFolder bmf = root.Items.Find(x => x.Name == SavedByMp && x is BookmarkFolder) as BookmarkFolder;
if (bmf != null)
{
bmf.Items.Add(new BookmarkItem() { Name = title, Url = url });
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -23,7 +23,6 @@
#endregion
-using System.Collections.Generic;
using MediaPortal.GUI.Library;
using MediaPortal.Configuration;
@@ -135,9 +134,9 @@
facade.Add(item);
}
- List<BookmarkBase> list = parent == null ? Bookmarks.Instance.root : parent.Items;
+ BookmarkFolder bmf = parent == null ? Bookmarks.Instance.root : parent;
- foreach (BookmarkBase bookmark in list)
+ foreach (BookmarkBase bookmark in bmf.Items)
{
BtwebGuiListItem item = new BtwebGuiListItem();
item.IsFolder = bookmark is BookmarkFolder;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportBrowser.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -195,8 +195,8 @@
MyLog.debug("open database");
SQLiteClient client = new SQLiteClient(path);
- List<BookmarkBase> dummy = new List<BookmarkBase>();
- ImportFFFolder(client, "2", dummy);
+ BookmarkFolder dummy = new BookmarkFolder();
+ ImportFFFolder(client, "2", dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
MyLog.debug("close database");
client.Close();
@@ -250,11 +250,11 @@
private void ImportIE()
{
- List<BookmarkBase> dummy = new List<BookmarkBase>();
+ BookmarkFolder dummy = new BookmarkFolder();
string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
if (Directory.Exists(favPath))
{
- ImportIEFolder(favPath, dummy);
+ ImportIEFolder(favPath, dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
}
else
@@ -299,8 +299,8 @@
string s = File.ReadAllText(path);
JSONNode node = JSONNode.LoadJSON(s);
List<JSONNode> res = node.GetNodes("roots/bookmark_bar/children", null);
- List<BookmarkBase> dummy = new List<BookmarkBase>();
- ImportChromeFolder(res, dummy);
+ BookmarkFolder dummy = new BookmarkFolder();
+ ImportChromeFolder(res, dummy.Items);
Setup.FillTreeview(dummy, treeView1.Nodes);
}
else
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-03-27 16:17:25 UTC (rev 4776)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-04-01 20:04:56 UTC (rev 4777)
@@ -70,9 +70,9 @@
}
- public static void FillTreeview(List<BookmarkBase> bookmarks, TreeNodeCollection nodes)
+ public static void FillTreeview(BookmarkFolder bmf, TreeNodeCollection nodes)
{
- foreach (BookmarkBase item in bookmarks)
+ foreach (BookmarkBase item in bmf.Items)
{
TreeNode newNode = nodes.Add(item.Name);
newNode.Tag = item;
@@ -80,7 +80,7 @@
{
newNode.ImageIndex = 1;
newNode.SelectedImageIndex = 1;
- FillTreeview(((BookmarkFolder)item).Items, newNode.Nodes);
+ FillTreeview((BookmarkFolder)item, newNode.Nodes);
}
}
}
@@ -95,18 +95,18 @@
treeview.Invalidate();
}
- private void FillBookmarks(TreeNodeCollection nodes, List<BookmarkBase> bms)
+ private void FillBookmarks(TreeNodeCollection nodes, BookmarkFolder bms)
{
foreach (TreeNode node in nodes)
{
BookmarkBase bkm = (BookmarkBase)node.Tag;
- bms.Add(bkm);
+ bms.Items.Add(bkm);
BookmarkFolder bmf = node.Tag as BookmarkFolder;
if (bmf != null)
{
bmf.Items.Clear();
- FillBookmarks(node.Nodes, bmf.Items);
+ FillBookmarks(node.Nodes, bmf);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-27 16:17:29
|
Revision: 4776
http://sourceforge.net/p/mp-plugins/code/4776
Author: nicsergio
Date: 2014-03-27 16:17:25 +0000 (Thu, 27 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-03-23 17:55:25 UTC (rev 4775)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-03-27 16:17:25 UTC (rev 4776)
@@ -11,8 +11,47 @@
namespace ProcessPlugins.ShortCuter
{
- public class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
+ private struct Destination
{
+ public int _windowID; //Id finestra per visualizzazione in MediaPortal
+ public string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
+ public override string ToString()
+ {
+ return "WindowID=" + _windowID.ToString() + ((_loadParameter.Length > 0) ? " LoadParameter=[" + _loadParameter + "]" : "");
+ }
+ }
+
+ private struct KeyCombination
+ {
+ public string _key; //Tasto (stringa corrispondente a KeyCode)
+ public bool _ctrl; //Utilizzo del modificatore "Ctrl" - combinazione di tasti
+ public bool _alt; //Utilizzo del modificatore "Alt" - combinazione di tasti
+ public bool _shift; //Utilizzo del modificatore "Shift" - combinazione di tasti
+ public override string ToString()
+ {
+ return "Key=" + ((_ctrl) ? "<CTRL>" : "")
+ + ((_alt) ? "<ALT>" : "")
+ + ((_shift) ? "<SHIFT>" : "")
+ + "<" + _key + ">";
+ }
+ }
+
+ internal class SimpleShortCut
+ {
+ protected string _caption; //Titolo
+ protected Destination _destination;
+
+ public override string ToString()
+ {
+ return "ShortCut " + _caption + " --> " + _destination.ToString();
+ }
+
+ }
+
+
+
+ public class ShortCut : INotifyPropertyChanged //Classe shortcut (scorciatoia da tastiera) con notifica variazione proprietà
+ {
#region Dati
private string _caption; //Titolo
private string _key; //Tasto (stringa corrispondente a KeyCode)
@@ -23,7 +62,7 @@
private string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.)
private bool _return; //Ritorno a finestra precedente se si è già a destinazione
private string _soundEffect; //File relativo all'eventuale effetto sonoro
-
+ private Destination _destination;
public static readonly List<Keys> ModifierKeys = new List<Keys>(); //Lista dei tasti modificatori
#endregion
@@ -117,12 +156,15 @@
public bool Ctrl { get { return this._ctrl; } set { this._ctrl = value; this.NotifyPropertyChanged("Ctrl"); } }
public bool Alt { get { return this._alt; } set { this._alt = value; this.NotifyPropertyChanged("Alt"); } }
public bool Shift { get { return this._shift; } set { this._shift = value; this.NotifyPropertyChanged("Shift"); } }
- public int WindowID { get { return this._windowID; } set { this._windowID = value; this.NotifyPropertyChanged("WindowID"); } }
+ public int WindowID { get { return this._destination._windowID; } set { this._destination._windowID = value; this.NotifyPropertyChanged("WindowID"); } }
public string LoadParameter { get { return this._loadParameter; } set { this._loadParameter = value; this.NotifyPropertyChanged("LoadParameter"); } }
public bool Return { get { return this._return; } set { this._return = value; this.NotifyPropertyChanged("Return"); } }
public string SoundEffect { get { return this._soundEffect; } set { this._soundEffect = value; this.NotifyPropertyChanged("SoundEffect"); } }
#endregion
}
+
+
+
internal class ShortCuts //Classe di gestione degli shortcuts configurati
{
#region Dati
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-23 17:55:26
|
Revision: 4775
http://sourceforge.net/p/mp-plugins/code/4775
Author: nicsergio
Date: 2014-03-23 17:55:25 +0000 (Sun, 23 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-17 17:09:58 UTC (rev 4774)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-23 17:55:25 UTC (rev 4775)
@@ -25,7 +25,6 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Any CPU.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.ActiveCfg = DLL|x86
- {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
@@ -43,6 +42,7 @@
{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|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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-17 17:10:02
|
Revision: 4774
http://sourceforge.net/p/mp-plugins/code/4774
Author: nicsergio
Date: 2014-03-17 17:09:58 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Release/XtremeMenuEditor/XtremeMenuEditor.dll
trunk/plugins/ShortCuter&SkinEditor/Release/XtremeMenuEditor/XtremeMenuEditor.exe
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/XtremeMenuEditor/XtremeMenuEditor.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/XtremeMenuEditor/XtremeMenuEditor.exe
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-15 17:27:54 UTC (rev 4773)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-17 17:09:58 UTC (rev 4774)
@@ -25,6 +25,7 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Any CPU.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.ActiveCfg = DLL|x86
+ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
@@ -42,7 +43,6 @@
{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|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/XtremeMenuEditor/BHEditor.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs 2014-03-15 17:27:54 UTC (rev 4773)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs 2014-03-17 17:09:58 UTC (rev 4774)
@@ -185,7 +185,7 @@
this.iconGroupBox.Size = new System.Drawing.Size(324, 94);
this.iconGroupBox.TabIndex = 14;
this.iconGroupBox.TabStop = false;
- this.iconGroupBox.Text = "Icon (Horus Theme)";
+ this.iconGroupBox.Text = "Icon (Vision Themes)";
//
// iconPictureBox
//
@@ -991,7 +991,7 @@
this.skinItems.Enter += new System.EventHandler(this.skinItems_Enter);
this.skinItems.SelectedIndexChanged += new System.EventHandler(this.skinItems_SelectedIndexChanged);
//
- // BHEditorForm
+ // BHEditor
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -1013,7 +1013,7 @@
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
- this.Name = "BHEditorForm";
+ this.Name = "BHEditor";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Xtreme Custom Menu Editor";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BHEditorForm_FormClosing);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2014-03-15 17:27:54 UTC (rev 4773)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2014-03-17 17:09:58 UTC (rev 4774)
@@ -35,8 +35,8 @@
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// utilizzando l'asterisco (*) come descritto di seguito:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]
#if DLL_TYPE
//Importante per la compatibilità con MediaPortal (se usato come PlugIn - dll)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-03-15 17:27:54 UTC (rev 4773)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-03-17 17:09:58 UTC (rev 4774)
@@ -6,7 +6,7 @@
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid>
- <OutputType>WinExe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace>
<AssemblyName>XtremeMenuEditor</AssemblyName>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-15 17:27:57
|
Revision: 4773
http://sourceforge.net/p/mp-plugins/code/4773
Author: nicsergio
Date: 2014-03-15 17:27:54 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx
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/ShortCuterConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAdd.png
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.resx
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -322,7 +322,7 @@
this.Name = "VersionInfo";
this.ShowIcon = false;
this.ShowInTaskbar = false;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Paint += new System.Windows.Forms.PaintEventHandler(this.VersionInfo_Paint);
this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown);
this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2014-03-15 17:27:54 UTC (rev 4773)
@@ -124,50 +124,50 @@
<data name="okPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- YQUAAAoDSURBVFhHpZYLUFNXGscvVJ5WKVX7oNShAh3wATSwKAgIiAJSEJWXgMEiryABRCMIRN6gIAgC
- TYCQQAIBgfASRfCBb2pb626nHdvptNOd3Xbb2dqZ3ala++C/37kGqm2no9vM/ObkJud+3//8z/edeznu
- CT/BFcFLtlRvCUyWJYsKugsKpFppYZo8LSO6Jvr1sPKwl54w3ONN31C+4dnwmnCJpEtyQ3VBNXPx1kVc
- +fgKLn90GZc+ugR2Pfn+JJTnlcjtyL0VfTi6JLQk9M+LWVOwxoySl5QOlv735N9OYvi9Yehu6HiGbw5j
- 9K+jPCM3RzB4YxD9b/dDe0ULzUUNCjWF3wdLgxu9crwsH2+Zv5rlmufqFtcU94l2mgJe00BxUYGOKx3o
- ut6F3nd60X+jH7r3SAwxcGMAfe/2oed6D9RX1Gifaod8Uo6aoRoEFwZ/5ZLmEvREIpbnLN8qahfdVV1S
- oWGyAQ1nGiCbkkFxiURc64Dmugbad7S8kN53e9HzTg+63+6GeloN5WUlWqZa0DTZhKNjR3FIdwh++/1+
- ejnm5czHEmGfaR8e3xz/Y+OZRpSNlqHqZBVqJ2px7NwxXkTbpTYoryrROd0J9Vtqns63Onlh7Zfb0XKh
- Bc3nmlE/UY/qsWqU68oh7ZZiZfLKGYsQC/EfirDNsHX2L/O/U3WiCnn9eZAOSVF6ohSHTh1C7WQtGs42
- oHmqGfILcrReauUdUVxW8KJaL7ZCdkGGpvNNqJ+sR814DSpHK1GsK0a+Nh+7ZbthEWrx0/yN8wN/V4SN
- yMbYWeL8gUglQlZ3FnJ6c5A3QCKGpSg7QU6cqsKRiSM4euYo7wZLxMQwmqaa0Hi+kRdYN1mH6tPVqBir
- QPFwMQr6CyDpliCrPQueezxhtsHsK/P15s/+RoR9hr3Er8wPaR1pSO1MhVgrxt6+vcjTkYgRKUrGSlBx
- qgKHTx9GzWQNas/Uou5s3RxHzhxB9WQ1qsarUDJSgv3q/TigPQDJcQmyNdlIV6RjR+0OGK43hLm/efMj
- ApamLjUX7Bf827/SH3EtcUhUJSK1i0T0ipHTn4PcwVwUjBSgaKwIpadKUT5ejsqJSlRNVPGw7xWnK1A2
- XoZ8XT7y2vIw/e40iruLkdWThd3q3UhuTUZCQwIWRyyG0Tqj+2Y+ZtZzImzTbRO9i7zhUuiCKHkU4tvj
- kagmEdpUZBzPQPZANvYN7UPeSB4KThRAelKKg6cOouhUEYrGCRoPnjwISb8ExcpifP73zzEzM4PMtkyI
- tCIkd1LylgTE1sdiWeIycD4czLzNSuYErMxeeXpV7irY5dphy5tbEKUgER3xeKPrDST3JEPUJ4JYJ0b2
- UDb2juyF5IQEuWO5yBvL42Hf9wzsQWF7Ib7815d8cvYRHhNiV9cuCFVCbJdvR8TRCLya9io4Pw5GnkYf
- 8QKWJi01EkgEd17IeAE2uTYIaQ5BeGs4IpWRiFXHQthNQXp3IaU/BSKdCBlDGcgcyUTWaBayR7N5xINi
- iFvE+Ozzz+aSMwEJTQmI18QjRhmDbbJtCKsLg3WSNbgADgYeBjNmnrQNNik2q9ZK18J0lykssy2xoWkD
- NrVswub2zYjoiEBMVwzieuKQcDwBiQOJSNIlIWUoBanDqUgboYIdSoWwVYjp96YfSc4EFPYWIrIjElvb
- tyL0zVAEHQnCgvgF4DZy4Dw4mHqahnK2abZhngc9we0kVSIDeNV7IUAegGBFMEJVodii2YIIbQSie6MR
- 2xeLuL44CHVCJAwlYOfQTmzXbId8SI4ffviBt332c/PTm0jvSkeYKgwhbSEIbAqEV6UXuChKHkSspW1Y
- bZTJOWQ47BDkC8Al0o/pHGxKbeAj84F/mz82Kjdik3oTQrtCEaahQLQ9OZochHeGI3owGlH9UUhpScHt
- b2/PJWb733aujU+4qXMTgjqCENAaAN9jvlgqWQoumvIEPxBg4GZQyDmIHeKd85zB7aIfMzjMk8yDa6Mr
- vFq9sE65Dv4qf/jKfLGjaQemrk/hzp07SFOnIawvDEGtQTj/9vk563/++WdUjFYgQBGAQG0gAjQB8FP5
- wafFB661rjBMMQQX84sAzpUr4OxF9iFzAsT0p4TDwtKFcGtxwxrFGgTIAiAfkeObb76ZS3Tt42tYJ18H
- sVKMu3fv8qtnK2enn2+HL/x7SbTWF94ab3gqPeH+pjuezn0aXDLFn3XAk8NTf3lqN7csdZmj4ABtAXMg
- k8glpBwsayzxmuI1eMg8UDdRh7v3HySaTbazaSeu3rw6J4o9Bzw7POHd5421x9fCQ+sBd7U7BAoBLMos
- wO2huEkEq4HAB0VovNo4mLNLtXuKTsH/8DXAHGACiohyDvPr5sNR6QgnhROCWoLw4T8/nBPxxddf4N69
- e/z1+AfjcG13xeqB1XDvd4fbcTcItAI4qhxhXm0OrpDiZRNskREEtSG3mpsx8zB7nj8LBPsEQ+bJNHG3
- XkAxjZXEEQ6GDYZ4TvEcHLsc4SJzwdlbZx9pt0++/gRuCje4DLrwOA04YXnvcv4egzoDcBUUp0DvbgKN
- 4QQdRPPWzLs5dxI6ZTtFvyR+CVwa/blP70AVjbVEIyGjim01wMKOhbBqtsLw+8O8iPs/3kdIVwgcdA6w
- HbSFVZ8VFmoW8nO5Zrqv7oGTXB5BHcbFEiGENwcTD5PcXwRkORkt37P8H/w2MKuYZcwBFqCJaCHaiQ6i
- k/r3mBEmPp6A9LwUhiqq7B76XUto9HPa9PfV0MjczCFm7d9ArnoafrfAZ8HiR56IghxByoIkOqVENHk/
- UUqwAMyBVkKlT8ASERadFjBRm4Dro2sGE9GlF8AEN+gXcYBGtrXxRCixjoO5t3nlb94H3Pa6GTpkOVxj
- JyLfDWzfmAtHCdoC3gG1fqXH9Un7aWSwayaA/a8gmGvVxEGCOcqc3UbQ6o19jD+1XG85/3ffipyznV9Z
- lLToNt8urG2oHTlWC/WE/CER3fqEvfqRXc8mZ3s/a/1e+v5Q7xv4GNyzWG/h/ofvhSsyV3ibCc3uzIl4
- uB5YcLYdSkJfD/zI3GECjxGHCdbGLHkKsZ14nYrYz+BHy42WUY/1ZuwmcfMyjje+PXc4sSouIQ4RrDBZ
- IiaGwexmDrFVs4pnW8dsZy6yY5eSGwYY3rXabLX1sZLPTrJLt3vFPM58mhNSkFR9UP0pyRcoS8Z6vIxg
- lZ5PsGpnRcz6PZKgljMNMr21JGyJyxMln51snWhtuCRhSZpJnMkXvBC2KtbPrEjZKlmdZBH0EONFsgJm
- q6bDxvh1428XbV6Ub7XVyvT/Sv7wTfZp9sYkJNYywfKEcZzxd1wcJdlBMFFsZAcMrdhom9H3z0Q+c+7F
- mBdTbeNtF/zpxL8XYEXGinn0AFtlvcs63CTaRGgUaZTwvPD5bXbJdgKHZIcnXu3/AGjdlMroJAbzAAAA
- AElFTkSuQmCC
+ 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
+ AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -227,55 +227,56 @@
<data name="internetPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- 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
+ YQUAAAt1SURBVFhHrVcHUJTnFjUZk5eM7yUPMJQtLMvSliYoKgooRhEVBQRUVoIuiAWkgxQpVgSkCNIE
+ denSWUB6E1CQIgbFgkaNaGLBEjXxmdjOuyybSTKZvJjMuzPf/Auz/3fPd88593476a8Ekxv4IZsXZKis
+ HuqtZ7TnkLF5vHjuogMNM0xjK3i6kSkMbtBmebafloKy32TpK/+fUFbbNlVVKzzMTnBkZF/iibcZ2X1I
+ F/Vib1wbdsa0ICCyAZsCq7HWvQzLHHPe6M/ZPyivHOihwPb/p3SLvxcauts/0Jm+w8NxXe79+OQOZBed
+ RVxKJwIiauEeKIZgYxHshQVYsTYXywU5WEHLWpANoa8YTl6V0DWOuy7PDrD7jO3/vnTLdw8eP0TOfPGB
+ qr2xLW/zSs7iRN8ttPXdRsCOeniE1EDgXoo51kewyKkAwuA6rHQtgi2BsXHOg1twLTaHNWBLeCOWrs17
+ o8gNTicQH0u3/vNQVA1Q/HxJ8kBqVjfiUzuRlNmN08P30XbmDhJF/diVcgqW649hjkMO7H1q4BV3Ek6h
+ DViwOht2bkVw2FQMR58qOHlXYnNkE1ZtKQODF3b8M9Y7UMJQCfiX0dzYU1nZvYhJOoEd+1uRXXYOp87f
+ R1P/tzjWdA2Raadh51sDz6h2LN9UgshDfdgrGkRAdCt89zZD4FkOGzcC4VmBjdsbJCCWET2K3JBiOZbv
+ B9JUvw8WL/B9dd3IQ3tiW5ByuAfh0S0Ii21DD52+Y+gemgbuoL73G/jHdcKJyu4e2wWjNfkQbKcEXjVQ
+ WZgONYsMaFqkgzsvBVzTZNh7VyMipQd2G0tgbJX1Vo7pFyhN9/vgaARbuLoXv95Pgtud0A7P8DocodMP
+ XHmEflptBCIq5yy4Sw9jTVgT7IIbMNOpEOsjGmDlXQXukkyYfFEAQzsRVBakwcA2G2bOxVhL35tlcxTz
+ rbMwfV7Cs6ksP01pyl9ChuX9od7MqFMRexsRk9yJrdtrie8+XB59ioGrj9A4eBc1fXeQ1z4Kx8gWbBd9
+ iZiyEThHdWChRyVMNpRCY2U2rIl7Nasj4CzKAHt+KvhLszDHMR8so3go8KOwiHTC0QzLV+D4vydNPRFy
+ TN/5AmH+W//wWoTHtmJbVDOGrz/Gma8eo+vCA3RcfIjmcw+Q3TaKRPEVJNZcQ3D2EITx3Zi5qQLThSXQ
+ /6IImg554Cw/CuUlWeAQHQar8mDuVg5tyyxomafCnCo2a+HBF4qcAK409UQwuCFZ6zYXY1OAGNGpJ+G/
+ rwUXbj6h0z/GyUsP0XRuDBW9VIHO2zjafgtJddfhnXUWBpsqYbhZDDWnIvAcC8FbnQ+efS5UrEXgEFUq
+ lpmY9UUxLNzFWOJRjcVUqblEB0cjNEiaetIkeZb3Ryz1yKv82Qnw3H4cHhH1cAmtQ//IQ/QRgLbhB2gk
+ AJX99yA+cx/HqRJRZZdgGlAH/sZKaGwoh6ZrGdTWlYInBcK1zyMQVG6iQH81NavABiwloS7ZIoathxgM
+ 1ZCWqUzfiQaloOzD5vD3vDJckAKjZZkwXZOLbQkdKO+4gdPjAC48ROcIPS8/Rsulx0hvvgGvzAG4Z/Rh
+ yc426GytgfomMTQJjJqwDDwSnurPIFYchYGgEDYhzfBP6iaN1MJqC4E22HNXRtFrigQASzVgHld3H4yX
+ knCMD4A1LxVrQ+qQWnEB/de+Q3r9Vyg+dRvHvxxDTtctBOUNwTf7rGT55XyJNYnd0PA8Di0pEDXXcqpG
+ yUQlVubAzKMK9hHtOHp8BNZ+9Vi6uRz6JomvZRW9lCQAOJoh1jPnJ0N5Rhw4JslgmafB2rcKAeTfk5cf
+ wWFPO7ZRownJH0JC3VcIKjyPwPF1bBhBtGwSuqEd0Agd/3poeR2H5pYqaBItPOKeuyofn/vVYdWuDvgm
+ 98Lavw5WRME0swOQUfKesKO2YeRKA9MDYEyLBY+Uyl6YgTkuJRDua0c7OWBNTCdiKi8jrHgYO+kpPDwI
+ 6+Q+uIqGEFhyEXOjuqAd2gqd4GZo+TdA06uWQFAliA5VwTFySSWEcT2wD2+FbWA97AiogVncLwCYXD8z
+ I3M6ueF+MOckSZQ7bieHyGbY7m5HIZV/vPShxRfgkX8eC+JPY3ZMN3R3UyeM7oYePXV2dEA3vB384BZo
+ +REIT6LDrUJShekbyrAxsQerdpzA3LWFcPQ/Dn3jmFeyip5MCQASIWfm/KSX4xQwCIDy4kNQIwFZhzXC
+ kJQ7L6IVhztvwafoAowpsQElNYrrg35sLwz290Ivuge6UackQLTHQQRRJXzrJqqwvgTzPaswjXqEMelC
+ a2EqlrsUgKe7a1yEE8NJge3zMU9v9zW+CSUnDShbEACqwLiaBTTptKms8/edxKYCAhDfhzV5F2F5+Dym
+ Jw3CKHkQhokDMCBAhjE90NvVCd2wtgkqyPfzyKr61KQ41B3Z1J7VzBJguiIT8spBrSTCCRvKs3zeU+WH
+ ZzPICWrzU8An62hSQ5ntWY1lu9pgtusEdOhks/afhm/1dZRdfIIiWkeHHsOnYRQz0oZgQGCmxfdDL4qo
+ iTwB/rZmzA1tgvm2BnCpD6hYZZG7ksCYsR8LbDIhq+QXKkn+czC4ARYq+tFvlIwSwCER6pF3DajFWu5o
+ g1vWGQnH06ncB3vuofrqM5SOPEP+xac4cv4Jks88glf9LQmIcVp0d3bCmFRvE90JDRdqTqtywVlyCEzT
+ g9Calww949gX/1b0VJemnghZNnVDjfBe5VkJYNEQUaVWylt7DPpkK1OqgDDnHGxFw2i/+QNqr/+A8qvf
+ o3Dke2RffIb0oSeI6hmDZ+1NCAouwSn7HJwz+qFN3KutLwXXLhfKNJzGBW5qfQhy7MAiGSVp+X8d9M9l
+ ytNiXnE/p7lONHAd8iVK1glshGVSL+xyhlEw/BiNN5+j+sZzlF57joIrP+DwhadIOfsYcafHkNb3ACkn
+ 72Im0aDpXiVpzZwVIigvTAPHLBkaRrHPZBneetKUvw1ZhudklnqoSGVuErQItfqaAqjTCbR96iQasBed
+ h3vt16j7+jlabr9A4+0fUTP6AuXX/4P8y9+j7PITpPc+wIq0sxIrjs8IVWpE3OVHJNZmGu1/K8cO2C7L
+ 8PntKP51kCPk9Iyj+zToBXVqIlrUVvWIBt2QFkwj+wlKaBSfGUPXnR/Rc/8luu69RC89z9z/CeWXn2Jv
+ 6zcwCCcXUFvWJPXzHI9JLM0xT8FU1ZAKGbbvn19OlXj+KiaWyUNGdJHQ2lABfbLUOIBxn4/bbmvjKLrv
+ vsDF715LVs+9n9BIVcnqu4fYxuvUmnug7V0L/pZqaI3PBMtDkNcIa5RT9peRpvjzUOL6MQ1MY+ptPCre
+ CqgVO2ecgWvuMLaUX0HMyW9xbuxHXPnuFQbGXqL2Bulg8AESO24hrvlrmOzpkoDmu5SBb5X1WlEzXCSn
+ GvCpdOt3DwX9HVOUdCKCuCYHHvJJTHp+jVgU34ukE7dQN/IETdeeoYjuBseGxpA7cA+pHaPwoFvSNN96
+ zHYrg97ilFEl3Yj18vywP74J/69gOJV/xFxXocSwFlmyLNJLebaiBxrC0rdmdAt2y+zDnqqL2Jo3CBua
+ 80tiumAR2YoFPjVvZgjyRtmL0w4q2Yr0masLPlZ0yP1j0f1RKNhnvsd0Ff+b7VqlyXapMme7iAUs59IQ
+ hkN2AcM2o59pe/Ama2XSGNs++SHTLvUOyz5zhGkvamU6Fh5gra8QslzEC9iuYi3aQ4bhWvnXf5qNB0NY
+ NZkprP6EkrNYLlW6tKkpS1huxXQudmSszd/AEOS4MwTZHvTZjelcJGCtL1/OchWbUWI9eodN3/+U6VLx
+ 98r/62AKxe8zXcSTWULxP2hNYbpUfcISVsowXStkma7lspLPLpWfsFwqp7Bcqz6iU0+mv9/h1JMm/RfS
+ CDnUhkr9VgAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="commentLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.18052
+// Versione runtime:4.0.30319.17929
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
@@ -149,5 +149,25 @@
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap SkinNav {
+ get {
+ object obj = ResourceManager.GetObject("SkinNav", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap SkinNavAdd {
+ get {
+ object obj = ResourceManager.GetObject("SkinNavAdd", 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-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-03-15 17:27:54 UTC (rev 4773)
@@ -142,8 +142,14 @@
<data name="ShortCuter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\images\shortcuterenable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<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>
</root>
\ No newline at end of file
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.png 2014-03-15 17:27:54 UTC (rev 4773)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNav.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/SkinNavAdd.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAdd.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAdd.png 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAdd.png 2014-03-15 17:27:54 UTC (rev 4773)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/SkinNavAdd.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-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-03-15 17:27:54 UTC (rev 4773)
@@ -118,6 +118,12 @@
<DependentUpon>ShortCuterKeyConfig.cs</DependentUpon>
</Compile>
<Compile Include="ShortCuts.cs" />
+ <Compile Include="SkinNavigatorConfig.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SkinNavigatorConfig.Designer.cs">
+ <DependentUpon>SkinNavigatorConfig.cs</DependentUpon>
+ </Compile>
<Compile Include="SkinWithSounds.cs" />
</ItemGroup>
<ItemGroup>
@@ -139,6 +145,9 @@
<EmbeddedResource Include="ShortCuterKeyConfig.resx">
<DependentUpon>ShortCuterKeyConfig.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="SkinNavigatorConfig.resx">
+ <DependentUpon>SkinNavigatorConfig.cs</DependentUpon>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Properties\Settings.settings">
@@ -164,6 +173,8 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
+ <Content Include="Resources\Images\SkinNav.png" />
+ <Content Include="Resources\Images\SkinNavAdd.png" />
<EmbeddedResource Include="Resources\XmlFiles\DefaultConfig.xml" />
<Content Include="..\Common\Resources\Images\ArrowDown.png">
<Link>Resources\Images\ArrowDown.png</Link>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -55,6 +55,8 @@
this.capsLockGroupBox = new System.Windows.Forms.GroupBox();
this.capsLockComboBox = new System.Windows.Forms.ComboBox();
this.rowCopyButton = new System.Windows.Forms.Button();
+ this.skinNavAddButton = new System.Windows.Forms.Button();
+ this.skinNavConfigButton = new System.Windows.Forms.Button();
this.skinItems = new My.Common.SkinItems();
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit();
this.linkPropertiesGroupBox.SuspendLayout();
@@ -211,7 +213,7 @@
this.rowDownButton.AutoSize = true;
this.rowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.rowDownButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowDown;
- this.rowDownButton.Location = new System.Drawing.Point(221, 264);
+ this.rowDownButton.Location = new System.Drawing.Point(226, 264);
this.rowDownButton.Name = "rowDownButton";
this.rowDownButton.Size = new System.Drawing.Size(38, 38);
this.rowDownButton.TabIndex = 35;
@@ -223,7 +225,7 @@
this.rowUpButton.AutoSize = true;
this.rowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.rowUpButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowUp;
- this.rowUpButton.Location = new System.Drawing.Point(177, 264);
+ this.rowUpButton.Location = new System.Drawing.Point(186, 264);
this.rowUpButton.Name = "rowUpButton";
this.rowUpButton.Size = new System.Drawing.Size(38, 38);
this.rowUpButton.TabIndex = 34;
@@ -246,7 +248,7 @@
this.rowRemoveButton.AutoSize = true;
this.rowRemoveButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.rowRemoveButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowRemove;
- this.rowRemoveButton.Location = new System.Drawing.Point(50, 264);
+ this.rowRemoveButton.Location = new System.Drawing.Point(46, 264);
this.rowRemoveButton.Name = "rowRemoveButton";
this.rowRemoveButton.Size = new System.Drawing.Size(38, 38);
this.rowRemoveButton.TabIndex = 26;
@@ -344,13 +346,36 @@
this.rowCopyButton.AutoSize = true;
this.rowCopyButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.rowCopyButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowCopy;
- this.rowCopyButton.Location = new System.Drawing.Point(94, 264);
+ this.rowCopyButton.Location = new System.Drawing.Point(96, 264);
this.rowCopyButton.Name = "rowCopyButton";
this.rowCopyButton.Size = new System.Drawing.Size(38, 38);
this.rowCopyButton.TabIndex = 38;
this.rowCopyButton.UseVisualStyleBackColor = true;
this.rowCopyButton.Click += new System.EventHandler(this.rowCopyButton_Click);
//
+ // skinNavAddButton
+ //
+ this.skinNavAddButton.AutoSize = true;
+ this.skinNavAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.skinNavAddButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.SkinNavAdd;
+ this.skinNavAddButton.Location = new System.Drawing.Point(136, 264);
+ this.skinNavAddButton.Name = "skinNavAddButton";
+ this.skinNavAddButton.Size = new System.Drawing.Size(38, 38);
+ this.skinNavAddButton.TabIndex = 40;
+ this.skinNavAddButton.UseVisualStyleBackColor = true;
+ this.skinNavAddButton.Click += new System.EventHandler(this.skinNavAddButton_Click);
+ //
+ // skinNavConfigButton
+ //
+ this.skinNavConfigButton.BackgroundImage = global::ProcessPlugins.ShortCuter.Properties.Resources.SkinNav;
+ this.skinNavConfigButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.skinNavConfigButton.Location = new System.Drawing.Point(726, 220);
+ this.skinNavConfigButton.Name = "skinNavConfigButton";
+ this.skinNavConfigButton.Size = new System.Drawing.Size(70, 70);
+ this.skinNavConfigButton.TabIndex = 41;
+ this.skinNavConfigButton.UseVisualStyleBackColor = true;
+ this.skinNavConfigButton.Click += new System.EventHandler(this.skinNavConfigButton_Click);
+ //
// skinItems
//
this.skinItems.Location = new System.Drawing.Point(266, 8);
@@ -368,6 +393,8 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1018, 740);
+ this.Controls.Add(this.skinNavConfigButton);
+ this.Controls.Add(this.skinNavAddButton);
this.Controls.Add(this.skinItems);
this.Controls.Add(this.rowCopyButton);
this.Controls.Add(this.overridesGroupBox);
@@ -434,6 +461,8 @@
private System.Windows.Forms.ComboBox numLockComboBox;
private System.Windows.Forms.Button rowCopyButton;
private My.Common.SkinItems skinItems;
+ private System.Windows.Forms.Button skinNavAddButton;
+ private System.Windows.Forms.Button skinNavConfigButton;
}
}
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -37,18 +37,20 @@
numLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
numLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.GeneralForcingNumLock);
- toolTip.SetToolTip(skinItems, "Double click to set the link's parameter to shortcut");
- toolTip.SetToolTip(rowAddButton, "Add shortcut to list");
- toolTip.SetToolTip(rowRemoveButton, "Remove selected shortcut from list");
- toolTip.SetToolTip(rowCopyButton, "Copy selected shortcut to list");
- toolTip.SetToolTip(rowUpButton, "Move up selected shortcut in list");
- toolTip.SetToolTip(rowDownButton, "Move down selected shortcut in list");
- toolTip.SetToolTip(resetButton, "Reset actual settings and load the default configuration");
- toolTip.SetToolTip(saveButton, "Save actual settings");
- toolTip.SetToolTip(updateButton, "Save actual setting and close the application");
- toolTip.SetToolTip(capsLockComboBox, "Set forcing for Caps-Lock when Mediaportal starts (OFF is recommended)");
- toolTip.SetToolTip(numLockComboBox, "Set forcing for Num-Lock when Mediaportal starts");
- toolTip.SetToolTip(infoPictureBox, "Version information");
+ toolTip.SetToolTip(skinItems, "Double click to set the link's parameter to shortcut");
+ toolTip.SetToolTip(rowAddButton, "Add shortcut to list");
+ toolTip.SetToolTip(rowRemoveButton, "Remove selected shortcut from list");
+ toolTip.SetToolTip(rowCopyButton, "Copy selected shortcut to list");
+ toolTip.SetToolTip(skinNavAddButton, "Add a shortcut to Skin Navigator in list");
+ toolTip.SetToolTip(rowUpButton, "Move up selected shortcut in list");
+ toolTip.SetToolTip(rowDownButton, "Move down selected shortcut in list");
+ toolTip.SetToolTip(resetButton, "Reset actual settings and load the default configuration");
+ toolTip.SetToolTip(saveButton, "Save actual settings");
+ toolTip.SetToolTip(updateButton, "Save actual setting and close the application");
+ toolTip.SetToolTip(capsLockComboBox, "Set forcing for Caps-Lock when Mediaportal starts (OFF is recommended)");
+ toolTip.SetToolTip(numLockComboBox, "Set forcing for Num-Lock when Mediaportal starts");
+ toolTip.SetToolTip(skinNavConfigButton, "Configure Skin Navigator");
+ toolTip.SetToolTip(infoPictureBox, "Version information");
unsavedChanges = false; //--> necessario a fine aggiornamento controlli grafici
}
@@ -359,6 +361,10 @@
shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Selected = true;
}
}
+ private void skinNavAddButton_Click(object sender, EventArgs e)
+ {
+
+ }
private void rowUpButton_Click(object sender, EventArgs e)
{
MoveItemList(true);
@@ -427,6 +433,10 @@
myShortCuts.LoadConfig(true);
}
}
+ private void skinNavConfigButton_Click(object sender, EventArgs e)
+ {
+ new SkinNavigatorConfig().ShowDialog();
+ }
private void infoPictureBox_Click(object sender, EventArgs e)
{
VersionInfo.ShowInfo(ProcessPlugins.ShortCuter.Properties.Resources.ShortCuter, "...a big thank to MoPath for old version of this plugin!",
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-03-14 22:09:00 UTC (rev 4772)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-03-15 17:27:54 UTC (rev 4773)
@@ -189,6 +189,15 @@
<metadata name="rowCopyButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="skinNavAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinNavConfigButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinItems.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.Designer.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.Designer.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -0,0 +1,64 @@
+namespace ProcessPlugins.ShortCuter
+{
+ partial class SkinNavigatorConfig
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SkinNavigatorConfig));
+ this.skinItems1 = new My.Common.SkinItems();
+ this.SuspendLayout();
+ //
+ // skinItems1
+ //
+ this.skinItems1.Location = new System.Drawing.Point(20, 22);
+ this.skinItems1.Name = "skinItems1";
+ this.skinItems1.SelectedIndex = -1;
+ this.skinItems1.SelectedTab = My.Common.SkinItems.SkinItemsType.Links;
+ this.skinItems1.Size = new System.Drawing.Size(178, 444);
+ this.skinItems1.TabIndex = 0;
+ //
+ // SkinNavigatorConfig
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1018, 740);
+ this.Controls.Add(this.skinItems1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.MaximizeBox = false;
+ this.Name = "SkinNavigatorConfig";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "SkinNavigatorConfig";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private My.Common.SkinItems skinItems1;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.cs 2014-03-15 17:27:54 UTC (rev 4773)
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace ProcessPlugins.ShortCuter
+{
+ public partial class SkinNavigatorConfig : Form
+ {
+ public SkinNavigatorConfig()
+ {
+ InitializeComponent();
+ }
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.resx (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinNavigatorConfig.resx 2014-03-15 17:27:54 UTC (rev 4773)
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhvb285nJycaqmpqYyvr6+ar6+vmq+v
+ r5qvr6+ar6+vmq+vr5qvr6+ar6+vmqmrq4yampprbW1tOgAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCnp6d3yMjI09jY2P/r6+v/7+/v//Dw
+ 8P/x8fH/8fHx//Hx8f/x8fH/8fHx//Hw8P/w8PD/7+/v/+rq6v/X2Nf/x8fH1KWlpXgAAAARAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACLi4tNzMzM2+/v7//t7e3/4+Tj/+Hh
+ 4f/h4eH/4uHi/+Li4v/i4uL/4uLi/+Li4v/i4uL/4uLi/+Hh4f/h4eH/4eHh/+Pj4//t7e3/7+/v/87O
+ ztuMjIxOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAp6end+Dg4P/w8PD/4eHh/+Lh
+ 4v/i4+L/4+Pj/+Tk5P/k5OT/5OTk/+Tk5f/k5eT/5OTk/+Tk5P/k5OT/5OTk/+Pj4//j4+P/4uLi/+Hh
+ 4f/h4eH/7+/v/+Dg4P+mpqZ5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKqqqnPt7u7/6enp/+Hh
+ 4f/j4+P/5OPk/+Tk5P/l5eX/5eXl/+bm5v/m5ub/5ubm/+bm5v/m5ub/5ubm/+bm5v/l5eX/5eXl/+Tk
+ 5P/k5OT/4+Pj/+Li4v/h4eH/6Ojo/+3t7f+pqal1AAAAAAAAAAAAAAAAAAAAAAAAAACamppC5OTk/+rq
+ 6v/i4uL/4+Tj/+Xl5P/l5eX/5ubm/+bm5//n5+f/5+jn/+jo6P/o6Oj/6Ojo/+jo6P/o6Oj/6Ojo/+fn
+ 5//n5+b/5ubm/+Xl5f/l5OX/5OTk/+Pj4//h4eH/6enp/+Tk5P+fn59DAAAAAAAAAAAAAAAAJCQkB9HR
+ 0dny8vL/4uLi/+Tk5P/l5eX/5ubm/+fn5//o6Oj/6Ojp/+np6f/q6ur/6urq/+rq6//q6+v/6uvr/+rq
+ 6v/q6ur/6urq/+np6f/o6Oj/5+fn/+bm5v/l5eX/5OTk/+Pj4//h4eH/8fHx/9DQ0No/Pz8IAAAAAAAA
+ AAC+vL5j9fX1/+Tk5P/k5OT/5ubm/+fn5//o6Oj/6enp/+vr6//w8PD/8/P0//Dy8//u8PH/7+/w/+7u
+ 7v/t7e3/7e3t/+3t7f/s7Oz/7Ozs/+vr6//q6ur/6enp/+jo6P/m5+f/5eXl/+Tk5P/i4uL/9PT0/729
+ vWUAAAAAAAAAANbX1sjz8/P/5eXl/+bn5v/o6Oj/6urq/+vr6//t7e3/8vT1/9bd5P+7ubf/uK2i/8G3
+ rv/OysX/6enp//Hx8f/v7+//7+/v/+/v7v/u7u7/7e3t/+zs7P/r7Ov/6urq/+rp6f/o6Oj/5ubm/+Tk
+ 5P/y8vL/1dXWygAAAAC5ubkh4eHh++rq6f/o6Oj/6unq/+vr6//s7Oz/7e3t//P2+P/BwcP/pnhN/8uV
+ X//du5n/6NPA/+zh2f/w8PD/9/f4//j4+P/y8vL/8PDw//Dw8P/v7+//7u7u/+3t7f/s7Oz/6+vr/+rq
+ 6v/o6Oj/5+fn/+np6f/h4eH8u7u7ItjY2FD09PT/6Onp/+rq6f/r6+v/7Ozs/+3t7f/09fb/0tXZ/6Fm
+ L//rvIv/+fr6//b7///1+Pz/9Pb3//X2+P/Z3+T/z9Xb//Dz9//29fX/8fHx//Hw8f/w8PD/7u/v/+3t
+ 7f/s7Oz/6+vr/+rq6v/o6Oj/5+fn//T09P/Z1tZS4eHhb/r6+v/p6en/6+vr/+zs7P/t7e3/7+/v//L4
+ /v+vimn/xoNA//v////z9ff/9PT0//X19f/6+/v/29rb/6R3TP+kaTL/uK6l//H3/f/39/b/8vLy//Hx
+ 8f/w8PD/7+/v/+7u7v/s7Oz/6+vr/+np6f/o6Oj/+fn5/+Hh4XHl5eV6/Pz8/+rq6v/s7Oz/7e3t/+/v
+ 7//z8/T/5+ns/7RoGv/Km2r/+v////X19f/29vb/9vb2//v////bv5z/uVcA/8BhAP+2aBX/vLKo//H3
+ ///49/f/8vLy//Hy8f/w8PD/7+/v/+7u7v/s7Oz/6+vr/+np6f/6+vr/5OTkfOfn53n9/f3/6+vr/+3t
+ 7f/u7u7/8PDw//T2+f/o4dn/yXAI/8KGPv/f6fX//v////z8/P/5+fn/+fz///jryf/ajQn/zHIH/9B1
+ BP/FdxX/v7aq//H3///49/f/8vPz//Ly8f/x8fH/7+/v/+7u7v/t7O3/6+rq//z8/P/m5uZ75+fnef7+
+ /v/t7e3/7u/u//Dw8P/x8fH/8/T4//Px5v/fkxr/2H0D/8KgbP/LztT/4ej1/+/0/f/1+f//+/////zt
+ s//nohD/24gL/96HBf/Shhb/w7mr//D2///49/f/8/Pz//Ly8v/x8fH/7+/v/+3u7f/s7Oz//f39/+jo
+ 6Hvp6el5/////+7u7v/w8PD/8fHx//Pz8//09PT/9vv///TVcf/olAD/548E/9iYKP/LpV//x7KJ/8i7
+ pP/Kw7j/y83S/9bBfv/onQ3/55oQ/+qXBv/clRn/xr2u//D1/f/29vb/8/Pz//Lx8v/w8PD/7+/v/+3t
+ 7f//////6urqe+zp6Xn/////7+/v//Dx8f/y8vL/9PT0//X19f/29vr/+Pv0//jeYf/ytAX/8aIA//Kg
+ A//wogn/7KQR/+mlGf/mpR//5qgs/+6pGf/vqBT/76cW//OkCv/hnRv/2dHD//n8/v/09PT/8vPy//Ly
+ 8f/w8PD/7u7u///////q6up77Ozsef/////w8PD/8fHx//Pz8//19PX/9vb2//f29v/4+P7/+v7///v4
+ sf/64lP/98se//W8Df/1tQv/9bIM//WwDv/2sRD/9LQZ//SzGv/0sxr/9LEb//WpAP/x14r/9vv///X1
+ 9P/z9PP/8vLy//Hw8f/v7+///////+rq6nvs7Ox5//////Hx8f/y8vL/9PTz//X19f/39/f/9/f3//n5
+ +P/6+vz/+vz///v////9/tf//fej//zudv/85Vb//eBD//nWOf/2viP/97wg//e8If/3thX/+dAs//r5
+ 1f/3+P3/9fX1//T09P/z8/P/8fHx/+/w8P//////7Ozse+zs7Hn/////8fHx//Pz8//09PT/9fb1//f3
+ 9//4+Pj/+fn5//r6+v/7+/v//Pz9//z9///9/////v/////////z+vv/29CX//jFJ//5xSf/+MEe//rW
+ Nf/7+s7/+fr///f39//29vb/9fX1//Pz9P/y8vL/8fHx///////s7Ox78PDwbP/////y8vL/8/Pz//X1
+ 9f/29vb/+Pf3//n5+f/6+vr/+/v7//v7+//8/Pz//f39//7+/v/+/v//9fj//9jPs//0yjf//M4u//rK
+ J//73EL//PzU//r8///5+fn/+Pj4//b39//19fX/9PT0//Pz8//x8fH//////+7u7m709PRK//////Pz
+ 8//09PT/9fX1//b29v/4+Pj/+fn5//r6+v/7+/v/+/v8//z8/P/9/f3//v7+///////r5tD/8s44//3W
+ NP/50jH//OJP//z82f/7/P//+vr6//n5+f/4+Pj/9/f3//b29v/19PX/8/Pz//Hx8f/+/v7/8fHxTPX1
+ 9Rry8vL49/f3//T09P/29vb/9/f3//f4+P/5+fn/+vr6//v7+//7+/v//Pz8//39/f/+/v7//v////z0
+ wf/72zH/+dg2//znW//9/d7//P3///v7+//7+/v/+fn5//j4+P/4+Pj/9vb2//T09P/z8/P/9fb2//Hx
+ 8fn19fUbAAAAAPLy8r3/////9PT0//b29v/39/f/+Pj4//n5+f/6+vr/+/v7//v7+//8/Pz//f39//39
+ /f/+/v7//v/5//32of/98of//f3i//z9///8/Pz/+/v7//r6+v/5+fn/+Pj4//j4+P/29vb/9PT0//Pz
+ 8///////8vLyvwAAAAAAAAAA9fX1Uv/////09PT/9fX1//f39//4+Pj/+fn5//r6+v/7+/v//Pz8//z8
+ /P/8/Pz//f39//39/f/9/f///f7///3////8/f///Pz8//z8/P/7+/v/+vr6//n5+f/5+fn/9/f3//b2
+ 9v/09PT/9PT0///////19fVUAAAAAAAAAAD///8B9PT0yf/////09PT/9vb2//j4+P/5+fn/+fn5//r6
+ +v/8/Pv//Pz8//z8/P/8/Pz//Pz8//38/f/9/P3//Pz9//z8/P/8/Pz//Pz8//r6+v/6+vr/+fn5//j4
+ +P/39/f/9vb2//T09P//////9PTzy////wEAAAAAAAAAAAAAAAD5+fkt+vr6+fz8/P/19fX/9/f3//n5
+ +f/5+fn/+vr6//v6+v/7+/v//Pz8//z8/P/8/Pz//Pz8//z8/P/8/Pz//Pz8//z8+//7+/r/+vr6//r6
+ +v/5+fn/+Pj4//f39//19fX//Pz8//n5+fr5+fkuAAAAAAAAAAAAAAAAAAAAAAAAAAD29vZX//////7+
+ /v/29vb/+Pj4//n5+f/6+vr/+vr6//v7+//7+/v//Pz8//z8/P/8/Pz//Pz8//z7+//7+/v/+/v7//v6
+ +//6+vr/+fn5//n5+f/49/j/9vb2//39/f//////8/PzWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAD29vZZ/Pz89v/////4+Pj/+Pj4//n5+f/6+vr/+/v7//v7+//7+/v/+/v7//v7+//7+/v/+/v7//v7
+ +//7+/v/+vr6//r6+v/5+fn/+Pj4//j4+P///////f389vb29loAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAD5+fQw/Pz8w////////////v7+//r6+v/6+vr/+/v7//v7+//7+/v/+/v7//v7
+ +//7+/v/+/v7//r6+v/5+vn/+vr6//39/f////////////39/cP5+fkxAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+/v7U/z8/Lf6+vrz////////////////////////
+ ////////////////////////////////////////+/v78/39/bf7+/tUAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/hr7+/tH/Pz8afr6
+ +nj8/Px4+vr6ePr6+nj6+vp4+vr6ePz8/Hj6+vp4/Pz8af7+/kf+/v4aAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA/wAA//wAAD/4AAAf8AAAD+AAAAfAAAADgAAAAYAAAAGAAAABAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAYAA
+ AAHAAAAD4AAAB/AAAA/4AAAf/gAAf/+AAf8=
+</value>
+ </data>
+</root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-14 22:09:03
|
Revision: 4772
http://sourceforge.net/p/mp-plugins/code/4772
Author: nicsergio
Date: 2014-03-14 22:09:00 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-03 17:24:56 UTC (rev 4771)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-14 22:09:00 UTC (rev 4772)
@@ -7,22 +7,30 @@
namespace My.Common
{
- internal partial class SkinItems : UserControl
+ internal partial class SkinItems : UserControl //Controllo utente per visualizzazione elementi della skin
{
+ #region Dati
+ private static ImageList skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
+ public enum SkinItemsType //Tipologie di elementi della skin
+ {
+ Links = 0, //--> link predefiniti
+ Files = 1 //--> file
+ }
+ #endregion
+
+ #region Costruttore
public SkinItems()
{
InitializeComponent();
-
-
-
+ }
+ static SkinItems()
+ {
//Lettura nomi delle immagini per il treeview dei link della skin incapsulate nell'eseguibile
var resNames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains(".Resources.Images.TreeViewIcons."));
- //Impostazione spazio dei nomi predefinito
- //DefaultNamespace = resNames.ElementAt(0).Substring(0, resNames.ElementAt(0).IndexOf(".Resource"));
skinLinksImgs.ImageSize = new Size(24, 24);
skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
- foreach (string resName in resNames) //Iterazione di caricamento immagini per treevie link della skin
+ foreach (string resName in resNames) //Iterazione di caricamento immagini per treeview link della skin
{
try
{
@@ -34,127 +42,103 @@
catch { }
}
}
+ #endregion
- public delegate void ItemChanged(SkinItemsType itemType, int selectedIndex);
- public new event EventHandler Enter;
- public new event EventHandler DoubleClick;
- public event EventHandler SelectedIndexChanged;
-
-
- protected ImageList skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
-
- public enum SkinItemsType //Tipologie di azioni di modica stato
+ #region Metodi Pubblici
+ internal void Populate(List<MediaPortalSkin.SkinFile> skinFiles,
+ List<MediaPortalSkin.SkinLink> skinLinks,
+ bool selectFirst, bool collapseTreeView) //Popolamento del controllo
{
- Links = 0, //--> reset blocco
- Files = 1 //--> nessuna modifica (stato invariato)
- }
- //public event
-
-
- internal void Populate(List<MediaPortalSkin.SkinFile> skinFiles, List<MediaPortalSkin.SkinLink> skinLinks, bool selectFirst, bool collapseTreeView)
- {
-
skinFilesListBox.DataSource = skinFiles;
int i = 0;
skinLinksTreeView.Nodes.Clear();
- skinLinksTreeView.ImageList = skinLinksImgs; //--> aggancio a lista immagini per treeview
+ skinLinksTreeView.ImageList = skinLinksImgs; //--> aggancio a lista immagini per treeview
TreeNode node = new TreeNode();
- foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview
+ foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview
{
- if (skLink.IsFather) //--> nodo padre
+ if (skLink.IsFather) //--> nodo padre
node = skinLinksTreeView.Nodes.Add(i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- else //--> nodo figlio
+ else //--> nodo figlio
node.Nodes.Add(i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
+ i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
}
-
-
+
if (collapseTreeView)
- skinLinksTreeView.CollapseAll();
+ skinLinksTreeView.CollapseAll(); //--> nodi collassati
else
- skinLinksTreeView.ExpandAll();
+ skinLinksTreeView.ExpandAll(); //--> nodi espansi
- skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
+ skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1); //--> eventuale selezione primo elemento della lista
if (selectFirst)
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
-
+ skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0]; //--> eventuale selezione primo elemento del treeview
}
-
-
-
- private void SwitchFocus()
+ public new void Focus() //Distribuzione del fuoco tra treeview link e lista file
{
- if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
skinLinksTreeView.Focus();
else
skinFilesListBox.Focus();
}
-
+ #endregion
+
+ #region Consumazione Eventi
private void SkinItemsControl_SizeChanged(object sender, EventArgs e)
{
- itemsTabControl.Size = this.Size;
- skinLinksTreeView.Size = new Size(this.Size.Width - 12, this.Size.Height - 35);
- skinFilesListBox.Size = new Size(this.Size.Width - 12, this.Size.Height - 35);
-
+ itemsTabControl.Size = this.Size;
+ skinLinksTreeView.Size = new Size(this.Size.Width - 12, this.Size.Height - 35);
+ skinFilesListBox.Size = new Size(this.Size.Width - 12, this.Size.Height - 35);
}
-
private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
{
Focus();
}
-
private void itemsTabControl_Click(object sender, EventArgs e)
{
Focus();
}
-
private void skinFilesListBox_Enter(object sender, EventArgs e)
{
if (Enter != null)
- Enter(sender, e);
+ Enter(sender, e); //--> pubblicazione evento
}
private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
{
if (SelectedIndexChanged != null)
- SelectedIndexChanged(sender, e);
+ SelectedIndexChanged(sender, e); //--> pubblicazione evento
}
private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
{
if (DoubleClick != null)
- DoubleClick(sender, e);
+ DoubleClick(sender, e); //--> pubblicazione evento
}
private void skinLinksTreeView_Enter(object sender, EventArgs e)
{
if (Enter != null)
- Enter(sender, e);
+ Enter(sender, e); //--> pubblicazione evento
}
private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
{
if (SelectedIndexChanged != null)
- SelectedIndexChanged(sender, e);
- }
+ SelectedIndexChanged(sender, e); //--> pubblicazione evento
+ }
private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
{
if (DoubleClick != null)
- DoubleClick(sender, e);
+ DoubleClick(sender, e); //--> pubblicazione evento
}
+ #endregion
+ #region Eventi
+ public new event EventHandler Enter; //Evento di ricezione del fuoco
+ public new event EventHandler DoubleClick; //Evento di doppio click su un elemento
+ public event EventHandler SelectedIndexChanged; //Evento di modifica indice elemento selezionato
+ #endregion
-
-
- public new void Focus()
- {
- if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
- }
-
+ #region Proprietà
public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } set { itemsTabControl.SelectedIndex = (int)value; } }
- public new bool Focused { get { return (skinFilesListBox.Focused | skinLinksTreeView.Focused | itemsTabControl.Focused); } }
- public new Color BackColor { get { return skinFilesListBox.BackColor; } set { if (skinFilesListBox.BackColor != value) { skinFilesListBox.BackColor = value; skinLinksTreeView.BackColor = value; } } }
-
+ public new Color BackColor { get { return skinFilesListBox.BackColor; } set { if (skinFilesListBox.BackColor != value) { skinFilesListBox.BackColor = value; skinLinksTreeView.BackColor = value; } } }
+ public new bool Focused { get { return (skinFilesListBox.Focused | skinLinksTreeView.Focused | itemsTabControl.Focused); } }
public int SelectedIndex
{
get
@@ -168,19 +152,20 @@
{
if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- try
+ try
{
+ //Indice nodo selezionato TreeView --> corrispondente a chiave)
skinLinksTreeView.SelectedNode = ((value >= 0) ? skinLinksTreeView.Nodes.Find(value.ToString(), true)[0] : null);
}
catch
{
- skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
+ skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
}
}
else
- skinFilesListBox.SelectedIndex = value; //--> selezione eventuale file corrispondente a WindowID
+ skinFilesListBox.SelectedIndex = value; //--> selezione eventuale file corrispondente a WindowID
}
}
+ #endregion
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-03 17:24:56 UTC (rev 4771)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-14 22:09:00 UTC (rev 4772)
@@ -29,7 +29,6 @@
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = EXE|x86
- {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = EXE|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = DLL|x86
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,6 +47,7 @@
{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
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-03 17:24:59
|
Revision: 4771
http://sourceforge.net/p/mp-plugins/code/4771
Author: nicsergio
Date: 2014-03-03 17:24:56 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-03 17:19:13 UTC (rev 4770)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-03 17:24:56 UTC (rev 4771)
@@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
+using System.Reflection;
using System.Windows.Forms;
-using System.Reflection;
namespace My.Common
{
@@ -38,7 +38,7 @@
public delegate void ItemChanged(SkinItemsType itemType, int selectedIndex);
public new event EventHandler Enter;
public new event EventHandler DoubleClick;
- public event EventHandler SelectedIndexChanged;
+ public event EventHandler SelectedIndexChanged;
protected ImageList skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-03 17:19:17
|
Revision: 4770
http://sourceforge.net/p/mp-plugins/code/4770
Author: nicsergio
Date: 2014-03-03 17:19:13 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Program.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.resx
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
Added: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditor.Designer.cs 2014-03-03 17:19:13 UTC (rev 4770)
@@ -0,0 +1,1139 @@
+namespace ProcessPlugins.XtremeMenuEditor
+{
+ partial class BHEditor
+ {
+ /// <summary>
+ /// Variabile di progettazione necessaria.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Liberare le risorse in uso.
+ /// </summary>
+ /// <param name="disposing">ha valore true se le risorse gestite devono essere eliminate, false in caso contrario.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Codice generato da Progettazione Windows Form
+
+ /// <summary>
+ /// Metodo necessario per il supporto della finestra di progettazione. Non modificare
+ /// il contenuto del metodo con l'editor di codice.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BHEditor));
+ this.multiImageFolderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
+ this.singleImageOpenFileDialog = new System.Windows.Forms.OpenFileDialog();
+ this.propertiesPanel = new System.Windows.Forms.Panel();
+ this.propertiesGroupBox = new System.Windows.Forms.GroupBox();
+ this.iconGroupBox = new System.Windows.Forms.GroupBox();
+ this.iconPictureBox = new System.Windows.Forms.PictureBox();
+ this.iconComboBox = new System.Windows.Forms.ComboBox();
+ this.iconBrowseButton = new System.Windows.Forms.Button();
+ this.loadParameterTextBox = new System.Windows.Forms.TextBox();
+ this.windowIdShowLabel = new System.Windows.Forms.Label();
+ this.skinFileShowLabel = new System.Windows.Forms.Label();
+ this.captionTextBox = new System.Windows.Forms.TextBox();
+ this.backgroundGroupBox = new System.Windows.Forms.GroupBox();
+ this.fanartHandlerPictureBox = new System.Windows.Forms.PictureBox();
+ this.backgroundPictureBox = new System.Windows.Forms.PictureBox();
+ this.fanartComboBox = new System.Windows.Forms.ComboBox();
+ this.multiImageComboBox = new System.Windows.Forms.ComboBox();
+ this.fanartRadioButton = new System.Windows.Forms.RadioButton();
+ this.singleImageComboBox = new System.Windows.Forms.ComboBox();
+ this.multiImageBrowseButton = new System.Windows.Forms.Button();
+ this.singleImageBrowseButton = new System.Windows.Forms.Button();
+ this.singleImageRadioButton = new System.Windows.Forms.RadioButton();
+ this.multiImageRadioButton = new System.Windows.Forms.RadioButton();
+ this.overlayGroupBox = new System.Windows.Forms.GroupBox();
+ this.overlayLabel = new System.Windows.Forms.Label();
+ this.overlayComboBox = new System.Windows.Forms.ComboBox();
+ this.contextTextBox = new System.Windows.Forms.TextBox();
+ this.loadParameterLabel = new System.Windows.Forms.Label();
+ this.windowIdLabel = new System.Windows.Forms.Label();
+ this.skinFileLabel = new System.Windows.Forms.Label();
+ this.captionLabel = new System.Windows.Forms.Label();
+ this.contextLabel = new System.Windows.Forms.Label();
+ this.menuPanel = new System.Windows.Forms.Panel();
+ this.creationGroupBox = new System.Windows.Forms.GroupBox();
+ this.createBackupCheckBox = new System.Windows.Forms.CheckBox();
+ this.clearCacheCheckBox = new System.Windows.Forms.CheckBox();
+ this.saveButton = new System.Windows.Forms.Button();
+ this.generalGroupBox = new System.Windows.Forms.GroupBox();
+ this.showContextLabelCheckBox = new System.Windows.Forms.CheckBox();
+ this.showSubItemBackgroundCheckBox = new System.Windows.Forms.CheckBox();
+ this.multiImageTimeGroupBox = new System.Windows.Forms.GroupBox();
+ this.multiIMageTimeLabel = new System.Windows.Forms.Label();
+ this.multiImageTimeSecLabel = new System.Windows.Forms.Label();
+ this.multiImageTimeTrackBar = new System.Windows.Forms.TrackBar();
+ this.defaultMenuItemGroupBox = new System.Windows.Forms.GroupBox();
+ this.defaultMenuItemComboBox = new System.Windows.Forms.ComboBox();
+ this.backgroundAnimatedCheckBox = new System.Windows.Forms.CheckBox();
+ this.showRssCheckBox = new System.Windows.Forms.CheckBox();
+ this.subMenuGroupBox = new System.Windows.Forms.GroupBox();
+ this.subMenuRowRemoveButton = new System.Windows.Forms.Button();
+ this.subMenuRowDownButton = new System.Windows.Forms.Button();
+ this.subMenuRowUpButton = new System.Windows.Forms.Button();
+ this.subMenuListBox = new System.Windows.Forms.ListBox();
+ this.menuGroupBox = new System.Windows.Forms.GroupBox();
+ this.defaultItemRightPanel = new System.Windows.Forms.Panel();
+ this.defaultItemLeftPanel = new System.Windows.Forms.Panel();
+ this.menuRowRemoveButton = new System.Windows.Forms.Button();
+ this.menuRowDownButton = new System.Windows.Forms.Button();
+ this.menuRowUpButton = new System.Windows.Forms.Button();
+ this.menuListBox = new System.Windows.Forms.ListBox();
+ this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox();
+ this.backgroundImageTimer = new System.Windows.Forms.Timer(this.components);
+ this.iconOpenFileDialog = new System.Windows.Forms.OpenFileDialog();
+ this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.updateNotifyTimer = new System.Windows.Forms.Timer(this.components);
+ this.infoPictureBox = new System.Windows.Forms.PictureBox();
+ this.subMenuRowAddButton = new System.Windows.Forms.Button();
+ this.menuRowAddButton = new System.Windows.Forms.Button();
+ this.propLeftPictureBox = new System.Windows.Forms.PictureBox();
+ this.propRightPictureBox = new System.Windows.Forms.PictureBox();
+ this.menuRowEditButton = new System.Windows.Forms.Button();
+ this.subMenuRowEditButton = new System.Windows.Forms.Button();
+ this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox();
+ this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox();
+ this.arrowsPictureBox = new System.Windows.Forms.PictureBox();
+ this.skinItems = new My.Common.SkinItems();
+ this.propertiesPanel.SuspendLayout();
+ this.propertiesGroupBox.SuspendLayout();
+ this.iconGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).BeginInit();
+ this.backgroundGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.fanartHandlerPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).BeginInit();
+ this.overlayGroupBox.SuspendLayout();
+ this.menuPanel.SuspendLayout();
+ this.creationGroupBox.SuspendLayout();
+ this.generalGroupBox.SuspendLayout();
+ this.multiImageTimeGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.multiImageTimeTrackBar)).BeginInit();
+ this.defaultMenuItemGroupBox.SuspendLayout();
+ this.subMenuGroupBox.SuspendLayout();
+ this.menuGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateNotifyMenuPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.updateNotifySubMenuPictureBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.arrowsPictureBox)).BeginInit();
+ this.SuspendLayout();
+ //
+ // multiImageFolderBrowserDialog
+ //
+ this.multiImageFolderBrowserDialog.Description = "Select multi-image folder for this menu item";
+ this.multiImageFolderBrowserDialog.RootFolder = System.Environment.SpecialFolder.MyComputer;
+ this.multiImageFolderBrowserDialog.ShowNewFolderButton = false;
+ //
+ // singleImageOpenFileDialog
+ //
+ this.singleImageOpenFileDialog.Filter = "Image Files |*.png;*.jpg;*.bmp;*.gif";
+ //
+ // propertiesPanel
+ //
+ this.propertiesPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.propertiesPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.propertiesPanel.Controls.Add(this.propertiesGroupBox);
+ this.propertiesPanel.Location = new System.Drawing.Point(294, 12);
+ this.propertiesPanel.Name = "propertiesPanel";
+ this.propertiesPanel.Size = new System.Drawing.Size(342, 573);
+ this.propertiesPanel.TabIndex = 21;
+ //
+ // propertiesGroupBox
+ //
+ this.propertiesGroupBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.propertiesGroupBox.Controls.Add(this.iconGroupBox);
+ this.propertiesGroupBox.Controls.Add(this.loadParameterTextBox);
+ this.propertiesGroupBox.Controls.Add(this.windowIdShowLabel);
+ this.propertiesGroupBox.Controls.Add(this.skinFileShowLabel);
+ this.propertiesGroupBox.Controls.Add(this.captionTextBox);
+ this.propertiesGroupBox.Controls.Add(this.backgroundGroupBox);
+ this.propertiesGroupBox.Controls.Add(this.overlayGroupBox);
+ this.propertiesGroupBox.Controls.Add(this.contextTextBox);
+ this.propertiesGroupBox.Controls.Add(this.loadParameterLabel);
+ this.propertiesGroupBox.Controls.Add(this.windowIdLabel);
+ this.propertiesGroupBox.Controls.Add(this.skinFileLabel);
+ this.propertiesGroupBox.Controls.Add(this.captionLabel);
+ this.propertiesGroupBox.Controls.Add(this.contextLabel);
+ this.propertiesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.propertiesGroupBox.Location = new System.Drawing.Point(1, 3);
+ this.propertiesGroupBox.Name = "propertiesGroupBox";
+ this.propertiesGroupBox.Size = new System.Drawing.Size(336, 562);
+ this.propertiesGroupBox.TabIndex = 2;
+ this.propertiesGroupBox.TabStop = false;
+ this.propertiesGroupBox.Text = "Item Properties";
+ //
+ // iconGroupBox
+ //
+ this.iconGroupBox.Controls.Add(this.iconPictureBox);
+ this.iconGroupBox.Controls.Add(this.iconComboBox);
+ this.iconGroupBox.Controls.Add(this.iconBrowseButton);
+ this.iconGroupBox.Location = new System.Drawing.Point(6, 394);
+ this.iconGroupBox.Name = "iconGroupBox";
+ this.iconGroupBox.Size = new System.Drawing.Size(324, 94);
+ this.iconGroupBox.TabIndex = 14;
+ this.iconGroupBox.TabStop = false;
+ this.iconGroupBox.Text = "Icon (Horus Theme)";
+ //
+ // iconPictureBox
+ //
+ this.iconPictureBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.iconPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError;
+ this.iconPictureBox.Location = new System.Drawing.Point(21, 22);
+ this.iconPictureBox.Name = "iconPictureBox";
+ this.iconPictureBox.Size = new System.Drawing.Size(64, 64);
+ this.iconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.iconPictureBox.TabIndex = 32;
+ this.iconPictureBox.TabStop = false;
+ //
+ // iconComboBox
+ //
+ this.iconComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.iconComboBox.FormattingEnabled = true;
+ this.iconComboBox.Location = new System.Drawing.Point(97, 44);
+ this.iconComboBox.Name = "iconComboBox";
+ this.iconComboBox.Size = new System.Drawing.Size(164, 21);
+ this.iconComboBox.TabIndex = 16;
+ this.iconComboBox.TextChanged += new System.EventHandler(this.iconComboBox_TextChanged);
+ //
+ // iconBrowseButton
+ //
+ this.iconBrowseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.iconBrowseButton.Location = new System.Drawing.Point(267, 43);
+ this.iconBrowseButton.Name = "iconBrowseButton";
+ this.iconBrowseButton.Size = new System.Drawing.Size(51, 23);
+ this.iconBrowseButton.TabIndex = 17;
+ this.iconBrowseButton.Text = "Browse";
+ this.iconBrowseButton.UseVisualStyleBackColor = true;
+ this.iconBrowseButton.Click += new System.EventHandler(this.iconBrowseButton_Click);
+ //
+ // loadParameterTextBox
+ //
+ this.loadParameterTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.loadParameterTextBox.Location = new System.Drawing.Point(110, 130);
+ this.loadParameterTextBox.Name = "loadParameterTextBox";
+ this.loadParameterTextBox.Size = new System.Drawing.Size(214, 20);
+ this.loadParameterTextBox.TabIndex = 4;
+ this.loadParameterTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.loadParameterTextBox.TextChanged += new System.EventHandler(this.loadParameterTextBox_TextChanged);
+ //
+ // windowIdShowLabel
+ //
+ this.windowIdShowLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.windowIdShowLabel.Location = new System.Drawing.Point(114, 108);
+ this.windowIdShowLabel.Name = "windowIdShowLabel";
+ this.windowIdShowLabel.Size = new System.Drawing.Size(150, 13);
+ this.windowIdShowLabel.TabIndex = 10;
+ this.windowIdShowLabel.Text = "-";
+ this.windowIdShowLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // skinFileShowLabel
+ //
+ this.skinFileShowLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.skinFileShowLabel.Location = new System.Drawing.Point(114, 82);
+ this.skinFileShowLabel.Name = "skinFileShowLabel";
+ this.skinFileShowLabel.Size = new System.Drawing.Size(150, 13);
+ this.skinFileShowLabel.TabIndex = 9;
+ this.skinFileShowLabel.Text = "-";
+ this.skinFileShowLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // captionTextBox
+ //
+ this.captionTextBox.Location = new System.Drawing.Point(110, 52);
+ this.captionTextBox.Name = "captionTextBox";
+ this.captionTextBox.Size = new System.Drawing.Size(158, 21);
+ this.captionTextBox.TabIndex = 3;
+ this.captionTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.captionTextBox.TextChanged += new System.EventHandler(this.captionTextBox_TextChanged);
+ //
+ // backgroundGroupBox
+ //
+ this.backgroundGroupBox.Controls.Add(this.fanartHandlerPictureBox);
+ this.backgroundGroupBox.Controls.Add(this.backgroundPictureBox);
+ this.backgroundGroupBox.Controls.Add(this.fanartComboBox);
+ this.backgroundGroupBox.Controls.Add(this.multiImageComboBox);
+ this.backgroundGroupBox.Controls.Add(this.fanartRadioButton);
+ this.backgroundGroupBox.Controls.Add(this.singleImageComboBox);
+ this.backgroundGroupBox.Controls.Add(this.multiImageBrowseButton);
+ this.backgroundGroupBox.Controls.Add(this.singleImageBrowseButton);
+ this.backgroundGroupBox.Controls.Add(this.singleImageRadioButton);
+ this.backgroundGroupBox.Controls.Add(this.multiImageRadioButton);
+ this.backgroundGroupBox.Location = new System.Drawing.Point(6, 156);
+ this.backgroundGroupBox.Name = "backgroundGroupBox";
+ this.backgroundGroupBox.Size = new System.Drawing.Size(324, 232);
+ this.backgroundGroupBox.TabIndex = 5;
+ this.backgroundGroupBox.TabStop = false;
+ this.backgroundGroupBox.Text = "Background image(s)";
+ //
+ // fanartHandlerPictureBox
+ //
+ this.fanartHandlerPictureBox.BackColor = System.Drawing.Color.Transparent;
+ this.fanartHandlerPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.fanartHandlerPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.FanartHandler;
+ this.fanartHandlerPictureBox.Location = new System.Drawing.Point(234, 93);
+ this.fanartHandlerPictureBox.Name = "fanartHandlerPictureBox";
+ this.fanartHandlerPictureBox.Size = new System.Drawing.Size(48, 48);
+ this.fanartHandlerPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+ this.fanartHandlerPictureBox.TabIndex = 31;
+ this.fanartHandlerPictureBox.TabStop = false;
+ this.fanartHandlerPictureBox.Visible = false;
+ //
+ // backgroundPictureBox
+ //
+ this.backgroundPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.BackgroundError;
+ this.backgroundPictureBox.Location = new System.Drawing.Point(42, 93);
+ this.backgroundPictureBox.Name = "backgroundPictureBox";
+ this.backgroundPictureBox.Size = new System.Drawing.Size(240, 135);
+ this.backgroundPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.backgroundPictureBox.TabIndex = 14;
+ this.backgroundPictureBox.TabStop = false;
+ //
+ // fanartComboBox
+ //
+ this.fanartComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.fanartComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.fanartComboBox.FormattingEnabled = true;
+ this.fanartComboBox.Location = new System.Drawing.Point(98, 66);
+ this.fanartComboBox.Name = "fanartComboBox";
+ this.fanartComboBox.Size = new System.Drawing.Size(220, 21);
+ this.fanartComboBox.TabIndex = 13;
+ this.fanartComboBox.TextChanged += new System.EventHandler(this.fanartComboBox_TextChanged);
+ //
+ // multiImageComboBox
+ //
+ this.multiImageComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiImageComboBox.FormattingEnabled = true;
+ this.multiImageComboBox.Location = new System.Drawing.Point(98, 42);
+ this.multiImageComboBox.Name = "multiImageComboBox";
+ this.multiImageComboBox.Size = new System.Drawing.Size(164, 21);
+ this.multiImageComboBox.TabIndex = 10;
+ this.multiImageComboBox.TextChanged += new System.EventHandler(this.multiImageComboBox_TextChanged);
+ //
+ // fanartRadioButton
+ //
+ this.fanartRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.fanartRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.fanartRadioButton.Location = new System.Drawing.Point(6, 65);
+ this.fanartRadioButton.Name = "fanartRadioButton";
+ this.fanartRadioButton.Size = new System.Drawing.Size(314, 23);
+ this.fanartRadioButton.TabIndex = 12;
+ this.fanartRadioButton.TabStop = true;
+ this.fanartRadioButton.Text = "Fanart Handler";
+ this.fanartRadioButton.UseVisualStyleBackColor = false;
+ this.fanartRadioButton.CheckedChanged += new System.EventHandler(this.fanartRadioButton_CheckedChanged);
+ //
+ // singleImageComboBox
+ //
+ this.singleImageComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.singleImageComboBox.FormattingEnabled = true;
+ this.singleImageComboBox.Location = new System.Drawing.Point(98, 18);
+ this.singleImageComboBox.Name = "singleImageComboBox";
+ this.singleImageComboBox.Size = new System.Drawing.Size(163, 21);
+ this.singleImageComboBox.TabIndex = 7;
+ this.singleImageComboBox.TextChanged += new System.EventHandler(this.singleImageComboBox_TextChanged);
+ //
+ // multiImageBrowseButton
+ //
+ this.multiImageBrowseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiImageBrowseButton.Location = new System.Drawing.Point(268, 42);
+ this.multiImageBrowseButton.Name = "multiImageBrowseButton";
+ this.multiImageBrowseButton.Size = new System.Drawing.Size(51, 21);
+ this.multiImageBrowseButton.TabIndex = 11;
+ this.multiImageBrowseButton.Text = "Browse";
+ this.multiImageBrowseButton.UseVisualStyleBackColor = true;
+ this.multiImageBrowseButton.Click += new System.EventHandler(this.multiImageBrowseButton_Click);
+ //
+ // singleImageBrowseButton
+ //
+ this.singleImageBrowseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.singleImageBrowseButton.Location = new System.Drawing.Point(268, 18);
+ this.singleImageBrowseButton.Name = "singleImageBrowseButton";
+ this.singleImageBrowseButton.Size = new System.Drawing.Size(51, 21);
+ this.singleImageBrowseButton.TabIndex = 8;
+ this.singleImageBrowseButton.Text = "Browse";
+ this.singleImageBrowseButton.UseVisualStyleBackColor = true;
+ this.singleImageBrowseButton.Click += new System.EventHandler(this.singleImageBrowseButton_Click);
+ //
+ // singleImageRadioButton
+ //
+ this.singleImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.singleImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.singleImageRadioButton.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.singleImageRadioButton.Location = new System.Drawing.Point(6, 17);
+ this.singleImageRadioButton.Name = "singleImageRadioButton";
+ this.singleImageRadioButton.Size = new System.Drawing.Size(314, 23);
+ this.singleImageRadioButton.TabIndex = 6;
+ this.singleImageRadioButton.TabStop = true;
+ this.singleImageRadioButton.Text = "Single Image";
+ this.singleImageRadioButton.UseVisualStyleBackColor = false;
+ this.singleImageRadioButton.CheckedChanged += new System.EventHandler(this.singleImageRadioButton_CheckedChanged);
+ //
+ // multiImageRadioButton
+ //
+ this.multiImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.multiImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiImageRadioButton.Location = new System.Drawing.Point(6, 41);
+ this.multiImageRadioButton.Name = "multiImageRadioButton";
+ this.multiImageRadioButton.Size = new System.Drawing.Size(314, 23);
+ this.multiImageRadioButton.TabIndex = 9;
+ this.multiImageRadioButton.TabStop = true;
+ this.multiImageRadioButton.Text = "Multi Image";
+ this.multiImageRadioButton.UseVisualStyleBackColor = false;
+ this.multiImageRadioButton.CheckedChanged += new System.EventHandler(this.multiImageRadioButton_CheckedChanged);
+ //
+ // overlayGroupBox
+ //
+ this.overlayGroupBox.Controls.Add(this.overlayLabel);
+ this.overlayGroupBox.Controls.Add(this.overlayComboBox);
+ this.overlayGroupBox.Location = new System.Drawing.Point(6, 494);
+ this.overlayGroupBox.Name = "overlayGroupBox";
+ this.overlayGroupBox.Size = new System.Drawing.Size(324, 60);
+ this.overlayGroupBox.TabIndex = 15;
+ this.overlayGroupBox.TabStop = false;
+ this.overlayGroupBox.Text = "Overlay";
+ //
+ // overlayLabel
+ //
+ this.overlayLabel.AutoSize = true;
+ this.overlayLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.overlayLabel.Location = new System.Drawing.Point(6, 34);
+ this.overlayLabel.Name = "overlayLabel";
+ this.overlayLabel.Size = new System.Drawing.Size(70, 13);
+ this.overlayLabel.TabIndex = 1;
+ this.overlayLabel.Text = "Overlay Type";
+ //
+ // overlayComboBox
+ //
+ this.overlayComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.overlayComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.overlayComboBox.FormattingEnabled = true;
+ this.overlayComboBox.Location = new System.Drawing.Point(98, 30);
+ this.overlayComboBox.Name = "overlayComboBox";
+ this.overlayComboBox.Size = new System.Drawing.Size(220, 21);
+ this.overlayComboBox.TabIndex = 18;
+ this.overlayComboBox.TextChanged += new System.EventHandler(this.overlayComboBox_TextChanged);
+ //
+ // contextTextBox
+ //
+ this.contextTextBox.BackColor = System.Drawing.SystemColors.Window;
+ this.contextTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.contextTextBox.Location = new System.Drawing.Point(110, 26);
+ this.contextTextBox.Name = "contextTextBox";
+ this.contextTextBox.Size = new System.Drawing.Size(158, 20);
+ this.contextTextBox.TabIndex = 2;
+ this.contextTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.contextTextBox.TextChanged += new System.EventHandler(this.labelTextBox_TextChanged);
+ //
+ // loadParameterLabel
+ //
+ this.loadParameterLabel.AutoSize = true;
+ this.loadParameterLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.loadParameterLabel.Location = new System.Drawing.Point(9, 133);
+ this.loadParameterLabel.Name = "loadParameterLabel";
+ this.loadParameterLabel.Size = new System.Drawing.Size(99, 15);
+ this.loadParameterLabel.TabIndex = 4;
+ this.loadParameterLabel.Text = "Load Parameter:";
+ this.loadParameterLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // windowIdLabel
+ //
+ this.windowIdLabel.AutoSize = true;
+ this.windowIdLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.windowIdLabel.Location = new System.Drawing.Point(39, 107);
+ this.windowIdLabel.Name = "windowIdLabel";
+ this.windowIdLabel.Size = new System.Drawing.Size(69, 15);
+ this.windowIdLabel.TabIndex = 3;
+ this.windowIdLabel.Text = "Window ID:";
+ this.windowIdLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // skinFileLabel
+ //
+ this.skinFileLabel.AutoSize = true;
+ this.skinFileLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.skinFileLabel.Location = new System.Drawing.Point(55, 81);
+ this.skinFileLabel.Name = "skinFileLabel";
+ this.skinFileLabel.Size = new System.Drawing.Size(57, 15);
+ this.skinFileLabel.TabIndex = 2;
+ this.skinFileLabel.Text = "Skin File:";
+ this.skinFileLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // captionLabel
+ //
+ this.captionLabel.AutoSize = true;
+ this.captionLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.captionLabel.Location = new System.Drawing.Point(56, 55);
+ this.captionLabel.Name = "captionLabel";
+ this.captionLabel.Size = new System.Drawing.Size(52, 15);
+ this.captionLabel.TabIndex = 1;
+ this.captionLabel.Text = "Caption:";
+ this.captionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // contextLabel
+ //
+ this.contextLabel.AutoSize = true;
+ this.contextLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.contextLabel.Location = new System.Drawing.Point(12, 29);
+ this.contextLabel.Name = "contextLabel";
+ this.contextLabel.Size = new System.Drawing.Size(85, 15);
+ this.contextLabel.TabIndex = 0;
+ this.contextLabel.Text = "Context Label:";
+ this.contextLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // menuPanel
+ //
+ this.menuPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
+ this.menuPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.menuPanel.Controls.Add(this.creationGroupBox);
+ this.menuPanel.Controls.Add(this.generalGroupBox);
+ this.menuPanel.Controls.Add(this.subMenuGroupBox);
+ this.menuPanel.Controls.Add(this.menuGroupBox);
+ this.menuPanel.Controls.Add(this.subMenuArrowPictureBox);
+ this.menuPanel.Location = new System.Drawing.Point(676, 90);
+ this.menuPanel.Name = "menuPanel";
+ this.menuPanel.Size = new System.Drawing.Size(330, 495);
+ this.menuPanel.TabIndex = 24;
+ //
+ // creationGroupBox
+ //
+ this.creationGroupBox.Controls.Add(this.createBackupCheckBox);
+ this.creationGroupBox.Controls.Add(this.clearCacheCheckBox);
+ this.creationGroupBox.Controls.Add(this.saveButton);
+ this.creationGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.creationGroupBox.Location = new System.Drawing.Point(3, 419);
+ this.creationGroupBox.Name = "creationGroupBox";
+ this.creationGroupBox.Size = new System.Drawing.Size(322, 68);
+ this.creationGroupBox.TabIndex = 25;
+ this.creationGroupBox.TabStop = false;
+ this.creationGroupBox.Text = "Custom Menu Creation";
+ //
+ // createBackupCheckBox
+ //
+ this.createBackupCheckBox.AutoSize = true;
+ this.createBackupCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.createBackupCheckBox.Location = new System.Drawing.Point(178, 43);
+ this.createBackupCheckBox.Name = "createBackupCheckBox";
+ this.createBackupCheckBox.Size = new System.Drawing.Size(135, 17);
+ this.createBackupCheckBox.TabIndex = 19;
+ this.createBackupCheckBox.Text = "Back-up settings (.bak)";
+ this.createBackupCheckBox.UseVisualStyleBackColor = true;
+ this.createBackupCheckBox.CheckedChanged += new System.EventHandler(this.createBackupCheckBox_CheckedChanged);
+ //
+ // clearCacheCheckBox
+ //
+ this.clearCacheCheckBox.AutoSize = true;
+ this.clearCacheCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.clearCacheCheckBox.Location = new System.Drawing.Point(178, 20);
+ this.clearCacheCheckBox.Name = "clearCacheCheckBox";
+ this.clearCacheCheckBox.Size = new System.Drawing.Size(83, 17);
+ this.clearCacheCheckBox.TabIndex = 18;
+ this.clearCacheCheckBox.Text = "Clear cache";
+ this.clearCacheCheckBox.UseVisualStyleBackColor = true;
+ this.clearCacheCheckBox.CheckedChanged += new System.EventHandler(this.clearCacheCheckBox_CheckedChanged);
+ //
+ // saveButton
+ //
+ this.saveButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
+ this.saveButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.saveButton.Location = new System.Drawing.Point(6, 20);
+ this.saveButton.Name = "saveButton";
+ this.saveButton.Size = new System.Drawing.Size(144, 40);
+ this.saveButton.TabIndex = 17;
+ this.saveButton.Text = "SAVE";
+ this.saveButton.UseVisualStyleBackColor = false;
+ this.saveButton.Click += new System.EventHandler(this.saveButton_Click);
+ //
+ // generalGroupBox
+ //
+ this.generalGroupBox.Controls.Add(this.showContextLabelCheckBox);
+ this.generalGroupBox.Controls.Add(this.showSubItemBackgroundCheckBox);
+ this.generalGroupBox.Controls.Add(this.multiImageTimeGroupBox);
+ this.generalGroupBox.Controls.Add(this.defaultMenuItemGroupBox);
+ this.generalGroupBox.Controls.Add(this.backgroundAnimatedCheckBox);
+ this.generalGroupBox.Controls.Add(this.showRssCheckBox);
+ this.generalGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.generalGroupBox.Location = new System.Drawing.Point(3, 230);
+ this.generalGroupBox.Name = "generalGroupBox";
+ this.generalGroupBox.Size = new System.Drawing.Size(322, 183);
+ this.generalGroupBox.TabIndex = 24;
+ this.generalGroupBox.TabStop = false;
+ this.generalGroupBox.Text = "General Properties";
+ //
+ // showContextLabelCheckBox
+ //
+ this.showContextLabelCheckBox.AutoSize = true;
+ this.showContextLabelCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.showContextLabelCheckBox.Location = new System.Drawing.Point(178, 41);
+ this.showContextLabelCheckBox.Name = "showContextLabelCheckBox";
+ this.showContextLabelCheckBox.Size = new System.Drawing.Size(116, 17);
+ this.showContextLabelCheckBox.TabIndex = 7;
+ this.showContextLabelCheckBox.Text = "Show context label";
+ this.showContextLabelCheckBox.UseVisualStyleBackColor = true;
+ this.showContextLabelCheckBox.CheckedChanged += new System.EventHandler(this.showContextLabelCheckBox_CheckedChanged);
+ //
+ // showSubItemBackgroundCheckBox
+ //
+ this.showSubItemBackgroundCheckBox.AutoSize = true;
+ this.showSubItemBackgroundCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.showSubItemBackgroundCheckBox.Location = new System.Drawing.Point(12, 85);
+ this.showSubItemBackgroundCheckBox.Name = "showSubItemBackgroundCheckBox";
+ this.showSubItemBackgroundCheckBox.Size = new System.Drawing.Size(250, 17);
+ this.showSubItemBackgroundCheckBox.TabIndex = 6;
+ this.showSubItemBackgroundCheckBox.Text = "Show sub menu background (fast systems only)";
+ this.showSubItemBackgroundCheckBox.UseVisualStyleBackColor = true;
+ this.showSubItemBackgroundCheckBox.CheckedChanged += new System.EventHandler(this.showSubItemBackgroundCheckBox_CheckedChanged);
+ //
+ // multiImageTimeGroupBox
+ //
+ this.multiImageTimeGroupBox.Controls.Add(this.multiIMageTimeLabel);
+ this.multiImageTimeGroupBox.Controls.Add(this.multiImageTimeSecLabel);
+ this.multiImageTimeGroupBox.Controls.Add(this.multiImageTimeTrackBar);
+ this.multiImageTimeGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiImageTimeGroupBox.Location = new System.Drawing.Point(6, 109);
+ this.multiImageTimeGroupBox.Name = "multiImageTimeGroupBox";
+ this.multiImageTimeGroupBox.Size = new System.Drawing.Size(310, 66);
+ this.multiImageTimeGroupBox.TabIndex = 5;
+ this.multiImageTimeGroupBox.TabStop = false;
+ this.multiImageTimeGroupBox.Text = "Multi Image time interval";
+ //
+ // multiIMageTimeLabel
+ //
+ this.multiIMageTimeLabel.Font = new System.Drawing.Font("LCDMono2", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiIMageTimeLabel.Location = new System.Drawing.Point(245, 26);
+ this.multiIMageTimeLabel.Name = "multiIMageTimeLabel";
+ this.multiIMageTimeLabel.Size = new System.Drawing.Size(44, 19);
+ this.multiIMageTimeLabel.TabIndex = 1;
+ this.multiIMageTimeLabel.Text = "0";
+ this.multiIMageTimeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ //
+ // multiImageTimeSecLabel
+ //
+ this.multiImageTimeSecLabel.AutoSize = true;
+ this.multiImageTimeSecLabel.Font = new System.Drawing.Font("LCDMono2", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.multiImageTimeSecLabel.Location = new System.Drawing.Point(283, 27);
+ this.multiImageTimeSecLabel.Name = "multiImageTimeSecLabel";
+ this.multiImageTimeSecLabel.Size = new System.Drawing.Size(18, 17);
+ this.multiImageTimeSecLabel.TabIndex = 2;
+ this.multiImageTimeSecLabel.Text = "\"";
+ this.multiImageTimeSecLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // multiImageTimeTrackBar
+ //
+ this.multiImageTimeTrackBar.Location = new System.Drawing.Point(6, 19);
+ this.multiImageTimeTrackBar.Maximum = 60;
+ this.multiImageTimeTrackBar.Minimum = 5;
+ this.multiImageTimeTrackBar.Name = "multiImageTimeTrackBar";
+ this.multiImageTimeTrackBar.Size = new System.Drawing.Size(244, 45);
+ this.multiImageTimeTrackBar.TabIndex = 0;
+ this.multiImageTimeTrackBar.TickFrequency = 5;
+ this.multiImageTimeTrackBar.Value = 5;
+ this.multiImageTimeTrackBar.ValueChanged += new System.EventHandler(this.multiImageTimeTrackBar_ValueChanged);
+ //
+ // defaultMenuItemGroupBox
+ //
+ this.defaultMenuItemGroupBox.Controls.Add(this.defaultMenuItemComboBox);
+ this.defaultMenuItemGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.defaultMenuItemGroupBox.Location = new System.Drawing.Point(6, 20);
+ this.defaultMenuItemGroupBox.Name = "defaultMenuItemGroupBox";
+ this.defaultMenuItemGroupBox.Size = new System.Drawing.Size(144, 55);
+ this.defaultMenuItemGroupBox.TabIndex = 4;
+ this.defaultMenuItemGroupBox.TabStop = false;
+ this.defaultMenuItemGroupBox.Text = "Default menu item";
+ //
+ // defaultMenuItemComboBox
+ //
+ this.defaultMenuItemComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.defaultMenuItemComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.defaultMenuItemComboBox.FormattingEnabled = true;
+ this.defaultMenuItemComboBox.Location = new System.Drawing.Point(6, 22);
+ this.defaultMenuItemComboBox.Name = "defaultMenuItemComboBox";
+ this.defaultMenuItemComboBox.Size = new System.Drawing.Size(132, 21);
+ this.defaultMenuItemComboBox.TabIndex = 0;
+ this.defaultMenuItemComboBox.SelectedIndexChanged += new System.EventHandler(this.defaultMenuItemComboBox_SelectedIndexChanged);
+ //
+ // backgroundAnimatedCheckBox
+ //
+ this.backgroundAnimatedCheckBox.AutoSize = true;
+ this.backgroundAnimatedCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.backgroundAnimatedCheckBox.Location = new System.Drawing.Point(178, 62);
+ this.backgroundAnimatedCheckBox.Name = "backgroundAnimatedCheckBox";
+ this.backgroundAnimatedCheckBox.Size = new System.Drawing.Size(130, 17);
+ this.backgroundAnimatedCheckBox.TabIndex = 2;
+ this.backgroundAnimatedCheckBox.Text = "Background animated";
+ this.backgroundAnimatedCheckBox.UseVisualStyleBackColor = true;
+ this.backgroundAnimatedCheckBox.CheckedChanged += new System.EventHandler(this.backgroundAnimatedCheckBox_CheckedChanged);
+ //
+ // showRssCheckBox
+ //
+ this.showRssCheckBox.AutoSize = true;
+ this.showRssCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.showRssCheckBox.Location = new System.Drawing.Point(178, 20);
+ this.showRssCheckBox.Name = "showRssCheckBox";
+ this.showRssCheckBox.Size = new System.Drawing.Size(78, 17);
+ this.showRssCheckBox.TabIndex = 1;
+ this.showRssCheckBox.Text = "Show RSS";
+ this.showRssCheckBox.UseVisualStyleBackColor = true;
+ this.showRssCheckBox.CheckedChanged += new System.EventHandler(this.showRssCheckBox_CheckedChanged);
+ //
+ // subMenuGroupBox
+ //
+ this.subMenuGroupBox.Controls.Add(this.subMenuRowRemoveButton);
+ this.subMenuGroupBox.Controls.Add(this.subMenuRowDownButton);
+ this.subMenuGroupBox.Controls.Add(this.subMenuRowUpButton);
+ this.subMenuGroupBox.Controls.Add(this.subMenuListBox);
+ this.subMenuGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.subMenuGroupBox.Location = new System.Drawing.Point(175, 3);
+ this.subMenuGroupBox.Name = "subMenuGroupBox";
+ this.subMenuGroupBox.Size = new System.Drawing.Size(150, 221);
+ this.subMenuGroupBox.TabIndex = 23;
+ this.subMenuGroupBox.TabStop = false;
+ this.subMenuGroupBox.Text = "Sub Menu";
+ //
+ // subMenuRowRemoveButton
+ //
+ this.subMenuRowRemoveButton.AutoSize = true;
+ this.subMenuRowRemoveButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.subMenuRowRemoveButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.SubRowRemove;
+ this.subMenuRowRemoveButton.Location = new System.Drawing.Point(106, 171);
+ this.subMenuRowRemoveButton.Name = "subMenuRowRemoveButton";
+ this.subMenuRowRemoveButton.Size = new System.Drawing.Size(38, 38);
+ this.subMenuRowRemoveButton.TabIndex = 25;
+ this.subMenuRowRemoveButton.UseVisualStyleBackColor = true;
+ this.subMenuRowRemoveButton.Click += new System.EventHandler(this.subMenuRowRemoveButton_Click);
+ //
+ // subMenuRowDownButton
+ //
+ this.subMenuRowDownButton.AutoSize = true;
+ this.subMenuRowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.subMenuRowDownButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.SubRowDown;
+ this.subMenuRowDownButton.Location = new System.Drawing.Point(56, 171);
+ this.subMenuRowDownButton.Name = "subMenuRowDownButton";
+ this.subMenuRowDownButton.Size = new System.Drawing.Size(38, 38);
+ this.subMenuRowDownButton.TabIndex = 24;
+ this.subMenuRowDownButton.UseVisualStyleBackColor = true;
+ this.subMenuRowDownButton.Click += new System.EventHandler(this.subMenuRowDownButton_Click);
+ //
+ // subMenuRowUpButton
+ //
+ this.subMenuRowUpButton.AutoSize = true;
+ this.subMenuRowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.subMenuRowUpButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.SubRowUp;
+ this.subMenuRowUpButton.Location = new System.Drawing.Point(6, 171);
+ this.subMenuRowUpButton.Name = "subMenuRowUpButton";
+ this.subMenuRowUpButton.Size = new System.Drawing.Size(38, 38);
+ this.subMenuRowUpButton.TabIndex = 23;
+ this.subMenuRowUpButton.UseVisualStyleBackColor = true;
+ this.subMenuRowUpButton.Click += new System.EventHandler(this.subMenuRowUpButton_Click);
+ //
+ // subMenuListBox
+ //
+ this.subMenuListBox.BackColor = System.Drawing.Color.White;
+ this.subMenuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.subMenuListBox.FormattingEnabled = true;
+ this.subMenuListBox.Location = new System.Drawing.Point(6, 25);
+ this.subMenuListBox.Name = "subMenuListBox";
+ this.subMenuListBox.Size = new System.Drawing.Size(138, 134);
+ this.subMenuListBox.TabIndex = 22;
+ this.subMenuListBox.SelectedIndexChanged += new System.EventHandler(this.subMenuListBox_SelectedIndexChanged);
+ this.subMenuListBox.Enter += new System.EventHandler(this.subMenuListBox_Enter);
+ //
+ // menuGroupBox
+ //
+ this.menuGroupBox.Controls.Add(this.defaultItemRightPanel);
+ this.menuGroupBox.Controls.Add(this.defaultItemLeftPanel);
+ this.menuGroupBox.Controls.Add(this.menuRowRemoveButton);
+ this.menuGroupBox.Controls.Add(this.menuRowDownButton);
+ this.menuGroupBox.Controls.Add(this.menuRowUpButton);
+ this.menuGroupBox.Controls.Add(this.menuListBox);
+ this.menuGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.menuGroupBox.Location = new System.Drawing.Point(3, 3);
+ this.menuGroupBox.Name = "menuGroupBox";
+ this.menuGroupBox.Size = new System.Drawing.Size(150, 221);
+ this.menuGroupBox.TabIndex = 21;
+ this.menuGroupBox.TabStop = false;
+ this.menuGroupBox.Text = "Menu";
+ //
+ // defaultItemRightPanel
+ //
+ this.defaultItemRightPanel.BackColor = System.Drawing.Color.DarkTurquoise;
+ this.defaultItemRightPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.defaultItemRightPanel.ForeColor = System.Drawing.Color.Black;
+ this.defaultItemRightPanel.Location = new System.Drawing.Point(144, 25);
+ this.defaultItemRightPanel.Name = "defaultItemRightPanel";
+ this.defaultItemRightPanel.Size = new System.Drawing.Size(4, 17);
+ this.defaultItemRightPanel.TabIndex = 23;
+ this.defaultItemRightPanel.Visible = false;
+ //
+ // defaultItemLeftPanel
+ //
+ this.defaultItemLeftPanel.BackColor = System.Drawing.Color.DarkTurquoise;
+ this.defaultItemLeftPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.defaultItemLeftPanel.ForeColor = System.Drawing.Color.Black;
+ this.defaultItemLeftPanel.Location = new System.Drawing.Point(2, 25);
+ this.defaultItemLeftPanel.Name = "defaultItemLeftPanel";
+ this.defaultItemLeftPanel.Size = new System.Drawing.Size(4, 17);
+ this.defaultItemLeftPanel.TabIndex = 22;
+ this.defaultItemLeftPanel.Visible = false;
+ //
+ // menuRowRemoveButton
+ //
+ this.menuRowRemoveButton.AutoSize = true;
+ this.menuRowRemoveButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.menuRowRemoveButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.RowRemove;
+ this.menuRowRemoveButton.Location = new System.Drawing.Point(106, 171);
+ this.menuRowRemoveButton.Name = "menuRowRemoveButton";
+ this.menuRowRemoveButton.Size = new System.Drawing.Size(38, 38);
+ this.menuRowRemoveButton.TabIndex = 21;
+ this.menuRowRemoveButton.UseVisualStyleBackColor = true;
+ this.menuRowRemoveButton.Click += new System.EventHandler(this.menuRowRemoveButton_Click);
+ //
+ // menuRowDownButton
+ //
+ this.menuRowDownButton.AutoSize = true;
+ this.menuRowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.menuRowDownButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.RowDown;
+ this.menuRowDownButton.Location = new System.Drawing.Point(56, 171);
+ this.menuRowDownButton.Name = "menuRowDownButton";
+ this.menuRowDownButton.Size = new System.Drawing.Size(38, 38);
+ this.menuRowDownButton.TabIndex = 20;
+ this.menuRowDownButton.UseVisualStyleBackColor = true;
+ this.menuRowDownButton.Click += new System.EventHandler(this.menuRowDownButton_Click);
+ //
+ // menuRowUpButton
+ //
+ this.menuRowUpButton.AutoSize = true;
+ this.menuRowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.menuRowUpButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.RowUp;
+ this.menuRowUpButton.Location = new System.Drawing.Point(6, 171);
+ this.menuRowUpButton.Name = "menuRowUpButton";
+ this.menuRowUpButton.Size = new System.Drawing.Size(38, 38);
+ this.menuRowUpButton.TabIndex = 19;
+ this.menuRowUpButton.UseVisualStyleBackColor = true;
+ this.menuRowUpButton.Click += new System.EventHandler(this.menuRowUpButton_Click);
+ //
+ // menuListBox
+ //
+ this.menuListBox.BackColor = System.Drawing.Color.White;
+ this.menuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.menuListBox.FormattingEnabled = true;
+ this.menuListBox.Location = new System.Drawing.Point(6, 25);
+ this.menuListBox.Name = "menuListBox";
+ this.menuListBox.Size = new System.Drawing.Size(138, 134);
+ this.menuListBox.TabIndex = 18;
+ this.menuListBox.SelectedIndexChanged += new System.EventHandler(this.menuListBox_SelectedIndexChanged);
+ this.menuListBox.Enter += new System.EventHandler(this.menuListBox_Enter);
+ //
+ // subMenuArrowPictureBox
+ //
+ this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight;
+ this.subMenuArrowPictureBox.Location = new System.Drawing.Point(148, 22);
+ this.subMenuArrowPictureBox.Name = "subMenuArrowPictureBox";
+ this.subMenuArrowPictureBox.Size = new System.Drawing.Size(30, 30);
+ this.subMenuArrowPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.subMenuArrowPictureBox.TabIndex = 26;
+ this.subMenuArrowPictureBox.TabStop = false;
+ //
+ // backgroundImageTimer
+ //
+ this.backgroundImageTimer.Interval = 2500;
+ this.backgroundImageTimer.Tick += new System.EventHandler(this.backgroundImageTimer_Tick);
+ //
+ // iconOpenFileDialog
+ //
+ this.iconOpenFileDialog.Filter = "Image Files |*.png;*.jpg;*.bmp;*.gif";
+ //
+ // toolTip
+ //
+ this.toolTip.ShowAlways = true;
+ //
+ // updateNotifyTimer
+ //
+ this.updateNotifyTimer.Interval = 1250;
+ this.updateNotifyTimer.Tick += new System.EventHandler(this.updateNotifyTimer_Tick);
+ //
+ // infoPictureBox
+ //
+ this.infoPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.Info;
+ this.infoPictureBox.Location = new System.Drawing.Point(994, 1);
+ this.infoPictureBox.Name = "infoPictureBox";
+ this.infoPictureBox.Size = new System.Drawing.Size(24, 24);
+ this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.infoPictureBox.TabIndex = 29;
+ this.infoPictureBox.TabStop = false;
+ this.infoPictureBox.Click += new System.EventHandler(this.infoPictureBox_Click);
+ //
+ // subMenuRowAddButton
+ //
+ this.subMenuRowAddButton.AutoSize = true;
+ this.subMenuRowAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.subMenuRowAddButton.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.SubRowAdd;
+ this.subMenuRowAddButton.Location = new System.Drawing.Point(906, 31);
+ this.subMenuRowAddButton.Name = "subMenuRowAddButton";
+ this.subMenuRowAddButton.Size = new System.Drawing.Size(38, 38);
+ this.subMenuRowAddButton.TabIndex = 17;
+ this.subMenuRowAddButton.UseVisualStyleBackColor = true;
+ this.subMenuRowAddButton.Click += new System.EventHandler(this.subMenuRowAddButton_Click);
+ //
+ // menuRowAddButton
+ //
+ this.menuRowAddButton.AutoSize = true;
+ this.menuRowAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.menu...
[truncated message content] |
|
From: <dos...@us...> - 2014-03-03 14:27:54
|
Revision: 4769
http://sourceforge.net/p/mp-plugins/code/4769
Author: doskabouter
Date: 2014-03-03 14:27:50 +0000 (Mon, 03 Mar 2014)
Log Message:
-----------
Improved error logging
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-03-01 18:05:25 UTC (rev 4768)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-03-03 14:27:50 UTC (rev 4769)
@@ -199,7 +199,7 @@
}
catch (Exception ex)
{
- MyLog.debug("Could not find xulrunner under : " + Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\xulrunner");
+ MyLog.debug("Could not find xulrunner under : " + Settings.XulRunnerPath());
MyLog.debug("Reason : " + ex.Message);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-03-01 18:05:32
|
Revision: 4768
http://sourceforge.net/p/mp-plugins/code/4768
Author: nicsergio
Date: 2014-03-01 18:05:25 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -105,7 +105,6 @@
this.Controls.Add(this.itemsTabControl);
this.Name = "SkinItems";
this.Size = new System.Drawing.Size(247, 573);
- this.Load += new System.EventHandler(this.SkinItemsControl_Load);
this.SizeChanged += new System.EventHandler(this.SkinItemsControl_SizeChanged);
this.itemsTabControl.ResumeLayout(false);
this.linksTabPage.ResumeLayout(false);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -7,7 +7,7 @@
namespace My.Common
{
- public partial class SkinItems : UserControl
+ internal partial class SkinItems : UserControl
{
public SkinItems()
{
@@ -20,8 +20,8 @@
//Impostazione spazio dei nomi predefinito
//DefaultNamespace = resNames.ElementAt(0).Substring(0, resNames.ElementAt(0).IndexOf(".Resource"));
- _skinLinksImgs.ImageSize = new Size(24, 24);
- _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
+ skinLinksImgs.ImageSize = new Size(24, 24);
+ skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
foreach (string resName in resNames) //Iterazione di caricamento immagini per treevie link della skin
{
try
@@ -29,19 +29,19 @@
//Chiave: nome immagine senza percorso
string resKey = resName.Remove(0, resName.LastIndexOf("TreeViewIcons.") + "TreeViewIcons.".Length);
//Aggiunta dell'immagine
- _skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
+ skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
}
catch { }
}
}
- public delegate void ItemChanged(SkinItemsType itemType, int index);
- public new event ItemChanged Enter;
- public event ItemChanged Changed;
- public new event ItemChanged DoubleClick;
+ public delegate void ItemChanged(SkinItemsType itemType, int selectedIndex);
+ public new event EventHandler Enter;
+ public new event EventHandler DoubleClick;
+ public event EventHandler SelectedIndexChanged;
- protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
+ protected ImageList skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
public enum SkinItemsType //Tipologie di azioni di modica stato
{
@@ -58,7 +58,7 @@
int i = 0;
skinLinksTreeView.Nodes.Clear();
- skinLinksTreeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview
+ skinLinksTreeView.ImageList = skinLinksImgs; //--> aggancio a lista immagini per treeview
TreeNode node = new TreeNode();
foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview
{
@@ -69,38 +69,20 @@
i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
}
- skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
- if (selectFirst)
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
if (collapseTreeView)
skinLinksTreeView.CollapseAll();
else
skinLinksTreeView.ExpandAll();
+ skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
+ if (selectFirst)
+ skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
+
}
- internal void SetIndex(int index)
- {
- if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
- {
- try
- {
- skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
- }
- catch
- {
- skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
- }
- else
- skinFilesListBox.SelectedIndex = index; //--> selezione eventuale file corrispondente a WindowID
- }
+
- private void SkinItemsControl_Load(object sender, EventArgs e)
- {
-
- }
private void SwitchFocus()
{
if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
@@ -119,49 +101,86 @@
private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
{
- SwitchFocus();
+ Focus();
}
private void itemsTabControl_Click(object sender, EventArgs e)
{
- SwitchFocus();
+ Focus();
}
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinFilesListBox_Enter(object sender, EventArgs e)
{
- Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (Enter != null)
+ Enter(sender, e);
}
-
- private void skinFilesListBox_Enter(object sender, EventArgs e)
+ private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
{
- Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (SelectedIndexChanged != null)
+ SelectedIndexChanged(sender, e);
}
-
private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
{
- DoubleClick(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (DoubleClick != null)
+ DoubleClick(sender, e);
}
-
+ private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ {
+ if (Enter != null)
+ Enter(sender, e);
+ }
private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- Changed(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (SelectedIndexChanged != null)
+ SelectedIndexChanged(sender, e);
}
-
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- Enter(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (DoubleClick != null)
+ DoubleClick(sender, e);
}
- private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
+
+
+
+ public new void Focus()
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ skinLinksTreeView.Focus();
+ else
+ skinFilesListBox.Focus();
}
+ public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } set { itemsTabControl.SelectedIndex = (int)value; } }
+ public new bool Focused { get { return (skinFilesListBox.Focused | skinLinksTreeView.Focused | itemsTabControl.Focused); } }
+ public new Color BackColor { get { return skinFilesListBox.BackColor; } set { if (skinFilesListBox.BackColor != value) { skinFilesListBox.BackColor = value; skinLinksTreeView.BackColor = value; } } }
- public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } }
-
+ public int SelectedIndex
+ {
+ get
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ return (skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1;
+ else
+ return skinFilesListBox.SelectedIndex;
+ }
+ set
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ {
+ //Indice nodo selezionato TreeView --> corrispondente a chiave)
+ try
+ {
+ skinLinksTreeView.SelectedNode = ((value >= 0) ? skinLinksTreeView.Nodes.Find(value.ToString(), true)[0] : null);
+ }
+ catch
+ {
+ skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
+ }
+ }
+ else
+ skinFilesListBox.SelectedIndex = value; //--> selezione eventuale file corrispondente a WindowID
+ }
+ }
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -7,7 +7,7 @@
namespace My.Common
{
- public partial class VersionInfo : Form //Form di visualizzazione informazioni sulla versione
+ internal partial class VersionInfo : Form //Form di visualizzazione informazioni sulla versione
{
#region Dati
static VersionInfo myVersionInfo; //Istanza form di visualizzazione versione
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-01 18:05:25 UTC (rev 4768)
@@ -29,6 +29,7 @@
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = EXE|x86
+ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = EXE|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = DLL|x86
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,7 +48,6 @@
{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
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -355,11 +355,13 @@
//
this.skinItems.Location = new System.Drawing.Point(266, 8);
this.skinItems.Name = "skinItems";
+ this.skinItems.SelectedIndex = -1;
+ this.skinItems.SelectedTab = My.Common.SkinItems.SkinItemsType.Links;
this.skinItems.Size = new System.Drawing.Size(330, 260);
this.skinItems.TabIndex = 39;
- this.skinItems.Enter += new My.Common.SkinItems.ItemChanged(this.skinItems_Enter);
- this.skinItems.Changed += new My.Common.SkinItems.ItemChanged(this.skinItems_Changed);
- this.skinItems.DoubleClick += new My.Common.SkinItems.ItemChanged(this.skinItems_DoubleClick);
+ this.skinItems.Enter += new System.EventHandler(this.skinItems_Enter);
+ this.skinItems.DoubleClick += new System.EventHandler(this.skinItems_DoubleClick);
+ this.skinItems.SelectedIndexChanged += new System.EventHandler(this.skinItems_SelectedIndexChanged);
//
// ShortCuterConfig
//
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -144,9 +144,9 @@
shortCutsDataGridView.DataSource = myShortCuts.Items;
}
- private void ShowLinkProperties(SkinItems.SkinItemsType itemType, int index) //Visualizzazione proprietà link
+ private void ShowLinkProperties() //Visualizzazione proprietà link
{
- if (index < 0) //Se indice invalido --> reset proprietà
+ if (skinItems.SelectedIndex < 0) //Se indice invalido --> reset proprietà
{
skinFileLabel.Text = "-";
windowIdLabel.Text = "-";
@@ -154,18 +154,18 @@
}
else //Visualizzazione proprietà elemento selezionato
{
- switch (itemType)
+ switch (skinItems.SelectedTab)
{
case SkinItems.SkinItemsType.Files: //Lista files della skin
- skinFileLabel.Text = mySkin.SkinFiles[index].Name;
- windowIdLabel.Text = mySkin.SkinFiles[index].Id.ToString();
+ skinFileLabel.Text = mySkin.SkinFiles[skinItems.SelectedIndex].Name;
+ windowIdLabel.Text = mySkin.SkinFiles[skinItems.SelectedIndex].Id.ToString();
loadParameterTextBox.Text = "-";
break;
case SkinItems.SkinItemsType.Links: //Lista links predefiniti della skin
- skinFileLabel.Text = mySkin.SkinLinks[index].XmlFile;
- windowIdLabel.Text = mySkin.SkinLinks[index].WindowID.ToString();
- loadParameterTextBox.Text = mySkin.SkinLinks[index].LoadParameter;
+ skinFileLabel.Text = mySkin.SkinLinks[skinItems.SelectedIndex].XmlFile;
+ windowIdLabel.Text = mySkin.SkinLinks[skinItems.SelectedIndex].WindowID.ToString();
+ loadParameterTextBox.Text = mySkin.SkinLinks[skinItems.SelectedIndex].LoadParameter;
break;
}
}
@@ -189,7 +189,7 @@
//Selezione eventuale file corrispondente a WindowID
showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID);
- skinItems.SetIndex(showIndex);
+ skinItems.SelectedIndex = showIndex;
}
}
}
@@ -377,28 +377,28 @@
}
#endregion
#region Eventi Liste Files & Links Skin
- private void skinItems_Enter(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_Enter(object sender, EventArgs e)
{
propLeftPictureBox.Visible = false; //--> il link non è collegato allo shortcut selezionato
- ShowLinkProperties(itemType, index);
+ ShowLinkProperties();
}
- private void skinItems_Changed(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_SelectedIndexChanged(object sender, EventArgs e)
{
- ShowLinkProperties(itemType, index);
+ ShowLinkProperties();
}
- private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_DoubleClick(object sender, EventArgs e)
{
- if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && index >= 0)
+ if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && skinItems.SelectedIndex >= 0)
{
- if (itemType == SkinItems.SkinItemsType.Files)
+ if (skinItems.SelectedTab == SkinItems.SkinItemsType.Files)
{
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[index].Id.ToString();
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[skinItems.SelectedIndex].Id.ToString();
shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = "";
}
else
{
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[index].WindowID.ToString();
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[index].LoadParameter;
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[skinItems.SelectedIndex].WindowID.ToString();
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[skinItems.SelectedIndex].LoadParameter;
}
forceCell = true;
shortCutsDataGridView.CurrentCell = shortCutsDataGridView[5, shortCutsDataGridView.CurrentRow.Index];
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -30,11 +30,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BHEditorForm));
- this.itemsTabControl = new System.Windows.Forms.TabControl();
- this.linksTabPage = new System.Windows.Forms.TabPage();
- this.skinLinksTreeView = new System.Windows.Forms.TreeView();
- this.skinTabPage = new System.Windows.Forms.TabPage();
- this.skinFilesListBox = new System.Windows.Forms.ListBox();
this.multiImageFolderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.singleImageOpenFileDialog = new System.Windows.Forms.OpenFileDialog();
this.propertiesPanel = new System.Windows.Forms.Panel();
@@ -110,9 +105,7 @@
this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox();
this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox();
this.arrowsPictureBox = new System.Windows.Forms.PictureBox();
- this.itemsTabControl.SuspendLayout();
- this.linksTabPage.SuspendLayout();
- this.skinTabPage.SuspendLayout();
+ this.skinItems = new My.Common.SkinItems();
this.propertiesPanel.SuspendLayout();
this.propertiesGroupBox.SuspendLayout();
this.iconGroupBox.SuspendLayout();
@@ -138,64 +131,6 @@
((System.ComponentModel.ISupportInitialize)(this.arrowsPictureBox)).BeginInit();
this.SuspendLayout();
//
- // itemsTabControl
- //
- this.itemsTabControl.Controls.Add(this.linksTabPage);
- this.itemsTabControl.Controls.Add(this.skinTabPage);
- this.itemsTabControl.ItemSize = new System.Drawing.Size(74, 18);
- this.itemsTabControl.Location = new System.Drawing.Point(12, 12);
- this.itemsTabControl.Name = "itemsTabControl";
- this.itemsTabControl.SelectedIndex = 0;
- this.itemsTabControl.Size = new System.Drawing.Size(247, 573);
- this.itemsTabControl.TabIndex = 0;
- this.itemsTabControl.SelectedIndexChanged += new System.EventHandler(this.itemsTabControl_SelectedIndexChanged);
- this.itemsTabControl.Click += new System.EventHandler(this.itemsTabControl_Click);
- //
- // linksTabPage
- //
- this.linksTabPage.Controls.Add(this.skinLinksTreeView);
- this.linksTabPage.Location = new System.Drawing.Point(4, 22);
- this.linksTabPage.Name = "linksTabPage";
- this.linksTabPage.Padding = new System.Windows.Forms.Padding(3);
- this.linksTabPage.Size = new System.Drawing.Size(239, 547);
- this.linksTabPage.TabIndex = 0;
- this.linksTabPage.Text = "Default Links";
- this.linksTabPage.UseVisualStyleBackColor = true;
- //
- // skinLinksTreeView
- //
- this.skinLinksTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
- this.skinLinksTreeView.FullRowSelect = true;
- this.skinLinksTreeView.HideSelection = false;
- this.skinLinksTreeView.Location = new System.Drawing.Point(1, 5);
- this.skinLinksTreeView.Name = "skinLinksTreeView";
- this.skinLinksTreeView.Size = new System.Drawing.Size(235, 538);
- this.skinLinksTreeView.TabIndex = 1;
- this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
- this.skinLinksTreeView.Enter += new System.EventHandler(this.skinLinksTreeView_Enter);
- //
- // skinTabPage
- //
- this.skinTabPage.Controls.Add(this.skinFilesListBox);
- this.skinTabPage.Location = new System.Drawing.Point(4, 22);
- this.skinTabPage.Name = "skinTabPage";
- this.skinTabPage.Padding = new System.Windows.Forms.Padding(3);
- this.skinTabPage.Size = new System.Drawing.Size(239, 547);
- this.skinTabPage.TabIndex = 1;
- this.skinTabPage.Text = "Skin Files";
- this.skinTabPage.UseVisualStyleBackColor = true;
- //
- // skinFilesListBox
- //
- this.skinFilesListBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
- this.skinFilesListBox.FormattingEnabled = true;
- this.skinFilesListBox.Location = new System.Drawing.Point(1, 5);
- this.skinFilesListBox.Name = "skinFilesListBox";
- this.skinFilesListBox.Size = new System.Drawing.Size(235, 537);
- this.skinFilesListBox.TabIndex = 0;
- this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged);
- this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
- //
// multiImageFolderBrowserDialog
//
this.multiImageFolderBrowserDialog.Description = "Select multi-image folder for this menu item";
@@ -1045,18 +980,29 @@
this.arrowsPictureBox.TabIndex = 26;
this.arrowsPictureBox.TabStop = false;
//
+ // skinItems
+ //
+ this.skinItems.Location = new System.Drawing.Point(12, 12);
+ this.skinItems.Name = "skinItems";
+ this.skinItems.SelectedIndex = -1;
+ this.skinItems.SelectedTab = My.Common.SkinItems.SkinItemsType.Links;
+ this.skinItems.Size = new System.Drawing.Size(247, 573);
+ this.skinItems.TabIndex = 32;
+ this.skinItems.Enter += new System.EventHandler(this.skinItems_Enter);
+ this.skinItems.SelectedIndexChanged += new System.EventHandler(this.skinItems_SelectedIndexChanged);
+ //
// BHEditorForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(1018, 602);
+ this.Controls.Add(this.skinItems);
this.Controls.Add(this.menuPanel);
this.Controls.Add(this.propertiesPanel);
this.Controls.Add(this.infoPictureBox);
this.Controls.Add(this.subMenuRowAddButton);
this.Controls.Add(this.menuRowAddButton);
- this.Controls.Add(this.itemsTabControl);
this.Controls.Add(this.propLeftPictureBox);
this.Controls.Add(this.propRightPictureBox);
this.Controls.Add(this.menuRowEditButton);
@@ -1073,9 +1019,6 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BHEditorForm_FormClosing);
this.Load += new System.EventHandler(this.BHEditorForm_Load);
this.Shown += new System.EventHandler(this.BHEditorForm_Shown);
- this.itemsTabControl.ResumeLayout(false);
- this.linksTabPage.ResumeLayout(false);
- this.skinTabPage.ResumeLayout(false);
this.propertiesPanel.ResumeLayout(false);
this.propertiesGroupBox.ResumeLayout(false);
this.propertiesGroupBox.PerformLayout();
@@ -1114,10 +1057,6 @@
#endregion
- private System.Windows.Forms.TabControl itemsTabControl;
- private System.Windows.Forms.TabPage linksTabPage;
- private System.Windows.Forms.TabPage skinTabPage;
- private System.Windows.Forms.ListBox skinFilesListBox;
private System.Windows.Forms.FolderBrowserDialog multiImageFolderBrowserDialog;
private System.Windows.Forms.OpenFileDialog singleImageOpenFileDialog;
private System.Windows.Forms.Panel propertiesPanel;
@@ -1176,7 +1115,6 @@
private System.Windows.Forms.CheckBox clearCacheCheckBox;
private System.Windows.Forms.Timer backgroundImageTimer;
private System.Windows.Forms.PictureBox fanartHandlerPictureBox;
- private System.Windows.Forms.TreeView skinLinksTreeView;
private System.Windows.Forms.GroupBox iconGroupBox;
private System.Windows.Forms.PictureBox iconPictureBox;
private System.Windows.Forms.ComboBox iconComboBox;
@@ -1194,6 +1132,7 @@
private System.Windows.Forms.Panel defaultItemRightPanel;
private System.Windows.Forms.CheckBox showContextLabelCheckBox;
private System.Windows.Forms.CheckBox showSubItemBackgroundCheckBox;
+ private My.Common.SkinItems skinItems;
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -34,6 +34,16 @@
private bool falseAddMenuItem; //Aggiunta virtuale elemento di menu (usata per editazione)
private string[] bgImages = new string[50]; //Array immagini di background da visualizzare (multi-immagine)
private int bgImageIndex = 0; //Indice immagine di background visualizzata (multi-immagine)
+
+
+ public enum ShowItemsType //Tipologie di azioni di modica stato
+ {
+ SkinLinks = 0, //--> reset blocco
+ SkinFiles = 1,
+ MenuItems = 2,
+ SubMenuItems //--> nessuna modifica (stato invariato)
+ }
+
#endregion
#region Costruttore
@@ -65,11 +75,7 @@
multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString();
clearCacheCheckBox.Checked = myMenu.EditorClearCache;
createBackupCheckBox.Checked = myMenu.EditorCreateBackup;
- skinFilesListBox.DataSource = myMediaPortal.SelectedSkin.SkinFiles;
- skinFilesListBox.SelectedIndex = 0;
- myMediaPortal.SelectedSkin.FillTreeViewSkinLinks(skinLinksTreeView);
- skinLinksTreeView.ExpandAll();
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
+ skinItems.Populate(myMediaPortal.SelectedSkin.SkinFiles, myMediaPortal.SelectedSkin.SkinLinks, true, false);
unsavedChanges = false; //--> necessario a fine aggiornamento controlli grafici
@@ -92,35 +98,22 @@
toolTip.SetToolTip(saveButton, "Save settings and create custom menu");
toolTip.SetToolTip(infoPictureBox, "Version information");
}
- private void ShowItemProperties(object listControl) //Visualizzazione proprietà elemento di menu/sotto-menu
+ private void ShowItemProperties(ShowItemsType itemType, int index, bool focused) //Visualizzazione proprietà elemento di skin/menu/sotto-menu
{
- Control itemsList = (Control)listControl; //Casting sender -> Control
- int selectedIndex; //Indice eventuale elemento selezionato
+ if (!focused || index < 0)
+ return; //Se controllo non attivo o indice invalido --> uscita dalla procedura
- if (itemsList is ListBox)
- {
- ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox
- selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato
- }
- else
- {
- TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView
- selectedIndex= myMediaPortal.SelectedSkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato
- }
-
- if (!itemsList.Focused || selectedIndex < 0)
- return; //Se controllo non attivo o indice invalido --> uscita dalla procedura
const string propBoxText = "Item Properties";
showingProperties = true; //--> inibizione eventi di rinfresco immagini
- switch (itemsList.Name)
+ switch (itemType)
{
- case "skinFilesListBox": //Lista files della skin
+ case ShowItemsType.SkinFiles: //Lista files della skin
propertiesGroupBox.Text = propBoxText + " (Skin Files)";
contextTextBox.Enabled= true;
contextTextBox.Text = "";
captionTextBox.Text = "";
- skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Name;
- windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Id.ToString();
+ skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Name;
+ windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Id.ToString();
loadParameterTextBox.Text = "";
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
@@ -137,94 +130,92 @@
subMenuRowAddButton.Visible = true;
menuRowEditButton.Visible = false;
subMenuRowEditButton.Visible = false;
- skinFilesListBox.BackColor = Color.Aquamarine;
- skinLinksTreeView.BackColor = Color.FromArgb(213,220,227);
+ skinItems.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
subMenuListBox.BackColor = Color.White;
break;
- case "skinLinksTreeView": //Lista links predefiniti della skin
+ case ShowItemsType.SkinLinks: //Lista links predefiniti della skin
propertiesGroupBox.Text = propBoxText + " (Default Links)";
contextTextBox.Enabled= true;
- contextTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Context;
- captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Caption;
- skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].WindowID.ToString();
- loadParameterTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].LoadParameter;
+ contextTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].Context;
+ captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].Caption;
+ skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[index].XmlFile;
+ windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[index].WindowID.ToString();
+ loadParameterTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].LoadParameter;
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundImage.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundImage.Length > 0)
{
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundImage;
}
else
{
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundFolder.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundFolder.Length > 0)
{
multiImageRadioButton.Checked = true;
- multiImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundFolder;
+ multiImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundFolder;
}
else
{
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].FanartHandler.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].FanartHandler.Length > 0)
{
fanartRadioButton.Checked = true;
- fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].FanartHandler));
+ fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMediaPortal.SelectedSkin.SkinLinks[index].FanartHandler));
}
}
}
iconComboBox.Text = "";
overlayGroupBox.Enabled = true;
- overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay));
+ overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[index].Overlay));
propLeftPictureBox.Visible = true;
propRightPictureBox.Visible = false;
menuRowAddButton.Visible = true;
subMenuRowAddButton.Visible = true;
menuRowEditButton.Visible = false;
subMenuRowEditButton.Visible = false;
- skinLinksTreeView.BackColor = Color.Aquamarine;
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
subMenuListBox.BackColor = Color.White;
break;
- case "menuListBox": //Lista elementi di menu
+ case ShowItemsType.MenuItems: //Lista elementi di menu
propertiesGroupBox.Text = propBoxText + " (Menu)";
contextTextBox.Enabled= true;
- contextTextBox.Text = myMenu.Items[selectedIndex].Context;
- captionTextBox.Text = myMenu.Items[selectedIndex].Caption;
- skinFileShowLabel.Text = myMenu.Items[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMenu.Items[selectedIndex].Hyperlink.ToString();
- loadParameterTextBox.Text = myMenu.Items[selectedIndex].HyperlinkParameter;
+ contextTextBox.Text = myMenu.Items[index].Context;
+ captionTextBox.Text = myMenu.Items[index].Caption;
+ skinFileShowLabel.Text = myMenu.Items[index].XmlFile;
+ windowIdShowLabel.Text = myMenu.Items[index].Hyperlink.ToString();
+ loadParameterTextBox.Text = myMenu.Items[index].HyperlinkParameter;
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
- if (myMenu.Items[selectedIndex].BackgroundImage.Length > 0)
+ if (myMenu.Items[index].BackgroundImage.Length > 0)
{
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMenu.Items[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMenu.Items[index].BackgroundImage;
}
else
{
- if (myMenu.Items[selectedIndex].BackgroundFolder.Length > 0)
+ if (myMenu.Items[index].BackgroundFolder.Length > 0)
{
multiImageRadioButton.Checked = true;
- multiImageComboBox.Text = myMenu.Items[selectedIndex].BackgroundFolder;
+ multiImageComboBox.Text = myMenu.Items[index].BackgroundFolder;
}
else
{
- if (myMenu.Items[selectedIndex].FanartHandler.Length > 0)
+ if (myMenu.Items[index].FanartHandler.Length > 0)
{
fanartRadioButton.Checked = true;
- fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMenu.Items[selectedIndex].FanartHandler));
+ fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMenu.Items[index].FanartHandler));
}
}
}
- iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[selectedIndex].Icon);
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[index].Icon);
overlayGroupBox.Enabled = true;
- overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay));
+ overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[index].Overlay));
propLeftPictureBox.Visible = false;
propRightPictureBox.Visible = true;
menuRowAddButton.Visible = false;
@@ -233,27 +224,26 @@
subMenuRowEditButton.Visible = false;
menuListBox.BackColor = Color.Aquamarine;
subMenuListBox.BackColor = Color.White;
- skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227);
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.FromArgb(213, 220, 227);
break;
- case "subMenuListBox": //Lista elementi di sotto-menu
+ case ShowItemsType.SubMenuItems: //Lista elementi di sotto-menu
if (menuListBox.SelectedIndex < 0)
return;
propertiesGroupBox.Text = propBoxText + " (Sub Menu)";
contextTextBox.Enabled = false;
contextTextBox.Text = "";
- captionTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Caption;
- skinFileShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Hyperlink.ToString();
- loadParameterTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].HyperlinkParameter;
+ 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();
+ loadParameterTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].HyperlinkParameter;
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].BackgroundImage;
multiImageComboBox.SelectedIndex = 0;
multiImageRadioButton.Enabled = false;
fanartComboBox.SelectedIndex = 0;
fanartRadioButton.Enabled = false;
- iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Icon);
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Icon);
overlayGroupBox.Enabled = false;
overlayComboBox.SelectedIndex = 0;
propLeftPictureBox.Visible = false;
@@ -264,8 +254,7 @@
subMenuRowEditButton.Visible = true;
subMenuListBox.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
- skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227);
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.FromArgb(213, 220, 227);
break;
}
@@ -537,7 +526,7 @@
}
private void BHEditorForm_Shown(object sender, EventArgs e)
{
- skinLinksTreeView.Focus();
+ skinItems.Focus();
}
private void BHEditorForm_FormClosing(object sender, FormClosingEventArgs e)
{
@@ -552,36 +541,14 @@
}
#endregion
#region Eventi Liste Files & Links Skin
- private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinItems_Enter(object sender, EventArgs e)
{
- if (itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
+ ShowItemProperties((ShowItemsType)skinItems.SelectedTab, skinItems.SelectedIndex, skinItems.Focused);
}
- private void itemsTabControl_Click(object sender, EventArgs e)
+ private void skinItems_SelectedIndexChanged(object sender, EventArgs e)
{
- if (itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
+ ShowItemProperties((ShowItemsType)skinItems.SelectedTab, skinItems.SelectedIndex, skinItems.Focused);
}
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinFilesListBox_Enter(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
#endregion
#region Eventi Selezione Immagine(i) Background & Icona
private void singleImageRadioButton_CheckedChanged(object sender, EventArgs e)
@@ -736,7 +703,7 @@
{
subMenuArrowPictureBox.Top = 22 + ((menuListBox.SelectedIndex >= 0) ? menuListBox.SelectedIndex : 0) * menuListBox.ItemHeight;
ModifyMenuListButtonsEnable();
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
if (!movingItem)
{
updateNotifyTimer.Enabled = false;
@@ -745,12 +712,12 @@
}
private void menuListBox_Enter(object sender, EventArgs e)
{
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
}
private void subMenuListBox_SelectedIndexChanged(object sender, EventArgs e)
{
ModifyMenuListButtonsEnable();
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
if (!movingItem)
{
updateNotifyTimer.Enabled = false;
@@ -759,7 +726,7 @@
}
private void subMenuListBox_Enter(object sender, EventArgs e)
{
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
}
#endregion
#region Eventi Modifica Impostazioni Generali Menu
@@ -814,7 +781,7 @@
myMenu.Items.RemoveAt(index);
menuListBox.Focus();
menuListBox.SelectedIndex = ((index < myMenu.Items.Count) ? index : index-1);
- ShowItemProperties(menuListBox);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
ModifyMenuListButtonsEnable();
updateNotifyTimer.Enabled = false;
updateNotifyMenuPictureBox.Visible = false;
@@ -850,7 +817,7 @@
myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.RemoveAt(index);
subMenuListBox.Focus();
subMenuListBox.SelectedIndex = ((index < myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Count) ? index : index - 1);
- ShowItemProperties(subMenuListBox);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
ModifyMenuListButtonsEnable();
if (myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Count == 0)
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2014-03-01 18:05:25 UTC (rev 4768)
@@ -117,21 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="itemsTabControl.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="linksTabPage.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinLinksTreeView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinTabPage.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinFilesListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="multiImageFolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>183, 2</value>
</metadata>
@@ -357,6 +342,9 @@
<metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="skinItems.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-03-01 18:05:25 UTC (rev 4768)
@@ -84,6 +84,14 @@
<Compile Include="..\Common\Skin.cs">
<Link>Skin.cs</Link>
</Compile>
+ <Compile Include="..\Common\SkinItems.cs">
+ <Link>SkinItems.cs</Link>
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="..\Common\SkinItems.designer.cs">
+ <Link>SkinItems.designer.cs</Link>
+ <DependentUpon>SkinItems.cs</DependentUpon>
+ </Compile>
<Compile Include="..\Common\Tools.cs">
<Link>Tools.cs</Link>
</Compile>
@@ -105,6 +113,10 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="..\Common\SkinItems.resx">
+ <Link>SkinItems.resx</Link>
+ <DependentUpon>SkinItems.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="..\Common\VersionInfo.resx">
<Link>VersionInfo.resx</Link>
<DependentUpon>VersionInfo.cs</DependentUpon>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-28 16:54:49
|
Revision: 4767
http://sourceforge.net/p/mp-plugins/code/4767
Author: nicsergio
Date: 2014-02-28 16:54:44 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
-using System.Windows.Forms;
using System.Xml;
namespace My.Common
@@ -46,7 +44,6 @@
protected Folders _paths = new Folders(); //Percorsi
protected List<SkinFile> _skinFiles = new List<SkinFile>(); //Lista file della skin (con ID)
protected List<SkinLink> _skinLinks = new List<SkinLink>(); //Lista link predefiniti per la skin
- protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
protected bool _initialized; //Classe inizializzata
#endregion
@@ -61,23 +58,6 @@
_paths.Icons = _paths.Media + @"Icons\"; //--> eventuale percorso icone di menu della skin
_paths.Sounds = _paths.Skin + @"Sounds\"; //--> percorso effetto sonori skin
- //Lettura nomi delle immagini per il treeview dei link della skin incapsulate nell'eseguibile
- var resNames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains(".Resources.Images.TreeViewIcons."));
-
- _skinLinksImgs.ImageSize = new Size(24, 24);
- _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
- foreach (string resName in resNames) //Iterazione di caricamento immagini per treevie link della skin
- {
- try
- {
- //Chiave: nome immagine senza percorso
- string resKey = resName.Remove(0, resName.LastIndexOf("TreeViewIcons.") + "TreeViewIcons.".Length);
- //Aggiunta dell'immagine
- _skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
- }
- catch { }
- }
-
_initialized = GetSkinFiles(onlyMenuItems) && GetSkinLinks(onlyMenuItems); //--> raccolta file della skin (con ID) e link
}
#endregion
@@ -210,45 +190,7 @@
}
}
#endregion
-
- #region Metodi Pubblici
- public void FillTreeViewSkinLinks(TreeView treeView) //Riempimento treeview dei links per la skin
- {
- int i = 0;
- treeView.Nodes.Clear();
- treeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview
-
- TreeNode node = new TreeNode();
- foreach (SkinLink skLink in _skinLinks) //Iterazione di popolazione treeview
- {
- if (skLink.IsFather) //--> nodo padre
- node = treeView.Nodes.Add(i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- else //--> nodo figlio
- node.Nodes.Add( i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
- }
- }
- public int GetSkinLinkIndex(TreeView treeView) //Ottenimento indice link per la skin corrispondente a nodo selezionato nel treeview
- {
- if (treeView.SelectedNode != null)
- return Convert.ToInt32(treeView.SelectedNode.Name); //<-- indice nodo selezionato (chiave)
- else
- return -1; //<-- nessun nodo selezionato
-
- }
- public void SetSkinLinkIndex(TreeView treeView, int linkIndex) //Selezione nodo treeview corrispondente ad indice link per la skin
- {
- try
- {
- treeView.SelectedNode = ((linkIndex >= 0) ? treeView.Nodes.Find(linkIndex.ToString(), true)[0] : null);
- }
- catch
- {
- treeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
- }
- #endregion
-
+
#region Proprietà
public bool Initialized { get { return this._initialized; } }
public string SkinPath { get { return this._paths.Skin; } }
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Drawing;
-using System.Data;
using System.Linq;
-using System.Text;
using System.Windows.Forms;
using System.Reflection;
@@ -86,16 +83,16 @@
internal void SetIndex(int index)
{
if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ {
+ try
{
- try
- {
- skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
- }
- catch
- {
- skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
+ skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
}
+ catch
+ {
+ skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
+ }
+ }
else
skinFilesListBox.SelectedIndex = index; //--> selezione eventuale file corrispondente a WindowID
}
@@ -162,5 +159,9 @@
//Indice nodo selezionato TreeView --> corrispondente a chiave)
DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
}
+
+
+ public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } }
+
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -176,21 +176,20 @@
{
if (!forceCell) //Non nel caso di forzatura valore cella WindowID (doppio click da lista links)
{
- /*
int showIndex;
int windowID = Convert.ToInt32(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value);
- if (itemsTabControl.SelectedIndex == 0)
+
+ if (skinItems.SelectedTab == SkinItems.SkinItemsType.Links)
{
+ //Selezione eventuale link corrispondente a WindowID & LoadParameter
string loadParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value);
showIndex = mySkin.SkinLinks.FindIndex(x => x.WindowID == windowID && x.LoadParameter == loadParameter);
- mySkin.SetSkinLinkIndex(skinLinksTreeView, showIndex); //--> selezione eventuale link corrispondente a WindowID & LoadParameter
}
else
- {
+ //Selezione eventuale file corrispondente a WindowID
showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID);
- skinFilesListBox.SelectedIndex = showIndex; //--> selezione eventuale file corrispondente a WindowID
- }
- */
+
+ skinItems.SetIndex(showIndex);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-27 16:42:16
|
Revision: 4766
http://sourceforge.net/p/mp-plugins/code/4766
Author: nicsergio
Date: 2014-02-27 16:42:14 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-24 19:38:41 UTC (rev 4765)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-27 16:42:14 UTC (rev 4766)
@@ -19,10 +19,10 @@
//Lettura nomi delle immagini per il treeview dei link della skin incapsulate nell'eseguibile
- //var resNames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains(".Resources.Images.TreeViewIcons."));
+ var resNames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains(".Resources.Images.TreeViewIcons."));
//Impostazione spazio dei nomi predefinito
//DefaultNamespace = resNames.ElementAt(0).Substring(0, resNames.ElementAt(0).IndexOf(".Resource"));
- /*
+
_skinLinksImgs.ImageSize = new Size(24, 24);
_skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
foreach (string resName in resNames) //Iterazione di caricamento immagini per treevie link della skin
@@ -35,7 +35,7 @@
_skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
}
catch { }
- }*/
+ }
}
public delegate void ItemChanged(SkinItemsType itemType, int index);
@@ -82,6 +82,24 @@
skinLinksTreeView.ExpandAll();
}
+
+ internal void SetIndex(int index)
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ {
+ try
+ {
+ skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
+ }
+ catch
+ {
+ skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
+ }
+ }
+ else
+ skinFilesListBox.SelectedIndex = index; //--> selezione eventuale file corrispondente a WindowID
+ }
+
private void SkinItemsControl_Load(object sender, EventArgs e)
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 19:38:41 UTC (rev 4765)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-27 16:42:14 UTC (rev 4766)
@@ -478,8 +478,5 @@
return false;
}
#endregion
-
-
-
}
}
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.
