Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4673] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2013-11-09 19:35:45
|
Revision: 4673
http://sourceforge.net/p/mp-plugins/code/4673
Author: nicsergio
Date: 2013-11-09 19:35:41 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.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/MediaPortal.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -20,8 +20,9 @@
{
public string Skin; //Percorso della skin
public string Cache; //Percorso cache della skin
- public string Media; //Percorso dati multimediali della skin
- public string Animations; //Percorso animazioni della skin
+ public string Media; //Percorso file multimediali della skin
+ public string Animations; //Percorso per animazioni (multi-image) della skin
+ public string Icons; //Eventuale percorso icone di menu della skin
public string Sounds; //Percorso effetti sonori
}
public class SkinFile //Classe file della skin (con ID)
@@ -60,7 +61,8 @@
_paths.Skin = skinsPath + Name + @"\"; //--> percorso skin
_paths.Cache = cachesPath + Name + @"\"; //--> percorso cache skin
_paths.Media = _paths.Skin + @"Media\"; //--> percorso file multimediali skin
- _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multiimage) skin
+ _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multi-image) skin
+ _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
@@ -254,6 +256,7 @@
public string CachePath { get { return this._paths.Cache; } }
public string MediaPath { get { return this._paths.Media; } }
public string AnimationsPath { get { return this._paths.Animations; } }
+ public string IconsPath { get { return this._paths.Icons; } }
public string SoundsPath { get { return this._paths.Sounds; } }
public List<SkinFile> SkinFiles { get { return this._skinFiles; } }
public List<SkinLink> SkinLinks { get { return this._skinLinks; } }
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -74,8 +74,8 @@
this.saveButton = new System.Windows.Forms.Button();
this.generalGroupBox = new System.Windows.Forms.GroupBox();
this.multiImageTimeGroupBox = new System.Windows.Forms.GroupBox();
+ this.multiIMageTimeLabel = new System.Windows.Forms.Label();
this.multiImageTimeSecLabel = new System.Windows.Forms.Label();
- this.multiIMageTimeLabel = 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();
@@ -245,16 +245,14 @@
//
// iconPictureBox
//
- this.iconPictureBox.BackColor = System.Drawing.Color.Transparent;
- this.iconPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ 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(9, 22);
+ 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;
- this.iconPictureBox.Visible = false;
//
// iconComboBox
//
@@ -264,6 +262,7 @@
this.iconComboBox.Name = "iconComboBox";
this.iconComboBox.Size = new System.Drawing.Size(164, 21);
this.iconComboBox.TabIndex = 17;
+ this.iconComboBox.TextChanged += new System.EventHandler(this.iconComboBox_TextChanged);
//
// iconBrowseButton
//
@@ -274,6 +273,7 @@
this.iconBrowseButton.TabIndex = 16;
this.iconBrowseButton.Text = "Browse";
this.iconBrowseButton.UseVisualStyleBackColor = true;
+ this.iconBrowseButton.Click += new System.EventHandler(this.iconBrowseButton_Click);
//
// loadParameterTextBox
//
@@ -630,6 +630,16 @@
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;
@@ -641,16 +651,6 @@
this.multiImageTimeSecLabel.Text = "\"";
this.multiImageTimeSecLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
- // 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;
- //
// multiImageTimeTrackBar
//
this.multiImageTimeTrackBar.Location = new System.Drawing.Point(6, 19);
@@ -952,7 +952,7 @@
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(1019, 592);
+ this.ClientSize = new System.Drawing.Size(1019, 608);
this.Controls.Add(this.menuPanel);
this.Controls.Add(this.propertiesPanel);
this.Controls.Add(this.infoPictureBox);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -42,6 +42,7 @@
singleImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgImages;
multiImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgFolders;
fanartComboBox.DataSource = myMediaPortal.FanartTypes;
+ iconComboBox.DataSource = myMediaPortal.SelectedSkin.SkinMenuIcons;
overlayComboBox.DataSource = myMediaPortal.SelectedSkin.SkinOverlays;
menuListBox.DataSource = myMenu.Items;
menuListBox.SelectedIndex = 0;
@@ -112,6 +113,7 @@
singleImageRadioButton.Checked = true;
singleImageComboBox.Text = "hover_extensions.png";
fanartComboBox.SelectedIndex = 0;
+ iconComboBox.Text = "";
overlayGroupBox.Enabled = true;
overlayComboBox.SelectedIndex = 0;
propLeftPictureBox.Visible = true;
@@ -152,6 +154,7 @@
}
}
+ iconComboBox.Text = "";
overlayGroupBox.Enabled = true;
overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay));
propLeftPictureBox.Visible = true;
@@ -192,6 +195,7 @@
}
}
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[selectedIndex].Icon);
overlayGroupBox.Enabled = true;
overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay));
propLeftPictureBox.Visible = false;
@@ -234,7 +238,7 @@
}
}
-
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Icon);
overlayGroupBox.Enabled = false;
overlayComboBox.SelectedIndex = 0;
propLeftPictureBox.Visible = false;
@@ -270,6 +274,8 @@
try { backgroundPictureBox.LoadAsync(bgImageName); }
catch { }
}
+ else
+ backgroundPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.BackgroundError;
}
else
if (multiImageRadioButton.Checked) //Caso di cartella di animazione (multi-immagine)
@@ -392,6 +398,7 @@
else
if (fanartRadioButton.Checked)
mItem.FanartHandler = myMediaPortal.GetFanartValue(fanartComboBox.Text);
+ mItem.Icon = myMediaPortal.SelectedSkin.GetMenuIconPath(iconComboBox.Text);
mItem.Overlay = myMediaPortal.SelectedSkin.GetOverlayValue(overlayComboBox.Text);
if (edit) //Caso di editazione: rimozione ed re-inserimento elemento
{
@@ -431,6 +438,7 @@
else
if (fanartRadioButton.Checked)
smItem.FanartHandler = myMediaPortal.GetFanartValue(fanartComboBox.Text);
+ smItem.Icon = myMediaPortal.SelectedSkin.GetMenuIconPath(iconComboBox.Text);
if (edit) //Caso di editazione: rimozione ed re-inserimento elemento
{
int index = subMenuListBox.SelectedIndex;
@@ -547,7 +555,7 @@
ShowItemProperties(sender);
}
#endregion
- #region Eventi Selezione Immagine(i) Background
+ #region Eventi Selezione Immagine(i) Background & Icona
private void singleImageRadioButton_CheckedChanged(object sender, EventArgs e)
{
if (showingProperties)
@@ -595,8 +603,21 @@
}
}
}
+ private void iconBrowseButton_Click(object sender, EventArgs e)
+ {
+ iconOpenFileDialog.InitialDirectory = myMediaPortal.SelectedSkin.IconsPath;
+ if (iconOpenFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ if (iconOpenFileDialog.FileName.Length > 0)
+ {
+ if (iconOpenFileDialog.FileName.ToLower().StartsWith(myMediaPortal.SelectedSkin.IconsPath.ToLower()))
+ iconOpenFileDialog.FileName = iconOpenFileDialog.FileName.Remove(0, myMediaPortal.SelectedSkin.IconsPath.Length);
+ iconComboBox.Text = iconOpenFileDialog.FileName;
+ }
+ }
+ }
#endregion
- #region Eventi Visualizzazione Immagine(i) Background
+ #region Eventi Visualizzazione Immagine(i) Background & Icona
private void singleImageComboBox_TextChanged(object sender, EventArgs e)
{
if (showingProperties)
@@ -628,6 +649,22 @@
try { backgroundPictureBox.LoadAsync(bgImages[bgImageIndex]); }
catch { }
}
+ private void iconComboBox_TextChanged(object sender, EventArgs e)
+ {
+ if (iconComboBox.Text.Length > 0)
+ {
+ string iconName = Path.Combine(myMediaPortal.SelectedSkin.IconsPath, iconComboBox.Text);
+ if (File.Exists(iconName))
+ {
+ try { iconPictureBox.LoadAsync(iconName); }
+ catch { }
+ }
+ else
+ iconPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError;
+ }
+ else
+ iconPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconEmpty;
+ }
#endregion
#region Eventi Liste Menu & Sotto-Menu
private void menuListBox_SelectedIndexChanged(object sender, EventArgs e)
@@ -681,6 +718,10 @@
if (!falseRemMenuItem && myMenu.Items.Count > 0)
DefaultMenuItemRefresh();
}
+ private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e)
+ {
+ multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString();
+ }
#endregion
#region Eventi Modifica Sotto-Menu
private void subMenuRowRemoveButton_Click(object sender, EventArgs e)
@@ -766,12 +807,5 @@
return false;
}
#endregion
-
- private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e)
- {
- multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString();
- }
-
-
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-09 19:35:41 UTC (rev 4673)
@@ -117,15 +117,198 @@
<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>
<metadata name="singleImageOpenFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>5, 1</value>
</metadata>
+ <metadata name="propertiesPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="iconGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="iconPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="iconComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="iconBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="loadParameterTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="windowIdShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinFileShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="captionTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="backgroundGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="fanartHandlerPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="backgroundPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="fanartComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="fanartRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="singleImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="singleImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="singleImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="overlayGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="overlayLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="overlayComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="captionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="labelLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="clearCacheCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageTimeGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiIMageTimeLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageTimeSecLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="multiImageTimeTrackBar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="showRssCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="backgroundImageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>390, 2</value>
</metadata>
+ <metadata name="infoPictureBox.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="infoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -176,6 +359,27 @@
AElFTkSuQmCC
</value>
</data>
+ <metadata name="subMenuRowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuRowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="propLeftPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="propRightPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="menuRowEditButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="subMenuRowEditButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<data name="arrowsPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAoAAAACACAYAAACbUtgKAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
@@ -312,6 +516,9 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>703, 1</value>
</metadata>
+ <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -37,9 +37,10 @@
public string Description; //Descrizione overlay
public override string ToString() { return Description; } //Override metodo ToString per riempire classi ListControl
}
- private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media)
- private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations)
- private List<Overlay> _skinOverlays = new List<Overlay>(); //Lista overlay disponibili per BasicHome della skin
+ private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media)
+ private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations)
+ private List<string> _skinMenuIcons = new List<string>(); //Lista icone per elementi di menu della skin (sotto \media\icons)
+ private List<Overlay> _skinOverlays = new List<Overlay>(); //Lista overlay disponibili per BasicHome della skin
#endregion
#region Costruttore
@@ -47,7 +48,8 @@
{ //Costruttore sotto-classe Skin
_initialized = _initialized && GetSkinBackgroundImages(false)
&& GetSkinMultiImageFolders()
- && GetSkinOverlays(); //--> raccolta immagini di background, animazioni ed overlays della skin
+ && GetSkinIcons()
+ && GetSkinOverlays(); //--> raccolta immagini di background, animazioni, icone ed overlays della skin
}
#endregion
@@ -116,6 +118,29 @@
return false;
}
}
+ private bool GetSkinIcons() //Raccolta icone per elementi di menu della skin
+ {
+ DirectoryInfo dInfo = new DirectoryInfo(_paths.Icons);
+ if (!dInfo.Exists)
+ {
+ Tools.ErrorMessage("Skin icons folder not found!", _paths.Icons);
+ return false;
+ }
+ string fExt;
+ foreach (FileInfo fInfo in dInfo.GetFiles()) //Iterazione per applicazione filtro e memorizzazione dati
+ {
+ fExt = fInfo.Extension.ToLower();
+ if ((fExt == ".png" || fExt == ".jpg" || fExt == ".bmp" || fExt == ".gif"))
+ _skinMenuIcons.Add(fInfo.Name); //--> aggiunta icona nella lista
+ }
+ if (_skinMenuIcons.Count > 0)
+ return true; //--> raccolta icone effettuata
+ else
+ {
+ Tools.ErrorMessage("No icons found.", _paths.Icons);
+ return false;
+ }
+ }
private bool GetSkinOverlays() //Raccolta degli overlay per BasicHome della skin
{
const string OverlayPrefix = "BasicHome.Overlay."; //Prefisso nomi file identificativi degli overlays per BasicHome
@@ -172,11 +197,24 @@
Overlay ovl = _skinOverlays.Find(x => x.Description == overlayDescription);
return ovl.Value;
}
+ public string GetMenuIconPath(string iconFile) //Ottenimento path (completo o parziale) icona
+ {
+ return (Path.IsPathRooted(iconFile) ? iconFile : @"Icons\" + iconFile);
+ }
+ public string GetMenuIconFile(string iconPath) //Ottenimento nome file icona
+ {
+ try
+ {
+ return (Path.IsPathRooted(iconPath) ? iconPath : iconPath.Remove(0, @"Icons\".Length));
+ }
+ catch { return ""; }
+ }
#endregion
#region Proprietà
public List<string> SkinBgImages { get { return this._skinBgImages; } }
public List<string> SkinBgFolders { get { return this._skinBgFolders; } }
+ public List<string> SkinMenuIcons { get { return this._skinMenuIcons; } }
public List<Overlay> SkinOverlays { get { return this._skinOverlays; } }
#endregion
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -18,6 +18,7 @@
public string BackgroundImage = ""; //File immagine di background
public string BackgroundFolder = ""; //Cartella per multi-image di background
public string FanartHandler = ""; //Tipologia di fanart per background
+ public string Icon = ""; //Eventuale icona
public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl
}
internal class SimpleMenuItem : SubMenuItem //Classe elemento di menu semplificato
@@ -139,6 +140,9 @@
innerNode = node.SelectSingleNode("FanartHandler");
if (innerNode != null)
mItem.FanartHandler = innerNode.InnerText;
+ innerNode = node.SelectSingleNode("Icon");
+ if (innerNode != null)
+ mItem.Icon = innerNode.InnerText;
innerNode = node.SelectSingleNode("Overlay");
if (innerNode != null)
mItem.Overlay = innerNode.InnerText;
@@ -169,6 +173,9 @@
innerNode = subNode.SelectSingleNode("FanartHandler");
if (innerNode != null)
smItem.FanartHandler = innerNode.InnerText;
+ innerNode = node.SelectSingleNode("Icon");
+ if (innerNode != null)
+ mItem.Icon = innerNode.InnerText;
mItem.SubMenuItems.Add(smItem); //--> aggiunta dell'elemento di sotto-menu nella lista
}
_items.Add(mItem); //--> aggiunta dell'elemento di menu nella lista
@@ -265,6 +272,7 @@
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundImage", _items[itemIndex].BackgroundImage);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundFolder", _items[itemIndex].BackgroundFolder);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".FanartHandler", _items[itemIndex].FanartHandler);
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Icon", _items[itemIndex].Icon);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Overlay", _items[itemIndex].Overlay);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.Count", _items[itemIndex].SubMenuItems.Count.ToString());
@@ -277,6 +285,7 @@
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundImage", _items[itemIndex].SubMenuItems[ii-1].BackgroundImage);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundFolder", _items[itemIndex].SubMenuItems[ii-1].BackgroundFolder);
XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".FanartHandler", _items[itemIndex].SubMenuItems[ii-1].FanartHandler);
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".Icon", _items[itemIndex].SubMenuItems[ii-1].Icon);
}
itemIndex = (itemIndex + 1) % _items.Count;
}
@@ -301,60 +310,59 @@
{
//Questa procedura si è resa necessaria per limitazioni dello skin engine: non si riesce ad assegnare un path parametrico ai controlli multi-image
- const string SkinMltImgAnimFile = "BasicHomeBackgrounds.MultiImages.animated.xml"; //Nome del file di definizione controlli multi-image animati della skin
- const string SkinMltImgNormFile = "BasicHomeBackgrounds.MultiImages.normal.xml"; //Nome del file di definizione controlli multi-image normali della skin
+ const string SkinMltImgPrefix = "BasicHomeBackgrounds.MultiImages."; //Prefisso nomi file di definizione controlli multi-image della skin
- string skinMltImgFile = skinPath + (_general.BackgroundAnimated ? SkinMltImgAnimFile : SkinMltImgNormFile);
- if (!File.Exists(skinMltImgFile))
+ string[] files = Directory.GetFiles(skinPath); //--> lettura file skin da disco
+ foreach (string file in files) //Iterazione per applicazione filtro e scrittura impostazioni
{
- Tools.ErrorMessage("Skin multi-image file not found!", skinMltImgFile);
- return false; //--> file di definizione controlli multi-image skin non trovato
- }
+ if (file.StartsWith(skinPath + SkinMltImgPrefix) && file.ToLower().EndsWith(".xml"))
+ {
+ FileStream mltImg = null;
+ try
+ {
+ XmlDocument xmlMltImg = new XmlDocument();
+ mltImg = new FileStream(file, FileMode.Open, FileAccess.Read);
+ xmlMltImg.Load(mltImg); //--> lettura file di definizione controlli multi-image skin
+ mltImg.Close(); //--> chiusura file
- FileStream mltImg = null;
- try
- {
- XmlDocument xmlMltImg = new XmlDocument();
- mltImg = new FileStream(skinMltImgFile, FileMode.Open, FileAccess.Read);
- xmlMltImg.Load(mltImg); //--> lettura file di definizione controlli multi-image skin
- mltImg.Close(); //--> chiusura file
+ XmlNodeList controlsList = xmlMltImg.DocumentElement.SelectNodes("/window/controls/control");
+ if (controlsList.Count != ItemsMaxNum)
+ {
+ Tools.ErrorMessage("Skin multi-image file not valid!", file);
+ return false; //--> file di definizione controlli multi-image skin non valido
+ }
- XmlNodeList controlsList = xmlMltImg.DocumentElement.SelectNodes("/window/controls/control");
- if (controlsList.Count != ItemsMaxNum)
- {
- Tools.ErrorMessage("Skin multi-image file not valid!", skinMltImgFile);
- return false; //--> file di definizione controlli multi-image skin non valido
- }
+ /* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo
+ e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */
+ for (int i = 0; i < controlsList.Count; i++) //Iterazione di modifica path controlli multi-image
+ {
+ controlsList[i].SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : "");
+ controlsList[i].SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString();
+ }
- /* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo
- e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */
- for (int i = 0; i < controlsList.Count; i++) //Iterazione di modifica path controlli multi-image
- {
- controlsList[i].SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : "");
- controlsList[i].SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString();
+ mltImg = new FileStream(file, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite);
+ xmlMltImg.Save(mltImg); //--> salvataggio file di definizione controlli multi-image skin manipolato
+ mltImg.Close(); //--> chiusura file
+ }
+ catch (Exception e)
+ {
+ Tools.ErrorMessage("Error writing multi-image settings in " + file, e.Message);
+ return false; //--> procedura terminata con errori
+ }
+ finally
+ {
+ if (mltImg != null)
+ mltImg.Close(); //--> eventuale chiusura oggetto FileStream
+ }
}
-
- mltImg = new FileStream(skinMltImgFile, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite);
- xmlMltImg.Save(mltImg); //--> salvataggio file di definizione controlli multi-image skin manipolato
- mltImg.Close(); //--> chiusura file
- return true; //--> procedura terminata correttamente
}
- catch (Exception e)
- {
- Tools.ErrorMessage("Error writing multi-image settings.", e.Message);
- return false; //--> procedura terminata con errori
- }
- finally
- {
- if (mltImg != null)
- mltImg.Close(); //--> eventuale chiusura oggetto FileStream
- }
+ return true; //--> file di definizione controlli multi-image skin non trovato
}
private void XmlAddMenuSetting(ref XmlDocument xmlSkinSettings, string nodeName, int menuSectionIndex, string nameData, string valueData)
- { //Aggiunta scrittura impostazione di menu
+ { //Aggiunta scrittura impostazione di menu
XmlElement menuSetting = xmlSkinSettings.CreateElement("entry");
XmlAttribute menuSettingAttribute = xmlSkinSettings.CreateAttribute("name");
- menuSetting.InnerText = ((valueData.Length > 0) ? valueData : " "); //--> conversione stringhe nulle in " "
+ menuSetting.InnerText = ((valueData.Length > 0) ? valueData : " "); //--> conversione stringhe nulle in " "
menuSettingAttribute.Value = nameData;
menuSetting.Attributes.Append(menuSettingAttribute);
xmlSkinSettings.DocumentElement.SelectSingleNode(nodeName).ChildNodes[menuSectionIndex].AppendChild(menuSetting);
@@ -409,6 +417,7 @@
menuSettings.WriteElementString("BackgroundImage", mItem.BackgroundImage);
menuSettings.WriteElementString("BackgroundFolder", mItem.BackgroundFolder);
menuSettings.WriteElementString("FanartHandler", mItem.FanartHandler);
+ menuSettings.WriteElementString("Icon", mItem.Icon);
menuSettings.WriteElementString("Overlay", mItem.Overlay);
if (mItem.SubMenuItems.Count > 0)
{
@@ -423,6 +432,7 @@
menuSettings.WriteElementString("BackgroundImage", smItem.BackgroundImage);
menuSettings.WriteElementString("BackgroundFolder", smItem.BackgroundFolder);
menuSettings.WriteElementString("FanartHandler", smItem.FanartHandler);
+ menuSettings.WriteElementString("Icon", smItem.Icon);
menuSettings.WriteEndElement();
}
menuSettings.WriteEndElement();
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs 2013-11-09 19:35:41 UTC (rev 4673)
@@ -113,6 +113,16 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
+ internal static System.Drawing.Bitmap IconEmpty {
+ get {
+ object obj = ResourceManager.GetObject("IconEmpty", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap IconError {
get {
object obj = ResourceManager.GetObject("IconError", resourceCulture);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx 2013-11-09 19:35:41 UTC (rev 4673)
@@ -172,11 +172,14 @@
<data name="SubRowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\resources\images\subrowup.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="BackgroundError" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\BackgroundError.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="IconError" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\IconError.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="IconEmpty" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Images\IconEmpty.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/XtremeMenuEditor/Resources/Images/IconEmpty.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png 2013-11-09 19:35:41 UTC (rev 4673)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-09 09:54:37 UTC (rev 4672)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-09 19:35:41 UTC (rev 4673)
@@ -281,6 +281,7 @@
<Content Include="Resources\Images\ArrowDoubleDown.png" />
<Content Include="Resources\Images\BackgroundError.png" />
<Content Include="Resources\Images\Editor.ico" />
+ <Content Include="Resources\Images\IconEmpty.png" />
<Content Include="Resources\Images\FanartHandler.png" />
<Content Include="Resources\Images\IconError.png" />
<Content Include="Resources\Images\MiniArrowLeft.png" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
