diff --git a/Eve-O-Preview/Presentation/MainPresenter.cs b/Eve-O-Preview/Presentation/MainPresenter.cs index e027465..cfac9ef 100644 --- a/Eve-O-Preview/Presentation/MainPresenter.cs +++ b/Eve-O-Preview/Presentation/MainPresenter.cs @@ -54,13 +54,17 @@ namespace EveOPreview.UI { this.LoadApplicationSettings(); this.View.SetForumUrl(MainPresenter.ForumUrl); + if (this._configuration.MinimizeToTray) + { + this.View.Minimize(); + } this._thumbnailManager.Activate(); } private void Minimize() { - if (!this.View.MinimizeToTray) + if (!this._configuration.MinimizeToTray) { return; } diff --git a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs index dd455c2..54bc9ae 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs +++ b/Eve-O-Preview/UI/Implementation/MainForm.Designer.cs @@ -42,9 +42,9 @@ namespace EveOPreview.UI System.Windows.Forms.Label ZoomAnchorLabel; System.Windows.Forms.Panel ThumbnailsListPanel; System.Windows.Forms.Label ThumbnailsListLabel; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); System.Windows.Forms.ToolStripMenuItem TitleMenuItem; System.Windows.Forms.ToolStripSeparator SeparatorMenuItem; + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.MinimizeToTrayCheckBox = new System.Windows.Forms.CheckBox(); this.ThumbnailsOpacityScrollBar = new System.Windows.Forms.HScrollBar(); this.EnableClientLayoutTrackingCheckBox = new System.Windows.Forms.CheckBox(); @@ -581,6 +581,18 @@ namespace EveOPreview.UI "be set from prresenter"; this.ForumLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.ForumLinkLabelClicked_Handler); // + // TitleMenuItem + // + TitleMenuItem.Enabled = false; + TitleMenuItem.Name = "TitleMenuItem"; + TitleMenuItem.Size = new System.Drawing.Size(151, 22); + TitleMenuItem.Text = "EVE-O Preview"; + // + // SeparatorMenuItem + // + SeparatorMenuItem.Name = "SeparatorMenuItem"; + SeparatorMenuItem.Size = new System.Drawing.Size(148, 6); + // // NotifyIcon // this.NotifyIcon.ContextMenuStrip = this.TrayMenu; @@ -599,18 +611,6 @@ namespace EveOPreview.UI this.TrayMenu.Name = "contextMenuStrip1"; this.TrayMenu.Size = new System.Drawing.Size(152, 76); // - // TitleMenuItem - // - TitleMenuItem.Enabled = false; - TitleMenuItem.Name = "TitleMenuItem"; - TitleMenuItem.Size = new System.Drawing.Size(151, 22); - TitleMenuItem.Text = "EVE-O Preview"; - // - // SeparatorMenuItem - // - SeparatorMenuItem.Name = "SeparatorMenuItem"; - SeparatorMenuItem.Size = new System.Drawing.Size(148, 6); - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -625,8 +625,8 @@ namespace EveOPreview.UI this.Name = "MainForm"; this.Text = "EVE-O Preview"; this.TopMost = true; - this.WindowState = System.Windows.Forms.FormWindowState.Minimized; 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); ContentFlowLayoutPanel.ResumeLayout(false); ContentFlowLayoutPanel.PerformLayout(); diff --git a/Eve-O-Preview/UI/Implementation/MainForm.resx b/Eve-O-Preview/UI/Implementation/MainForm.resx index 1957984..11cf4f4 100644 --- a/Eve-O-Preview/UI/Implementation/MainForm.resx +++ b/Eve-O-Preview/UI/Implementation/MainForm.resx @@ -144,6 +144,60 @@ True + + True + + + True + + + True + + + True + + + True + + + False + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + True + + + True + + + False + + + True + + + True + True @@ -177,6 +231,15 @@ True + + True + + + True + + + True + False @@ -192,6 +255,54 @@ True + + False + + + True + + + True + + + True + + + False + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -252,14 +363,17 @@ True - + True - - 17, 17 + + False - - 123, 17 + + True + + + True False @@ -267,6 +381,12 @@ False + + 17, 17 + + + 123, 17 + diff --git a/Eve-O-Preview/UI/Implementation/ThumbnailOverlay.Designer.cs b/Eve-O-Preview/UI/Implementation/ThumbnailOverlay.Designer.cs index 321644c..5336b35 100644 --- a/Eve-O-Preview/UI/Implementation/ThumbnailOverlay.Designer.cs +++ b/Eve-O-Preview/UI/Implementation/ThumbnailOverlay.Designer.cs @@ -59,7 +59,7 @@ this.OverlayLabel.TabIndex = 1; this.OverlayLabel.Text = "..."; // - // PreviewOverlay + // ThumbnailOverlay // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;