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-02-24 19:38:44
|
Revision: 4765
http://sourceforge.net/p/mp-plugins/code/4765
Author: nicsergio
Date: 2014-02-24 19:38:41 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
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
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 17:36:22 UTC (rev 4764)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 19:38:41 UTC (rev 4765)
@@ -32,11 +32,6 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterConfig));
this.shortCutsDataGridView = new System.Windows.Forms.DataGridView();
- 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.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterTextBox = new System.Windows.Forms.TextBox();
@@ -60,11 +55,8 @@
this.capsLockGroupBox = new System.Windows.Forms.GroupBox();
this.capsLockComboBox = new System.Windows.Forms.ComboBox();
this.rowCopyButton = new System.Windows.Forms.Button();
- this.skinItems1 = new My.Common.SkinItems();
+ this.skinItems = new My.Common.SkinItems();
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit();
- this.itemsTabControl.SuspendLayout();
- this.linksTabPage.SuspendLayout();
- this.skinTabPage.SuspendLayout();
this.linkPropertiesGroupBox.SuspendLayout();
this.loadParameterGroupBox.SuspendLayout();
this.windowIdGroupBox.SuspendLayout();
@@ -107,66 +99,6 @@
this.shortCutsDataGridView.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.shortCutsDataGridView_EditingControlShowing);
this.shortCutsDataGridView.Enter += new System.EventHandler(this.shortCutsDataGridView_Enter);
//
- // 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(266, 8);
- this.itemsTabControl.Name = "itemsTabControl";
- this.itemsTabControl.SelectedIndex = 0;
- this.itemsTabControl.Size = new System.Drawing.Size(330, 260);
- this.itemsTabControl.TabIndex = 1;
- 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(322, 234);
- 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(318, 225);
- this.skinLinksTreeView.TabIndex = 2;
- this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
- this.skinLinksTreeView.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
- 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(322, 234);
- 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(318, 225);
- this.skinFilesListBox.TabIndex = 0;
- this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged);
- this.skinFilesListBox.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
- this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
- //
// linkPropertiesGroupBox
//
this.linkPropertiesGroupBox.Controls.Add(this.loadParameterGroupBox);
@@ -419,19 +351,22 @@
this.rowCopyButton.UseVisualStyleBackColor = true;
this.rowCopyButton.Click += new System.EventHandler(this.rowCopyButton_Click);
//
- // skinItems1
+ // skinItems
//
- this.skinItems1.Location = new System.Drawing.Point(466, 8);
- this.skinItems1.Name = "skinItems1";
- this.skinItems1.Size = new System.Drawing.Size(330, 260);
- this.skinItems1.TabIndex = 39;
+ this.skinItems.Location = new System.Drawing.Point(266, 8);
+ this.skinItems.Name = "skinItems";
+ 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);
//
// ShortCuterConfig
//
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.Controls.Add(this.skinItems);
this.Controls.Add(this.rowCopyButton);
this.Controls.Add(this.overridesGroupBox);
this.Controls.Add(this.saveButton);
@@ -443,7 +378,6 @@
this.Controls.Add(this.infoPictureBox);
this.Controls.Add(this.rowRemoveButton);
this.Controls.Add(this.rowAddButton);
- this.Controls.Add(this.itemsTabControl);
this.Controls.Add(this.shortCutsDataGridView);
this.Controls.Add(this.propLeftPictureBox);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -456,9 +390,6 @@
this.Load += new System.EventHandler(this.ShortCuterConfig_Load);
this.Shown += new System.EventHandler(this.ShortCuterConfig_Shown);
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).EndInit();
- this.itemsTabControl.ResumeLayout(false);
- this.linksTabPage.ResumeLayout(false);
- this.skinTabPage.ResumeLayout(false);
this.linkPropertiesGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.PerformLayout();
@@ -477,10 +408,6 @@
#endregion
private System.Windows.Forms.DataGridView shortCutsDataGridView;
- 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.PictureBox propLeftPictureBox;
private System.Windows.Forms.Button rowAddButton;
private System.Windows.Forms.Button rowRemoveButton;
@@ -496,7 +423,6 @@
private System.Windows.Forms.GroupBox skinFileGroupBox;
private System.Windows.Forms.Label skinFileLabel;
private System.Windows.Forms.GroupBox loadParameterGroupBox;
- private System.Windows.Forms.TreeView skinLinksTreeView;
private System.Windows.Forms.Button saveButton;
private System.Windows.Forms.TextBox loadParameterTextBox;
private System.Windows.Forms.GroupBox overridesGroupBox;
@@ -505,7 +431,7 @@
private System.Windows.Forms.ComboBox capsLockComboBox;
private System.Windows.Forms.ComboBox numLockComboBox;
private System.Windows.Forms.Button rowCopyButton;
- private My.Common.SkinItems skinItems1;
+ private My.Common.SkinItems skinItems;
}
}
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 17:36:22 UTC (rev 4764)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 19:38:41 UTC (rev 4765)
@@ -29,10 +29,7 @@
#region Metodi Privati
private void InitializeGUI() //Inizializzazione interfaccia
{
- skinFilesListBox.DataSource = mySkin.SkinFiles;
- skinFilesListBox.SelectedIndex = -1;
- mySkin.FillTreeViewSkinLinks(skinLinksTreeView);
- skinLinksTreeView.CollapseAll();
+ skinItems.Populate(mySkin.SkinFiles, mySkin.SkinLinks, false, true);
FormatShortCutsGrid();
capsLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
@@ -40,8 +37,7 @@
numLockComboBox.DataSource = Enum.GetNames(typeof(LockKeys.LockKeyActions));
numLockComboBox.SelectedItem = Enum.GetName(typeof(LockKeys.LockKeyActions), myShortCuts.GeneralForcingNumLock);
- toolTip.SetToolTip(skinFilesListBox, "Double click to set the link's parameter to shortcut");
- toolTip.SetToolTip(skinLinksTreeView, "Double click to set the link's parameter to shortcut");
+ 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");
@@ -148,42 +144,28 @@
shortCutsDataGridView.DataSource = myShortCuts.Items;
}
- private void ShowLinkProperties(object listControl) //Visualizzazione proprietà link
+ private void ShowLinkProperties(SkinItems.SkinItemsType itemType, int index) //Visualizzazione proprietà link
{
- Control itemsList = (Control)listControl; //Casting sender -> Control
- int selectedIndex; //Indice eventuale elemento selezionato
-
- if (itemsList is ListBox)
+ if (index < 0) //Se indice invalido --> reset proprietà
{
- ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox
- selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato
- }
- else
- {
- TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView
- selectedIndex= mySkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato
- }
-
- if (selectedIndex < 0) //Se indice invalido --> reset proprietà
- {
skinFileLabel.Text = "-";
windowIdLabel.Text = "-";
loadParameterTextBox.Text = "-";
}
else //Visualizzazione proprietà elemento selezionato
- {
- switch (itemsList.Name)
+ {
+ switch (itemType)
{
- case "skinFilesListBox": //Lista files della skin
- skinFileLabel.Text = mySkin.SkinFiles[selectedIndex].Name;
- windowIdLabel.Text = mySkin.SkinFiles[selectedIndex].Id.ToString();
+ case SkinItems.SkinItemsType.Files: //Lista files della skin
+ skinFileLabel.Text = mySkin.SkinFiles[index].Name;
+ windowIdLabel.Text = mySkin.SkinFiles[index].Id.ToString();
loadParameterTextBox.Text = "-";
break;
- case "skinLinksTreeView": //Lista links predefiniti della skin
- skinFileLabel.Text = mySkin.SkinLinks[selectedIndex].XmlFile;
- windowIdLabel.Text = mySkin.SkinLinks[selectedIndex].WindowID.ToString();
- loadParameterTextBox.Text = mySkin.SkinLinks[selectedIndex].LoadParameter;
+ 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;
break;
}
}
@@ -194,6 +176,7 @@
{
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)
@@ -207,6 +190,7 @@
showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID);
skinFilesListBox.SelectedIndex = showIndex; //--> selezione eventuale file corrispondente a WindowID
}
+ */
}
}
}
@@ -394,56 +378,29 @@
}
#endregion
#region Eventi Liste Files & Links Skin
- private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinItems_Enter(SkinItems.SkinItemsType itemType, int index)
{
- if(itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
- }
- private void itemsTabControl_Click(object sender, EventArgs e)
- {
- if (itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
- }
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
- {
- ShowLinkProperties(sender);
- }
- private void skinFilesListBox_Enter(object sender, EventArgs e)
- {
propLeftPictureBox.Visible = false; //--> il link non è collegato allo shortcut selezionato
- ShowLinkProperties(sender);
+ ShowLinkProperties(itemType, index);
}
- private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
+ private void skinItems_Changed(SkinItems.SkinItemsType itemType, int index)
{
- if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0)
- {
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[skinFilesListBox.SelectedIndex].Id.ToString();
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = "";
- forceCell = true;
- shortCutsDataGridView.CurrentCell = shortCutsDataGridView[5, shortCutsDataGridView.CurrentRow.Index];
- forceCell = false;
- }
+ ShowLinkProperties(itemType, index);
}
- private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
+ private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index)
{
- ShowLinkProperties(sender);
- }
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
- {
- propLeftPictureBox.Visible = false; //--> il link non è collegato allo shortcut selezionato
- ShowLinkProperties(sender);
- }
- private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
- {
- int skinLinkIndex = mySkin.GetSkinLinkIndex(skinLinksTreeView);
- if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && skinLinkIndex >= 0)
+ if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && index >= 0)
{
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[skinLinkIndex].WindowID.ToString();
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[skinLinkIndex].LoadParameter;
+ if (itemType == SkinItems.SkinItemsType.Files)
+ {
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[index].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;
+ }
forceCell = true;
shortCutsDataGridView.CurrentCell = shortCutsDataGridView[5, shortCutsDataGridView.CurrentRow.Index];
forceCell = false;
@@ -521,5 +478,8 @@
return false;
}
#endregion
+
+
+
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 17:36:22 UTC (rev 4764)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 19:38:41 UTC (rev 4765)
@@ -120,21 +120,6 @@
<metadata name="shortCutsDataGridView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <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="linkPropertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-24 17:36:25
|
Revision: 4764
http://sourceforge.net/p/mp-plugins/code/4764
Author: nicsergio
Date: 2014-02-24 17:36:22 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
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
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-24 17:07:28 UTC (rev 4763)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-24 17:36:22 UTC (rev 4764)
@@ -329,12 +329,6 @@
<EmbeddedResource Include="Resources\Images\ShortCuterDisable.png" />
<EmbeddedResource Include="Resources\Images\ShortCuterEnable.png" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Common\My.Common.csproj">
- <Project>{4D76B200-01C9-48C6-BA04-DAF0845D56B0}</Project>
- <Name>My.Common</Name>
- </ProjectReference>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 17:07:28 UTC (rev 4763)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 17:36:22 UTC (rev 4764)
@@ -32,6 +32,11 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterConfig));
this.shortCutsDataGridView = new System.Windows.Forms.DataGridView();
+ 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.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterTextBox = new System.Windows.Forms.TextBox();
@@ -55,7 +60,11 @@
this.capsLockGroupBox = new System.Windows.Forms.GroupBox();
this.capsLockComboBox = new System.Windows.Forms.ComboBox();
this.rowCopyButton = new System.Windows.Forms.Button();
+ this.skinItems1 = new My.Common.SkinItems();
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit();
+ this.itemsTabControl.SuspendLayout();
+ this.linksTabPage.SuspendLayout();
+ this.skinTabPage.SuspendLayout();
this.linkPropertiesGroupBox.SuspendLayout();
this.loadParameterGroupBox.SuspendLayout();
this.windowIdGroupBox.SuspendLayout();
@@ -98,6 +107,66 @@
this.shortCutsDataGridView.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.shortCutsDataGridView_EditingControlShowing);
this.shortCutsDataGridView.Enter += new System.EventHandler(this.shortCutsDataGridView_Enter);
//
+ // 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(266, 8);
+ this.itemsTabControl.Name = "itemsTabControl";
+ this.itemsTabControl.SelectedIndex = 0;
+ this.itemsTabControl.Size = new System.Drawing.Size(330, 260);
+ this.itemsTabControl.TabIndex = 1;
+ 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(322, 234);
+ 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(318, 225);
+ this.skinLinksTreeView.TabIndex = 2;
+ this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
+ this.skinLinksTreeView.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
+ 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(322, 234);
+ 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(318, 225);
+ this.skinFilesListBox.TabIndex = 0;
+ this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged);
+ this.skinFilesListBox.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
+ this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
+ //
// linkPropertiesGroupBox
//
this.linkPropertiesGroupBox.Controls.Add(this.loadParameterGroupBox);
@@ -350,11 +419,19 @@
this.rowCopyButton.UseVisualStyleBackColor = true;
this.rowCopyButton.Click += new System.EventHandler(this.rowCopyButton_Click);
//
+ // skinItems1
+ //
+ this.skinItems1.Location = new System.Drawing.Point(466, 8);
+ this.skinItems1.Name = "skinItems1";
+ this.skinItems1.Size = new System.Drawing.Size(330, 260);
+ this.skinItems1.TabIndex = 39;
+ //
// ShortCuterConfig
//
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.Controls.Add(this.rowCopyButton);
this.Controls.Add(this.overridesGroupBox);
this.Controls.Add(this.saveButton);
@@ -366,6 +443,7 @@
this.Controls.Add(this.infoPictureBox);
this.Controls.Add(this.rowRemoveButton);
this.Controls.Add(this.rowAddButton);
+ this.Controls.Add(this.itemsTabControl);
this.Controls.Add(this.shortCutsDataGridView);
this.Controls.Add(this.propLeftPictureBox);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -378,6 +456,9 @@
this.Load += new System.EventHandler(this.ShortCuterConfig_Load);
this.Shown += new System.EventHandler(this.ShortCuterConfig_Shown);
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).EndInit();
+ this.itemsTabControl.ResumeLayout(false);
+ this.linksTabPage.ResumeLayout(false);
+ this.skinTabPage.ResumeLayout(false);
this.linkPropertiesGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.PerformLayout();
@@ -396,6 +477,10 @@
#endregion
private System.Windows.Forms.DataGridView shortCutsDataGridView;
+ 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.PictureBox propLeftPictureBox;
private System.Windows.Forms.Button rowAddButton;
private System.Windows.Forms.Button rowRemoveButton;
@@ -411,6 +496,7 @@
private System.Windows.Forms.GroupBox skinFileGroupBox;
private System.Windows.Forms.Label skinFileLabel;
private System.Windows.Forms.GroupBox loadParameterGroupBox;
+ private System.Windows.Forms.TreeView skinLinksTreeView;
private System.Windows.Forms.Button saveButton;
private System.Windows.Forms.TextBox loadParameterTextBox;
private System.Windows.Forms.GroupBox overridesGroupBox;
@@ -419,5 +505,7 @@
private System.Windows.Forms.ComboBox capsLockComboBox;
private System.Windows.Forms.ComboBox numLockComboBox;
private System.Windows.Forms.Button rowCopyButton;
+ private My.Common.SkinItems skinItems1;
+
}
}
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 17:07:28 UTC (rev 4763)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 17:36:22 UTC (rev 4764)
@@ -521,12 +521,5 @@
return false;
}
#endregion
-
-
-
- private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index)
- {
-
- }
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 17:07:28 UTC (rev 4763)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 17:36:22 UTC (rev 4764)
@@ -120,6 +120,21 @@
<metadata name="shortCutsDataGridView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <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="linkPropertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-24 17:07:32
|
Revision: 4763
http://sourceforge.net/p/mp-plugins/code/4763
Author: nicsergio
Date: 2014-02-24 17:07:28 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,59 +0,0 @@
-namespace My.Common
-{
- partial class Form1
- {
- /// <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()
- {
- this.skinItemsControl1 = new My.Common.SkinItemsControl();
- this.SuspendLayout();
- //
- // skinItemsControl1
- //
- this.skinItemsControl1.Location = new System.Drawing.Point(12, 12);
- this.skinItemsControl1.Name = "skinItemsControl1";
- this.skinItemsControl1.Size = new System.Drawing.Size(247, 180);
- this.skinItemsControl1.TabIndex = 0;
- this.skinItemsControl1.Load += new System.EventHandler(this.skinItemsControl1_Load);
- //
- // Form1
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Red;
- this.ClientSize = new System.Drawing.Size(284, 262);
- this.Controls.Add(this.skinItemsControl1);
- this.Name = "Form1";
- this.Text = "Form1";
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private SkinItemsControl skinItemsControl1;
- }
-}
\ No newline at end of file
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,24 +0,0 @@
-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 My.Common
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
-
- private void skinItemsControl1_Load(object sender, EventArgs e)
- {
-
- }
- }
-}
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,120 +0,0 @@
-<?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>
-</root>
\ No newline at end of file
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,125 +0,0 @@
-namespace My.Common
-{
- partial class SkinItemsControl
- {
- /// <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 componenti
-
- /// <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.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.itemsTabControl.SuspendLayout();
- this.linksTabPage.SuspendLayout();
- this.skinTabPage.SuspendLayout();
- 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(0, 0);
- this.itemsTabControl.Name = "itemsTabControl";
- this.itemsTabControl.SelectedIndex = 0;
- this.itemsTabControl.Size = new System.Drawing.Size(247, 573);
- this.itemsTabControl.TabIndex = 1;
- 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.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
- 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.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
- this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
- //
- // SkinItemsControl
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.itemsTabControl);
- this.Name = "SkinItemsControl";
- 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);
- this.skinTabPage.ResumeLayout(false);
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private System.Windows.Forms.TabControl itemsTabControl;
- private System.Windows.Forms.TabPage linksTabPage;
- private System.Windows.Forms.TreeView skinLinksTreeView;
- private System.Windows.Forms.TabPage skinTabPage;
- private System.Windows.Forms.ListBox skinFilesListBox;
- }
-}
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,114 +0,0 @@
-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.Linq;
-using System.Reflection;
-
-namespace My.Common
-{
- public partial class SkinItemsControl : UserControl
- {
- public SkinItemsControl()
- {
- InitializeComponent();
-
-
-
- //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
- {
- 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 { }
- }
- }
-
- public delegate void ItemChanged(SkinItemsType itemType, int index);
- public event ItemChanged Enter;
- public event ItemChanged Changed;
- protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
-
- public enum SkinItemsType //Tipologie di azioni di modica stato
- {
- Links = 0, //--> reset blocco
- Files = 1 //--> nessuna modifica (stato invariato)
- }
- //public event
-
- private void SkinItemsControl_Load(object sender, EventArgs e)
- {
-
- }
- private void SwitchFocus()
- {
- if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
- }
-
- 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);
-
- }
-
- private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
- {
- SwitchFocus();
- }
-
- private void itemsTabControl_Click(object sender, EventArgs e)
- {
- SwitchFocus();
- }
-
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
- {
- Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
- }
-
- private void skinFilesListBox_Enter(object sender, EventArgs e)
- {
- Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
- }
-
- private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
- {
-
- }
-
- private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
- {
- //Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex);
- }
-
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
- {
-
- }
-
- private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
- {
-
- }
- }
-}
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx 2014-02-24 17:06:22 UTC (rev 4762)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx 2014-02-24 17:07:28 UTC (rev 4763)
@@ -1,120 +0,0 @@
-<?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>
-</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-02-24 17:06:26
|
Revision: 4762
http://sourceforge.net/p/mp-plugins/code/4762
Author: nicsergio
Date: 2014-02-24 17:06:22 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
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/Common/SkinItems.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-24 17:06:22 UTC (rev 4762)
@@ -35,17 +35,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Form1.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Form1.Designer.cs">
- <DependentUpon>Form1.cs</DependentUpon>
- </Compile>
- <Compile Include="SkinItemsControl.cs">
+ <Compile Include="SkinItems.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="SkinItemsControl.Designer.cs">
- <DependentUpon>SkinItemsControl.cs</DependentUpon>
+ <Compile Include="SkinItems.Designer.cs">
+ <DependentUpon>SkinItems.cs</DependentUpon>
</Compile>
<Compile Include="VersionInfo.cs">
<SubType>Form</SubType>
@@ -125,15 +119,12 @@
</Content>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Form1.resx">
- <DependentUpon>Form1.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="SkinItemsControl.resx">
- <DependentUpon>SkinItemsControl.cs</DependentUpon>
+ <EmbeddedResource Include="SkinItems.resx">
+ <DependentUpon>SkinItems.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="VersionInfo.resx">
<DependentUpon>VersionInfo.cs</DependentUpon>
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762)
@@ -0,0 +1,125 @@
+namespace My.Common
+{
+ partial class SkinItems
+ {
+ /// <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 componenti
+
+ /// <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.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.itemsTabControl.SuspendLayout();
+ this.linksTabPage.SuspendLayout();
+ this.skinTabPage.SuspendLayout();
+ 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(0, 0);
+ this.itemsTabControl.Name = "itemsTabControl";
+ this.itemsTabControl.SelectedIndex = 0;
+ this.itemsTabControl.Size = new System.Drawing.Size(247, 573);
+ this.itemsTabControl.TabIndex = 1;
+ 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.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
+ 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.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
+ this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
+ //
+ // SkinItems
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ 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);
+ this.skinTabPage.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TabControl itemsTabControl;
+ private System.Windows.Forms.TabPage linksTabPage;
+ private System.Windows.Forms.TreeView skinLinksTreeView;
+ private System.Windows.Forms.TabPage skinTabPage;
+ private System.Windows.Forms.ListBox skinFilesListBox;
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-24 17:06:22 UTC (rev 4762)
@@ -0,0 +1,148 @@
+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;
+
+namespace My.Common
+{
+ public partial class SkinItems : UserControl
+ {
+ public SkinItems()
+ {
+ InitializeComponent();
+
+
+
+ //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
+ {
+ 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 { }
+ }*/
+ }
+
+ public delegate void ItemChanged(SkinItemsType itemType, int index);
+ public new event ItemChanged Enter;
+ public event ItemChanged Changed;
+ public new event ItemChanged DoubleClick;
+
+
+ protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
+
+ public enum SkinItemsType //Tipologie di azioni di modica stato
+ {
+ 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
+ TreeNode node = new TreeNode();
+ foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview
+ {
+ if (skLink.IsFather) //--> nodo padre
+ node = skinLinksTreeView.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
+ }
+
+ skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
+ if (selectFirst)
+ skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
+
+ if (collapseTreeView)
+ skinLinksTreeView.CollapseAll();
+ else
+ skinLinksTreeView.ExpandAll();
+
+ }
+ private void SkinItemsControl_Load(object sender, EventArgs e)
+ {
+
+ }
+ private void SwitchFocus()
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ skinLinksTreeView.Focus();
+ else
+ skinFilesListBox.Focus();
+ }
+
+ 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);
+
+ }
+
+ private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ SwitchFocus();
+ }
+
+ private void itemsTabControl_Click(object sender, EventArgs e)
+ {
+ SwitchFocus();
+ }
+
+ private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ }
+
+ private void skinFilesListBox_Enter(object sender, EventArgs e)
+ {
+ Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ }
+
+ private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
+ {
+ DoubleClick(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ }
+
+ 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));
+ }
+
+ private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ {
+ //Indice nodo selezionato TreeView --> corrispondente a chiave)
+ Enter(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ }
+
+ private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
+ {
+ //Indice nodo selezionato TreeView --> corrispondente a chiave)
+ DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ }
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx 2014-02-24 17:06:22 UTC (rev 4762)
@@ -0,0 +1,138 @@
+<?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="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="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-24 17:06:22 UTC (rev 4762)
@@ -34,7 +34,6 @@
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.Build.0 = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
- {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|x86.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|Any CPU.Build.0 = Release|Any CPU
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-24 17:06:22 UTC (rev 4762)
@@ -70,6 +70,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>
@@ -113,6 +121,10 @@
<Compile Include="SkinWithSounds.cs" />
</ItemGroup>
<ItemGroup>
+ <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>
@@ -317,7 +329,12 @@
<EmbeddedResource Include="Resources\Images\ShortCuterDisable.png" />
<EmbeddedResource Include="Resources\Images\ShortCuterEnable.png" />
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <ProjectReference Include="..\Common\My.Common.csproj">
+ <Project>{4D76B200-01C9-48C6-BA04-DAF0845D56B0}</Project>
+ <Name>My.Common</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762)
@@ -32,11 +32,6 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterConfig));
this.shortCutsDataGridView = new System.Windows.Forms.DataGridView();
- 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.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterGroupBox = new System.Windows.Forms.GroupBox();
this.loadParameterTextBox = new System.Windows.Forms.TextBox();
@@ -61,9 +56,6 @@
this.capsLockComboBox = new System.Windows.Forms.ComboBox();
this.rowCopyButton = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit();
- this.itemsTabControl.SuspendLayout();
- this.linksTabPage.SuspendLayout();
- this.skinTabPage.SuspendLayout();
this.linkPropertiesGroupBox.SuspendLayout();
this.loadParameterGroupBox.SuspendLayout();
this.windowIdGroupBox.SuspendLayout();
@@ -106,66 +98,6 @@
this.shortCutsDataGridView.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.shortCutsDataGridView_EditingControlShowing);
this.shortCutsDataGridView.Enter += new System.EventHandler(this.shortCutsDataGridView_Enter);
//
- // 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(266, 8);
- this.itemsTabControl.Name = "itemsTabControl";
- this.itemsTabControl.SelectedIndex = 0;
- this.itemsTabControl.Size = new System.Drawing.Size(330, 260);
- this.itemsTabControl.TabIndex = 1;
- 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(322, 234);
- 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(318, 225);
- this.skinLinksTreeView.TabIndex = 2;
- this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
- this.skinLinksTreeView.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
- 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(322, 234);
- 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(318, 225);
- this.skinFilesListBox.TabIndex = 0;
- this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged);
- this.skinFilesListBox.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
- this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
- //
// linkPropertiesGroupBox
//
this.linkPropertiesGroupBox.Controls.Add(this.loadParameterGroupBox);
@@ -434,7 +366,6 @@
this.Controls.Add(this.infoPictureBox);
this.Controls.Add(this.rowRemoveButton);
this.Controls.Add(this.rowAddButton);
- this.Controls.Add(this.itemsTabControl);
this.Controls.Add(this.shortCutsDataGridView);
this.Controls.Add(this.propLeftPictureBox);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -447,9 +378,6 @@
this.Load += new System.EventHandler(this.ShortCuterConfig_Load);
this.Shown += new System.EventHandler(this.ShortCuterConfig_Shown);
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).EndInit();
- this.itemsTabControl.ResumeLayout(false);
- this.linksTabPage.ResumeLayout(false);
- this.skinTabPage.ResumeLayout(false);
this.linkPropertiesGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.ResumeLayout(false);
this.loadParameterGroupBox.PerformLayout();
@@ -468,10 +396,6 @@
#endregion
private System.Windows.Forms.DataGridView shortCutsDataGridView;
- 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.PictureBox propLeftPictureBox;
private System.Windows.Forms.Button rowAddButton;
private System.Windows.Forms.Button rowRemoveButton;
@@ -487,7 +411,6 @@
private System.Windows.Forms.GroupBox skinFileGroupBox;
private System.Windows.Forms.Label skinFileLabel;
private System.Windows.Forms.GroupBox loadParameterGroupBox;
- private System.Windows.Forms.TreeView skinLinksTreeView;
private System.Windows.Forms.Button saveButton;
private System.Windows.Forms.TextBox loadParameterTextBox;
private System.Windows.Forms.GroupBox overridesGroupBox;
@@ -496,6 +419,5 @@
private System.Windows.Forms.ComboBox capsLockComboBox;
private System.Windows.Forms.ComboBox numLockComboBox;
private System.Windows.Forms.Button rowCopyButton;
-
}
}
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 17:06:22 UTC (rev 4762)
@@ -521,5 +521,12 @@
return false;
}
#endregion
+
+
+
+ private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index)
+ {
+
+ }
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-23 16:48:11 UTC (rev 4761)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 17:06:22 UTC (rev 4762)
@@ -120,21 +120,6 @@
<metadata name="shortCutsDataGridView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <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="linkPropertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-23 16:48:15
|
Revision: 4761
http://sourceforge.net/p/mp-plugins/code/4761
Author: nicsergio
Date: 2014-02-23 16:48:11 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-21 16:11:41 UTC (rev 4760)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-23 16:48:11 UTC (rev 4761)
@@ -13,8 +13,6 @@
{
#region Dati
protected readonly string Name; //Nome della skin
- protected readonly string DefaultNamespace; //Spazio dei nomi predefinito
-
protected struct Folders //Struttura di memorizzazione cartelle
{
public string Skin; //Percorso della skin
@@ -45,7 +43,6 @@
public bool IsFather = false; //Il link è un nodo padre (visualizzazione a treeview)
public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl
}
-
protected Folders _paths = new Folders(); //Percorsi
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
@@ -66,8 +63,6 @@
//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;
@@ -130,7 +125,8 @@
XmlDocument xmlFile = new XmlDocument();
try
{
- using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream(DefaultNamespace + ".Resources.XmlFiles.PopularSkinLinks.xml"))
+ using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream(
+ Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains("PopularSkinLinks.xml")).ElementAt(0).ToString()))
{
xmlFile.Load(streamFile); //Links skin disponibili --> lettura file xml incapsulato
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-21 16:11:41 UTC (rev 4760)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-23 16:48:11 UTC (rev 4761)
@@ -6,6 +6,8 @@
using System.Linq;
using System.Text;
using System.Windows.Forms;
+using System.Linq;
+using System.Reflection;
namespace My.Common
{
@@ -14,11 +16,33 @@
public SkinItemsControl()
{
InitializeComponent();
+
+
+
+ //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
+ {
+ 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 { }
+ }
}
public delegate void ItemChanged(SkinItemsType itemType, int index);
public event ItemChanged Enter;
public event ItemChanged Changed;
+ protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
public enum SkinItemsType //Tipologie di azioni di modica stato
{
@@ -74,7 +98,7 @@
private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
{
- Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex);
+ //Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex);
}
private void skinLinksTreeView_Enter(object sender, EventArgs e)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-02-21 16:11:44
|
Revision: 4760
http://sourceforge.net/p/mp-plugins/code/4760
Author: nicsergio
Date: 2014-02-21 16:11:41 +0000 (Fri, 21 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.Designer.cs 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,59 @@
+namespace My.Common
+{
+ partial class Form1
+ {
+ /// <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()
+ {
+ this.skinItemsControl1 = new My.Common.SkinItemsControl();
+ this.SuspendLayout();
+ //
+ // skinItemsControl1
+ //
+ this.skinItemsControl1.Location = new System.Drawing.Point(12, 12);
+ this.skinItemsControl1.Name = "skinItemsControl1";
+ this.skinItemsControl1.Size = new System.Drawing.Size(247, 180);
+ this.skinItemsControl1.TabIndex = 0;
+ this.skinItemsControl1.Load += new System.EventHandler(this.skinItemsControl1_Load);
+ //
+ // Form1
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Red;
+ this.ClientSize = new System.Drawing.Size(284, 262);
+ this.Controls.Add(this.skinItemsControl1);
+ this.Name = "Form1";
+ this.Text = "Form1";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private SkinItemsControl skinItemsControl1;
+ }
+}
\ No newline at end of file
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.cs 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,24 @@
+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 My.Common
+{
+ public partial class Form1 : Form
+ {
+ public Form1()
+ {
+ InitializeComponent();
+ }
+
+ private void skinItemsControl1_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Form1.resx 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,120 @@
+<?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>
+</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-16 11:46:08 UTC (rev 4759)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-21 16:11:41 UTC (rev 4760)
@@ -35,6 +35,18 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Form1.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form1.Designer.cs">
+ <DependentUpon>Form1.cs</DependentUpon>
+ </Compile>
+ <Compile Include="SkinItemsControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="SkinItemsControl.Designer.cs">
+ <DependentUpon>SkinItemsControl.cs</DependentUpon>
+ </Compile>
<Compile Include="VersionInfo.cs">
<SubType>Form</SubType>
</Compile>
@@ -113,10 +125,16 @@
</Content>
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Form1.resx">
+ <DependentUpon>Form1.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="SkinItemsControl.resx">
+ <DependentUpon>SkinItemsControl.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="VersionInfo.resx">
<DependentUpon>VersionInfo.cs</DependentUpon>
</EmbeddedResource>
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.Designer.cs 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,125 @@
+namespace My.Common
+{
+ partial class SkinItemsControl
+ {
+ /// <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 componenti
+
+ /// <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.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.itemsTabControl.SuspendLayout();
+ this.linksTabPage.SuspendLayout();
+ this.skinTabPage.SuspendLayout();
+ 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(0, 0);
+ this.itemsTabControl.Name = "itemsTabControl";
+ this.itemsTabControl.SelectedIndex = 0;
+ this.itemsTabControl.Size = new System.Drawing.Size(247, 573);
+ this.itemsTabControl.TabIndex = 1;
+ 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.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
+ 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.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick);
+ this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
+ //
+ // SkinItemsControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.itemsTabControl);
+ this.Name = "SkinItemsControl";
+ 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);
+ this.skinTabPage.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TabControl itemsTabControl;
+ private System.Windows.Forms.TabPage linksTabPage;
+ private System.Windows.Forms.TreeView skinLinksTreeView;
+ private System.Windows.Forms.TabPage skinTabPage;
+ private System.Windows.Forms.ListBox skinFilesListBox;
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,90 @@
+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;
+
+namespace My.Common
+{
+ public partial class SkinItemsControl : UserControl
+ {
+ public SkinItemsControl()
+ {
+ InitializeComponent();
+ }
+
+ public delegate void ItemChanged(SkinItemsType itemType, int index);
+ public event ItemChanged Enter;
+ public event ItemChanged Changed;
+
+ public enum SkinItemsType //Tipologie di azioni di modica stato
+ {
+ Links = 0, //--> reset blocco
+ Files = 1 //--> nessuna modifica (stato invariato)
+ }
+ //public event
+
+ private void SkinItemsControl_Load(object sender, EventArgs e)
+ {
+
+ }
+ private void SwitchFocus()
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ skinLinksTreeView.Focus();
+ else
+ skinFilesListBox.Focus();
+ }
+
+ 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);
+
+ }
+
+ private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ SwitchFocus();
+ }
+
+ private void itemsTabControl_Click(object sender, EventArgs e)
+ {
+ SwitchFocus();
+ }
+
+ private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ }
+
+ private void skinFilesListBox_Enter(object sender, EventArgs e)
+ {
+ Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ }
+
+ private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
+ {
+
+ }
+
+ private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
+ {
+ Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex);
+ }
+
+ private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ {
+
+ }
+
+ private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx (rev 0)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.resx 2014-02-21 16:11:41 UTC (rev 4760)
@@ -0,0 +1,120 @@
+<?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>
+</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-16 11:46:08 UTC (rev 4759)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-21 16:11:41 UTC (rev 4760)
@@ -34,6 +34,7 @@
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.Build.0 = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|x86.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.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: <dos...@us...> - 2014-02-16 11:46:11
|
Revision: 4759
http://sourceforge.net/p/mp-plugins/code/4759
Author: doskabouter
Date: 2014-02-16 11:46:08 +0000 (Sun, 16 Feb 2014)
Log Message:
-----------
Fixed typo, enabled adding bookmarks in, and moving bookmarks to the root of the bookmarklist
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-01-25 20:42:00 UTC (rev 4758)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-02-16 11:46:08 UTC (rev 4759)
@@ -763,7 +763,7 @@
}
else
- ShowAlert("Bookmark could not been saved !", "Title : " + title, "URL : " + actualUrl, "");
+ ShowAlert("Bookmark could not be saved !", "Title : " + title, "URL : " + actualUrl, "");
}
webBrowser.Visible = true;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-01-25 20:42:00 UTC (rev 4758)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs 2014-02-16 11:46:08 UTC (rev 4759)
@@ -287,18 +287,21 @@
}
#endregion
- if (targetNode.Tag is BookmarkFolder)
+ if (targetNode != null)
{
- sourceNode.Remove();
- targetNode.Nodes.Insert(0, sourceNode);
- }
- else
- {
- if (targetNode.Parent != null)
+ if (targetNode.Tag is BookmarkFolder)
{
sourceNode.Remove();
- targetNode.Parent.Nodes.Insert(targetNode.Index, sourceNode);
+ targetNode.Nodes.Insert(0, sourceNode);
}
+ else
+ {
+ sourceNode.Remove();
+ if (targetNode.Parent != null)
+ targetNode.Parent.Nodes.Insert(targetNode.Index, sourceNode);
+ else
+ targetNode.Nodes.Insert(targetNode.Index, sourceNode);
+ }
}
}
@@ -360,8 +363,14 @@
thumb.ShowDialog();
}
- TreeNode newNode = node.Tag is BookmarkFolder ? node.Nodes.Add(get.SelectedName) :
- node.Parent.Nodes.Insert(node.Index + 1, get.SelectedName);
+ TreeNode newNode;
+ if (node.Parent == null)//root node "Bookmarks"
+ newNode = node.Nodes.Insert(node.Index + 1, get.SelectedName);
+ else
+ if (node.Tag is BookmarkFolder)
+ newNode = node.Nodes.Add(get.SelectedName);
+ else
+ newNode = node.Parent.Nodes.Insert(node.Index + 1, get.SelectedName);
newNode.ImageIndex = 1;
newNode.SelectedImageIndex = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-25 20:42:03
|
Revision: 4758
http://sourceforge.net/p/mp-plugins/code/4758
Author: doskabouter
Date: 2014-01-25 20:42:00 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Changed default plugin name
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2014-01-25 20:22:11 UTC (rev 4757)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs 2014-01-25 20:42:00 UTC (rev 4758)
@@ -81,7 +81,7 @@
UseHome = xmlreader.GetValueAsBool(section, "usehome", true);
HomePage = xmlreader.GetValueAsString(section, "homepage", "http://team-mediaportal.com");
RemoteTime = xmlreader.GetValueAsInt(section, "remotetime", 15);
- PluginName = xmlreader.GetValueAsString(section, "name", "Browse Web");
+ PluginName = xmlreader.GetValueAsString(section, "name", "WebBrowser");
BlankBrowser = xmlreader.GetValueAsBool(section, "blank", false);
StatusBar = xmlreader.GetValueAsBool(section, "status", true);
OSD = xmlreader.GetValueAsBool(section, "osd", true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-25 20:22:16
|
Revision: 4757
http://sourceforge.net/p/mp-plugins/code/4757
Author: doskabouter
Date: 2014-01-25 20:22:11 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Release 1.5.0.1
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1 2014-01-25 20:12:42 UTC (rev 4756)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1 2014-01-25 20:22:11 UTC (rev 4757)
Property changes on: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-01-25 20:12:42 UTC (rev 4756)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-01-25 20:22:11 UTC (rev 4757)
@@ -1035,5 +1035,157 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Common">
+ <DisplayName>Common</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Common</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan">
+ <DisplayName>Titan</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.6 or higher.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.6.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.6.0.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Doskabouter</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>5</Minor>
+ <Build>0</Build>
+ <Revision>1</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
+</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.1.mpe1</OnlineLocation>
+ <ReleaseDate>2014-01-25T21:13:09.5882715+01:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-25 20:12:42 UTC (rev 4756)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-25 20:22:11 UTC (rev 4757)
@@ -666,7 +666,7 @@
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2014-01-25T21:08:31.4691286+01:00</ReleaseDate>
+ <ReleaseDate>2014-01-25T21:13:09.5882715+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-25 20:12:44
|
Revision: 4756
http://sourceforge.net/p/mp-plugins/code/4756
Author: doskabouter
Date: 2014-01-25 20:12:42 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Fixed compatibility issues, and bumped version
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-25 20:06:46 UTC (rev 4755)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-25 20:12:42 UTC (rev 4756)
@@ -608,9 +608,9 @@
<Id />
<MinVersion>
<Major>1</Major>
- <Minor>6</Minor>
- <Build>0</Build>
- <Revision>0</Revision>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MinVersion>
<MaxVersion>
<Major>1</Major>
@@ -656,7 +656,7 @@
<Major>1</Major>
<Minor>5</Minor>
<Build>0</Build>
- <Revision>0</Revision>
+ <Revision>1</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
<VersionDescription>Preserve bookmark folder structure on import
@@ -666,7 +666,7 @@
</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2014-01-23T22:56:18.0702247+01:00</ReleaseDate>
+ <ReleaseDate>2014-01-25T21:08:31.4691286+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-25 20:06:46 UTC (rev 4755)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-25 20:12:42 UTC (rev 4756)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.0.1")]
+[assembly: AssemblyFileVersion("1.5.0.1")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-25 20:06:50
|
Revision: 4755
http://sourceforge.net/p/mp-plugins/code/4755
Author: doskabouter
Date: 2014-01-25 20:06:46 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
Create backup of old bookmarks
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-01-23 22:04:36 UTC (rev 4754)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmarks.cs 2014-01-25 20:06:46 UTC (rev 4755)
@@ -121,6 +121,7 @@
if (doc.DocumentElement.SelectSingleNode("//isFolder") != null)
{
+ File.Copy(fileName, Path.ChangeExtension(fileName, ".bak"));
LoadOldVersion(doc);
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-23 22:04:40
|
Revision: 4754
http://sourceforge.net/p/mp-plugins/code/4754
Author: doskabouter
Date: 2014-01-23 22:04:36 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
release 1.5.0.0
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1 2014-01-23 21:40:11 UTC (rev 4753)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1 2014-01-23 22:04:36 UTC (rev 4754)
Property changes on: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-01-23 21:40:11 UTC (rev 4753)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2014-01-23 22:04:36 UTC (rev 4754)
@@ -883,5 +883,157 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Common">
+ <DisplayName>Common</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Common</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan">
+ <DisplayName>Titan</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>6</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>requires MediaPortal version 1.6 or higher.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.6.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.6.0.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Doskabouter</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>5</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
+</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.5.0.0.mpe1</OnlineLocation>
+ <ReleaseDate>2014-01-23T22:56:18.0702247+01:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
+If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</Value>
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-23 21:40:11 UTC (rev 4753)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-23 22:04:36 UTC (rev 4754)
@@ -429,8 +429,8 @@
<Description />
</SectionParam>
<SectionParam Name="Description">
- <Value>This will install [Name] version [Version] on your computer.
-It is recommended that you close all other applications before continuing.
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
Click Next to continue or Cancel to exit Setup.</Value>
<ValueType>String</ValueType>
<Description />
@@ -554,7 +554,7 @@
<SectionParam Name="Path to plugin">
<Value>%Plugins%\windows\browsetheweb.dll</Value>
<ValueType>Template</ValueType>
- <Description>Path to the plugin like
+ <Description>Path to the plugin like
%Plugins%\Windows\plugin.dll</Description>
</SectionParam>
</Items>
@@ -613,10 +613,10 @@
<Revision>0</Revision>
</MinVersion>
<MaxVersion>
- <Major>9</Major>
- <Minor>9</Minor>
- <Build>9</Build>
- <Revision>9</Revision>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
</MaxVersion>
<WarnOnly>false</WarnOnly>
<Message>requires MediaPortal version 1.6 or higher.</Message>
@@ -654,16 +654,19 @@
<UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>1</Major>
- <Minor>4</Minor>
+ <Minor>5</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed some gui issues
-Fixed Compatibility with Mediaportal 1.6.0</VersionDescription>
+ <VersionDescription>Preserve bookmark folder structure on import
+Fixed mouse visibility
+Fixed some mouse click issues
+Uses Gecko version 22
+</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2014-01-19T17:09:41.9034161+01:00</ReleaseDate>
+ <ReleaseDate>2014-01-23T22:56:18.0702247+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
@@ -681,8 +684,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-23 21:40:11 UTC (rev 4753)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-23 22:04:36 UTC (rev 4754)
@@ -16,7 +16,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("MP")]
[assembly: AssemblyProduct("BrowseTheWeb")]
-[assembly: AssemblyCopyright("Copyright © 2013")]
+[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-23 21:40:15
|
Revision: 4753
http://sourceforge.net/p/mp-plugins/code/4753
Author: doskabouter
Date: 2014-01-23 21:40:11 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
plugin now based on .NET 4, so compatibility is MP 1.6 minimum
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-23 21:37:10 UTC (rev 4752)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-23 21:40:11 UTC (rev 4753)
@@ -429,8 +429,8 @@
<Description />
</SectionParam>
<SectionParam Name="Description">
- <Value>This will install [Name] version [Version] on your computer.
-It is recommended that you close all other applications before continuing.
+ <Value>This will install [Name] version [Version] on your computer.
+It is recommended that you close all other applications before continuing.
Click Next to continue or Cancel to exit Setup.</Value>
<ValueType>String</ValueType>
<Description />
@@ -554,7 +554,7 @@
<SectionParam Name="Path to plugin">
<Value>%Plugins%\windows\browsetheweb.dll</Value>
<ValueType>Template</ValueType>
- <Description>Path to the plugin like
+ <Description>Path to the plugin like
%Plugins%\Windows\plugin.dll</Description>
</SectionParam>
</Items>
@@ -608,18 +608,18 @@
<Id />
<MinVersion>
<Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
+ <Minor>6</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
</MinVersion>
<MaxVersion>
- <Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
+ <Major>9</Major>
+ <Minor>9</Minor>
+ <Build>9</Build>
+ <Revision>9</Revision>
</MaxVersion>
<WarnOnly>false</WarnOnly>
- <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Message>requires MediaPortal version 1.6 or higher.</Message>
<Name>MediaPortal</Name>
</DependencyItem>
</Items>
@@ -681,8 +681,8 @@
<SectionParam Name="Configuration file">
<Value />
<ValueType>Template</ValueType>
- <Description>The file used to configure the extension.
-If have .exe extension the will be executed
+ <Description>The file used to configure the extension.
+If have .exe extension the will be executed
If have .dll extension used like MP plugin configuration</Description>
</SectionParam>
<SectionParam Name="Online Screenshots">
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-23 21:37:10 UTC (rev 4752)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-23 21:40:11 UTC (rev 4753)
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BrowseTheWeb</RootNamespace>
<AssemblyName>BrowseTheWeb</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-23 21:37:10 UTC (rev 4752)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2014-01-23 21:40:11 UTC (rev 4753)
@@ -3,7 +3,7 @@
using System.Runtime.InteropServices;
using MediaPortal.Common.Utils;
-[assembly: CompatibleVersion("1.5.100.0", "1.3.100.0")]
+[assembly: CompatibleVersion("1.6.0.0", "1.6.0.0")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
[assembly: UsesSubsystem("MP.DB")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-23 21:37:13
|
Revision: 4752
http://sourceforge.net/p/mp-plugins/code/4752
Author: doskabouter
Date: 2014-01-23 21:37:10 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
Improved mouse click emulation
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-01-23 20:59:24 UTC (rev 4751)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-01-23 21:37:10 UTC (rev 4752)
@@ -45,9 +45,27 @@
public class GUIPlugin : GUIWindow, ISetupForm
{
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct MOUSEINPUT
+ {
+ public int X;
+ public int Y;
+ public uint MouseData;
+ public uint Flags;
+ public uint Time;
+ public IntPtr ExtraInfo;
+ }
+ [StructLayout(LayoutKind.Sequential)]
+ internal struct INPUT
+ {
+ public uint Type;
+ public MOUSEINPUT Mouse;
+ }
+
+ [DllImport("user32.dll", SetLastError = true)]
+ private static extern uint SendInput(uint numberOfInputs, INPUT[] inputs, int sizeOfInputStructure);
+
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
- public static extern void mouse_event(uint dwFlags, uint dx, uint dy, uint cButtons, IntPtr dwExtraInfo);
- [DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
public static extern int ShowCursor(bool bShow);
[DllImport("dwmapi.dll", EntryPoint = "DwmEnableComposition")]
protected extern static uint Win32DwmEnableComposition(uint uCompositionAction);
@@ -492,12 +510,7 @@
}
else
{
- webBrowser.Enabled = true;
- System.Threading.Thread.Sleep(200);
- clickFromPlugin = true;
- int X = Cursor.Position.X;
- int Y = Cursor.Position.Y;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, IntPtr.Zero);
+ ClickOn(null);
}
}
if (action.wID == settings.Remote_Bookmark)
@@ -982,19 +995,35 @@
// some items just need a mousehover, and a ge.Click won't do that
{
Point p = DomHelper.GetCenterCoordinate(webBrowser.Document, ge);
- MyLog.debug("perform click on " + p.ToString());
p.X = Convert.ToInt32(p.X * zoom);
p.Y = Convert.ToInt32(p.Y * zoom);
- webBrowser.Enabled = true;
- System.Threading.Thread.Sleep(200);
- Cursor.Position = webBrowser.PointToScreen(p);
- clickFromPlugin = true;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, IntPtr.Zero);
+ ClickOn(p);
}
//else
// ge.Click();
}
+ private int delta = 5;
+ private void ClickOn(Point? p)
+ {
+ webBrowser.Enabled = true;
+ if (p.HasValue)
+ {
+ Point newP = new Point(p.Value.X + delta, p.Value.Y);
+ delta = -delta;// some flash vids don't react to clicking on previous coordinate
+ MyLog.debug("perform click on " + newP.ToString());
+ Cursor.Position = webBrowser.PointToScreen(newP);
+ }
+
+ INPUT[] ips = new INPUT[] { new INPUT { Type = 0 }, new INPUT { Type = 0 } };
+ ips[0].Mouse.Flags = MOUSEEVENTF_LEFTDOWN;
+ ips[1].Mouse.Flags = MOUSEEVENTF_LEFTUP;
+
+ clickFromPlugin = true;
+ if (SendInput(2, ips, Marshal.SizeOf(typeof(INPUT))) == 0)
+ MyLog.debug("Error sendinput");
+ }
+
public void ShowInputDialog(bool isPassword, GeckoInputElement element)
{
webBrowser.Visible = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-23 20:59:26
|
Revision: 4751
http://sourceforge.net/p/mp-plugins/code/4751
Author: doskabouter
Date: 2014-01-23 20:59:24 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
Added solution configuration to easily debug setup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-19 19:34:48 UTC (rev 4750)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-23 20:59:24 UTC (rev 4751)
@@ -53,6 +53,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug Config|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>C:\Program Files %28x86%29\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <CodeAnalysisLogFile>C:\Program Files (x86)\Team MediaPortal\MediaPortal\plugins\Windows\BrowseTheWeb.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+ <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+ <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+ <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
+ <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+ <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+ <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Common.Utils">
<HintPath>$(ProgramFiles)\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
@@ -207,6 +225,6 @@
</Target>
-->
<PropertyGroup>
- <PostBuildEvent>if $(ConfigurationName) == Release "$(ProgramFiles)\Team MediaPortal\MediaPortal\MpeMaker" ..\..\BrowseTheWeb.xmp2 /B /UpdateXML</PostBuildEvent>
+ <PostBuildEvent>if "$(ConfigurationName)" == "Release" "$(ProgramFiles)\Team MediaPortal\MediaPortal\MpeMaker" ..\..\BrowseTheWeb.xmp2 /B /UpdateXML</PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2014-01-19 19:34:48 UTC (rev 4750)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln 2014-01-23 20:59:24 UTC (rev 4751)
@@ -5,6 +5,9 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Config|Any CPU = Debug Config|Any CPU
+ Debug Config|Mixed Platforms = Debug Config|Mixed Platforms
+ Debug Config|x86 = Debug Config|x86
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
@@ -13,6 +16,11 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug Config|Any CPU.ActiveCfg = Debug Config|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug Config|Any CPU.Build.0 = Debug Config|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug Config|Mixed Platforms.ActiveCfg = Debug Config|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug Config|Mixed Platforms.Build.0 = Debug Config|Any CPU
+ {70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug Config|x86.ActiveCfg = Debug Config|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70ECF0E8-19B6-43A9-B3B5-B1BB13F6E241}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-19 19:34:52
|
Revision: 4750
http://sourceforge.net/p/mp-plugins/code/4750
Author: doskabouter
Date: 2014-01-19 19:34:48 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
remove unnecessary resources
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/HtmlAgilityPack.dll
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-19 16:18:54 UTC (rev 4749)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-19 19:34:48 UTC (rev 4750)
@@ -17,13 +17,6 @@
<ZipFileName>Installer{CopyFile}\{1506466c-26c2-4a8f-bbe3-20b5be6eefdf}-BrowseTheWeb.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\BrowseTheWeb.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\HtmlAgilityPack.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3c35cede-0ef8-455e-8ea5-f341e7d0398e}-HtmlAgilityPack.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\HtmlAgilityPack.dll</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
@@ -666,7 +659,7 @@
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Fixed some gui issues
+ <VersionDescription>Fixed some gui issues
Fixed Compatibility with Mediaportal 1.6.0</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
@@ -714,13 +707,6 @@
<ZipFileName>Installer{CopyFile}\{1506466c-26c2-4a8f-bbe3-20b5be6eefdf}-BrowseTheWeb.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\BrowseTheWeb.dll</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\HtmlAgilityPack.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3c35cede-0ef8-455e-8ea5-f341e7d0398e}-HtmlAgilityPack.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\HtmlAgilityPack.dll</DestinationFilename>
- </FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
Deleted: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/HtmlAgilityPack.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-19 16:18:54 UTC (rev 4749)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj 2014-01-19 19:34:48 UTC (rev 4750)
@@ -72,11 +72,7 @@
<Reference Include="Geckofx-Winforms">
<HintPath>..\..\..\..\..\..\..\Gecko\Gecko 22.0-0.7\Geckofx-Winforms.dll</HintPath>
</Reference>
- <Reference Include="Ionic.Zip">
- <HintPath>$(ProgramFiles)\Team MediaPortal\MediaPortal\Ionic.Zip.dll</HintPath>
- </Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-19 16:18:58
|
Revision: 4749
http://sourceforge.net/p/mp-plugins/code/4749
Author: doskabouter
Date: 2014-01-19 16:18:54 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Moved to Gecko core 22
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/AccessibleMarshal.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/IA2Marshal.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/breakpadinjector.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/crashreporter.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/dependentlibs.list
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/dictionaries/en-US.dic
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/freebl3.chk
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/freebl3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/gkmedias.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/js.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/libEGL.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/libGLESv2.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/mozalloc.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/mozglue.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/mozjs.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nss3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nssckbi.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nssdbm3.chk
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nssdbm3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/omni.ja
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/platform.ini
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/plugin-container.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/precomplete
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/redit.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/softokn3.chk
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/softokn3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/updater.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/xul.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/xulrunner-stub.exe
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/xulrunner.exe
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BrowseTheWeb.csproj
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb.sln
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/js-gdb.py
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/plugin-hang-ui.exe
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Geckofx-Core.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Geckofx-Winforms.dll
Removed Paths:
-------------
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/chrome.manifest
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/components/
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/d3dx9_43.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/mozsqlite3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nspr4.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/nssutil3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/plc4.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/plds4.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/smime3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/ssl3.dll
trunk/plugins/BrowseTheWeb/Release/Files/xulrunner/xpcom.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/Geckofx-Winforms-18.dll
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/geckofx-core-18.dll
trunk/plugins/BrowseTheWeb/Source/geckofx-18.0/
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-19 12:38:02 UTC (rev 4748)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2014-01-19 16:18:54 UTC (rev 4749)
@@ -27,353 +27,290 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\geckofx-core-18.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7101304c-9abf-4fd0-a686-64327ece8e7d}-geckofx-core-18.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\geckofx-core-18.dll</DestinationFilename>
+ <LocalFileName>Plugins\Windows\Geckofx-Core.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{41ffb796-38a6-40a4-8e92-4a51387d5acd}-Geckofx-Core.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Geckofx-Core.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\Geckofx-Winforms-18.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6c097b5d-1f5e-4dce-bbef-aa554e8d1e49}-Geckofx-Winforms-18.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\Geckofx-Winforms-18.dll</DestinationFilename>
+ <LocalFileName>Plugins\Windows\Geckofx-Winforms.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1b30ea58-3a73-485d-8c0e-38db3c0a5099}-Geckofx-Winforms.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Geckofx-Winforms.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\AccessibleMarshal.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{5d0ef453-3120-43c8-a451-be8be8904d63}-AccessibleMarshal.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{704c8bfb-2648-48be-b546-cfafd1aec147}-AccessibleMarshal.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\AccessibleMarshal.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\breakpadinjector.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{a96b091b-bf7c-46a9-9d98-6ac54896abdc}-breakpadinjector.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{1824a42a-c1b9-4b36-a120-dd6a28ee3812}-breakpadinjector.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\breakpadinjector.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\chrome.manifest</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3ec4b636-d69c-4082-8417-f001cdae464e}-chrome.manifest</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\chrome.manifest</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\crashreporter.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b1f3fe64-8bd7-49d4-88cb-b161e0ec020f}-crashreporter.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{bc79c48a-0399-4a9d-8294-f9e7f2138e4d}-crashreporter.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\crashreporter.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\crashreporter.ini</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{287e2c62-67ec-444b-81c3-8596b87b364c}-crashreporter.ini</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{e1d9d7a3-04fc-47cd-8fc0-adafe61a21fc}-crashreporter.ini</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\crashreporter.ini</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\D3DCompiler_43.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6ee91eca-53c8-4d02-8517-6b3e19a1dcd7}-D3DCompiler_43.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{874a2cb8-66bc-47b1-a924-59c7aedeaf72}-D3DCompiler_43.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\D3DCompiler_43.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\d3dx9_43.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7532e3c2-d3d8-4be8-817c-17e30683445b}-d3dx9_43.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\d3dx9_43.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\dependentlibs.list</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{d1cca528-4b91-4bd0-8da7-6f85a011fc23}-dependentlibs.list</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{ee734ece-98b2-45e2-845a-e037b2af7b64}-dependentlibs.list</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\dependentlibs.list</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\freebl3.chk</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{72444e4f-0636-46f6-b4ac-74d66032bb18}-freebl3.chk</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{3d7d850b-d04c-443a-93f4-c815d649da13}-freebl3.chk</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\freebl3.chk</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\freebl3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0c3c0adf-44f8-4f08-845d-66c4ff09d31d}-freebl3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{049aaa8e-c25f-4f2c-ac0a-b683490eedbc}-freebl3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\freebl3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\gkmedias.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{cf32841a-329a-4a7b-99da-e1c6567b61ac}-gkmedias.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{0b00dd67-cca2-46a7-9765-9195e6f97ff4}-gkmedias.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\gkmedias.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\IA2Marshal.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{8087e539-87c4-4222-b7d8-c613341965a4}-IA2Marshal.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{dc71e2a7-11a4-4da7-8169-624e36a5a0c5}-IA2Marshal.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\IA2Marshal.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\js-gdb.py</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2eac2555-0e37-4c40-be5e-3e9b7166e88c}-js-gdb.py</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\js-gdb.py</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\js.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0e132c62-795e-4461-8a2c-a844188ecab4}-js.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d74ddb83-d0a4-47a1-8d8d-35b69e5cbec9}-js.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\js.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\libEGL.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b4ad176a-07c2-4c00-a0b8-60e393f71ed7}-libEGL.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{707eb149-bfa5-4158-b50c-1e59804dfac1}-libEGL.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\libEGL.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\libGLESv2.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{fcedc7d6-7475-49cc-896e-495601fe455e}-libGLESv2.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d67d38fd-3f13-4ed0-aa2d-70af86c7d9d3}-libGLESv2.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\libGLESv2.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\LICENSE</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7089abae-fdf0-4c79-928c-0d1e7d7597cf}-LICENSE</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{2aae553a-45cb-4b70-b1dc-029f223a12a4}-LICENSE</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\LICENSE</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozalloc.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{81d1b6c7-8fd5-418e-9e81-5a3535c93b0c}-mozalloc.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{54af4050-6f08-4c13-90e3-d2758f067a24}-mozalloc.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozalloc.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozglue.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{ecd275d9-a8cc-4193-bade-de348d4796b4}-mozglue.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{80e915c7-8e34-43b3-b079-6b7ed9b91ed1}-mozglue.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozglue.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozjs.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6b600e94-2aca-4f90-a9e5-ddda79cb8760}-mozjs.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{4107c7e1-c531-4a71-83f9-5b8264075361}-mozjs.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozjs.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\mozsqlite3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7a6f44f6-0ad7-4d82-8406-a243a2443a69}-mozsqlite3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\mozsqlite3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\msvcp100.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{33379289-cba2-467b-a8c6-72cc55ed77ab}-msvcp100.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{99eaa6db-622e-4f87-95d8-912857ca4043}-msvcp100.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\msvcp100.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\msvcr100.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{174dc3bf-0df0-4831-b0a1-9546bb59c88c}-msvcr100.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{63faaaba-5267-479b-90a3-19aa1ead2856}-msvcr100.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\msvcr100.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\nspr4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{de49c525-af61-4ade-a974-076d2f5ecc18}-nspr4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\nspr4.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nss3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{f9fefb45-1367-459f-ad1a-f157a3e226e6}-nss3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{4ea1548a-e093-4792-8822-63ffb0b9a941}-nss3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nss3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssckbi.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b050c28b-1490-4255-9589-95ad7f90de6a}-nssckbi.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{92516e88-bc35-4d15-8e9b-486581b428ee}-nssckbi.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssckbi.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssdbm3.chk</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0cfda781-eed4-4906-bb68-c6ec49d2be7e}-nssdbm3.chk</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{cc8e4fa3-d888-46e8-a009-a0ecc5e798f8}-nssdbm3.chk</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssdbm3.chk</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssdbm3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{9953f61c-54f2-4f4f-b986-97ed500a1182}-nssdbm3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{16e9cefa-f807-4734-978c-e2775d692e6a}-nssdbm3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssdbm3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\nssutil3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{65b5012a-275a-45c8-b23e-978fe0534587}-nssutil3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\nssutil3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\omni.ja</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{c1391a90-0903-427f-b7f8-4ebb594db10d}-omni.ja</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{c6bce977-80c9-45ca-b4a0-32139ff3774b}-omni.ja</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\omni.ja</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\platform.ini</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{397a0e92-5775-4e9a-bbd6-c1956193b16a}-platform.ini</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{b31ad71b-77b4-4103-9470-d6b7cb609cb4}-platform.ini</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\platform.ini</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plc4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0bc1d754-4d28-4f24-89d5-7a9cb356746b}-plc4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plc4.dll</DestinationFilename>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\plugin-container.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d0bf4f74-bb43-432b-89e6-e22584ed98b7}-plugin-container.exe</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-container.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plds4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{d0f2ea94-34d3-42c1-bfe2-4d30ef4f5762}-plds4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plds4.dll</DestinationFilename>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\plugin-hang-ui.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{bde8189a-0d42-4f3a-9d73-708ad508637f}-plugin-hang-ui.exe</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-hang-ui.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plugin-container.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{388c3679-eefc-431a-9936-38d5a9ad32b3}-plugin-container.exe</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-container.exe</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\precomplete</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6d8ff592-0e26-4378-bba3-0c6f3df03900}-precomplete</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{21066f36-a86a-4152-b2ba-7bd013456546}-precomplete</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\precomplete</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\README.xulrunner</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{737aeb25-f024-434a-be78-9d6f7819e98e}-README.xulrunner</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{9d332951-ba2e-4336-ac41-debca551d189}-README.xulrunner</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\README.xulrunner</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\redit.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{e8843f2c-78a3-411a-a6b6-9a169eca0809}-redit.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{0c0ae566-c4f6-49b9-97a0-9fceaa8f3d45}-redit.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\redit.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\smime3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{00d3b907-baa6-4a79-a5db-172ca77cf0f4}-smime3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\smime3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\softokn3.chk</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{a63aceb8-c5cf-4e61-82cb-841e149248c0}-softokn3.chk</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{3eda149d-2221-46a4-917a-d441adc16ab3}-softokn3.chk</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\softokn3.chk</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\softokn3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{2750cd50-c6d7-43da-b2bd-76dc2d7a6782}-softokn3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{f95afeed-6f04-4848-a10f-a17476e8fc57}-softokn3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\softokn3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\ssl3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0cd11faa-0b5c-4714-ad19-731d2754066e}-ssl3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\ssl3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\updater.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{65786666-ad0f-416c-909c-362c43748a6a}-updater.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d6886be1-f2bd-4160-9784-b6799f00489a}-updater.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\updater.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\xpcom.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{835e2b5c-86f8-416d-a38a-dbfe9347999e}-xpcom.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\xpcom.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\xul.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{13055766-7135-4a31-9823-4deea3eb7dcb}-xul.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{51739373-ea01-4927-abca-c5e80326007e}-xul.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\xul.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\xulrunner-stub.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{f5df0873-a9a1-455d-bf79-b0fe4fe5512c}-xulrunner-stub.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{efcc3882-31e8-4129-a2a7-5b7195fc4844}-xulrunner-stub.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\xulrunner-stub.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\xulrunner.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{1d223357-3727-42fb-a933-10b2bf31bd21}-xulrunner.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{bb2d6969-e6b0-4578-8a8d-01e5fc0a67da}-xulrunner.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\xulrunner.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\dictionaries\en-US.aff</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3af6cf93-e55a-468e-9317-5660e487970c}-en-US.aff</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{e597a5fe-5e74-4f0e-aa00-ea04f7fbde9d}-en-US.aff</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\dictionaries\en-US.aff</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\dictionaries\en-US.dic</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{ea40822e-0cd1-432e-9746-8648c48289d5}-en-US.dic</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{39d7d724-77d1-4d19-897c-a73a982728d0}-en-US.dic</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\dictionaries\en-US.dic</DestinationFilename>
</FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\components\binary.manifest</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{c6673673-3b04-401d-b764-0e06bf5f8185}-binary.manifest</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\components\binary.manifest</DestinationFilename>
- </FileItem>
</Items>
</Files>
</GroupItem>
@@ -700,8 +637,8 @@
<CompatibleVersion>
<Items>
<CompatibleVersionItem>
- <MinRequiredVersion>1.3.100.0</MinRequiredVersion>
- <DesignedForVersion>1.5.100.0</DesignedForVersion>
+ <MinRequiredVersion>1.6.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.6.0.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -733,7 +670,7 @@
Fixed Compatibility with Mediaportal 1.6.0</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2013-11-12T23:14:07.6287285+01:00</ReleaseDate>
+ <ReleaseDate>2014-01-19T17:09:41.9034161+01:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
@@ -787,353 +724,290 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\geckofx-core-18.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7101304c-9abf-4fd0-a686-64327ece8e7d}-geckofx-core-18.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\geckofx-core-18.dll</DestinationFilename>
+ <LocalFileName>Plugins\Windows\Geckofx-Core.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{41ffb796-38a6-40a4-8e92-4a51387d5acd}-Geckofx-Core.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Geckofx-Core.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
- <LocalFileName>Plugins\Windows\Geckofx-Winforms-18.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6c097b5d-1f5e-4dce-bbef-aa554e8d1e49}-Geckofx-Winforms-18.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\Geckofx-Winforms-18.dll</DestinationFilename>
+ <LocalFileName>Plugins\Windows\Geckofx-Winforms.dll</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{1b30ea58-3a73-485d-8c0e-38db3c0a5099}-Geckofx-Winforms.dll</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\Geckofx-Winforms.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\AccessibleMarshal.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{5d0ef453-3120-43c8-a451-be8be8904d63}-AccessibleMarshal.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{704c8bfb-2648-48be-b546-cfafd1aec147}-AccessibleMarshal.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\AccessibleMarshal.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\breakpadinjector.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{a96b091b-bf7c-46a9-9d98-6ac54896abdc}-breakpadinjector.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{1824a42a-c1b9-4b36-a120-dd6a28ee3812}-breakpadinjector.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\breakpadinjector.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\chrome.manifest</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{3ec4b636-d69c-4082-8417-f001cdae464e}-chrome.manifest</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\chrome.manifest</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\crashreporter.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b1f3fe64-8bd7-49d4-88cb-b161e0ec020f}-crashreporter.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{bc79c48a-0399-4a9d-8294-f9e7f2138e4d}-crashreporter.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\crashreporter.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\crashreporter.ini</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{287e2c62-67ec-444b-81c3-8596b87b364c}-crashreporter.ini</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{e1d9d7a3-04fc-47cd-8fc0-adafe61a21fc}-crashreporter.ini</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\crashreporter.ini</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\D3DCompiler_43.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6ee91eca-53c8-4d02-8517-6b3e19a1dcd7}-D3DCompiler_43.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{874a2cb8-66bc-47b1-a924-59c7aedeaf72}-D3DCompiler_43.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\D3DCompiler_43.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\d3dx9_43.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7532e3c2-d3d8-4be8-817c-17e30683445b}-d3dx9_43.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\d3dx9_43.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\dependentlibs.list</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{d1cca528-4b91-4bd0-8da7-6f85a011fc23}-dependentlibs.list</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{ee734ece-98b2-45e2-845a-e037b2af7b64}-dependentlibs.list</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\dependentlibs.list</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\freebl3.chk</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{72444e4f-0636-46f6-b4ac-74d66032bb18}-freebl3.chk</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{3d7d850b-d04c-443a-93f4-c815d649da13}-freebl3.chk</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\freebl3.chk</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\freebl3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0c3c0adf-44f8-4f08-845d-66c4ff09d31d}-freebl3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{049aaa8e-c25f-4f2c-ac0a-b683490eedbc}-freebl3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\freebl3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\gkmedias.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{cf32841a-329a-4a7b-99da-e1c6567b61ac}-gkmedias.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{0b00dd67-cca2-46a7-9765-9195e6f97ff4}-gkmedias.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\gkmedias.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\IA2Marshal.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{8087e539-87c4-4222-b7d8-c613341965a4}-IA2Marshal.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{dc71e2a7-11a4-4da7-8169-624e36a5a0c5}-IA2Marshal.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\IA2Marshal.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\js-gdb.py</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2eac2555-0e37-4c40-be5e-3e9b7166e88c}-js-gdb.py</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\js-gdb.py</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
+ <Param1 />
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\js.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0e132c62-795e-4461-8a2c-a844188ecab4}-js.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d74ddb83-d0a4-47a1-8d8d-35b69e5cbec9}-js.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\js.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\libEGL.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b4ad176a-07c2-4c00-a0b8-60e393f71ed7}-libEGL.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{707eb149-bfa5-4158-b50c-1e59804dfac1}-libEGL.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\libEGL.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\libGLESv2.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{fcedc7d6-7475-49cc-896e-495601fe455e}-libGLESv2.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{d67d38fd-3f13-4ed0-aa2d-70af86c7d9d3}-libGLESv2.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\libGLESv2.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\LICENSE</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7089abae-fdf0-4c79-928c-0d1e7d7597cf}-LICENSE</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{2aae553a-45cb-4b70-b1dc-029f223a12a4}-LICENSE</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\LICENSE</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozalloc.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{81d1b6c7-8fd5-418e-9e81-5a3535c93b0c}-mozalloc.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{54af4050-6f08-4c13-90e3-d2758f067a24}-mozalloc.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozalloc.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozglue.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{ecd275d9-a8cc-4193-bade-de348d4796b4}-mozglue.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{80e915c7-8e34-43b3-b079-6b7ed9b91ed1}-mozglue.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozglue.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\mozjs.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6b600e94-2aca-4f90-a9e5-ddda79cb8760}-mozjs.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{4107c7e1-c531-4a71-83f9-5b8264075361}-mozjs.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\mozjs.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\mozsqlite3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7a6f44f6-0ad7-4d82-8406-a243a2443a69}-mozsqlite3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\mozsqlite3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\msvcp100.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{33379289-cba2-467b-a8c6-72cc55ed77ab}-msvcp100.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{99eaa6db-622e-4f87-95d8-912857ca4043}-msvcp100.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\msvcp100.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\msvcr100.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{174dc3bf-0df0-4831-b0a1-9546bb59c88c}-msvcr100.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{63faaaba-5267-479b-90a3-19aa1ead2856}-msvcr100.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\msvcr100.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\nspr4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{de49c525-af61-4ade-a974-076d2f5ecc18}-nspr4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\nspr4.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nss3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{f9fefb45-1367-459f-ad1a-f157a3e226e6}-nss3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{4ea1548a-e093-4792-8822-63ffb0b9a941}-nss3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nss3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssckbi.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{b050c28b-1490-4255-9589-95ad7f90de6a}-nssckbi.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{92516e88-bc35-4d15-8e9b-486581b428ee}-nssckbi.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssckbi.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssdbm3.chk</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0cfda781-eed4-4906-bb68-c6ec49d2be7e}-nssdbm3.chk</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{cc8e4fa3-d888-46e8-a009-a0ecc5e798f8}-nssdbm3.chk</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssdbm3.chk</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\nssdbm3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{9953f61c-54f2-4f4f-b986-97ed500a1182}-nssdbm3.dll</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{16e9cefa-f807-4734-978c-e2775d692e6a}-nssdbm3.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\nssdbm3.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\nssutil3.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{65b5012a-275a-45c8-b23e-978fe0534587}-nssutil3.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\nssutil3.dll</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\omni.ja</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{c1391a90-0903-427f-b7f8-4ebb594db10d}-omni.ja</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{c6bce977-80c9-45ca-b4a0-32139ff3774b}-omni.ja</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\omni.ja</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\platform.ini</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{397a0e92-5775-4e9a-bbd6-c1956193b16a}-platform.ini</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{b31ad71b-77b4-4103-9470-d6b7cb609cb4}-platform.ini</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\platform.ini</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plc4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{0bc1d754-4d28-4f24-89d5-7a9cb356746b}-plc4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plc4.dll</DestinationFilename>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\plugin-container.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{d0bf4f74-bb43-432b-89e6-e22584ed98b7}-plugin-container.exe</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-container.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plds4.dll</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{d0f2ea94-34d3-42c1-bfe2-4d30ef4f5762}-plds4.dll</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plds4.dll</DestinationFilename>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <LocalFileName>Files\xulrunner\plugin-hang-ui.exe</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{bde8189a-0d42-4f3a-9d73-708ad508637f}-plugin-hang-ui.exe</ZipFileName>
+ <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-hang-ui.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>Files\xulrunner\plugin-container.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{388c3679-eefc-431a-9936-38d5a9ad32b3}-plugin-container.exe</ZipFileName>
- <DestinationFilename>%Plugins%\Windows\xulrunner\plugin-container.exe</DestinationFilename>
- </FileItem>
- <FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
- <Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\precomplete</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{6d8ff592-0e26-4378-bba3-0c6f3df03900}-precomplete</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{21066f36-a86a-4152-b2ba-7bd013456546}-precomplete</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\precomplete</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\README.xulrunner</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{737aeb25-f024-434a-be78-9d6f7819e98e}-README.xulrunner</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{9d332951-ba2e-4336-ac41-debca551d189}-README.xulrunner</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\README.xulrunner</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="false">
<Param1 />
- <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>Files\xulrunner\redit.exe</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{e8843f2c-78a3-411a-a6b6-9a169eca0809}-redit.exe</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{0c0ae566-c4f6-49b9-97a0-9fceaa8f3d45}-redit.exe</ZipFileName>
<DestinationFilename>%Plugins%\Windows\xulrunner\redit.exe</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified=...
[truncated message content] |
|
From: <dos...@us...> - 2014-01-19 12:38:04
|
Revision: 4748
http://sourceforge.net/p/mp-plugins/code/4748
Author: doskabouter
Date: 2014-01-19 12:38:02 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
minor cleanup
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-01-19 12:35:31 UTC (rev 4747)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-01-19 12:38:02 UTC (rev 4748)
@@ -557,7 +557,7 @@
GUIGraphicsContext.form.Cursor = new Cursor(memoryStream);
}
mouseVisible = true;
- while (ShowCursor(true) < 0) ;
+ while (ShowCursor(true) < 0);
}
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-19 12:35:35
|
Revision: 4747
http://sourceforge.net/p/mp-plugins/code/4747
Author: doskabouter
Date: 2014-01-19 12:35:31 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Fixed mouse visibility bug
minor cleanup
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-01-19 12:31:57 UTC (rev 4746)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2014-01-19 12:35:31 UTC (rev 4747)
@@ -31,6 +31,7 @@
using MediaPortal.Dialogs;
using MediaPortal.Configuration;
+using System.Reflection;
using System.Windows.Forms;
using System.Runtime.InteropServices;
@@ -44,7 +45,7 @@
public class GUIPlugin : GUIWindow, ISetupForm
{
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
- public static extern void mouse_event(long dwFlags, long dx, long dy, long cButtons, long dwExtraInfo);
+ public static extern void mouse_event(uint dwFlags, uint dx, uint dy, uint cButtons, IntPtr dwExtraInfo);
[DllImport("user32.dll", CharSet = CharSet.Auto, CallingConvention = CallingConvention.StdCall)]
public static extern int ShowCursor(bool bShow);
[DllImport("dwmapi.dll", EntryPoint = "DwmEnableComposition")]
@@ -78,6 +79,7 @@
public static string loadFav = string.Empty;
private bool originalMouseSupport;
+ private bool originalMouseAutoHide;
private bool formsAdded = false;
#endregion
@@ -266,6 +268,9 @@
originalMouseSupport = GUIGraphicsContext.MouseSupport;
GUIGraphicsContext.MouseSupport = true;
while (ShowCursor(true) < 0) ;
+ FieldInfo fi = GUIGraphicsContext.form.GetType().GetField("AutoHideMouse", BindingFlags.NonPublic | BindingFlags.Instance);
+ originalMouseAutoHide = (bool)fi.GetValue(GUIGraphicsContext.form);
+ fi.SetValue(GUIGraphicsContext.form, false);
}
Parameter = _loadParameter;
@@ -492,7 +497,7 @@
clickFromPlugin = true;
int X = Cursor.Position.X;
int Y = Cursor.Position.Y;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, IntPtr.Zero);
}
}
if (action.wID == settings.Remote_Bookmark)
@@ -932,7 +937,7 @@
#endregion
if (logHtml)
{
- using (System.IO.StreamWriter tw = new System.IO.StreamWriter(@"e:\last.html"))
+ using (System.IO.StreamWriter tw = new System.IO.StreamWriter(@"d:\last.html"))
{
tw.WriteLine(((GeckoHtmlElement)webBrowser.Document.DocumentElement).OuterHtml);
}
@@ -1008,7 +1013,7 @@
System.Threading.Thread.Sleep(200);
Cursor.Position = webBrowser.PointToScreen(p);
clickFromPlugin = true;
- mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
+ mouse_event(MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP, 0, 0, 0, IntPtr.Zero);
}
//else
// ge.Click();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2014-01-19 12:32:00
|
Revision: 4746
http://sourceforge.net/p/mp-plugins/code/4746
Author: doskabouter
Date: 2014-01-19 12:31:57 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Added detection of embedded flash objects
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-01-19 11:42:42 UTC (rev 4745)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2014-01-19 12:31:57 UTC (rev 4746)
@@ -183,6 +183,19 @@
}
}
+ GeckoElementCollection embeds = document.GetElementsByTagName("embed");
+ MyLog.debug("page embeds cnt : " + embeds.Count);
+ foreach (GeckoEmbedElement element in embeds)
+ if (element.Type == "application/x-shockwave-flash")
+ {
+ if (!elementDone(element))
+ {
+ insertSpanAfter(id, null, element.Parent, "color:black;background-color:white");
+ SetLinkAttributes(element, id);
+ id++;
+ }
+ }
+
GeckoElementCollection forms = document.GetElementsByTagName("form");
MyLog.debug("page forms cnt : " + forms.Count);
foreach (GeckoHtmlElement element in forms)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-01-19 11:42:45
|
Revision: 4745
http://sourceforge.net/p/mp-plugins/code/4745
Author: nicsergio
Date: 2014-01-19 11:42:42 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-01-19 11:31:09 UTC (rev 4744)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-01-19 11:42:42 UTC (rev 4745)
@@ -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: <nic...@us...> - 2014-01-19 11:31:12
|
Revision: 4744
http://sourceforge.net/p/mp-plugins/code/4744
Author: nicsergio
Date: 2014-01-19 11:31:09 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2
trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 2014-01-19 11:29:30 UTC (rev 4743)
+++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 2014-01-19 11:31:09 UTC (rev 4744)
@@ -253,21 +253,7 @@
</Items>
</Dependencies>
<PluginDependencies>
- <Items>
- <PluginDependencyItem AssemblyName="ShortCuter.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
- <DesignedForVersion>1.1.6.27644</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items />
- </SubSystemsUsed>
- </PluginDependencyItem>
- </Items>
+ <Items />
</PluginDependencies>
<GeneralInfo>
<Name>ShortCut'er</Name>
@@ -287,10 +273,10 @@
For each shortcut you can define a keystroke combination such as:
<CTRL> + <ALT> + <SHIFT> + <KEY></ExtensionDescription>
- <VersionDescription> - completely overrides at start-up (CapsLock & NumLock)
+ <VersionDescription> - full forcing Caps-Lock & Num-Lock at start-up
- improving the shortcut key assignment
- - management cyclical destinations for shotcuts
- - management go to previous window
+ - management cyclical shotcuts (multi destinations)
+ - management toggle shortcuts (go to previous window if already at destination)
- add clone shortcut command</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1</OnlineLocation>
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2014-01-19 11:29:30 UTC (rev 4743)
+++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2014-01-19 11:31:09 UTC (rev 4744)
@@ -762,21 +762,7 @@
</Items>
</Dependencies>
<PluginDependencies>
- <Items>
- <PluginDependencyItem AssemblyName="ShortCuter.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
- <DesignedForVersion>1.1.6.27644</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items />
- </SubSystemsUsed>
- </PluginDependencyItem>
- </Items>
+ <Items />
</PluginDependencies>
<GeneralInfo>
<Name>ShortCut'er</Name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-01-19 11:29:32
|
Revision: 4743
http://sourceforge.net/p/mp-plugins/code/4743
Author: nicsergio
Date: 2014-01-19 11:29:30 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2014-01-19 11:26:25 UTC (rev 4742)
+++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2014-01-19 11:29:30 UTC (rev 4743)
@@ -796,10 +796,10 @@
For each shortcut you can define a keystroke combination such as:
<CTRL> + <ALT> + <SHIFT> + <KEY></ExtensionDescription>
- <VersionDescription> - completely overrides at start-up (CapsLock & NumLock)
+ <VersionDescription> - full forcing Caps-Lock & Num-Lock at start-up
- improving the shortcut key assignment
- - management cyclical destinations for shotcuts
- - management go to previous window
+ - management cyclical shotcuts (multi destinations)
+ - management toggle shortcuts (go to previous window if already at destination)
- add clone shortcut command</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1</OnlineLocation>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-01-19 11:26:28
|
Revision: 4742
http://sourceforge.net/p/mp-plugins/code/4742
Author: nicsergio
Date: 2014-01-19 11:26:25 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt
Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt 2014-01-19 11:17:09 UTC (rev 4741)
+++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt 2014-01-19 11:26:25 UTC (rev 4742)
@@ -1,9 +1,9 @@
- V2.0.6 (01/17/2014)
- > completely overrides at start-up (CapsLock & NumLock)
+ > full forcing Caps-Lock & Num-Lock at start-up
> improving the shortcut key assignment
- > management cyclical destinations for shotcuts
- > management go to previous window
+ > management cyclical shotcuts (multi destinations)
+ > management toggle shortcuts (go to previous window if already at destination)
> add clone shortcut command
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nic...@us...> - 2014-01-19 11:17:12
|
Revision: 4741
http://sourceforge.net/p/mp-plugins/code/4741
Author: nicsergio
Date: 2014-01-19 11:17:09 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
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/ShortCuterKeyConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-19 11:17:09 UTC (rev 4741)
@@ -55,7 +55,6 @@
<Content Include="Resources\Images\ArrowLeft.png" />
<Content Include="Resources\Images\ArrowRight.png" />
<Content Include="Resources\Images\ArrowUp.png" />
- <Content Include="Resources\Images\Error.png" />
<Content Include="Resources\Images\Info.png" />
<Content Include="Resources\Images\Internet.png" />
<Content Include="Resources\Images\Ok.png" />
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-19 11:17:09 UTC (rev 4741)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.17929
+// Versione runtime:4.0.30319.18052
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
@@ -73,16 +73,6 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap Error {
- get {
- object obj = ResourceManager.GetObject("Error", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
internal static System.Drawing.Bitmap Info {
get {
object obj = ResourceManager.GetObject("Info", resourceCulture);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-19 11:17:09 UTC (rev 4741)
@@ -142,11 +142,8 @@
<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="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\..\common\resources\images\error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-19 11:17:09 UTC (rev 4741)
@@ -156,9 +156,6 @@
<Content Include="..\Common\Resources\Images\ArrowDown.png">
<Link>Resources\Images\ArrowDown.png</Link>
</Content>
- <Content Include="..\Common\Resources\Images\Error.png">
- <Link>Resources\Images\Error.png</Link>
- </Content>
<Content Include="..\Common\Resources\Images\Info.png">
<Link>Resources\Images\Info.png</Link>
</Content>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs 2014-01-19 11:17:09 UTC (rev 4741)
@@ -28,11 +28,9 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
this.keyGroupBox = new System.Windows.Forms.GroupBox();
this.keyLabel = new System.Windows.Forms.Label();
this.okPictureBox = new System.Windows.Forms.PictureBox();
- this.errorImageTimer = new System.Windows.Forms.Timer(this.components);
this.keyGroupBox.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).BeginInit();
this.SuspendLayout();
@@ -68,11 +66,6 @@
this.okPictureBox.TabStop = false;
this.okPictureBox.Click += new System.EventHandler(this.okPictureBox_Click);
//
- // errorImageTimer
- //
- this.errorImageTimer.Interval = 500;
- this.errorImageTimer.Tick += new System.EventHandler(this.errorImageTimer_Tick);
- //
// ShortCuterKeyConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -101,6 +94,5 @@
private System.Windows.Forms.GroupBox keyGroupBox;
private System.Windows.Forms.Label keyLabel;
private System.Windows.Forms.PictureBox okPictureBox;
- private System.Windows.Forms.Timer errorImageTimer;
}
}
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-01-19 11:17:09 UTC (rev 4741)
@@ -39,21 +39,10 @@
mySc.Key = keyLabel.Text; //--> memorizzazione tasto assegnato allo shortcut
this.Close(); //--> chiusura form
}
- private void errorImageTimer_Tick(object sender, EventArgs e)
- {
- okPictureBox.Image = ProcessPlugins.ShortCuter.Properties.Resources.Ok; //--> ripristino immagine "ok"
- errorImageTimer.Enabled = false;
- }
private void keyboardHook_KeyDown(object sender, KeyEventArgs e) //Evento KeyDown intercettato dall'hook
{
- if (ShortCut.ModifierKeys.Contains(e.KeyCode)) //Se premuto un modificatore
- {
- okPictureBox.Image = ProcessPlugins.ShortCuter.Properties.Resources.Error; //--> visualizzazione temporanea immagine "error"
- errorImageTimer.Enabled = true; //--> attivazione timer per ripristino immagine
- }
- else
+ if (!ShortCut.ModifierKeys.Contains(e.KeyCode))
keyLabel.Text = e.KeyCode.ToString(); //--> visualizzazione tasto premuto, se non corrisponde ad un modificatore
-
e.Handled = true; //--> il tasto premuto viene ignorato
}
#endregion
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx 2014-01-18 16:35:35 UTC (rev 4740)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx 2014-01-19 11:17:09 UTC (rev 4741)
@@ -123,16 +123,13 @@
<metadata name="keyLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="keyLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="okPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="errorImageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>9, 6</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>36</value>
- </metadata>
</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.
|
2 messages has been excluded from this view by a project administrator.
