Index: /branches/eraser6/Util/UxThemeAPI.cs =================================================================== --- /branches/eraser6/Util/UxThemeAPI.cs (revision 965) +++ /branches/eraser6/Util/UxThemeAPI.cs (revision 966) @@ -41,4 +41,10 @@ else if (control is ContextMenuStrip) UpdateControlTheme((ContextMenuStrip)control); + /*else if (control is MenuStrip) + UpdateControlTheme((MenuStrip)control); + + if (control.ContextMenuStrip != null) + UpdateControlTheme(control.ContextMenuStrip); + */ foreach (Control child in control.Controls) UpdateControlTheme(child); @@ -66,8 +72,28 @@ /// /// The List View control to set the theme on. - public static void UpdateControlTheme(ContextMenuStrip lv) + public static void UpdateControlTheme(ContextMenuStrip menu) { if (Environment.OSVersion.Version.Major >= 6) - lv.Renderer = new UxThemeMenuRenderer(); + if (!(menu.Renderer is UxThemeMenuRenderer)) + menu.Renderer = new UxThemeMenuRenderer(); + } + + /// + /// Updates the control's theme to fit in with the latest Windows visuals. + /// + /// The List View control to set the theme on. + public static void UpdateControlTheme(MenuStrip menu) + { + foreach (ToolStripMenuItem item in menu.Items) + UpdateControlTheme(item); + } + + /// + /// Updates the control's theme to fit in with the latest Windows visuals. + /// + /// The List View control to set the theme on. + public static void UpdateControlTheme(ToolStripMenuItem menu) + { + UpdateControlTheme(menu.DropDown); } Index: /branches/eraser6/Eraser/MainForm.Designer.cs =================================================================== --- /branches/eraser6/Eraser/MainForm.Designer.cs (revision 965) +++ /branches/eraser6/Eraser/MainForm.Designer.cs (revision 966) @@ -53,9 +53,5 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.contentPanel = new System.Windows.Forms.Panel(); - this.toolbarScheduleMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.newTaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolbarHelpMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutEraserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tbSchedule = new System.Windows.Forms.ToolStripMenuItem(); this.notificationIcon = new System.Windows.Forms.NotifyIcon(this.components); this.notificationMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -65,7 +61,15 @@ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notificationIconTimer = new System.Windows.Forms.Timer(this.components); - this.toolbarScheduleMenu.SuspendLayout(); - this.toolbarHelpMenu.SuspendLayout(); + this.ToolBar = new Eraser.ToolBar(); + this.tbScheduleDropDown = new System.Windows.Forms.ToolStripMenuItem(); + this.newTaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tbSettings = new System.Windows.Forms.ToolStripMenuItem(); + this.tbHelp = new System.Windows.Forms.ToolStripMenuItem(); + this.tbHelpDropDown = new System.Windows.Forms.ToolStripMenuItem(); + this.checkForUpdatesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutEraserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.notificationMenu.SuspendLayout(); + this.ToolBar.SuspendLayout(); this.SuspendLayout(); // @@ -76,36 +80,11 @@ this.contentPanel.Name = "contentPanel"; // - // toolbarScheduleMenu - // - this.toolbarScheduleMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newTaskToolStripMenuItem}); - this.toolbarScheduleMenu.Name = "toolbarScheduleMenu"; - resources.ApplyResources(this.toolbarScheduleMenu, "toolbarScheduleMenu"); - // - // newTaskToolStripMenuItem - // - this.newTaskToolStripMenuItem.Name = "newTaskToolStripMenuItem"; - resources.ApplyResources(this.newTaskToolStripMenuItem, "newTaskToolStripMenuItem"); - this.newTaskToolStripMenuItem.Click += new System.EventHandler(this.newTaskToolStripMenuItem_Click); - // - // toolbarHelpMenu - // - this.toolbarHelpMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.checkForUpdatesToolStripMenuItem, - this.aboutEraserToolStripMenuItem}); - this.toolbarHelpMenu.Name = "toolbarHelpMenu"; - resources.ApplyResources(this.toolbarHelpMenu, "toolbarHelpMenu"); - // - // checkForUpdatesToolStripMenuItem - // - this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; - resources.ApplyResources(this.checkForUpdatesToolStripMenuItem, "checkForUpdatesToolStripMenuItem"); - this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); - // - // aboutEraserToolStripMenuItem - // - this.aboutEraserToolStripMenuItem.Name = "aboutEraserToolStripMenuItem"; - resources.ApplyResources(this.aboutEraserToolStripMenuItem, "aboutEraserToolStripMenuItem"); - this.aboutEraserToolStripMenuItem.Click += new System.EventHandler(this.aboutEraserToolStripMenuItem_Click); + // tbSchedule + // + this.tbSchedule.Image = global::Eraser.Properties.Resources.ToolbarSchedule; + this.tbSchedule.Name = "tbSchedule"; + this.tbSchedule.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + resources.ApplyResources(this.tbSchedule, "tbSchedule"); + this.tbSchedule.Click += new System.EventHandler(this.tbSchedule_Click); // // notificationIcon @@ -153,4 +132,73 @@ this.notificationIconTimer.Tick += new System.EventHandler(this.notificationIconTimer_Tick); // + // ToolBar + // + this.ToolBar.AllowItemReorder = true; + resources.ApplyResources(this.ToolBar, "ToolBar"); + this.ToolBar.ImageScalingSize = new System.Drawing.Size(24, 24); + this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tbSchedule, + this.tbScheduleDropDown, + this.tbSettings, + this.tbHelp, + this.tbHelpDropDown}); + this.ToolBar.Name = "ToolBar"; + // + // tbScheduleDropDown + // + this.tbScheduleDropDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tbScheduleDropDown.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newTaskToolStripMenuItem}); + this.tbScheduleDropDown.Image = global::Eraser.Properties.Resources.ToolbarArrow; + resources.ApplyResources(this.tbScheduleDropDown, "tbScheduleDropDown"); + this.tbScheduleDropDown.Name = "tbScheduleDropDown"; + this.tbScheduleDropDown.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + // + // newTaskToolStripMenuItem + // + this.newTaskToolStripMenuItem.Name = "newTaskToolStripMenuItem"; + resources.ApplyResources(this.newTaskToolStripMenuItem, "newTaskToolStripMenuItem"); + // + // tbSettings + // + this.tbSettings.Image = global::Eraser.Properties.Resources.ToolbarSettings; + this.tbSettings.Name = "tbSettings"; + resources.ApplyResources(this.tbSettings, "tbSettings"); + this.tbSettings.Click += new System.EventHandler(this.tbSettings_Click); + // + // tbHelp + // + this.tbHelp.Image = global::Eraser.Properties.Resources.ToolbarHelp; + this.tbHelp.Name = "tbHelp"; + this.tbHelp.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + resources.ApplyResources(this.tbHelp, "tbHelp"); + // + // tbHelpDropDown + // + this.tbHelpDropDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tbHelpDropDown.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.checkForUpdatesToolStripMenuItem1, + this.aboutEraserToolStripMenuItem}); + this.tbHelpDropDown.Image = global::Eraser.Properties.Resources.ToolbarArrow; + resources.ApplyResources(this.tbHelpDropDown, "tbHelpDropDown"); + this.tbHelpDropDown.Name = "tbHelpDropDown"; + this.tbHelpDropDown.Padding = new System.Windows.Forms.Padding(2, 0, 4, 0); + // + // checkForUpdatesToolStripMenuItem1 + // + this.checkForUpdatesToolStripMenuItem1.Name = "checkForUpdatesToolStripMenuItem1"; + resources.ApplyResources(this.checkForUpdatesToolStripMenuItem1, "checkForUpdatesToolStripMenuItem1"); + // + // aboutEraserToolStripMenuItem + // + this.aboutEraserToolStripMenuItem.Name = "aboutEraserToolStripMenuItem"; + resources.ApplyResources(this.aboutEraserToolStripMenuItem, "aboutEraserToolStripMenuItem"); + // + // checkForUpdatesToolStripMenuItem + // + this.checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem"; + resources.ApplyResources(this.checkForUpdatesToolStripMenuItem, "checkForUpdatesToolStripMenuItem"); + this.checkForUpdatesToolStripMenuItem.Click += new System.EventHandler(this.checkForUpdatesToolStripMenuItem_Click); + // // MainForm // @@ -159,5 +207,7 @@ this.BackColor = System.Drawing.SystemColors.Control; this.Controls.Add(this.contentPanel); + this.Controls.Add(this.ToolBar); this.DoubleBuffered = true; + this.MainMenuStrip = this.ToolBar; this.Name = "MainForm"; this.Paint += new System.Windows.Forms.PaintEventHandler(this.MainForm_Paint); @@ -165,7 +215,7 @@ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Resize += new System.EventHandler(this.MainForm_Resize); - this.toolbarScheduleMenu.ResumeLayout(false); - this.toolbarHelpMenu.ResumeLayout(false); this.notificationMenu.ResumeLayout(false); + this.ToolBar.ResumeLayout(false); + this.ToolBar.PerformLayout(); this.ResumeLayout(false); @@ -175,9 +225,4 @@ private System.Windows.Forms.Panel contentPanel; - private System.Windows.Forms.ContextMenuStrip toolbarScheduleMenu; - private System.Windows.Forms.ContextMenuStrip toolbarHelpMenu; - private System.Windows.Forms.ToolStripMenuItem checkForUpdatesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem aboutEraserToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem newTaskToolStripMenuItem; private System.Windows.Forms.NotifyIcon notificationIcon; private System.Windows.Forms.Timer notificationIconTimer; @@ -187,5 +232,14 @@ private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem hideWhenMinimisedToolStripMenuItem; - + private ToolBar ToolBar; + private System.Windows.Forms.ToolStripMenuItem tbSchedule; + private System.Windows.Forms.ToolStripMenuItem tbSettings; + private System.Windows.Forms.ToolStripMenuItem checkForUpdatesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tbHelp; + private System.Windows.Forms.ToolStripMenuItem tbScheduleDropDown; + private System.Windows.Forms.ToolStripMenuItem tbHelpDropDown; + private System.Windows.Forms.ToolStripMenuItem newTaskToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem checkForUpdatesToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem aboutEraserToolStripMenuItem; } } Index: /branches/eraser6/Eraser/MainForm.cs =================================================================== --- /branches/eraser6/Eraser/MainForm.cs (revision 965) +++ /branches/eraser6/Eraser/MainForm.cs (revision 966) @@ -36,5 +36,4 @@ public partial class MainForm : Form { - private ToolBar ToolBar = new ToolBar(); private BasePanel CurrPage; private SchedulerPanel SchedulerPage = new SchedulerPanel(); @@ -44,6 +43,4 @@ { InitializeComponent(); - UxThemeAPI.UpdateControlTheme(toolbarScheduleMenu); - UxThemeAPI.UpdateControlTheme(toolbarHelpMenu); UxThemeAPI.UpdateControlTheme(notificationMenu); SettingsPage.CreateControl(); @@ -56,36 +53,4 @@ //Check the notification area context menu's minimise to tray item. hideWhenMinimisedToolStripMenuItem.Checked = EraserSettings.Get().HideWhenMinimised; - - //Create the toolbar control - ToolBar.Name = "toolBar"; - ToolBar.Location = new Point(14, 27); - ToolBar.Size = new Size(500, 26); - ToolBar.TabIndex = 1; - Controls.Add(ToolBar); - - ToolBarItem tbSchedule = new ToolBarItem(); - tbSchedule.Bitmap = Properties.Resources.ToolbarSchedule; - tbSchedule.Text = S._("Erase Schedule"); - tbSchedule.Menu = toolbarScheduleMenu; - tbSchedule.ToolBarItemClicked += delegate(object sender, EventArgs args) - { - ChangePage(MainFormPage.Scheduler); - }; - ToolBar.Items.Add(tbSchedule); - - ToolBarItem tbSettings = new ToolBarItem(); - tbSettings.Bitmap = Properties.Resources.ToolbarSettings; - tbSettings.Text = S._("Settings"); - tbSettings.ToolBarItemClicked += delegate(object sender, EventArgs args) - { - ChangePage(MainFormPage.Settings); - }; - ToolBar.Items.Add(tbSettings); - - ToolBarItem tbHelp = new ToolBarItem(); - tbHelp.Bitmap = Properties.Resources.ToolbarHelp; - tbHelp.Text = S._("Help"); - tbHelp.Menu = toolbarHelpMenu; - ToolBar.Items.Add(tbHelp); //Set the docking style for each of the pages @@ -227,4 +192,14 @@ Visible = false; } + } + + private void tbSchedule_Click(object sender, EventArgs e) + { + ChangePage(MainFormPage.Scheduler); + } + + private void tbSettings_Click(object sender, EventArgs e) + { + ChangePage(MainFormPage.Settings); } Index: /branches/eraser6/Eraser/SchedulerPanel.cs =================================================================== --- /branches/eraser6/Eraser/SchedulerPanel.cs (revision 965) +++ /branches/eraser6/Eraser/SchedulerPanel.cs (revision 966) @@ -42,5 +42,4 @@ InitializeComponent(); UxThemeAPI.UpdateControlTheme(this); - UxThemeAPI.UpdateControlTheme(schedulerMenu); UxThemeAPI.UpdateControlTheme(schedulerDefaultMenu); Index: /branches/eraser6/Eraser/ToolBar.cs =================================================================== --- /branches/eraser6/Eraser/ToolBar.cs (revision 965) +++ /branches/eraser6/Eraser/ToolBar.cs (revision 966) @@ -29,8 +29,9 @@ using System.Runtime.InteropServices; using System.Collections.ObjectModel; +using Eraser.Util; namespace Eraser { - public partial class ToolBar : Control + public partial class ToolBar : System.Windows.Forms.MenuStrip { public ToolBar() @@ -38,357 +39,78 @@ //Create the base component InitializeComponent(); - - //Initialize the toolbar item list - Items = new ToolBarItemCollection(this); - - //Hook mouse move events to show the currently selected item - MouseMove += ToolBar_MouseMove; - MouseLeave += ToolBar_MouseLeave; - MouseClick += ToolBar_MouseClick; + Renderer = new EraserToolStripRenderer(); } - void ToolBar_MouseMove(object sender, MouseEventArgs e) + private class EraserToolStripRenderer : UxThemeMenuRenderer { - Redraw(); - } + protected override void Initialize(ToolStrip toolStrip) + { + base.Initialize(toolStrip); + owner = toolStrip; + } - void ToolBar_MouseLeave(object sender, EventArgs e) - { - Redraw(); - } + protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e) + { + if (e.ToolStrip == owner) + //Draw the parent background image. This is not portable in that it will render + //this code unreusable, but for the lack of anything better this will have to suffice! + e.Graphics.DrawImage(Properties.Resources.BackgroundGradient, + new Point(-owner.Left, -owner.Top)); + else + base.OnRenderToolStripBackground(e); + } - void ToolBar_MouseClick(object sender, MouseEventArgs e) - { - //See if the click was on any item's arrow. - Rectangle mouse_rect = new Rectangle(e.Location, new Size(1, 1)); - foreach (ToolBarItem i in Items) + protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e) { - if (i.Menu != null && mouse_rect.IntersectsWith(i.MenuRect)) + if (e.ToolStrip != owner) + base.OnRenderMenuItemBackground(e); + } + + protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e) + { + if (e.ToolStrip != owner) { - //Show the menu below the toolbar item. - Point mouse_point = PointToScreen(i.Rectangle.Location); - i.Menu.Show(mouse_point.X, mouse_point.Y + i.Rectangle.Height); + base.OnRenderItemText(e); + return; } - else if (mouse_rect.IntersectsWith(i.Rectangle)) + + Graphics g = e.Graphics; + + //Draw the actual text + Rectangle tempRect = e.TextRectangle; + tempRect.Inflate(3, 0); + tempRect.Offset(3, 0); + e.TextRectangle = tempRect; + using (SolidBrush textBrush = new SolidBrush(TextColour)) + g.DrawString(e.Text, e.TextFont, textBrush, e.TextRectangle); + + //If the text has got a selection, draw an underline + if (e.Item.Selected) { - //Broadcast the item click event - i.OnToolbarItemClicked(this); + SizeF textSize = g.MeasureString(e.Text, e.TextFont); + using (Pen underlinePen = new Pen(TextColour)) + { + Point underlineStart = e.TextRectangle.Location; + underlineStart.Offset(0, Point.Truncate(textSize.ToPointF()).Y); + Point underlineEnd = underlineStart; + underlineEnd.Offset(e.TextRectangle.Width, 0); + + g.DrawLine(underlinePen, underlineStart, underlineEnd); + } } } - } - - /// - /// Draws the Tool Bar on the given graphics object. - /// - /// Graphics object to draw on. - public void Draw(Graphics rawDC) - { - //Create a backing bitmap buffer to prevent flicker - Bitmap back_bmp = new Bitmap(Width, Height); - Graphics dc = Graphics.FromImage(back_bmp); - //Draw the parent background image. This is not portable in that it will render - //this code unreusable, but for the lack of anything better this will have to suffice! - dc.DrawImage(Properties.Resources.BackgroundGradient, new Point(-Left, -Top)); - - Point mouse_pos = PointToClient(MousePosition); - int x = 0; + /// + /// The margin between a drop-down arrow and the surrounding items. + /// + private const int ArrowMargin = 0; - foreach (ToolBarItem i in Items) - { - { - Point pos = i.Rectangle.Location; - pos.X = x; - pos.Y = 0; - i.Rectangle.Location = pos; - } + /// + /// The colour of the menu bar text. + /// + private readonly Color TextColour = Color.White; - if (i.Bitmap != null) - { - i.BitmapRect = new Rectangle(x, 0, i.Bitmap.Width, i.Bitmap.Height); - dc.DrawImage(i.Bitmap, i.BitmapRect); - - x += i.BitmapRect.Width + 4; - } - - //Draw the toolbar item text - SizeF string_size = dc.MeasureString(i.Text, Font); - i.TextRect = new Rectangle(x, (int)(Height - string_size.Height) / 2, - (int)string_size.Width, (int)string_size.Height); - dc.DrawString(i.Text, Font, Brushes.White, i.TextRect.Location); - x += i.TextRect.Width; - - //If there is a menu associated draw a drop-down glyph - if (i.Menu != null) - { - Bitmap menu_arrow = Properties.Resources.ToolbarArrow; - i.MenuRect = new Rectangle(x += 6, i.TextRect.Y, - menu_arrow.Width, menu_arrow.Height); - dc.DrawImage(menu_arrow, i.MenuRect); - x += i.MenuRect.Width; - } - - //Update the size of the item rectangle - { - Size size = i.Rectangle.Size; - size.Width = x - i.Rectangle.Location.X; - size.Height = Height; - i.Rectangle.Size = size; - } - - //If the mouse cursor intersects with the item then draw an underline. - if (i.Rectangle.IntersectsWith(new Rectangle(mouse_pos, new Size(1, 1)))) - dc.DrawLine(Pens.White, new Point(i.TextRect.Left, i.TextRect.Bottom + 1), - new Point(i.TextRect.Right, i.TextRect.Bottom + 1)); - - //Padding between items. - x += 16; - } - - rawDC.DrawImage(back_bmp, new Point(0, 0)); - } - - /// - /// Redraws the Tool Bar by creating a Graphics object. - /// - public void Redraw() - { - Draw(CreateGraphics()); - } - - /// - /// Paints the control. - /// - /// Paint event object. - protected override void OnPaint(PaintEventArgs e) - { - Draw(e.Graphics); - - // Calling the base class OnPaint - base.OnPaint(e); - } - - /// - /// Stores the items in the Tool Bar. - /// - public ToolBarItemCollection Items - { - get; - private set; + private ToolStrip owner; } } - - public class ToolBarItem - { - /// - /// Tool bar item text. - /// - [Description("Toolbar item text")] - public string Text - { - get { return text; } - set - { - text = value; - if (Window != null) - Window.Redraw(); - } - } - - /// - /// Item bitmap. - /// - [Description("Item Bitmap")] - public Bitmap Bitmap - { - get { return bitmap; } - set - { - bitmap = value; - if (Window != null) - Window.Redraw(); - } - } - - /// - /// Item drop-down menu - /// - public ContextMenuStrip Menu - { - get { return menu; } - set - { - menu = value; - if (Window != null) - Window.Redraw(); - } - } - - /// - /// Item click event handler - /// - public EventHandler ToolBarItemClicked - { - get; - set; - } - - internal void OnToolbarItemClicked(object sender) - { - if (ToolBarItemClicked != null) - ToolBarItemClicked(sender, new EventArgs()); - } - - private string text; - private Bitmap bitmap; - private ContextMenuStrip menu; - - /// - /// The owning window of this item. - /// - internal ToolBar Window; - - /// - /// Stores the rectangle of this item. - /// - internal Rectangle Rectangle; - - /// - /// Stores the rectangle of the bitmap. - /// - internal Rectangle BitmapRect; - - /// - /// Stores the rectangle of the text. - /// - internal Rectangle TextRect; - - /// - /// Stores the rectangle of the drop-down arrow. - /// - internal Rectangle MenuRect; - } - - public class ToolBarItemCollection : ICollection, IList, - IEnumerable - { - /// - /// Constructor. - /// - /// The owning toolbar window. - internal ToolBarItemCollection(ToolBar win) - { - window = win; - } - - #region ICollection Members - public void Add(ToolBarItem item) - { - Insert(Count, item); - } - - public void Clear() - { - foreach (ToolBarItem item in list) - item.Window = null; - list.Clear(); - window.Redraw(); - } - - public bool Contains(ToolBarItem item) - { - return list.Contains(item); - } - - public void CopyTo(ToolBarItem[] array, int arrayIndex) - { - list.CopyTo(array, arrayIndex); - } - - public int Count - { - get { return list.Count; } - } - - public bool IsReadOnly - { - get { return false; } - } - - public bool Remove(ToolBarItem item) - { - int index = IndexOf(item); - if (index < 0) - return false; - - RemoveAt(index); - return true; - } - #endregion - - #region IEnumerable Members - public IEnumerator GetEnumerator() - { - return list.GetEnumerator(); - } - #endregion - - #region IEnumerable Members - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { - return list.GetEnumerator(); - } - #endregion - - #region IList Members - public int IndexOf(ToolBarItem item) - { - return list.IndexOf(item); - } - - public void Insert(int index, ToolBarItem item) - { - if (item.Window != null) - throw new ArgumentException("The item being added already is owned by " + - "another ToolBar control. Remove the item from the other control " + - "before inserting it into this one."); - - item.Window = window; - list.Insert(index, item); - window.Redraw(); - } - - public void RemoveAt(int index) - { - ToolBarItem item = list[index]; - item.Window = null; - list.RemoveAt(index); - window.Redraw(); - } - - public ToolBarItem this[int index] - { - get - { - return list[index]; - } - set - { - list[index] = value; - if (window != null) - window.Redraw(); - } - } - #endregion - - /// - /// The window owning the items in this list. - /// - private ToolBar window; - - /// - /// The list storing the toolbar items. - /// - private List list = new List(); - } } Index: /branches/eraser6/Eraser/TaskPropertiesForm.cs =================================================================== --- /branches/eraser6/Eraser/TaskPropertiesForm.cs (revision 965) +++ /branches/eraser6/Eraser/TaskPropertiesForm.cs (revision 966) @@ -40,5 +40,4 @@ InitializeComponent(); UxThemeAPI.UpdateControlTheme(this); - UxThemeAPI.UpdateControlTheme(dataContextMenuStrip); scheduleTime.CustomFormat = DateTimeFormatInfo.CurrentInfo.ShortTimePattern; Index: /branches/eraser6/Eraser/Strings.resx =================================================================== --- /branches/eraser6/Eraser/Strings.resx (revision 965) +++ /branches/eraser6/Eraser/Strings.resx (revision 966) @@ -136,13 +136,4 @@ Session: {0:F} - - Erase Schedule - - - Settings - - - Help - Processing: Index: /branches/eraser6/Eraser/Strings.en.resx =================================================================== --- /branches/eraser6/Eraser/Strings.en.resx (revision 965) +++ /branches/eraser6/Eraser/Strings.en.resx (revision 966) @@ -136,13 +136,4 @@ Session: {0:F} - - Erase Schedule - - - Settings - - - Help - Processing: Index: /branches/eraser6/Eraser/Strings.NL.resx =================================================================== --- /branches/eraser6/Eraser/Strings.NL.resx (revision 965) +++ /branches/eraser6/Eraser/Strings.NL.resx (revision 966) @@ -136,13 +136,4 @@ (Untranslated) - - Planner - - - Instellingen - - - Help - (Untranslated) Index: /branches/eraser6/Eraser/SettingsPanel.cs =================================================================== --- /branches/eraser6/Eraser/SettingsPanel.cs (revision 965) +++ /branches/eraser6/Eraser/SettingsPanel.cs (revision 966) @@ -44,5 +44,4 @@ InitializeComponent(); UxThemeAPI.UpdateControlTheme(this); - UxThemeAPI.UpdateControlTheme(pluginsMenu); //For new plugins, register the callback. Index: /branches/eraser6/Eraser/MainForm.resx =================================================================== --- /branches/eraser6/Eraser/MainForm.resx (revision 965) +++ /branches/eraser6/Eraser/MainForm.resx (revision 966) @@ -146,53 +146,17 @@ - 3 - - - 17, 17 - - - 125, 22 - - - New Task - - - 126, 26 - - - toolbarScheduleMenu - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 189, 17 - - - 171, 22 - - - Check for Updates - - - 171, 22 - - - About Eraser - - - 172, 48 - - - toolbarHelpMenu - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1 + + + 117, 28 + + + Erase Schedule - 337, 17 + 110, 17 - 640, 17 + 413, 17 @@ -221,5 +185,5 @@ - 193, 98 + 193, 76 @@ -1796,6 +1760,99 @@ - 473, 17 + 246, 17 + + 17, 17 + + + False + + + None + + + Ctrl+N + + + 168, 22 + + + New Task + + + BottomCenter + + + None + + + 20, 28 + + + Erase Schedule + + + 85, 28 + + + Settings + + + 64, 28 + + + Help + + + 171, 22 + + + Check for Updates + + + 171, 22 + + + About Eraser + + + None + + + 22, 28 + + + Help + + + 14, 26 + + + 500, 32 + + + 1 + + + ToolBar + + + ToolBar + + + Eraser.ToolBar, Eraser, Version=6.0.4.875, Culture=neutral, PublicKeyToken=311f5aaf640c645d + + + $this + + + 2 + + + 171, 22 + + + Check for Updates + True @@ -3376,4 +3433,52 @@ Eraser + + tbSchedule + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + notificationIcon + + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openEraserToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripMenuItem1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + hideWhenMinimisedToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + notificationIconTimer + + + System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbScheduleDropDown + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + newTaskToolStripMenuItem @@ -3382,4 +3487,34 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tbSettings + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbHelp + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbHelpDropDown + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + checkForUpdatesToolStripMenuItem1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + aboutEraserToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + checkForUpdatesToolStripMenuItem @@ -3388,46 +3523,4 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - aboutEraserToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - notificationIcon - - - System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openEraserToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripMenuItem1 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - hideWhenMinimisedToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - exitToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - notificationIconTimer - - - System.Windows.Forms.Timer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm