diff --git a/Eve-O-Preview/Presentation/MainPresenter.cs b/Eve-O-Preview/Presentation/MainPresenter.cs index 8e20c5f..3ca0ac1 100644 --- a/Eve-O-Preview/Presentation/MainPresenter.cs +++ b/Eve-O-Preview/Presentation/MainPresenter.cs @@ -115,6 +115,8 @@ namespace EveOPreview.UI this.View.ShowThumbnailOverlays = this._configuration.ShowThumbnailOverlays; this.View.ShowThumbnailFrames = this._configuration.ShowThumbnailFrames; + this.View.EnableActiveClientHighlight = this._configuration.EnableActiveClientHighlight; + this.View.ActiveClientHighlightColor = this._configuration.ActiveClientHighlightColor; } private void SaveApplicationSettings() @@ -137,6 +139,8 @@ namespace EveOPreview.UI this._configuration.ShowThumbnailOverlays = this.View.ShowThumbnailOverlays; this._configuration.ShowThumbnailFrames = this.View.ShowThumbnailFrames; + this._configuration.EnableActiveClientHighlight = this.View.EnableActiveClientHighlight; + this._configuration.ActiveClientHighlightColor = this.View.ActiveClientHighlightColor; this._configurationStorage.Save(); diff --git a/Eve-O-Preview/Presentation/ThumbnailManager.cs b/Eve-O-Preview/Presentation/ThumbnailManager.cs index 16388e7..409199e 100644 --- a/Eve-O-Preview/Presentation/ThumbnailManager.cs +++ b/Eve-O-Preview/Presentation/ThumbnailManager.cs @@ -14,7 +14,7 @@ namespace EveOPreview.UI #endregion #region Private fields - private readonly IApplicationConfiguration _configuration; + private readonly IAppConfig _configuration; private readonly IConfigurationStorage _configurationStorage; private readonly DispatcherTimer _thumbnailUpdateTimer; private readonly IThumbnailViewFactory _thumbnailViewFactory; @@ -27,7 +27,7 @@ namespace EveOPreview.UI private bool _isHoverEffectActive; #endregion - public ThumbnailManager(IApplicationConfiguration configuration, IConfigurationStorage configurationStorage, IThumbnailViewFactory factory) + public ThumbnailManager(IAppConfig configuration, IConfigurationStorage configurationStorage, IThumbnailViewFactory factory) { this._configuration = configuration; this._configurationStorage = configurationStorage; @@ -127,12 +127,14 @@ namespace EveOPreview.UI { // No need to move Thumbnails while one of them is highlighted view.ThumbnailLocation = this._configuration.GetThumbnailLocation(view.Title, this._activeClientTitle, view.ThumbnailLocation); - view.SetOpacity(this._configuration.ThumbnailsOpacity); + view.SetOpacity(this._configuration.ThumbnailOpacity); view.SetTopMost(this._configuration.ShowThumbnailsAlwaysOnTop); } view.IsOverlayEnabled = this._configuration.ShowThumbnailOverlays; + view.SetHighlight(this._configuration.EnableActiveClientHighlight && (view.Id == this._activeClientHandle), this._configuration.ActiveClientHighlightColor); + if (!view.IsActive) { view.Show(); @@ -289,7 +291,7 @@ namespace EveOPreview.UI view.SetTopMost(true); view.SetOpacity(1.0); - if (this._configuration.EnableThumbnailZoom) + if (this._configuration.ThumbnailZoomEnabled) { this.ThumbnailZoomIn(view); } @@ -304,12 +306,12 @@ namespace EveOPreview.UI IThumbnailView view = this._thumbnailViews[id]; - if (this._configuration.EnableThumbnailZoom) + if (this._configuration.ThumbnailZoomEnabled) { this.ThumbnailZoomOut(view); } - view.SetOpacity(this._configuration.ThumbnailsOpacity); + view.SetOpacity(this._configuration.ThumbnailOpacity); this._isHoverEffectActive = false; } diff --git a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs index 0de95ed..0ca0d8d 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs @@ -34,17 +34,18 @@ namespace EveOPreview.UI System.Windows.Forms.Label OpacityLabel; System.Windows.Forms.ToolStripMenuItem RestoreWindowMenuItem; System.Windows.Forms.ToolStripMenuItem ExitMenuItem; - System.Windows.Forms.Panel OpacityPanel; - System.Windows.Forms.Panel ResizeOptionsPanel; + System.Windows.Forms.Panel MainOptionsPanel; + System.Windows.Forms.Panel ThumbnailSizePanel; System.Windows.Forms.Label HeigthLabel; System.Windows.Forms.Label WidthLabel; System.Windows.Forms.Panel ZoomOptionsPanel; System.Windows.Forms.Label ZoomFactorLabel; System.Windows.Forms.Label ZoomAnchorLabel; - System.Windows.Forms.Panel ThumbnailsListPanel; + System.Windows.Forms.Panel ThumbnailListPanel; System.Windows.Forms.Label ThumbnailsListLabel; System.Windows.Forms.ToolStripMenuItem TitleMenuItem; System.Windows.Forms.ToolStripSeparator SeparatorMenuItem; + System.Windows.Forms.Panel OverlayOptionsPanel; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.ThumbnailOpacityTrackBar = new System.Windows.Forms.TrackBar(); this.MinimizeToTrayCheckBox = new System.Windows.Forms.CheckBox(); @@ -68,37 +69,40 @@ namespace EveOPreview.UI this.EnableThumbnailZoomCheckBox = new System.Windows.Forms.CheckBox(); this.ThumbnailZoomFactorNumericEdit = new System.Windows.Forms.NumericUpDown(); this.ThumbnailsList = new System.Windows.Forms.CheckedListBox(); + this.HighlightColorLabel = new System.Windows.Forms.Label(); + this.ActiveClientHighlightColorButton = new System.Windows.Forms.Panel(); + this.EnableActiveClientHighlightCheckBox = new System.Windows.Forms.CheckBox(); + this.ShowThumbnailOverlaysCheckBox = new System.Windows.Forms.CheckBox(); + this.ShowThumbnailFramesCheckBox = new System.Windows.Forms.CheckBox(); this.ForumLinkLabel = new System.Windows.Forms.LinkLabel(); this.NotifyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.TrayMenu = new System.Windows.Forms.ContextMenuStrip(this.components); - this.panel1 = new System.Windows.Forms.Panel(); - this.ShowThumbnailOverlaysCheckBox = new System.Windows.Forms.CheckBox(); - this.ShowThumbnailFramesCheckBox = new System.Windows.Forms.CheckBox(); OpacityLabel = new System.Windows.Forms.Label(); RestoreWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - OpacityPanel = new System.Windows.Forms.Panel(); - ResizeOptionsPanel = new System.Windows.Forms.Panel(); + MainOptionsPanel = new System.Windows.Forms.Panel(); + ThumbnailSizePanel = new System.Windows.Forms.Panel(); HeigthLabel = new System.Windows.Forms.Label(); WidthLabel = new System.Windows.Forms.Label(); ZoomOptionsPanel = new System.Windows.Forms.Panel(); ZoomFactorLabel = new System.Windows.Forms.Label(); ZoomAnchorLabel = new System.Windows.Forms.Label(); - ThumbnailsListPanel = new System.Windows.Forms.Panel(); + ThumbnailListPanel = new System.Windows.Forms.Panel(); ThumbnailsListLabel = new System.Windows.Forms.Label(); TitleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); SeparatorMenuItem = new System.Windows.Forms.ToolStripSeparator(); - OpacityPanel.SuspendLayout(); + OverlayOptionsPanel = new System.Windows.Forms.Panel(); + MainOptionsPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailOpacityTrackBar)).BeginInit(); - ResizeOptionsPanel.SuspendLayout(); + ThumbnailSizePanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailsWidthNumericEdit)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailsHeightNumericEdit)).BeginInit(); ZoomOptionsPanel.SuspendLayout(); this.ZoomAnchorPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailZoomFactorNumericEdit)).BeginInit(); - ThumbnailsListPanel.SuspendLayout(); + ThumbnailListPanel.SuspendLayout(); + OverlayOptionsPanel.SuspendLayout(); this.TrayMenu.SuspendLayout(); - this.panel1.SuspendLayout(); this.SuspendLayout(); // // OpacityLabel @@ -124,21 +128,23 @@ namespace EveOPreview.UI ExitMenuItem.Text = "Exit"; ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItemClick_Handler); // - // OpacityPanel + // MainOptionsPanel // - OpacityPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - OpacityPanel.Controls.Add(this.ThumbnailOpacityTrackBar); - OpacityPanel.Controls.Add(this.MinimizeToTrayCheckBox); - OpacityPanel.Controls.Add(this.EnableClientLayoutTrackingCheckBox); - OpacityPanel.Controls.Add(this.HideActiveClientThumbnailCheckBox); - OpacityPanel.Controls.Add(this.ShowThumbnailsAlwaysOnTopCheckBox); - OpacityPanel.Controls.Add(this.HideThumbnailsOnLostFocusCheckBox); - OpacityPanel.Controls.Add(this.EnablePerClientThumbnailsLayoutsCheckBox); - OpacityPanel.Controls.Add(OpacityLabel); - OpacityPanel.Location = new System.Drawing.Point(3, 3); - OpacityPanel.Name = "OpacityPanel"; - OpacityPanel.Size = new System.Drawing.Size(246, 164); - OpacityPanel.TabIndex = 33; + MainOptionsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + MainOptionsPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + MainOptionsPanel.Controls.Add(this.ThumbnailOpacityTrackBar); + MainOptionsPanel.Controls.Add(this.MinimizeToTrayCheckBox); + MainOptionsPanel.Controls.Add(this.EnableClientLayoutTrackingCheckBox); + MainOptionsPanel.Controls.Add(this.HideActiveClientThumbnailCheckBox); + MainOptionsPanel.Controls.Add(this.ShowThumbnailsAlwaysOnTopCheckBox); + MainOptionsPanel.Controls.Add(this.HideThumbnailsOnLostFocusCheckBox); + MainOptionsPanel.Controls.Add(this.EnablePerClientThumbnailsLayoutsCheckBox); + MainOptionsPanel.Controls.Add(OpacityLabel); + MainOptionsPanel.Location = new System.Drawing.Point(3, 3); + MainOptionsPanel.Name = "MainOptionsPanel"; + MainOptionsPanel.Size = new System.Drawing.Size(264, 164); + MainOptionsPanel.TabIndex = 0; // // ThumbnailOpacityTrackBar // @@ -148,8 +154,8 @@ namespace EveOPreview.UI this.ThumbnailOpacityTrackBar.Maximum = 100; this.ThumbnailOpacityTrackBar.Minimum = 10; this.ThumbnailOpacityTrackBar.Name = "ThumbnailOpacityTrackBar"; - this.ThumbnailOpacityTrackBar.Size = new System.Drawing.Size(190, 22); - this.ThumbnailOpacityTrackBar.TabIndex = 39; + this.ThumbnailOpacityTrackBar.Size = new System.Drawing.Size(208, 22); + this.ThumbnailOpacityTrackBar.TabIndex = 1; this.ThumbnailOpacityTrackBar.TickFrequency = 10; this.ThumbnailOpacityTrackBar.Value = 10; this.ThumbnailOpacityTrackBar.ValueChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -160,7 +166,7 @@ namespace EveOPreview.UI this.MinimizeToTrayCheckBox.Location = new System.Drawing.Point(3, 3); this.MinimizeToTrayCheckBox.Name = "MinimizeToTrayCheckBox"; this.MinimizeToTrayCheckBox.Size = new System.Drawing.Size(139, 17); - this.MinimizeToTrayCheckBox.TabIndex = 38; + this.MinimizeToTrayCheckBox.TabIndex = 0; this.MinimizeToTrayCheckBox.Text = "Minimize to System Tray"; this.MinimizeToTrayCheckBox.UseVisualStyleBackColor = true; this.MinimizeToTrayCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -171,7 +177,7 @@ namespace EveOPreview.UI this.EnableClientLayoutTrackingCheckBox.Location = new System.Drawing.Point(3, 50); this.EnableClientLayoutTrackingCheckBox.Name = "EnableClientLayoutTrackingCheckBox"; this.EnableClientLayoutTrackingCheckBox.Size = new System.Drawing.Size(127, 17); - this.EnableClientLayoutTrackingCheckBox.TabIndex = 37; + this.EnableClientLayoutTrackingCheckBox.TabIndex = 2; this.EnableClientLayoutTrackingCheckBox.Text = "Track client locations"; this.EnableClientLayoutTrackingCheckBox.UseVisualStyleBackColor = true; this.EnableClientLayoutTrackingCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -184,7 +190,7 @@ namespace EveOPreview.UI this.HideActiveClientThumbnailCheckBox.Location = new System.Drawing.Point(3, 73); this.HideActiveClientThumbnailCheckBox.Name = "HideActiveClientThumbnailCheckBox"; this.HideActiveClientThumbnailCheckBox.Size = new System.Drawing.Size(184, 17); - this.HideActiveClientThumbnailCheckBox.TabIndex = 33; + this.HideActiveClientThumbnailCheckBox.TabIndex = 3; this.HideActiveClientThumbnailCheckBox.Text = "Hide preview of active EVE client"; this.HideActiveClientThumbnailCheckBox.UseVisualStyleBackColor = true; this.HideActiveClientThumbnailCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -198,7 +204,7 @@ namespace EveOPreview.UI this.ShowThumbnailsAlwaysOnTopCheckBox.Name = "ShowThumbnailsAlwaysOnTopCheckBox"; this.ShowThumbnailsAlwaysOnTopCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; this.ShowThumbnailsAlwaysOnTopCheckBox.Size = new System.Drawing.Size(137, 17); - this.ShowThumbnailsAlwaysOnTopCheckBox.TabIndex = 36; + this.ShowThumbnailsAlwaysOnTopCheckBox.TabIndex = 4; this.ShowThumbnailsAlwaysOnTopCheckBox.Text = "Previews always on top"; this.ShowThumbnailsAlwaysOnTopCheckBox.UseVisualStyleBackColor = true; this.ShowThumbnailsAlwaysOnTopCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -211,7 +217,7 @@ namespace EveOPreview.UI this.HideThumbnailsOnLostFocusCheckBox.Location = new System.Drawing.Point(3, 119); this.HideThumbnailsOnLostFocusCheckBox.Name = "HideThumbnailsOnLostFocusCheckBox"; this.HideThumbnailsOnLostFocusCheckBox.Size = new System.Drawing.Size(234, 17); - this.HideThumbnailsOnLostFocusCheckBox.TabIndex = 34; + this.HideThumbnailsOnLostFocusCheckBox.TabIndex = 5; this.HideThumbnailsOnLostFocusCheckBox.Text = "Hide previews when EVE client is not active"; this.HideThumbnailsOnLostFocusCheckBox.UseVisualStyleBackColor = true; this.HideThumbnailsOnLostFocusCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -224,27 +230,29 @@ namespace EveOPreview.UI this.EnablePerClientThumbnailsLayoutsCheckBox.Location = new System.Drawing.Point(3, 142); this.EnablePerClientThumbnailsLayoutsCheckBox.Name = "EnablePerClientThumbnailsLayoutsCheckBox"; this.EnablePerClientThumbnailsLayoutsCheckBox.Size = new System.Drawing.Size(185, 17); - this.EnablePerClientThumbnailsLayoutsCheckBox.TabIndex = 35; + this.EnablePerClientThumbnailsLayoutsCheckBox.TabIndex = 6; this.EnablePerClientThumbnailsLayoutsCheckBox.Text = "Unique layout for each EVE client"; this.EnablePerClientThumbnailsLayoutsCheckBox.UseVisualStyleBackColor = true; this.EnablePerClientThumbnailsLayoutsCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); // - // ResizeOptionsPanel + // ThumbnailSizePanel // - ResizeOptionsPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - ResizeOptionsPanel.Controls.Add(HeigthLabel); - ResizeOptionsPanel.Controls.Add(WidthLabel); - ResizeOptionsPanel.Controls.Add(this.ThumbnailsWidthNumericEdit); - ResizeOptionsPanel.Controls.Add(this.ThumbnailsHeightNumericEdit); - ResizeOptionsPanel.Location = new System.Drawing.Point(3, 173); - ResizeOptionsPanel.Name = "ResizeOptionsPanel"; - ResizeOptionsPanel.Size = new System.Drawing.Size(246, 28); - ResizeOptionsPanel.TabIndex = 26; + ThumbnailSizePanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + ThumbnailSizePanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + ThumbnailSizePanel.Controls.Add(HeigthLabel); + ThumbnailSizePanel.Controls.Add(WidthLabel); + ThumbnailSizePanel.Controls.Add(this.ThumbnailsWidthNumericEdit); + ThumbnailSizePanel.Controls.Add(this.ThumbnailsHeightNumericEdit); + ThumbnailSizePanel.Location = new System.Drawing.Point(3, 173); + ThumbnailSizePanel.Name = "ThumbnailSizePanel"; + ThumbnailSizePanel.Size = new System.Drawing.Size(264, 28); + ThumbnailSizePanel.TabIndex = 1; // // HeigthLabel // HeigthLabel.AutoSize = true; - HeigthLabel.Location = new System.Drawing.Point(152, 5); + HeigthLabel.Location = new System.Drawing.Point(150, 5); HeigthLabel.Name = "HeigthLabel"; HeigthLabel.Size = new System.Drawing.Size(38, 13); HeigthLabel.TabIndex = 14; @@ -269,7 +277,7 @@ namespace EveOPreview.UI 0, 0, 0}); - this.ThumbnailsWidthNumericEdit.Location = new System.Drawing.Point(95, 3); + this.ThumbnailsWidthNumericEdit.Location = new System.Drawing.Point(92, 3); this.ThumbnailsWidthNumericEdit.Maximum = new decimal(new int[] { 999999, 0, @@ -277,7 +285,7 @@ namespace EveOPreview.UI 0}); this.ThumbnailsWidthNumericEdit.Name = "ThumbnailsWidthNumericEdit"; this.ThumbnailsWidthNumericEdit.Size = new System.Drawing.Size(48, 20); - this.ThumbnailsWidthNumericEdit.TabIndex = 11; + this.ThumbnailsWidthNumericEdit.TabIndex = 0; this.ThumbnailsWidthNumericEdit.Value = new decimal(new int[] { 100, 0, @@ -295,7 +303,7 @@ namespace EveOPreview.UI 0, 0, 0}); - this.ThumbnailsHeightNumericEdit.Location = new System.Drawing.Point(196, 3); + this.ThumbnailsHeightNumericEdit.Location = new System.Drawing.Point(217, 3); this.ThumbnailsHeightNumericEdit.Maximum = new decimal(new int[] { 99999999, 0, @@ -303,7 +311,7 @@ namespace EveOPreview.UI 0}); this.ThumbnailsHeightNumericEdit.Name = "ThumbnailsHeightNumericEdit"; this.ThumbnailsHeightNumericEdit.Size = new System.Drawing.Size(42, 20); - this.ThumbnailsHeightNumericEdit.TabIndex = 12; + this.ThumbnailsHeightNumericEdit.TabIndex = 1; this.ThumbnailsHeightNumericEdit.Value = new decimal(new int[] { 70, 0, @@ -313,6 +321,8 @@ namespace EveOPreview.UI // // ZoomOptionsPanel // + ZoomOptionsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); ZoomOptionsPanel.BackColor = System.Drawing.SystemColors.Control; ZoomOptionsPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; ZoomOptionsPanel.Controls.Add(ZoomFactorLabel); @@ -322,13 +332,13 @@ namespace EveOPreview.UI ZoomOptionsPanel.Controls.Add(this.ThumbnailZoomFactorNumericEdit); ZoomOptionsPanel.Location = new System.Drawing.Point(3, 207); ZoomOptionsPanel.Name = "ZoomOptionsPanel"; - ZoomOptionsPanel.Size = new System.Drawing.Size(246, 82); - ZoomOptionsPanel.TabIndex = 27; + ZoomOptionsPanel.Size = new System.Drawing.Size(264, 82); + ZoomOptionsPanel.TabIndex = 2; // // ZoomFactorLabel // ZoomFactorLabel.AutoSize = true; - ZoomFactorLabel.Location = new System.Drawing.Point(8, 43); + ZoomFactorLabel.Location = new System.Drawing.Point(0, 43); ZoomFactorLabel.Name = "ZoomFactorLabel"; ZoomFactorLabel.Size = new System.Drawing.Size(67, 13); ZoomFactorLabel.TabIndex = 29; @@ -345,10 +355,10 @@ namespace EveOPreview.UI this.ZoomAnchorPanel.Controls.Add(this.ZoomAanchorSRadioButton); this.ZoomAnchorPanel.Controls.Add(this.ZoomAanchorERadioButton); this.ZoomAnchorPanel.Controls.Add(this.ZoomAanchorSWRadioButton); - this.ZoomAnchorPanel.Location = new System.Drawing.Point(182, 21); + this.ZoomAnchorPanel.Location = new System.Drawing.Point(199, 20); this.ZoomAnchorPanel.Name = "ZoomAnchorPanel"; this.ZoomAnchorPanel.Size = new System.Drawing.Size(60, 57); - this.ZoomAnchorPanel.TabIndex = 28; + this.ZoomAnchorPanel.TabIndex = 2; // // ZoomAanchorNWRadioButton // @@ -356,7 +366,7 @@ namespace EveOPreview.UI this.ZoomAanchorNWRadioButton.Location = new System.Drawing.Point(3, 3); this.ZoomAanchorNWRadioButton.Name = "ZoomAanchorNWRadioButton"; this.ZoomAanchorNWRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorNWRadioButton.TabIndex = 15; + this.ZoomAanchorNWRadioButton.TabIndex = 0; this.ZoomAanchorNWRadioButton.TabStop = true; this.ZoomAanchorNWRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorNWRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -367,7 +377,7 @@ namespace EveOPreview.UI this.ZoomAanchorNRadioButton.Location = new System.Drawing.Point(23, 3); this.ZoomAanchorNRadioButton.Name = "ZoomAanchorNRadioButton"; this.ZoomAanchorNRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorNRadioButton.TabIndex = 16; + this.ZoomAanchorNRadioButton.TabIndex = 1; this.ZoomAanchorNRadioButton.TabStop = true; this.ZoomAanchorNRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorNRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -378,7 +388,7 @@ namespace EveOPreview.UI this.ZoomAanchorNERadioButton.Location = new System.Drawing.Point(43, 3); this.ZoomAanchorNERadioButton.Name = "ZoomAanchorNERadioButton"; this.ZoomAanchorNERadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorNERadioButton.TabIndex = 17; + this.ZoomAanchorNERadioButton.TabIndex = 2; this.ZoomAanchorNERadioButton.TabStop = true; this.ZoomAanchorNERadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorNERadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -389,7 +399,7 @@ namespace EveOPreview.UI this.ZoomAanchorWRadioButton.Location = new System.Drawing.Point(3, 22); this.ZoomAanchorWRadioButton.Name = "ZoomAanchorWRadioButton"; this.ZoomAanchorWRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorWRadioButton.TabIndex = 18; + this.ZoomAanchorWRadioButton.TabIndex = 3; this.ZoomAanchorWRadioButton.TabStop = true; this.ZoomAanchorWRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorWRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -400,7 +410,7 @@ namespace EveOPreview.UI this.ZoomAanchorSERadioButton.Location = new System.Drawing.Point(43, 41); this.ZoomAanchorSERadioButton.Name = "ZoomAanchorSERadioButton"; this.ZoomAanchorSERadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorSERadioButton.TabIndex = 23; + this.ZoomAanchorSERadioButton.TabIndex = 8; this.ZoomAanchorSERadioButton.TabStop = true; this.ZoomAanchorSERadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorSERadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -411,7 +421,7 @@ namespace EveOPreview.UI this.ZoomAanchorCRadioButton.Location = new System.Drawing.Point(23, 22); this.ZoomAanchorCRadioButton.Name = "ZoomAanchorCRadioButton"; this.ZoomAanchorCRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorCRadioButton.TabIndex = 19; + this.ZoomAanchorCRadioButton.TabIndex = 4; this.ZoomAanchorCRadioButton.TabStop = true; this.ZoomAanchorCRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorCRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -422,7 +432,7 @@ namespace EveOPreview.UI this.ZoomAanchorSRadioButton.Location = new System.Drawing.Point(23, 41); this.ZoomAanchorSRadioButton.Name = "ZoomAanchorSRadioButton"; this.ZoomAanchorSRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorSRadioButton.TabIndex = 22; + this.ZoomAanchorSRadioButton.TabIndex = 7; this.ZoomAanchorSRadioButton.TabStop = true; this.ZoomAanchorSRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorSRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -433,7 +443,7 @@ namespace EveOPreview.UI this.ZoomAanchorERadioButton.Location = new System.Drawing.Point(43, 22); this.ZoomAanchorERadioButton.Name = "ZoomAanchorERadioButton"; this.ZoomAanchorERadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorERadioButton.TabIndex = 20; + this.ZoomAanchorERadioButton.TabIndex = 5; this.ZoomAanchorERadioButton.TabStop = true; this.ZoomAanchorERadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorERadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -444,7 +454,7 @@ namespace EveOPreview.UI this.ZoomAanchorSWRadioButton.Location = new System.Drawing.Point(3, 41); this.ZoomAanchorSWRadioButton.Name = "ZoomAanchorSWRadioButton"; this.ZoomAanchorSWRadioButton.Size = new System.Drawing.Size(14, 13); - this.ZoomAanchorSWRadioButton.TabIndex = 21; + this.ZoomAanchorSWRadioButton.TabIndex = 6; this.ZoomAanchorSWRadioButton.TabStop = true; this.ZoomAanchorSWRadioButton.UseVisualStyleBackColor = true; this.ZoomAanchorSWRadioButton.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -452,7 +462,7 @@ namespace EveOPreview.UI // ZoomAnchorLabel // ZoomAnchorLabel.AutoSize = true; - ZoomAnchorLabel.Location = new System.Drawing.Point(138, 43); + ZoomAnchorLabel.Location = new System.Drawing.Point(150, 43); ZoomAnchorLabel.Name = "ZoomAnchorLabel"; ZoomAnchorLabel.Size = new System.Drawing.Size(41, 13); ZoomAnchorLabel.TabIndex = 30; @@ -467,7 +477,7 @@ namespace EveOPreview.UI this.EnableThumbnailZoomCheckBox.Name = "EnableThumbnailZoomCheckBox"; this.EnableThumbnailZoomCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; this.EnableThumbnailZoomCheckBox.Size = new System.Drawing.Size(98, 17); - this.EnableThumbnailZoomCheckBox.TabIndex = 13; + this.EnableThumbnailZoomCheckBox.TabIndex = 0; this.EnableThumbnailZoomCheckBox.Text = "Zoom on hover"; this.EnableThumbnailZoomCheckBox.UseVisualStyleBackColor = true; this.EnableThumbnailZoomCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); @@ -476,7 +486,7 @@ namespace EveOPreview.UI // this.ThumbnailZoomFactorNumericEdit.BackColor = System.Drawing.SystemColors.Window; this.ThumbnailZoomFactorNumericEdit.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ThumbnailZoomFactorNumericEdit.Location = new System.Drawing.Point(81, 41); + this.ThumbnailZoomFactorNumericEdit.Location = new System.Drawing.Point(94, 41); this.ThumbnailZoomFactorNumericEdit.Maximum = new decimal(new int[] { 10, 0, @@ -488,8 +498,8 @@ namespace EveOPreview.UI 0, 0}); this.ThumbnailZoomFactorNumericEdit.Name = "ThumbnailZoomFactorNumericEdit"; - this.ThumbnailZoomFactorNumericEdit.Size = new System.Drawing.Size(34, 20); - this.ThumbnailZoomFactorNumericEdit.TabIndex = 24; + this.ThumbnailZoomFactorNumericEdit.Size = new System.Drawing.Size(38, 20); + this.ThumbnailZoomFactorNumericEdit.TabIndex = 1; this.ThumbnailZoomFactorNumericEdit.Value = new decimal(new int[] { 1, 0, @@ -497,26 +507,32 @@ namespace EveOPreview.UI 0}); this.ThumbnailZoomFactorNumericEdit.ValueChanged += new System.EventHandler(this.OptionChanged_Handler); // - // ThumbnailsListPanel + // ThumbnailListPanel // - ThumbnailsListPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - ThumbnailsListPanel.Controls.Add(this.ThumbnailsList); - ThumbnailsListPanel.Controls.Add(ThumbnailsListLabel); - ThumbnailsListPanel.Location = new System.Drawing.Point(3, 325); - ThumbnailsListPanel.Name = "ThumbnailsListPanel"; - ThumbnailsListPanel.Size = new System.Drawing.Size(246, 125); - ThumbnailsListPanel.TabIndex = 31; + ThumbnailListPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + ThumbnailListPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + ThumbnailListPanel.Controls.Add(this.ThumbnailsList); + ThumbnailListPanel.Controls.Add(ThumbnailsListLabel); + ThumbnailListPanel.Location = new System.Drawing.Point(3, 350); + ThumbnailListPanel.Name = "ThumbnailListPanel"; + ThumbnailListPanel.Size = new System.Drawing.Size(264, 125); + ThumbnailListPanel.TabIndex = 5; // // ThumbnailsList // + this.ThumbnailsList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.ThumbnailsList.BackColor = System.Drawing.SystemColors.Window; this.ThumbnailsList.BorderStyle = System.Windows.Forms.BorderStyle.None; this.ThumbnailsList.FormattingEnabled = true; this.ThumbnailsList.IntegralHeight = false; this.ThumbnailsList.Location = new System.Drawing.Point(3, 18); this.ThumbnailsList.Name = "ThumbnailsList"; - this.ThumbnailsList.Size = new System.Drawing.Size(240, 100); - this.ThumbnailsList.TabIndex = 28; + this.ThumbnailsList.Size = new System.Drawing.Size(256, 100); + this.ThumbnailsList.TabIndex = 0; this.ThumbnailsList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.ThumbnailsList_ItemCheck_Handler); // // ThumbnailsListLabel @@ -540,12 +556,89 @@ namespace EveOPreview.UI SeparatorMenuItem.Name = "SeparatorMenuItem"; SeparatorMenuItem.Size = new System.Drawing.Size(148, 6); // + // OverlayOptionsPanel + // + OverlayOptionsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + OverlayOptionsPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + OverlayOptionsPanel.Controls.Add(this.HighlightColorLabel); + OverlayOptionsPanel.Controls.Add(this.ActiveClientHighlightColorButton); + OverlayOptionsPanel.Controls.Add(this.EnableActiveClientHighlightCheckBox); + OverlayOptionsPanel.Controls.Add(this.ShowThumbnailOverlaysCheckBox); + OverlayOptionsPanel.Controls.Add(this.ShowThumbnailFramesCheckBox); + OverlayOptionsPanel.Location = new System.Drawing.Point(3, 295); + OverlayOptionsPanel.Name = "OverlayOptionsPanel"; + OverlayOptionsPanel.Size = new System.Drawing.Size(264, 49); + OverlayOptionsPanel.TabIndex = 3; + // + // HighlightColorLabel + // + this.HighlightColorLabel.AutoSize = true; + this.HighlightColorLabel.Location = new System.Drawing.Point(150, 28); + this.HighlightColorLabel.Name = "HighlightColorLabel"; + this.HighlightColorLabel.Size = new System.Drawing.Size(31, 13); + this.HighlightColorLabel.TabIndex = 19; + this.HighlightColorLabel.Text = "Color"; + // + // ActiveClientHighlightColorButton + // + this.ActiveClientHighlightColorButton.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ActiveClientHighlightColorButton.Location = new System.Drawing.Point(199, 27); + this.ActiveClientHighlightColorButton.Name = "ActiveClientHighlightColorButton"; + this.ActiveClientHighlightColorButton.Size = new System.Drawing.Size(60, 17); + this.ActiveClientHighlightColorButton.TabIndex = 3; + this.ActiveClientHighlightColorButton.Click += new System.EventHandler(this.ActiveClientHighlightColorButton_Click); + // + // EnableActiveClientHighlightCheckBox + // + this.EnableActiveClientHighlightCheckBox.AutoSize = true; + this.EnableActiveClientHighlightCheckBox.Checked = true; + this.EnableActiveClientHighlightCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.EnableActiveClientHighlightCheckBox.Location = new System.Drawing.Point(3, 27); + this.EnableActiveClientHighlightCheckBox.Name = "EnableActiveClientHighlightCheckBox"; + this.EnableActiveClientHighlightCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.EnableActiveClientHighlightCheckBox.Size = new System.Drawing.Size(127, 17); + this.EnableActiveClientHighlightCheckBox.TabIndex = 2; + this.EnableActiveClientHighlightCheckBox.Text = "Highlight active client"; + this.EnableActiveClientHighlightCheckBox.UseVisualStyleBackColor = true; + this.EnableActiveClientHighlightCheckBox.CheckStateChanged += new System.EventHandler(this.OptionChanged_Handler); + // + // ShowThumbnailOverlaysCheckBox + // + this.ShowThumbnailOverlaysCheckBox.AutoSize = true; + this.ShowThumbnailOverlaysCheckBox.Checked = true; + this.ShowThumbnailOverlaysCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.ShowThumbnailOverlaysCheckBox.Location = new System.Drawing.Point(3, 4); + this.ShowThumbnailOverlaysCheckBox.Name = "ShowThumbnailOverlaysCheckBox"; + this.ShowThumbnailOverlaysCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.ShowThumbnailOverlaysCheckBox.Size = new System.Drawing.Size(90, 17); + this.ShowThumbnailOverlaysCheckBox.TabIndex = 0; + this.ShowThumbnailOverlaysCheckBox.Text = "Show overlay"; + this.ShowThumbnailOverlaysCheckBox.UseVisualStyleBackColor = true; + this.ShowThumbnailOverlaysCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); + // + // ShowThumbnailFramesCheckBox + // + this.ShowThumbnailFramesCheckBox.AutoSize = true; + this.ShowThumbnailFramesCheckBox.Checked = true; + this.ShowThumbnailFramesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; + this.ShowThumbnailFramesCheckBox.Location = new System.Drawing.Point(153, 4); + this.ShowThumbnailFramesCheckBox.Name = "ShowThumbnailFramesCheckBox"; + this.ShowThumbnailFramesCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.ShowThumbnailFramesCheckBox.Size = new System.Drawing.Size(87, 17); + this.ShowThumbnailFramesCheckBox.TabIndex = 1; + this.ShowThumbnailFramesCheckBox.Text = "Show frames"; + this.ShowThumbnailFramesCheckBox.UseVisualStyleBackColor = true; + this.ShowThumbnailFramesCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); + // // ForumLinkLabel // - this.ForumLinkLabel.Location = new System.Drawing.Point(3, 453); + this.ForumLinkLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ForumLinkLabel.Location = new System.Drawing.Point(4, 478); this.ForumLinkLabel.Name = "ForumLinkLabel"; - this.ForumLinkLabel.Size = new System.Drawing.Size(246, 33); - this.ForumLinkLabel.TabIndex = 10; + this.ForumLinkLabel.Size = new System.Drawing.Size(264, 33); + this.ForumLinkLabel.TabIndex = 0; this.ForumLinkLabel.TabStop = true; this.ForumLinkLabel.Text = "to be set from prresenter to be set from prresenter to be set from prresenter to " + "be set from prresenter"; @@ -569,55 +662,17 @@ namespace EveOPreview.UI this.TrayMenu.Name = "contextMenuStrip1"; this.TrayMenu.Size = new System.Drawing.Size(152, 76); // - // panel1 - // - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.ShowThumbnailOverlaysCheckBox); - this.panel1.Controls.Add(this.ShowThumbnailFramesCheckBox); - this.panel1.Location = new System.Drawing.Point(3, 295); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(246, 24); - this.panel1.TabIndex = 35; - // - // ShowThumbnailOverlaysCheckBox - // - this.ShowThumbnailOverlaysCheckBox.AutoSize = true; - this.ShowThumbnailOverlaysCheckBox.Checked = true; - this.ShowThumbnailOverlaysCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.ShowThumbnailOverlaysCheckBox.Location = new System.Drawing.Point(3, 4); - this.ShowThumbnailOverlaysCheckBox.Name = "ShowThumbnailOverlaysCheckBox"; - this.ShowThumbnailOverlaysCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.ShowThumbnailOverlaysCheckBox.Size = new System.Drawing.Size(90, 17); - this.ShowThumbnailOverlaysCheckBox.TabIndex = 16; - this.ShowThumbnailOverlaysCheckBox.Text = "Show overlay"; - this.ShowThumbnailOverlaysCheckBox.UseVisualStyleBackColor = true; - this.ShowThumbnailOverlaysCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); - // - // ShowThumbnailFramesCheckBox - // - this.ShowThumbnailFramesCheckBox.AutoSize = true; - this.ShowThumbnailFramesCheckBox.Checked = true; - this.ShowThumbnailFramesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.ShowThumbnailFramesCheckBox.Location = new System.Drawing.Point(103, 4); - this.ShowThumbnailFramesCheckBox.Name = "ShowThumbnailFramesCheckBox"; - this.ShowThumbnailFramesCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.ShowThumbnailFramesCheckBox.Size = new System.Drawing.Size(127, 17); - this.ShowThumbnailFramesCheckBox.TabIndex = 15; - this.ShowThumbnailFramesCheckBox.Text = "Show preview frames"; - this.ShowThumbnailFramesCheckBox.UseVisualStyleBackColor = true; - this.ShowThumbnailFramesCheckBox.CheckedChanged += new System.EventHandler(this.OptionChanged_Handler); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(252, 485); - this.Controls.Add(this.panel1); - this.Controls.Add(OpacityPanel); - this.Controls.Add(ResizeOptionsPanel); + this.ClientSize = new System.Drawing.Size(270, 511); + this.Controls.Add(OverlayOptionsPanel); + this.Controls.Add(MainOptionsPanel); + this.Controls.Add(ThumbnailSizePanel); this.Controls.Add(ZoomOptionsPanel); - this.Controls.Add(ThumbnailsListPanel); + this.Controls.Add(ThumbnailListPanel); this.Controls.Add(this.ForumLinkLabel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -629,11 +684,11 @@ namespace EveOPreview.UI this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainFormClosing_Handler); this.Load += new System.EventHandler(this.MainFormResize_Handler); this.Resize += new System.EventHandler(this.MainFormResize_Handler); - OpacityPanel.ResumeLayout(false); - OpacityPanel.PerformLayout(); + MainOptionsPanel.ResumeLayout(false); + MainOptionsPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailOpacityTrackBar)).EndInit(); - ResizeOptionsPanel.ResumeLayout(false); - ResizeOptionsPanel.PerformLayout(); + ThumbnailSizePanel.ResumeLayout(false); + ThumbnailSizePanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailsWidthNumericEdit)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailsHeightNumericEdit)).EndInit(); ZoomOptionsPanel.ResumeLayout(false); @@ -641,11 +696,11 @@ namespace EveOPreview.UI this.ZoomAnchorPanel.ResumeLayout(false); this.ZoomAnchorPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.ThumbnailZoomFactorNumericEdit)).EndInit(); - ThumbnailsListPanel.ResumeLayout(false); - ThumbnailsListPanel.PerformLayout(); + ThumbnailListPanel.ResumeLayout(false); + ThumbnailListPanel.PerformLayout(); + OverlayOptionsPanel.ResumeLayout(false); + OverlayOptionsPanel.PerformLayout(); this.TrayMenu.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -674,10 +729,12 @@ namespace EveOPreview.UI private CheckBox ShowThumbnailsAlwaysOnTopCheckBox; private CheckBox HideThumbnailsOnLostFocusCheckBox; private CheckBox EnablePerClientThumbnailsLayoutsCheckBox; - private Panel panel1; private CheckBox ShowThumbnailOverlaysCheckBox; private CheckBox ShowThumbnailFramesCheckBox; private CheckBox MinimizeToTrayCheckBox; private TrackBar ThumbnailOpacityTrackBar; + private CheckBox EnableActiveClientHighlightCheckBox; + private Label HighlightColorLabel; + private Panel ActiveClientHighlightColorButton; } } \ No newline at end of file diff --git a/Eve-O-Preview/UI/Implementation/MainForm.cs b/Eve-O-Preview/UI/Implementation/MainForm.cs index bd5589a..da802cd 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.cs @@ -218,9 +218,31 @@ namespace EveOPreview.UI } } - public bool EnableActiveClientHighlight { get; set; } + public bool EnableActiveClientHighlight + { + get + { + return this.EnableActiveClientHighlightCheckBox.Checked; + } + set + { + this.EnableActiveClientHighlightCheckBox.Checked = value; + } + } - public Color ActiveClientHighlightColor { get; set; } + public Color ActiveClientHighlightColor + { + get + { + return this._activeClientHighlightColor; + } + set + { + this._activeClientHighlightColor = value; + this.ActiveClientHighlightColorButton.BackColor = value; + } + } + private Color _activeClientHighlightColor; public new void Show() { @@ -345,6 +367,23 @@ namespace EveOPreview.UI this.ThumbnailsSizeChanged?.Invoke(); } + private void ActiveClientHighlightColorButton_Click(object sender, EventArgs e) + { + using (ColorDialog dialog = new ColorDialog()) + { + dialog.Color = this.ActiveClientHighlightColor; + + if (dialog.ShowDialog() != DialogResult.OK) + { + return; + } + + this.ActiveClientHighlightColor = dialog.Color; + } + + this.OptionChanged_Handler(sender, e); + } + private void ThumbnailsList_ItemCheck_Handler(object sender, ItemCheckEventArgs e) { IThumbnailDescriptionView selectedItem = this.ThumbnailsList.Items[e.Index] as IThumbnailDescriptionView; diff --git a/Eve-O-Preview/UI/Implementation/MainForm.resx b/Eve-O-Preview/UI/Implementation/MainForm.resx index 780add2..6db7e83 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.resx +++ b/Eve-O-Preview/UI/Implementation/MainForm.resx @@ -120,60 +120,261 @@ False + + True + False False - + False - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + False + + True + False + + True + False + + True + + + True + + + True + False + + True + False + + True + + + True + + + True + False - - False - - - False + + True False + + True + + + True + False - + + True + + + True + + + True + + False + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + True + False + + True + + + True + False + + True + False False + + False + + + True + + + True + + + True + + + True + + + True + + + True + + + True + 17, 17 @@ -760,6 +961,9 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////////// + + True + 36