diff --git a/src/OnTopReplica/MainForm.Designer.cs b/src/OnTopReplica/MainForm.Designer.cs index 9094761..500c80a 100644 --- a/src/OnTopReplica/MainForm.Designer.cs +++ b/src/OnTopReplica/MainForm.Designer.cs @@ -31,6 +31,7 @@ this.menuContextWindows = new System.Windows.Forms.ToolStripMenuItem(); this.menuWindows = new System.Windows.Forms.ContextMenuStrip(this.components); this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fullSelectWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.switchToWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.selectRegionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.advancedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -44,6 +45,7 @@ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); + this.fullOpacityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuResize = new System.Windows.Forms.ContextMenuStrip(this.components); this.doubleToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -67,8 +69,6 @@ this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuContextClose = new System.Windows.Forms.ToolStripMenuItem(); - this.fullOpacityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fullSelectWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuFullscreenContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.modeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuModeStandardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -82,9 +82,10 @@ this.menuResize.SuspendLayout(); this.menuFullscreenContext.SuspendLayout(); this.SuspendLayout(); - // + // // menuContext - // + // + this.menuContext.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuContextWindows, this.switchToWindowToolStripMenuItem, @@ -100,53 +101,63 @@ this.aboutToolStripMenuItem, this.menuContextClose}); this.menuContext.Name = "menuContext"; - this.menuContext.Size = new System.Drawing.Size(187, 274); + this.menuContext.Size = new System.Drawing.Size(263, 370); this.menuContext.Opening += new System.ComponentModel.CancelEventHandler(this.Menu_opening); - // + // // menuContextWindows - // + // this.menuContextWindows.DropDown = this.menuWindows; this.menuContextWindows.Image = global::OnTopReplica.Properties.Resources.list; this.menuContextWindows.Name = "menuContextWindows"; - this.menuContextWindows.Size = new System.Drawing.Size(186, 22); + this.menuContextWindows.Size = new System.Drawing.Size(262, 30); this.menuContextWindows.Text = global::OnTopReplica.Strings.MenuWindows; this.menuContextWindows.ToolTipText = global::OnTopReplica.Strings.MenuWindowsTT; - // + // // menuWindows - // + // + this.menuWindows.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuWindows.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem}); this.menuWindows.Name = "menuWindows"; - this.menuWindows.OwnerItem = this.fullSelectWindowToolStripMenuItem; - this.menuWindows.Size = new System.Drawing.Size(118, 26); - // + this.menuWindows.OwnerItem = this.menuContextWindows; + this.menuWindows.Size = new System.Drawing.Size(149, 34); + // // noneToolStripMenuItem - // + // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(117, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(148, 30); this.noneToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuWindowsNone; - // + // + // fullSelectWindowToolStripMenuItem + // + this.fullSelectWindowToolStripMenuItem.DropDown = this.menuWindows; + this.fullSelectWindowToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.list; + this.fullSelectWindowToolStripMenuItem.Name = "fullSelectWindowToolStripMenuItem"; + this.fullSelectWindowToolStripMenuItem.Size = new System.Drawing.Size(259, 30); + this.fullSelectWindowToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuWindows; + this.fullSelectWindowToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuWindowsTT; + // // switchToWindowToolStripMenuItem - // + // this.switchToWindowToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.xiao_arrow; this.switchToWindowToolStripMenuItem.Name = "switchToWindowToolStripMenuItem"; - this.switchToWindowToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.switchToWindowToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.switchToWindowToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuSwitch; this.switchToWindowToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuSwitchTT; this.switchToWindowToolStripMenuItem.Click += new System.EventHandler(this.Menu_Switch_click); - // + // // selectRegionToolStripMenuItem - // + // this.selectRegionToolStripMenuItem.Enabled = false; this.selectRegionToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.regions; this.selectRegionToolStripMenuItem.Name = "selectRegionToolStripMenuItem"; - this.selectRegionToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.selectRegionToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.selectRegionToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuRegion; this.selectRegionToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuRegionTT; this.selectRegionToolStripMenuItem.Click += new System.EventHandler(this.Menu_Region_click); - // + // // advancedToolStripMenuItem - // + // this.advancedToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.clickForwardingToolStripMenuItem, this.clickThroughToolStripMenuItem, @@ -154,115 +165,125 @@ this.restoreLastClonedWindowToolStripMenuItem}); this.advancedToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.xiao_wrench; this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; - this.advancedToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.advancedToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.advancedToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuAdvanced; this.advancedToolStripMenuItem.DropDownOpening += new System.EventHandler(this.Menu_Advanced_opening); - // + // // clickForwardingToolStripMenuItem - // + // this.clickForwardingToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.clickforwarding; this.clickForwardingToolStripMenuItem.Name = "clickForwardingToolStripMenuItem"; - this.clickForwardingToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.clickForwardingToolStripMenuItem.Size = new System.Drawing.Size(312, 30); this.clickForwardingToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuClickForwarding; this.clickForwardingToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuClickForwardingTT; this.clickForwardingToolStripMenuItem.Click += new System.EventHandler(this.Menu_ClickForwarding_click); - // + // // clickThroughToolStripMenuItem - // + // this.clickThroughToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.window_opacity; this.clickThroughToolStripMenuItem.Name = "clickThroughToolStripMenuItem"; - this.clickThroughToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.clickThroughToolStripMenuItem.Size = new System.Drawing.Size(312, 30); this.clickThroughToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuClickThrough; this.clickThroughToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuClickThroughTT; this.clickThroughToolStripMenuItem.Click += new System.EventHandler(this.Menu_ClickThrough_click); - // + // // groupSwitchModeToolStripMenuItem - // + // this.groupSwitchModeToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.groupmode; this.groupSwitchModeToolStripMenuItem.Name = "groupSwitchModeToolStripMenuItem"; - this.groupSwitchModeToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.groupSwitchModeToolStripMenuItem.Size = new System.Drawing.Size(312, 30); this.groupSwitchModeToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuGroupSwitch; this.groupSwitchModeToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuGroupSwitchTT; this.groupSwitchModeToolStripMenuItem.Click += new System.EventHandler(this.Menu_GroupSwitchMode_click); - // + // // restoreLastClonedWindowToolStripMenuItem - // + // this.restoreLastClonedWindowToolStripMenuItem.Name = "restoreLastClonedWindowToolStripMenuItem"; - this.restoreLastClonedWindowToolStripMenuItem.Size = new System.Drawing.Size(218, 22); + this.restoreLastClonedWindowToolStripMenuItem.Size = new System.Drawing.Size(312, 30); this.restoreLastClonedWindowToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuRestoreLast; this.restoreLastClonedWindowToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuRestoreLastTT; this.restoreLastClonedWindowToolStripMenuItem.Click += new System.EventHandler(this.Menu_RestoreLastWindow_click); - // + // // menuContextOpacity - // + // this.menuContextOpacity.DropDown = this.menuOpacity; this.menuContextOpacity.Image = global::OnTopReplica.Properties.Resources.window_opacity; this.menuContextOpacity.Name = "menuContextOpacity"; - this.menuContextOpacity.Size = new System.Drawing.Size(186, 22); + this.menuContextOpacity.Size = new System.Drawing.Size(262, 30); this.menuContextOpacity.Text = global::OnTopReplica.Strings.MenuOpacity; - // + // // menuOpacity - // + // + this.menuOpacity.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuOpacity.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem1, this.toolStripMenuItem2, this.toolStripMenuItem3, this.toolStripMenuItem4}); this.menuOpacity.Name = "menuOpacity"; - this.menuOpacity.OwnerItem = this.fullOpacityToolStripMenuItem; + this.menuOpacity.OwnerItem = this.menuContextOpacity; this.menuOpacity.ShowCheckMargin = true; this.menuOpacity.ShowImageMargin = false; - this.menuOpacity.Size = new System.Drawing.Size(154, 92); + this.menuOpacity.Size = new System.Drawing.Size(206, 124); this.menuOpacity.Opening += new System.ComponentModel.CancelEventHandler(this.Menu_Opacity_opening); - // + // // toolStripMenuItem1 - // + // this.toolStripMenuItem1.Checked = true; this.toolStripMenuItem1.CheckState = System.Windows.Forms.CheckState.Checked; this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(153, 22); + this.toolStripMenuItem1.Size = new System.Drawing.Size(205, 30); this.toolStripMenuItem1.Tag = 1D; this.toolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuOp100; this.toolStripMenuItem1.ToolTipText = global::OnTopReplica.Strings.MenuOp100TT; this.toolStripMenuItem1.Click += new System.EventHandler(this.Menu_Opacity_click); - // + // // toolStripMenuItem2 - // + // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(153, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(205, 30); this.toolStripMenuItem2.Tag = 0.75D; this.toolStripMenuItem2.Text = global::OnTopReplica.Strings.MenuOp75; this.toolStripMenuItem2.ToolTipText = global::OnTopReplica.Strings.MenuOp75TT; this.toolStripMenuItem2.Click += new System.EventHandler(this.Menu_Opacity_click); - // + // // toolStripMenuItem3 - // + // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(153, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(205, 30); this.toolStripMenuItem3.Tag = 0.5D; this.toolStripMenuItem3.Text = global::OnTopReplica.Strings.MenuOp50; this.toolStripMenuItem3.ToolTipText = global::OnTopReplica.Strings.MenuOp50TT; this.toolStripMenuItem3.Click += new System.EventHandler(this.Menu_Opacity_click); - // + // // toolStripMenuItem4 - // + // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(153, 22); + this.toolStripMenuItem4.Size = new System.Drawing.Size(205, 30); this.toolStripMenuItem4.Tag = 0.25D; this.toolStripMenuItem4.Text = global::OnTopReplica.Strings.MenuOp25; this.toolStripMenuItem4.ToolTipText = global::OnTopReplica.Strings.MenuOp25TT; this.toolStripMenuItem4.Click += new System.EventHandler(this.Menu_Opacity_click); - // + // + // fullOpacityToolStripMenuItem + // + this.fullOpacityToolStripMenuItem.DropDown = this.menuOpacity; + this.fullOpacityToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.window_opacity; + this.fullOpacityToolStripMenuItem.Name = "fullOpacityToolStripMenuItem"; + this.fullOpacityToolStripMenuItem.Size = new System.Drawing.Size(259, 30); + this.fullOpacityToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuOpacity; + // // resizeToolStripMenuItem - // + // this.resizeToolStripMenuItem.DropDown = this.menuResize; this.resizeToolStripMenuItem.Enabled = false; this.resizeToolStripMenuItem.Name = "resizeToolStripMenuItem"; - this.resizeToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.resizeToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.resizeToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuResize; - // + // // menuResize - // + // + this.menuResize.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuResize.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.doubleToolStripMenuItem1, this.fitToWindowToolStripMenuItem1, @@ -274,65 +295,65 @@ this.restorePositionAndSizeToolStripMenuItem}); this.menuResize.Name = "menuResize"; this.menuResize.OwnerItem = this.resizeToolStripMenuItem; - this.menuResize.Size = new System.Drawing.Size(218, 148); + this.menuResize.Size = new System.Drawing.Size(308, 196); this.menuResize.Opening += new System.ComponentModel.CancelEventHandler(this.Menu_Resize_opening); - // + // // doubleToolStripMenuItem1 - // + // this.doubleToolStripMenuItem1.Name = "doubleToolStripMenuItem1"; - this.doubleToolStripMenuItem1.Size = new System.Drawing.Size(217, 22); + this.doubleToolStripMenuItem1.Size = new System.Drawing.Size(307, 30); this.doubleToolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuFitDouble; this.doubleToolStripMenuItem1.Click += new System.EventHandler(this.Menu_Resize_Double); - // + // // fitToWindowToolStripMenuItem1 - // + // this.fitToWindowToolStripMenuItem1.Name = "fitToWindowToolStripMenuItem1"; - this.fitToWindowToolStripMenuItem1.Size = new System.Drawing.Size(217, 22); + this.fitToWindowToolStripMenuItem1.Size = new System.Drawing.Size(307, 30); this.fitToWindowToolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuFitOriginal; this.fitToWindowToolStripMenuItem1.Click += new System.EventHandler(this.Menu_Resize_FitToWindow); - // + // // halfToolStripMenuItem1 - // + // this.halfToolStripMenuItem1.Name = "halfToolStripMenuItem1"; - this.halfToolStripMenuItem1.Size = new System.Drawing.Size(217, 22); + this.halfToolStripMenuItem1.Size = new System.Drawing.Size(307, 30); this.halfToolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuFitHalf; this.halfToolStripMenuItem1.Click += new System.EventHandler(this.Menu_Resize_Half); - // + // // quarterToolStripMenuItem1 - // + // this.quarterToolStripMenuItem1.Name = "quarterToolStripMenuItem1"; - this.quarterToolStripMenuItem1.Size = new System.Drawing.Size(217, 22); + this.quarterToolStripMenuItem1.Size = new System.Drawing.Size(307, 30); this.quarterToolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuFitQuarter; this.quarterToolStripMenuItem1.Click += new System.EventHandler(this.Menu_Resize_Quarter); - // + // // toolStripSeparator3 - // + // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(214, 6); - // + this.toolStripSeparator3.Size = new System.Drawing.Size(304, 6); + // // fullscreenToolStripMenuItem1 - // + // this.fullscreenToolStripMenuItem1.Image = global::OnTopReplica.Properties.Resources.fullscreen; this.fullscreenToolStripMenuItem1.Name = "fullscreenToolStripMenuItem1"; - this.fullscreenToolStripMenuItem1.Size = new System.Drawing.Size(217, 22); + this.fullscreenToolStripMenuItem1.Size = new System.Drawing.Size(307, 30); this.fullscreenToolStripMenuItem1.Text = global::OnTopReplica.Strings.MenuFitFullscreen; this.fullscreenToolStripMenuItem1.Click += new System.EventHandler(this.Menu_Resize_Fullscreen); - // + // // toolStripSeparator2 - // + // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(214, 6); - // + this.toolStripSeparator2.Size = new System.Drawing.Size(304, 6); + // // restorePositionAndSizeToolStripMenuItem - // + // this.restorePositionAndSizeToolStripMenuItem.Name = "restorePositionAndSizeToolStripMenuItem"; - this.restorePositionAndSizeToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.restorePositionAndSizeToolStripMenuItem.Size = new System.Drawing.Size(307, 30); this.restorePositionAndSizeToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuRecall; this.restorePositionAndSizeToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuRecallTT; this.restorePositionAndSizeToolStripMenuItem.Click += new System.EventHandler(this.Menu_Resize_RecallPosition_click); - // + // // dockToolStripMenuItem - // + // this.dockToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.disabledToolStripMenuItem, this.topLeftToolStripMenuItem, @@ -342,126 +363,110 @@ this.bottomRightToolStripMenuItem}); this.dockToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_null; this.dockToolStripMenuItem.Name = "dockToolStripMenuItem"; - this.dockToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.dockToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.dockToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosition; this.dockToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuPositionTT; this.dockToolStripMenuItem.DropDownOpening += new System.EventHandler(this.Menu_Position_Opening); - // + // // disabledToolStripMenuItem - // + // this.disabledToolStripMenuItem.Checked = true; this.disabledToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.disabledToolStripMenuItem.Name = "disabledToolStripMenuItem"; - this.disabledToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.disabledToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.disabledToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosDisabled; this.disabledToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_Disable); - // + // // topLeftToolStripMenuItem - // + // this.topLeftToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_topleft; this.topLeftToolStripMenuItem.Name = "topLeftToolStripMenuItem"; - this.topLeftToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.topLeftToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.topLeftToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosTopLeft; this.topLeftToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_TopLeft); - // + // // topRightToolStripMenuItem - // + // this.topRightToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_topright; this.topRightToolStripMenuItem.Name = "topRightToolStripMenuItem"; - this.topRightToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.topRightToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.topRightToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosTopRight; this.topRightToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_TopRight); - // + // // centerToolStripMenuItem - // + // this.centerToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_center; this.centerToolStripMenuItem.Name = "centerToolStripMenuItem"; - this.centerToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.centerToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.centerToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosCenter; this.centerToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_Center); - // + // // bottomLeftToolStripMenuItem - // + // this.bottomLeftToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_bottomleft; this.bottomLeftToolStripMenuItem.Name = "bottomLeftToolStripMenuItem"; - this.bottomLeftToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.bottomLeftToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.bottomLeftToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosBottomLeft; this.bottomLeftToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_BottomLeft); - // + // // bottomRightToolStripMenuItem - // + // this.bottomRightToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.pos_bottomright; this.bottomRightToolStripMenuItem.Name = "bottomRightToolStripMenuItem"; - this.bottomRightToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.bottomRightToolStripMenuItem.Size = new System.Drawing.Size(203, 30); this.bottomRightToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuPosBottomRight; this.bottomRightToolStripMenuItem.Click += new System.EventHandler(this.Menu_Position_BottomRight); - // + // // chromeToolStripMenuItem - // + // this.chromeToolStripMenuItem.Name = "chromeToolStripMenuItem"; - this.chromeToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.chromeToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.chromeToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuChrome; this.chromeToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuChromeTT; this.chromeToolStripMenuItem.Click += new System.EventHandler(this.Menu_Chrome_click); - // + // // reduceToIconToolStripMenuItem - // + // this.reduceToIconToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.minimize; this.reduceToIconToolStripMenuItem.Name = "reduceToIconToolStripMenuItem"; - this.reduceToIconToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.reduceToIconToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.reduceToIconToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuReduce; this.reduceToIconToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuReduceTT; this.reduceToIconToolStripMenuItem.Click += new System.EventHandler(this.Menu_Reduce_click); - // + // // toolStripSeparator1 - // + // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6); - // + this.toolStripSeparator1.Size = new System.Drawing.Size(259, 6); + // // settingsToolStripMenuItem - // + // this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - this.settingsToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.settingsToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuSettings; this.settingsToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuSettingsTT; this.settingsToolStripMenuItem.Click += new System.EventHandler(this.Menu_Settings_click); - // + // // aboutToolStripMenuItem - // + // this.aboutToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.help; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(262, 30); this.aboutToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuAbout; this.aboutToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuAboutTT; this.aboutToolStripMenuItem.Click += new System.EventHandler(this.Menu_About_click); - // + // // menuContextClose - // + // this.menuContextClose.Image = global::OnTopReplica.Properties.Resources.close_new; this.menuContextClose.Name = "menuContextClose"; - this.menuContextClose.Size = new System.Drawing.Size(186, 22); + this.menuContextClose.Size = new System.Drawing.Size(262, 30); this.menuContextClose.Text = global::OnTopReplica.Strings.MenuClose; this.menuContextClose.Click += new System.EventHandler(this.Menu_Close_click); - // - // fullOpacityToolStripMenuItem - // - this.fullOpacityToolStripMenuItem.DropDown = this.menuOpacity; - this.fullOpacityToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.window_opacity; - this.fullOpacityToolStripMenuItem.Name = "fullOpacityToolStripMenuItem"; - this.fullOpacityToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.fullOpacityToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuOpacity; - // - // fullSelectWindowToolStripMenuItem - // - this.fullSelectWindowToolStripMenuItem.DropDown = this.menuWindows; - this.fullSelectWindowToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.list; - this.fullSelectWindowToolStripMenuItem.Name = "fullSelectWindowToolStripMenuItem"; - this.fullSelectWindowToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.fullSelectWindowToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuWindows; - this.fullSelectWindowToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuWindowsTT; - // + // // menuFullscreenContext - // + // + this.menuFullscreenContext.ImageScalingSize = new System.Drawing.Size(24, 24); this.menuFullscreenContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fullSelectWindowToolStripMenuItem, this.modeToolStripMenuItem, @@ -469,70 +474,71 @@ this.enableClickthroughToolStripMenuItem, this.fullExitToolStripMenuItem}); this.menuFullscreenContext.Name = "menuFullscreenContext"; - this.menuFullscreenContext.Size = new System.Drawing.Size(190, 114); - // + this.menuFullscreenContext.Size = new System.Drawing.Size(260, 154); + // // modeToolStripMenuItem - // + // this.modeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuModeStandardToolStripMenuItem, this.menuModeFullscreenToolStripMenuItem, this.menuModeAllScreensToolStripMenuItem}); this.modeToolStripMenuItem.Name = "modeToolStripMenuItem"; - this.modeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.modeToolStripMenuItem.Size = new System.Drawing.Size(259, 30); this.modeToolStripMenuItem.Text = "Mode"; this.modeToolStripMenuItem.DropDownOpening += new System.EventHandler(this.Menu_Fullscreen_Mode_opening); - // + // // menuModeStandardToolStripMenuItem - // + // this.menuModeStandardToolStripMenuItem.Name = "menuModeStandardToolStripMenuItem"; - this.menuModeStandardToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.menuModeStandardToolStripMenuItem.Size = new System.Drawing.Size(179, 30); this.menuModeStandardToolStripMenuItem.Text = "Standard"; this.menuModeStandardToolStripMenuItem.Click += new System.EventHandler(this.Menu_Fullscreen_Mode_Standard_click); - // + // // menuModeFullscreenToolStripMenuItem - // + // this.menuModeFullscreenToolStripMenuItem.Name = "menuModeFullscreenToolStripMenuItem"; - this.menuModeFullscreenToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.menuModeFullscreenToolStripMenuItem.Size = new System.Drawing.Size(179, 30); this.menuModeFullscreenToolStripMenuItem.Text = "Fullscreen"; this.menuModeFullscreenToolStripMenuItem.Click += new System.EventHandler(this.Menu_Fullscreen_Mode_Fullscreen_click); - // + // // menuModeAllScreensToolStripMenuItem - // + // this.menuModeAllScreensToolStripMenuItem.Name = "menuModeAllScreensToolStripMenuItem"; - this.menuModeAllScreensToolStripMenuItem.Size = new System.Drawing.Size(130, 22); + this.menuModeAllScreensToolStripMenuItem.Size = new System.Drawing.Size(179, 30); this.menuModeAllScreensToolStripMenuItem.Text = "All screens"; this.menuModeAllScreensToolStripMenuItem.Click += new System.EventHandler(this.Menu_Fullscreen_Mode_AllScreens_click); - // + // // enableClickthroughToolStripMenuItem - // + // this.enableClickthroughToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.clickforwarding; this.enableClickthroughToolStripMenuItem.Name = "enableClickthroughToolStripMenuItem"; - this.enableClickthroughToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.enableClickthroughToolStripMenuItem.Size = new System.Drawing.Size(259, 30); this.enableClickthroughToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuClickThrough; this.enableClickthroughToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuClickThroughTT; this.enableClickthroughToolStripMenuItem.Click += new System.EventHandler(this.Menu_ClickThrough_click); - // + // // fullExitToolStripMenuItem - // + // this.fullExitToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.close_new; this.fullExitToolStripMenuItem.Name = "fullExitToolStripMenuItem"; - this.fullExitToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.fullExitToolStripMenuItem.Size = new System.Drawing.Size(259, 30); this.fullExitToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuQuitFullscreen; this.fullExitToolStripMenuItem.Click += new System.EventHandler(this.Menu_Fullscreen_ExitFullscreen_click); - // + // // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(326, 234); + this.ClientSize = new System.Drawing.Size(469, 393); this.ControlBox = false; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; this.HideCaption = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.MaximizeBox = false; this.MinimizeBox = false; - this.MinimumSize = new System.Drawing.Size(44, 44); + this.MinimumSize = new System.Drawing.Size(54, 60); this.Name = "MainForm"; this.Text = "OnTopReplica"; this.TopMost = true; diff --git a/src/OnTopReplica/MainForm.cs b/src/OnTopReplica/MainForm.cs index 92ebfdd..e72d05a 100644 --- a/src/OnTopReplica/MainForm.cs +++ b/src/OnTopReplica/MainForm.cs @@ -33,6 +33,7 @@ namespace OnTopReplica { //WinForms init pass InitializeComponent(); + Program.Platform.PostFormInit(this); //Store default values DefaultNonClickTransparencyKey = TransparencyKey; diff --git a/src/OnTopReplica/OnTopReplica.csproj b/src/OnTopReplica/OnTopReplica.csproj index 883c003..42858a0 100644 --- a/src/OnTopReplica/OnTopReplica.csproj +++ b/src/OnTopReplica/OnTopReplica.csproj @@ -1,4 +1,4 @@ - + Debug @@ -150,6 +150,7 @@ + True @@ -340,7 +341,7 @@ - + diff --git a/src/OnTopReplica/PlatformSupport.cs b/src/OnTopReplica/Platforms/PlatformSupport.cs similarity index 86% rename from src/OnTopReplica/PlatformSupport.cs rename to src/OnTopReplica/Platforms/PlatformSupport.cs index 9ca1394..a87e349 100644 --- a/src/OnTopReplica/PlatformSupport.cs +++ b/src/OnTopReplica/Platforms/PlatformSupport.cs @@ -4,7 +4,7 @@ using System.Text; using OnTopReplica.Platforms; using System.Windows.Forms; -namespace OnTopReplica { +namespace OnTopReplica.Platforms { abstract class PlatformSupport { @@ -25,7 +25,10 @@ namespace OnTopReplica { if (os.Platform != PlatformID.Win32NT) return new Other(); - if (os.Version.Major == 6) { + if(os.Version.Major == 10) { + return new WindowsTen(); + } + else if (os.Version.Major == 6) { if (os.Version.Minor >= 2) return new WindowsEight(); else if (os.Version.Minor == 1) @@ -50,15 +53,21 @@ namespace OnTopReplica { public abstract bool CheckCompatibility(); /// - /// Initializes a form before it is fully constructed and before the window handle has been created. + /// Initialization step to run before the form is constructed. /// public virtual void PreHandleFormInit() { } + /// + /// Initialization step to run just after the form is constructed and WinForms + /// components have initialized. + /// + public virtual void PostFormInit(MainForm form) { + } + /// /// Initializes a form after its handle has been created. /// - /// Form to initialize. public virtual void PostHandleFormInit(MainForm form) { } diff --git a/src/OnTopReplica/Platforms/WindowsTen.cs b/src/OnTopReplica/Platforms/WindowsTen.cs new file mode 100644 index 0000000..2c8c7fa --- /dev/null +++ b/src/OnTopReplica/Platforms/WindowsTen.cs @@ -0,0 +1,32 @@ +using System.Windows.Forms; +using OnTopReplica.Native; +using WindowsFormsAero.Dwm; + +namespace OnTopReplica.Platforms { + + class WindowsTen : PlatformSupport { + + public override bool CheckCompatibility() { + return true; + } + + public override void PreHandleFormInit() { + WindowsSevenMethods.SetCurrentProcessExplicitAppUserModelID(Program.ApplicationId); + } + + public override void PostFormInit(MainForm form) { + base.PostFormInit(form); + + form.FormBorderStyle = FormBorderStyle.Sizable; + form.ControlBox = true; + form.HideCaption = false; + } + + public override void PostHandleFormInit(MainForm form) { + DwmManager.SetExcludeFromPeek(form, true); + DwmManager.SetDisallowPeek(form, true); + } + + } + +}