Moved from VistaControls.dll library to updated WindowsFormsAero.dll.

This commit is contained in:
Lorenz Cuno Klopfenstein 2011-06-07 01:03:06 +02:00
parent 818bc4c300
commit 0ff6d904eb
22 changed files with 307 additions and 299 deletions

Binary file not shown.

Binary file not shown.

BIN
Lib/WindowsFormsAero.dll Normal file

Binary file not shown.

BIN
Lib/WindowsFormsAero.pdb Normal file

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using VistaControls.Dwm.Helpers;
using System.ComponentModel;
using OnTopReplica.Native;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using OnTopReplica.Native;
using WindowsFormsAero.Dwm.Helpers;
namespace OnTopReplica {

View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using VistaControls;
using WindowsFormsAero;
using System.Windows.Forms;
namespace OnTopReplica {

View file

@ -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,7 +45,6 @@
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();
@ -68,7 +68,7 @@
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuContextClose = new System.Windows.Forms.ToolStripMenuItem();
this.fullSelectWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fullOpacityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuFullscreenContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.enableClickthroughToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fullExitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -113,7 +113,7 @@
this.menuWindows.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.noneToolStripMenuItem});
this.menuWindows.Name = "menuWindows";
this.menuWindows.OwnerItem = this.fullSelectWindowToolStripMenuItem;
this.menuWindows.OwnerItem = this.menuContextWindows;
this.menuWindows.Size = new System.Drawing.Size(118, 26);
this.menuWindows.Opening += new System.ComponentModel.CancelEventHandler(this.Menu_Windows_opening);
//
@ -123,6 +123,15 @@
this.noneToolStripMenuItem.Size = new System.Drawing.Size(117, 22);
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(189, 22);
this.fullSelectWindowToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuWindows;
this.fullSelectWindowToolStripMenuItem.ToolTipText = global::OnTopReplica.Strings.MenuWindowsTT;
//
// switchToWindowToolStripMenuItem
//
this.switchToWindowToolStripMenuItem.Image = global::OnTopReplica.Properties.Resources.xiao_arrow;
@ -206,7 +215,7 @@
this.toolStripMenuItem3,
this.toolStripMenuItem4});
this.menuOpacity.Name = "menuOpacity";
this.menuOpacity.OwnerItem = this.menuContextOpacity;
this.menuOpacity.OwnerItem = this.fullOpacityToolStripMenuItem;
this.menuOpacity.ShowCheckMargin = true;
this.menuOpacity.ShowImageMargin = false;
this.menuOpacity.Size = new System.Drawing.Size(154, 92);
@ -250,14 +259,6 @@
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(189, 22);
this.fullOpacityToolStripMenuItem.Text = global::OnTopReplica.Strings.MenuOpacity;
//
// resizeToolStripMenuItem
//
this.resizeToolStripMenuItem.DropDown = this.menuResize;
@ -448,14 +449,13 @@
this.menuContextClose.Text = global::OnTopReplica.Strings.MenuClose;
this.menuContextClose.Click += new System.EventHandler(this.Menu_Close_click);
//
// fullSelectWindowToolStripMenuItem
// fullOpacityToolStripMenuItem
//
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;
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;
//
// menuFullscreenContext
//
@ -489,17 +489,17 @@
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(264, 204);
this.ClientSize = new System.Drawing.Size(269, 192);
this.ControlBox = false;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.HideCaption = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(40, 40);
this.Name = "MainForm";
this.Text = Strings.ApplicationName;
this.Text = "OnTopReplica";
this.TopMost = true;
this.ShowInTaskbar = true;
this.menuContext.ResumeLayout(false);
this.menuWindows.ResumeLayout(false);
this.menuOpacity.ResumeLayout(false);

View file

@ -8,8 +8,8 @@ using OnTopReplica.Properties;
using OnTopReplica.StartupOptions;
using OnTopReplica.Update;
using OnTopReplica.WindowSeekers;
using VistaControls.Dwm;
using VistaControls.TaskDialog;
using WindowsFormsAero.Dwm;
using WindowsFormsAero.TaskDialog;
namespace OnTopReplica {
@ -55,15 +55,6 @@ namespace OnTopReplica {
#region Event override
protected override CreateParams CreateParams {
get {
//Needed to hide caption, while keeping window title in task bar
var parms = base.CreateParams;
parms.Style &= ~0x00C00000; //WS_CAPTION
return parms;
}
}
protected override void OnHandleCreated(EventArgs e){
base.OnHandleCreated(e);

View file

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
using OnTopReplica.Properties;
using VistaControls.TaskDialog;
using WindowsFormsAero.TaskDialog;
using System.Drawing;
using System.Windows.Forms;

View file

@ -1,6 +1,6 @@
using System.Drawing;
using System.Windows.Forms;
using VistaControls.TaskDialog;
using WindowsFormsAero.TaskDialog;
namespace OnTopReplica {
partial class MainForm {

View file

@ -3,7 +3,7 @@ using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
using OnTopReplica.Properties;
using VistaControls.TaskDialog;
using WindowsFormsAero.TaskDialog;
using OnTopReplica.SidePanels;
namespace OnTopReplica {

View file

@ -94,9 +94,8 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="VistaControls, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\VistaControls.dll</HintPath>
<Reference Include="WindowsFormsAero">
<HintPath>..\Lib\WindowsFormsAero.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

View file

@ -1,7 +1,7 @@
using System;
using System.Windows.Forms;
using OnTopReplica.Native;
using VistaControls.Dwm;
using WindowsFormsAero.Dwm;
namespace OnTopReplica.Platforms {

View file

@ -1,13 +1,13 @@
using System;
using System.Windows.Forms;
using VistaControls.Dwm;
using WindowsFormsAero.Dwm;
namespace OnTopReplica.Platforms {
class WindowsVista : PlatformSupport {
public override bool CheckCompatibility() {
if (!VistaControls.OsSupport.IsCompositionEnabled) {
if (!WindowsFormsAero.OsSupport.IsCompositionEnabled) {
MessageBox.Show(Strings.ErrorDwmOffContent, Strings.ErrorDwmOff, MessageBoxButtons.OK, MessageBoxIcon.Error);
return false;
}

View file

@ -109,7 +109,7 @@ namespace OnTopReplica {
sw.WriteLine("OnTopReplica v. {0}", Assembly.GetEntryAssembly().GetName().Version);
sw.WriteLine("OS: {0}", Environment.OSVersion.ToString());
sw.WriteLine(".NET: {0}", Environment.Version.ToString());
sw.WriteLine("Aero DWM: {0}", VistaControls.OsSupport.IsCompositionEnabled);
sw.WriteLine("Aero DWM: {0}", WindowsFormsAero.OsSupport.IsCompositionEnabled);
sw.WriteLine("Launch command: {0}", Environment.CommandLine);
sw.WriteLine("UTC time: {0} {1}", DateTime.UtcNow.ToShortDateString(), DateTime.UtcNow.ToShortTimeString());
}

View file

@ -2,7 +2,8 @@
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using VistaControls.Dwm;
using WindowsFormsAero.Dwm;
using System.Drawing;
namespace OnTopReplica {

View file

@ -5,7 +5,7 @@ using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using VistaControls.Dwm.Helpers;
using WindowsFormsAero.Dwm.Helpers;
namespace OnTopReplica {
/// <summary>

View file

@ -23,7 +23,7 @@
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent() {
this.labelVersion = new VistaControls.ThemeText.ThemedLabel();
this.labelVersion = new WindowsFormsAero.ThemeText.ThemedLabel();
this.panelContents = new OnTopReplica.SidePanels.AboutPanelContents();
this.SuspendLayout();
//
@ -67,7 +67,7 @@
#endregion
private VistaControls.ThemeText.ThemedLabel labelVersion;
private WindowsFormsAero.ThemeText.ThemedLabel labelVersion;
private AboutPanelContents panelContents;
}

View file

@ -5,7 +5,7 @@ using System.Drawing;
using System.Data;
using System.Text;
using System.Windows.Forms;
using VistaControls.Dwm;
using WindowsFormsAero.Dwm;
namespace OnTopReplica.SidePanels {
partial class AboutPanel : SidePanel {
@ -13,6 +13,7 @@ namespace OnTopReplica.SidePanels {
public AboutPanel() {
InitializeComponent();
//Display version number
labelVersion.Text = string.Format(Strings.AboutVersion, Application.ProductVersion);
}

View file

@ -25,17 +25,17 @@
private void InitializeComponent() {
this.labelTranslators = new System.Windows.Forms.Label();
this.linkCredits = new System.Windows.Forms.LinkLabel();
this.progressUpdate = new VistaControls.ProgressBar();
this.progressUpdate = new WindowsFormsAero.ProgressBar();
this.buttonUpdate = new System.Windows.Forms.Button();
this.lblUpdateDisclaimer = new System.Windows.Forms.Label();
this.labeledDivider2 = new VistaControls.LabeledDivider();
this.labeledDivider1 = new VistaControls.LabeledDivider();
this.labeledDivider2 = new WindowsFormsAero.LabeledDivider();
this.labeledDivider1 = new WindowsFormsAero.LabeledDivider();
this.linkHomepage = new System.Windows.Forms.LinkLabel();
this.linkAuthor = new System.Windows.Forms.LinkLabel();
this.lblSlogan = new System.Windows.Forms.Label();
this.labeledDivider3 = new VistaControls.LabeledDivider();
this.labeledDivider3 = new WindowsFormsAero.LabeledDivider();
this.linkLicense = new System.Windows.Forms.LinkLabel();
this.labeledDivider4 = new VistaControls.LabeledDivider();
this.labeledDivider4 = new WindowsFormsAero.LabeledDivider();
this.linkContribute = new System.Windows.Forms.LinkLabel();
this.SuspendLayout();
//
@ -103,7 +103,6 @@
this.labeledDivider2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.labeledDivider2.DividerColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(191)))), ((int)(((byte)(222)))));
this.labeledDivider2.Font = new System.Drawing.Font("Segoe UI", 9F);
this.labeledDivider2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(170)))));
this.labeledDivider2.Location = new System.Drawing.Point(0, 197);
this.labeledDivider2.Name = "labeledDivider2";
@ -116,7 +115,6 @@
this.labeledDivider1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.labeledDivider1.DividerColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(191)))), ((int)(((byte)(222)))));
this.labeledDivider1.Font = new System.Drawing.Font("Segoe UI", 9F);
this.labeledDivider1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(170)))));
this.labeledDivider1.Location = new System.Drawing.Point(0, 82);
this.labeledDivider1.Name = "labeledDivider1";
@ -172,7 +170,6 @@
this.labeledDivider3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.labeledDivider3.DividerColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(191)))), ((int)(((byte)(222)))));
this.labeledDivider3.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labeledDivider3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(170)))));
this.labeledDivider3.Location = new System.Drawing.Point(0, 393);
this.labeledDivider3.Name = "labeledDivider3";
@ -199,7 +196,6 @@
this.labeledDivider4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.labeledDivider4.DividerColor = System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(191)))), ((int)(((byte)(222)))));
this.labeledDivider4.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labeledDivider4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(51)))), ((int)(((byte)(170)))));
this.labeledDivider4.Location = new System.Drawing.Point(0, 503);
this.labeledDivider4.Name = "labeledDivider4";
@ -252,17 +248,17 @@
private System.Windows.Forms.Label labelTranslators;
private System.Windows.Forms.LinkLabel linkCredits;
private VistaControls.ProgressBar progressUpdate;
private WindowsFormsAero.ProgressBar progressUpdate;
private System.Windows.Forms.Button buttonUpdate;
private System.Windows.Forms.Label lblUpdateDisclaimer;
private VistaControls.LabeledDivider labeledDivider2;
private VistaControls.LabeledDivider labeledDivider1;
private WindowsFormsAero.LabeledDivider labeledDivider2;
private WindowsFormsAero.LabeledDivider labeledDivider1;
private System.Windows.Forms.LinkLabel linkHomepage;
private System.Windows.Forms.LinkLabel linkAuthor;
private System.Windows.Forms.Label lblSlogan;
private VistaControls.LabeledDivider labeledDivider3;
private WindowsFormsAero.LabeledDivider labeledDivider3;
private System.Windows.Forms.LinkLabel linkLicense;
private VistaControls.LabeledDivider labeledDivider4;
private WindowsFormsAero.LabeledDivider labeledDivider4;
private System.Windows.Forms.LinkLabel linkContribute;
}

View file

@ -2,8 +2,8 @@
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using VistaControls.Dwm;
using VistaControls.ThemeText;
using WindowsFormsAero.Dwm;
using WindowsFormsAero.ThemeText;
using System.Drawing;
using System.Windows.Forms.VisualStyles;
using OnTopReplica.Native;