Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4477] trunk/plugins/BrowseTheWeb/Source/ BrowseTheWeb
|
From: <dos...@us...> - 2012-04-08 21:51:07
|
Revision: 4477
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4477&view=rev
Author: doskabouter
Date: 2012-04-08 21:50:59 +0000 (Sun, 08 Apr 2012)
Log Message:
-----------
general cleanup/formatting
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Mouse.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/OSD_LinkId.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Settings.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Setup.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Bookmark.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,8 +23,6 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Xml;
using System.IO;
using System.Windows.Forms;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkElement.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,21 +23,19 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public class BookmarkElement
- {
- public string Name = string.Empty;
- public string Url = string.Empty;
+ public class BookmarkElement
+ {
+ public string Name = string.Empty;
+ public string Url = string.Empty;
- public int Visited = 0;
- public DateTime LastVisited;
- public DateTime Created = DateTime.Now;
+ public int Visited = 0;
+ public DateTime LastVisited;
+ public DateTime Created = DateTime.Now;
- public bool isFolder = false;
- public bool isSubFolder = false;
- }
+ public bool isFolder = false;
+ public bool isSubFolder = false;
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/BookmarkXml.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,167 +24,166 @@
using System;
using System.Collections.Generic;
-using System.Text;
using System.Xml;
using System.IO;
namespace BrowseTheWeb
{
- public class BookmarkXml
- {
- public static List<BookmarkElement> BookmarkItems = new List<BookmarkElement>();
-
- private static void InitBookmarks(string Path)
+ public class BookmarkXml
{
- if (!File.Exists(Path))
- {
- string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
- StreamWriter sr = new StreamWriter(Path);
- sr.Write(s);
- sr.Close();
- }
- }
+ public static List<BookmarkElement> BookmarkItems = new List<BookmarkElement>();
- public static bool LoadBookmarks(string Path)
- {
- InitBookmarks(Path);
-
- BookmarkItems = new List<BookmarkElement>();
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
-
- XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
- foreach (XmlNode node in col)
+ private static void InitBookmarks(string Path)
{
- BookmarkElement elem = GetData(node);
- BookmarkItems.Add(elem);
+ if (!File.Exists(Path))
+ {
+ string s = "<?xml version=\"1.0\"?>\n<Bookmarks />";
+ StreamWriter sr = new StreamWriter(Path);
+ sr.Write(s);
+ sr.Close();
+ }
}
- }
- catch
- {
- return false;
- }
- return true;
- }
- public static BookmarkElement GetData(XmlNode Node)
- {
- BookmarkElement result = new BookmarkElement();
- result.Name = Node.SelectSingleNode("Name").InnerText;
- result.Url = Node.SelectSingleNode("URL").InnerText;
+ public static bool LoadBookmarks(string Path)
+ {
+ InitBookmarks(Path);
- result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
- result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
- result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
+ BookmarkItems = new List<BookmarkElement>();
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
- result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
+ XmlNodeList col = xmlDocument.GetElementsByTagName("Entry");
+ foreach (XmlNode node in col)
+ {
+ BookmarkElement elem = GetData(node);
+ BookmarkItems.Add(elem);
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ return true;
+ }
+ public static BookmarkElement GetData(XmlNode Node)
+ {
+ BookmarkElement result = new BookmarkElement();
- return result;
- }
+ result.Name = Node.SelectSingleNode("Name").InnerText;
+ result.Url = Node.SelectSingleNode("URL").InnerText;
- public static void AddFolder(string Path, string FolderName)
- {
- InitBookmarks(Path);
+ result.Visited = Convert.ToInt32(Node.SelectSingleNode("Visited").InnerText);
+ result.LastVisited = Convert.ToDateTime(Node.SelectSingleNode("LastVisited").InnerText);
+ result.Created = Convert.ToDateTime(Node.SelectSingleNode("Created").InnerText);
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
+ result.isFolder = Convert.ToBoolean(Node.SelectSingleNode("isFolder").InnerText);
+ result.isSubFolder = Convert.ToBoolean(Node.SelectSingleNode("isSubFolder").InnerText);
- bool found = false;
-
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == FolderName) found = true;
- }
+ return result;
}
- if (!found)
+ public static void AddFolder(string Path, string FolderName)
{
- XmlElement childElement = xmlDocument.CreateElement("Entry");
+ InitBookmarks(Path);
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = "0";
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "true";
- childElement.AppendChild(sub7);
- XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "false";
- childElement.AppendChild(sub8);
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertBefore(childElement, parentNode.FirstChild);
- }
- xmlDocument.Save(Path);
- }
- catch
- { }
- }
- public static bool AddBookmark(string Title, string Url, string Path, long ID)
- {
- try
- {
- XmlDocument xmlDocument = new XmlDocument();
- xmlDocument.Load(Path);
+ bool found = false;
- bool found = false;
- XmlNode folder = null;
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == FolderName) found = true;
+ }
+ }
- foreach (XmlNode r in xmlDocument.ChildNodes)
- {
+ if (!found)
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
- foreach (XmlNode one in r.ChildNodes)
- {
- if (one.FirstChild.InnerText == Title) found = true;
- if (one.FirstChild.InnerText == "Saved by MP") folder = one;
- }
- }
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = FolderName;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = string.Empty;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = "0";
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "true";
+ childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "false";
+ childElement.AppendChild(sub8);
- if ((!found) && (folder != null))
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertBefore(childElement, parentNode.FirstChild);
+ }
+ xmlDocument.Save(Path);
+ }
+ catch
+ { }
+ }
+ public static bool AddBookmark(string Title, string Url, string Path, long ID)
{
- XmlElement childElement = xmlDocument.CreateElement("Entry");
+ try
+ {
+ XmlDocument xmlDocument = new XmlDocument();
+ xmlDocument.Load(Path);
- XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
- childElement.AppendChild(sub1);
- XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
- childElement.AppendChild(sub2);
- XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = ID.ToString();
- childElement.AppendChild(sub3);
- XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
- childElement.AppendChild(sub4);
- XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
- childElement.AppendChild(sub5);
- XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
- childElement.AppendChild(sub6);
- XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "false";
- childElement.AppendChild(sub7);
- XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "true";
- childElement.AppendChild(sub8);
+ bool found = false;
+ XmlNode folder = null;
- XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
- parentNode.InsertAfter(childElement, folder);
+ foreach (XmlNode r in xmlDocument.ChildNodes)
+ {
- xmlDocument.Save(Path);
- return true;
- }
+ foreach (XmlNode one in r.ChildNodes)
+ {
+ if (one.FirstChild.InnerText == Title) found = true;
+ if (one.FirstChild.InnerText == "Saved by MP") folder = one;
+ }
+ }
- }
- catch
- { }
- return false;
+ if ((!found) && (folder != null))
+ {
+ XmlElement childElement = xmlDocument.CreateElement("Entry");
+
+ XmlElement sub1 = xmlDocument.CreateElement("Name"); sub1.InnerText = Title;
+ childElement.AppendChild(sub1);
+ XmlElement sub2 = xmlDocument.CreateElement("URL"); sub2.InnerText = Url;
+ childElement.AppendChild(sub2);
+ XmlElement sub3 = xmlDocument.CreateElement("ID"); sub3.InnerText = ID.ToString();
+ childElement.AppendChild(sub3);
+ XmlElement sub4 = xmlDocument.CreateElement("Visited"); sub4.InnerText = "0";
+ childElement.AppendChild(sub4);
+ XmlElement sub5 = xmlDocument.CreateElement("LastVisited"); sub5.InnerText = "0001-01-01T00:00:00";
+ childElement.AppendChild(sub5);
+ XmlElement sub6 = xmlDocument.CreateElement("Created"); sub6.InnerText = DateTime.UtcNow.ToString("u", null);
+ childElement.AppendChild(sub6);
+ XmlElement sub7 = xmlDocument.CreateElement("isFolder"); sub7.InnerText = "false";
+ childElement.AppendChild(sub7);
+ XmlElement sub8 = xmlDocument.CreateElement("isSubFolder"); sub8.InnerText = "true";
+ childElement.AppendChild(sub8);
+
+ XmlNode parentNode = xmlDocument.SelectSingleNode("Bookmarks");
+ parentNode.InsertAfter(childElement, folder);
+
+ xmlDocument.Save(Path);
+ return true;
+ }
+
+ }
+ catch
+ { }
+ return false;
+ }
}
- }
}
\ No newline at end of file
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIBookmark.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,15 +22,8 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Drawing;
using MediaPortal.GUI.Library;
-using MediaPortal.Dialogs;
-using MediaPortal.Util;
using MediaPortal.Configuration;
using System.Xml;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,13 +24,10 @@
using System;
using System.Collections.Generic;
-using System.Text;
-using System.IO;
using System.Drawing;
using MediaPortal.GUI.Library;
using MediaPortal.Dialogs;
-using MediaPortal.Util;
using MediaPortal.Configuration;
using System.Windows.Forms;
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetFolder.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,52 +23,47 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
namespace BrowseTheWeb
{
- public partial class GetFolder : Form
- {
- public string SelectedFolderName = string.Empty;
-
- public GetFolder()
+ public partial class GetFolder : Form
{
- InitializeComponent();
- this.DialogResult = DialogResult.Cancel;
- }
- private void GetFolder_Load(object sender, EventArgs e)
- {
- txtName.Text = SelectedFolderName;
- }
+ public string SelectedFolderName = string.Empty;
- private void btnOK_Click(object sender, EventArgs e)
- {
- if (txtName.Text != string.Empty)
- {
- this.DialogResult = DialogResult.OK;
- SelectedFolderName = txtName.Text;
- Close();
- }
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.DialogResult = DialogResult.Cancel;
- Close();
- }
+ public GetFolder()
+ {
+ InitializeComponent();
+ this.DialogResult = DialogResult.Cancel;
+ }
+ private void GetFolder_Load(object sender, EventArgs e)
+ {
+ txtName.Text = SelectedFolderName;
+ }
- private void txtName_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- btnOK_Click(this, new EventArgs());
- }
- }
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ if (txtName.Text != string.Empty)
+ {
+ this.DialogResult = DialogResult.OK;
+ SelectedFolderName = txtName.Text;
+ Close();
+ }
+ }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ Close();
+ }
-
- }
+ private void txtName_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ btnOK_Click(this, new EventArgs());
+ }
+ }
+
+
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetThumb.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,80 +23,76 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using Skybound.Gecko;
namespace BrowseTheWeb
{
- public partial class GetThumb : Form
- {
- public string SelectedUrl = string.Empty;
- private GeckoWebBrowser browser;
- private Bitmap snap;
+ public partial class GetThumb : Form
+ {
+ public string SelectedUrl = string.Empty;
+ private GeckoWebBrowser browser;
+ private Bitmap snap;
- private bool received = false;
- private int time = 0;
- private int cancel = 0;
+ private bool received = false;
+ private int time = 0;
+ private int cancel = 0;
- public GetThumb()
- {
- InitializeComponent();
+ public GetThumb()
+ {
+ InitializeComponent();
- browser = new GeckoWebBrowser();
- this.Controls.Add(browser);
- }
- private void GetThumb_Load(object sender, EventArgs e)
- {
- browser.Visible = false;
- chkUrl.Checked = true;
+ browser = new GeckoWebBrowser();
+ this.Controls.Add(browser);
+ }
+ private void GetThumb_Load(object sender, EventArgs e)
+ {
+ browser.Visible = false;
+ chkUrl.Checked = true;
- txtUrl.Text = SelectedUrl;
+ txtUrl.Text = SelectedUrl;
- browser.Size = new Size(800, 1024);
- browser.DocumentCompleted += new EventHandler(browser_DocumentCompleted);
- browser.Navigate(SelectedUrl);
- }
+ browser.Size = new Size(800, 1024);
+ browser.DocumentCompleted += new EventHandler(browser_DocumentCompleted);
+ browser.Navigate(SelectedUrl);
+ }
- private void browser_DocumentCompleted(object sender, EventArgs e)
- {
- if (browser.Url.ToString() != "about:blank")
- {
- snap = new Bitmap(browser.Width, browser.Height);
- browser.DrawToBitmap(snap, new Rectangle(0, 0, browser.Width, browser.Height));
+ private void browser_DocumentCompleted(object sender, EventArgs e)
+ {
+ if (browser.Url.ToString() != "about:blank")
+ {
+ snap = new Bitmap(browser.Width, browser.Height);
+ browser.DrawToBitmap(snap, new Rectangle(0, 0, browser.Width, browser.Height));
- snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
+ snap = MediaPortal.Util.BitmapResize.Resize(ref snap, 300, 400, false, true);
- Graphics g = Graphics.FromImage((Image)snap);
- g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
+ Graphics g = Graphics.FromImage((Image)snap);
+ g.DrawRectangle(new Pen(Color.Black, 2), new Rectangle(1, 1, snap.Width - 2, snap.Height - 2));
- Bookmark.SaveSnap(snap, SelectedUrl);
- received = true;
- chkGetThumb.Checked = true;
- }
- }
+ Bookmark.SaveSnap(snap, SelectedUrl);
+ received = true;
+ chkGetThumb.Checked = true;
+ }
+ }
- private void button1_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void button1_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- private void timer1_Tick(object sender, EventArgs e)
- {
- cancel++;
- if (cancel > 100) this.Close();
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ cancel++;
+ if (cancel > 100) this.Close();
- if (received)
- {
- time++;
- // implemented maybe later to get flash loaded...
- if (time > 0) this.Close();
- }
+ if (received)
+ {
+ time++;
+ // implemented maybe later to get flash loaded...
+ if (time > 0) this.Close();
+ }
+ }
}
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GetUrl.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -23,71 +23,66 @@
#endregion
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
namespace BrowseTheWeb
{
- public partial class GetUrl : Form
- {
- public string SelectedName = string.Empty;
- public string SelectedUrl = string.Empty;
-
- public GetUrl()
+ public partial class GetUrl : Form
{
- InitializeComponent();
- this.DialogResult = DialogResult.Cancel;
- }
- private void GetUrl_Load(object sender, EventArgs e)
- {
- txtName.Text = SelectedName;
- txtUrl.Text = SelectedUrl;
- }
+ public string SelectedName = string.Empty;
+ public string SelectedUrl = string.Empty;
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.DialogResult = DialogResult.Cancel;
- this.Close();
- }
- private void btnOK_Click(object sender, EventArgs e)
- {
- try
- {
- Uri u = new Uri(txtUrl.Text);
- if (SelectedName != string.Empty)
+ public GetUrl()
{
- SelectedName = txtName.Text;
- SelectedUrl = txtUrl.Text;
+ InitializeComponent();
+ this.DialogResult = DialogResult.Cancel;
+ }
+ private void GetUrl_Load(object sender, EventArgs e)
+ {
+ txtName.Text = SelectedName;
+ txtUrl.Text = SelectedUrl;
+ }
- if (SelectedName.EndsWith("/")) SelectedName = SelectedName.Substring(0, SelectedName.Length - 1);
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.DialogResult = DialogResult.Cancel;
+ this.Close();
+ }
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ Uri u = new Uri(txtUrl.Text);
+ if (SelectedName != string.Empty)
+ {
+ SelectedName = txtName.Text;
+ SelectedUrl = txtUrl.Text;
- this.DialogResult = DialogResult.OK;
- this.Close();
+ if (SelectedName.EndsWith("/")) SelectedName = SelectedName.Substring(0, SelectedName.Length - 1);
+
+ this.DialogResult = DialogResult.OK;
+ this.Close();
+ }
+ }
+ catch
+ {
+ MessageBox.Show("Wrong URL !!!");
+ }
}
- }
- catch
- {
- MessageBox.Show("Wrong URL !!!");
- }
- }
- private void txtUrl_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- btnOK_Click(this, new EventArgs());
- }
+ private void txtUrl_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ btnOK_Click(this, new EventArgs());
+ }
+ }
+ private void txtName_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ txtUrl.Focus();
+ }
+ }
}
- private void txtName_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- txtUrl.Focus();
- }
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlInputType.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,16 +22,13 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public enum HtmlInputType
+ public enum HtmlInputType
{
- Input,
- Link,
- Action
+ Input,
+ Link,
+ Action
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/HtmlLinkNumber.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -22,28 +22,25 @@
*/
#endregion
-using System;
-using System.Collections.Generic;
-using System.Text;
namespace BrowseTheWeb
{
- public class HtmlLinkNumber
- {
- public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type)
+ public class HtmlLinkNumber
{
- Type = type;
- Number = number;
- Name = name;
- Id = id;
- Link = link;
+ public HtmlLinkNumber(int number, string id, string name, string link, HtmlInputType type)
+ {
+ Type = type;
+ Number = number;
+ Name = name;
+ Id = id;
+ Link = link;
- }
+ }
- public int Number { get; set; }
- public string Id { get; set; }
- public string Name { get; set; }
- public HtmlInputType Type { get; set; }
- public string Link { get; set; }
- }
+ public int Number { get; set; }
+ public string Id { get; set; }
+ public string Name { get; set; }
+ public HtmlInputType Type { get; set; }
+ public string Link { get; set; }
+ }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportChrome.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,211 +24,206 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
namespace BrowseTheWeb
{
- public partial class ImportChrome : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportChrome(TreeView SetupTreeview)
+ public partial class ImportChrome : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import Chrome")
+ public ImportChrome(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import Chrome")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
}
- }
- counter++;
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
}
- }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void ImportChr_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+ path += "\\Google\\Chrome\\User Data\\Default";
- private void ImportChr_Load(object sender, EventArgs e)
- {
- try
- {
- string path = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
- path += "\\Google\\Chrome\\User Data\\Default";
+ MyLog.debug("Chrome folder is " + path);
- MyLog.debug("Chrome folder is " + path);
+ if (Directory.Exists(path))
+ {
+ if (File.Exists(path + "\\Bookmarks"))
+ {
+ MyLog.debug("Open bookmarks");
- if (Directory.Exists(path))
- {
- if (File.Exists(path + "\\Bookmarks"))
- {
- MyLog.debug("Open bookmarks");
+ StreamReader sr = new StreamReader(path + "\\Bookmarks");
+ string line = sr.ReadToEnd();
+ sr.Close();
- StreamReader sr = new StreamReader(path + "\\Bookmarks");
- string line = sr.ReadToEnd();
- sr.Close();
+ MyLog.debug("Read " + line.Length + " bytes");
- MyLog.debug("Read " + line.Length + " bytes");
+ int x = 0;
+ int secNo = 1;
- int x = 0;
- int secNo = 1;
+ while ((x = line.IndexOf("children\": [", x + 1)) > 0)
+ {
+ int y = line.IndexOf("]", x + 12);
+ string section = line.Substring(x + 12, y - x - 12);
- while ((x = line.IndexOf("children\": [", x + 1)) > 0)
- {
- int y = line.IndexOf("]", x + 12);
- string section = line.Substring(x + 12, y - x - 12);
+ MyLog.debug("Read section " + secNo);
+ secNo++;
- MyLog.debug("Read section " + secNo);
- secNo++;
+ int start = 0;
+ while ((start = section.IndexOf("{", start + 1)) > 0)
+ {
+ int stop = section.IndexOf("}", start + 1);
+ string entry = section.Substring(start + 1, stop - start - 3);
- int start = 0;
- while ((start = section.IndexOf("{", start + 1)) > 0)
- {
- int stop = section.IndexOf("}", start + 1);
- string entry = section.Substring(start + 1, stop - start - 3);
+ string[] sep = new string[1];
+ sep[0] = "\r\n";
+ string[] lines = entry.Split(sep, StringSplitOptions.RemoveEmptyEntries);
- string[] sep = new string[1];
- sep[0] = "\r\n";
- string[] lines = entry.Split(sep, StringSplitOptions.RemoveEmptyEntries);
+ for (int i = 0; i < lines.Length; i++)
+ {
+ lines[i] = lines[i].Replace("\"", "");
+ lines[i] = lines[i].Trim();
+ }
- for (int i = 0; i < lines.Length; i++)
- {
- lines[i] = lines[i].Replace("\"", "");
- lines[i] = lines[i].Trim();
- }
+ string name = string.Empty;
+ string url = string.Empty;
+ string typ = string.Empty;
- string name = string.Empty;
- string url = string.Empty;
- string typ = string.Empty;
+ for (int i = 0; i < lines.Length; i++)
+ {
+ if (lines[i].StartsWith("type:"))
+ {
+ typ = lines[i].Replace("type:", "").Trim();
+ if (typ.EndsWith(",")) typ = typ.Substring(0, typ.Length - 1);
+ }
+ if (lines[i].StartsWith("name:"))
+ {
+ name = lines[i].Replace("name:", "").Trim();
+ if (name.EndsWith(",")) name = name.Substring(0, name.Length - 1);
+ }
+ if (lines[i].StartsWith("url:"))
+ { // with /
+ url = lines[i].Replace("url:", "").Trim();
+ }
+ }
- for (int i = 0; i < lines.Length; i++)
- {
- if (lines[i].StartsWith("type:"))
- {
- typ = lines[i].Replace("type:", "").Trim();
- if (typ.EndsWith(",")) typ = typ.Substring(0, typ.Length - 1);
- }
- if (lines[i].StartsWith("name:"))
- {
- name = lines[i].Replace("name:", "").Trim();
- if (name.EndsWith(",")) name = name.Substring(0, name.Length - 1);
- }
- if (lines[i].StartsWith("url:"))
- { // with /
- url = lines[i].Replace("url:", "").Trim();
- }
- }
+ if ((name != "") && (typ == "url") && (url != ""))
+ {
+ MyLog.debug("Found bookmark " + name);
- if ((name != "") && (typ == "url") && (url != ""))
- {
- MyLog.debug("Found bookmark " + name);
+ BookmarkElement bkm = new BookmarkElement();
+ bkm.Url = url;
+ bkm.Name = name;
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = name;
+ EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
+ }
+ }
+ }
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
- }
- }
- }
+ }
- }
+ }
+ }
+ catch (Exception ex)
+ {
+ MyLog.debug("Exception import chrome : " + ex.Message);
+ MyLog.debug("Exception import chrome : " + ex.StackTrace);
+ }
+ }
+ private BookmarkElement GetBookmark(string Name)
+ {
+ foreach (BookmarkElement bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
}
- }
- catch (Exception ex)
- {
- MyLog.debug("Exception import chrome : " + ex.Message);
- MyLog.debug("Exception import chrome : " + ex.StackTrace);
- }
- }
- private BookmarkElement GetBookmark(string Name)
- {
- foreach (BookmarkElement bkm in EntryList)
- {
- if (bkm.Name == Name) return bkm;
- }
- return null;
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
}
-
- private void btnSelect_Click(object sender, EventArgs e)
- {
- for (int i = 0; i < listBox1.Items.Count; i++)
- {
- listBox1.SetSelected(i, select);
- }
- select = !select;
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportFF.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,166 +24,161 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
using SQLite.NET;
namespace BrowseTheWeb
{
- public partial class ImportFF : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportFF(TreeView SetupTreeview)
+ public partial class ImportFF : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import FF")
+ public ImportFF(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import FF")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
+
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
+
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
}
- }
- counter++;
+
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
}
- }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ private void ImportFF_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+ path += "\\Mozilla\\Firefox\\Profiles";
- private void ImportFF_Load(object sender, EventArgs e)
- {
- try
- {
- string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
- path += "\\Mozilla\\Firefox\\Profiles";
+ MyLog.debug("Morzilla folder is " + path);
- MyLog.debug("Morzilla folder is " + path);
+ if (Directory.Exists(path))
+ {
+ string[] dir = Directory.GetDirectories(path);
+ if (dir.Length == 1)
+ {
+ MyLog.debug("Morzilla profile under " + dir[0]);
+ path = dir[0] + "\\places.sqlite";
- if (Directory.Exists(path))
- {
- string[] dir = Directory.GetDirectories(path);
- if (dir.Length == 1)
- {
- MyLog.debug("Morzilla profile under " + dir[0]);
- path = dir[0] + "\\places.sqlite";
+ MyLog.debug("open database");
+ SQLiteClient client = new SQLiteClient(path);
- MyLog.debug("open database");
- SQLiteClient client = new SQLiteClient(path);
+ SQLiteResultSet result = client.Execute("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
+ "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
- SQLiteResultSet result = client.Execute("SELECT moz_bookmarks.title,moz_places.url,moz_bookmarks.type FROM moz_bookmarks LEFT JOIN moz_places " +
- "WHERE moz_bookmarks.fk = moz_places.id AND moz_bookmarks.title != 'null' AND moz_places.url LIKE '%http%';");
+ MyLog.debug("Morzilla bookmarks found : " + result.Rows.Count);
- MyLog.debug("Morzilla bookmarks found : " + result.Rows.Count);
+ foreach (SQLite.NET.SQLiteResultSet.Row row in result.Rows)
+ {
+ string title = row.fields[0].ToString();
+ string url = row.fields[1].ToString();
- foreach (SQLite.NET.SQLiteResultSet.Row row in result.Rows)
- {
- string title = row.fields[0].ToString();
- string url = row.fields[1].ToString();
+ BookmarkElement bkm = new BookmarkElement();
+ bkm.Url = url;
+ bkm.Name = title;
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = title;
+ EntryList.Add(bkm);
+ listBox1.Items.Add(bkm.Name);
+ }
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
+ MyLog.debug("close database");
+ client.Close();
+ }
+ }
}
+ catch (Exception ex)
+ {
+ MyLog.debug("Exception import ff : " + ex.Message);
+ MyLog.debug("Exception import ff : " + ex.StackTrace);
+ }
+ }
- MyLog.debug("close database");
- client.Close();
- }
+ private BookmarkElement GetBookmark(string Name)
+ {
+ foreach (BookmarkElement bkm in EntryList)
+ {
+ if (bkm.Name == Name) return bkm;
+ }
+ return null;
}
- }
- catch (Exception ex)
- {
- MyLog.debug("Exception import ff : " + ex.Message);
- MyLog.debug("Exception import ff : " + ex.StackTrace);
- }
- }
- private BookmarkElement GetBookmark(string Name)
- {
- foreach (BookmarkElement bkm in EntryList)
- {
- if (bkm.Name == Name) return bkm;
- }
- return null;
+ private void btnSelect_Click(object sender, EventArgs e)
+ {
+ for (int i = 0; i < listBox1.Items.Count; i++)
+ {
+ listBox1.SetSelected(i, select);
+ }
+ select = !select;
+ }
}
-
- private void btnSelect_Click(object sender, EventArgs e)
- {
- for (int i = 0; i < listBox1.Items.Count; i++)
- {
- listBox1.SetSelected(i, select);
- }
- select = !select;
- }
- }
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2012-04-08 18:36:02 UTC (rev 4476)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/ImportIE.cs 2012-04-08 21:50:59 UTC (rev 4477)
@@ -24,193 +24,188 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
using System.Windows.Forms;
using System.IO;
-using MediaPortal.Configuration;
namespace BrowseTheWeb
{
- public partial class ImportIE : Form
- {
- private List<BookmarkElement> EntryList = new List<BookmarkElement>();
- private TreeView tree;
- private bool select = true;
-
- public ImportIE(TreeView SetupTreeview)
+ public partial class ImportIE : Form
{
- InitializeComponent();
- tree = SetupTreeview;
- }
+ private List<BookmarkElement> EntryList = new List<BookmarkElement>();
+ private TreeView tree;
+ private bool select = true;
- private void btnImport_Click(object sender, EventArgs e)
- {
- btnImport.Visible = false;
- btnSelect.Visible = false;
- prgState.Visible = true;
- chkThumbs.Enabled = false;
-
- int max = listBox1.SelectedItems.Count;
- int imported = 0;
- int counter = 1;
-
- #region get parent
- TreeNode node = null;
- foreach (TreeNode n in tree.Nodes[0].Nodes)
- {
- if (n.Text == "Import IE")
+ public ImportIE(TreeView SetupTreeview)
{
- node = n;
- break;
+ InitializeComponent();
+ tree = SetupTreeview;
}
- }
- #endregion
- if (node != null)
- {
- foreach (Object item in listBox1.SelectedItems)
+ private void btnImport_Click(object sender, EventArgs e)
{
- Application.DoEvents();
- prgState.Value = (counter * 100 / max);
+ btnImport.Visible = false;
+ btnSelect.Visible = false;
+ prgState.Visible = true;
+ chkThumbs.Enabled = false;
- string name = (string)item;
- BookmarkElement bkm = GetBookmark(name);
+ int max = listBox1.SelectedItems.Count;
+ int imported = 0;
+ int counter = 1;
- if (bkm != null)
- {
- if (!Bookmark.Exists(tree, bkm.Name))
+ #region get parent
+ TreeNode node = null;
+ foreach (TreeNode n in tree.Nodes[0].Nodes)
{
- imported++;
+ if (n.Text == "Import IE")
+ {
+ node = n;
+ break;
+ }
+ }
+ #endregion
- TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
+ if (node != null)
+ {
+ foreach (Object item in listBox1.SelectedItems)
+ {
+ Application.DoEvents();
+ prgState.Value = (counter * 100 / max);
- BookmarkElement addBkm = new BookmarkElement();
- addBkm.Name = bkm.Name;
- addBkm.Url = bkm.Url;
- addBkm.isSubFolder = true;
- add.Tag = addBkm;
+ string name = (string)item;
+ BookmarkElement bkm = GetBookmark(name);
- if (chkThumbs.Checked)
- {
- GetThumb thumb = new GetThumb();
- thumb.SelectedUrl = bkm.Url;
- thumb.ShowDialog();
- }
+ if (bkm != null)
+ {
+ if (!Bookmark.Exists(tree, bkm.Name))
+ {
+ imported++;
- node.ExpandAll();
- }
- }
- counter++;
- }
- }
+ TreeNode add = node.Nodes.Add(bkm.Url, bkm.Name);
- MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
- this.Close();
- }
- private void btnCancel_Click(object sender, EventArgs e)
- {
- this.Close();
- }
+ BookmarkElement addBkm = new BookmarkElement();
+ addBkm.Name = bkm.Name;
+ addBkm.Url = bkm.Url;
+ addBkm.isSubFolder = true;
+ add.Tag = addBkm;
- private void ImportIE_Load(object sender, EventArgs e)
- {
- string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
- string[] favFiles;
+ if (chkThumbs.Checked)
+ {
+ GetThumb thumb = new GetThumb();
+ thumb.SelectedUrl = bkm.Url;
+ thumb.ShowDialog();
+ }
- MyLog.debug("Import folder is " + favPath);
+ node.ExpandAll();
+ }
+ }
+ counter++;
+ }
+ }
- if (Directory.Exists(favPath))
- {
- string[] favDirs = Directory.GetDirectories(favPath);
- MyLog.debug("Found " + favDirs.Length.ToString() + " folder");
+ MessageBox.Show("Import is done. Imported " + imported.ToString() + " links.");
+ this.Close();
+ }
+ private void btnCancel_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
- foreach (string folder in favDirs)
+ private void ImportIE_Load(object sender, EventArgs e)
{
- MyLog.debug("Work on folder '" + Path.GetFileName(folder) + "'");
+ string favPath = Environment.GetFolderPath(Environment.SpecialFolder.Favorites);
+ string[] favFiles;
- favFiles = Directory.GetFiles(folder, "*.url", SearchOption.TopDirectoryOnly);
- MyLog.debug(favFiles.Length.ToString() + " files to import");
+ MyLog.debug("Import folder is " + favPath);
- foreach (string s in favFiles)
- {
- FileInfo f = new FileInfo(s);
- string name = Path.GetFileNameWithoutExtension(f.Name);
+ if (Directory.Exists(favPath))
+ {
+ string[] favDirs = Directory.GetDirectories(favPath);
+ MyLog.debug("Found " + favDirs.Length.ToString() + " folder");
- string url = GetUrlFile(s);
+ foreach (string folder in favDirs)
+ {
+ MyLog.debug("Work on folder '" + Path.GetFileName(folder) + "'");
- if (url != null)
- {
- BookmarkElement bkm = new BookmarkElement();
- bkm.Url = url;
- bkm.Name = name;
+ favFiles = Directory.GetFiles(folder, "*.url", SearchOption.TopDirectoryOnly);
+ MyLog.debug(favFiles.Length.ToString() + " files to import");
- EntryList.Add(bkm);
- listBox1.Items.Add(bkm.Name);
- }
- }
- }
+ ...
[truncated message content] |
