Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4912] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2015-01-10 14:12:37
|
Revision: 4912
http://sourceforge.net/p/mp-plugins/code/4912
Author: nicsergio
Date: 2015-01-10 14:12:34 +0000 (Sat, 10 Jan 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2015-01-10 14:12:34 UTC (rev 4912)
@@ -539,6 +539,21 @@
</SubItem>
<SubItem>
+ <Context>LISTEN TO</Context>
+ <Caption>MUSIC FULLSCREEN</Caption>
+ <XmlFile>musicFullScreen</XmlFile>
+ <WindowID>511</WindowID>
+ <LoadParameter></LoadParameter>
+ <BackgroundImage></BackgroundImage>
+ <BackgroundFolder>music</BackgroundFolder>
+ <FanartHandler></FanartHandler>
+ <Icon></Icon>
+ <Overlay></Overlay>
+ <IconList>Fullscreen.png</IconList>
+ <Menu>False</Menu>
+ </SubItem>
+
+ <SubItem>
<Context>CONFIGURE</Context>
<Caption>MUSIC SETTINGS</Caption>
<XmlFile>settings_MyMusic</XmlFile>
@@ -654,6 +669,21 @@
<SubItem>
<Context>WATCH</Context>
+ <Caption>ONLINE VIDEOS FULLSCREEN</Caption>
+ <XmlFile>myonlinevideosFullScreen</XmlFile>
+ <WindowID>4758</WindowID>
+ <LoadParameter></LoadParameter>
+ <BackgroundImage>hover_OnlineVideos.png</BackgroundImage>
+ <BackgroundFolder></BackgroundFolder>
+ <FanartHandler></FanartHandler>
+ <Icon></Icon>
+ <Overlay></Overlay>
+ <IconList>Fullscreen.png</IconList>
+ <Menu>False</Menu>
+ </SubItem>
+
+ <SubItem>
+ <Context>WATCH</Context>
<Caption>YOUTUBE</Caption>
<XmlFile>myonlinevideos</XmlFile>
<WindowID>4755</WindowID>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/ShortCuterConfig.cs 2015-01-10 14:12:34 UTC (rev 4912)
@@ -1,12 +1,12 @@
using System;
using System.ComponentModel;
using System.Drawing;
+using System.Linq;
using System.Windows.Forms;
using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
using MediaPortal.Profile;
using My.Common;
-using System.Linq;
namespace ShortCuter.Configuration
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.Designer.cs 2015-01-10 14:12:34 UTC (rev 4912)
@@ -129,7 +129,7 @@
this.headerGroupBox.Size = new System.Drawing.Size(158, 51);
this.headerGroupBox.TabIndex = 0;
this.headerGroupBox.TabStop = false;
- this.headerGroupBox.Text = "Header title";
+ this.headerGroupBox.Text = "Header Title";
//
// headerTextBox
//
@@ -163,7 +163,7 @@
this.dialogTypeGroupBox.Size = new System.Drawing.Size(201, 56);
this.dialogTypeGroupBox.TabIndex = 4;
this.dialogTypeGroupBox.TabStop = false;
- this.dialogTypeGroupBox.Text = "Window dialog type";
+ this.dialogTypeGroupBox.Text = "Window Dialog Type";
//
// dialogTypeComboBox
//
@@ -280,7 +280,7 @@
//
this.windowAddPictureBox.Enabled = false;
this.windowAddPictureBox.Image = global::ShortCuter.Properties.Resources.ArrowDown;
- this.windowAddPictureBox.Location = new System.Drawing.Point(286, 282);
+ this.windowAddPictureBox.Location = new System.Drawing.Point(279, 282);
this.windowAddPictureBox.Name = "windowAddPictureBox";
this.windowAddPictureBox.Size = new System.Drawing.Size(158, 132);
this.windowAddPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -293,7 +293,7 @@
this.windowAddButton.BackColor = System.Drawing.Color.Transparent;
this.windowAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.windowAddButton.Image = global::ShortCuter.Properties.Resources.SubRowAdd;
- this.windowAddButton.Location = new System.Drawing.Point(346, 320);
+ this.windowAddButton.Location = new System.Drawing.Point(339, 320);
this.windowAddButton.Name = "windowAddButton";
this.windowAddButton.Size = new System.Drawing.Size(38, 38);
this.windowAddButton.TabIndex = 11;
@@ -308,13 +308,13 @@
this.windowsGroupBox.Controls.Add(this.windowRemoveButton);
this.windowsGroupBox.Controls.Add(this.windowsListBox);
this.windowsGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold);
- this.windowsGroupBox.Location = new System.Drawing.Point(280, 389);
+ this.windowsGroupBox.Location = new System.Drawing.Point(250, 389);
this.windowsGroupBox.Name = "windowsGroupBox";
this.windowsGroupBox.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.windowsGroupBox.Size = new System.Drawing.Size(170, 288);
+ this.windowsGroupBox.Size = new System.Drawing.Size(216, 288);
this.windowsGroupBox.TabIndex = 13;
this.windowsGroupBox.TabStop = false;
- this.windowsGroupBox.Text = "Conditional windows";
+ this.windowsGroupBox.Text = "Conditional Windows";
//
// alwaysVisibleLabel
//
@@ -323,7 +323,7 @@
this.alwaysVisibleLabel.FlatStyle = System.Windows.Forms.FlatStyle.System;
this.alwaysVisibleLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.alwaysVisibleLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.alwaysVisibleLabel.Location = new System.Drawing.Point(26, 55);
+ this.alwaysVisibleLabel.Location = new System.Drawing.Point(47, 55);
this.alwaysVisibleLabel.Name = "alwaysVisibleLabel";
this.alwaysVisibleLabel.Size = new System.Drawing.Size(115, 15);
this.alwaysVisibleLabel.TabIndex = 41;
@@ -336,7 +336,7 @@
this.windowDownButton.AutoSize = true;
this.windowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.windowDownButton.Image = global::ShortCuter.Properties.Resources.SubRowDown;
- this.windowDownButton.Location = new System.Drawing.Point(126, 243);
+ this.windowDownButton.Location = new System.Drawing.Point(172, 244);
this.windowDownButton.Name = "windowDownButton";
this.windowDownButton.Size = new System.Drawing.Size(38, 38);
this.windowDownButton.TabIndex = 16;
@@ -348,7 +348,7 @@
this.windowUpButton.AutoSize = true;
this.windowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.windowUpButton.Image = global::ShortCuter.Properties.Resources.SubRowUp;
- this.windowUpButton.Location = new System.Drawing.Point(86, 243);
+ this.windowUpButton.Location = new System.Drawing.Point(132, 244);
this.windowUpButton.Name = "windowUpButton";
this.windowUpButton.Size = new System.Drawing.Size(38, 38);
this.windowUpButton.TabIndex = 15;
@@ -374,7 +374,7 @@
this.windowsListBox.FormattingEnabled = true;
this.windowsListBox.Location = new System.Drawing.Point(6, 25);
this.windowsListBox.Name = "windowsListBox";
- this.windowsListBox.Size = new System.Drawing.Size(158, 212);
+ this.windowsListBox.Size = new System.Drawing.Size(204, 212);
this.windowsListBox.TabIndex = 13;
this.windowsListBox.SelectedIndexChanged += new System.EventHandler(this.windowsListBox_SelectedIndexChanged);
this.windowsListBox.Enter += new System.EventHandler(this.windowsListBox_Enter);
@@ -392,19 +392,19 @@
this.destinationsGroupBox.Controls.Add(this.destinationRemoveButton);
this.destinationsGroupBox.Controls.Add(this.destinationsListBox);
this.destinationsGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold);
- this.destinationsGroupBox.Location = new System.Drawing.Point(490, 389);
+ this.destinationsGroupBox.Location = new System.Drawing.Point(470, 389);
this.destinationsGroupBox.Name = "destinationsGroupBox";
this.destinationsGroupBox.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.destinationsGroupBox.Size = new System.Drawing.Size(480, 288);
+ this.destinationsGroupBox.Size = new System.Drawing.Size(532, 288);
this.destinationsGroupBox.TabIndex = 17;
this.destinationsGroupBox.TabStop = false;
- this.destinationsGroupBox.Text = "Available destinations";
+ this.destinationsGroupBox.Text = "Available Destinations";
//
// destinationForceCheckBox
//
this.destinationForceCheckBox.AutoSize = true;
this.destinationForceCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.destinationForceCheckBox.Location = new System.Drawing.Point(360, 106);
+ this.destinationForceCheckBox.Location = new System.Drawing.Point(410, 106);
this.destinationForceCheckBox.Name = "destinationForceCheckBox";
this.destinationForceCheckBox.Size = new System.Drawing.Size(107, 17);
this.destinationForceCheckBox.TabIndex = 23;
@@ -415,12 +415,12 @@
// destinationLoadParameterGroupBox
//
this.destinationLoadParameterGroupBox.Controls.Add(this.destinationLoadParameterTextBox);
- this.destinationLoadParameterGroupBox.Location = new System.Drawing.Point(172, 133);
+ this.destinationLoadParameterGroupBox.Location = new System.Drawing.Point(222, 133);
this.destinationLoadParameterGroupBox.Name = "destinationLoadParameterGroupBox";
this.destinationLoadParameterGroupBox.Size = new System.Drawing.Size(302, 51);
this.destinationLoadParameterGroupBox.TabIndex = 24;
this.destinationLoadParameterGroupBox.TabStop = false;
- this.destinationLoadParameterGroupBox.Text = "Load parameter";
+ this.destinationLoadParameterGroupBox.Text = "Load Parameter";
//
// destinationLoadParameterTextBox
//
@@ -436,7 +436,7 @@
// destinationWindowIdGroupBox
//
this.destinationWindowIdGroupBox.Controls.Add(this.destinationWindowIdTextBox);
- this.destinationWindowIdGroupBox.Location = new System.Drawing.Point(172, 79);
+ this.destinationWindowIdGroupBox.Location = new System.Drawing.Point(222, 79);
this.destinationWindowIdGroupBox.Name = "destinationWindowIdGroupBox";
this.destinationWindowIdGroupBox.Size = new System.Drawing.Size(144, 51);
this.destinationWindowIdGroupBox.TabIndex = 22;
@@ -457,7 +457,7 @@
// destinationLabelGroupBox
//
this.destinationLabelGroupBox.Controls.Add(this.destinationTextBox);
- this.destinationLabelGroupBox.Location = new System.Drawing.Point(172, 25);
+ this.destinationLabelGroupBox.Location = new System.Drawing.Point(222, 25);
this.destinationLabelGroupBox.Name = "destinationLabelGroupBox";
this.destinationLabelGroupBox.Size = new System.Drawing.Size(302, 51);
this.destinationLabelGroupBox.TabIndex = 21;
@@ -480,7 +480,7 @@
this.destinationIconGroupBox.Controls.Add(this.destinationIconPictureBox);
this.destinationIconGroupBox.Controls.Add(this.destinationIconComboBox);
this.destinationIconGroupBox.Controls.Add(this.destinationIconBrowseButton);
- this.destinationIconGroupBox.Location = new System.Drawing.Point(170, 187);
+ this.destinationIconGroupBox.Location = new System.Drawing.Point(222, 187);
this.destinationIconGroupBox.Name = "destinationIconGroupBox";
this.destinationIconGroupBox.Size = new System.Drawing.Size(302, 94);
this.destinationIconGroupBox.TabIndex = 25;
@@ -525,7 +525,7 @@
this.destinationDownButton.AutoSize = true;
this.destinationDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.destinationDownButton.Image = global::ShortCuter.Properties.Resources.SubRowDown;
- this.destinationDownButton.Location = new System.Drawing.Point(126, 243);
+ this.destinationDownButton.Location = new System.Drawing.Point(172, 243);
this.destinationDownButton.Name = "destinationDownButton";
this.destinationDownButton.Size = new System.Drawing.Size(38, 38);
this.destinationDownButton.TabIndex = 20;
@@ -537,7 +537,7 @@
this.destinationUpButton.AutoSize = true;
this.destinationUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.destinationUpButton.Image = global::ShortCuter.Properties.Resources.SubRowUp;
- this.destinationUpButton.Location = new System.Drawing.Point(86, 243);
+ this.destinationUpButton.Location = new System.Drawing.Point(132, 243);
this.destinationUpButton.Name = "destinationUpButton";
this.destinationUpButton.Size = new System.Drawing.Size(38, 38);
this.destinationUpButton.TabIndex = 19;
@@ -563,7 +563,7 @@
this.destinationsListBox.FormattingEnabled = true;
this.destinationsListBox.Location = new System.Drawing.Point(6, 25);
this.destinationsListBox.Name = "destinationsListBox";
- this.destinationsListBox.Size = new System.Drawing.Size(158, 212);
+ this.destinationsListBox.Size = new System.Drawing.Size(204, 212);
this.destinationsListBox.TabIndex = 17;
this.destinationsListBox.SelectedIndexChanged += new System.EventHandler(this.destinationsListBox_SelectedIndexChanged);
this.destinationsListBox.Enter += new System.EventHandler(this.destinationsListBox_Enter);
@@ -586,20 +586,20 @@
this.groupPropertiesShape.CornerRadius = 4;
this.groupPropertiesShape.Enabled = false;
this.groupPropertiesShape.FillColor = System.Drawing.SystemColors.ControlLight;
- this.groupPropertiesShape.Location = new System.Drawing.Point(253, 380);
+ this.groupPropertiesShape.Location = new System.Drawing.Point(246, 380);
this.groupPropertiesShape.Name = "groupPropertiesShape";
- this.groupPropertiesShape.Size = new System.Drawing.Size(745, 339);
+ this.groupPropertiesShape.Size = new System.Drawing.Size(759, 339);
//
// groupPropertiesLabel
//
this.groupPropertiesLabel.AutoSize = true;
this.groupPropertiesLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold);
this.groupPropertiesLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.groupPropertiesLabel.Location = new System.Drawing.Point(851, 371);
+ this.groupPropertiesLabel.Location = new System.Drawing.Point(862, 371);
this.groupPropertiesLabel.Name = "groupPropertiesLabel";
- this.groupPropertiesLabel.Size = new System.Drawing.Size(119, 15);
+ this.groupPropertiesLabel.Size = new System.Drawing.Size(120, 15);
this.groupPropertiesLabel.TabIndex = 40;
- this.groupPropertiesLabel.Text = "Group properties:";
+ this.groupPropertiesLabel.Text = "Group Properties:";
this.groupPropertiesLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// destinationAddButton
@@ -608,7 +608,7 @@
this.destinationAddButton.BackColor = System.Drawing.Color.Transparent;
this.destinationAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.destinationAddButton.Image = global::ShortCuter.Properties.Resources.SubRowAdd;
- this.destinationAddButton.Location = new System.Drawing.Point(556, 320);
+ this.destinationAddButton.Location = new System.Drawing.Point(559, 320);
this.destinationAddButton.Name = "destinationAddButton";
this.destinationAddButton.Size = new System.Drawing.Size(38, 38);
this.destinationAddButton.TabIndex = 12;
@@ -619,7 +619,7 @@
//
this.destinationAddPictureBox.Enabled = false;
this.destinationAddPictureBox.Image = global::ShortCuter.Properties.Resources.ArrowDown;
- this.destinationAddPictureBox.Location = new System.Drawing.Point(496, 282);
+ this.destinationAddPictureBox.Location = new System.Drawing.Point(499, 282);
this.destinationAddPictureBox.Name = "destinationAddPictureBox";
this.destinationAddPictureBox.Size = new System.Drawing.Size(158, 132);
this.destinationAddPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -630,9 +630,9 @@
//
this.groupTextBox.BackColor = System.Drawing.SystemColors.Window;
this.groupTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupTextBox.Location = new System.Drawing.Point(380, 687);
+ this.groupTextBox.Location = new System.Drawing.Point(470, 689);
this.groupTextBox.Name = "groupTextBox";
- this.groupTextBox.Size = new System.Drawing.Size(274, 20);
+ this.groupTextBox.Size = new System.Drawing.Size(210, 20);
this.groupTextBox.TabIndex = 27;
this.groupTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.groupTextBox.TextChanged += new System.EventHandler(this.groupTextBox_TextChanged);
@@ -641,11 +641,11 @@
//
this.groupLabel.AutoSize = true;
this.groupLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupLabel.Location = new System.Drawing.Point(283, 690);
+ this.groupLabel.Location = new System.Drawing.Point(378, 689);
this.groupLabel.Name = "groupLabel";
- this.groupLabel.Size = new System.Drawing.Size(86, 15);
+ this.groupLabel.Size = new System.Drawing.Size(90, 15);
this.groupLabel.TabIndex = 27;
- this.groupLabel.Text = "Group label:";
+ this.groupLabel.Text = "Group Label:";
this.groupLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// linkPropertiesGroupBox
@@ -654,7 +654,7 @@
this.linkPropertiesGroupBox.Controls.Add(this.windowIdGroupBox);
this.linkPropertiesGroupBox.Controls.Add(this.skinFileGroupBox);
this.linkPropertiesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.linkPropertiesGroupBox.Location = new System.Drawing.Point(679, 28);
+ this.linkPropertiesGroupBox.Location = new System.Drawing.Point(686, 28);
this.linkPropertiesGroupBox.Name = "linkPropertiesGroupBox";
this.linkPropertiesGroupBox.Size = new System.Drawing.Size(320, 175);
this.linkPropertiesGroupBox.TabIndex = 40;
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Configuration/SkinNavigatorConfig.cs 2015-01-10 14:12:34 UTC (rev 4912)
@@ -1,8 +1,8 @@
-using System.Windows.Forms;
-using System.Drawing;
-using My.Common;
+using System.Drawing;
using System.IO;
using System.Linq;
+using System.Windows.Forms;
+using My.Common;
namespace ShortCuter.Configuration
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2015-01-10 14:12:34 UTC (rev 4912)
@@ -199,7 +199,7 @@
<ShowSeparator>1</ShowSeparator>
<ShowNumbers>0</ShowNumbers>
<RemoveDuplicates>1</RemoveDuplicates>
- <DialogType>CustomList</DialogType>
+ <DialogType>DefaultDialog</DialogType>
</General>
<Items>
<Item>
@@ -263,6 +263,10 @@
<WindowID>25</WindowID>
</Window>
<Window>
+ <Caption>[ID=4755] ONLINE VIDEOS</Caption>
+ <WindowID>4755</WindowID>
+ </Window>
+ <Window>
<Caption>[ID=7111992] SHOWTIMES</Caption>
<WindowID>7111992</WindowID>
</Window>
@@ -271,17 +275,17 @@
<WindowID>87258</WindowID>
</Window>
<Window>
+ <Caption>[ID=703] VIDEO SETTINGS</Caption>
+ <WindowID>703</WindowID>
+ </Window>
+ <Window>
<Caption>[ID=2005] VIDEOS FULLSCREEN</Caption>
<WindowID>2005</WindowID>
</Window>
<Window>
- <Caption>[ID=4755] ONLINE VIDEOS</Caption>
- <WindowID>4755</WindowID>
+ <Caption>[ID=4758] ONLINE VIDEOS FULLSCREEN</Caption>
+ <WindowID>4758</WindowID>
</Window>
- <Window>
- <Caption>[ID=703] VIDEO SETTINGS</Caption>
- <WindowID>703</WindowID>
- </Window>
</Windows>
<Destinations>
<Destination>
@@ -306,13 +310,6 @@
<Icon>ShortCuter\MyFilms.png</Icon>
</Destination>
<Destination>
- <Caption>VIDEOS (DB)</Caption>
- <WindowID>25</WindowID>
- <LoadParameter />
- <Force>0</Force>
- <Icon>ShortCuter\Movies.png</Icon>
- </Destination>
- <Destination>
<Caption>SHOWTIMES</Caption>
<WindowID>7111992</WindowID>
<LoadParameter />
@@ -391,13 +388,13 @@
<WindowID>7700</WindowID>
</Window>
<Window>
+ <Caption>[ID=700] TV SETTINGS</Caption>
+ <WindowID>700</WindowID>
+ </Window>
+ <Window>
<Caption>[ID=602] TV FULLSCREEN</Caption>
<WindowID>602</WindowID>
</Window>
- <Window>
- <Caption>[ID=700] TV SETTINGS</Caption>
- <WindowID>700</WindowID>
- </Window>
</Windows>
<Destinations>
<Destination>
@@ -475,6 +472,10 @@
<Caption>[ID=14] MUSIC SETTINGS</Caption>
<WindowID>14</WindowID>
</Window>
+ <Window>
+ <Caption>[ID=511] MUSIC FULLSCREEN</Caption>
+ <WindowID>511</WindowID>
+ </Window>
</Windows>
<Destinations>
<Destination>
@@ -506,13 +507,6 @@
<Icon>ShortCuter\MyLyrics.png</Icon>
</Destination>
<Destination>
- <Caption>MUSIC (DB)</Caption>
- <WindowID>504</WindowID>
- <LoadParameter />
- <Force>0</Force>
- <Icon>ShortCuter\Music.png</Icon>
- </Destination>
- <Destination>
<Caption>RADIO</Caption>
<WindowID>30</WindowID>
<LoadParameter />
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2015-01-09 18:01:50 UTC (rev 4911)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2015-01-10 14:12:34 UTC (rev 4912)
@@ -143,6 +143,7 @@
}
public void Reset() //Reset destinazione (invalidazione)
{
+ _caption = string.Empty; //--> reset titolo link
_windowID = InvalidID; //--> invalidazione Id finestra
_loadParameter = string.Empty; //--> reset parametri di caricamento
}
@@ -407,7 +408,7 @@
#endregion
#region Metodi Pubblici
- public override string ToString() { return (base.Caption); } //Nuovo metodo ToString per riempire classi ListControl
+ public override string ToString() { return (base.Caption); } //Override metodo ToString per riempire classi ListControl
#endregion
#region Proprietà
@@ -496,10 +497,12 @@
}
dlg.ShowQuickNumbers = _general.ShowNumbers; //--> visualizzazione numeri per accesso diretto
+ Item.Destination nullDst = new Item.Destination();
+ nullDst.Reset(); //--> creazione destinazione invalida (appoggio per separatore gruppi)
for (int i = 0; i < destinations.Count; i++) //Iterazione per popolamento lista
{
- if (destinations[i] != null)
+ if (destinations[i] != null && destinations[i].IsValid)
{
GUIListItem lstItem = new GUIListItem(destinations[i].Caption); //--> creazione elemento GUIListItem
lstItem.IconImage = destinations[i].Icon; //--> percorso eventuale icona destinazione (visualizzazione lista)
@@ -517,7 +520,7 @@
for (int ii = 0; ((mIndex + ii) % navDlg.PanelRowIcons) != 0; ii++) //Iterazione di aggiunta elementi vuoti per forzare una nuova riga
{
dlg.Add(string.Empty); //--> aggiunta riquadro vuoto
- destinations.Insert(mIndex, null); //--> inserzione elemento nullo per mantenere sincronizzati gli indici delle destinazioni con gli elementi selezionabili
+ destinations.Insert(mIndex, nullDst); //--> inserzione destinazione invalida per mantenere sincronizzati gli indici delle destinazioni con gli elementi selezionabili
i++; //--> adeguamento indice per inserzione elemento
}
}
@@ -532,7 +535,7 @@
if (dlg.SelectedLabel >= 0 && dlg.SelectedLabel < destinations.Count)
return destinations[dlg.SelectedLabel]; //--> ritorno destinazione selezionata
else
- return null; //--> nessun elemento selezionato
+ return nullDst; //--> nessun elemento selezionato (destinazione invalida)
}
#endregion
@@ -679,6 +682,9 @@
{
int actWindowID = GUIWindowManager.ActiveWindow; //--> id finestra attuale
+ Item.Destination nullDst = new Item.Destination();
+ nullDst.Reset(); //--> creazione destinazione invalida (appoggio per separatore gruppi)
+
List<Item.Destination> dlgDst = new List<Item.Destination>(); //--> lista destinazioni corrispondenti agli elementi da visualizzare nel menu di dialogo
foreach (Item item in _items) //Iterazione per valutazione elementi di navigazione impostati
{
@@ -690,7 +696,7 @@
if ((dlgDst.Find(x => x.WindowID == dst.WindowID && x.LoadParameter == dst.LoadParameter) == null || !_general.RemoveDuplicates) && (dst.WindowID != actWindowID || dst.Force))
{ //Controllo destinazione duplicata o corrispondente a finestra attuale
if (_general.ShowSeparator && first && dlgDst.Count > 0) //Eventuale inserzione separatore destinazioni
- dlgDst.Add(null); //--> elemento nullo corrisponde a separatore
+ dlgDst.Add(nullDst); //--> aggiunta destinazione invalida corrispondente a separatore
dlgDst.Add(dst); //--> aggiunta destinazione corrispondente
first = false;
}
@@ -700,10 +706,13 @@
if (dlgDst.Count > 0) //Se raccolta almeno una destinazione da proporre
{
- WindowLink selectedLnk = ShowMenuDialog(dlgDst); //--> visualizzazione finestra di dialogo per navigazione
- if (selectedLnk != null)
+ //Visualizzazione finestra di dialogo per navigazione (e ritorno eventuale destinazione selezionata, se non selezionato niente: destinazione invalida)
+ WindowLink selectedLnk = new WindowLink().GetData((WindowLink)ShowMenuDialog(dlgDst));
+ if (selectedLnk != null && selectedLnk.IsValid)
+ {
if (selectedLnk.Go(Log)) //--> attivazione destinazione selezionata
return selectedLnk; //--> ritorno destinazione attivata
+ }
else
if (Log != null)
Log(this, new LogEventArgs(LogEventArgs.LogLevels.Info, "No links selected from Skin Navigator dialog menu, WindowID=" + actWindowID));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
