diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..69f0ca82f --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,14 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +# Required +version: 2 + +# Build documentation in the docs/ directory with Sphinx +sphinx: + configuration: mRemoteNGDocumentation/conf.py + +# Optionally build your docs in additional formats such as PDF +formats: + - pdf \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ad8d0abd..ab595ab4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,19 +6,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] ### Added - #327: Added Alternative Shell for RDP settings +- #1476: Configurable backups. Can now edit/set backup frequency, backup path, and max number of backup files. +- #1427: Fix RDP local desktop scale not taking effect on remote - #1770: Added missing RDP performance settings - #1332: Added option to hide menu strip container - #545: Option to minimize to system tray on closing - #420: SSH tunneling implemented - #319: Override quick connect username when using user@domain - #283: Support for native PowerShell remoting as new protocol +- #1850: Minify config xml +- #1516: added API to access credential vault (Thycotic Secret Server) by specifying SSAPI:ID as username +- #503: SSH Execute a single command after login ### Changed +- #2022: Replaced CefSharp with WebView2 +- #2014: Revised icons +- #2013: Removed components check +- #2011: Removed screenshot manager +- #2010: Redesigned menus +- #2005: Removed in-app documentation - #1777: Cleaned up VisualStudio project structure - #1767: Turned about window into a simple popup form -- #1766: Converted components check page into options page - #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium) - #1325: Language resource files cleanup ### Fixed +- #1884: Allow setting Port when using MSSQL - #1783: Added missing inheritance properties to SQL scripts - #1773: Connection issue with mysql - Missing fields in - #1756: Cannot type any character on MultiSSH toolbar @@ -31,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - #1465: REGRESSION: Smart Cards redirection to Remote Desktop not working - #1337: Unhandled exception after closing mRemoteNG - #359: Making a VNC connection to an unreachable host causes the application to not respond for 20-30 seconds +- #618: Do not break the Windows Clipboard Chain when exiting. ## [1.77.1] - 2019-09-02 ### Added diff --git a/CREDITS.md b/CREDITS.md index 2b8955f91..1a6473ba1 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -90,10 +90,6 @@ Copyright © 2004 Marc Merritt © 2008 Felix Deimel # Included Components -**[CefSharp](https://github.com/cefsharp/CefSharp)** -Copyright © The CefSharp Authors -MIT License - **[DockPanel Suite](https://github.com/dockpanelsuite/dockpanelsuite)** Copyright © 2018 @roken and @lextm (formerly Weifen Luo) MIT License diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 40047a3e4..000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,63 +0,0 @@ -#!groovy​ -node('windows') { - def jobDir = pwd() - def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\"" - def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe" - def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.7.0\\tools\\nunit3-console.exe" - def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe" - def reportGeneratorPath = "${jobDir}\\packages\\ReportGenerator.3.0.2\\tools\\ReportGenerator.exe" - def testResultFilePrefix = "TestResult" - def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml" - def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml" - def testResultFileAcceptance = "${testResultFilePrefix}_AcceptanceTests.xml" - def coverageReport = "code_coverage_report.xml" - def codeCoverageHtml = "CodeCoverageReport.html" - - stage ('Checkout Branch') { - checkout scm - bat "del /Q \"${jobDir}\\${testResultFilePrefix}*.xml\"" - } - - stage ('Restore NuGet Packages') { - def nugetPath = "C:\\nuget.exe" - bat "${nugetPath} restore ${solutionFilePath}" - } - - stage ('Build mRemoteNG (Normal)') { - bat "\"${msBuild}\" /nologo /p:Platform=x86 \"${jobDir}\\mRemoteV1.sln\"" - } - - stage ('Build mRemoteNG (Portable)') { - bat "\"${msBuild}\" /nologo /p:Configuration=\"Debug Portable\";Platform=x86 \"${jobDir}\\mRemoteV1.sln\"" - } - - stage ('Run Unit Tests (Normal, w/coverage)') { - try { - bat "\"${openCoverPath}\" -register:user -target:\"${nunitConsolePath}\" -targetargs:\"\"${jobDir}\\mRemoteNGTests\\bin\\debug\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86\" -output:\"${coverageReport}\"" - } - catch (ex) { - nunit testResultsPattern: "${testResultFilePrefix}*.xml" - throw ex - } - } - - stage ('Run Unit Tests (Portable)') { - try { - bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\debug portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86" - } - catch (ex) { - nunit testResultsPattern: "${testResultFilePrefix}*.xml" - throw ex - } - } - - stage ('Run Acceptance Tests') { - try { - bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNG.Specs\\bin\\debug\\mRemoteNG.Specs.dll\" --result=${testResultFileAcceptance} --x86" - } - catch (ex) { - nunit testResultsPattern: "${testResultFilePrefix}*.xml" - throw ex - } - } -} diff --git a/Jenkinsfile_publish.groovy b/Jenkinsfile_publish.groovy deleted file mode 100644 index ec8d92a7d..000000000 --- a/Jenkinsfile_publish.groovy +++ /dev/null @@ -1,71 +0,0 @@ -node('windows') { - def jobDir = pwd() - def solutionFilePath = "\"${jobDir}\\mRemoteV1.sln\"" - def msBuild = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\msbuild.exe" - def nunitConsolePath = "${jobDir}\\packages\\NUnit.ConsoleRunner.3.10.0\\tools\\nunit3-console.exe" - def openCoverPath = "${jobDir}\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe" - def testResultFilePrefix = "TestResult" - def testResultFileNormal = "${testResultFilePrefix}_UnitTests_normal.xml" - def testResultFilePortable = "${testResultFilePrefix}_UnitTests_portable.xml" - def coverageReport = "code_coverage_report.xml" - - - stage ('Clean output dir') { - bat script: "rmdir /S /Q \"${jobDir}\\Release\" 2>nul", returnStatus: true - } - - stage ('Checkout Branch') { - checkout([ - $class: 'GitSCM', - branches: [[name: '*/${TargetBranch}']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[ - credentialsId: '9c3fbff4-5b90-402f-a298-00e607fcec87', - url: 'https://github.com/mRemoteNG/mRemoteNG.git' - ]] - ]) - } - - stage ('Restore NuGet Packages') { - def nugetPath = "C:\\nuget.exe" - bat "${nugetPath} restore ${solutionFilePath}" - } - - withCredentials([file(credentialsId: '9b674d57-6792-48e3-984a-4d1bab2abb64', variable: 'CODE_SIGNING_CERT')]) { - withCredentials([usernamePassword(credentialsId: '05b7449b-05c0-490f-8661-236242526e62', passwordVariable: 'MRNG_CERT_PASSWORD', usernameVariable: 'NO_USERNAME')]) { - stage ('Build mRemoteNG (Normal - MSI)') { - bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Installer\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\"" - archiveArtifacts artifacts: "Release\\*.msi", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true - } - - stage ('Build mRemoteNG (Portable)') { - bat "\"${msBuild}\" /nologo /t:Clean,Build /p:Configuration=\"Release Portable\" /p:Platform=x86 /p:CertPath=\"${env.CODE_SIGNING_CERT}\" /p:CertPassword=${env.MRNG_CERT_PASSWORD} \"${jobDir}\\mRemoteV1.sln\"" - archiveArtifacts artifacts: "Release\\*.zip", caseSensitive: false, onlyIfSuccessful: true, fingerprint: true - } - } - } - - stage ('Run Unit Tests (Normal - MSI)') { - bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release\\mRemoteNGTests.dll\" --result=${testResultFileNormal} --x86" - } - - stage ('Run Unit Tests (Portable)') { - bat "\"${nunitConsolePath}\" \"${jobDir}\\mRemoteNGTests\\bin\\release portable\\mRemoteNGTests.dll\" --result=${testResultFilePortable} --x86" - } - - stage ('Generate UpdateCheck Files') { - bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\create_upg_chk_files.ps1\" -TagName \"${env.TagName}\" -UpdateChannel \"${env.UpdateChannel}\"" - archiveArtifacts artifacts: "Release\\*.txt", caseSensitive: false, onlyIfSuccessful: true - } - - stage ('Publish to GitHub') { - withCredentials([string(credentialsId: '5443a369-dbe8-42d3-b4e8-04d0b4e9039a', variable: 'GH_AUTH_TOKEN')]) { - def releaseFolder = "${jobDir}\\Release" - // because batch files suck at handling newline characters, we have to convert to base64 in groovy and back to text in powershell - def base64Description = env.ReleaseDescription.bytes.encodeBase64().toString() - bat "powershell -ExecutionPolicy Bypass -File \"${jobDir}\\Tools\\publish_to_github.ps1\" -Owner \"mRemoteNG\" -Repository \"mRemoteNG\" -ReleaseTitle \"${env.ReleaseTitle}\" -TagName \"${env.TagName}\" -TargetCommitish \"${env.TargetBranch}\" -Description \"${base64Description}\" -IsDraft ${env.IsDraft} -IsPrerelease ${env.IsPreRelease} -ReleaseFolderPath \"${releaseFolder}\" -AuthToken \"${env.GH_AUTH_TOKEN}\" -DescriptionIsBase64Encoded" - } - } -} \ No newline at end of file diff --git a/README.MD b/README.MD index a4f929991..f82916f5f 100644 --- a/README.MD +++ b/README.MD @@ -1,5 +1,8 @@ +**NOTICE: This project currently transited to a new maintainer. Development help would be greatly appreciated.** + +

- +

@@ -46,6 +49,7 @@ | ---------------|--------------|-----------| | Stable | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/master?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/master) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.76.20/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.76.20) | | Prerelease | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.1/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.1) | +| Nightly build | [![Build status](https://ci.appveyor.com/api/projects/status/k0sdbxmq90fgdmj6/branch/develop?svg=true)](https://ci.appveyor.com/project/mremoteng/mremoteng/branch/develop) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.77.2-nb/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.77.2-nb) | ## Features @@ -66,6 +70,7 @@ For a detailed feature list and general usage support, refer to the [Documentati ### Supported Operating Systems +- [Windows 11](https://en.wikipedia.org/wiki/Windows_11) - [Windows 10](https://en.wikipedia.org/wiki/Windows_10) - [Windows 8.1](https://en.wikipedia.org/wiki/Windows_8.1) - [Windows Server 2019](https://en.wikipedia.org/wiki/Windows_Server_2019) @@ -94,11 +99,9 @@ You will need to compile it yourself using Visual Studio. ### Minimum Requirements * [Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017 and 2019](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) -* [Microsoft .NET Framework 4.0](https://www.microsoft.com/en-us/download/details.aspx?id=17851) +* [Microsoft .NET 5.0](https://dotnet.microsoft.com/download/dotnet/5.0) * Microsoft Terminal Service Client 6.0 or later * Needed if you use RDP. mstscax.dll and/or msrdp.ocx be registered. -* [Citrix ICA Client](https://www.citrix.com/downloads/citrix-receiver.html) - * Needed if you use ICA. wfica.ocx must be registered ### Download @@ -160,6 +163,7 @@ _If you are using the Portable version, simply deleting the folder that contains ## Featured Projects * [PSmRemoteNG](https://github.com/realslacker/PSmRemoteNG) A module to create mRemoteNG connection files from PowerShell. +* [mRemoteNGOpenVPN](https://github.com/T3los/mRemoteNGOpenVPN) A script that can be embedded as an external tool to control OpenVPN. ## Contribute @@ -173,5 +177,5 @@ Check out the [Wiki page](https://github.com/mRemoteNG/mRemoteNG/wiki) on how to

- Developed with ReSharper + Developed with ReSharper

diff --git a/mRemoteNGSpecs/Properties/AssemblyInfo.cs b/SecretServerInterface/Properties/AssemblyInfo.cs similarity index 76% rename from mRemoteNGSpecs/Properties/AssemblyInfo.cs rename to SecretServerInterface/Properties/AssemblyInfo.cs index a40f57b87..2733685ea 100644 --- a/mRemoteNGSpecs/Properties/AssemblyInfo.cs +++ b/SecretServerInterface/Properties/AssemblyInfo.cs @@ -1,34 +1,35 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("mRemoteNGSpecs")] +[assembly: AssemblyTitle("SecretServerInterface")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("mRemoteNGSpecs")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyProduct("SecretServerInterface")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("16aa21e2-d6b7-427d-ab7d-aa8c611b724e")] +[assembly: Guid("cbeee1a0-b917-4f61-812b-85c4c15e80fc")] // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -// You can specify all the values or you can default the Build and Revision Numbers +// You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] diff --git a/SecretServerInterface/Properties/Settings.Designer.cs b/SecretServerInterface/Properties/Settings.Designer.cs new file mode 100644 index 000000000..55381d5c0 --- /dev/null +++ b/SecretServerInterface/Properties/Settings.Designer.cs @@ -0,0 +1,46 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace SecretServerInterface.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("https://cred.sit.local/SecretServer/webservices/SSWebService.asmx")] + public string SecretServerInterface_SSWebService { + get { + return ((string)(this["SecretServerInterface_SSWebService"])); + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] + [global::System.Configuration.DefaultSettingValueAttribute("https://cred.sit.local/SecretServer/winauthwebservices/SSWinAuthWebService.asmx")] + public string SecretServerInterface_SSWinAuthWebService { + get { + return ((string)(this["SecretServerInterface_SSWinAuthWebService"])); + } + } + } +} diff --git a/SecretServerInterface/Properties/Settings.settings b/SecretServerInterface/Properties/Settings.settings new file mode 100644 index 000000000..a88b36e3f --- /dev/null +++ b/SecretServerInterface/Properties/Settings.settings @@ -0,0 +1,12 @@ + + + + + + https://cred.sit.local/SecretServer/webservices/SSWebService.asmx + + + https://cred.sit.local/SecretServer/winauthwebservices/SSWinAuthWebService.asmx + + + \ No newline at end of file diff --git a/SecretServerInterface/SSConnectionForm.Designer.cs b/SecretServerInterface/SSConnectionForm.Designer.cs new file mode 100644 index 000000000..76da73812 --- /dev/null +++ b/SecretServerInterface/SSConnectionForm.Designer.cs @@ -0,0 +1,289 @@ +namespace SecretServerInterface +{ + partial class SSConnectionForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tbSSURL = new System.Windows.Forms.TextBox(); + this.tbUsername = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.tbPassword = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.tbDomain = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.tbOrganization = new System.Windows.Forms.TextBox(); + this.btnOK = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label6 = new System.Windows.Forms.Label(); + this.cbUseSSO = new System.Windows.Forms.CheckBox(); + this.tbWinAuthURL = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.SuspendLayout(); + // + // tbSSURL + // + this.tbSSURL.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbSSURL.Location = new System.Drawing.Point(222, 3); + this.tbSSURL.Name = "tbSSURL"; + this.tbSSURL.Size = new System.Drawing.Size(461, 20); + this.tbSSURL.TabIndex = 0; + // + // tbUsername + // + this.tbUsername.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbUsername.Location = new System.Drawing.Point(222, 28); + this.tbUsername.Name = "tbUsername"; + this.tbUsername.Size = new System.Drawing.Size(461, 20); + this.tbUsername.TabIndex = 2; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Dock = System.Windows.Forms.DockStyle.Fill; + this.label3.Location = new System.Drawing.Point(3, 50); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(213, 20); + this.label3.TabIndex = 5; + this.label3.Text = "Password"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tbPassword + // + this.tbPassword.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbPassword.Location = new System.Drawing.Point(222, 53); + this.tbPassword.Name = "tbPassword"; + this.tbPassword.Size = new System.Drawing.Size(461, 20); + this.tbPassword.TabIndex = 4; + this.tbPassword.UseSystemPasswordChar = true; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Dock = System.Windows.Forms.DockStyle.Fill; + this.label4.Location = new System.Drawing.Point(3, 70); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(213, 20); + this.label4.TabIndex = 7; + this.label4.Text = "Domain"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tbDomain + // + this.tbDomain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbDomain.Location = new System.Drawing.Point(222, 73); + this.tbDomain.Name = "tbDomain"; + this.tbDomain.Size = new System.Drawing.Size(461, 20); + this.tbDomain.TabIndex = 6; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Dock = System.Windows.Forms.DockStyle.Fill; + this.label5.Location = new System.Drawing.Point(3, 90); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(213, 20); + this.label5.TabIndex = 9; + this.label5.Text = "Organization"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tbOrganization + // + this.tbOrganization.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbOrganization.Location = new System.Drawing.Point(222, 93); + this.tbOrganization.Name = "tbOrganization"; + this.tbOrganization.Size = new System.Drawing.Size(461, 20); + this.tbOrganization.TabIndex = 8; + // + // btnOK + // + this.btnOK.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(255, 10); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(75, 23); + this.btnOK.TabIndex = 10; + this.btnOK.Text = "OK"; + this.btnOK.UseVisualStyleBackColor = true; + // + // btnCancel + // + this.btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.btnCancel.Location = new System.Drawing.Point(356, 10); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.TabIndex = 11; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.06997F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67.93003F)); + this.tableLayoutPanel1.Controls.Add(this.label6, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.cbUseSSO, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.tbWinAuthURL, 1, 6); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.tbOrganization, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.label5, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.label4, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.tbSSURL, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.tbDomain, 1, 3); + this.tableLayoutPanel1.Controls.Add(this.tbUsername, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.tbPassword, 1, 2); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 7; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(686, 151); + this.tableLayoutPanel1.TabIndex = 12; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Dock = System.Windows.Forms.DockStyle.Fill; + this.label6.Location = new System.Drawing.Point(3, 130); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(213, 21); + this.label6.TabIndex = 15; + this.label6.Text = "Secret Server WinAuth URL"; + this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // cbUseSSO + // + this.cbUseSSO.AutoSize = true; + this.cbUseSSO.Location = new System.Drawing.Point(3, 113); + this.cbUseSSO.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0); + this.cbUseSSO.Name = "cbUseSSO"; + this.cbUseSSO.Size = new System.Drawing.Size(70, 17); + this.cbUseSSO.TabIndex = 14; + this.cbUseSSO.Text = "Use SSO"; + this.cbUseSSO.UseVisualStyleBackColor = true; + this.cbUseSSO.CheckedChanged += new System.EventHandler(this.cbUseSSO_CheckedChanged); + // + // tbWinAuthURL + // + this.tbWinAuthURL.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbWinAuthURL.Location = new System.Drawing.Point(222, 133); + this.tbWinAuthURL.Name = "tbWinAuthURL"; + this.tbWinAuthURL.Size = new System.Drawing.Size(461, 20); + this.tbWinAuthURL.TabIndex = 10; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Location = new System.Drawing.Point(3, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(213, 25); + this.label1.TabIndex = 2; + this.label1.Text = "Secret Server URL"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Dock = System.Windows.Forms.DockStyle.Fill; + this.label2.Location = new System.Drawing.Point(3, 25); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(213, 25); + this.label2.TabIndex = 4; + this.label2.Text = "Username"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 5; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.tableLayoutPanel2.Controls.Add(this.btnOK, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.btnCancel, 3, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 172); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(686, 43); + this.tableLayoutPanel2.TabIndex = 13; + // + // SSConnectionForm + // + this.AcceptButton = this.btnOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(686, 215); + this.Controls.Add(this.tableLayoutPanel2); + this.Controls.Add(this.tableLayoutPanel1); + this.Name = "SSConnectionForm"; + this.Text = "Secret Server API Login Data"; + this.Activated += new System.EventHandler(this.SSConnectionForm_Activated); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + + public System.Windows.Forms.TextBox tbSSURL; + public System.Windows.Forms.TextBox tbUsername; + public System.Windows.Forms.TextBox tbPassword; + public System.Windows.Forms.TextBox tbDomain; + public System.Windows.Forms.TextBox tbOrganization; + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; + private System.Windows.Forms.Label label6; + public System.Windows.Forms.TextBox tbWinAuthURL; + public System.Windows.Forms.CheckBox cbUseSSO; + } +} \ No newline at end of file diff --git a/SecretServerInterface/SSConnectionForm.cs b/SecretServerInterface/SSConnectionForm.cs new file mode 100644 index 000000000..707d62d51 --- /dev/null +++ b/SecretServerInterface/SSConnectionForm.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SecretServerInterface +{ + public partial class SSConnectionForm : Form + { + public SSConnectionForm() + { + InitializeComponent(); + } + + private void SSConnectionForm_Activated(object sender, EventArgs e) + { + SetVisibility(); + if (cbUseSSO.Checked) + btnOK.Focus(); + else + tbPassword.Focus(); + } + + private void cbUseSSO_CheckedChanged(object sender, EventArgs e) + { + SetVisibility(); + } + private void SetVisibility() + { + bool ch = cbUseSSO.Checked; + tbDomain.Enabled = !ch; + tbPassword.Enabled = !ch; + tbUsername.Enabled = !ch; + tbSSURL.Enabled = !ch; + + tbWinAuthURL.Enabled = ch; + } + } +} diff --git a/mRemoteNG/UI/Window/HelpWindow.resx b/SecretServerInterface/SSConnectionForm.resx similarity index 96% rename from mRemoteNG/UI/Window/HelpWindow.resx rename to SecretServerInterface/SSConnectionForm.resx index ca620d883..1af7de150 100644 --- a/mRemoteNG/UI/Window/HelpWindow.resx +++ b/SecretServerInterface/SSConnectionForm.resx @@ -1,4 +1,4 @@ - + + + SecretServerInterface.SSWebService.AddSecretResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/AuthenticateResult1.datasource b/SecretServerInterface/Web References/SSWebService/AuthenticateResult1.datasource new file mode 100644 index 000000000..b0fc6829a --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/AuthenticateResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.AuthenticateResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/CreateFolderResult1.datasource b/SecretServerInterface/Web References/SSWebService/CreateFolderResult1.datasource new file mode 100644 index 000000000..8fff9fae0 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/CreateFolderResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.CreateFolderResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/FileDownloadResult1.datasource b/SecretServerInterface/Web References/SSWebService/FileDownloadResult1.datasource new file mode 100644 index 000000000..5c0103b00 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/FileDownloadResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.FileDownloadResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/FolderExtendedCreateResult1.datasource b/SecretServerInterface/Web References/SSWebService/FolderExtendedCreateResult1.datasource new file mode 100644 index 000000000..366193d46 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/FolderExtendedCreateResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.FolderExtendedCreateResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/FolderExtendedGetNewResult1.datasource b/SecretServerInterface/Web References/SSWebService/FolderExtendedGetNewResult1.datasource new file mode 100644 index 000000000..243b2cda0 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/FolderExtendedGetNewResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.FolderExtendedGetNewResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/FolderExtendedGetResult1.datasource b/SecretServerInterface/Web References/SSWebService/FolderExtendedGetResult1.datasource new file mode 100644 index 000000000..1b899f4d8 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/FolderExtendedGetResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.FolderExtendedGetResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/FolderExtendedUpdateResult1.datasource b/SecretServerInterface/Web References/SSWebService/FolderExtendedUpdateResult1.datasource new file mode 100644 index 000000000..6f4ac9ac3 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/FolderExtendedUpdateResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.FolderExtendedUpdateResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GeneratePasswordResult1.datasource b/SecretServerInterface/Web References/SSWebService/GeneratePasswordResult1.datasource new file mode 100644 index 000000000..16364e290 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GeneratePasswordResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GeneratePasswordResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetAllGroupsResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetAllGroupsResult1.datasource new file mode 100644 index 000000000..fbaa5297a --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetAllGroupsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetAllGroupsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetCheckOutStatusResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetCheckOutStatusResult1.datasource new file mode 100644 index 000000000..319d6fc66 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetCheckOutStatusResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetCheckOutStatusResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetDependenciesResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetDependenciesResult1.datasource new file mode 100644 index 000000000..ca6598ded --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetDependenciesResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetDependenciesResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetDependencyGroupsResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetDependencyGroupsResult1.datasource new file mode 100644 index 000000000..73492801d --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetDependencyGroupsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetDependencyGroupsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetFavoritesResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetFavoritesResult1.datasource new file mode 100644 index 000000000..d782be8ea --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetFavoritesResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetFavoritesResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetFolderResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetFolderResult1.datasource new file mode 100644 index 000000000..809bf9b09 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetFolderResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetFolderResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetFoldersResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetFoldersResult1.datasource new file mode 100644 index 000000000..5fbe4ada2 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetFoldersResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetFoldersResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetReportResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetReportResult1.datasource new file mode 100644 index 000000000..1406ac6fe --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetReportResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetReportResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSecretAuditResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSecretAuditResult1.datasource new file mode 100644 index 000000000..6ddba39e9 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSecretAuditResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSecretAuditResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSecretResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSecretResult1.datasource new file mode 100644 index 000000000..ce2098d0f --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSecretResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSecretResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSecretTemplateFieldsResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSecretTemplateFieldsResult1.datasource new file mode 100644 index 000000000..dc17d868f --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSecretTemplateFieldsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSecretTemplateFieldsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSecretTemplatesResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSecretTemplatesResult1.datasource new file mode 100644 index 000000000..3dd2359cb --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSecretTemplatesResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSecretTemplatesResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSecretsByFieldValueResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSecretsByFieldValueResult1.datasource new file mode 100644 index 000000000..809bd1985 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSecretsByFieldValueResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSecretsByFieldValueResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSitesResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSitesResult1.datasource new file mode 100644 index 000000000..16f7fbb22 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSitesResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSitesResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSshCommandMenuResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSshCommandMenuResult1.datasource new file mode 100644 index 000000000..07cd3083d --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSshCommandMenuResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSshCommandMenuResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetSshCommandMenusResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetSshCommandMenusResult1.datasource new file mode 100644 index 000000000..628c0f119 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetSshCommandMenusResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetSshCommandMenusResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetTicketSystemsResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetTicketSystemsResult1.datasource new file mode 100644 index 000000000..463d226e1 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetTicketSystemsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetTicketSystemsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetUserResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetUserResult1.datasource new file mode 100644 index 000000000..589dea842 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetUserResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetUserResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetUserScriptResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetUserScriptResult1.datasource new file mode 100644 index 000000000..69fc36f64 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetUserScriptResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetUserScriptResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetUserScriptsResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetUserScriptsResult1.datasource new file mode 100644 index 000000000..4ca421ee6 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetUserScriptsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetUserScriptsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/GetUsersResult1.datasource b/SecretServerInterface/Web References/SSWebService/GetUsersResult1.datasource new file mode 100644 index 000000000..250320567 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/GetUsersResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.GetUsersResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/ImpersonateResult1.datasource b/SecretServerInterface/Web References/SSWebService/ImpersonateResult1.datasource new file mode 100644 index 000000000..2934d1fa2 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/ImpersonateResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.ImpersonateResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/Reference.cs b/SecretServerInterface/Web References/SSWebService/Reference.cs new file mode 100644 index 000000000..efc0e858e --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/Reference.cs @@ -0,0 +1,11915 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. +// +#pragma warning disable 1591 + +namespace SecretServerInterface.SSWebService { + using System.Diagnostics; + using System; + using System.Xml.Serialization; + using System.ComponentModel; + using System.Web.Services.Protocols; + using System.Web.Services; + using System.Data; + + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="SSWebServiceSoap", Namespace="urn:thesecretserver.com")] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedResultBase))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(TrackChanges))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GenericResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SqlScriptArgument2[]))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(UserScript[]))] + public partial class SSWebService : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback ApproveSecretAccessRequestOperationCompleted; + + private System.Threading.SendOrPostCallback DenySecretAccessRequestOperationCompleted; + + private System.Threading.SendOrPostCallback AuthenticateOperationCompleted; + + private System.Threading.SendOrPostCallback ImpersonateUserOperationCompleted; + + private System.Threading.SendOrPostCallback AuthenticateRADIUSOperationCompleted; + + private System.Threading.SendOrPostCallback GetTokenIsValidOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetCheckOutStatusOperationCompleted; + + private System.Threading.SendOrPostCallback ChangePasswordOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretsByFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretsByExposedFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByExposedFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByExposedValuesOperationCompleted; + + private System.Threading.SendOrPostCallback AddUserOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFolderOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFolderLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback GetFavoritesOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateIsFavoriteOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretOperationCompleted; + + private System.Threading.SendOrPostCallback AddNewSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetNewSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretTemplateFieldsOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretTemplatesOperationCompleted; + + private System.Threading.SendOrPostCallback GeneratePasswordOperationCompleted; + + private System.Threading.SendOrPostCallback DeactivateSecretOperationCompleted; + + private System.Threading.SendOrPostCallback VersionGetOperationCompleted; + + private System.Threading.SendOrPostCallback FolderGetOperationCompleted; + + private System.Threading.SendOrPostCallback FolderUpdateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderGetAllChildrenOperationCompleted; + + private System.Threading.SendOrPostCallback FolderCreateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedCreateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedGetOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedUpdateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedGetNewOperationCompleted; + + private System.Threading.SendOrPostCallback SearchFoldersOperationCompleted; + + private System.Threading.SendOrPostCallback DownloadFileAttachmentOperationCompleted; + + private System.Threading.SendOrPostCallback DownloadFileAttachmentByItemIdOperationCompleted; + + private System.Threading.SendOrPostCallback UploadFileAttachmentOperationCompleted; + + private System.Threading.SendOrPostCallback UploadFileAttachmentByItemIdOperationCompleted; + + private System.Threading.SendOrPostCallback ExpireSecretOperationCompleted; + + private System.Threading.SendOrPostCallback SetCheckOutEnabledOperationCompleted; + + private System.Threading.SendOrPostCallback ImportXMLOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretAuditOperationCompleted; + + private System.Threading.SendOrPostCallback AddDependencyOperationCompleted; + + private System.Threading.SendOrPostCallback RemoveDependencyOperationCompleted; + + private System.Threading.SendOrPostCallback GetDependenciesOperationCompleted; + + private System.Threading.SendOrPostCallback CreateDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetDependencyGroupsForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback RemoveDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetDistributedEnginesOperationCompleted; + + private System.Threading.SendOrPostCallback GetTicketSystemsOperationCompleted; + + private System.Threading.SendOrPostCallback AssignSiteOperationCompleted; + + private System.Threading.SendOrPostCallback CheckInOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretCustomAuditOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateSecretPermissionOperationCompleted; + + private System.Threading.SendOrPostCallback CheckInByKeyOperationCompleted; + + private System.Threading.SendOrPostCallback WhoAmIOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllGroupsOperationCompleted; + + private System.Threading.SendOrPostCallback AssignUserToGroupOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHLoginCredentialsOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHLoginCredentialsWithMachineOperationCompleted; + + private System.Threading.SendOrPostCallback SearchUsersOperationCompleted; + + private System.Threading.SendOrPostCallback GetUserOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateUserOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretItemHistoryByFieldNameOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretPolicyForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback AssignSecretPolicyForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretPoliciesOperationCompleted; + + private System.Threading.SendOrPostCallback RunActiveDirectorySynchronizationOperationCompleted; + + private System.Threading.SendOrPostCallback AddGroupToActiveDirectorySynchronizationOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretPolicyOperationCompleted; + + private System.Threading.SendOrPostCallback GetNewSecretPolicyOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback SaveSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllSSHCommandMenusOperationCompleted; + + private System.Threading.SendOrPostCallback DeleteSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback RestoreSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback GetReportOperationCompleted; + + private System.Threading.SendOrPostCallback AddScriptOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllScriptsOperationCompleted; + + private System.Threading.SendOrPostCallback GetScriptOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateScriptOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// + public SSWebService() { + this.Url = global::SecretServerInterface.Properties.Settings.Default.SecretServerInterface_SSWebService; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// + public event ApproveSecretAccessRequestCompletedEventHandler ApproveSecretAccessRequestCompleted; + + /// + public event DenySecretAccessRequestCompletedEventHandler DenySecretAccessRequestCompleted; + + /// + public event AuthenticateCompletedEventHandler AuthenticateCompleted; + + /// + public event ImpersonateUserCompletedEventHandler ImpersonateUserCompleted; + + /// + public event AuthenticateRADIUSCompletedEventHandler AuthenticateRADIUSCompleted; + + /// + public event GetTokenIsValidCompletedEventHandler GetTokenIsValidCompleted; + + /// + public event GetSecretLegacyCompletedEventHandler GetSecretLegacyCompleted; + + /// + public event GetSecretCompletedEventHandler GetSecretCompleted; + + /// + public event GetCheckOutStatusCompletedEventHandler GetCheckOutStatusCompleted; + + /// + public event ChangePasswordCompletedEventHandler ChangePasswordCompleted; + + /// + public event GetSecretsByFieldValueCompletedEventHandler GetSecretsByFieldValueCompleted; + + /// + public event SearchSecretsByFieldValueCompletedEventHandler SearchSecretsByFieldValueCompleted; + + /// + public event GetSecretsByExposedFieldValueCompletedEventHandler GetSecretsByExposedFieldValueCompleted; + + /// + public event SearchSecretsByExposedFieldValueCompletedEventHandler SearchSecretsByExposedFieldValueCompleted; + + /// + public event SearchSecretsByExposedValuesCompletedEventHandler SearchSecretsByExposedValuesCompleted; + + /// + public event AddUserCompletedEventHandler AddUserCompleted; + + /// + public event SearchSecretsCompletedEventHandler SearchSecretsCompleted; + + /// + public event SearchSecretsLegacyCompletedEventHandler SearchSecretsLegacyCompleted; + + /// + public event SearchSecretsByFolderCompletedEventHandler SearchSecretsByFolderCompleted; + + /// + public event SearchSecretsByFolderLegacyCompletedEventHandler SearchSecretsByFolderLegacyCompleted; + + /// + public event GetFavoritesCompletedEventHandler GetFavoritesCompleted; + + /// + public event UpdateIsFavoriteCompletedEventHandler UpdateIsFavoriteCompleted; + + /// + public event AddSecretCompletedEventHandler AddSecretCompleted; + + /// + public event AddNewSecretCompletedEventHandler AddNewSecretCompleted; + + /// + public event GetNewSecretCompletedEventHandler GetNewSecretCompleted; + + /// + public event GetSecretTemplateFieldsCompletedEventHandler GetSecretTemplateFieldsCompleted; + + /// + public event UpdateSecretCompletedEventHandler UpdateSecretCompleted; + + /// + public event GetSecretTemplatesCompletedEventHandler GetSecretTemplatesCompleted; + + /// + public event GeneratePasswordCompletedEventHandler GeneratePasswordCompleted; + + /// + public event DeactivateSecretCompletedEventHandler DeactivateSecretCompleted; + + /// + public event VersionGetCompletedEventHandler VersionGetCompleted; + + /// + public event FolderGetCompletedEventHandler FolderGetCompleted; + + /// + public event FolderUpdateCompletedEventHandler FolderUpdateCompleted; + + /// + public event FolderGetAllChildrenCompletedEventHandler FolderGetAllChildrenCompleted; + + /// + public event FolderCreateCompletedEventHandler FolderCreateCompleted; + + /// + public event FolderExtendedCreateCompletedEventHandler FolderExtendedCreateCompleted; + + /// + public event FolderExtendedGetCompletedEventHandler FolderExtendedGetCompleted; + + /// + public event FolderExtendedUpdateCompletedEventHandler FolderExtendedUpdateCompleted; + + /// + public event FolderExtendedGetNewCompletedEventHandler FolderExtendedGetNewCompleted; + + /// + public event SearchFoldersCompletedEventHandler SearchFoldersCompleted; + + /// + public event DownloadFileAttachmentCompletedEventHandler DownloadFileAttachmentCompleted; + + /// + public event DownloadFileAttachmentByItemIdCompletedEventHandler DownloadFileAttachmentByItemIdCompleted; + + /// + public event UploadFileAttachmentCompletedEventHandler UploadFileAttachmentCompleted; + + /// + public event UploadFileAttachmentByItemIdCompletedEventHandler UploadFileAttachmentByItemIdCompleted; + + /// + public event ExpireSecretCompletedEventHandler ExpireSecretCompleted; + + /// + public event SetCheckOutEnabledCompletedEventHandler SetCheckOutEnabledCompleted; + + /// + public event ImportXMLCompletedEventHandler ImportXMLCompleted; + + /// + public event GetSecretAuditCompletedEventHandler GetSecretAuditCompleted; + + /// + public event AddDependencyCompletedEventHandler AddDependencyCompleted; + + /// + public event RemoveDependencyCompletedEventHandler RemoveDependencyCompleted; + + /// + public event GetDependenciesCompletedEventHandler GetDependenciesCompleted; + + /// + public event CreateDependencyGroupForSecretCompletedEventHandler CreateDependencyGroupForSecretCompleted; + + /// + public event GetDependencyGroupsForSecretCompletedEventHandler GetDependencyGroupsForSecretCompleted; + + /// + public event UpdateDependencyGroupForSecretCompletedEventHandler UpdateDependencyGroupForSecretCompleted; + + /// + public event RemoveDependencyGroupForSecretCompletedEventHandler RemoveDependencyGroupForSecretCompleted; + + /// + public event GetDistributedEnginesCompletedEventHandler GetDistributedEnginesCompleted; + + /// + public event GetTicketSystemsCompletedEventHandler GetTicketSystemsCompleted; + + /// + public event AssignSiteCompletedEventHandler AssignSiteCompleted; + + /// + public event CheckInCompletedEventHandler CheckInCompleted; + + /// + public event AddSecretCustomAuditCompletedEventHandler AddSecretCustomAuditCompleted; + + /// + public event UpdateSecretPermissionCompletedEventHandler UpdateSecretPermissionCompleted; + + /// + public event CheckInByKeyCompletedEventHandler CheckInByKeyCompleted; + + /// + public event WhoAmICompletedEventHandler WhoAmICompleted; + + /// + public event GetAllGroupsCompletedEventHandler GetAllGroupsCompleted; + + /// + public event AssignUserToGroupCompletedEventHandler AssignUserToGroupCompleted; + + /// + public event GetSSHLoginCredentialsCompletedEventHandler GetSSHLoginCredentialsCompleted; + + /// + public event GetSSHLoginCredentialsWithMachineCompletedEventHandler GetSSHLoginCredentialsWithMachineCompleted; + + /// + public event SearchUsersCompletedEventHandler SearchUsersCompleted; + + /// + public event GetUserCompletedEventHandler GetUserCompleted; + + /// + public event UpdateUserCompletedEventHandler UpdateUserCompleted; + + /// + public event GetSecretItemHistoryByFieldNameCompletedEventHandler GetSecretItemHistoryByFieldNameCompleted; + + /// + public event GetSecretPolicyForSecretCompletedEventHandler GetSecretPolicyForSecretCompleted; + + /// + public event AssignSecretPolicyForSecretCompletedEventHandler AssignSecretPolicyForSecretCompleted; + + /// + public event SearchSecretPoliciesCompletedEventHandler SearchSecretPoliciesCompleted; + + /// + public event RunActiveDirectorySynchronizationCompletedEventHandler RunActiveDirectorySynchronizationCompleted; + + /// + public event AddGroupToActiveDirectorySynchronizationCompletedEventHandler AddGroupToActiveDirectorySynchronizationCompleted; + + /// + public event AddSecretPolicyCompletedEventHandler AddSecretPolicyCompleted; + + /// + public event GetNewSecretPolicyCompletedEventHandler GetNewSecretPolicyCompleted; + + /// + public event GetSSHCommandMenuCompletedEventHandler GetSSHCommandMenuCompleted; + + /// + public event SaveSSHCommandMenuCompletedEventHandler SaveSSHCommandMenuCompleted; + + /// + public event GetAllSSHCommandMenusCompletedEventHandler GetAllSSHCommandMenusCompleted; + + /// + public event DeleteSSHCommandMenuCompletedEventHandler DeleteSSHCommandMenuCompleted; + + /// + public event RestoreSSHCommandMenuCompletedEventHandler RestoreSSHCommandMenuCompleted; + + /// + public event GetReportCompletedEventHandler GetReportCompleted; + + /// + public event AddScriptCompletedEventHandler AddScriptCompleted; + + /// + public event GetAllScriptsCompletedEventHandler GetAllScriptsCompleted; + + /// + public event GetScriptCompletedEventHandler GetScriptCompleted; + + /// + public event UpdateScriptCompletedEventHandler UpdateScriptCompleted; + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ApproveSecretAccessRequest", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public RequestApprovalResult ApproveSecretAccessRequest(string approvalId, string hours, bool userOverride) { + object[] results = this.Invoke("ApproveSecretAccessRequest", new object[] { + approvalId, + hours, + userOverride}); + return ((RequestApprovalResult)(results[0])); + } + + /// + public void ApproveSecretAccessRequestAsync(string approvalId, string hours, bool userOverride) { + this.ApproveSecretAccessRequestAsync(approvalId, hours, userOverride, null); + } + + /// + public void ApproveSecretAccessRequestAsync(string approvalId, string hours, bool userOverride, object userState) { + if ((this.ApproveSecretAccessRequestOperationCompleted == null)) { + this.ApproveSecretAccessRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnApproveSecretAccessRequestOperationCompleted); + } + this.InvokeAsync("ApproveSecretAccessRequest", new object[] { + approvalId, + hours, + userOverride}, this.ApproveSecretAccessRequestOperationCompleted, userState); + } + + private void OnApproveSecretAccessRequestOperationCompleted(object arg) { + if ((this.ApproveSecretAccessRequestCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ApproveSecretAccessRequestCompleted(this, new ApproveSecretAccessRequestCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DenySecretAccessRequest", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public RequestApprovalResult DenySecretAccessRequest(string approvalId, bool userOverride) { + object[] results = this.Invoke("DenySecretAccessRequest", new object[] { + approvalId, + userOverride}); + return ((RequestApprovalResult)(results[0])); + } + + /// + public void DenySecretAccessRequestAsync(string approvalId, bool userOverride) { + this.DenySecretAccessRequestAsync(approvalId, userOverride, null); + } + + /// + public void DenySecretAccessRequestAsync(string approvalId, bool userOverride, object userState) { + if ((this.DenySecretAccessRequestOperationCompleted == null)) { + this.DenySecretAccessRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDenySecretAccessRequestOperationCompleted); + } + this.InvokeAsync("DenySecretAccessRequest", new object[] { + approvalId, + userOverride}, this.DenySecretAccessRequestOperationCompleted, userState); + } + + private void OnDenySecretAccessRequestOperationCompleted(object arg) { + if ((this.DenySecretAccessRequestCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DenySecretAccessRequestCompleted(this, new DenySecretAccessRequestCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/Authenticate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AuthenticateResult Authenticate(string username, string password, string organization, string domain) { + object[] results = this.Invoke("Authenticate", new object[] { + username, + password, + organization, + domain}); + return ((AuthenticateResult)(results[0])); + } + + /// + public void AuthenticateAsync(string username, string password, string organization, string domain) { + this.AuthenticateAsync(username, password, organization, domain, null); + } + + /// + public void AuthenticateAsync(string username, string password, string organization, string domain, object userState) { + if ((this.AuthenticateOperationCompleted == null)) { + this.AuthenticateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAuthenticateOperationCompleted); + } + this.InvokeAsync("Authenticate", new object[] { + username, + password, + organization, + domain}, this.AuthenticateOperationCompleted, userState); + } + + private void OnAuthenticateOperationCompleted(object arg) { + if ((this.AuthenticateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AuthenticateCompleted(this, new AuthenticateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ImpersonateUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public ImpersonateResult ImpersonateUser(string token, string username, string organization, string domain) { + object[] results = this.Invoke("ImpersonateUser", new object[] { + token, + username, + organization, + domain}); + return ((ImpersonateResult)(results[0])); + } + + /// + public void ImpersonateUserAsync(string token, string username, string organization, string domain) { + this.ImpersonateUserAsync(token, username, organization, domain, null); + } + + /// + public void ImpersonateUserAsync(string token, string username, string organization, string domain, object userState) { + if ((this.ImpersonateUserOperationCompleted == null)) { + this.ImpersonateUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnImpersonateUserOperationCompleted); + } + this.InvokeAsync("ImpersonateUser", new object[] { + token, + username, + organization, + domain}, this.ImpersonateUserOperationCompleted, userState); + } + + private void OnImpersonateUserOperationCompleted(object arg) { + if ((this.ImpersonateUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ImpersonateUserCompleted(this, new ImpersonateUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AuthenticateRADIUS", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AuthenticateResult AuthenticateRADIUS(string username, string password, string organization, string domain, string radiusPassword) { + object[] results = this.Invoke("AuthenticateRADIUS", new object[] { + username, + password, + organization, + domain, + radiusPassword}); + return ((AuthenticateResult)(results[0])); + } + + /// + public void AuthenticateRADIUSAsync(string username, string password, string organization, string domain, string radiusPassword) { + this.AuthenticateRADIUSAsync(username, password, organization, domain, radiusPassword, null); + } + + /// + public void AuthenticateRADIUSAsync(string username, string password, string organization, string domain, string radiusPassword, object userState) { + if ((this.AuthenticateRADIUSOperationCompleted == null)) { + this.AuthenticateRADIUSOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAuthenticateRADIUSOperationCompleted); + } + this.InvokeAsync("AuthenticateRADIUS", new object[] { + username, + password, + organization, + domain, + radiusPassword}, this.AuthenticateRADIUSOperationCompleted, userState); + } + + private void OnAuthenticateRADIUSOperationCompleted(object arg) { + if ((this.AuthenticateRADIUSCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AuthenticateRADIUSCompleted(this, new AuthenticateRADIUSCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetTokenIsValid", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public TokenIsValidResult GetTokenIsValid(string token) { + object[] results = this.Invoke("GetTokenIsValid", new object[] { + token}); + return ((TokenIsValidResult)(results[0])); + } + + /// + public void GetTokenIsValidAsync(string token) { + this.GetTokenIsValidAsync(token, null); + } + + /// + public void GetTokenIsValidAsync(string token, object userState) { + if ((this.GetTokenIsValidOperationCompleted == null)) { + this.GetTokenIsValidOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetTokenIsValidOperationCompleted); + } + this.InvokeAsync("GetTokenIsValid", new object[] { + token}, this.GetTokenIsValidOperationCompleted, userState); + } + + private void OnGetTokenIsValidOperationCompleted(object arg) { + if ((this.GetTokenIsValidCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetTokenIsValidCompleted(this, new GetTokenIsValidCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetSecretLegacy(string token, int secretId) { + object[] results = this.Invoke("GetSecretLegacy", new object[] { + token, + secretId}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetSecretLegacyAsync(string token, int secretId) { + this.GetSecretLegacyAsync(token, secretId, null); + } + + /// + public void GetSecretLegacyAsync(string token, int secretId, object userState) { + if ((this.GetSecretLegacyOperationCompleted == null)) { + this.GetSecretLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretLegacyOperationCompleted); + } + this.InvokeAsync("GetSecretLegacy", new object[] { + token, + secretId}, this.GetSecretLegacyOperationCompleted, userState); + } + + private void OnGetSecretLegacyOperationCompleted(object arg) { + if ((this.GetSecretLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretLegacyCompleted(this, new GetSecretLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetSecret(string token, int secretId, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses) { + object[] results = this.Invoke("GetSecret", new object[] { + token, + secretId, + loadSettingsAndPermissions, + codeResponses}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetSecretAsync(string token, int secretId, System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses) { + this.GetSecretAsync(token, secretId, loadSettingsAndPermissions, codeResponses, null); + } + + /// + public void GetSecretAsync(string token, int secretId, System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses, object userState) { + if ((this.GetSecretOperationCompleted == null)) { + this.GetSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretOperationCompleted); + } + this.InvokeAsync("GetSecret", new object[] { + token, + secretId, + loadSettingsAndPermissions, + codeResponses}, this.GetSecretOperationCompleted, userState); + } + + private void OnGetSecretOperationCompleted(object arg) { + if ((this.GetSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretCompleted(this, new GetSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetCheckOutStatus", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetCheckOutStatusResult GetCheckOutStatus(string token, int secretId) { + object[] results = this.Invoke("GetCheckOutStatus", new object[] { + token, + secretId}); + return ((GetCheckOutStatusResult)(results[0])); + } + + /// + public void GetCheckOutStatusAsync(string token, int secretId) { + this.GetCheckOutStatusAsync(token, secretId, null); + } + + /// + public void GetCheckOutStatusAsync(string token, int secretId, object userState) { + if ((this.GetCheckOutStatusOperationCompleted == null)) { + this.GetCheckOutStatusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetCheckOutStatusOperationCompleted); + } + this.InvokeAsync("GetCheckOutStatus", new object[] { + token, + secretId}, this.GetCheckOutStatusOperationCompleted, userState); + } + + private void OnGetCheckOutStatusOperationCompleted(object arg) { + if ((this.GetCheckOutStatusCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetCheckOutStatusCompleted(this, new GetCheckOutStatusCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ChangePassword", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ChangePassword(string token, string currentPassword, string newPassword) { + object[] results = this.Invoke("ChangePassword", new object[] { + token, + currentPassword, + newPassword}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ChangePasswordAsync(string token, string currentPassword, string newPassword) { + this.ChangePasswordAsync(token, currentPassword, newPassword, null); + } + + /// + public void ChangePasswordAsync(string token, string currentPassword, string newPassword, object userState) { + if ((this.ChangePasswordOperationCompleted == null)) { + this.ChangePasswordOperationCompleted = new System.Threading.SendOrPostCallback(this.OnChangePasswordOperationCompleted); + } + this.InvokeAsync("ChangePassword", new object[] { + token, + currentPassword, + newPassword}, this.ChangePasswordOperationCompleted, userState); + } + + private void OnChangePasswordOperationCompleted(object arg) { + if ((this.ChangePasswordCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ChangePasswordCompleted(this, new ChangePasswordCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretsByFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretsByFieldValueResult GetSecretsByFieldValue(string token, string fieldName, string searchTerm, bool showDeleted) { + object[] results = this.Invoke("GetSecretsByFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted}); + return ((GetSecretsByFieldValueResult)(results[0])); + } + + /// + public void GetSecretsByFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted) { + this.GetSecretsByFieldValueAsync(token, fieldName, searchTerm, showDeleted, null); + } + + /// + public void GetSecretsByFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, object userState) { + if ((this.GetSecretsByFieldValueOperationCompleted == null)) { + this.GetSecretsByFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretsByFieldValueOperationCompleted); + } + this.InvokeAsync("GetSecretsByFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted}, this.GetSecretsByFieldValueOperationCompleted, userState); + } + + private void OnGetSecretsByFieldValueOperationCompleted(object arg) { + if ((this.GetSecretsByFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretsByFieldValueCompleted(this, new GetSecretsByFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFieldValue(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted) { + object[] results = this.Invoke("SearchSecretsByFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted) { + this.SearchSecretsByFieldValueAsync(token, fieldName, searchTerm, showDeleted, showRestricted, null); + } + + /// + public void SearchSecretsByFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted, object userState) { + if ((this.SearchSecretsByFieldValueOperationCompleted == null)) { + this.SearchSecretsByFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFieldValueOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showRestricted}, this.SearchSecretsByFieldValueOperationCompleted, userState); + } + + private void OnSearchSecretsByFieldValueOperationCompleted(object arg) { + if ((this.SearchSecretsByFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFieldValueCompleted(this, new SearchSecretsByFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretsByExposedFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretsByFieldValueResult GetSecretsByExposedFieldValue(string token, string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches) { + object[] results = this.Invoke("GetSecretsByExposedFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showPartialMatches}); + return ((GetSecretsByFieldValueResult)(results[0])); + } + + /// + public void GetSecretsByExposedFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches) { + this.GetSecretsByExposedFieldValueAsync(token, fieldName, searchTerm, showDeleted, showPartialMatches, null); + } + + /// + public void GetSecretsByExposedFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches, object userState) { + if ((this.GetSecretsByExposedFieldValueOperationCompleted == null)) { + this.GetSecretsByExposedFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretsByExposedFieldValueOperationCompleted); + } + this.InvokeAsync("GetSecretsByExposedFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showPartialMatches}, this.GetSecretsByExposedFieldValueOperationCompleted, userState); + } + + private void OnGetSecretsByExposedFieldValueOperationCompleted(object arg) { + if ((this.GetSecretsByExposedFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretsByExposedFieldValueCompleted(this, new GetSecretsByExposedFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByExposedFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByExposedFieldValue(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + object[] results = this.Invoke("SearchSecretsByExposedFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByExposedFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + this.SearchSecretsByExposedFieldValueAsync(token, fieldName, searchTerm, showDeleted, showRestricted, showPartialMatches, null); + } + + /// + public void SearchSecretsByExposedFieldValueAsync(string token, string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches, object userState) { + if ((this.SearchSecretsByExposedFieldValueOperationCompleted == null)) { + this.SearchSecretsByExposedFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByExposedFieldValueOperationCompleted); + } + this.InvokeAsync("SearchSecretsByExposedFieldValue", new object[] { + token, + fieldName, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}, this.SearchSecretsByExposedFieldValueOperationCompleted, userState); + } + + private void OnSearchSecretsByExposedFieldValueOperationCompleted(object arg) { + if ((this.SearchSecretsByExposedFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByExposedFieldValueCompleted(this, new SearchSecretsByExposedFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByExposedValues", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByExposedValues(string token, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + object[] results = this.Invoke("SearchSecretsByExposedValues", new object[] { + token, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByExposedValuesAsync(string token, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + this.SearchSecretsByExposedValuesAsync(token, searchTerm, showDeleted, showRestricted, showPartialMatches, null); + } + + /// + public void SearchSecretsByExposedValuesAsync(string token, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches, object userState) { + if ((this.SearchSecretsByExposedValuesOperationCompleted == null)) { + this.SearchSecretsByExposedValuesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByExposedValuesOperationCompleted); + } + this.InvokeAsync("SearchSecretsByExposedValues", new object[] { + token, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}, this.SearchSecretsByExposedValuesOperationCompleted, userState); + } + + private void OnSearchSecretsByExposedValuesOperationCompleted(object arg) { + if ((this.SearchSecretsByExposedValuesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByExposedValuesCompleted(this, new SearchSecretsByExposedValuesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddUser(string token, User newUser) { + object[] results = this.Invoke("AddUser", new object[] { + token, + newUser}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddUserAsync(string token, User newUser) { + this.AddUserAsync(token, newUser, null); + } + + /// + public void AddUserAsync(string token, User newUser, object userState) { + if ((this.AddUserOperationCompleted == null)) { + this.AddUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddUserOperationCompleted); + } + this.InvokeAsync("AddUser", new object[] { + token, + newUser}, this.AddUserOperationCompleted, userState); + } + + private void OnAddUserOperationCompleted(object arg) { + if ((this.AddUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddUserCompleted(this, new AddUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecrets", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecrets(string token, string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeDeleted, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeRestricted) { + object[] results = this.Invoke("SearchSecrets", new object[] { + token, + searchTerm, + includeDeleted, + includeRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsAsync(string token, string searchTerm, System.Nullable includeDeleted, System.Nullable includeRestricted) { + this.SearchSecretsAsync(token, searchTerm, includeDeleted, includeRestricted, null); + } + + /// + public void SearchSecretsAsync(string token, string searchTerm, System.Nullable includeDeleted, System.Nullable includeRestricted, object userState) { + if ((this.SearchSecretsOperationCompleted == null)) { + this.SearchSecretsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsOperationCompleted); + } + this.InvokeAsync("SearchSecrets", new object[] { + token, + searchTerm, + includeDeleted, + includeRestricted}, this.SearchSecretsOperationCompleted, userState); + } + + private void OnSearchSecretsOperationCompleted(object arg) { + if ((this.SearchSecretsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsCompleted(this, new SearchSecretsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsLegacy(string token, string searchTerm) { + object[] results = this.Invoke("SearchSecretsLegacy", new object[] { + token, + searchTerm}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsLegacyAsync(string token, string searchTerm) { + this.SearchSecretsLegacyAsync(token, searchTerm, null); + } + + /// + public void SearchSecretsLegacyAsync(string token, string searchTerm, object userState) { + if ((this.SearchSecretsLegacyOperationCompleted == null)) { + this.SearchSecretsLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsLegacyOperationCompleted); + } + this.InvokeAsync("SearchSecretsLegacy", new object[] { + token, + searchTerm}, this.SearchSecretsLegacyOperationCompleted, userState); + } + + private void OnSearchSecretsLegacyOperationCompleted(object arg) { + if ((this.SearchSecretsLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsLegacyCompleted(this, new SearchSecretsLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFolder", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFolder(string token, string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable folderId, bool includeSubFolders, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeDeleted, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeRestricted) { + object[] results = this.Invoke("SearchSecretsByFolder", new object[] { + token, + searchTerm, + folderId, + includeSubFolders, + includeDeleted, + includeRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFolderAsync(string token, string searchTerm, System.Nullable folderId, bool includeSubFolders, System.Nullable includeDeleted, System.Nullable includeRestricted) { + this.SearchSecretsByFolderAsync(token, searchTerm, folderId, includeSubFolders, includeDeleted, includeRestricted, null); + } + + /// + public void SearchSecretsByFolderAsync(string token, string searchTerm, System.Nullable folderId, bool includeSubFolders, System.Nullable includeDeleted, System.Nullable includeRestricted, object userState) { + if ((this.SearchSecretsByFolderOperationCompleted == null)) { + this.SearchSecretsByFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFolderOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFolder", new object[] { + token, + searchTerm, + folderId, + includeSubFolders, + includeDeleted, + includeRestricted}, this.SearchSecretsByFolderOperationCompleted, userState); + } + + private void OnSearchSecretsByFolderOperationCompleted(object arg) { + if ((this.SearchSecretsByFolderCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFolderCompleted(this, new SearchSecretsByFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFolderLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFolderLegacy(string token, string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable folderId, bool includeSubFolders) { + object[] results = this.Invoke("SearchSecretsByFolderLegacy", new object[] { + token, + searchTerm, + folderId, + includeSubFolders}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFolderLegacyAsync(string token, string searchTerm, System.Nullable folderId, bool includeSubFolders) { + this.SearchSecretsByFolderLegacyAsync(token, searchTerm, folderId, includeSubFolders, null); + } + + /// + public void SearchSecretsByFolderLegacyAsync(string token, string searchTerm, System.Nullable folderId, bool includeSubFolders, object userState) { + if ((this.SearchSecretsByFolderLegacyOperationCompleted == null)) { + this.SearchSecretsByFolderLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFolderLegacyOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFolderLegacy", new object[] { + token, + searchTerm, + folderId, + includeSubFolders}, this.SearchSecretsByFolderLegacyOperationCompleted, userState); + } + + private void OnSearchSecretsByFolderLegacyOperationCompleted(object arg) { + if ((this.SearchSecretsByFolderLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFolderLegacyCompleted(this, new SearchSecretsByFolderLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetFavorites", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFavoritesResult GetFavorites(string token, bool includeRestricted) { + object[] results = this.Invoke("GetFavorites", new object[] { + token, + includeRestricted}); + return ((GetFavoritesResult)(results[0])); + } + + /// + public void GetFavoritesAsync(string token, bool includeRestricted) { + this.GetFavoritesAsync(token, includeRestricted, null); + } + + /// + public void GetFavoritesAsync(string token, bool includeRestricted, object userState) { + if ((this.GetFavoritesOperationCompleted == null)) { + this.GetFavoritesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFavoritesOperationCompleted); + } + this.InvokeAsync("GetFavorites", new object[] { + token, + includeRestricted}, this.GetFavoritesOperationCompleted, userState); + } + + private void OnGetFavoritesOperationCompleted(object arg) { + if ((this.GetFavoritesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetFavoritesCompleted(this, new GetFavoritesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateIsFavorite", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateIsFavorite(string token, int secretId, bool isFavorite) { + object[] results = this.Invoke("UpdateIsFavorite", new object[] { + token, + secretId, + isFavorite}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateIsFavoriteAsync(string token, int secretId, bool isFavorite) { + this.UpdateIsFavoriteAsync(token, secretId, isFavorite, null); + } + + /// + public void UpdateIsFavoriteAsync(string token, int secretId, bool isFavorite, object userState) { + if ((this.UpdateIsFavoriteOperationCompleted == null)) { + this.UpdateIsFavoriteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateIsFavoriteOperationCompleted); + } + this.InvokeAsync("UpdateIsFavorite", new object[] { + token, + secretId, + isFavorite}, this.UpdateIsFavoriteOperationCompleted, userState); + } + + private void OnUpdateIsFavoriteOperationCompleted(object arg) { + if ((this.UpdateIsFavoriteCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateIsFavoriteCompleted(this, new UpdateIsFavoriteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AddSecretResult AddSecret(string token, int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId) { + object[] results = this.Invoke("AddSecret", new object[] { + token, + secretTypeId, + secretName, + secretFieldIds, + secretItemValues, + folderId}); + return ((AddSecretResult)(results[0])); + } + + /// + public void AddSecretAsync(string token, int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId) { + this.AddSecretAsync(token, secretTypeId, secretName, secretFieldIds, secretItemValues, folderId, null); + } + + /// + public void AddSecretAsync(string token, int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId, object userState) { + if ((this.AddSecretOperationCompleted == null)) { + this.AddSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretOperationCompleted); + } + this.InvokeAsync("AddSecret", new object[] { + token, + secretTypeId, + secretName, + secretFieldIds, + secretItemValues, + folderId}, this.AddSecretOperationCompleted, userState); + } + + private void OnAddSecretOperationCompleted(object arg) { + if ((this.AddSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretCompleted(this, new AddSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddNewSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AddSecretResult AddNewSecret(string token, Secret secret) { + object[] results = this.Invoke("AddNewSecret", new object[] { + token, + secret}); + return ((AddSecretResult)(results[0])); + } + + /// + public void AddNewSecretAsync(string token, Secret secret) { + this.AddNewSecretAsync(token, secret, null); + } + + /// + public void AddNewSecretAsync(string token, Secret secret, object userState) { + if ((this.AddNewSecretOperationCompleted == null)) { + this.AddNewSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddNewSecretOperationCompleted); + } + this.InvokeAsync("AddNewSecret", new object[] { + token, + secret}, this.AddNewSecretOperationCompleted, userState); + } + + private void OnAddNewSecretOperationCompleted(object arg) { + if ((this.AddNewSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddNewSecretCompleted(this, new AddNewSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetNewSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetNewSecret(string token, int secretTypeId, int folderId) { + object[] results = this.Invoke("GetNewSecret", new object[] { + token, + secretTypeId, + folderId}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetNewSecretAsync(string token, int secretTypeId, int folderId) { + this.GetNewSecretAsync(token, secretTypeId, folderId, null); + } + + /// + public void GetNewSecretAsync(string token, int secretTypeId, int folderId, object userState) { + if ((this.GetNewSecretOperationCompleted == null)) { + this.GetNewSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetNewSecretOperationCompleted); + } + this.InvokeAsync("GetNewSecret", new object[] { + token, + secretTypeId, + folderId}, this.GetNewSecretOperationCompleted, userState); + } + + private void OnGetNewSecretOperationCompleted(object arg) { + if ((this.GetNewSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetNewSecretCompleted(this, new GetNewSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretTemplateFields", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretTemplateFieldsResult GetSecretTemplateFields(string token, int secretTypeId) { + object[] results = this.Invoke("GetSecretTemplateFields", new object[] { + token, + secretTypeId}); + return ((GetSecretTemplateFieldsResult)(results[0])); + } + + /// + public void GetSecretTemplateFieldsAsync(string token, int secretTypeId) { + this.GetSecretTemplateFieldsAsync(token, secretTypeId, null); + } + + /// + public void GetSecretTemplateFieldsAsync(string token, int secretTypeId, object userState) { + if ((this.GetSecretTemplateFieldsOperationCompleted == null)) { + this.GetSecretTemplateFieldsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretTemplateFieldsOperationCompleted); + } + this.InvokeAsync("GetSecretTemplateFields", new object[] { + token, + secretTypeId}, this.GetSecretTemplateFieldsOperationCompleted, userState); + } + + private void OnGetSecretTemplateFieldsOperationCompleted(object arg) { + if ((this.GetSecretTemplateFieldsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretTemplateFieldsCompleted(this, new GetSecretTemplateFieldsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateSecret(string token, Secret secret) { + object[] results = this.Invoke("UpdateSecret", new object[] { + token, + secret}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateSecretAsync(string token, Secret secret) { + this.UpdateSecretAsync(token, secret, null); + } + + /// + public void UpdateSecretAsync(string token, Secret secret, object userState) { + if ((this.UpdateSecretOperationCompleted == null)) { + this.UpdateSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateSecretOperationCompleted); + } + this.InvokeAsync("UpdateSecret", new object[] { + token, + secret}, this.UpdateSecretOperationCompleted, userState); + } + + private void OnUpdateSecretOperationCompleted(object arg) { + if ((this.UpdateSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateSecretCompleted(this, new UpdateSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretTemplates", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretTemplatesResult GetSecretTemplates(string token) { + object[] results = this.Invoke("GetSecretTemplates", new object[] { + token}); + return ((GetSecretTemplatesResult)(results[0])); + } + + /// + public void GetSecretTemplatesAsync(string token) { + this.GetSecretTemplatesAsync(token, null); + } + + /// + public void GetSecretTemplatesAsync(string token, object userState) { + if ((this.GetSecretTemplatesOperationCompleted == null)) { + this.GetSecretTemplatesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretTemplatesOperationCompleted); + } + this.InvokeAsync("GetSecretTemplates", new object[] { + token}, this.GetSecretTemplatesOperationCompleted, userState); + } + + private void OnGetSecretTemplatesOperationCompleted(object arg) { + if ((this.GetSecretTemplatesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretTemplatesCompleted(this, new GetSecretTemplatesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GeneratePassword", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GeneratePasswordResult GeneratePassword(string token, int secretFieldId) { + object[] results = this.Invoke("GeneratePassword", new object[] { + token, + secretFieldId}); + return ((GeneratePasswordResult)(results[0])); + } + + /// + public void GeneratePasswordAsync(string token, int secretFieldId) { + this.GeneratePasswordAsync(token, secretFieldId, null); + } + + /// + public void GeneratePasswordAsync(string token, int secretFieldId, object userState) { + if ((this.GeneratePasswordOperationCompleted == null)) { + this.GeneratePasswordOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGeneratePasswordOperationCompleted); + } + this.InvokeAsync("GeneratePassword", new object[] { + token, + secretFieldId}, this.GeneratePasswordOperationCompleted, userState); + } + + private void OnGeneratePasswordOperationCompleted(object arg) { + if ((this.GeneratePasswordCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GeneratePasswordCompleted(this, new GeneratePasswordCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DeactivateSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult DeactivateSecret(string token, int secretId) { + object[] results = this.Invoke("DeactivateSecret", new object[] { + token, + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void DeactivateSecretAsync(string token, int secretId) { + this.DeactivateSecretAsync(token, secretId, null); + } + + /// + public void DeactivateSecretAsync(string token, int secretId, object userState) { + if ((this.DeactivateSecretOperationCompleted == null)) { + this.DeactivateSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeactivateSecretOperationCompleted); + } + this.InvokeAsync("DeactivateSecret", new object[] { + token, + secretId}, this.DeactivateSecretOperationCompleted, userState); + } + + private void OnDeactivateSecretOperationCompleted(object arg) { + if ((this.DeactivateSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DeactivateSecretCompleted(this, new DeactivateSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/VersionGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public VersionGetResult VersionGet() { + object[] results = this.Invoke("VersionGet", new object[0]); + return ((VersionGetResult)(results[0])); + } + + /// + public void VersionGetAsync() { + this.VersionGetAsync(null); + } + + /// + public void VersionGetAsync(object userState) { + if ((this.VersionGetOperationCompleted == null)) { + this.VersionGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnVersionGetOperationCompleted); + } + this.InvokeAsync("VersionGet", new object[0], this.VersionGetOperationCompleted, userState); + } + + private void OnVersionGetOperationCompleted(object arg) { + if ((this.VersionGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.VersionGetCompleted(this, new VersionGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFolderResult FolderGet(string token, int folderId) { + object[] results = this.Invoke("FolderGet", new object[] { + token, + folderId}); + return ((GetFolderResult)(results[0])); + } + + /// + public void FolderGetAsync(string token, int folderId) { + this.FolderGetAsync(token, folderId, null); + } + + /// + public void FolderGetAsync(string token, int folderId, object userState) { + if ((this.FolderGetOperationCompleted == null)) { + this.FolderGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderGetOperationCompleted); + } + this.InvokeAsync("FolderGet", new object[] { + token, + folderId}, this.FolderGetOperationCompleted, userState); + } + + private void OnFolderGetOperationCompleted(object arg) { + if ((this.FolderGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderGetCompleted(this, new FolderGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderUpdate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult FolderUpdate(string token, Folder modifiedFolder) { + object[] results = this.Invoke("FolderUpdate", new object[] { + token, + modifiedFolder}); + return ((WebServiceResult)(results[0])); + } + + /// + public void FolderUpdateAsync(string token, Folder modifiedFolder) { + this.FolderUpdateAsync(token, modifiedFolder, null); + } + + /// + public void FolderUpdateAsync(string token, Folder modifiedFolder, object userState) { + if ((this.FolderUpdateOperationCompleted == null)) { + this.FolderUpdateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderUpdateOperationCompleted); + } + this.InvokeAsync("FolderUpdate", new object[] { + token, + modifiedFolder}, this.FolderUpdateOperationCompleted, userState); + } + + private void OnFolderUpdateOperationCompleted(object arg) { + if ((this.FolderUpdateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderUpdateCompleted(this, new FolderUpdateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderGetAllChildren", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFoldersResult FolderGetAllChildren(string token, int parentFolderId) { + object[] results = this.Invoke("FolderGetAllChildren", new object[] { + token, + parentFolderId}); + return ((GetFoldersResult)(results[0])); + } + + /// + public void FolderGetAllChildrenAsync(string token, int parentFolderId) { + this.FolderGetAllChildrenAsync(token, parentFolderId, null); + } + + /// + public void FolderGetAllChildrenAsync(string token, int parentFolderId, object userState) { + if ((this.FolderGetAllChildrenOperationCompleted == null)) { + this.FolderGetAllChildrenOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderGetAllChildrenOperationCompleted); + } + this.InvokeAsync("FolderGetAllChildren", new object[] { + token, + parentFolderId}, this.FolderGetAllChildrenOperationCompleted, userState); + } + + private void OnFolderGetAllChildrenOperationCompleted(object arg) { + if ((this.FolderGetAllChildrenCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderGetAllChildrenCompleted(this, new FolderGetAllChildrenCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderCreate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public CreateFolderResult FolderCreate(string token, string folderName, int parentFolderId, int folderTypeId) { + object[] results = this.Invoke("FolderCreate", new object[] { + token, + folderName, + parentFolderId, + folderTypeId}); + return ((CreateFolderResult)(results[0])); + } + + /// + public void FolderCreateAsync(string token, string folderName, int parentFolderId, int folderTypeId) { + this.FolderCreateAsync(token, folderName, parentFolderId, folderTypeId, null); + } + + /// + public void FolderCreateAsync(string token, string folderName, int parentFolderId, int folderTypeId, object userState) { + if ((this.FolderCreateOperationCompleted == null)) { + this.FolderCreateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderCreateOperationCompleted); + } + this.InvokeAsync("FolderCreate", new object[] { + token, + folderName, + parentFolderId, + folderTypeId}, this.FolderCreateOperationCompleted, userState); + } + + private void OnFolderCreateOperationCompleted(object arg) { + if ((this.FolderCreateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderCreateCompleted(this, new FolderCreateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedCreate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedCreateResult FolderExtendedCreate(string token, FolderExtended folder) { + object[] results = this.Invoke("FolderExtendedCreate", new object[] { + token, + folder}); + return ((FolderExtendedCreateResult)(results[0])); + } + + /// + public void FolderExtendedCreateAsync(string token, FolderExtended folder) { + this.FolderExtendedCreateAsync(token, folder, null); + } + + /// + public void FolderExtendedCreateAsync(string token, FolderExtended folder, object userState) { + if ((this.FolderExtendedCreateOperationCompleted == null)) { + this.FolderExtendedCreateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedCreateOperationCompleted); + } + this.InvokeAsync("FolderExtendedCreate", new object[] { + token, + folder}, this.FolderExtendedCreateOperationCompleted, userState); + } + + private void OnFolderExtendedCreateOperationCompleted(object arg) { + if ((this.FolderExtendedCreateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedCreateCompleted(this, new FolderExtendedCreateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedGetResult FolderExtendedGet(string token, int folderId) { + object[] results = this.Invoke("FolderExtendedGet", new object[] { + token, + folderId}); + return ((FolderExtendedGetResult)(results[0])); + } + + /// + public void FolderExtendedGetAsync(string token, int folderId) { + this.FolderExtendedGetAsync(token, folderId, null); + } + + /// + public void FolderExtendedGetAsync(string token, int folderId, object userState) { + if ((this.FolderExtendedGetOperationCompleted == null)) { + this.FolderExtendedGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedGetOperationCompleted); + } + this.InvokeAsync("FolderExtendedGet", new object[] { + token, + folderId}, this.FolderExtendedGetOperationCompleted, userState); + } + + private void OnFolderExtendedGetOperationCompleted(object arg) { + if ((this.FolderExtendedGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedGetCompleted(this, new FolderExtendedGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedUpdate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedUpdateResult FolderExtendedUpdate(string token, FolderExtended folder) { + object[] results = this.Invoke("FolderExtendedUpdate", new object[] { + token, + folder}); + return ((FolderExtendedUpdateResult)(results[0])); + } + + /// + public void FolderExtendedUpdateAsync(string token, FolderExtended folder) { + this.FolderExtendedUpdateAsync(token, folder, null); + } + + /// + public void FolderExtendedUpdateAsync(string token, FolderExtended folder, object userState) { + if ((this.FolderExtendedUpdateOperationCompleted == null)) { + this.FolderExtendedUpdateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedUpdateOperationCompleted); + } + this.InvokeAsync("FolderExtendedUpdate", new object[] { + token, + folder}, this.FolderExtendedUpdateOperationCompleted, userState); + } + + private void OnFolderExtendedUpdateOperationCompleted(object arg) { + if ((this.FolderExtendedUpdateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedUpdateCompleted(this, new FolderExtendedUpdateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedGetNew", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedGetNewResult FolderExtendedGetNew(string token, FolderExtendedGetNewRequest folderExtendedGetNewRequest) { + object[] results = this.Invoke("FolderExtendedGetNew", new object[] { + token, + folderExtendedGetNewRequest}); + return ((FolderExtendedGetNewResult)(results[0])); + } + + /// + public void FolderExtendedGetNewAsync(string token, FolderExtendedGetNewRequest folderExtendedGetNewRequest) { + this.FolderExtendedGetNewAsync(token, folderExtendedGetNewRequest, null); + } + + /// + public void FolderExtendedGetNewAsync(string token, FolderExtendedGetNewRequest folderExtendedGetNewRequest, object userState) { + if ((this.FolderExtendedGetNewOperationCompleted == null)) { + this.FolderExtendedGetNewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedGetNewOperationCompleted); + } + this.InvokeAsync("FolderExtendedGetNew", new object[] { + token, + folderExtendedGetNewRequest}, this.FolderExtendedGetNewOperationCompleted, userState); + } + + private void OnFolderExtendedGetNewOperationCompleted(object arg) { + if ((this.FolderExtendedGetNewCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedGetNewCompleted(this, new FolderExtendedGetNewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchFolders", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchFolderResult SearchFolders(string token, string folderName) { + object[] results = this.Invoke("SearchFolders", new object[] { + token, + folderName}); + return ((SearchFolderResult)(results[0])); + } + + /// + public void SearchFoldersAsync(string token, string folderName) { + this.SearchFoldersAsync(token, folderName, null); + } + + /// + public void SearchFoldersAsync(string token, string folderName, object userState) { + if ((this.SearchFoldersOperationCompleted == null)) { + this.SearchFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchFoldersOperationCompleted); + } + this.InvokeAsync("SearchFolders", new object[] { + token, + folderName}, this.SearchFoldersOperationCompleted, userState); + } + + private void OnSearchFoldersOperationCompleted(object arg) { + if ((this.SearchFoldersCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchFoldersCompleted(this, new SearchFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DownloadFileAttachment", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FileDownloadResult DownloadFileAttachment(string token, int secretId) { + object[] results = this.Invoke("DownloadFileAttachment", new object[] { + token, + secretId}); + return ((FileDownloadResult)(results[0])); + } + + /// + public void DownloadFileAttachmentAsync(string token, int secretId) { + this.DownloadFileAttachmentAsync(token, secretId, null); + } + + /// + public void DownloadFileAttachmentAsync(string token, int secretId, object userState) { + if ((this.DownloadFileAttachmentOperationCompleted == null)) { + this.DownloadFileAttachmentOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDownloadFileAttachmentOperationCompleted); + } + this.InvokeAsync("DownloadFileAttachment", new object[] { + token, + secretId}, this.DownloadFileAttachmentOperationCompleted, userState); + } + + private void OnDownloadFileAttachmentOperationCompleted(object arg) { + if ((this.DownloadFileAttachmentCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DownloadFileAttachmentCompleted(this, new DownloadFileAttachmentCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DownloadFileAttachmentByItemId", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FileDownloadResult DownloadFileAttachmentByItemId(string token, int secretId, int secretItemId) { + object[] results = this.Invoke("DownloadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId}); + return ((FileDownloadResult)(results[0])); + } + + /// + public void DownloadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId) { + this.DownloadFileAttachmentByItemIdAsync(token, secretId, secretItemId, null); + } + + /// + public void DownloadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, object userState) { + if ((this.DownloadFileAttachmentByItemIdOperationCompleted == null)) { + this.DownloadFileAttachmentByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDownloadFileAttachmentByItemIdOperationCompleted); + } + this.InvokeAsync("DownloadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId}, this.DownloadFileAttachmentByItemIdOperationCompleted, userState); + } + + private void OnDownloadFileAttachmentByItemIdOperationCompleted(object arg) { + if ((this.DownloadFileAttachmentByItemIdCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DownloadFileAttachmentByItemIdCompleted(this, new DownloadFileAttachmentByItemIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UploadFileAttachment", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UploadFileAttachment(string token, int secretId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] fileData, string fileName) { + object[] results = this.Invoke("UploadFileAttachment", new object[] { + token, + secretId, + fileData, + fileName}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UploadFileAttachmentAsync(string token, int secretId, byte[] fileData, string fileName) { + this.UploadFileAttachmentAsync(token, secretId, fileData, fileName, null); + } + + /// + public void UploadFileAttachmentAsync(string token, int secretId, byte[] fileData, string fileName, object userState) { + if ((this.UploadFileAttachmentOperationCompleted == null)) { + this.UploadFileAttachmentOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUploadFileAttachmentOperationCompleted); + } + this.InvokeAsync("UploadFileAttachment", new object[] { + token, + secretId, + fileData, + fileName}, this.UploadFileAttachmentOperationCompleted, userState); + } + + private void OnUploadFileAttachmentOperationCompleted(object arg) { + if ((this.UploadFileAttachmentCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UploadFileAttachmentCompleted(this, new UploadFileAttachmentCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UploadFileAttachmentByItemId", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UploadFileAttachmentByItemId(string token, int secretId, int secretItemId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] fileData, string fileName) { + object[] results = this.Invoke("UploadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId, + fileData, + fileName}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UploadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, byte[] fileData, string fileName) { + this.UploadFileAttachmentByItemIdAsync(token, secretId, secretItemId, fileData, fileName, null); + } + + /// + public void UploadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, byte[] fileData, string fileName, object userState) { + if ((this.UploadFileAttachmentByItemIdOperationCompleted == null)) { + this.UploadFileAttachmentByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUploadFileAttachmentByItemIdOperationCompleted); + } + this.InvokeAsync("UploadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId, + fileData, + fileName}, this.UploadFileAttachmentByItemIdOperationCompleted, userState); + } + + private void OnUploadFileAttachmentByItemIdOperationCompleted(object arg) { + if ((this.UploadFileAttachmentByItemIdCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UploadFileAttachmentByItemIdCompleted(this, new UploadFileAttachmentByItemIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ExpireSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ExpireSecret(string token, int secretId) { + object[] results = this.Invoke("ExpireSecret", new object[] { + token, + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ExpireSecretAsync(string token, int secretId) { + this.ExpireSecretAsync(token, secretId, null); + } + + /// + public void ExpireSecretAsync(string token, int secretId, object userState) { + if ((this.ExpireSecretOperationCompleted == null)) { + this.ExpireSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnExpireSecretOperationCompleted); + } + this.InvokeAsync("ExpireSecret", new object[] { + token, + secretId}, this.ExpireSecretOperationCompleted, userState); + } + + private void OnExpireSecretOperationCompleted(object arg) { + if ((this.ExpireSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ExpireSecretCompleted(this, new ExpireSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SetCheckOutEnabled", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult SetCheckOutEnabled(string token, int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable checkOutInterval) { + object[] results = this.Invoke("SetCheckOutEnabled", new object[] { + token, + secretId, + setCheckOut, + setPasswordChangeOnCheckIn, + checkOutInterval}); + return ((WebServiceResult)(results[0])); + } + + /// + public void SetCheckOutEnabledAsync(string token, int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, System.Nullable checkOutInterval) { + this.SetCheckOutEnabledAsync(token, secretId, setCheckOut, setPasswordChangeOnCheckIn, checkOutInterval, null); + } + + /// + public void SetCheckOutEnabledAsync(string token, int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, System.Nullable checkOutInterval, object userState) { + if ((this.SetCheckOutEnabledOperationCompleted == null)) { + this.SetCheckOutEnabledOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetCheckOutEnabledOperationCompleted); + } + this.InvokeAsync("SetCheckOutEnabled", new object[] { + token, + secretId, + setCheckOut, + setPasswordChangeOnCheckIn, + checkOutInterval}, this.SetCheckOutEnabledOperationCompleted, userState); + } + + private void OnSetCheckOutEnabledOperationCompleted(object arg) { + if ((this.SetCheckOutEnabledCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SetCheckOutEnabledCompleted(this, new SetCheckOutEnabledCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ImportXML", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ImportXML(string token, string xml) { + object[] results = this.Invoke("ImportXML", new object[] { + token, + xml}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ImportXMLAsync(string token, string xml) { + this.ImportXMLAsync(token, xml, null); + } + + /// + public void ImportXMLAsync(string token, string xml, object userState) { + if ((this.ImportXMLOperationCompleted == null)) { + this.ImportXMLOperationCompleted = new System.Threading.SendOrPostCallback(this.OnImportXMLOperationCompleted); + } + this.InvokeAsync("ImportXML", new object[] { + token, + xml}, this.ImportXMLOperationCompleted, userState); + } + + private void OnImportXMLOperationCompleted(object arg) { + if ((this.ImportXMLCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ImportXMLCompleted(this, new ImportXMLCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretAudit", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretAuditResult GetSecretAudit(string token, int secretId) { + object[] results = this.Invoke("GetSecretAudit", new object[] { + token, + secretId}); + return ((GetSecretAuditResult)(results[0])); + } + + /// + public void GetSecretAuditAsync(string token, int secretId) { + this.GetSecretAuditAsync(token, secretId, null); + } + + /// + public void GetSecretAuditAsync(string token, int secretId, object userState) { + if ((this.GetSecretAuditOperationCompleted == null)) { + this.GetSecretAuditOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretAuditOperationCompleted); + } + this.InvokeAsync("GetSecretAudit", new object[] { + token, + secretId}, this.GetSecretAuditOperationCompleted, userState); + } + + private void OnGetSecretAuditOperationCompleted(object arg) { + if ((this.GetSecretAuditCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretAuditCompleted(this, new GetSecretAuditCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddDependency", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddDependency(string token, Dependency dependency) { + object[] results = this.Invoke("AddDependency", new object[] { + token, + dependency}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddDependencyAsync(string token, Dependency dependency) { + this.AddDependencyAsync(token, dependency, null); + } + + /// + public void AddDependencyAsync(string token, Dependency dependency, object userState) { + if ((this.AddDependencyOperationCompleted == null)) { + this.AddDependencyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddDependencyOperationCompleted); + } + this.InvokeAsync("AddDependency", new object[] { + token, + dependency}, this.AddDependencyOperationCompleted, userState); + } + + private void OnAddDependencyOperationCompleted(object arg) { + if ((this.AddDependencyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddDependencyCompleted(this, new AddDependencyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RemoveDependency", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RemoveDependency(string token, int dependencyId, int secretId) { + object[] results = this.Invoke("RemoveDependency", new object[] { + token, + dependencyId, + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RemoveDependencyAsync(string token, int dependencyId, int secretId) { + this.RemoveDependencyAsync(token, dependencyId, secretId, null); + } + + /// + public void RemoveDependencyAsync(string token, int dependencyId, int secretId, object userState) { + if ((this.RemoveDependencyOperationCompleted == null)) { + this.RemoveDependencyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDependencyOperationCompleted); + } + this.InvokeAsync("RemoveDependency", new object[] { + token, + dependencyId, + secretId}, this.RemoveDependencyOperationCompleted, userState); + } + + private void OnRemoveDependencyOperationCompleted(object arg) { + if ((this.RemoveDependencyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RemoveDependencyCompleted(this, new RemoveDependencyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDependencies", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetDependenciesResult GetDependencies(string token, int secretId) { + object[] results = this.Invoke("GetDependencies", new object[] { + token, + secretId}); + return ((GetDependenciesResult)(results[0])); + } + + /// + public void GetDependenciesAsync(string token, int secretId) { + this.GetDependenciesAsync(token, secretId, null); + } + + /// + public void GetDependenciesAsync(string token, int secretId, object userState) { + if ((this.GetDependenciesOperationCompleted == null)) { + this.GetDependenciesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDependenciesOperationCompleted); + } + this.InvokeAsync("GetDependencies", new object[] { + token, + secretId}, this.GetDependenciesOperationCompleted, userState); + } + + private void OnGetDependenciesOperationCompleted(object arg) { + if ((this.GetDependenciesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDependenciesCompleted(this, new GetDependenciesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CreateDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CreateDependencyGroupForSecret(string token, DependencyGroup dependencyGroup) { + object[] results = this.Invoke("CreateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CreateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup) { + this.CreateDependencyGroupForSecretAsync(token, dependencyGroup, null); + } + + /// + public void CreateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup, object userState) { + if ((this.CreateDependencyGroupForSecretOperationCompleted == null)) { + this.CreateDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("CreateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}, this.CreateDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnCreateDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.CreateDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CreateDependencyGroupForSecretCompleted(this, new CreateDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDependencyGroupsForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetDependencyGroupsResult GetDependencyGroupsForSecret(string token, int secretId) { + object[] results = this.Invoke("GetDependencyGroupsForSecret", new object[] { + token, + secretId}); + return ((GetDependencyGroupsResult)(results[0])); + } + + /// + public void GetDependencyGroupsForSecretAsync(string token, int secretId) { + this.GetDependencyGroupsForSecretAsync(token, secretId, null); + } + + /// + public void GetDependencyGroupsForSecretAsync(string token, int secretId, object userState) { + if ((this.GetDependencyGroupsForSecretOperationCompleted == null)) { + this.GetDependencyGroupsForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDependencyGroupsForSecretOperationCompleted); + } + this.InvokeAsync("GetDependencyGroupsForSecret", new object[] { + token, + secretId}, this.GetDependencyGroupsForSecretOperationCompleted, userState); + } + + private void OnGetDependencyGroupsForSecretOperationCompleted(object arg) { + if ((this.GetDependencyGroupsForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDependencyGroupsForSecretCompleted(this, new GetDependencyGroupsForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateDependencyGroupForSecret(string token, DependencyGroup dependencyGroup) { + object[] results = this.Invoke("UpdateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup) { + this.UpdateDependencyGroupForSecretAsync(token, dependencyGroup, null); + } + + /// + public void UpdateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup, object userState) { + if ((this.UpdateDependencyGroupForSecretOperationCompleted == null)) { + this.UpdateDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("UpdateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}, this.UpdateDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnUpdateDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.UpdateDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateDependencyGroupForSecretCompleted(this, new UpdateDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RemoveDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RemoveDependencyGroupForSecret(string token, int dependencyGroupId) { + object[] results = this.Invoke("RemoveDependencyGroupForSecret", new object[] { + token, + dependencyGroupId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RemoveDependencyGroupForSecretAsync(string token, int dependencyGroupId) { + this.RemoveDependencyGroupForSecretAsync(token, dependencyGroupId, null); + } + + /// + public void RemoveDependencyGroupForSecretAsync(string token, int dependencyGroupId, object userState) { + if ((this.RemoveDependencyGroupForSecretOperationCompleted == null)) { + this.RemoveDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("RemoveDependencyGroupForSecret", new object[] { + token, + dependencyGroupId}, this.RemoveDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnRemoveDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.RemoveDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RemoveDependencyGroupForSecretCompleted(this, new RemoveDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDistributedEngines", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSitesResult GetDistributedEngines(string token) { + object[] results = this.Invoke("GetDistributedEngines", new object[] { + token}); + return ((GetSitesResult)(results[0])); + } + + /// + public void GetDistributedEnginesAsync(string token) { + this.GetDistributedEnginesAsync(token, null); + } + + /// + public void GetDistributedEnginesAsync(string token, object userState) { + if ((this.GetDistributedEnginesOperationCompleted == null)) { + this.GetDistributedEnginesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributedEnginesOperationCompleted); + } + this.InvokeAsync("GetDistributedEngines", new object[] { + token}, this.GetDistributedEnginesOperationCompleted, userState); + } + + private void OnGetDistributedEnginesOperationCompleted(object arg) { + if ((this.GetDistributedEnginesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDistributedEnginesCompleted(this, new GetDistributedEnginesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetTicketSystems", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetTicketSystemsResult GetTicketSystems(string token) { + object[] results = this.Invoke("GetTicketSystems", new object[] { + token}); + return ((GetTicketSystemsResult)(results[0])); + } + + /// + public void GetTicketSystemsAsync(string token) { + this.GetTicketSystemsAsync(token, null); + } + + /// + public void GetTicketSystemsAsync(string token, object userState) { + if ((this.GetTicketSystemsOperationCompleted == null)) { + this.GetTicketSystemsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetTicketSystemsOperationCompleted); + } + this.InvokeAsync("GetTicketSystems", new object[] { + token}, this.GetTicketSystemsOperationCompleted, userState); + } + + private void OnGetTicketSystemsOperationCompleted(object arg) { + if ((this.GetTicketSystemsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetTicketSystemsCompleted(this, new GetTicketSystemsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignSite", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AssignSite(string token, int secretId, int siteId) { + object[] results = this.Invoke("AssignSite", new object[] { + token, + secretId, + siteId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AssignSiteAsync(string token, int secretId, int siteId) { + this.AssignSiteAsync(token, secretId, siteId, null); + } + + /// + public void AssignSiteAsync(string token, int secretId, int siteId, object userState) { + if ((this.AssignSiteOperationCompleted == null)) { + this.AssignSiteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignSiteOperationCompleted); + } + this.InvokeAsync("AssignSite", new object[] { + token, + secretId, + siteId}, this.AssignSiteOperationCompleted, userState); + } + + private void OnAssignSiteOperationCompleted(object arg) { + if ((this.AssignSiteCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignSiteCompleted(this, new AssignSiteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CheckIn", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CheckIn(string token, int secretId) { + object[] results = this.Invoke("CheckIn", new object[] { + token, + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CheckInAsync(string token, int secretId) { + this.CheckInAsync(token, secretId, null); + } + + /// + public void CheckInAsync(string token, int secretId, object userState) { + if ((this.CheckInOperationCompleted == null)) { + this.CheckInOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckInOperationCompleted); + } + this.InvokeAsync("CheckIn", new object[] { + token, + secretId}, this.CheckInOperationCompleted, userState); + } + + private void OnCheckInOperationCompleted(object arg) { + if ((this.CheckInCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CheckInCompleted(this, new CheckInCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecretCustomAudit", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddSecretCustomAudit(string token, int secretId, string notes, string ipAddress, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable referenceId, string ticketNumber, int userId) { + object[] results = this.Invoke("AddSecretCustomAudit", new object[] { + token, + secretId, + notes, + ipAddress, + referenceId, + ticketNumber, + userId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddSecretCustomAuditAsync(string token, int secretId, string notes, string ipAddress, System.Nullable referenceId, string ticketNumber, int userId) { + this.AddSecretCustomAuditAsync(token, secretId, notes, ipAddress, referenceId, ticketNumber, userId, null); + } + + /// + public void AddSecretCustomAuditAsync(string token, int secretId, string notes, string ipAddress, System.Nullable referenceId, string ticketNumber, int userId, object userState) { + if ((this.AddSecretCustomAuditOperationCompleted == null)) { + this.AddSecretCustomAuditOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretCustomAuditOperationCompleted); + } + this.InvokeAsync("AddSecretCustomAudit", new object[] { + token, + secretId, + notes, + ipAddress, + referenceId, + ticketNumber, + userId}, this.AddSecretCustomAuditOperationCompleted, userState); + } + + private void OnAddSecretCustomAuditOperationCompleted(object arg) { + if ((this.AddSecretCustomAuditCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretCustomAuditCompleted(this, new AddSecretCustomAuditCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateSecretPermission", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateSecretPermission(string token, int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner) { + object[] results = this.Invoke("UpdateSecretPermission", new object[] { + token, + secretId, + groupOrUserRecord, + view, + edit, + owner}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateSecretPermissionAsync(string token, int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner) { + this.UpdateSecretPermissionAsync(token, secretId, groupOrUserRecord, view, edit, owner, null); + } + + /// + public void UpdateSecretPermissionAsync(string token, int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner, object userState) { + if ((this.UpdateSecretPermissionOperationCompleted == null)) { + this.UpdateSecretPermissionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateSecretPermissionOperationCompleted); + } + this.InvokeAsync("UpdateSecretPermission", new object[] { + token, + secretId, + groupOrUserRecord, + view, + edit, + owner}, this.UpdateSecretPermissionOperationCompleted, userState); + } + + private void OnUpdateSecretPermissionOperationCompleted(object arg) { + if ((this.UpdateSecretPermissionCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateSecretPermissionCompleted(this, new UpdateSecretPermissionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CheckInByKey", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CheckInByKey(string sessionKey) { + object[] results = this.Invoke("CheckInByKey", new object[] { + sessionKey}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CheckInByKeyAsync(string sessionKey) { + this.CheckInByKeyAsync(sessionKey, null); + } + + /// + public void CheckInByKeyAsync(string sessionKey, object userState) { + if ((this.CheckInByKeyOperationCompleted == null)) { + this.CheckInByKeyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckInByKeyOperationCompleted); + } + this.InvokeAsync("CheckInByKey", new object[] { + sessionKey}, this.CheckInByKeyOperationCompleted, userState); + } + + private void OnCheckInByKeyOperationCompleted(object arg) { + if ((this.CheckInByKeyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CheckInByKeyCompleted(this, new CheckInByKeyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/WhoAmI", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UserInfoResult WhoAmI(string token) { + object[] results = this.Invoke("WhoAmI", new object[] { + token}); + return ((UserInfoResult)(results[0])); + } + + /// + public void WhoAmIAsync(string token) { + this.WhoAmIAsync(token, null); + } + + /// + public void WhoAmIAsync(string token, object userState) { + if ((this.WhoAmIOperationCompleted == null)) { + this.WhoAmIOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWhoAmIOperationCompleted); + } + this.InvokeAsync("WhoAmI", new object[] { + token}, this.WhoAmIOperationCompleted, userState); + } + + private void OnWhoAmIOperationCompleted(object arg) { + if ((this.WhoAmICompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.WhoAmICompleted(this, new WhoAmICompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllGroups", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetAllGroupsResult GetAllGroups(string token) { + object[] results = this.Invoke("GetAllGroups", new object[] { + token}); + return ((GetAllGroupsResult)(results[0])); + } + + /// + public void GetAllGroupsAsync(string token) { + this.GetAllGroupsAsync(token, null); + } + + /// + public void GetAllGroupsAsync(string token, object userState) { + if ((this.GetAllGroupsOperationCompleted == null)) { + this.GetAllGroupsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllGroupsOperationCompleted); + } + this.InvokeAsync("GetAllGroups", new object[] { + token}, this.GetAllGroupsOperationCompleted, userState); + } + + private void OnGetAllGroupsOperationCompleted(object arg) { + if ((this.GetAllGroupsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllGroupsCompleted(this, new GetAllGroupsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignUserToGroup", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AssignUserToGroup(string token, int userId, int groupId) { + object[] results = this.Invoke("AssignUserToGroup", new object[] { + token, + userId, + groupId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AssignUserToGroupAsync(string token, int userId, int groupId) { + this.AssignUserToGroupAsync(token, userId, groupId, null); + } + + /// + public void AssignUserToGroupAsync(string token, int userId, int groupId, object userState) { + if ((this.AssignUserToGroupOperationCompleted == null)) { + this.AssignUserToGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignUserToGroupOperationCompleted); + } + this.InvokeAsync("AssignUserToGroup", new object[] { + token, + userId, + groupId}, this.AssignUserToGroupOperationCompleted, userState); + } + + private void OnAssignUserToGroupOperationCompleted(object arg) { + if ((this.AssignUserToGroupCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignUserToGroupCompleted(this, new AssignUserToGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHLoginCredentials", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SSHCredentialsResult GetSSHLoginCredentials(string token, int secretId) { + object[] results = this.Invoke("GetSSHLoginCredentials", new object[] { + token, + secretId}); + return ((SSHCredentialsResult)(results[0])); + } + + /// + public void GetSSHLoginCredentialsAsync(string token, int secretId) { + this.GetSSHLoginCredentialsAsync(token, secretId, null); + } + + /// + public void GetSSHLoginCredentialsAsync(string token, int secretId, object userState) { + if ((this.GetSSHLoginCredentialsOperationCompleted == null)) { + this.GetSSHLoginCredentialsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHLoginCredentialsOperationCompleted); + } + this.InvokeAsync("GetSSHLoginCredentials", new object[] { + token, + secretId}, this.GetSSHLoginCredentialsOperationCompleted, userState); + } + + private void OnGetSSHLoginCredentialsOperationCompleted(object arg) { + if ((this.GetSSHLoginCredentialsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHLoginCredentialsCompleted(this, new GetSSHLoginCredentialsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHLoginCredentialsWithMachine", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SSHCredentialsResult GetSSHLoginCredentialsWithMachine(string token, int secretId, string machine) { + object[] results = this.Invoke("GetSSHLoginCredentialsWithMachine", new object[] { + token, + secretId, + machine}); + return ((SSHCredentialsResult)(results[0])); + } + + /// + public void GetSSHLoginCredentialsWithMachineAsync(string token, int secretId, string machine) { + this.GetSSHLoginCredentialsWithMachineAsync(token, secretId, machine, null); + } + + /// + public void GetSSHLoginCredentialsWithMachineAsync(string token, int secretId, string machine, object userState) { + if ((this.GetSSHLoginCredentialsWithMachineOperationCompleted == null)) { + this.GetSSHLoginCredentialsWithMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHLoginCredentialsWithMachineOperationCompleted); + } + this.InvokeAsync("GetSSHLoginCredentialsWithMachine", new object[] { + token, + secretId, + machine}, this.GetSSHLoginCredentialsWithMachineOperationCompleted, userState); + } + + private void OnGetSSHLoginCredentialsWithMachineOperationCompleted(object arg) { + if ((this.GetSSHLoginCredentialsWithMachineCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHLoginCredentialsWithMachineCompleted(this, new GetSSHLoginCredentialsWithMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchUsers", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUsersResult SearchUsers(string token, string searchTerm, bool includeInactiveUsers) { + object[] results = this.Invoke("SearchUsers", new object[] { + token, + searchTerm, + includeInactiveUsers}); + return ((GetUsersResult)(results[0])); + } + + /// + public void SearchUsersAsync(string token, string searchTerm, bool includeInactiveUsers) { + this.SearchUsersAsync(token, searchTerm, includeInactiveUsers, null); + } + + /// + public void SearchUsersAsync(string token, string searchTerm, bool includeInactiveUsers, object userState) { + if ((this.SearchUsersOperationCompleted == null)) { + this.SearchUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchUsersOperationCompleted); + } + this.InvokeAsync("SearchUsers", new object[] { + token, + searchTerm, + includeInactiveUsers}, this.SearchUsersOperationCompleted, userState); + } + + private void OnSearchUsersOperationCompleted(object arg) { + if ((this.SearchUsersCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchUsersCompleted(this, new SearchUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserResult GetUser(string token, int userId) { + object[] results = this.Invoke("GetUser", new object[] { + token, + userId}); + return ((GetUserResult)(results[0])); + } + + /// + public void GetUserAsync(string token, int userId) { + this.GetUserAsync(token, userId, null); + } + + /// + public void GetUserAsync(string token, int userId, object userState) { + if ((this.GetUserOperationCompleted == null)) { + this.GetUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetUserOperationCompleted); + } + this.InvokeAsync("GetUser", new object[] { + token, + userId}, this.GetUserOperationCompleted, userState); + } + + private void OnGetUserOperationCompleted(object arg) { + if ((this.GetUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetUserCompleted(this, new GetUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UpdateUserResult UpdateUser(string token, User user) { + object[] results = this.Invoke("UpdateUser", new object[] { + token, + user}); + return ((UpdateUserResult)(results[0])); + } + + /// + public void UpdateUserAsync(string token, User user) { + this.UpdateUserAsync(token, user, null); + } + + /// + public void UpdateUserAsync(string token, User user, object userState) { + if ((this.UpdateUserOperationCompleted == null)) { + this.UpdateUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateUserOperationCompleted); + } + this.InvokeAsync("UpdateUser", new object[] { + token, + user}, this.UpdateUserOperationCompleted, userState); + } + + private void OnUpdateUserOperationCompleted(object arg) { + if ((this.UpdateUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateUserCompleted(this, new UpdateUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretItemHistoryByFieldName", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretItemHistoryResult GetSecretItemHistoryByFieldName(string token, int secretId, string fieldDisplayName) { + object[] results = this.Invoke("GetSecretItemHistoryByFieldName", new object[] { + token, + secretId, + fieldDisplayName}); + return ((SecretItemHistoryResult)(results[0])); + } + + /// + public void GetSecretItemHistoryByFieldNameAsync(string token, int secretId, string fieldDisplayName) { + this.GetSecretItemHistoryByFieldNameAsync(token, secretId, fieldDisplayName, null); + } + + /// + public void GetSecretItemHistoryByFieldNameAsync(string token, int secretId, string fieldDisplayName, object userState) { + if ((this.GetSecretItemHistoryByFieldNameOperationCompleted == null)) { + this.GetSecretItemHistoryByFieldNameOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretItemHistoryByFieldNameOperationCompleted); + } + this.InvokeAsync("GetSecretItemHistoryByFieldName", new object[] { + token, + secretId, + fieldDisplayName}, this.GetSecretItemHistoryByFieldNameOperationCompleted, userState); + } + + private void OnGetSecretItemHistoryByFieldNameOperationCompleted(object arg) { + if ((this.GetSecretItemHistoryByFieldNameCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretItemHistoryByFieldNameCompleted(this, new GetSecretItemHistoryByFieldNameCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretPolicyForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyForSecretResult GetSecretPolicyForSecret(string token, int secretId) { + object[] results = this.Invoke("GetSecretPolicyForSecret", new object[] { + token, + secretId}); + return ((SecretPolicyForSecretResult)(results[0])); + } + + /// + public void GetSecretPolicyForSecretAsync(string token, int secretId) { + this.GetSecretPolicyForSecretAsync(token, secretId, null); + } + + /// + public void GetSecretPolicyForSecretAsync(string token, int secretId, object userState) { + if ((this.GetSecretPolicyForSecretOperationCompleted == null)) { + this.GetSecretPolicyForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretPolicyForSecretOperationCompleted); + } + this.InvokeAsync("GetSecretPolicyForSecret", new object[] { + token, + secretId}, this.GetSecretPolicyForSecretOperationCompleted, userState); + } + + private void OnGetSecretPolicyForSecretOperationCompleted(object arg) { + if ((this.GetSecretPolicyForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretPolicyForSecretCompleted(this, new GetSecretPolicyForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignSecretPolicyForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyForSecretResult AssignSecretPolicyForSecret(string token, SecretPolicyForSecret secretPolicyForSecret) { + object[] results = this.Invoke("AssignSecretPolicyForSecret", new object[] { + token, + secretPolicyForSecret}); + return ((SecretPolicyForSecretResult)(results[0])); + } + + /// + public void AssignSecretPolicyForSecretAsync(string token, SecretPolicyForSecret secretPolicyForSecret) { + this.AssignSecretPolicyForSecretAsync(token, secretPolicyForSecret, null); + } + + /// + public void AssignSecretPolicyForSecretAsync(string token, SecretPolicyForSecret secretPolicyForSecret, object userState) { + if ((this.AssignSecretPolicyForSecretOperationCompleted == null)) { + this.AssignSecretPolicyForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignSecretPolicyForSecretOperationCompleted); + } + this.InvokeAsync("AssignSecretPolicyForSecret", new object[] { + token, + secretPolicyForSecret}, this.AssignSecretPolicyForSecretOperationCompleted, userState); + } + + private void OnAssignSecretPolicyForSecretOperationCompleted(object arg) { + if ((this.AssignSecretPolicyForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignSecretPolicyForSecretCompleted(this, new AssignSecretPolicyForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretPolicies", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretPoliciesResult SearchSecretPolicies(string token, string term, bool includeInactive) { + object[] results = this.Invoke("SearchSecretPolicies", new object[] { + token, + term, + includeInactive}); + return ((SearchSecretPoliciesResult)(results[0])); + } + + /// + public void SearchSecretPoliciesAsync(string token, string term, bool includeInactive) { + this.SearchSecretPoliciesAsync(token, term, includeInactive, null); + } + + /// + public void SearchSecretPoliciesAsync(string token, string term, bool includeInactive, object userState) { + if ((this.SearchSecretPoliciesOperationCompleted == null)) { + this.SearchSecretPoliciesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretPoliciesOperationCompleted); + } + this.InvokeAsync("SearchSecretPolicies", new object[] { + token, + term, + includeInactive}, this.SearchSecretPoliciesOperationCompleted, userState); + } + + private void OnSearchSecretPoliciesOperationCompleted(object arg) { + if ((this.SearchSecretPoliciesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretPoliciesCompleted(this, new SearchSecretPoliciesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RunActiveDirectorySynchronization", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RunActiveDirectorySynchronization(string token) { + object[] results = this.Invoke("RunActiveDirectorySynchronization", new object[] { + token}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RunActiveDirectorySynchronizationAsync(string token) { + this.RunActiveDirectorySynchronizationAsync(token, null); + } + + /// + public void RunActiveDirectorySynchronizationAsync(string token, object userState) { + if ((this.RunActiveDirectorySynchronizationOperationCompleted == null)) { + this.RunActiveDirectorySynchronizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRunActiveDirectorySynchronizationOperationCompleted); + } + this.InvokeAsync("RunActiveDirectorySynchronization", new object[] { + token}, this.RunActiveDirectorySynchronizationOperationCompleted, userState); + } + + private void OnRunActiveDirectorySynchronizationOperationCompleted(object arg) { + if ((this.RunActiveDirectorySynchronizationCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RunActiveDirectorySynchronizationCompleted(this, new RunActiveDirectorySynchronizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddGroupToActiveDirectorySynchronization", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddGroupToActiveDirectorySynchronization(string token, AddGroupRequestMessage addGroupRequestMessage) { + object[] results = this.Invoke("AddGroupToActiveDirectorySynchronization", new object[] { + token, + addGroupRequestMessage}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddGroupToActiveDirectorySynchronizationAsync(string token, AddGroupRequestMessage addGroupRequestMessage) { + this.AddGroupToActiveDirectorySynchronizationAsync(token, addGroupRequestMessage, null); + } + + /// + public void AddGroupToActiveDirectorySynchronizationAsync(string token, AddGroupRequestMessage addGroupRequestMessage, object userState) { + if ((this.AddGroupToActiveDirectorySynchronizationOperationCompleted == null)) { + this.AddGroupToActiveDirectorySynchronizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddGroupToActiveDirectorySynchronizationOperationCompleted); + } + this.InvokeAsync("AddGroupToActiveDirectorySynchronization", new object[] { + token, + addGroupRequestMessage}, this.AddGroupToActiveDirectorySynchronizationOperationCompleted, userState); + } + + private void OnAddGroupToActiveDirectorySynchronizationOperationCompleted(object arg) { + if ((this.AddGroupToActiveDirectorySynchronizationCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddGroupToActiveDirectorySynchronizationCompleted(this, new AddGroupToActiveDirectorySynchronizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecretPolicy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyResult AddSecretPolicy(string token, SecretPolicyDetail secretPolicy) { + object[] results = this.Invoke("AddSecretPolicy", new object[] { + token, + secretPolicy}); + return ((SecretPolicyResult)(results[0])); + } + + /// + public void AddSecretPolicyAsync(string token, SecretPolicyDetail secretPolicy) { + this.AddSecretPolicyAsync(token, secretPolicy, null); + } + + /// + public void AddSecretPolicyAsync(string token, SecretPolicyDetail secretPolicy, object userState) { + if ((this.AddSecretPolicyOperationCompleted == null)) { + this.AddSecretPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretPolicyOperationCompleted); + } + this.InvokeAsync("AddSecretPolicy", new object[] { + token, + secretPolicy}, this.AddSecretPolicyOperationCompleted, userState); + } + + private void OnAddSecretPolicyOperationCompleted(object arg) { + if ((this.AddSecretPolicyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretPolicyCompleted(this, new AddSecretPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetNewSecretPolicy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyResult GetNewSecretPolicy(string token) { + object[] results = this.Invoke("GetNewSecretPolicy", new object[] { + token}); + return ((SecretPolicyResult)(results[0])); + } + + /// + public void GetNewSecretPolicyAsync(string token) { + this.GetNewSecretPolicyAsync(token, null); + } + + /// + public void GetNewSecretPolicyAsync(string token, object userState) { + if ((this.GetNewSecretPolicyOperationCompleted == null)) { + this.GetNewSecretPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetNewSecretPolicyOperationCompleted); + } + this.InvokeAsync("GetNewSecretPolicy", new object[] { + token}, this.GetNewSecretPolicyOperationCompleted, userState); + } + + private void OnGetNewSecretPolicyOperationCompleted(object arg) { + if ((this.GetNewSecretPolicyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetNewSecretPolicyCompleted(this, new GetNewSecretPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenuResult GetSSHCommandMenu(string token, int sshCommandMenuId) { + object[] results = this.Invoke("GetSSHCommandMenu", new object[] { + token, + sshCommandMenuId}); + return ((GetSshCommandMenuResult)(results[0])); + } + + /// + public void GetSSHCommandMenuAsync(string token, int sshCommandMenuId) { + this.GetSSHCommandMenuAsync(token, sshCommandMenuId, null); + } + + /// + public void GetSSHCommandMenuAsync(string token, int sshCommandMenuId, object userState) { + if ((this.GetSSHCommandMenuOperationCompleted == null)) { + this.GetSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("GetSSHCommandMenu", new object[] { + token, + sshCommandMenuId}, this.GetSSHCommandMenuOperationCompleted, userState); + } + + private void OnGetSSHCommandMenuOperationCompleted(object arg) { + if ((this.GetSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHCommandMenuCompleted(this, new GetSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SaveSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenuResult SaveSSHCommandMenu(string token, SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands) { + object[] results = this.Invoke("SaveSSHCommandMenu", new object[] { + token, + sshCommandMenu, + commandsText, + deleteCommands}); + return ((GetSshCommandMenuResult)(results[0])); + } + + /// + public void SaveSSHCommandMenuAsync(string token, SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands) { + this.SaveSSHCommandMenuAsync(token, sshCommandMenu, commandsText, deleteCommands, null); + } + + /// + public void SaveSSHCommandMenuAsync(string token, SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands, object userState) { + if ((this.SaveSSHCommandMenuOperationCompleted == null)) { + this.SaveSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("SaveSSHCommandMenu", new object[] { + token, + sshCommandMenu, + commandsText, + deleteCommands}, this.SaveSSHCommandMenuOperationCompleted, userState); + } + + private void OnSaveSSHCommandMenuOperationCompleted(object arg) { + if ((this.SaveSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SaveSSHCommandMenuCompleted(this, new SaveSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllSSHCommandMenus", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenusResult GetAllSSHCommandMenus(string token, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeInactive) { + object[] results = this.Invoke("GetAllSSHCommandMenus", new object[] { + token, + includeInactive}); + return ((GetSshCommandMenusResult)(results[0])); + } + + /// + public void GetAllSSHCommandMenusAsync(string token, System.Nullable includeInactive) { + this.GetAllSSHCommandMenusAsync(token, includeInactive, null); + } + + /// + public void GetAllSSHCommandMenusAsync(string token, System.Nullable includeInactive, object userState) { + if ((this.GetAllSSHCommandMenusOperationCompleted == null)) { + this.GetAllSSHCommandMenusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllSSHCommandMenusOperationCompleted); + } + this.InvokeAsync("GetAllSSHCommandMenus", new object[] { + token, + includeInactive}, this.GetAllSSHCommandMenusOperationCompleted, userState); + } + + private void OnGetAllSSHCommandMenusOperationCompleted(object arg) { + if ((this.GetAllSSHCommandMenusCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllSSHCommandMenusCompleted(this, new GetAllSSHCommandMenusCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DeleteSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult DeleteSSHCommandMenu(string token, int sshCommandMenuId) { + object[] results = this.Invoke("DeleteSSHCommandMenu", new object[] { + token, + sshCommandMenuId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void DeleteSSHCommandMenuAsync(string token, int sshCommandMenuId) { + this.DeleteSSHCommandMenuAsync(token, sshCommandMenuId, null); + } + + /// + public void DeleteSSHCommandMenuAsync(string token, int sshCommandMenuId, object userState) { + if ((this.DeleteSSHCommandMenuOperationCompleted == null)) { + this.DeleteSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("DeleteSSHCommandMenu", new object[] { + token, + sshCommandMenuId}, this.DeleteSSHCommandMenuOperationCompleted, userState); + } + + private void OnDeleteSSHCommandMenuOperationCompleted(object arg) { + if ((this.DeleteSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DeleteSSHCommandMenuCompleted(this, new DeleteSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RestoreSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RestoreSSHCommandMenu(string token, int sshCommandMenuId) { + object[] results = this.Invoke("RestoreSSHCommandMenu", new object[] { + token, + sshCommandMenuId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RestoreSSHCommandMenuAsync(string token, int sshCommandMenuId) { + this.RestoreSSHCommandMenuAsync(token, sshCommandMenuId, null); + } + + /// + public void RestoreSSHCommandMenuAsync(string token, int sshCommandMenuId, object userState) { + if ((this.RestoreSSHCommandMenuOperationCompleted == null)) { + this.RestoreSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRestoreSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("RestoreSSHCommandMenu", new object[] { + token, + sshCommandMenuId}, this.RestoreSSHCommandMenuOperationCompleted, userState); + } + + private void OnRestoreSSHCommandMenuOperationCompleted(object arg) { + if ((this.RestoreSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RestoreSSHCommandMenuCompleted(this, new RestoreSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetReport", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetReportResult GetReport(string token, GetReportRequest reportRequest) { + object[] results = this.Invoke("GetReport", new object[] { + token, + reportRequest}); + return ((GetReportResult)(results[0])); + } + + /// + public void GetReportAsync(string token, GetReportRequest reportRequest) { + this.GetReportAsync(token, reportRequest, null); + } + + /// + public void GetReportAsync(string token, GetReportRequest reportRequest, object userState) { + if ((this.GetReportOperationCompleted == null)) { + this.GetReportOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetReportOperationCompleted); + } + this.InvokeAsync("GetReport", new object[] { + token, + reportRequest}, this.GetReportOperationCompleted, userState); + } + + private void OnGetReportOperationCompleted(object arg) { + if ((this.GetReportCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetReportCompleted(this, new GetReportCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddScript(string token, UserScript newUserScript) { + object[] results = this.Invoke("AddScript", new object[] { + token, + newUserScript}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddScriptAsync(string token, UserScript newUserScript) { + this.AddScriptAsync(token, newUserScript, null); + } + + /// + public void AddScriptAsync(string token, UserScript newUserScript, object userState) { + if ((this.AddScriptOperationCompleted == null)) { + this.AddScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddScriptOperationCompleted); + } + this.InvokeAsync("AddScript", new object[] { + token, + newUserScript}, this.AddScriptOperationCompleted, userState); + } + + private void OnAddScriptOperationCompleted(object arg) { + if ((this.AddScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddScriptCompleted(this, new AddScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllScripts", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserScriptsResult GetAllScripts(string token, bool includeInactiveUserScripts) { + object[] results = this.Invoke("GetAllScripts", new object[] { + token, + includeInactiveUserScripts}); + return ((GetUserScriptsResult)(results[0])); + } + + /// + public void GetAllScriptsAsync(string token, bool includeInactiveUserScripts) { + this.GetAllScriptsAsync(token, includeInactiveUserScripts, null); + } + + /// + public void GetAllScriptsAsync(string token, bool includeInactiveUserScripts, object userState) { + if ((this.GetAllScriptsOperationCompleted == null)) { + this.GetAllScriptsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllScriptsOperationCompleted); + } + this.InvokeAsync("GetAllScripts", new object[] { + token, + includeInactiveUserScripts}, this.GetAllScriptsOperationCompleted, userState); + } + + private void OnGetAllScriptsOperationCompleted(object arg) { + if ((this.GetAllScriptsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllScriptsCompleted(this, new GetAllScriptsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserScriptResult GetScript(string token, int userScriptId) { + object[] results = this.Invoke("GetScript", new object[] { + token, + userScriptId}); + return ((GetUserScriptResult)(results[0])); + } + + /// + public void GetScriptAsync(string token, int userScriptId) { + this.GetScriptAsync(token, userScriptId, null); + } + + /// + public void GetScriptAsync(string token, int userScriptId, object userState) { + if ((this.GetScriptOperationCompleted == null)) { + this.GetScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetScriptOperationCompleted); + } + this.InvokeAsync("GetScript", new object[] { + token, + userScriptId}, this.GetScriptOperationCompleted, userState); + } + + private void OnGetScriptOperationCompleted(object arg) { + if ((this.GetScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetScriptCompleted(this, new GetScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UpdateUserScriptResult UpdateScript(string token, UserScript userScript) { + object[] results = this.Invoke("UpdateScript", new object[] { + token, + userScript}); + return ((UpdateUserScriptResult)(results[0])); + } + + /// + public void UpdateScriptAsync(string token, UserScript userScript) { + this.UpdateScriptAsync(token, userScript, null); + } + + /// + public void UpdateScriptAsync(string token, UserScript userScript, object userState) { + if ((this.UpdateScriptOperationCompleted == null)) { + this.UpdateScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateScriptOperationCompleted); + } + this.InvokeAsync("UpdateScript", new object[] { + token, + userScript}, this.UpdateScriptOperationCompleted, userState); + } + + private void OnUpdateScriptOperationCompleted(object arg) { + if ((this.UpdateScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateScriptCompleted(this, new UpdateScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class RequestApprovalResult : GenericResult { + + private ApprovalInfo approvalInfoField; + + /// + public ApprovalInfo ApprovalInfo { + get { + return this.approvalInfoField; + } + set { + this.approvalInfoField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class ApprovalInfo { + + private AccessRequestState statusField; + + private string responderField; + + private System.DateTime responseDateField; + + private string responseCommentField; + + private System.Nullable expirationDateField; + + private bool canOverrideField; + + /// + public AccessRequestState Status { + get { + return this.statusField; + } + set { + this.statusField = value; + } + } + + /// + public string Responder { + get { + return this.responderField; + } + set { + this.responderField = value; + } + } + + /// + public System.DateTime ResponseDate { + get { + return this.responseDateField; + } + set { + this.responseDateField = value; + } + } + + /// + public string ResponseComment { + get { + return this.responseCommentField; + } + set { + this.responseCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ExpirationDate { + get { + return this.expirationDateField; + } + set { + this.expirationDateField = value; + } + } + + /// + public bool CanOverride { + get { + return this.canOverrideField; + } + set { + this.canOverrideField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum AccessRequestState { + + /// + WaitingForRequest, + + /// + Pending, + + /// + Approved, + + /// + Denied, + + /// + Canceled, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshScriptArgument2 { + + private string nameField; + + private string valueField; + + private SshArgumentType2 sshTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public SshArgumentType2 SshType { + get { + return this.sshTypeField; + } + set { + this.sshTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum SshArgumentType2 { + + /// + Interpreted, + + /// + Literal, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDataSshObject { + + private string portField; + + private LineEnding lineEndingField; + + private bool doNotUseEnvironmentField; + + private SshScriptArgument2[] paramsField; + + private int versionField; + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public LineEnding LineEnding { + get { + return this.lineEndingField; + } + set { + this.lineEndingField = value; + } + } + + /// + public bool DoNotUseEnvironment { + get { + return this.doNotUseEnvironmentField; + } + set { + this.doNotUseEnvironmentField = value; + } + } + + /// + public SshScriptArgument2[] Params { + get { + return this.paramsField; + } + set { + this.paramsField = value; + } + } + + /// + public int Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum LineEnding { + + /// + NewLine, + + /// + CarriageReturn, + + /// + CarriageReturnNewLine, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetReportResult { + + private string[] errorsField; + + private System.Data.DataTable reportField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public System.Data.DataTable Report { + get { + return this.reportField; + } + set { + this.reportField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DualControlApproval { + + private string usernameField; + + private string passwordField; + + private System.Nullable domainIdField; + + private string twoFactorField; + + /// + public string Username { + get { + return this.usernameField; + } + set { + this.usernameField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string TwoFactor { + get { + return this.twoFactorField; + } + set { + this.twoFactorField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class ReportParameter { + + private string nameField; + + private string valueField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetReportRequest { + + private System.Nullable reportIdField; + + private string reportNameField; + + private ReportParameter[] parametersField; + + private DualControlApproval dualControlApprovalField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable reportId { + get { + return this.reportIdField; + } + set { + this.reportIdField = value; + } + } + + /// + public string reportName { + get { + return this.reportNameField; + } + set { + this.reportNameField = value; + } + } + + /// + public ReportParameter[] parameters { + get { + return this.parametersField; + } + set { + this.parametersField = value; + } + } + + /// + public DualControlApproval dualControlApproval { + get { + return this.dualControlApprovalField; + } + set { + this.dualControlApprovalField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSshCommandMenusResult { + + private SshCommandMenu[] sshCommandMenusField; + + private string[] errorsField; + + /// + public SshCommandMenu[] SshCommandMenus { + get { + return this.sshCommandMenusField; + } + set { + this.sshCommandMenusField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenu { + + private int sshCommandMenuIdField; + + private string nameField; + + private bool activeField; + + private string descriptionField; + + /// + public int SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSshCommandMenuResult { + + private SshCommandMenu sshCommandMenuField; + + private string sshCommandsField; + + private string[] errorsField; + + /// + public SshCommandMenu SshCommandMenu { + get { + return this.sshCommandMenuField; + } + set { + this.sshCommandMenuField = value; + } + } + + /// + public string SshCommands { + get { + return this.sshCommandsField; + } + set { + this.sshCommandsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AddGroupRequestMessage { + + private string groupNameField; + + private System.Nullable domainIdField; + + private string domainNameField; + + /// + public string GroupName { + get { + return this.groupNameField; + } + set { + this.groupNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItemHistoryWebServiceResult { + + private int secretItemHistoryIdField; + + private int userIdField; + + private int secretItemIdField; + + private int secretIdField; + + private System.DateTime dateField; + + private string itemValueNewField; + + private string itemValueNew2Field; + + /// + public int SecretItemHistoryId { + get { + return this.secretItemHistoryIdField; + } + set { + this.secretItemHistoryIdField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public int SecretItemId { + get { + return this.secretItemIdField; + } + set { + this.secretItemIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime Date { + get { + return this.dateField; + } + set { + this.dateField = value; + } + } + + /// + public string ItemValueNew { + get { + return this.itemValueNewField; + } + set { + this.itemValueNewField = value; + } + } + + /// + public string ItemValueNew2 { + get { + return this.itemValueNew2Field; + } + set { + this.itemValueNew2Field = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItemHistoryResult { + + private string[] errorsField; + + private bool successField; + + private SecretItemHistoryWebServiceResult[] secretItemHistoriesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + + /// + public SecretItemHistoryWebServiceResult[] SecretItemHistories { + get { + return this.secretItemHistoriesField; + } + set { + this.secretItemHistoriesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UpdateUserResult { + + private User userField; + + private string[] errorsField; + + /// + public User User { + get { + return this.userField; + } + set { + this.userField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class User { + + private System.Nullable idField; + + private string userNameField; + + private string displayNameField; + + private System.Nullable domainIdField; + + private bool isApplicationAccountField; + + private bool radiusTwoFactorField; + + private bool emailTwoFactorField; + + private string radiusUserNameField; + + private string emailAddressField; + + private string passwordField; + + private bool enabledField; + + private bool duoTwoFactorField; + + private bool oATHTwoFactorField; + + private bool fido2TwoFactorField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public bool IsApplicationAccount { + get { + return this.isApplicationAccountField; + } + set { + this.isApplicationAccountField = value; + } + } + + /// + public bool RadiusTwoFactor { + get { + return this.radiusTwoFactorField; + } + set { + this.radiusTwoFactorField = value; + } + } + + /// + public bool EmailTwoFactor { + get { + return this.emailTwoFactorField; + } + set { + this.emailTwoFactorField = value; + } + } + + /// + public string RadiusUserName { + get { + return this.radiusUserNameField; + } + set { + this.radiusUserNameField = value; + } + } + + /// + public string EmailAddress { + get { + return this.emailAddressField; + } + set { + this.emailAddressField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + public bool Enabled { + get { + return this.enabledField; + } + set { + this.enabledField = value; + } + } + + /// + public bool DuoTwoFactor { + get { + return this.duoTwoFactorField; + } + set { + this.duoTwoFactorField = value; + } + } + + /// + public bool OATHTwoFactor { + get { + return this.oATHTwoFactorField; + } + set { + this.oATHTwoFactorField = value; + } + } + + /// + public bool Fido2TwoFactor { + get { + return this.fido2TwoFactorField; + } + set { + this.fido2TwoFactorField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserResult { + + private User userField; + + private string[] errorsField; + + /// + public User User { + get { + return this.userField; + } + set { + this.userField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUsersResult { + + private User[] usersField; + + private string[] errorsField; + + /// + public User[] Users { + get { + return this.usersField; + } + set { + this.usersField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Group { + + private int idField; + + private string nameField; + + private int domainIdField; + + private string domainNameField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetAllGroupsResult { + + private string[] errorsField; + + private Group[] groupsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Group[] Groups { + get { + return this.groupsField; + } + set { + this.groupsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UserInfoResult { + + private string[] errorsField; + + private string displayNameField; + + private string userNameField; + + private string knownAsField; + + private int userIdField; + + private int domainIdField; + + private string domainNameField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + public string KnownAs { + get { + return this.knownAsField; + } + set { + this.knownAsField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public int DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class TicketSystem { + + private int ticketSystemIdField; + + private string nameField; + + private string descriptionField; + + private bool isDefaultField; + + /// + public int TicketSystemId { + get { + return this.ticketSystemIdField; + } + set { + this.ticketSystemIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public bool IsDefault { + get { + return this.isDefaultField; + } + set { + this.isDefaultField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetTicketSystemsResult { + + private TicketSystem[] ticketSystemsField; + + private string[] errorsField; + + private bool successField; + + /// + public TicketSystem[] TicketSystems { + get { + return this.ticketSystemsField; + } + set { + this.ticketSystemsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SiteConnector { + + private int siteConnectorIdField; + + private string siteConnectorNameField; + + private string queueTypeField; + + private string hostNameField; + + private int portField; + + private bool activeField; + + private bool validatedField; + + private bool useSslField; + + private string sslCertificateThumbprintField; + + private System.DateTime lastModifiedDateField; + + private string userNameField; + + private byte[] passwordIVField; + + private string versionField; + + /// + public int SiteConnectorId { + get { + return this.siteConnectorIdField; + } + set { + this.siteConnectorIdField = value; + } + } + + /// + public string SiteConnectorName { + get { + return this.siteConnectorNameField; + } + set { + this.siteConnectorNameField = value; + } + } + + /// + public string QueueType { + get { + return this.queueTypeField; + } + set { + this.queueTypeField = value; + } + } + + /// + public string HostName { + get { + return this.hostNameField; + } + set { + this.hostNameField = value; + } + } + + /// + public int Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public bool Validated { + get { + return this.validatedField; + } + set { + this.validatedField = value; + } + } + + /// + public bool UseSsl { + get { + return this.useSslField; + } + set { + this.useSslField = value; + } + } + + /// + public string SslCertificateThumbprint { + get { + return this.sslCertificateThumbprintField; + } + set { + this.sslCertificateThumbprintField = value; + } + } + + /// + public System.DateTime LastModifiedDate { + get { + return this.lastModifiedDateField; + } + set { + this.lastModifiedDateField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] PasswordIV { + get { + return this.passwordIVField; + } + set { + this.passwordIVField = value; + } + } + + /// + public string Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Site { + + private int siteIdField; + + private int organizationIdField; + + private string symmetricKeyField; + + private byte[] symmetricKeyIVField; + + private byte[] initializationVectorField; + + private string siteNameField; + + private bool activeField; + + private int heartbeatIntervalField; + + private bool useWebSiteField; + + private bool systemSiteField; + + private bool enableSshProxyField; + + private System.Nullable sshProxyPortField; + + private bool enableRDPProxyField; + + private System.Nullable rdpProxyPortField; + + private System.Nullable secretIdField; + + private System.DateTime lastModifiedDateField; + + private string winRMEndpointField; + + private System.Nullable enableCredSSPForWinRMField; + + private int siteConnectorIdField; + + private SiteConnector siteConnectorField; + + /// + public int SiteId { + get { + return this.siteIdField; + } + set { + this.siteIdField = value; + } + } + + /// + public int OrganizationId { + get { + return this.organizationIdField; + } + set { + this.organizationIdField = value; + } + } + + /// + public string SymmetricKey { + get { + return this.symmetricKeyField; + } + set { + this.symmetricKeyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] SymmetricKeyIV { + get { + return this.symmetricKeyIVField; + } + set { + this.symmetricKeyIVField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] InitializationVector { + get { + return this.initializationVectorField; + } + set { + this.initializationVectorField = value; + } + } + + /// + public string SiteName { + get { + return this.siteNameField; + } + set { + this.siteNameField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public int HeartbeatInterval { + get { + return this.heartbeatIntervalField; + } + set { + this.heartbeatIntervalField = value; + } + } + + /// + public bool UseWebSite { + get { + return this.useWebSiteField; + } + set { + this.useWebSiteField = value; + } + } + + /// + public bool SystemSite { + get { + return this.systemSiteField; + } + set { + this.systemSiteField = value; + } + } + + /// + public bool EnableSshProxy { + get { + return this.enableSshProxyField; + } + set { + this.enableSshProxyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshProxyPort { + get { + return this.sshProxyPortField; + } + set { + this.sshProxyPortField = value; + } + } + + /// + public bool EnableRDPProxy { + get { + return this.enableRDPProxyField; + } + set { + this.enableRDPProxyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RdpProxyPort { + get { + return this.rdpProxyPortField; + } + set { + this.rdpProxyPortField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime LastModifiedDate { + get { + return this.lastModifiedDateField; + } + set { + this.lastModifiedDateField = value; + } + } + + /// + public string WinRMEndpoint { + get { + return this.winRMEndpointField; + } + set { + this.winRMEndpointField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable EnableCredSSPForWinRM { + get { + return this.enableCredSSPForWinRMField; + } + set { + this.enableCredSSPForWinRMField = value; + } + } + + /// + public int SiteConnectorId { + get { + return this.siteConnectorIdField; + } + set { + this.siteConnectorIdField = value; + } + } + + /// + public SiteConnector SiteConnector { + get { + return this.siteConnectorField; + } + set { + this.siteConnectorField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSitesResult { + + private Site[] sitesField; + + private string[] errorsField; + + private bool successField; + + /// + public Site[] Sites { + get { + return this.sitesField; + } + set { + this.sitesField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetDependencyGroupsResult { + + private DependencyGroup[] dependencyGroupsField; + + private string[] errorsField; + + private bool successField; + + /// + public DependencyGroup[] DependencyGroups { + get { + return this.dependencyGroupsField; + } + set { + this.dependencyGroupsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DependencyGroup { + + private int secretDependencyGroupIdField; + + private int secretIdField; + + private string nameField; + + private System.Nullable siteIdField; + + /// + public int SecretDependencyGroupId { + get { + return this.secretDependencyGroupIdField; + } + set { + this.secretDependencyGroupIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SiteId { + get { + return this.siteIdField; + } + set { + this.siteIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetDependenciesResult { + + private Dependency[] dependenciesField; + + private string[] errorsField; + + private bool successField; + + /// + public Dependency[] Dependencies { + get { + return this.dependenciesField; + } + set { + this.dependenciesField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Dependency { + + private int secretIdField; + + private int secretDependencyTypeIdField; + + private string machineNameField; + + private string serviceNameField; + + private int privilegedAccountSecretIdField; + + private bool activeField; + + private bool restartOnPasswordChangeField; + + private int waitBeforeSecondsField; + + private AdditionalDependencyInfoJson additionalInfoField; + + private string descriptionField; + + private int scriptIdField; + + private int secretDependencyIdField; + + private System.Nullable sSHKeySecretIdField; + + private System.Nullable secretDependencyTemplateIdField; + + private System.Nullable secretDependencyGroupIdField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public int SecretDependencyTypeId { + get { + return this.secretDependencyTypeIdField; + } + set { + this.secretDependencyTypeIdField = value; + } + } + + /// + public string MachineName { + get { + return this.machineNameField; + } + set { + this.machineNameField = value; + } + } + + /// + public string ServiceName { + get { + return this.serviceNameField; + } + set { + this.serviceNameField = value; + } + } + + /// + public int PrivilegedAccountSecretId { + get { + return this.privilegedAccountSecretIdField; + } + set { + this.privilegedAccountSecretIdField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public bool RestartOnPasswordChange { + get { + return this.restartOnPasswordChangeField; + } + set { + this.restartOnPasswordChangeField = value; + } + } + + /// + public int WaitBeforeSeconds { + get { + return this.waitBeforeSecondsField; + } + set { + this.waitBeforeSecondsField = value; + } + } + + /// + public AdditionalDependencyInfoJson AdditionalInfo { + get { + return this.additionalInfoField; + } + set { + this.additionalInfoField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public int ScriptId { + get { + return this.scriptIdField; + } + set { + this.scriptIdField = value; + } + } + + /// + public int SecretDependencyId { + get { + return this.secretDependencyIdField; + } + set { + this.secretDependencyIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SSHKeySecretId { + get { + return this.sSHKeySecretIdField; + } + set { + this.sSHKeySecretIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretDependencyTemplateId { + get { + return this.secretDependencyTemplateIdField; + } + set { + this.secretDependencyTemplateIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretDependencyGroupId { + get { + return this.secretDependencyGroupIdField; + } + set { + this.secretDependencyGroupIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDependencyInfoJson { + + private string regexField; + + private string powershellArgumentsField; + + private SshScriptArgument[] sshArgumentsField; + + private SqlScriptArgument[] sqlArgumentsField; + + private OdbcConnectionArg[] odbcConnectionArgumentsField; + + private DependencyScanItemField[] dependencyScanItemFieldsField; + + private string portField; + + private string databaseField; + + private string serverKeyDigestField; + + /// + public string Regex { + get { + return this.regexField; + } + set { + this.regexField = value; + } + } + + /// + public string PowershellArguments { + get { + return this.powershellArgumentsField; + } + set { + this.powershellArgumentsField = value; + } + } + + /// + public SshScriptArgument[] SshArguments { + get { + return this.sshArgumentsField; + } + set { + this.sshArgumentsField = value; + } + } + + /// + public SqlScriptArgument[] SqlArguments { + get { + return this.sqlArgumentsField; + } + set { + this.sqlArgumentsField = value; + } + } + + /// + public OdbcConnectionArg[] OdbcConnectionArguments { + get { + return this.odbcConnectionArgumentsField; + } + set { + this.odbcConnectionArgumentsField = value; + } + } + + /// + public DependencyScanItemField[] DependencyScanItemFields { + get { + return this.dependencyScanItemFieldsField; + } + set { + this.dependencyScanItemFieldsField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public string Database { + get { + return this.databaseField; + } + set { + this.databaseField = value; + } + } + + /// + public string ServerKeyDigest { + get { + return this.serverKeyDigestField; + } + set { + this.serverKeyDigestField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshScriptArgument { + + private string nameField; + + private string valueField; + + private SshArgumentType sshTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public SshArgumentType SshType { + get { + return this.sshTypeField; + } + set { + this.sshTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum SshArgumentType { + + /// + Interpreted, + + /// + Literal, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlScriptArgument { + + private string nameField; + + private object valueField; + + private DbType dbTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public object Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public DbType DbType { + get { + return this.dbTypeField; + } + set { + this.dbTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum DbType { + + /// + AnsiString, + + /// + Binary, + + /// + Byte, + + /// + Boolean, + + /// + Currency, + + /// + Date, + + /// + DateTime, + + /// + Decimal, + + /// + Double, + + /// + Guid, + + /// + Int16, + + /// + Int32, + + /// + Int64, + + /// + Object, + + /// + SByte, + + /// + Single, + + /// + String, + + /// + Time, + + /// + UInt16, + + /// + UInt32, + + /// + UInt64, + + /// + VarNumeric, + + /// + AnsiStringFixedLength, + + /// + StringFixedLength, + + /// + Xml, + + /// + DateTime2, + + /// + DateTimeOffset, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class OdbcConnectionArg { + + private string nameField; + + private string valueField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DependencyScanItemField { + + private int scanItemFieldIdField; + + private string nameField; + + private string valueField; + + private string parentNameField; + + /// + public int ScanItemFieldId { + get { + return this.scanItemFieldIdField; + } + set { + this.scanItemFieldIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public string ParentName { + get { + return this.parentNameField; + } + set { + this.parentNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AuditSecret { + + private int auditSecretIdField; + + private int secretIdField; + + private System.DateTime dateRecordedField; + + private string actionField; + + private string notesField; + + private int userIdField; + + private string secretNameField; + + private string ipAddressField; + + private int referenceIdField; + + private string byUserDisplayNameField; + + private string ticketNumberField; + + /// + public int AuditSecretId { + get { + return this.auditSecretIdField; + } + set { + this.auditSecretIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime DateRecorded { + get { + return this.dateRecordedField; + } + set { + this.dateRecordedField = value; + } + } + + /// + public string Action { + get { + return this.actionField; + } + set { + this.actionField = value; + } + } + + /// + public string Notes { + get { + return this.notesField; + } + set { + this.notesField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public string SecretName { + get { + return this.secretNameField; + } + set { + this.secretNameField = value; + } + } + + /// + public string IpAddress { + get { + return this.ipAddressField; + } + set { + this.ipAddressField = value; + } + } + + /// + public int ReferenceId { + get { + return this.referenceIdField; + } + set { + this.referenceIdField = value; + } + } + + /// + public string ByUserDisplayName { + get { + return this.byUserDisplayNameField; + } + set { + this.byUserDisplayNameField = value; + } + } + + /// + public string TicketNumber { + get { + return this.ticketNumberField; + } + set { + this.ticketNumberField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretAuditResult { + + private string[] errorsField; + + private AuditSecret[] secretAuditsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public AuditSecret[] SecretAudits { + get { + return this.secretAuditsField; + } + set { + this.secretAuditsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchFolderResult { + + private string[] errorsField; + + private Folder[] foldersField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Folder[] Folders { + get { + return this.foldersField; + } + set { + this.foldersField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtended))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Folder { + + private int idField; + + private string nameField; + + private int typeIdField; + + private int parentFolderIdField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int TypeId { + get { + return this.typeIdField; + } + set { + this.typeIdField = value; + } + } + + /// + public int ParentFolderId { + get { + return this.parentFolderIdField; + } + set { + this.parentFolderIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtended : Folder { + + private FolderPermissions permissionSettingsField; + + private FolderSettings settingsField; + + /// + public FolderPermissions PermissionSettings { + get { + return this.permissionSettingsField; + } + set { + this.permissionSettingsField = value; + } + } + + /// + public FolderSettings Settings { + get { + return this.settingsField; + } + set { + this.settingsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderPermissions { + + private System.Nullable isChangeToPermissionsField; + + private System.Nullable inheritPermissionsEnabledField; + + private FolderPermission[] permissionsField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsChangeToPermissions { + get { + return this.isChangeToPermissionsField; + } + set { + this.isChangeToPermissionsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissionsEnabled { + get { + return this.inheritPermissionsEnabledField; + } + set { + this.inheritPermissionsEnabledField = value; + } + } + + /// + public FolderPermission[] Permissions { + get { + return this.permissionsField; + } + set { + this.permissionsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderPermission { + + private GroupOrUserRecord userOrGroupField; + + private string folderAccessRoleNameField; + + private System.Nullable folderAccessRoleIdField; + + private string secretAccessRoleNameField; + + private System.Nullable secretAccessRoleIdField; + + /// + public GroupOrUserRecord UserOrGroup { + get { + return this.userOrGroupField; + } + set { + this.userOrGroupField = value; + } + } + + /// + public string FolderAccessRoleName { + get { + return this.folderAccessRoleNameField; + } + set { + this.folderAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable FolderAccessRoleId { + get { + return this.folderAccessRoleIdField; + } + set { + this.folderAccessRoleIdField = value; + } + } + + /// + public string SecretAccessRoleName { + get { + return this.secretAccessRoleNameField; + } + set { + this.secretAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretAccessRoleId { + get { + return this.secretAccessRoleIdField; + } + set { + this.secretAccessRoleIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GroupOrUserRecord { + + private string nameField; + + private string domainNameField; + + private bool isUserField; + + private System.Nullable groupIdField; + + private System.Nullable userIdField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + + /// + public bool IsUser { + get { + return this.isUserField; + } + set { + this.isUserField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable GroupId { + get { + return this.groupIdField; + } + set { + this.groupIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderSettings { + + private System.Nullable isChangeToSettingsField; + + private System.Nullable inheritSecretPolicyField; + + private System.Nullable secretPolicyIdField; + + private SecretType[] associatedTemplatesField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsChangeToSettings { + get { + return this.isChangeToSettingsField; + } + set { + this.isChangeToSettingsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritSecretPolicy { + get { + return this.inheritSecretPolicyField; + } + set { + this.inheritSecretPolicyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public SecretType[] AssociatedTemplates { + get { + return this.associatedTemplatesField; + } + set { + this.associatedTemplatesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretType : TrackChanges { + + private string secretTypeDescriptionField; + + private int typeIDField; + + private int rPCRetryIntervalField; + + private System.Nullable rPCMaxAttemptsField; + + private bool launcherTypeReadyField; + + private bool enableHeartBeatField; + + private int secretNameHistoryLengthField; + + private string namePatternField; + + private string namePatternErrorMessageField; + + private bool activeField; + + private string nameField; + + private int organizationIdField; + + private int expirationFieldIdField; + + private int expirationDaysField; + + private int passwordTypeIdField; + + private bool passwordTypeReadyField; + + private string imageClassField; + + private int heartBeatCheckIntervalField; + + private bool validatePasswordRequirementsOnCreateField; + + private bool validatePasswordRequirementsOnEditField; + + private System.Nullable defaultPrivilegedAccountSecretIdField; + + private int basicHomeDisplayFieldIdField; + + private System.Nullable oneTimePasswordEnabledField; + + private System.Nullable oneTimePasswordHashModeField; + + private System.Nullable oneTimePasswordDurationSecondsField; + + private System.Nullable oneTimePasswordCodeLengthField; + + private System.Nullable secretCountField; + + /// + public string SecretTypeDescription { + get { + return this.secretTypeDescriptionField; + } + set { + this.secretTypeDescriptionField = value; + } + } + + /// + public int TypeID { + get { + return this.typeIDField; + } + set { + this.typeIDField = value; + } + } + + /// + public int RPCRetryInterval { + get { + return this.rPCRetryIntervalField; + } + set { + this.rPCRetryIntervalField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RPCMaxAttempts { + get { + return this.rPCMaxAttemptsField; + } + set { + this.rPCMaxAttemptsField = value; + } + } + + /// + public bool LauncherTypeReady { + get { + return this.launcherTypeReadyField; + } + set { + this.launcherTypeReadyField = value; + } + } + + /// + public bool EnableHeartBeat { + get { + return this.enableHeartBeatField; + } + set { + this.enableHeartBeatField = value; + } + } + + /// + public int SecretNameHistoryLength { + get { + return this.secretNameHistoryLengthField; + } + set { + this.secretNameHistoryLengthField = value; + } + } + + /// + public string NamePattern { + get { + return this.namePatternField; + } + set { + this.namePatternField = value; + } + } + + /// + public string NamePatternErrorMessage { + get { + return this.namePatternErrorMessageField; + } + set { + this.namePatternErrorMessageField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int OrganizationId { + get { + return this.organizationIdField; + } + set { + this.organizationIdField = value; + } + } + + /// + public int ExpirationFieldId { + get { + return this.expirationFieldIdField; + } + set { + this.expirationFieldIdField = value; + } + } + + /// + public int ExpirationDays { + get { + return this.expirationDaysField; + } + set { + this.expirationDaysField = value; + } + } + + /// + public int PasswordTypeId { + get { + return this.passwordTypeIdField; + } + set { + this.passwordTypeIdField = value; + } + } + + /// + public bool PasswordTypeReady { + get { + return this.passwordTypeReadyField; + } + set { + this.passwordTypeReadyField = value; + } + } + + /// + public string ImageClass { + get { + return this.imageClassField; + } + set { + this.imageClassField = value; + } + } + + /// + public int HeartBeatCheckInterval { + get { + return this.heartBeatCheckIntervalField; + } + set { + this.heartBeatCheckIntervalField = value; + } + } + + /// + public bool ValidatePasswordRequirementsOnCreate { + get { + return this.validatePasswordRequirementsOnCreateField; + } + set { + this.validatePasswordRequirementsOnCreateField = value; + } + } + + /// + public bool ValidatePasswordRequirementsOnEdit { + get { + return this.validatePasswordRequirementsOnEditField; + } + set { + this.validatePasswordRequirementsOnEditField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DefaultPrivilegedAccountSecretId { + get { + return this.defaultPrivilegedAccountSecretIdField; + } + set { + this.defaultPrivilegedAccountSecretIdField = value; + } + } + + /// + public int BasicHomeDisplayFieldId { + get { + return this.basicHomeDisplayFieldIdField; + } + set { + this.basicHomeDisplayFieldIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordEnabled { + get { + return this.oneTimePasswordEnabledField; + } + set { + this.oneTimePasswordEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordHashMode { + get { + return this.oneTimePasswordHashModeField; + } + set { + this.oneTimePasswordHashModeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordDurationSeconds { + get { + return this.oneTimePasswordDurationSecondsField; + } + set { + this.oneTimePasswordDurationSecondsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordCodeLength { + get { + return this.oneTimePasswordCodeLengthField; + } + set { + this.oneTimePasswordCodeLengthField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretCount { + get { + return this.secretCountField; + } + set { + this.secretCountField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretType))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class TrackChanges { + + private bool hasBeenDeletedField; + + private object storageField; + + /// + public bool HasBeenDeleted { + get { + return this.hasBeenDeletedField; + } + set { + this.hasBeenDeletedField = value; + } + } + + /// + public object Storage { + get { + return this.storageField; + } + set { + this.storageField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetNewRequest { + + private string folderNameField; + + private System.Nullable parentFolderIdField; + + private System.Nullable inheritPermissionsField; + + /// + public string FolderName { + get { + return this.folderNameField; + } + set { + this.folderNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ParentFolderId { + get { + return this.parentFolderIdField; + } + set { + this.parentFolderIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissions { + get { + return this.inheritPermissionsField; + } + set { + this.inheritPermissionsField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedGetNewResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedUpdateResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedGetResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedCreateResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedResultBase { + + private bool successField; + + private string[] errorsField; + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetNewResult : FolderExtendedResultBase { + + private FolderExtended folderField; + + /// + public FolderExtended Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedUpdateResult : FolderExtendedResultBase { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetResult : FolderExtendedResultBase { + + private FolderExtended folderField; + + /// + public FolderExtended Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedCreateResult : FolderExtendedResultBase { + + private int folderIdField; + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFoldersResult { + + private Folder[] foldersField; + + private string[] errorsField; + + private bool successField; + + /// + public Folder[] Folders { + get { + return this.foldersField; + } + set { + this.foldersField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFolderResult { + + private Folder folderField; + + private string[] errorsField; + + private bool successField; + + /// + public Folder Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class VersionGetResult { + + private string[] errorsField; + + private string versionField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GeneratePasswordResult { + + private string generatedPasswordField; + + private string[] errorsField; + + /// + public string GeneratedPassword { + get { + return this.generatedPasswordField; + } + set { + this.generatedPasswordField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretTemplate { + + private int idField; + + private string nameField; + + private SecretField[] fieldsField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public SecretField[] Fields { + get { + return this.fieldsField; + } + set { + this.fieldsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretField { + + private string displayNameField; + + private int idField; + + private bool isPasswordField; + + private bool isUrlField; + + private bool isNotesField; + + private bool isFileField; + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public bool IsPassword { + get { + return this.isPasswordField; + } + set { + this.isPasswordField = value; + } + } + + /// + public bool IsUrl { + get { + return this.isUrlField; + } + set { + this.isUrlField = value; + } + } + + /// + public bool IsNotes { + get { + return this.isNotesField; + } + set { + this.isNotesField = value; + } + } + + /// + public bool IsFile { + get { + return this.isFileField; + } + set { + this.isFileField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretTemplatesResult { + + private string[] errorsField; + + private SecretTemplate[] secretTemplatesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretTemplate[] SecretTemplates { + get { + return this.secretTemplatesField; + } + set { + this.secretTemplatesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretTemplateFieldsResult { + + private string[] errorsField; + + private SecretField[] fieldsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretField[] Fields { + get { + return this.fieldsField; + } + set { + this.fieldsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AddSecretResult { + + private string[] errorsField; + + private Secret secretField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Secret { + + private string nameField; + + private SecretItem[] itemsField; + + private int idField; + + private int secretTypeIdField; + + private int folderIdField; + + private bool isWebLauncherField; + + private System.Nullable checkOutMinutesRemainingField; + + private System.Nullable isCheckedOutField; + + private string checkOutUserDisplayNameField; + + private System.Nullable checkOutUserIdField; + + private System.Nullable isOutOfSyncField; + + private System.Nullable isRestrictedField; + + private string outOfSyncReasonField; + + private SecretSettings secretSettingsField; + + private SecretPermissions secretPermissionsField; + + private System.Nullable activeField; + + private bool activeFieldSpecified; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public SecretItem[] Items { + get { + return this.itemsField; + } + set { + this.itemsField = value; + } + } + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public int SecretTypeId { + get { + return this.secretTypeIdField; + } + set { + this.secretTypeIdField = value; + } + } + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + + /// + public bool IsWebLauncher { + get { + return this.isWebLauncherField; + } + set { + this.isWebLauncherField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutMinutesRemaining { + get { + return this.checkOutMinutesRemainingField; + } + set { + this.checkOutMinutesRemainingField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsCheckedOut { + get { + return this.isCheckedOutField; + } + set { + this.isCheckedOutField = value; + } + } + + /// + public string CheckOutUserDisplayName { + get { + return this.checkOutUserDisplayNameField; + } + set { + this.checkOutUserDisplayNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutUserId { + get { + return this.checkOutUserIdField; + } + set { + this.checkOutUserIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsOutOfSync { + get { + return this.isOutOfSyncField; + } + set { + this.isOutOfSyncField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsRestricted { + get { + return this.isRestrictedField; + } + set { + this.isRestrictedField = value; + } + } + + /// + public string OutOfSyncReason { + get { + return this.outOfSyncReasonField; + } + set { + this.outOfSyncReasonField = value; + } + } + + /// + public SecretSettings SecretSettings { + get { + return this.secretSettingsField; + } + set { + this.secretSettingsField = value; + } + } + + /// + public SecretPermissions SecretPermissions { + get { + return this.secretPermissionsField; + } + set { + this.secretPermissionsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ActiveSpecified { + get { + return this.activeFieldSpecified; + } + set { + this.activeFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItem { + + private string valueField; + + private System.Nullable idField; + + private System.Nullable fieldIdField; + + private string fieldNameField; + + private bool isFileField; + + private bool isNotesField; + + private bool isPasswordField; + + private string fieldDisplayNameField; + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable FieldId { + get { + return this.fieldIdField; + } + set { + this.fieldIdField = value; + } + } + + /// + public string FieldName { + get { + return this.fieldNameField; + } + set { + this.fieldNameField = value; + } + } + + /// + public bool IsFile { + get { + return this.isFileField; + } + set { + this.isFileField = value; + } + } + + /// + public bool IsNotes { + get { + return this.isNotesField; + } + set { + this.isNotesField = value; + } + } + + /// + public bool IsPassword { + get { + return this.isPasswordField; + } + set { + this.isPasswordField = value; + } + } + + /// + public string FieldDisplayName { + get { + return this.fieldDisplayNameField; + } + set { + this.fieldDisplayNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretSettings { + + private System.Nullable autoChangeEnabledField; + + private System.Nullable requiresApprovalForAccessField; + + private System.Nullable requiresCommentField; + + private System.Nullable checkOutEnabledField; + + private System.Nullable checkOutChangePasswordEnabledField; + + private System.Nullable proxyEnabledField; + + private System.Nullable sessionRecordingEnabledField; + + private System.Nullable restrictSshCommandsField; + + private System.Nullable allowOwnersUnrestrictedSshCommandsField; + + private System.Nullable privilegedSecretIdField; + + private int[] associatedSecretIdsField; + + private GroupOrUserRecord[] approversField; + + private SshCommandMenuAccessPermission[] sshCommandMenuAccessPermissionsField; + + private bool isChangeToSettingsField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable AutoChangeEnabled { + get { + return this.autoChangeEnabledField; + } + set { + this.autoChangeEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RequiresApprovalForAccess { + get { + return this.requiresApprovalForAccessField; + } + set { + this.requiresApprovalForAccessField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RequiresComment { + get { + return this.requiresCommentField; + } + set { + this.requiresCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutEnabled { + get { + return this.checkOutEnabledField; + } + set { + this.checkOutEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutChangePasswordEnabled { + get { + return this.checkOutChangePasswordEnabledField; + } + set { + this.checkOutChangePasswordEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ProxyEnabled { + get { + return this.proxyEnabledField; + } + set { + this.proxyEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SessionRecordingEnabled { + get { + return this.sessionRecordingEnabledField; + } + set { + this.sessionRecordingEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RestrictSshCommands { + get { + return this.restrictSshCommandsField; + } + set { + this.restrictSshCommandsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable AllowOwnersUnrestrictedSshCommands { + get { + return this.allowOwnersUnrestrictedSshCommandsField; + } + set { + this.allowOwnersUnrestrictedSshCommandsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable PrivilegedSecretId { + get { + return this.privilegedSecretIdField; + } + set { + this.privilegedSecretIdField = value; + } + } + + /// + public int[] AssociatedSecretIds { + get { + return this.associatedSecretIdsField; + } + set { + this.associatedSecretIdsField = value; + } + } + + /// + public GroupOrUserRecord[] Approvers { + get { + return this.approversField; + } + set { + this.approversField = value; + } + } + + /// + public SshCommandMenuAccessPermission[] SshCommandMenuAccessPermissions { + get { + return this.sshCommandMenuAccessPermissionsField; + } + set { + this.sshCommandMenuAccessPermissionsField = value; + } + } + + /// + public bool IsChangeToSettings { + get { + return this.isChangeToSettingsField; + } + set { + this.isChangeToSettingsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenuAccessPermission { + + private GroupOrUserRecord groupOrUserRecordField; + + private int secretIdField; + + private string concurrencyIdField; + + private string displayNameField; + + private string sshCommandMenuNameField; + + private bool isUnrestrictedField; + + private System.Nullable sshCommandMenuIdField; + + /// + public GroupOrUserRecord GroupOrUserRecord { + get { + return this.groupOrUserRecordField; + } + set { + this.groupOrUserRecordField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string ConcurrencyId { + get { + return this.concurrencyIdField; + } + set { + this.concurrencyIdField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public string SshCommandMenuName { + get { + return this.sshCommandMenuNameField; + } + set { + this.sshCommandMenuNameField = value; + } + } + + /// + public bool IsUnrestricted { + get { + return this.isUnrestrictedField; + } + set { + this.isUnrestrictedField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPermissions { + + private bool currentUserHasViewField; + + private bool currentUserHasEditField; + + private bool currentUserHasOwnerField; + + private System.Nullable inheritPermissionsEnabledField; + + private bool isChangeToPermissionsField; + + private Permission[] permissionsField; + + /// + public bool CurrentUserHasView { + get { + return this.currentUserHasViewField; + } + set { + this.currentUserHasViewField = value; + } + } + + /// + public bool CurrentUserHasEdit { + get { + return this.currentUserHasEditField; + } + set { + this.currentUserHasEditField = value; + } + } + + /// + public bool CurrentUserHasOwner { + get { + return this.currentUserHasOwnerField; + } + set { + this.currentUserHasOwnerField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissionsEnabled { + get { + return this.inheritPermissionsEnabledField; + } + set { + this.inheritPermissionsEnabledField = value; + } + } + + /// + public bool IsChangeToPermissions { + get { + return this.isChangeToPermissionsField; + } + set { + this.isChangeToPermissionsField = value; + } + } + + /// + public Permission[] Permissions { + get { + return this.permissionsField; + } + set { + this.permissionsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Permission { + + private GroupOrUserRecord userOrGroupField; + + private bool viewField; + + private bool editField; + + private bool ownerField; + + private string secretAccessRoleNameField; + + private System.Nullable secretAccessRoleIdField; + + /// + public GroupOrUserRecord UserOrGroup { + get { + return this.userOrGroupField; + } + set { + this.userOrGroupField = value; + } + } + + /// + public bool View { + get { + return this.viewField; + } + set { + this.viewField = value; + } + } + + /// + public bool Edit { + get { + return this.editField; + } + set { + this.editField = value; + } + } + + /// + public bool Owner { + get { + return this.ownerField; + } + set { + this.ownerField = value; + } + } + + /// + public string SecretAccessRoleName { + get { + return this.secretAccessRoleNameField; + } + set { + this.secretAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretAccessRoleId { + get { + return this.secretAccessRoleIdField; + } + set { + this.secretAccessRoleIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFavoritesResult { + + private string[] errorsField; + + private SecretSummary[] secretSummariesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretSummary[] SecretSummaries { + get { + return this.secretSummariesField; + } + set { + this.secretSummariesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretSummary { + + private int secretIdField; + + private string secretNameField; + + private string secretTypeNameField; + + private int secretTypeIdField; + + private int folderIdField; + + private bool isRestrictedField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string SecretName { + get { + return this.secretNameField; + } + set { + this.secretNameField = value; + } + } + + /// + public string SecretTypeName { + get { + return this.secretTypeNameField; + } + set { + this.secretTypeNameField = value; + } + } + + /// + public int SecretTypeId { + get { + return this.secretTypeIdField; + } + set { + this.secretTypeIdField = value; + } + } + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + + /// + public bool IsRestricted { + get { + return this.isRestrictedField; + } + set { + this.isRestrictedField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchSecretsResult { + + private string[] errorsField; + + private SecretSummary[] secretSummariesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretSummary[] SecretSummaries { + get { + return this.secretSummariesField; + } + set { + this.secretSummariesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretsByFieldValueResult { + + private string[] errorsField; + + private Secret[] secretsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret[] Secrets { + get { + return this.secretsField; + } + set { + this.secretsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlScriptArgument2 { + + private string nameField; + + private object valueField; + + private DbType dbTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public object Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public DbType DbType { + get { + return this.dbTypeField; + } + set { + this.dbTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDataSqlObject { + + private SqlScriptArgument2[] paramsField; + + private int passwordChangerIdField; + + private int versionField; + + private string databaseField; + + private string portField; + + /// + public SqlScriptArgument2[] Params { + get { + return this.paramsField; + } + set { + this.paramsField = value; + } + } + + /// + public int PasswordChangerId { + get { + return this.passwordChangerIdField; + } + set { + this.passwordChangerIdField = value; + } + } + + /// + public int Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + + /// + public string Database { + get { + return this.databaseField; + } + set { + this.databaseField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(PowerShellUserScript))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SshUserScript))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SqlUserScript))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public abstract partial class UserScript { + + private int scriptIdField; + + private string nameField; + + private string descriptionField; + + private string scriptField; + + private bool activeField; + + /// + public int ScriptId { + get { + return this.scriptIdField; + } + set { + this.scriptIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public string Script { + get { + return this.scriptField; + } + set { + this.scriptField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class PowerShellUserScript : UserScript { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshUserScript : UserScript { + + private AdditionalDataSshObject additionalDataObjectField; + + /// + public AdditionalDataSshObject AdditionalDataObject { + get { + return this.additionalDataObjectField; + } + set { + this.additionalDataObjectField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlUserScript : UserScript { + + private AdditionalDataSqlObject additionalDataObjectField; + + /// + public AdditionalDataSqlObject AdditionalDataObject { + get { + return this.additionalDataObjectField; + } + set { + this.additionalDataObjectField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenuGroupMap { + + private System.Nullable sshCommandMenuIdField; + + private UserGroupMap userGroupMapField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + + /// + public UserGroupMap UserGroupMap { + get { + return this.userGroupMapField; + } + set { + this.userGroupMapField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UserGroupMap { + + private int idField; + + private UserGroupMapType userGroupMapTypeField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public UserGroupMapType UserGroupMapType { + get { + return this.userGroupMapTypeField; + } + set { + this.userGroupMapTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum UserGroupMapType { + + /// + User, + + /// + Group, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyItem { + + private int secretPolicyItemMapIdField; + + private int secretPolicyItemIdField; + + private string policyApplyCodeField; + + private System.Nullable enabledValueField; + + private System.Nullable integerValueField; + + private System.Nullable secretIdField; + + private string stringValueField; + + private string nameField; + + private string descriptionField; + + private string valueTypeField; + + private System.Nullable parentSecretPolicyItemIdField; + + private string sectionNameField; + + private UserGroupMap[] userGroupMapsField; + + private SshCommandMenuGroupMap[] sshCommandMenuGroupMapsField; + + /// + public int SecretPolicyItemMapId { + get { + return this.secretPolicyItemMapIdField; + } + set { + this.secretPolicyItemMapIdField = value; + } + } + + /// + public int SecretPolicyItemId { + get { + return this.secretPolicyItemIdField; + } + set { + this.secretPolicyItemIdField = value; + } + } + + /// + public string PolicyApplyCode { + get { + return this.policyApplyCodeField; + } + set { + this.policyApplyCodeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable EnabledValue { + get { + return this.enabledValueField; + } + set { + this.enabledValueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IntegerValue { + get { + return this.integerValueField; + } + set { + this.integerValueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string StringValue { + get { + return this.stringValueField; + } + set { + this.stringValueField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public string ValueType { + get { + return this.valueTypeField; + } + set { + this.valueTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ParentSecretPolicyItemId { + get { + return this.parentSecretPolicyItemIdField; + } + set { + this.parentSecretPolicyItemIdField = value; + } + } + + /// + public string SectionName { + get { + return this.sectionNameField; + } + set { + this.sectionNameField = value; + } + } + + /// + public UserGroupMap[] UserGroupMaps { + get { + return this.userGroupMapsField; + } + set { + this.userGroupMapsField = value; + } + } + + /// + public SshCommandMenuGroupMap[] SshCommandMenuGroupMaps { + get { + return this.sshCommandMenuGroupMapsField; + } + set { + this.sshCommandMenuGroupMapsField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyDetail))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicySummary { + + private int secretPolicyIdField; + + private string secretPolicyNameField; + + private string secretPolicyDescriptionField; + + private bool activeField; + + /// + public int SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public string SecretPolicyName { + get { + return this.secretPolicyNameField; + } + set { + this.secretPolicyNameField = value; + } + } + + /// + public string SecretPolicyDescription { + get { + return this.secretPolicyDescriptionField; + } + set { + this.secretPolicyDescriptionField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyDetail : SecretPolicySummary { + + private SecretPolicyItem[] secretPolicyItemsField; + + /// + public SecretPolicyItem[] SecretPolicyItems { + get { + return this.secretPolicyItemsField; + } + set { + this.secretPolicyItemsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyForSecret { + + private int secretIdField; + + private System.Nullable secretPolicyIdField; + + private bool inheritField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public bool Inherit { + get { + return this.inheritField; + } + set { + this.inheritField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(UpdateUserScriptResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GetUserScriptResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GetUserScriptsResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchSecretPoliciesResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyForSecretResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SSHCredentialsResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FileDownloadResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(CreateFolderResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class WebServiceResult { + + private string[] errorsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UpdateUserScriptResult : WebServiceResult { + + private UserScript userScriptField; + + /// + public UserScript UserScript { + get { + return this.userScriptField; + } + set { + this.userScriptField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserScriptResult : WebServiceResult { + + private UserScript userScriptField; + + /// + public UserScript UserScript { + get { + return this.userScriptField; + } + set { + this.userScriptField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserScriptsResult : WebServiceResult { + + private UserScript[] userScriptsField; + + /// + public UserScript[] UserScripts { + get { + return this.userScriptsField; + } + set { + this.userScriptsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyResult : WebServiceResult { + + private SecretPolicyDetail secretPolicyField; + + /// + public SecretPolicyDetail SecretPolicy { + get { + return this.secretPolicyField; + } + set { + this.secretPolicyField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchSecretPoliciesResult : WebServiceResult { + + private SecretPolicySummary[] secretPoliciesField; + + /// + public SecretPolicySummary[] SecretPolicies { + get { + return this.secretPoliciesField; + } + set { + this.secretPoliciesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyForSecretResult : WebServiceResult { + + private SecretPolicyForSecret secretPolicyForSecretField; + + /// + public SecretPolicyForSecret SecretPolicyForSecret { + get { + return this.secretPolicyForSecretField; + } + set { + this.secretPolicyForSecretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SSHCredentialsResult : WebServiceResult { + + private string usernameField; + + private string passwordField; + + private string hostField; + + private string portField; + + /// + public string Username { + get { + return this.usernameField; + } + set { + this.usernameField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + public string Host { + get { + return this.hostField; + } + set { + this.hostField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FileDownloadResult : WebServiceResult { + + private byte[] fileAttachmentField; + + private string fileNameField; + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] FileAttachment { + get { + return this.fileAttachmentField; + } + set { + this.fileAttachmentField = value; + } + } + + /// + public string FileName { + get { + return this.fileNameField; + } + set { + this.fileNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class CreateFolderResult : WebServiceResult { + + private int folderIdField; + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetCheckOutStatusResult { + + private string[] errorsField; + + private Secret secretField; + + private int checkOutMinutesRemainingField; + + private bool isCheckedOutField; + + private string checkOutUserDisplayNameField; + + private int checkOutUserIdField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + + /// + public int CheckOutMinutesRemaining { + get { + return this.checkOutMinutesRemainingField; + } + set { + this.checkOutMinutesRemainingField = value; + } + } + + /// + public bool IsCheckedOut { + get { + return this.isCheckedOutField; + } + set { + this.isCheckedOutField = value; + } + } + + /// + public string CheckOutUserDisplayName { + get { + return this.checkOutUserDisplayNameField; + } + set { + this.checkOutUserDisplayNameField = value; + } + } + + /// + public int CheckOutUserId { + get { + return this.checkOutUserIdField; + } + set { + this.checkOutUserIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class CodeResponse { + + private string errorCodeField; + + private string commentField; + + private string additionalCommentField; + + private System.Nullable ticketSystemIdField; + + /// + public string ErrorCode { + get { + return this.errorCodeField; + } + set { + this.errorCodeField = value; + } + } + + /// + public string Comment { + get { + return this.commentField; + } + set { + this.commentField = value; + } + } + + /// + public string AdditionalComment { + get { + return this.additionalCommentField; + } + set { + this.additionalCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable TicketSystemId { + get { + return this.ticketSystemIdField; + } + set { + this.ticketSystemIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretError { + + private string errorCodeField; + + private string errorMessageField; + + private bool allowsResponseField; + + private string commentTitleField; + + private string additionalCommentTitleField; + + /// + public string ErrorCode { + get { + return this.errorCodeField; + } + set { + this.errorCodeField = value; + } + } + + /// + public string ErrorMessage { + get { + return this.errorMessageField; + } + set { + this.errorMessageField = value; + } + } + + /// + public bool AllowsResponse { + get { + return this.allowsResponseField; + } + set { + this.allowsResponseField = value; + } + } + + /// + public string CommentTitle { + get { + return this.commentTitleField; + } + set { + this.commentTitleField = value; + } + } + + /// + public string AdditionalCommentTitle { + get { + return this.additionalCommentTitleField; + } + set { + this.additionalCommentTitleField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretResult { + + private string[] errorsField; + + private SecretError secretErrorField; + + private Secret secretField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretError SecretError { + get { + return this.secretErrorField; + } + set { + this.secretErrorField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class TokenIsValidResult { + + private string[] errorsField; + + private int maxOfflineSecondsField; + + private string versionField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public int MaxOfflineSeconds { + get { + return this.maxOfflineSecondsField; + } + set { + this.maxOfflineSecondsField = value; + } + } + + /// + public string Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class ImpersonateResult { + + private string[] errorsField; + + private string tokenField; + + private string authorizeURLField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string Token { + get { + return this.tokenField; + } + set { + this.tokenField = value; + } + } + + /// + public string AuthorizeURL { + get { + return this.authorizeURLField; + } + set { + this.authorizeURLField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AuthenticateResult { + + private string[] errorsField; + + private string tokenField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string Token { + get { + return this.tokenField; + } + set { + this.tokenField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(RequestApprovalResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GenericResult { + + private string errorMessageField; + + private string[] debugMessagesField; + + /// + public string ErrorMessage { + get { + return this.errorMessageField; + } + set { + this.errorMessageField = value; + } + } + + /// + public string[] DebugMessages { + get { + return this.debugMessagesField; + } + set { + this.debugMessagesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ApproveSecretAccessRequestCompletedEventHandler(object sender, ApproveSecretAccessRequestCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ApproveSecretAccessRequestCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ApproveSecretAccessRequestCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public RequestApprovalResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((RequestApprovalResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DenySecretAccessRequestCompletedEventHandler(object sender, DenySecretAccessRequestCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DenySecretAccessRequestCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DenySecretAccessRequestCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public RequestApprovalResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((RequestApprovalResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AuthenticateCompletedEventHandler(object sender, AuthenticateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AuthenticateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AuthenticateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AuthenticateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AuthenticateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ImpersonateUserCompletedEventHandler(object sender, ImpersonateUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ImpersonateUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ImpersonateUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public ImpersonateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((ImpersonateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AuthenticateRADIUSCompletedEventHandler(object sender, AuthenticateRADIUSCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AuthenticateRADIUSCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AuthenticateRADIUSCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AuthenticateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AuthenticateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetTokenIsValidCompletedEventHandler(object sender, GetTokenIsValidCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetTokenIsValidCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetTokenIsValidCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public TokenIsValidResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((TokenIsValidResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretLegacyCompletedEventHandler(object sender, GetSecretLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretCompletedEventHandler(object sender, GetSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetCheckOutStatusCompletedEventHandler(object sender, GetCheckOutStatusCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetCheckOutStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetCheckOutStatusCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetCheckOutStatusResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetCheckOutStatusResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ChangePasswordCompletedEventHandler(object sender, ChangePasswordCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ChangePasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ChangePasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretsByFieldValueCompletedEventHandler(object sender, GetSecretsByFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretsByFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretsByFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretsByFieldValueResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretsByFieldValueResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFieldValueCompletedEventHandler(object sender, SearchSecretsByFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretsByExposedFieldValueCompletedEventHandler(object sender, GetSecretsByExposedFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretsByExposedFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretsByExposedFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretsByFieldValueResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretsByFieldValueResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByExposedFieldValueCompletedEventHandler(object sender, SearchSecretsByExposedFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByExposedFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByExposedFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByExposedValuesCompletedEventHandler(object sender, SearchSecretsByExposedValuesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByExposedValuesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByExposedValuesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddUserCompletedEventHandler(object sender, AddUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsCompletedEventHandler(object sender, SearchSecretsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsLegacyCompletedEventHandler(object sender, SearchSecretsLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFolderCompletedEventHandler(object sender, SearchSecretsByFolderCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFolderLegacyCompletedEventHandler(object sender, SearchSecretsByFolderLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFolderLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFolderLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetFavoritesCompletedEventHandler(object sender, GetFavoritesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetFavoritesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetFavoritesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFavoritesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFavoritesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateIsFavoriteCompletedEventHandler(object sender, UpdateIsFavoriteCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateIsFavoriteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateIsFavoriteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretCompletedEventHandler(object sender, AddSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AddSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AddSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddNewSecretCompletedEventHandler(object sender, AddNewSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddNewSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddNewSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AddSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AddSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetNewSecretCompletedEventHandler(object sender, GetNewSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetNewSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetNewSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretTemplateFieldsCompletedEventHandler(object sender, GetSecretTemplateFieldsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretTemplateFieldsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretTemplateFieldsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretTemplateFieldsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretTemplateFieldsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateSecretCompletedEventHandler(object sender, UpdateSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretTemplatesCompletedEventHandler(object sender, GetSecretTemplatesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretTemplatesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretTemplatesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretTemplatesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretTemplatesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GeneratePasswordCompletedEventHandler(object sender, GeneratePasswordCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GeneratePasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GeneratePasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GeneratePasswordResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GeneratePasswordResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DeactivateSecretCompletedEventHandler(object sender, DeactivateSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DeactivateSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DeactivateSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void VersionGetCompletedEventHandler(object sender, VersionGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class VersionGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal VersionGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public VersionGetResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((VersionGetResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderGetCompletedEventHandler(object sender, FolderGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderUpdateCompletedEventHandler(object sender, FolderUpdateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderUpdateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderGetAllChildrenCompletedEventHandler(object sender, FolderGetAllChildrenCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderGetAllChildrenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderGetAllChildrenCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFoldersResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFoldersResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderCreateCompletedEventHandler(object sender, FolderCreateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderCreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderCreateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public CreateFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((CreateFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedCreateCompletedEventHandler(object sender, FolderExtendedCreateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedCreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedCreateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedCreateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedCreateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedGetCompletedEventHandler(object sender, FolderExtendedGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedGetResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedGetResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedUpdateCompletedEventHandler(object sender, FolderExtendedUpdateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedUpdateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedUpdateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedUpdateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedGetNewCompletedEventHandler(object sender, FolderExtendedGetNewCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedGetNewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedGetNewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedGetNewResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedGetNewResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchFoldersCompletedEventHandler(object sender, SearchFoldersCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DownloadFileAttachmentCompletedEventHandler(object sender, DownloadFileAttachmentCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DownloadFileAttachmentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DownloadFileAttachmentCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FileDownloadResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FileDownloadResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DownloadFileAttachmentByItemIdCompletedEventHandler(object sender, DownloadFileAttachmentByItemIdCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DownloadFileAttachmentByItemIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DownloadFileAttachmentByItemIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FileDownloadResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FileDownloadResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UploadFileAttachmentCompletedEventHandler(object sender, UploadFileAttachmentCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UploadFileAttachmentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UploadFileAttachmentCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UploadFileAttachmentByItemIdCompletedEventHandler(object sender, UploadFileAttachmentByItemIdCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UploadFileAttachmentByItemIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UploadFileAttachmentByItemIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ExpireSecretCompletedEventHandler(object sender, ExpireSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ExpireSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ExpireSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SetCheckOutEnabledCompletedEventHandler(object sender, SetCheckOutEnabledCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SetCheckOutEnabledCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SetCheckOutEnabledCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ImportXMLCompletedEventHandler(object sender, ImportXMLCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ImportXMLCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ImportXMLCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretAuditCompletedEventHandler(object sender, GetSecretAuditCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretAuditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretAuditCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretAuditResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretAuditResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddDependencyCompletedEventHandler(object sender, AddDependencyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddDependencyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddDependencyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RemoveDependencyCompletedEventHandler(object sender, RemoveDependencyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RemoveDependencyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RemoveDependencyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDependenciesCompletedEventHandler(object sender, GetDependenciesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDependenciesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDependenciesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetDependenciesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetDependenciesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CreateDependencyGroupForSecretCompletedEventHandler(object sender, CreateDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CreateDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CreateDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDependencyGroupsForSecretCompletedEventHandler(object sender, GetDependencyGroupsForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDependencyGroupsForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDependencyGroupsForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetDependencyGroupsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetDependencyGroupsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateDependencyGroupForSecretCompletedEventHandler(object sender, UpdateDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RemoveDependencyGroupForSecretCompletedEventHandler(object sender, RemoveDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RemoveDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RemoveDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDistributedEnginesCompletedEventHandler(object sender, GetDistributedEnginesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDistributedEnginesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDistributedEnginesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSitesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSitesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetTicketSystemsCompletedEventHandler(object sender, GetTicketSystemsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetTicketSystemsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetTicketSystemsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetTicketSystemsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetTicketSystemsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignSiteCompletedEventHandler(object sender, AssignSiteCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignSiteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignSiteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CheckInCompletedEventHandler(object sender, CheckInCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CheckInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CheckInCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretCustomAuditCompletedEventHandler(object sender, AddSecretCustomAuditCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretCustomAuditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretCustomAuditCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateSecretPermissionCompletedEventHandler(object sender, UpdateSecretPermissionCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateSecretPermissionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateSecretPermissionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CheckInByKeyCompletedEventHandler(object sender, CheckInByKeyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CheckInByKeyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CheckInByKeyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void WhoAmICompletedEventHandler(object sender, WhoAmICompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class WhoAmICompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal WhoAmICompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UserInfoResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UserInfoResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllGroupsCompletedEventHandler(object sender, GetAllGroupsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllGroupsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllGroupsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetAllGroupsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetAllGroupsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignUserToGroupCompletedEventHandler(object sender, AssignUserToGroupCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignUserToGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignUserToGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHLoginCredentialsCompletedEventHandler(object sender, GetSSHLoginCredentialsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHLoginCredentialsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHLoginCredentialsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SSHCredentialsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SSHCredentialsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHLoginCredentialsWithMachineCompletedEventHandler(object sender, GetSSHLoginCredentialsWithMachineCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHLoginCredentialsWithMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHLoginCredentialsWithMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SSHCredentialsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SSHCredentialsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchUsersCompletedEventHandler(object sender, SearchUsersCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchUsersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUsersResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUsersResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetUserCompletedEventHandler(object sender, GetUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateUserCompletedEventHandler(object sender, UpdateUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UpdateUserResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UpdateUserResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretItemHistoryByFieldNameCompletedEventHandler(object sender, GetSecretItemHistoryByFieldNameCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretItemHistoryByFieldNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretItemHistoryByFieldNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretItemHistoryResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretItemHistoryResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretPolicyForSecretCompletedEventHandler(object sender, GetSecretPolicyForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretPolicyForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretPolicyForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyForSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyForSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignSecretPolicyForSecretCompletedEventHandler(object sender, AssignSecretPolicyForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignSecretPolicyForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignSecretPolicyForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyForSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyForSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretPoliciesCompletedEventHandler(object sender, SearchSecretPoliciesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretPoliciesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretPoliciesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretPoliciesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretPoliciesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RunActiveDirectorySynchronizationCompletedEventHandler(object sender, RunActiveDirectorySynchronizationCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RunActiveDirectorySynchronizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RunActiveDirectorySynchronizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddGroupToActiveDirectorySynchronizationCompletedEventHandler(object sender, AddGroupToActiveDirectorySynchronizationCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddGroupToActiveDirectorySynchronizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddGroupToActiveDirectorySynchronizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretPolicyCompletedEventHandler(object sender, AddSecretPolicyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetNewSecretPolicyCompletedEventHandler(object sender, GetNewSecretPolicyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetNewSecretPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetNewSecretPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHCommandMenuCompletedEventHandler(object sender, GetSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenuResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenuResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SaveSSHCommandMenuCompletedEventHandler(object sender, SaveSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SaveSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenuResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenuResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllSSHCommandMenusCompletedEventHandler(object sender, GetAllSSHCommandMenusCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllSSHCommandMenusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllSSHCommandMenusCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenusResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenusResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DeleteSSHCommandMenuCompletedEventHandler(object sender, DeleteSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DeleteSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DeleteSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RestoreSSHCommandMenuCompletedEventHandler(object sender, RestoreSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RestoreSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RestoreSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetReportCompletedEventHandler(object sender, GetReportCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetReportCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetReportResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetReportResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddScriptCompletedEventHandler(object sender, AddScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllScriptsCompletedEventHandler(object sender, GetAllScriptsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllScriptsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllScriptsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserScriptsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserScriptsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetScriptCompletedEventHandler(object sender, GetScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserScriptResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserScriptResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateScriptCompletedEventHandler(object sender, UpdateScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UpdateUserScriptResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UpdateUserScriptResult)(this.results[0])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/Reference.map b/SecretServerInterface/Web References/SSWebService/Reference.map new file mode 100644 index 000000000..a1de00dc8 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/Reference.map @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/RequestApprovalResult1.datasource b/SecretServerInterface/Web References/SSWebService/RequestApprovalResult1.datasource new file mode 100644 index 000000000..b6f56e3aa --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/RequestApprovalResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.RequestApprovalResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SSHCredentialsResult1.datasource b/SecretServerInterface/Web References/SSWebService/SSHCredentialsResult1.datasource new file mode 100644 index 000000000..a941e9493 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SSHCredentialsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SSHCredentialsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SSWebService.disco b/SecretServerInterface/Web References/SSWebService/SSWebService.disco new file mode 100644 index 000000000..8fbba74f8 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SSWebService.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SSWebService.wsdl b/SecretServerInterface/Web References/SSWebService/SSWebService.wsdl new file mode 100644 index 000000000..cdcebf84b --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SSWebService.wsdl @@ -0,0 +1,7624 @@ + + + Webservice for standard integration. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Webservice for standard integration. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SearchFolderResult1.datasource b/SecretServerInterface/Web References/SSWebService/SearchFolderResult1.datasource new file mode 100644 index 000000000..88353a767 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SearchFolderResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SearchFolderResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SearchSecretPoliciesResult1.datasource b/SecretServerInterface/Web References/SSWebService/SearchSecretPoliciesResult1.datasource new file mode 100644 index 000000000..ac8ee5026 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SearchSecretPoliciesResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SearchSecretPoliciesResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SearchSecretsResult1.datasource b/SecretServerInterface/Web References/SSWebService/SearchSecretsResult1.datasource new file mode 100644 index 000000000..b135e6465 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SearchSecretsResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SearchSecretsResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SecretItemHistoryResult1.datasource b/SecretServerInterface/Web References/SSWebService/SecretItemHistoryResult1.datasource new file mode 100644 index 000000000..d158f8712 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SecretItemHistoryResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SecretItemHistoryResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SecretPolicyForSecretResult1.datasource b/SecretServerInterface/Web References/SSWebService/SecretPolicyForSecretResult1.datasource new file mode 100644 index 000000000..05e7a6a6c --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SecretPolicyForSecretResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SecretPolicyForSecretResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/SecretPolicyResult1.datasource b/SecretServerInterface/Web References/SSWebService/SecretPolicyResult1.datasource new file mode 100644 index 000000000..b8cd5f0fb --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/SecretPolicyResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.SecretPolicyResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/TokenIsValidResult1.datasource b/SecretServerInterface/Web References/SSWebService/TokenIsValidResult1.datasource new file mode 100644 index 000000000..1f9946eda --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/TokenIsValidResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.TokenIsValidResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/UpdateUserResult1.datasource b/SecretServerInterface/Web References/SSWebService/UpdateUserResult1.datasource new file mode 100644 index 000000000..712954295 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/UpdateUserResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.UpdateUserResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/UpdateUserScriptResult1.datasource b/SecretServerInterface/Web References/SSWebService/UpdateUserScriptResult1.datasource new file mode 100644 index 000000000..ae2d474f0 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/UpdateUserScriptResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.UpdateUserScriptResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/UserInfoResult1.datasource b/SecretServerInterface/Web References/SSWebService/UserInfoResult1.datasource new file mode 100644 index 000000000..14076ec57 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/UserInfoResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.UserInfoResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/VersionGetResult1.datasource b/SecretServerInterface/Web References/SSWebService/VersionGetResult1.datasource new file mode 100644 index 000000000..234898b35 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/VersionGetResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.VersionGetResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebService/WebServiceResult1.datasource b/SecretServerInterface/Web References/SSWebService/WebServiceResult1.datasource new file mode 100644 index 000000000..181fe7645 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebService/WebServiceResult1.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebService.WebServiceResult, Web References.SSWebService.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/AddSecretResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/AddSecretResult.datasource new file mode 100644 index 000000000..7add67272 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/AddSecretResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.AddSecretResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/CreateFolderResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/CreateFolderResult.datasource new file mode 100644 index 000000000..6dfb12e6f --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/CreateFolderResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.CreateFolderResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/FileDownloadResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/FileDownloadResult.datasource new file mode 100644 index 000000000..f0be88ffd --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/FileDownloadResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.FileDownloadResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedCreateResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedCreateResult.datasource new file mode 100644 index 000000000..8887b5cc2 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedCreateResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.FolderExtendedCreateResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetNewResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetNewResult.datasource new file mode 100644 index 000000000..afcf31541 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetNewResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.FolderExtendedGetNewResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetResult.datasource new file mode 100644 index 000000000..14c22bc24 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedGetResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.FolderExtendedGetResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedUpdateResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedUpdateResult.datasource new file mode 100644 index 000000000..4269dd569 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/FolderExtendedUpdateResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.FolderExtendedUpdateResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GeneratePasswordResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GeneratePasswordResult.datasource new file mode 100644 index 000000000..63a948315 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GeneratePasswordResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GeneratePasswordResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetAllGroupsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetAllGroupsResult.datasource new file mode 100644 index 000000000..ae384787b --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetAllGroupsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetAllGroupsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetCheckOutStatusResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetCheckOutStatusResult.datasource new file mode 100644 index 000000000..9ad96f054 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetCheckOutStatusResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetCheckOutStatusResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependenciesResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependenciesResult.datasource new file mode 100644 index 000000000..a538a8aaf --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependenciesResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetDependenciesResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependencyGroupsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependencyGroupsResult.datasource new file mode 100644 index 000000000..511f1cc66 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetDependencyGroupsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetDependencyGroupsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFavoritesResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFavoritesResult.datasource new file mode 100644 index 000000000..8de37c3a5 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFavoritesResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetFavoritesResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFolderResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFolderResult.datasource new file mode 100644 index 000000000..a79b19aaa --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFolderResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetFolderResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFoldersResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFoldersResult.datasource new file mode 100644 index 000000000..5eda15c23 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetFoldersResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetFoldersResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetReportResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetReportResult.datasource new file mode 100644 index 000000000..13ca4aeaf --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetReportResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetReportResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretAuditResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretAuditResult.datasource new file mode 100644 index 000000000..72593ee8d --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretAuditResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSecretAuditResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretResult.datasource new file mode 100644 index 000000000..5bb8378d5 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSecretResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplateFieldsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplateFieldsResult.datasource new file mode 100644 index 000000000..aa3dcceaa --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplateFieldsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSecretTemplateFieldsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplatesResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplatesResult.datasource new file mode 100644 index 000000000..b8e1e6e90 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretTemplatesResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSecretTemplatesResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretsByFieldValueResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretsByFieldValueResult.datasource new file mode 100644 index 000000000..797fe7c42 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSecretsByFieldValueResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSecretsByFieldValueResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSitesResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSitesResult.datasource new file mode 100644 index 000000000..adab4b087 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSitesResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSitesResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenuResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenuResult.datasource new file mode 100644 index 000000000..56d1dacdb --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenuResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSshCommandMenuResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenusResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenusResult.datasource new file mode 100644 index 000000000..f45fe95ec --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetSshCommandMenusResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetSshCommandMenusResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetTicketSystemsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetTicketSystemsResult.datasource new file mode 100644 index 000000000..47f5e530f --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetTicketSystemsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetTicketSystemsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserResult.datasource new file mode 100644 index 000000000..b92f84564 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetUserResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptResult.datasource new file mode 100644 index 000000000..51a279233 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetUserScriptResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptsResult.datasource new file mode 100644 index 000000000..76f9980e1 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUserScriptsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetUserScriptsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUsersResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUsersResult.datasource new file mode 100644 index 000000000..a0a063607 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/GetUsersResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.GetUsersResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.cs b/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.cs new file mode 100644 index 000000000..dfeb45ca6 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.cs @@ -0,0 +1,11529 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +// +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. +// +#pragma warning disable 1591 + +namespace SecretServerInterface.SSWebServiceWinAuth { + using System.Diagnostics; + using System; + using System.Xml.Serialization; + using System.ComponentModel; + using System.Web.Services.Protocols; + using System.Web.Services; + using System.Data; + + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Web.Services.WebServiceBindingAttribute(Name="SSWinAuthWebServiceSoap", Namespace="urn:thesecretserver.com")] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(AuditAsOfSiteLog))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedResultBase))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(TrackChanges))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GenericResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SqlScriptArgument2[]))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(UserScript[]))] + public partial class SSWinAuthWebService : System.Web.Services.Protocols.SoapHttpClientProtocol { + + private System.Threading.SendOrPostCallback ApproveSecretAccessRequestOperationCompleted; + + private System.Threading.SendOrPostCallback DenySecretAccessRequestOperationCompleted; + + private System.Threading.SendOrPostCallback AddUserOperationCompleted; + + private System.Threading.SendOrPostCallback FolderCreateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedCreateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedGetOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedUpdateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderExtendedGetNewOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretsByFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretsByExposedFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByExposedFieldValueOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByExposedValuesOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFolderOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretsByFolderLegacyOperationCompleted; + + private System.Threading.SendOrPostCallback ExpireSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetFavoritesOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateIsFavoriteOperationCompleted; + + private System.Threading.SendOrPostCallback CheckInOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretOperationCompleted; + + private System.Threading.SendOrPostCallback AddNewSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetNewSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretTemplateFieldsOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretTemplatesOperationCompleted; + + private System.Threading.SendOrPostCallback GeneratePasswordOperationCompleted; + + private System.Threading.SendOrPostCallback DeactivateSecretOperationCompleted; + + private System.Threading.SendOrPostCallback VersionGetOperationCompleted; + + private System.Threading.SendOrPostCallback GetCheckOutStatusOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretAuditOperationCompleted; + + private System.Threading.SendOrPostCallback FolderGetOperationCompleted; + + private System.Threading.SendOrPostCallback FolderUpdateOperationCompleted; + + private System.Threading.SendOrPostCallback FolderGetAllChildrenOperationCompleted; + + private System.Threading.SendOrPostCallback SearchFoldersOperationCompleted; + + private System.Threading.SendOrPostCallback RemoveDependencyOperationCompleted; + + private System.Threading.SendOrPostCallback GetDependenciesOperationCompleted; + + private System.Threading.SendOrPostCallback AddDependencyOperationCompleted; + + private System.Threading.SendOrPostCallback CreateDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback GetDependencyGroupsForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback RemoveDependencyGroupForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback DownloadFileAttachmentOperationCompleted; + + private System.Threading.SendOrPostCallback DownloadFileAttachmentByItemIdOperationCompleted; + + private System.Threading.SendOrPostCallback UploadFileAttachmentOperationCompleted; + + private System.Threading.SendOrPostCallback UploadFileAttachmentByItemIdOperationCompleted; + + private System.Threading.SendOrPostCallback ImportXMLOperationCompleted; + + private System.Threading.SendOrPostCallback SetCheckOutEnabledOperationCompleted; + + private System.Threading.SendOrPostCallback GetDistributedEnginesOperationCompleted; + + private System.Threading.SendOrPostCallback GetTicketSystemsOperationCompleted; + + private System.Threading.SendOrPostCallback AssignSiteOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretCustomAuditOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateSecretPermissionOperationCompleted; + + private System.Threading.SendOrPostCallback CheckInByKeyOperationCompleted; + + private System.Threading.SendOrPostCallback WhoAmIOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllGroupsOperationCompleted; + + private System.Threading.SendOrPostCallback AssignUserToGroupOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHLoginCredentialsOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHLoginCredentialsWithMachineOperationCompleted; + + private System.Threading.SendOrPostCallback SearchUsersOperationCompleted; + + private System.Threading.SendOrPostCallback GetUserOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateUserOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretItemHistoryByFieldNameOperationCompleted; + + private System.Threading.SendOrPostCallback GetSecretPolicyForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback AssignSecretPolicyForSecretOperationCompleted; + + private System.Threading.SendOrPostCallback SearchSecretPoliciesOperationCompleted; + + private System.Threading.SendOrPostCallback RunActiveDirectorySynchronizationOperationCompleted; + + private System.Threading.SendOrPostCallback AddGroupToActiveDirectorySynchronizationOperationCompleted; + + private System.Threading.SendOrPostCallback AddSecretPolicyOperationCompleted; + + private System.Threading.SendOrPostCallback GetNewSecretPolicyOperationCompleted; + + private System.Threading.SendOrPostCallback GetSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback SaveSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllSSHCommandMenusOperationCompleted; + + private System.Threading.SendOrPostCallback DeleteSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback RestoreSSHCommandMenuOperationCompleted; + + private System.Threading.SendOrPostCallback ValidateTwoFactorOperationCompleted; + + private System.Threading.SendOrPostCallback GetReportOperationCompleted; + + private System.Threading.SendOrPostCallback AddScriptOperationCompleted; + + private System.Threading.SendOrPostCallback GetAllScriptsOperationCompleted; + + private System.Threading.SendOrPostCallback GetScriptOperationCompleted; + + private System.Threading.SendOrPostCallback UpdateScriptOperationCompleted; + + private bool useDefaultCredentialsSetExplicitly; + + /// + public SSWinAuthWebService() { + this.Url = global::SecretServerInterface.Properties.Settings.Default.SecretServerInterface_SSWinAuthWebService; + if ((this.IsLocalFileSystemWebService(this.Url) == true)) { + this.UseDefaultCredentials = true; + this.useDefaultCredentialsSetExplicitly = false; + } + else { + this.useDefaultCredentialsSetExplicitly = true; + } + } + + public new string Url { + get { + return base.Url; + } + set { + if ((((this.IsLocalFileSystemWebService(base.Url) == true) + && (this.useDefaultCredentialsSetExplicitly == false)) + && (this.IsLocalFileSystemWebService(value) == false))) { + base.UseDefaultCredentials = false; + } + base.Url = value; + } + } + + public new bool UseDefaultCredentials { + get { + return base.UseDefaultCredentials; + } + set { + base.UseDefaultCredentials = value; + this.useDefaultCredentialsSetExplicitly = true; + } + } + + /// + public event ApproveSecretAccessRequestCompletedEventHandler ApproveSecretAccessRequestCompleted; + + /// + public event DenySecretAccessRequestCompletedEventHandler DenySecretAccessRequestCompleted; + + /// + public event AddUserCompletedEventHandler AddUserCompleted; + + /// + public event FolderCreateCompletedEventHandler FolderCreateCompleted; + + /// + public event FolderExtendedCreateCompletedEventHandler FolderExtendedCreateCompleted; + + /// + public event FolderExtendedGetCompletedEventHandler FolderExtendedGetCompleted; + + /// + public event FolderExtendedUpdateCompletedEventHandler FolderExtendedUpdateCompleted; + + /// + public event FolderExtendedGetNewCompletedEventHandler FolderExtendedGetNewCompleted; + + /// + public event GetSecretLegacyCompletedEventHandler GetSecretLegacyCompleted; + + /// + public event GetSecretCompletedEventHandler GetSecretCompleted; + + /// + public event GetSecretsByFieldValueCompletedEventHandler GetSecretsByFieldValueCompleted; + + /// + public event SearchSecretsByFieldValueCompletedEventHandler SearchSecretsByFieldValueCompleted; + + /// + public event GetSecretsByExposedFieldValueCompletedEventHandler GetSecretsByExposedFieldValueCompleted; + + /// + public event SearchSecretsByExposedFieldValueCompletedEventHandler SearchSecretsByExposedFieldValueCompleted; + + /// + public event SearchSecretsByExposedValuesCompletedEventHandler SearchSecretsByExposedValuesCompleted; + + /// + public event SearchSecretsCompletedEventHandler SearchSecretsCompleted; + + /// + public event SearchSecretsLegacyCompletedEventHandler SearchSecretsLegacyCompleted; + + /// + public event SearchSecretsByFolderCompletedEventHandler SearchSecretsByFolderCompleted; + + /// + public event SearchSecretsByFolderLegacyCompletedEventHandler SearchSecretsByFolderLegacyCompleted; + + /// + public event ExpireSecretCompletedEventHandler ExpireSecretCompleted; + + /// + public event GetFavoritesCompletedEventHandler GetFavoritesCompleted; + + /// + public event UpdateIsFavoriteCompletedEventHandler UpdateIsFavoriteCompleted; + + /// + public event CheckInCompletedEventHandler CheckInCompleted; + + /// + public event AddSecretCompletedEventHandler AddSecretCompleted; + + /// + public event AddNewSecretCompletedEventHandler AddNewSecretCompleted; + + /// + public event GetNewSecretCompletedEventHandler GetNewSecretCompleted; + + /// + public event GetSecretTemplateFieldsCompletedEventHandler GetSecretTemplateFieldsCompleted; + + /// + public event UpdateSecretCompletedEventHandler UpdateSecretCompleted; + + /// + public event GetSecretTemplatesCompletedEventHandler GetSecretTemplatesCompleted; + + /// + public event GeneratePasswordCompletedEventHandler GeneratePasswordCompleted; + + /// + public event DeactivateSecretCompletedEventHandler DeactivateSecretCompleted; + + /// + public event VersionGetCompletedEventHandler VersionGetCompleted; + + /// + public event GetCheckOutStatusCompletedEventHandler GetCheckOutStatusCompleted; + + /// + public event GetSecretAuditCompletedEventHandler GetSecretAuditCompleted; + + /// + public event FolderGetCompletedEventHandler FolderGetCompleted; + + /// + public event FolderUpdateCompletedEventHandler FolderUpdateCompleted; + + /// + public event FolderGetAllChildrenCompletedEventHandler FolderGetAllChildrenCompleted; + + /// + public event SearchFoldersCompletedEventHandler SearchFoldersCompleted; + + /// + public event RemoveDependencyCompletedEventHandler RemoveDependencyCompleted; + + /// + public event GetDependenciesCompletedEventHandler GetDependenciesCompleted; + + /// + public event AddDependencyCompletedEventHandler AddDependencyCompleted; + + /// + public event CreateDependencyGroupForSecretCompletedEventHandler CreateDependencyGroupForSecretCompleted; + + /// + public event GetDependencyGroupsForSecretCompletedEventHandler GetDependencyGroupsForSecretCompleted; + + /// + public event UpdateDependencyGroupForSecretCompletedEventHandler UpdateDependencyGroupForSecretCompleted; + + /// + public event RemoveDependencyGroupForSecretCompletedEventHandler RemoveDependencyGroupForSecretCompleted; + + /// + public event DownloadFileAttachmentCompletedEventHandler DownloadFileAttachmentCompleted; + + /// + public event DownloadFileAttachmentByItemIdCompletedEventHandler DownloadFileAttachmentByItemIdCompleted; + + /// + public event UploadFileAttachmentCompletedEventHandler UploadFileAttachmentCompleted; + + /// + public event UploadFileAttachmentByItemIdCompletedEventHandler UploadFileAttachmentByItemIdCompleted; + + /// + public event ImportXMLCompletedEventHandler ImportXMLCompleted; + + /// + public event SetCheckOutEnabledCompletedEventHandler SetCheckOutEnabledCompleted; + + /// + public event GetDistributedEnginesCompletedEventHandler GetDistributedEnginesCompleted; + + /// + public event GetTicketSystemsCompletedEventHandler GetTicketSystemsCompleted; + + /// + public event AssignSiteCompletedEventHandler AssignSiteCompleted; + + /// + public event AddSecretCustomAuditCompletedEventHandler AddSecretCustomAuditCompleted; + + /// + public event UpdateSecretPermissionCompletedEventHandler UpdateSecretPermissionCompleted; + + /// + public event CheckInByKeyCompletedEventHandler CheckInByKeyCompleted; + + /// + public event WhoAmICompletedEventHandler WhoAmICompleted; + + /// + public event GetAllGroupsCompletedEventHandler GetAllGroupsCompleted; + + /// + public event AssignUserToGroupCompletedEventHandler AssignUserToGroupCompleted; + + /// + public event GetSSHLoginCredentialsCompletedEventHandler GetSSHLoginCredentialsCompleted; + + /// + public event GetSSHLoginCredentialsWithMachineCompletedEventHandler GetSSHLoginCredentialsWithMachineCompleted; + + /// + public event SearchUsersCompletedEventHandler SearchUsersCompleted; + + /// + public event GetUserCompletedEventHandler GetUserCompleted; + + /// + public event UpdateUserCompletedEventHandler UpdateUserCompleted; + + /// + public event GetSecretItemHistoryByFieldNameCompletedEventHandler GetSecretItemHistoryByFieldNameCompleted; + + /// + public event GetSecretPolicyForSecretCompletedEventHandler GetSecretPolicyForSecretCompleted; + + /// + public event AssignSecretPolicyForSecretCompletedEventHandler AssignSecretPolicyForSecretCompleted; + + /// + public event SearchSecretPoliciesCompletedEventHandler SearchSecretPoliciesCompleted; + + /// + public event RunActiveDirectorySynchronizationCompletedEventHandler RunActiveDirectorySynchronizationCompleted; + + /// + public event AddGroupToActiveDirectorySynchronizationCompletedEventHandler AddGroupToActiveDirectorySynchronizationCompleted; + + /// + public event AddSecretPolicyCompletedEventHandler AddSecretPolicyCompleted; + + /// + public event GetNewSecretPolicyCompletedEventHandler GetNewSecretPolicyCompleted; + + /// + public event GetSSHCommandMenuCompletedEventHandler GetSSHCommandMenuCompleted; + + /// + public event SaveSSHCommandMenuCompletedEventHandler SaveSSHCommandMenuCompleted; + + /// + public event GetAllSSHCommandMenusCompletedEventHandler GetAllSSHCommandMenusCompleted; + + /// + public event DeleteSSHCommandMenuCompletedEventHandler DeleteSSHCommandMenuCompleted; + + /// + public event RestoreSSHCommandMenuCompletedEventHandler RestoreSSHCommandMenuCompleted; + + /// + public event ValidateTwoFactorCompletedEventHandler ValidateTwoFactorCompleted; + + /// + public event GetReportCompletedEventHandler GetReportCompleted; + + /// + public event AddScriptCompletedEventHandler AddScriptCompleted; + + /// + public event GetAllScriptsCompletedEventHandler GetAllScriptsCompleted; + + /// + public event GetScriptCompletedEventHandler GetScriptCompleted; + + /// + public event UpdateScriptCompletedEventHandler UpdateScriptCompleted; + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ApproveSecretAccessRequest", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public RequestApprovalResult ApproveSecretAccessRequest(string approvalId, string hours, bool userOverride) { + object[] results = this.Invoke("ApproveSecretAccessRequest", new object[] { + approvalId, + hours, + userOverride}); + return ((RequestApprovalResult)(results[0])); + } + + /// + public void ApproveSecretAccessRequestAsync(string approvalId, string hours, bool userOverride) { + this.ApproveSecretAccessRequestAsync(approvalId, hours, userOverride, null); + } + + /// + public void ApproveSecretAccessRequestAsync(string approvalId, string hours, bool userOverride, object userState) { + if ((this.ApproveSecretAccessRequestOperationCompleted == null)) { + this.ApproveSecretAccessRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnApproveSecretAccessRequestOperationCompleted); + } + this.InvokeAsync("ApproveSecretAccessRequest", new object[] { + approvalId, + hours, + userOverride}, this.ApproveSecretAccessRequestOperationCompleted, userState); + } + + private void OnApproveSecretAccessRequestOperationCompleted(object arg) { + if ((this.ApproveSecretAccessRequestCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ApproveSecretAccessRequestCompleted(this, new ApproveSecretAccessRequestCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DenySecretAccessRequest", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public RequestApprovalResult DenySecretAccessRequest(string approvalId, bool userOverride) { + object[] results = this.Invoke("DenySecretAccessRequest", new object[] { + approvalId, + userOverride}); + return ((RequestApprovalResult)(results[0])); + } + + /// + public void DenySecretAccessRequestAsync(string approvalId, bool userOverride) { + this.DenySecretAccessRequestAsync(approvalId, userOverride, null); + } + + /// + public void DenySecretAccessRequestAsync(string approvalId, bool userOverride, object userState) { + if ((this.DenySecretAccessRequestOperationCompleted == null)) { + this.DenySecretAccessRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDenySecretAccessRequestOperationCompleted); + } + this.InvokeAsync("DenySecretAccessRequest", new object[] { + approvalId, + userOverride}, this.DenySecretAccessRequestOperationCompleted, userState); + } + + private void OnDenySecretAccessRequestOperationCompleted(object arg) { + if ((this.DenySecretAccessRequestCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DenySecretAccessRequestCompleted(this, new DenySecretAccessRequestCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddUser(User newUser) { + object[] results = this.Invoke("AddUser", new object[] { + newUser}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddUserAsync(User newUser) { + this.AddUserAsync(newUser, null); + } + + /// + public void AddUserAsync(User newUser, object userState) { + if ((this.AddUserOperationCompleted == null)) { + this.AddUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddUserOperationCompleted); + } + this.InvokeAsync("AddUser", new object[] { + newUser}, this.AddUserOperationCompleted, userState); + } + + private void OnAddUserOperationCompleted(object arg) { + if ((this.AddUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddUserCompleted(this, new AddUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderCreate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public CreateFolderResult FolderCreate(string folderName, int parentFolderId, int folderTypeId) { + object[] results = this.Invoke("FolderCreate", new object[] { + folderName, + parentFolderId, + folderTypeId}); + return ((CreateFolderResult)(results[0])); + } + + /// + public void FolderCreateAsync(string folderName, int parentFolderId, int folderTypeId) { + this.FolderCreateAsync(folderName, parentFolderId, folderTypeId, null); + } + + /// + public void FolderCreateAsync(string folderName, int parentFolderId, int folderTypeId, object userState) { + if ((this.FolderCreateOperationCompleted == null)) { + this.FolderCreateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderCreateOperationCompleted); + } + this.InvokeAsync("FolderCreate", new object[] { + folderName, + parentFolderId, + folderTypeId}, this.FolderCreateOperationCompleted, userState); + } + + private void OnFolderCreateOperationCompleted(object arg) { + if ((this.FolderCreateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderCreateCompleted(this, new FolderCreateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedCreate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedCreateResult FolderExtendedCreate(FolderExtended folder) { + object[] results = this.Invoke("FolderExtendedCreate", new object[] { + folder}); + return ((FolderExtendedCreateResult)(results[0])); + } + + /// + public void FolderExtendedCreateAsync(FolderExtended folder) { + this.FolderExtendedCreateAsync(folder, null); + } + + /// + public void FolderExtendedCreateAsync(FolderExtended folder, object userState) { + if ((this.FolderExtendedCreateOperationCompleted == null)) { + this.FolderExtendedCreateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedCreateOperationCompleted); + } + this.InvokeAsync("FolderExtendedCreate", new object[] { + folder}, this.FolderExtendedCreateOperationCompleted, userState); + } + + private void OnFolderExtendedCreateOperationCompleted(object arg) { + if ((this.FolderExtendedCreateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedCreateCompleted(this, new FolderExtendedCreateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedGetResult FolderExtendedGet(int folderId) { + object[] results = this.Invoke("FolderExtendedGet", new object[] { + folderId}); + return ((FolderExtendedGetResult)(results[0])); + } + + /// + public void FolderExtendedGetAsync(int folderId) { + this.FolderExtendedGetAsync(folderId, null); + } + + /// + public void FolderExtendedGetAsync(int folderId, object userState) { + if ((this.FolderExtendedGetOperationCompleted == null)) { + this.FolderExtendedGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedGetOperationCompleted); + } + this.InvokeAsync("FolderExtendedGet", new object[] { + folderId}, this.FolderExtendedGetOperationCompleted, userState); + } + + private void OnFolderExtendedGetOperationCompleted(object arg) { + if ((this.FolderExtendedGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedGetCompleted(this, new FolderExtendedGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedUpdate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedUpdateResult FolderExtendedUpdate(FolderExtended folder) { + object[] results = this.Invoke("FolderExtendedUpdate", new object[] { + folder}); + return ((FolderExtendedUpdateResult)(results[0])); + } + + /// + public void FolderExtendedUpdateAsync(FolderExtended folder) { + this.FolderExtendedUpdateAsync(folder, null); + } + + /// + public void FolderExtendedUpdateAsync(FolderExtended folder, object userState) { + if ((this.FolderExtendedUpdateOperationCompleted == null)) { + this.FolderExtendedUpdateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedUpdateOperationCompleted); + } + this.InvokeAsync("FolderExtendedUpdate", new object[] { + folder}, this.FolderExtendedUpdateOperationCompleted, userState); + } + + private void OnFolderExtendedUpdateOperationCompleted(object arg) { + if ((this.FolderExtendedUpdateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedUpdateCompleted(this, new FolderExtendedUpdateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderExtendedGetNew", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FolderExtendedGetNewResult FolderExtendedGetNew(FolderExtendedGetNewRequest folderExtendedGetNewRequest) { + object[] results = this.Invoke("FolderExtendedGetNew", new object[] { + folderExtendedGetNewRequest}); + return ((FolderExtendedGetNewResult)(results[0])); + } + + /// + public void FolderExtendedGetNewAsync(FolderExtendedGetNewRequest folderExtendedGetNewRequest) { + this.FolderExtendedGetNewAsync(folderExtendedGetNewRequest, null); + } + + /// + public void FolderExtendedGetNewAsync(FolderExtendedGetNewRequest folderExtendedGetNewRequest, object userState) { + if ((this.FolderExtendedGetNewOperationCompleted == null)) { + this.FolderExtendedGetNewOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderExtendedGetNewOperationCompleted); + } + this.InvokeAsync("FolderExtendedGetNew", new object[] { + folderExtendedGetNewRequest}, this.FolderExtendedGetNewOperationCompleted, userState); + } + + private void OnFolderExtendedGetNewOperationCompleted(object arg) { + if ((this.FolderExtendedGetNewCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderExtendedGetNewCompleted(this, new FolderExtendedGetNewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetSecretLegacy(int secretId) { + object[] results = this.Invoke("GetSecretLegacy", new object[] { + secretId}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetSecretLegacyAsync(int secretId) { + this.GetSecretLegacyAsync(secretId, null); + } + + /// + public void GetSecretLegacyAsync(int secretId, object userState) { + if ((this.GetSecretLegacyOperationCompleted == null)) { + this.GetSecretLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretLegacyOperationCompleted); + } + this.InvokeAsync("GetSecretLegacy", new object[] { + secretId}, this.GetSecretLegacyOperationCompleted, userState); + } + + private void OnGetSecretLegacyOperationCompleted(object arg) { + if ((this.GetSecretLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretLegacyCompleted(this, new GetSecretLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetSecret(int secretId, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses) { + object[] results = this.Invoke("GetSecret", new object[] { + secretId, + loadSettingsAndPermissions, + codeResponses}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetSecretAsync(int secretId, System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses) { + this.GetSecretAsync(secretId, loadSettingsAndPermissions, codeResponses, null); + } + + /// + public void GetSecretAsync(int secretId, System.Nullable loadSettingsAndPermissions, CodeResponse[] codeResponses, object userState) { + if ((this.GetSecretOperationCompleted == null)) { + this.GetSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretOperationCompleted); + } + this.InvokeAsync("GetSecret", new object[] { + secretId, + loadSettingsAndPermissions, + codeResponses}, this.GetSecretOperationCompleted, userState); + } + + private void OnGetSecretOperationCompleted(object arg) { + if ((this.GetSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretCompleted(this, new GetSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretsByFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretsByFieldValueResult GetSecretsByFieldValue(string fieldName, string searchTerm, bool showDeleted) { + object[] results = this.Invoke("GetSecretsByFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted}); + return ((GetSecretsByFieldValueResult)(results[0])); + } + + /// + public void GetSecretsByFieldValueAsync(string fieldName, string searchTerm, bool showDeleted) { + this.GetSecretsByFieldValueAsync(fieldName, searchTerm, showDeleted, null); + } + + /// + public void GetSecretsByFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, object userState) { + if ((this.GetSecretsByFieldValueOperationCompleted == null)) { + this.GetSecretsByFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretsByFieldValueOperationCompleted); + } + this.InvokeAsync("GetSecretsByFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted}, this.GetSecretsByFieldValueOperationCompleted, userState); + } + + private void OnGetSecretsByFieldValueOperationCompleted(object arg) { + if ((this.GetSecretsByFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretsByFieldValueCompleted(this, new GetSecretsByFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFieldValue(string fieldName, string searchTerm, bool showDeleted, bool showRestricted) { + object[] results = this.Invoke("SearchSecretsByFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showRestricted) { + this.SearchSecretsByFieldValueAsync(fieldName, searchTerm, showDeleted, showRestricted, null); + } + + /// + public void SearchSecretsByFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showRestricted, object userState) { + if ((this.SearchSecretsByFieldValueOperationCompleted == null)) { + this.SearchSecretsByFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFieldValueOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showRestricted}, this.SearchSecretsByFieldValueOperationCompleted, userState); + } + + private void OnSearchSecretsByFieldValueOperationCompleted(object arg) { + if ((this.SearchSecretsByFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFieldValueCompleted(this, new SearchSecretsByFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretsByExposedFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretsByFieldValueResult GetSecretsByExposedFieldValue(string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches) { + object[] results = this.Invoke("GetSecretsByExposedFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showPartialMatches}); + return ((GetSecretsByFieldValueResult)(results[0])); + } + + /// + public void GetSecretsByExposedFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches) { + this.GetSecretsByExposedFieldValueAsync(fieldName, searchTerm, showDeleted, showPartialMatches, null); + } + + /// + public void GetSecretsByExposedFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showPartialMatches, object userState) { + if ((this.GetSecretsByExposedFieldValueOperationCompleted == null)) { + this.GetSecretsByExposedFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretsByExposedFieldValueOperationCompleted); + } + this.InvokeAsync("GetSecretsByExposedFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showPartialMatches}, this.GetSecretsByExposedFieldValueOperationCompleted, userState); + } + + private void OnGetSecretsByExposedFieldValueOperationCompleted(object arg) { + if ((this.GetSecretsByExposedFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretsByExposedFieldValueCompleted(this, new GetSecretsByExposedFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByExposedFieldValue", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByExposedFieldValue(string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + object[] results = this.Invoke("SearchSecretsByExposedFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByExposedFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + this.SearchSecretsByExposedFieldValueAsync(fieldName, searchTerm, showDeleted, showRestricted, showPartialMatches, null); + } + + /// + public void SearchSecretsByExposedFieldValueAsync(string fieldName, string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches, object userState) { + if ((this.SearchSecretsByExposedFieldValueOperationCompleted == null)) { + this.SearchSecretsByExposedFieldValueOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByExposedFieldValueOperationCompleted); + } + this.InvokeAsync("SearchSecretsByExposedFieldValue", new object[] { + fieldName, + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}, this.SearchSecretsByExposedFieldValueOperationCompleted, userState); + } + + private void OnSearchSecretsByExposedFieldValueOperationCompleted(object arg) { + if ((this.SearchSecretsByExposedFieldValueCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByExposedFieldValueCompleted(this, new SearchSecretsByExposedFieldValueCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByExposedValues", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByExposedValues(string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + object[] results = this.Invoke("SearchSecretsByExposedValues", new object[] { + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByExposedValuesAsync(string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches) { + this.SearchSecretsByExposedValuesAsync(searchTerm, showDeleted, showRestricted, showPartialMatches, null); + } + + /// + public void SearchSecretsByExposedValuesAsync(string searchTerm, bool showDeleted, bool showRestricted, bool showPartialMatches, object userState) { + if ((this.SearchSecretsByExposedValuesOperationCompleted == null)) { + this.SearchSecretsByExposedValuesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByExposedValuesOperationCompleted); + } + this.InvokeAsync("SearchSecretsByExposedValues", new object[] { + searchTerm, + showDeleted, + showRestricted, + showPartialMatches}, this.SearchSecretsByExposedValuesOperationCompleted, userState); + } + + private void OnSearchSecretsByExposedValuesOperationCompleted(object arg) { + if ((this.SearchSecretsByExposedValuesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByExposedValuesCompleted(this, new SearchSecretsByExposedValuesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecrets", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecrets(string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeDeleted, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeRestricted) { + object[] results = this.Invoke("SearchSecrets", new object[] { + searchTerm, + includeDeleted, + includeRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsAsync(string searchTerm, System.Nullable includeDeleted, System.Nullable includeRestricted) { + this.SearchSecretsAsync(searchTerm, includeDeleted, includeRestricted, null); + } + + /// + public void SearchSecretsAsync(string searchTerm, System.Nullable includeDeleted, System.Nullable includeRestricted, object userState) { + if ((this.SearchSecretsOperationCompleted == null)) { + this.SearchSecretsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsOperationCompleted); + } + this.InvokeAsync("SearchSecrets", new object[] { + searchTerm, + includeDeleted, + includeRestricted}, this.SearchSecretsOperationCompleted, userState); + } + + private void OnSearchSecretsOperationCompleted(object arg) { + if ((this.SearchSecretsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsCompleted(this, new SearchSecretsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsLegacy(string searchTerm) { + object[] results = this.Invoke("SearchSecretsLegacy", new object[] { + searchTerm}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsLegacyAsync(string searchTerm) { + this.SearchSecretsLegacyAsync(searchTerm, null); + } + + /// + public void SearchSecretsLegacyAsync(string searchTerm, object userState) { + if ((this.SearchSecretsLegacyOperationCompleted == null)) { + this.SearchSecretsLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsLegacyOperationCompleted); + } + this.InvokeAsync("SearchSecretsLegacy", new object[] { + searchTerm}, this.SearchSecretsLegacyOperationCompleted, userState); + } + + private void OnSearchSecretsLegacyOperationCompleted(object arg) { + if ((this.SearchSecretsLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsLegacyCompleted(this, new SearchSecretsLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFolder", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFolder(string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable folderId, bool includeSubFolders, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeDeleted, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeRestricted) { + object[] results = this.Invoke("SearchSecretsByFolder", new object[] { + searchTerm, + folderId, + includeSubFolders, + includeDeleted, + includeRestricted}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFolderAsync(string searchTerm, System.Nullable folderId, bool includeSubFolders, System.Nullable includeDeleted, System.Nullable includeRestricted) { + this.SearchSecretsByFolderAsync(searchTerm, folderId, includeSubFolders, includeDeleted, includeRestricted, null); + } + + /// + public void SearchSecretsByFolderAsync(string searchTerm, System.Nullable folderId, bool includeSubFolders, System.Nullable includeDeleted, System.Nullable includeRestricted, object userState) { + if ((this.SearchSecretsByFolderOperationCompleted == null)) { + this.SearchSecretsByFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFolderOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFolder", new object[] { + searchTerm, + folderId, + includeSubFolders, + includeDeleted, + includeRestricted}, this.SearchSecretsByFolderOperationCompleted, userState); + } + + private void OnSearchSecretsByFolderOperationCompleted(object arg) { + if ((this.SearchSecretsByFolderCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFolderCompleted(this, new SearchSecretsByFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretsByFolderLegacy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretsResult SearchSecretsByFolderLegacy(string searchTerm, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable folderId, bool includeSubFolders) { + object[] results = this.Invoke("SearchSecretsByFolderLegacy", new object[] { + searchTerm, + folderId, + includeSubFolders}); + return ((SearchSecretsResult)(results[0])); + } + + /// + public void SearchSecretsByFolderLegacyAsync(string searchTerm, System.Nullable folderId, bool includeSubFolders) { + this.SearchSecretsByFolderLegacyAsync(searchTerm, folderId, includeSubFolders, null); + } + + /// + public void SearchSecretsByFolderLegacyAsync(string searchTerm, System.Nullable folderId, bool includeSubFolders, object userState) { + if ((this.SearchSecretsByFolderLegacyOperationCompleted == null)) { + this.SearchSecretsByFolderLegacyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretsByFolderLegacyOperationCompleted); + } + this.InvokeAsync("SearchSecretsByFolderLegacy", new object[] { + searchTerm, + folderId, + includeSubFolders}, this.SearchSecretsByFolderLegacyOperationCompleted, userState); + } + + private void OnSearchSecretsByFolderLegacyOperationCompleted(object arg) { + if ((this.SearchSecretsByFolderLegacyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretsByFolderLegacyCompleted(this, new SearchSecretsByFolderLegacyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ExpireSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ExpireSecret(int secretId) { + object[] results = this.Invoke("ExpireSecret", new object[] { + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ExpireSecretAsync(int secretId) { + this.ExpireSecretAsync(secretId, null); + } + + /// + public void ExpireSecretAsync(int secretId, object userState) { + if ((this.ExpireSecretOperationCompleted == null)) { + this.ExpireSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnExpireSecretOperationCompleted); + } + this.InvokeAsync("ExpireSecret", new object[] { + secretId}, this.ExpireSecretOperationCompleted, userState); + } + + private void OnExpireSecretOperationCompleted(object arg) { + if ((this.ExpireSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ExpireSecretCompleted(this, new ExpireSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetFavorites", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFavoritesResult GetFavorites() { + object[] results = this.Invoke("GetFavorites", new object[0]); + return ((GetFavoritesResult)(results[0])); + } + + /// + public void GetFavoritesAsync() { + this.GetFavoritesAsync(null); + } + + /// + public void GetFavoritesAsync(object userState) { + if ((this.GetFavoritesOperationCompleted == null)) { + this.GetFavoritesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFavoritesOperationCompleted); + } + this.InvokeAsync("GetFavorites", new object[0], this.GetFavoritesOperationCompleted, userState); + } + + private void OnGetFavoritesOperationCompleted(object arg) { + if ((this.GetFavoritesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetFavoritesCompleted(this, new GetFavoritesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateIsFavorite", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateIsFavorite(int secretId, bool isFavorite) { + object[] results = this.Invoke("UpdateIsFavorite", new object[] { + secretId, + isFavorite}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateIsFavoriteAsync(int secretId, bool isFavorite) { + this.UpdateIsFavoriteAsync(secretId, isFavorite, null); + } + + /// + public void UpdateIsFavoriteAsync(int secretId, bool isFavorite, object userState) { + if ((this.UpdateIsFavoriteOperationCompleted == null)) { + this.UpdateIsFavoriteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateIsFavoriteOperationCompleted); + } + this.InvokeAsync("UpdateIsFavorite", new object[] { + secretId, + isFavorite}, this.UpdateIsFavoriteOperationCompleted, userState); + } + + private void OnUpdateIsFavoriteOperationCompleted(object arg) { + if ((this.UpdateIsFavoriteCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateIsFavoriteCompleted(this, new UpdateIsFavoriteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CheckIn", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CheckIn(int secretId) { + object[] results = this.Invoke("CheckIn", new object[] { + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CheckInAsync(int secretId) { + this.CheckInAsync(secretId, null); + } + + /// + public void CheckInAsync(int secretId, object userState) { + if ((this.CheckInOperationCompleted == null)) { + this.CheckInOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckInOperationCompleted); + } + this.InvokeAsync("CheckIn", new object[] { + secretId}, this.CheckInOperationCompleted, userState); + } + + private void OnCheckInOperationCompleted(object arg) { + if ((this.CheckInCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CheckInCompleted(this, new CheckInCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AddSecretResult AddSecret(int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId) { + object[] results = this.Invoke("AddSecret", new object[] { + secretTypeId, + secretName, + secretFieldIds, + secretItemValues, + folderId}); + return ((AddSecretResult)(results[0])); + } + + /// + public void AddSecretAsync(int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId) { + this.AddSecretAsync(secretTypeId, secretName, secretFieldIds, secretItemValues, folderId, null); + } + + /// + public void AddSecretAsync(int secretTypeId, string secretName, int[] secretFieldIds, string[] secretItemValues, int folderId, object userState) { + if ((this.AddSecretOperationCompleted == null)) { + this.AddSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretOperationCompleted); + } + this.InvokeAsync("AddSecret", new object[] { + secretTypeId, + secretName, + secretFieldIds, + secretItemValues, + folderId}, this.AddSecretOperationCompleted, userState); + } + + private void OnAddSecretOperationCompleted(object arg) { + if ((this.AddSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretCompleted(this, new AddSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddNewSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public AddSecretResult AddNewSecret(Secret secret) { + object[] results = this.Invoke("AddNewSecret", new object[] { + secret}); + return ((AddSecretResult)(results[0])); + } + + /// + public void AddNewSecretAsync(Secret secret) { + this.AddNewSecretAsync(secret, null); + } + + /// + public void AddNewSecretAsync(Secret secret, object userState) { + if ((this.AddNewSecretOperationCompleted == null)) { + this.AddNewSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddNewSecretOperationCompleted); + } + this.InvokeAsync("AddNewSecret", new object[] { + secret}, this.AddNewSecretOperationCompleted, userState); + } + + private void OnAddNewSecretOperationCompleted(object arg) { + if ((this.AddNewSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddNewSecretCompleted(this, new AddNewSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetNewSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretResult GetNewSecret(int secretTypeId, int folderId) { + object[] results = this.Invoke("GetNewSecret", new object[] { + secretTypeId, + folderId}); + return ((GetSecretResult)(results[0])); + } + + /// + public void GetNewSecretAsync(int secretTypeId, int folderId) { + this.GetNewSecretAsync(secretTypeId, folderId, null); + } + + /// + public void GetNewSecretAsync(int secretTypeId, int folderId, object userState) { + if ((this.GetNewSecretOperationCompleted == null)) { + this.GetNewSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetNewSecretOperationCompleted); + } + this.InvokeAsync("GetNewSecret", new object[] { + secretTypeId, + folderId}, this.GetNewSecretOperationCompleted, userState); + } + + private void OnGetNewSecretOperationCompleted(object arg) { + if ((this.GetNewSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetNewSecretCompleted(this, new GetNewSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretTemplateFields", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretTemplateFieldsResult GetSecretTemplateFields(int secretTypeId) { + object[] results = this.Invoke("GetSecretTemplateFields", new object[] { + secretTypeId}); + return ((GetSecretTemplateFieldsResult)(results[0])); + } + + /// + public void GetSecretTemplateFieldsAsync(int secretTypeId) { + this.GetSecretTemplateFieldsAsync(secretTypeId, null); + } + + /// + public void GetSecretTemplateFieldsAsync(int secretTypeId, object userState) { + if ((this.GetSecretTemplateFieldsOperationCompleted == null)) { + this.GetSecretTemplateFieldsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretTemplateFieldsOperationCompleted); + } + this.InvokeAsync("GetSecretTemplateFields", new object[] { + secretTypeId}, this.GetSecretTemplateFieldsOperationCompleted, userState); + } + + private void OnGetSecretTemplateFieldsOperationCompleted(object arg) { + if ((this.GetSecretTemplateFieldsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretTemplateFieldsCompleted(this, new GetSecretTemplateFieldsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateSecret(Secret secret) { + object[] results = this.Invoke("UpdateSecret", new object[] { + secret}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateSecretAsync(Secret secret) { + this.UpdateSecretAsync(secret, null); + } + + /// + public void UpdateSecretAsync(Secret secret, object userState) { + if ((this.UpdateSecretOperationCompleted == null)) { + this.UpdateSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateSecretOperationCompleted); + } + this.InvokeAsync("UpdateSecret", new object[] { + secret}, this.UpdateSecretOperationCompleted, userState); + } + + private void OnUpdateSecretOperationCompleted(object arg) { + if ((this.UpdateSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateSecretCompleted(this, new UpdateSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretTemplates", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretTemplatesResult GetSecretTemplates() { + object[] results = this.Invoke("GetSecretTemplates", new object[0]); + return ((GetSecretTemplatesResult)(results[0])); + } + + /// + public void GetSecretTemplatesAsync() { + this.GetSecretTemplatesAsync(null); + } + + /// + public void GetSecretTemplatesAsync(object userState) { + if ((this.GetSecretTemplatesOperationCompleted == null)) { + this.GetSecretTemplatesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretTemplatesOperationCompleted); + } + this.InvokeAsync("GetSecretTemplates", new object[0], this.GetSecretTemplatesOperationCompleted, userState); + } + + private void OnGetSecretTemplatesOperationCompleted(object arg) { + if ((this.GetSecretTemplatesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretTemplatesCompleted(this, new GetSecretTemplatesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GeneratePassword", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GeneratePasswordResult GeneratePassword(int secretFieldId) { + object[] results = this.Invoke("GeneratePassword", new object[] { + secretFieldId}); + return ((GeneratePasswordResult)(results[0])); + } + + /// + public void GeneratePasswordAsync(int secretFieldId) { + this.GeneratePasswordAsync(secretFieldId, null); + } + + /// + public void GeneratePasswordAsync(int secretFieldId, object userState) { + if ((this.GeneratePasswordOperationCompleted == null)) { + this.GeneratePasswordOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGeneratePasswordOperationCompleted); + } + this.InvokeAsync("GeneratePassword", new object[] { + secretFieldId}, this.GeneratePasswordOperationCompleted, userState); + } + + private void OnGeneratePasswordOperationCompleted(object arg) { + if ((this.GeneratePasswordCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GeneratePasswordCompleted(this, new GeneratePasswordCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DeactivateSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult DeactivateSecret(int secretId) { + object[] results = this.Invoke("DeactivateSecret", new object[] { + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void DeactivateSecretAsync(int secretId) { + this.DeactivateSecretAsync(secretId, null); + } + + /// + public void DeactivateSecretAsync(int secretId, object userState) { + if ((this.DeactivateSecretOperationCompleted == null)) { + this.DeactivateSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeactivateSecretOperationCompleted); + } + this.InvokeAsync("DeactivateSecret", new object[] { + secretId}, this.DeactivateSecretOperationCompleted, userState); + } + + private void OnDeactivateSecretOperationCompleted(object arg) { + if ((this.DeactivateSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DeactivateSecretCompleted(this, new DeactivateSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/VersionGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public VersionGetResult VersionGet() { + object[] results = this.Invoke("VersionGet", new object[0]); + return ((VersionGetResult)(results[0])); + } + + /// + public void VersionGetAsync() { + this.VersionGetAsync(null); + } + + /// + public void VersionGetAsync(object userState) { + if ((this.VersionGetOperationCompleted == null)) { + this.VersionGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnVersionGetOperationCompleted); + } + this.InvokeAsync("VersionGet", new object[0], this.VersionGetOperationCompleted, userState); + } + + private void OnVersionGetOperationCompleted(object arg) { + if ((this.VersionGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.VersionGetCompleted(this, new VersionGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetCheckOutStatus", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetCheckOutStatusResult GetCheckOutStatus(int secretId) { + object[] results = this.Invoke("GetCheckOutStatus", new object[] { + secretId}); + return ((GetCheckOutStatusResult)(results[0])); + } + + /// + public void GetCheckOutStatusAsync(int secretId) { + this.GetCheckOutStatusAsync(secretId, null); + } + + /// + public void GetCheckOutStatusAsync(int secretId, object userState) { + if ((this.GetCheckOutStatusOperationCompleted == null)) { + this.GetCheckOutStatusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetCheckOutStatusOperationCompleted); + } + this.InvokeAsync("GetCheckOutStatus", new object[] { + secretId}, this.GetCheckOutStatusOperationCompleted, userState); + } + + private void OnGetCheckOutStatusOperationCompleted(object arg) { + if ((this.GetCheckOutStatusCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetCheckOutStatusCompleted(this, new GetCheckOutStatusCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretAudit", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSecretAuditResult GetSecretAudit(int secretId) { + object[] results = this.Invoke("GetSecretAudit", new object[] { + secretId}); + return ((GetSecretAuditResult)(results[0])); + } + + /// + public void GetSecretAuditAsync(int secretId) { + this.GetSecretAuditAsync(secretId, null); + } + + /// + public void GetSecretAuditAsync(int secretId, object userState) { + if ((this.GetSecretAuditOperationCompleted == null)) { + this.GetSecretAuditOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretAuditOperationCompleted); + } + this.InvokeAsync("GetSecretAudit", new object[] { + secretId}, this.GetSecretAuditOperationCompleted, userState); + } + + private void OnGetSecretAuditOperationCompleted(object arg) { + if ((this.GetSecretAuditCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretAuditCompleted(this, new GetSecretAuditCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderGet", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFolderResult FolderGet(int folderId) { + object[] results = this.Invoke("FolderGet", new object[] { + folderId}); + return ((GetFolderResult)(results[0])); + } + + /// + public void FolderGetAsync(int folderId) { + this.FolderGetAsync(folderId, null); + } + + /// + public void FolderGetAsync(int folderId, object userState) { + if ((this.FolderGetOperationCompleted == null)) { + this.FolderGetOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderGetOperationCompleted); + } + this.InvokeAsync("FolderGet", new object[] { + folderId}, this.FolderGetOperationCompleted, userState); + } + + private void OnFolderGetOperationCompleted(object arg) { + if ((this.FolderGetCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderGetCompleted(this, new FolderGetCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderUpdate", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult FolderUpdate(Folder modifiedFolder) { + object[] results = this.Invoke("FolderUpdate", new object[] { + modifiedFolder}); + return ((WebServiceResult)(results[0])); + } + + /// + public void FolderUpdateAsync(Folder modifiedFolder) { + this.FolderUpdateAsync(modifiedFolder, null); + } + + /// + public void FolderUpdateAsync(Folder modifiedFolder, object userState) { + if ((this.FolderUpdateOperationCompleted == null)) { + this.FolderUpdateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderUpdateOperationCompleted); + } + this.InvokeAsync("FolderUpdate", new object[] { + modifiedFolder}, this.FolderUpdateOperationCompleted, userState); + } + + private void OnFolderUpdateOperationCompleted(object arg) { + if ((this.FolderUpdateCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderUpdateCompleted(this, new FolderUpdateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/FolderGetAllChildren", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetFoldersResult FolderGetAllChildren(int parentFolderId) { + object[] results = this.Invoke("FolderGetAllChildren", new object[] { + parentFolderId}); + return ((GetFoldersResult)(results[0])); + } + + /// + public void FolderGetAllChildrenAsync(int parentFolderId) { + this.FolderGetAllChildrenAsync(parentFolderId, null); + } + + /// + public void FolderGetAllChildrenAsync(int parentFolderId, object userState) { + if ((this.FolderGetAllChildrenOperationCompleted == null)) { + this.FolderGetAllChildrenOperationCompleted = new System.Threading.SendOrPostCallback(this.OnFolderGetAllChildrenOperationCompleted); + } + this.InvokeAsync("FolderGetAllChildren", new object[] { + parentFolderId}, this.FolderGetAllChildrenOperationCompleted, userState); + } + + private void OnFolderGetAllChildrenOperationCompleted(object arg) { + if ((this.FolderGetAllChildrenCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.FolderGetAllChildrenCompleted(this, new FolderGetAllChildrenCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchFolders", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchFolderResult SearchFolders(string folderName) { + object[] results = this.Invoke("SearchFolders", new object[] { + folderName}); + return ((SearchFolderResult)(results[0])); + } + + /// + public void SearchFoldersAsync(string folderName) { + this.SearchFoldersAsync(folderName, null); + } + + /// + public void SearchFoldersAsync(string folderName, object userState) { + if ((this.SearchFoldersOperationCompleted == null)) { + this.SearchFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchFoldersOperationCompleted); + } + this.InvokeAsync("SearchFolders", new object[] { + folderName}, this.SearchFoldersOperationCompleted, userState); + } + + private void OnSearchFoldersOperationCompleted(object arg) { + if ((this.SearchFoldersCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchFoldersCompleted(this, new SearchFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RemoveDependency", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RemoveDependency(int dependencyId, int secretId) { + object[] results = this.Invoke("RemoveDependency", new object[] { + dependencyId, + secretId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RemoveDependencyAsync(int dependencyId, int secretId) { + this.RemoveDependencyAsync(dependencyId, secretId, null); + } + + /// + public void RemoveDependencyAsync(int dependencyId, int secretId, object userState) { + if ((this.RemoveDependencyOperationCompleted == null)) { + this.RemoveDependencyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDependencyOperationCompleted); + } + this.InvokeAsync("RemoveDependency", new object[] { + dependencyId, + secretId}, this.RemoveDependencyOperationCompleted, userState); + } + + private void OnRemoveDependencyOperationCompleted(object arg) { + if ((this.RemoveDependencyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RemoveDependencyCompleted(this, new RemoveDependencyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDependencies", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetDependenciesResult GetDependencies(int secretId) { + object[] results = this.Invoke("GetDependencies", new object[] { + secretId}); + return ((GetDependenciesResult)(results[0])); + } + + /// + public void GetDependenciesAsync(int secretId) { + this.GetDependenciesAsync(secretId, null); + } + + /// + public void GetDependenciesAsync(int secretId, object userState) { + if ((this.GetDependenciesOperationCompleted == null)) { + this.GetDependenciesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDependenciesOperationCompleted); + } + this.InvokeAsync("GetDependencies", new object[] { + secretId}, this.GetDependenciesOperationCompleted, userState); + } + + private void OnGetDependenciesOperationCompleted(object arg) { + if ((this.GetDependenciesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDependenciesCompleted(this, new GetDependenciesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddDependency", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddDependency(Dependency dependency) { + object[] results = this.Invoke("AddDependency", new object[] { + dependency}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddDependencyAsync(Dependency dependency) { + this.AddDependencyAsync(dependency, null); + } + + /// + public void AddDependencyAsync(Dependency dependency, object userState) { + if ((this.AddDependencyOperationCompleted == null)) { + this.AddDependencyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddDependencyOperationCompleted); + } + this.InvokeAsync("AddDependency", new object[] { + dependency}, this.AddDependencyOperationCompleted, userState); + } + + private void OnAddDependencyOperationCompleted(object arg) { + if ((this.AddDependencyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddDependencyCompleted(this, new AddDependencyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CreateDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CreateDependencyGroupForSecret(string token, DependencyGroup dependencyGroup) { + object[] results = this.Invoke("CreateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CreateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup) { + this.CreateDependencyGroupForSecretAsync(token, dependencyGroup, null); + } + + /// + public void CreateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup, object userState) { + if ((this.CreateDependencyGroupForSecretOperationCompleted == null)) { + this.CreateDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("CreateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}, this.CreateDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnCreateDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.CreateDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CreateDependencyGroupForSecretCompleted(this, new CreateDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDependencyGroupsForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetDependencyGroupsResult GetDependencyGroupsForSecret(string token, int secretId) { + object[] results = this.Invoke("GetDependencyGroupsForSecret", new object[] { + token, + secretId}); + return ((GetDependencyGroupsResult)(results[0])); + } + + /// + public void GetDependencyGroupsForSecretAsync(string token, int secretId) { + this.GetDependencyGroupsForSecretAsync(token, secretId, null); + } + + /// + public void GetDependencyGroupsForSecretAsync(string token, int secretId, object userState) { + if ((this.GetDependencyGroupsForSecretOperationCompleted == null)) { + this.GetDependencyGroupsForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDependencyGroupsForSecretOperationCompleted); + } + this.InvokeAsync("GetDependencyGroupsForSecret", new object[] { + token, + secretId}, this.GetDependencyGroupsForSecretOperationCompleted, userState); + } + + private void OnGetDependencyGroupsForSecretOperationCompleted(object arg) { + if ((this.GetDependencyGroupsForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDependencyGroupsForSecretCompleted(this, new GetDependencyGroupsForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateDependencyGroupForSecret(string token, DependencyGroup dependencyGroup) { + object[] results = this.Invoke("UpdateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup) { + this.UpdateDependencyGroupForSecretAsync(token, dependencyGroup, null); + } + + /// + public void UpdateDependencyGroupForSecretAsync(string token, DependencyGroup dependencyGroup, object userState) { + if ((this.UpdateDependencyGroupForSecretOperationCompleted == null)) { + this.UpdateDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("UpdateDependencyGroupForSecret", new object[] { + token, + dependencyGroup}, this.UpdateDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnUpdateDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.UpdateDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateDependencyGroupForSecretCompleted(this, new UpdateDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RemoveDependencyGroupForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RemoveDependencyGroupForSecret(string token, int dependencyGroupId) { + object[] results = this.Invoke("RemoveDependencyGroupForSecret", new object[] { + token, + dependencyGroupId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RemoveDependencyGroupForSecretAsync(string token, int dependencyGroupId) { + this.RemoveDependencyGroupForSecretAsync(token, dependencyGroupId, null); + } + + /// + public void RemoveDependencyGroupForSecretAsync(string token, int dependencyGroupId, object userState) { + if ((this.RemoveDependencyGroupForSecretOperationCompleted == null)) { + this.RemoveDependencyGroupForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDependencyGroupForSecretOperationCompleted); + } + this.InvokeAsync("RemoveDependencyGroupForSecret", new object[] { + token, + dependencyGroupId}, this.RemoveDependencyGroupForSecretOperationCompleted, userState); + } + + private void OnRemoveDependencyGroupForSecretOperationCompleted(object arg) { + if ((this.RemoveDependencyGroupForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RemoveDependencyGroupForSecretCompleted(this, new RemoveDependencyGroupForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DownloadFileAttachment", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FileDownloadResult DownloadFileAttachment(string token, int secretId) { + object[] results = this.Invoke("DownloadFileAttachment", new object[] { + token, + secretId}); + return ((FileDownloadResult)(results[0])); + } + + /// + public void DownloadFileAttachmentAsync(string token, int secretId) { + this.DownloadFileAttachmentAsync(token, secretId, null); + } + + /// + public void DownloadFileAttachmentAsync(string token, int secretId, object userState) { + if ((this.DownloadFileAttachmentOperationCompleted == null)) { + this.DownloadFileAttachmentOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDownloadFileAttachmentOperationCompleted); + } + this.InvokeAsync("DownloadFileAttachment", new object[] { + token, + secretId}, this.DownloadFileAttachmentOperationCompleted, userState); + } + + private void OnDownloadFileAttachmentOperationCompleted(object arg) { + if ((this.DownloadFileAttachmentCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DownloadFileAttachmentCompleted(this, new DownloadFileAttachmentCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DownloadFileAttachmentByItemId", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public FileDownloadResult DownloadFileAttachmentByItemId(string token, int secretId, int secretItemId) { + object[] results = this.Invoke("DownloadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId}); + return ((FileDownloadResult)(results[0])); + } + + /// + public void DownloadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId) { + this.DownloadFileAttachmentByItemIdAsync(token, secretId, secretItemId, null); + } + + /// + public void DownloadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, object userState) { + if ((this.DownloadFileAttachmentByItemIdOperationCompleted == null)) { + this.DownloadFileAttachmentByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDownloadFileAttachmentByItemIdOperationCompleted); + } + this.InvokeAsync("DownloadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId}, this.DownloadFileAttachmentByItemIdOperationCompleted, userState); + } + + private void OnDownloadFileAttachmentByItemIdOperationCompleted(object arg) { + if ((this.DownloadFileAttachmentByItemIdCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DownloadFileAttachmentByItemIdCompleted(this, new DownloadFileAttachmentByItemIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UploadFileAttachment", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UploadFileAttachment(string token, int secretId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] fileData, string fileName) { + object[] results = this.Invoke("UploadFileAttachment", new object[] { + token, + secretId, + fileData, + fileName}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UploadFileAttachmentAsync(string token, int secretId, byte[] fileData, string fileName) { + this.UploadFileAttachmentAsync(token, secretId, fileData, fileName, null); + } + + /// + public void UploadFileAttachmentAsync(string token, int secretId, byte[] fileData, string fileName, object userState) { + if ((this.UploadFileAttachmentOperationCompleted == null)) { + this.UploadFileAttachmentOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUploadFileAttachmentOperationCompleted); + } + this.InvokeAsync("UploadFileAttachment", new object[] { + token, + secretId, + fileData, + fileName}, this.UploadFileAttachmentOperationCompleted, userState); + } + + private void OnUploadFileAttachmentOperationCompleted(object arg) { + if ((this.UploadFileAttachmentCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UploadFileAttachmentCompleted(this, new UploadFileAttachmentCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UploadFileAttachmentByItemId", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UploadFileAttachmentByItemId(string token, int secretId, int secretItemId, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] fileData, string fileName) { + object[] results = this.Invoke("UploadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId, + fileData, + fileName}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UploadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, byte[] fileData, string fileName) { + this.UploadFileAttachmentByItemIdAsync(token, secretId, secretItemId, fileData, fileName, null); + } + + /// + public void UploadFileAttachmentByItemIdAsync(string token, int secretId, int secretItemId, byte[] fileData, string fileName, object userState) { + if ((this.UploadFileAttachmentByItemIdOperationCompleted == null)) { + this.UploadFileAttachmentByItemIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUploadFileAttachmentByItemIdOperationCompleted); + } + this.InvokeAsync("UploadFileAttachmentByItemId", new object[] { + token, + secretId, + secretItemId, + fileData, + fileName}, this.UploadFileAttachmentByItemIdOperationCompleted, userState); + } + + private void OnUploadFileAttachmentByItemIdOperationCompleted(object arg) { + if ((this.UploadFileAttachmentByItemIdCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UploadFileAttachmentByItemIdCompleted(this, new UploadFileAttachmentByItemIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ImportXML", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ImportXML(string xml) { + object[] results = this.Invoke("ImportXML", new object[] { + xml}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ImportXMLAsync(string xml) { + this.ImportXMLAsync(xml, null); + } + + /// + public void ImportXMLAsync(string xml, object userState) { + if ((this.ImportXMLOperationCompleted == null)) { + this.ImportXMLOperationCompleted = new System.Threading.SendOrPostCallback(this.OnImportXMLOperationCompleted); + } + this.InvokeAsync("ImportXML", new object[] { + xml}, this.ImportXMLOperationCompleted, userState); + } + + private void OnImportXMLOperationCompleted(object arg) { + if ((this.ImportXMLCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ImportXMLCompleted(this, new ImportXMLCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SetCheckOutEnabled", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult SetCheckOutEnabled(int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable checkOutInterval) { + object[] results = this.Invoke("SetCheckOutEnabled", new object[] { + secretId, + setCheckOut, + setPasswordChangeOnCheckIn, + checkOutInterval}); + return ((WebServiceResult)(results[0])); + } + + /// + public void SetCheckOutEnabledAsync(int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, System.Nullable checkOutInterval) { + this.SetCheckOutEnabledAsync(secretId, setCheckOut, setPasswordChangeOnCheckIn, checkOutInterval, null); + } + + /// + public void SetCheckOutEnabledAsync(int secretId, bool setCheckOut, bool setPasswordChangeOnCheckIn, System.Nullable checkOutInterval, object userState) { + if ((this.SetCheckOutEnabledOperationCompleted == null)) { + this.SetCheckOutEnabledOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetCheckOutEnabledOperationCompleted); + } + this.InvokeAsync("SetCheckOutEnabled", new object[] { + secretId, + setCheckOut, + setPasswordChangeOnCheckIn, + checkOutInterval}, this.SetCheckOutEnabledOperationCompleted, userState); + } + + private void OnSetCheckOutEnabledOperationCompleted(object arg) { + if ((this.SetCheckOutEnabledCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SetCheckOutEnabledCompleted(this, new SetCheckOutEnabledCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetDistributedEngines", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSitesResult GetDistributedEngines() { + object[] results = this.Invoke("GetDistributedEngines", new object[0]); + return ((GetSitesResult)(results[0])); + } + + /// + public void GetDistributedEnginesAsync() { + this.GetDistributedEnginesAsync(null); + } + + /// + public void GetDistributedEnginesAsync(object userState) { + if ((this.GetDistributedEnginesOperationCompleted == null)) { + this.GetDistributedEnginesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributedEnginesOperationCompleted); + } + this.InvokeAsync("GetDistributedEngines", new object[0], this.GetDistributedEnginesOperationCompleted, userState); + } + + private void OnGetDistributedEnginesOperationCompleted(object arg) { + if ((this.GetDistributedEnginesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetDistributedEnginesCompleted(this, new GetDistributedEnginesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetTicketSystems", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetTicketSystemsResult GetTicketSystems() { + object[] results = this.Invoke("GetTicketSystems", new object[0]); + return ((GetTicketSystemsResult)(results[0])); + } + + /// + public void GetTicketSystemsAsync() { + this.GetTicketSystemsAsync(null); + } + + /// + public void GetTicketSystemsAsync(object userState) { + if ((this.GetTicketSystemsOperationCompleted == null)) { + this.GetTicketSystemsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetTicketSystemsOperationCompleted); + } + this.InvokeAsync("GetTicketSystems", new object[0], this.GetTicketSystemsOperationCompleted, userState); + } + + private void OnGetTicketSystemsOperationCompleted(object arg) { + if ((this.GetTicketSystemsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetTicketSystemsCompleted(this, new GetTicketSystemsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignSite", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AssignSite(int secretId, int siteId) { + object[] results = this.Invoke("AssignSite", new object[] { + secretId, + siteId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AssignSiteAsync(int secretId, int siteId) { + this.AssignSiteAsync(secretId, siteId, null); + } + + /// + public void AssignSiteAsync(int secretId, int siteId, object userState) { + if ((this.AssignSiteOperationCompleted == null)) { + this.AssignSiteOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignSiteOperationCompleted); + } + this.InvokeAsync("AssignSite", new object[] { + secretId, + siteId}, this.AssignSiteOperationCompleted, userState); + } + + private void OnAssignSiteOperationCompleted(object arg) { + if ((this.AssignSiteCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignSiteCompleted(this, new AssignSiteCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecretCustomAudit", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddSecretCustomAudit(int secretId, string notes, string ipAddress, [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable referenceId, string ticketNumber, int userId) { + object[] results = this.Invoke("AddSecretCustomAudit", new object[] { + secretId, + notes, + ipAddress, + referenceId, + ticketNumber, + userId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddSecretCustomAuditAsync(int secretId, string notes, string ipAddress, System.Nullable referenceId, string ticketNumber, int userId) { + this.AddSecretCustomAuditAsync(secretId, notes, ipAddress, referenceId, ticketNumber, userId, null); + } + + /// + public void AddSecretCustomAuditAsync(int secretId, string notes, string ipAddress, System.Nullable referenceId, string ticketNumber, int userId, object userState) { + if ((this.AddSecretCustomAuditOperationCompleted == null)) { + this.AddSecretCustomAuditOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretCustomAuditOperationCompleted); + } + this.InvokeAsync("AddSecretCustomAudit", new object[] { + secretId, + notes, + ipAddress, + referenceId, + ticketNumber, + userId}, this.AddSecretCustomAuditOperationCompleted, userState); + } + + private void OnAddSecretCustomAuditOperationCompleted(object arg) { + if ((this.AddSecretCustomAuditCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretCustomAuditCompleted(this, new AddSecretCustomAuditCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateSecretPermission", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult UpdateSecretPermission(int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner) { + object[] results = this.Invoke("UpdateSecretPermission", new object[] { + secretId, + groupOrUserRecord, + view, + edit, + owner}); + return ((WebServiceResult)(results[0])); + } + + /// + public void UpdateSecretPermissionAsync(int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner) { + this.UpdateSecretPermissionAsync(secretId, groupOrUserRecord, view, edit, owner, null); + } + + /// + public void UpdateSecretPermissionAsync(int secretId, GroupOrUserRecord groupOrUserRecord, bool view, bool edit, bool owner, object userState) { + if ((this.UpdateSecretPermissionOperationCompleted == null)) { + this.UpdateSecretPermissionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateSecretPermissionOperationCompleted); + } + this.InvokeAsync("UpdateSecretPermission", new object[] { + secretId, + groupOrUserRecord, + view, + edit, + owner}, this.UpdateSecretPermissionOperationCompleted, userState); + } + + private void OnUpdateSecretPermissionOperationCompleted(object arg) { + if ((this.UpdateSecretPermissionCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateSecretPermissionCompleted(this, new UpdateSecretPermissionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/CheckInByKey", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult CheckInByKey(string sessionKey) { + object[] results = this.Invoke("CheckInByKey", new object[] { + sessionKey}); + return ((WebServiceResult)(results[0])); + } + + /// + public void CheckInByKeyAsync(string sessionKey) { + this.CheckInByKeyAsync(sessionKey, null); + } + + /// + public void CheckInByKeyAsync(string sessionKey, object userState) { + if ((this.CheckInByKeyOperationCompleted == null)) { + this.CheckInByKeyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckInByKeyOperationCompleted); + } + this.InvokeAsync("CheckInByKey", new object[] { + sessionKey}, this.CheckInByKeyOperationCompleted, userState); + } + + private void OnCheckInByKeyOperationCompleted(object arg) { + if ((this.CheckInByKeyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.CheckInByKeyCompleted(this, new CheckInByKeyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/WhoAmI", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UserInfoResult WhoAmI() { + object[] results = this.Invoke("WhoAmI", new object[0]); + return ((UserInfoResult)(results[0])); + } + + /// + public void WhoAmIAsync() { + this.WhoAmIAsync(null); + } + + /// + public void WhoAmIAsync(object userState) { + if ((this.WhoAmIOperationCompleted == null)) { + this.WhoAmIOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWhoAmIOperationCompleted); + } + this.InvokeAsync("WhoAmI", new object[0], this.WhoAmIOperationCompleted, userState); + } + + private void OnWhoAmIOperationCompleted(object arg) { + if ((this.WhoAmICompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.WhoAmICompleted(this, new WhoAmICompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllGroups", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetAllGroupsResult GetAllGroups() { + object[] results = this.Invoke("GetAllGroups", new object[0]); + return ((GetAllGroupsResult)(results[0])); + } + + /// + public void GetAllGroupsAsync() { + this.GetAllGroupsAsync(null); + } + + /// + public void GetAllGroupsAsync(object userState) { + if ((this.GetAllGroupsOperationCompleted == null)) { + this.GetAllGroupsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllGroupsOperationCompleted); + } + this.InvokeAsync("GetAllGroups", new object[0], this.GetAllGroupsOperationCompleted, userState); + } + + private void OnGetAllGroupsOperationCompleted(object arg) { + if ((this.GetAllGroupsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllGroupsCompleted(this, new GetAllGroupsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignUserToGroup", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AssignUserToGroup(int userId, int groupId) { + object[] results = this.Invoke("AssignUserToGroup", new object[] { + userId, + groupId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AssignUserToGroupAsync(int userId, int groupId) { + this.AssignUserToGroupAsync(userId, groupId, null); + } + + /// + public void AssignUserToGroupAsync(int userId, int groupId, object userState) { + if ((this.AssignUserToGroupOperationCompleted == null)) { + this.AssignUserToGroupOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignUserToGroupOperationCompleted); + } + this.InvokeAsync("AssignUserToGroup", new object[] { + userId, + groupId}, this.AssignUserToGroupOperationCompleted, userState); + } + + private void OnAssignUserToGroupOperationCompleted(object arg) { + if ((this.AssignUserToGroupCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignUserToGroupCompleted(this, new AssignUserToGroupCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHLoginCredentials", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SSHCredentialsResult GetSSHLoginCredentials(int secretId) { + object[] results = this.Invoke("GetSSHLoginCredentials", new object[] { + secretId}); + return ((SSHCredentialsResult)(results[0])); + } + + /// + public void GetSSHLoginCredentialsAsync(int secretId) { + this.GetSSHLoginCredentialsAsync(secretId, null); + } + + /// + public void GetSSHLoginCredentialsAsync(int secretId, object userState) { + if ((this.GetSSHLoginCredentialsOperationCompleted == null)) { + this.GetSSHLoginCredentialsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHLoginCredentialsOperationCompleted); + } + this.InvokeAsync("GetSSHLoginCredentials", new object[] { + secretId}, this.GetSSHLoginCredentialsOperationCompleted, userState); + } + + private void OnGetSSHLoginCredentialsOperationCompleted(object arg) { + if ((this.GetSSHLoginCredentialsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHLoginCredentialsCompleted(this, new GetSSHLoginCredentialsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHLoginCredentialsWithMachine", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SSHCredentialsResult GetSSHLoginCredentialsWithMachine(int secretId, string machine) { + object[] results = this.Invoke("GetSSHLoginCredentialsWithMachine", new object[] { + secretId, + machine}); + return ((SSHCredentialsResult)(results[0])); + } + + /// + public void GetSSHLoginCredentialsWithMachineAsync(int secretId, string machine) { + this.GetSSHLoginCredentialsWithMachineAsync(secretId, machine, null); + } + + /// + public void GetSSHLoginCredentialsWithMachineAsync(int secretId, string machine, object userState) { + if ((this.GetSSHLoginCredentialsWithMachineOperationCompleted == null)) { + this.GetSSHLoginCredentialsWithMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHLoginCredentialsWithMachineOperationCompleted); + } + this.InvokeAsync("GetSSHLoginCredentialsWithMachine", new object[] { + secretId, + machine}, this.GetSSHLoginCredentialsWithMachineOperationCompleted, userState); + } + + private void OnGetSSHLoginCredentialsWithMachineOperationCompleted(object arg) { + if ((this.GetSSHLoginCredentialsWithMachineCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHLoginCredentialsWithMachineCompleted(this, new GetSSHLoginCredentialsWithMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchUsers", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUsersResult SearchUsers(string searchTerm, bool includeInactiveUsers) { + object[] results = this.Invoke("SearchUsers", new object[] { + searchTerm, + includeInactiveUsers}); + return ((GetUsersResult)(results[0])); + } + + /// + public void SearchUsersAsync(string searchTerm, bool includeInactiveUsers) { + this.SearchUsersAsync(searchTerm, includeInactiveUsers, null); + } + + /// + public void SearchUsersAsync(string searchTerm, bool includeInactiveUsers, object userState) { + if ((this.SearchUsersOperationCompleted == null)) { + this.SearchUsersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchUsersOperationCompleted); + } + this.InvokeAsync("SearchUsers", new object[] { + searchTerm, + includeInactiveUsers}, this.SearchUsersOperationCompleted, userState); + } + + private void OnSearchUsersOperationCompleted(object arg) { + if ((this.SearchUsersCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchUsersCompleted(this, new SearchUsersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserResult GetUser(int userId) { + object[] results = this.Invoke("GetUser", new object[] { + userId}); + return ((GetUserResult)(results[0])); + } + + /// + public void GetUserAsync(int userId) { + this.GetUserAsync(userId, null); + } + + /// + public void GetUserAsync(int userId, object userState) { + if ((this.GetUserOperationCompleted == null)) { + this.GetUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetUserOperationCompleted); + } + this.InvokeAsync("GetUser", new object[] { + userId}, this.GetUserOperationCompleted, userState); + } + + private void OnGetUserOperationCompleted(object arg) { + if ((this.GetUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetUserCompleted(this, new GetUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateUser", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UpdateUserResult UpdateUser(User user) { + object[] results = this.Invoke("UpdateUser", new object[] { + user}); + return ((UpdateUserResult)(results[0])); + } + + /// + public void UpdateUserAsync(User user) { + this.UpdateUserAsync(user, null); + } + + /// + public void UpdateUserAsync(User user, object userState) { + if ((this.UpdateUserOperationCompleted == null)) { + this.UpdateUserOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateUserOperationCompleted); + } + this.InvokeAsync("UpdateUser", new object[] { + user}, this.UpdateUserOperationCompleted, userState); + } + + private void OnUpdateUserOperationCompleted(object arg) { + if ((this.UpdateUserCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateUserCompleted(this, new UpdateUserCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretItemHistoryByFieldName", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretItemHistoryResult GetSecretItemHistoryByFieldName(int secretId, string fieldDisplayName) { + object[] results = this.Invoke("GetSecretItemHistoryByFieldName", new object[] { + secretId, + fieldDisplayName}); + return ((SecretItemHistoryResult)(results[0])); + } + + /// + public void GetSecretItemHistoryByFieldNameAsync(int secretId, string fieldDisplayName) { + this.GetSecretItemHistoryByFieldNameAsync(secretId, fieldDisplayName, null); + } + + /// + public void GetSecretItemHistoryByFieldNameAsync(int secretId, string fieldDisplayName, object userState) { + if ((this.GetSecretItemHistoryByFieldNameOperationCompleted == null)) { + this.GetSecretItemHistoryByFieldNameOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretItemHistoryByFieldNameOperationCompleted); + } + this.InvokeAsync("GetSecretItemHistoryByFieldName", new object[] { + secretId, + fieldDisplayName}, this.GetSecretItemHistoryByFieldNameOperationCompleted, userState); + } + + private void OnGetSecretItemHistoryByFieldNameOperationCompleted(object arg) { + if ((this.GetSecretItemHistoryByFieldNameCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretItemHistoryByFieldNameCompleted(this, new GetSecretItemHistoryByFieldNameCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSecretPolicyForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyForSecretResult GetSecretPolicyForSecret(int secretId) { + object[] results = this.Invoke("GetSecretPolicyForSecret", new object[] { + secretId}); + return ((SecretPolicyForSecretResult)(results[0])); + } + + /// + public void GetSecretPolicyForSecretAsync(int secretId) { + this.GetSecretPolicyForSecretAsync(secretId, null); + } + + /// + public void GetSecretPolicyForSecretAsync(int secretId, object userState) { + if ((this.GetSecretPolicyForSecretOperationCompleted == null)) { + this.GetSecretPolicyForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSecretPolicyForSecretOperationCompleted); + } + this.InvokeAsync("GetSecretPolicyForSecret", new object[] { + secretId}, this.GetSecretPolicyForSecretOperationCompleted, userState); + } + + private void OnGetSecretPolicyForSecretOperationCompleted(object arg) { + if ((this.GetSecretPolicyForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSecretPolicyForSecretCompleted(this, new GetSecretPolicyForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AssignSecretPolicyForSecret", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyForSecretResult AssignSecretPolicyForSecret(SecretPolicyForSecret secretPolicyForSecret) { + object[] results = this.Invoke("AssignSecretPolicyForSecret", new object[] { + secretPolicyForSecret}); + return ((SecretPolicyForSecretResult)(results[0])); + } + + /// + public void AssignSecretPolicyForSecretAsync(SecretPolicyForSecret secretPolicyForSecret) { + this.AssignSecretPolicyForSecretAsync(secretPolicyForSecret, null); + } + + /// + public void AssignSecretPolicyForSecretAsync(SecretPolicyForSecret secretPolicyForSecret, object userState) { + if ((this.AssignSecretPolicyForSecretOperationCompleted == null)) { + this.AssignSecretPolicyForSecretOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAssignSecretPolicyForSecretOperationCompleted); + } + this.InvokeAsync("AssignSecretPolicyForSecret", new object[] { + secretPolicyForSecret}, this.AssignSecretPolicyForSecretOperationCompleted, userState); + } + + private void OnAssignSecretPolicyForSecretOperationCompleted(object arg) { + if ((this.AssignSecretPolicyForSecretCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AssignSecretPolicyForSecretCompleted(this, new AssignSecretPolicyForSecretCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SearchSecretPolicies", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SearchSecretPoliciesResult SearchSecretPolicies(string term, bool includeInactive) { + object[] results = this.Invoke("SearchSecretPolicies", new object[] { + term, + includeInactive}); + return ((SearchSecretPoliciesResult)(results[0])); + } + + /// + public void SearchSecretPoliciesAsync(string term, bool includeInactive) { + this.SearchSecretPoliciesAsync(term, includeInactive, null); + } + + /// + public void SearchSecretPoliciesAsync(string term, bool includeInactive, object userState) { + if ((this.SearchSecretPoliciesOperationCompleted == null)) { + this.SearchSecretPoliciesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchSecretPoliciesOperationCompleted); + } + this.InvokeAsync("SearchSecretPolicies", new object[] { + term, + includeInactive}, this.SearchSecretPoliciesOperationCompleted, userState); + } + + private void OnSearchSecretPoliciesOperationCompleted(object arg) { + if ((this.SearchSecretPoliciesCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SearchSecretPoliciesCompleted(this, new SearchSecretPoliciesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RunActiveDirectorySynchronization", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RunActiveDirectorySynchronization() { + object[] results = this.Invoke("RunActiveDirectorySynchronization", new object[0]); + return ((WebServiceResult)(results[0])); + } + + /// + public void RunActiveDirectorySynchronizationAsync() { + this.RunActiveDirectorySynchronizationAsync(null); + } + + /// + public void RunActiveDirectorySynchronizationAsync(object userState) { + if ((this.RunActiveDirectorySynchronizationOperationCompleted == null)) { + this.RunActiveDirectorySynchronizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRunActiveDirectorySynchronizationOperationCompleted); + } + this.InvokeAsync("RunActiveDirectorySynchronization", new object[0], this.RunActiveDirectorySynchronizationOperationCompleted, userState); + } + + private void OnRunActiveDirectorySynchronizationOperationCompleted(object arg) { + if ((this.RunActiveDirectorySynchronizationCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RunActiveDirectorySynchronizationCompleted(this, new RunActiveDirectorySynchronizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddGroupToActiveDirectorySynchronization", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddGroupToActiveDirectorySynchronization(AddGroupRequestMessage groupRequestMessage) { + object[] results = this.Invoke("AddGroupToActiveDirectorySynchronization", new object[] { + groupRequestMessage}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddGroupToActiveDirectorySynchronizationAsync(AddGroupRequestMessage groupRequestMessage) { + this.AddGroupToActiveDirectorySynchronizationAsync(groupRequestMessage, null); + } + + /// + public void AddGroupToActiveDirectorySynchronizationAsync(AddGroupRequestMessage groupRequestMessage, object userState) { + if ((this.AddGroupToActiveDirectorySynchronizationOperationCompleted == null)) { + this.AddGroupToActiveDirectorySynchronizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddGroupToActiveDirectorySynchronizationOperationCompleted); + } + this.InvokeAsync("AddGroupToActiveDirectorySynchronization", new object[] { + groupRequestMessage}, this.AddGroupToActiveDirectorySynchronizationOperationCompleted, userState); + } + + private void OnAddGroupToActiveDirectorySynchronizationOperationCompleted(object arg) { + if ((this.AddGroupToActiveDirectorySynchronizationCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddGroupToActiveDirectorySynchronizationCompleted(this, new AddGroupToActiveDirectorySynchronizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddSecretPolicy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyResult AddSecretPolicy(SecretPolicyDetail secretPolicy) { + object[] results = this.Invoke("AddSecretPolicy", new object[] { + secretPolicy}); + return ((SecretPolicyResult)(results[0])); + } + + /// + public void AddSecretPolicyAsync(SecretPolicyDetail secretPolicy) { + this.AddSecretPolicyAsync(secretPolicy, null); + } + + /// + public void AddSecretPolicyAsync(SecretPolicyDetail secretPolicy, object userState) { + if ((this.AddSecretPolicyOperationCompleted == null)) { + this.AddSecretPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSecretPolicyOperationCompleted); + } + this.InvokeAsync("AddSecretPolicy", new object[] { + secretPolicy}, this.AddSecretPolicyOperationCompleted, userState); + } + + private void OnAddSecretPolicyOperationCompleted(object arg) { + if ((this.AddSecretPolicyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddSecretPolicyCompleted(this, new AddSecretPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetNewSecretPolicy", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public SecretPolicyResult GetNewSecretPolicy() { + object[] results = this.Invoke("GetNewSecretPolicy", new object[0]); + return ((SecretPolicyResult)(results[0])); + } + + /// + public void GetNewSecretPolicyAsync() { + this.GetNewSecretPolicyAsync(null); + } + + /// + public void GetNewSecretPolicyAsync(object userState) { + if ((this.GetNewSecretPolicyOperationCompleted == null)) { + this.GetNewSecretPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetNewSecretPolicyOperationCompleted); + } + this.InvokeAsync("GetNewSecretPolicy", new object[0], this.GetNewSecretPolicyOperationCompleted, userState); + } + + private void OnGetNewSecretPolicyOperationCompleted(object arg) { + if ((this.GetNewSecretPolicyCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetNewSecretPolicyCompleted(this, new GetNewSecretPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenuResult GetSSHCommandMenu(int sshCommandMenuId) { + object[] results = this.Invoke("GetSSHCommandMenu", new object[] { + sshCommandMenuId}); + return ((GetSshCommandMenuResult)(results[0])); + } + + /// + public void GetSSHCommandMenuAsync(int sshCommandMenuId) { + this.GetSSHCommandMenuAsync(sshCommandMenuId, null); + } + + /// + public void GetSSHCommandMenuAsync(int sshCommandMenuId, object userState) { + if ((this.GetSSHCommandMenuOperationCompleted == null)) { + this.GetSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("GetSSHCommandMenu", new object[] { + sshCommandMenuId}, this.GetSSHCommandMenuOperationCompleted, userState); + } + + private void OnGetSSHCommandMenuOperationCompleted(object arg) { + if ((this.GetSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetSSHCommandMenuCompleted(this, new GetSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/SaveSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenuResult SaveSSHCommandMenu(SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands) { + object[] results = this.Invoke("SaveSSHCommandMenu", new object[] { + sshCommandMenu, + commandsText, + deleteCommands}); + return ((GetSshCommandMenuResult)(results[0])); + } + + /// + public void SaveSSHCommandMenuAsync(SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands) { + this.SaveSSHCommandMenuAsync(sshCommandMenu, commandsText, deleteCommands, null); + } + + /// + public void SaveSSHCommandMenuAsync(SshCommandMenu sshCommandMenu, string commandsText, bool deleteCommands, object userState) { + if ((this.SaveSSHCommandMenuOperationCompleted == null)) { + this.SaveSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSaveSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("SaveSSHCommandMenu", new object[] { + sshCommandMenu, + commandsText, + deleteCommands}, this.SaveSSHCommandMenuOperationCompleted, userState); + } + + private void OnSaveSSHCommandMenuOperationCompleted(object arg) { + if ((this.SaveSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.SaveSSHCommandMenuCompleted(this, new SaveSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllSSHCommandMenus", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetSshCommandMenusResult GetAllSSHCommandMenus([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] System.Nullable includeInactive) { + object[] results = this.Invoke("GetAllSSHCommandMenus", new object[] { + includeInactive}); + return ((GetSshCommandMenusResult)(results[0])); + } + + /// + public void GetAllSSHCommandMenusAsync(System.Nullable includeInactive) { + this.GetAllSSHCommandMenusAsync(includeInactive, null); + } + + /// + public void GetAllSSHCommandMenusAsync(System.Nullable includeInactive, object userState) { + if ((this.GetAllSSHCommandMenusOperationCompleted == null)) { + this.GetAllSSHCommandMenusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllSSHCommandMenusOperationCompleted); + } + this.InvokeAsync("GetAllSSHCommandMenus", new object[] { + includeInactive}, this.GetAllSSHCommandMenusOperationCompleted, userState); + } + + private void OnGetAllSSHCommandMenusOperationCompleted(object arg) { + if ((this.GetAllSSHCommandMenusCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllSSHCommandMenusCompleted(this, new GetAllSSHCommandMenusCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/DeleteSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult DeleteSSHCommandMenu(int sshCommandMenuId) { + object[] results = this.Invoke("DeleteSSHCommandMenu", new object[] { + sshCommandMenuId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void DeleteSSHCommandMenuAsync(int sshCommandMenuId) { + this.DeleteSSHCommandMenuAsync(sshCommandMenuId, null); + } + + /// + public void DeleteSSHCommandMenuAsync(int sshCommandMenuId, object userState) { + if ((this.DeleteSSHCommandMenuOperationCompleted == null)) { + this.DeleteSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("DeleteSSHCommandMenu", new object[] { + sshCommandMenuId}, this.DeleteSSHCommandMenuOperationCompleted, userState); + } + + private void OnDeleteSSHCommandMenuOperationCompleted(object arg) { + if ((this.DeleteSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.DeleteSSHCommandMenuCompleted(this, new DeleteSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/RestoreSSHCommandMenu", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult RestoreSSHCommandMenu(int sshCommandMenuId) { + object[] results = this.Invoke("RestoreSSHCommandMenu", new object[] { + sshCommandMenuId}); + return ((WebServiceResult)(results[0])); + } + + /// + public void RestoreSSHCommandMenuAsync(int sshCommandMenuId) { + this.RestoreSSHCommandMenuAsync(sshCommandMenuId, null); + } + + /// + public void RestoreSSHCommandMenuAsync(int sshCommandMenuId, object userState) { + if ((this.RestoreSSHCommandMenuOperationCompleted == null)) { + this.RestoreSSHCommandMenuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRestoreSSHCommandMenuOperationCompleted); + } + this.InvokeAsync("RestoreSSHCommandMenu", new object[] { + sshCommandMenuId}, this.RestoreSSHCommandMenuOperationCompleted, userState); + } + + private void OnRestoreSSHCommandMenuOperationCompleted(object arg) { + if ((this.RestoreSSHCommandMenuCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.RestoreSSHCommandMenuCompleted(this, new RestoreSSHCommandMenuCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/ValidateTwoFactor", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult ValidateTwoFactor(string pinCode) { + object[] results = this.Invoke("ValidateTwoFactor", new object[] { + pinCode}); + return ((WebServiceResult)(results[0])); + } + + /// + public void ValidateTwoFactorAsync(string pinCode) { + this.ValidateTwoFactorAsync(pinCode, null); + } + + /// + public void ValidateTwoFactorAsync(string pinCode, object userState) { + if ((this.ValidateTwoFactorOperationCompleted == null)) { + this.ValidateTwoFactorOperationCompleted = new System.Threading.SendOrPostCallback(this.OnValidateTwoFactorOperationCompleted); + } + this.InvokeAsync("ValidateTwoFactor", new object[] { + pinCode}, this.ValidateTwoFactorOperationCompleted, userState); + } + + private void OnValidateTwoFactorOperationCompleted(object arg) { + if ((this.ValidateTwoFactorCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.ValidateTwoFactorCompleted(this, new ValidateTwoFactorCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetReport", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetReportResult GetReport(GetReportRequest reportRequest) { + object[] results = this.Invoke("GetReport", new object[] { + reportRequest}); + return ((GetReportResult)(results[0])); + } + + /// + public void GetReportAsync(GetReportRequest reportRequest) { + this.GetReportAsync(reportRequest, null); + } + + /// + public void GetReportAsync(GetReportRequest reportRequest, object userState) { + if ((this.GetReportOperationCompleted == null)) { + this.GetReportOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetReportOperationCompleted); + } + this.InvokeAsync("GetReport", new object[] { + reportRequest}, this.GetReportOperationCompleted, userState); + } + + private void OnGetReportOperationCompleted(object arg) { + if ((this.GetReportCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetReportCompleted(this, new GetReportCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/AddScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public WebServiceResult AddScript(UserScript newUserScript) { + object[] results = this.Invoke("AddScript", new object[] { + newUserScript}); + return ((WebServiceResult)(results[0])); + } + + /// + public void AddScriptAsync(UserScript newUserScript) { + this.AddScriptAsync(newUserScript, null); + } + + /// + public void AddScriptAsync(UserScript newUserScript, object userState) { + if ((this.AddScriptOperationCompleted == null)) { + this.AddScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddScriptOperationCompleted); + } + this.InvokeAsync("AddScript", new object[] { + newUserScript}, this.AddScriptOperationCompleted, userState); + } + + private void OnAddScriptOperationCompleted(object arg) { + if ((this.AddScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.AddScriptCompleted(this, new AddScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetAllScripts", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserScriptsResult GetAllScripts(bool includeInactiveUserScripts) { + object[] results = this.Invoke("GetAllScripts", new object[] { + includeInactiveUserScripts}); + return ((GetUserScriptsResult)(results[0])); + } + + /// + public void GetAllScriptsAsync(bool includeInactiveUserScripts) { + this.GetAllScriptsAsync(includeInactiveUserScripts, null); + } + + /// + public void GetAllScriptsAsync(bool includeInactiveUserScripts, object userState) { + if ((this.GetAllScriptsOperationCompleted == null)) { + this.GetAllScriptsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAllScriptsOperationCompleted); + } + this.InvokeAsync("GetAllScripts", new object[] { + includeInactiveUserScripts}, this.GetAllScriptsOperationCompleted, userState); + } + + private void OnGetAllScriptsOperationCompleted(object arg) { + if ((this.GetAllScriptsCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetAllScriptsCompleted(this, new GetAllScriptsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/GetScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public GetUserScriptResult GetScript(int userScriptId) { + object[] results = this.Invoke("GetScript", new object[] { + userScriptId}); + return ((GetUserScriptResult)(results[0])); + } + + /// + public void GetScriptAsync(int userScriptId) { + this.GetScriptAsync(userScriptId, null); + } + + /// + public void GetScriptAsync(int userScriptId, object userState) { + if ((this.GetScriptOperationCompleted == null)) { + this.GetScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetScriptOperationCompleted); + } + this.InvokeAsync("GetScript", new object[] { + userScriptId}, this.GetScriptOperationCompleted, userState); + } + + private void OnGetScriptOperationCompleted(object arg) { + if ((this.GetScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.GetScriptCompleted(this, new GetScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + [System.Web.Services.Protocols.SoapDocumentMethodAttribute("urn:thesecretserver.com/UpdateScript", RequestNamespace="urn:thesecretserver.com", ResponseNamespace="urn:thesecretserver.com", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)] + public UpdateUserScriptResult UpdateScript(UserScript userScript) { + object[] results = this.Invoke("UpdateScript", new object[] { + userScript}); + return ((UpdateUserScriptResult)(results[0])); + } + + /// + public void UpdateScriptAsync(UserScript userScript) { + this.UpdateScriptAsync(userScript, null); + } + + /// + public void UpdateScriptAsync(UserScript userScript, object userState) { + if ((this.UpdateScriptOperationCompleted == null)) { + this.UpdateScriptOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateScriptOperationCompleted); + } + this.InvokeAsync("UpdateScript", new object[] { + userScript}, this.UpdateScriptOperationCompleted, userState); + } + + private void OnUpdateScriptOperationCompleted(object arg) { + if ((this.UpdateScriptCompleted != null)) { + System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg)); + this.UpdateScriptCompleted(this, new UpdateScriptCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState)); + } + } + + /// + public new void CancelAsync(object userState) { + base.CancelAsync(userState); + } + + private bool IsLocalFileSystemWebService(string url) { + if (((url == null) + || (url == string.Empty))) { + return false; + } + System.Uri wsUri = new System.Uri(url); + if (((wsUri.Port >= 1024) + && (string.Compare(wsUri.Host, "localHost", System.StringComparison.OrdinalIgnoreCase) == 0))) { + return true; + } + return false; + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class RequestApprovalResult : GenericResult { + + private ApprovalInfo approvalInfoField; + + /// + public ApprovalInfo ApprovalInfo { + get { + return this.approvalInfoField; + } + set { + this.approvalInfoField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class ApprovalInfo { + + private AccessRequestState statusField; + + private string responderField; + + private System.DateTime responseDateField; + + private string responseCommentField; + + private System.Nullable expirationDateField; + + private bool canOverrideField; + + /// + public AccessRequestState Status { + get { + return this.statusField; + } + set { + this.statusField = value; + } + } + + /// + public string Responder { + get { + return this.responderField; + } + set { + this.responderField = value; + } + } + + /// + public System.DateTime ResponseDate { + get { + return this.responseDateField; + } + set { + this.responseDateField = value; + } + } + + /// + public string ResponseComment { + get { + return this.responseCommentField; + } + set { + this.responseCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ExpirationDate { + get { + return this.expirationDateField; + } + set { + this.expirationDateField = value; + } + } + + /// + public bool CanOverride { + get { + return this.canOverrideField; + } + set { + this.canOverrideField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum AccessRequestState { + + /// + WaitingForRequest, + + /// + Pending, + + /// + Approved, + + /// + Denied, + + /// + Canceled, + + /// + Expired, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshScriptArgument2 { + + private string nameField; + + private string valueField; + + private SshArgumentType2 sshTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public SshArgumentType2 SshType { + get { + return this.sshTypeField; + } + set { + this.sshTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum SshArgumentType2 { + + /// + Interpreted, + + /// + Literal, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDataSshObject { + + private string portField; + + private LineEnding lineEndingField; + + private bool doNotUseEnvironmentField; + + private SshScriptArgument2[] paramsField; + + private int versionField; + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public LineEnding LineEnding { + get { + return this.lineEndingField; + } + set { + this.lineEndingField = value; + } + } + + /// + public bool DoNotUseEnvironment { + get { + return this.doNotUseEnvironmentField; + } + set { + this.doNotUseEnvironmentField = value; + } + } + + /// + public SshScriptArgument2[] Params { + get { + return this.paramsField; + } + set { + this.paramsField = value; + } + } + + /// + public int Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum LineEnding { + + /// + NewLine, + + /// + CarriageReturn, + + /// + CarriageReturnNewLine, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetReportResult { + + private string[] errorsField; + + private System.Data.DataTable reportField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public System.Data.DataTable Report { + get { + return this.reportField; + } + set { + this.reportField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DualControlApproval { + + private string usernameField; + + private string passwordField; + + private System.Nullable domainIdField; + + private string twoFactorField; + + /// + public string Username { + get { + return this.usernameField; + } + set { + this.usernameField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string TwoFactor { + get { + return this.twoFactorField; + } + set { + this.twoFactorField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class ReportParameter { + + private string nameField; + + private string valueField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetReportRequest { + + private System.Nullable reportIdField; + + private string reportNameField; + + private ReportParameter[] parametersField; + + private DualControlApproval dualControlApprovalField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable reportId { + get { + return this.reportIdField; + } + set { + this.reportIdField = value; + } + } + + /// + public string reportName { + get { + return this.reportNameField; + } + set { + this.reportNameField = value; + } + } + + /// + public ReportParameter[] parameters { + get { + return this.parametersField; + } + set { + this.parametersField = value; + } + } + + /// + public DualControlApproval dualControlApproval { + get { + return this.dualControlApprovalField; + } + set { + this.dualControlApprovalField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSshCommandMenusResult { + + private SshCommandMenu[] sshCommandMenusField; + + private string[] errorsField; + + /// + public SshCommandMenu[] SshCommandMenus { + get { + return this.sshCommandMenusField; + } + set { + this.sshCommandMenusField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenu { + + private int sshCommandMenuIdField; + + private string nameField; + + private bool activeField; + + private string descriptionField; + + /// + public int SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSshCommandMenuResult { + + private SshCommandMenu sshCommandMenuField; + + private string sshCommandsField; + + private string[] errorsField; + + /// + public SshCommandMenu SshCommandMenu { + get { + return this.sshCommandMenuField; + } + set { + this.sshCommandMenuField = value; + } + } + + /// + public string SshCommands { + get { + return this.sshCommandsField; + } + set { + this.sshCommandsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AddGroupRequestMessage { + + private string groupNameField; + + private System.Nullable domainIdField; + + private string domainNameField; + + /// + public string GroupName { + get { + return this.groupNameField; + } + set { + this.groupNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItemHistoryWebServiceResult { + + private int secretItemHistoryIdField; + + private int userIdField; + + private int secretItemIdField; + + private int secretIdField; + + private System.DateTime dateField; + + private string itemValueNewField; + + private string itemValueNew2Field; + + /// + public int SecretItemHistoryId { + get { + return this.secretItemHistoryIdField; + } + set { + this.secretItemHistoryIdField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public int SecretItemId { + get { + return this.secretItemIdField; + } + set { + this.secretItemIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime Date { + get { + return this.dateField; + } + set { + this.dateField = value; + } + } + + /// + public string ItemValueNew { + get { + return this.itemValueNewField; + } + set { + this.itemValueNewField = value; + } + } + + /// + public string ItemValueNew2 { + get { + return this.itemValueNew2Field; + } + set { + this.itemValueNew2Field = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItemHistoryResult { + + private string[] errorsField; + + private bool successField; + + private SecretItemHistoryWebServiceResult[] secretItemHistoriesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + + /// + public SecretItemHistoryWebServiceResult[] SecretItemHistories { + get { + return this.secretItemHistoriesField; + } + set { + this.secretItemHistoriesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UpdateUserResult { + + private User userField; + + private string[] errorsField; + + /// + public User User { + get { + return this.userField; + } + set { + this.userField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class User { + + private System.Nullable idField; + + private string userNameField; + + private string displayNameField; + + private System.Nullable domainIdField; + + private bool isApplicationAccountField; + + private bool radiusTwoFactorField; + + private bool emailTwoFactorField; + + private string radiusUserNameField; + + private string emailAddressField; + + private string passwordField; + + private bool enabledField; + + private bool duoTwoFactorField; + + private bool oATHTwoFactorField; + + private bool fido2TwoFactorField; + + private int unixAuthenticationMethodField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public bool IsApplicationAccount { + get { + return this.isApplicationAccountField; + } + set { + this.isApplicationAccountField = value; + } + } + + /// + public bool RadiusTwoFactor { + get { + return this.radiusTwoFactorField; + } + set { + this.radiusTwoFactorField = value; + } + } + + /// + public bool EmailTwoFactor { + get { + return this.emailTwoFactorField; + } + set { + this.emailTwoFactorField = value; + } + } + + /// + public string RadiusUserName { + get { + return this.radiusUserNameField; + } + set { + this.radiusUserNameField = value; + } + } + + /// + public string EmailAddress { + get { + return this.emailAddressField; + } + set { + this.emailAddressField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + public bool Enabled { + get { + return this.enabledField; + } + set { + this.enabledField = value; + } + } + + /// + public bool DuoTwoFactor { + get { + return this.duoTwoFactorField; + } + set { + this.duoTwoFactorField = value; + } + } + + /// + public bool OATHTwoFactor { + get { + return this.oATHTwoFactorField; + } + set { + this.oATHTwoFactorField = value; + } + } + + /// + public bool Fido2TwoFactor { + get { + return this.fido2TwoFactorField; + } + set { + this.fido2TwoFactorField = value; + } + } + + /// + public int UnixAuthenticationMethod { + get { + return this.unixAuthenticationMethodField; + } + set { + this.unixAuthenticationMethodField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserResult { + + private User userField; + + private string[] errorsField; + + /// + public User User { + get { + return this.userField; + } + set { + this.userField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUsersResult { + + private User[] usersField; + + private string[] errorsField; + + /// + public User[] Users { + get { + return this.usersField; + } + set { + this.usersField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Group { + + private int idField; + + private string nameField; + + private int domainIdField; + + private string domainNameField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetAllGroupsResult { + + private string[] errorsField; + + private Group[] groupsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Group[] Groups { + get { + return this.groupsField; + } + set { + this.groupsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UserInfoResult { + + private string[] errorsField; + + private string displayNameField; + + private string userNameField; + + private string knownAsField; + + private int userIdField; + + private int domainIdField; + + private string domainNameField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + public string KnownAs { + get { + return this.knownAsField; + } + set { + this.knownAsField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public int DomainId { + get { + return this.domainIdField; + } + set { + this.domainIdField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class TicketSystem { + + private int ticketSystemIdField; + + private string nameField; + + private string descriptionField; + + private bool isDefaultField; + + /// + public int TicketSystemId { + get { + return this.ticketSystemIdField; + } + set { + this.ticketSystemIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public bool IsDefault { + get { + return this.isDefaultField; + } + set { + this.isDefaultField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetTicketSystemsResult { + + private TicketSystem[] ticketSystemsField; + + private string[] errorsField; + + private bool successField; + + /// + public TicketSystem[] TicketSystems { + get { + return this.ticketSystemsField; + } + set { + this.ticketSystemsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SiteConnector { + + private int siteConnectorIdField; + + private string siteConnectorNameField; + + private string queueTypeField; + + private string hostNameField; + + private int portField; + + private bool activeField; + + private bool validatedField; + + private bool useSslField; + + private string sslCertificateThumbprintField; + + private System.DateTime lastModifiedDateField; + + private string userNameField; + + private byte[] passwordIVField; + + private string versionField; + + /// + public int SiteConnectorId { + get { + return this.siteConnectorIdField; + } + set { + this.siteConnectorIdField = value; + } + } + + /// + public string SiteConnectorName { + get { + return this.siteConnectorNameField; + } + set { + this.siteConnectorNameField = value; + } + } + + /// + public string QueueType { + get { + return this.queueTypeField; + } + set { + this.queueTypeField = value; + } + } + + /// + public string HostName { + get { + return this.hostNameField; + } + set { + this.hostNameField = value; + } + } + + /// + public int Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public bool Validated { + get { + return this.validatedField; + } + set { + this.validatedField = value; + } + } + + /// + public bool UseSsl { + get { + return this.useSslField; + } + set { + this.useSslField = value; + } + } + + /// + public string SslCertificateThumbprint { + get { + return this.sslCertificateThumbprintField; + } + set { + this.sslCertificateThumbprintField = value; + } + } + + /// + public System.DateTime LastModifiedDate { + get { + return this.lastModifiedDateField; + } + set { + this.lastModifiedDateField = value; + } + } + + /// + public string UserName { + get { + return this.userNameField; + } + set { + this.userNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] PasswordIV { + get { + return this.passwordIVField; + } + set { + this.passwordIVField = value; + } + } + + /// + public string Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(Site))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AuditAsOfSiteLog { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Site : AuditAsOfSiteLog { + + private int siteIdField; + + private int organizationIdField; + + private string symmetricKeyField; + + private byte[] symmetricKeyIVField; + + private byte[] initializationVectorField; + + private string siteNameField; + + private bool activeField; + + private int heartbeatIntervalField; + + private bool useWebSiteField; + + private bool systemSiteField; + + private bool enableSshProxyField; + + private System.Nullable sshProxyPortField; + + private bool enableRDPProxyField; + + private System.Nullable rdpProxyPortField; + + private System.Nullable secretIdField; + + private System.DateTime lastModifiedDateField; + + private string winRMEndpointField; + + private System.Nullable enableCredSSPForWinRMField; + + private int siteConnectorIdField; + + private SiteConnector siteConnectorField; + + private string customAuditActionField; + + /// + public int SiteId { + get { + return this.siteIdField; + } + set { + this.siteIdField = value; + } + } + + /// + public int OrganizationId { + get { + return this.organizationIdField; + } + set { + this.organizationIdField = value; + } + } + + /// + public string SymmetricKey { + get { + return this.symmetricKeyField; + } + set { + this.symmetricKeyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] SymmetricKeyIV { + get { + return this.symmetricKeyIVField; + } + set { + this.symmetricKeyIVField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] InitializationVector { + get { + return this.initializationVectorField; + } + set { + this.initializationVectorField = value; + } + } + + /// + public string SiteName { + get { + return this.siteNameField; + } + set { + this.siteNameField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public int HeartbeatInterval { + get { + return this.heartbeatIntervalField; + } + set { + this.heartbeatIntervalField = value; + } + } + + /// + public bool UseWebSite { + get { + return this.useWebSiteField; + } + set { + this.useWebSiteField = value; + } + } + + /// + public bool SystemSite { + get { + return this.systemSiteField; + } + set { + this.systemSiteField = value; + } + } + + /// + public bool EnableSshProxy { + get { + return this.enableSshProxyField; + } + set { + this.enableSshProxyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshProxyPort { + get { + return this.sshProxyPortField; + } + set { + this.sshProxyPortField = value; + } + } + + /// + public bool EnableRDPProxy { + get { + return this.enableRDPProxyField; + } + set { + this.enableRDPProxyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RdpProxyPort { + get { + return this.rdpProxyPortField; + } + set { + this.rdpProxyPortField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime LastModifiedDate { + get { + return this.lastModifiedDateField; + } + set { + this.lastModifiedDateField = value; + } + } + + /// + public string WinRMEndpoint { + get { + return this.winRMEndpointField; + } + set { + this.winRMEndpointField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable EnableCredSSPForWinRM { + get { + return this.enableCredSSPForWinRMField; + } + set { + this.enableCredSSPForWinRMField = value; + } + } + + /// + public int SiteConnectorId { + get { + return this.siteConnectorIdField; + } + set { + this.siteConnectorIdField = value; + } + } + + /// + public SiteConnector SiteConnector { + get { + return this.siteConnectorField; + } + set { + this.siteConnectorField = value; + } + } + + /// + public string CustomAuditAction { + get { + return this.customAuditActionField; + } + set { + this.customAuditActionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSitesResult { + + private Site[] sitesField; + + private string[] errorsField; + + private bool successField; + + /// + public Site[] Sites { + get { + return this.sitesField; + } + set { + this.sitesField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetDependencyGroupsResult { + + private DependencyGroup[] dependencyGroupsField; + + private string[] errorsField; + + private bool successField; + + /// + public DependencyGroup[] DependencyGroups { + get { + return this.dependencyGroupsField; + } + set { + this.dependencyGroupsField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DependencyGroup { + + private int secretDependencyGroupIdField; + + private int secretIdField; + + private string nameField; + + private System.Nullable siteIdField; + + /// + public int SecretDependencyGroupId { + get { + return this.secretDependencyGroupIdField; + } + set { + this.secretDependencyGroupIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SiteId { + get { + return this.siteIdField; + } + set { + this.siteIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class DependencyScanItemField { + + private int scanItemFieldIdField; + + private string nameField; + + private string valueField; + + private string parentNameField; + + /// + public int ScanItemFieldId { + get { + return this.scanItemFieldIdField; + } + set { + this.scanItemFieldIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public string ParentName { + get { + return this.parentNameField; + } + set { + this.parentNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class OdbcConnectionArg { + + private string nameField; + + private string valueField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlScriptArgument { + + private string nameField; + + private object valueField; + + private DbType dbTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public object Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public DbType DbType { + get { + return this.dbTypeField; + } + set { + this.dbTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum DbType { + + /// + AnsiString, + + /// + Binary, + + /// + Byte, + + /// + Boolean, + + /// + Currency, + + /// + Date, + + /// + DateTime, + + /// + Decimal, + + /// + Double, + + /// + Guid, + + /// + Int16, + + /// + Int32, + + /// + Int64, + + /// + Object, + + /// + SByte, + + /// + Single, + + /// + String, + + /// + Time, + + /// + UInt16, + + /// + UInt32, + + /// + UInt64, + + /// + VarNumeric, + + /// + AnsiStringFixedLength, + + /// + StringFixedLength, + + /// + Xml, + + /// + DateTime2, + + /// + DateTimeOffset, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshScriptArgument { + + private string nameField; + + private string valueField; + + private SshArgumentType sshTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public SshArgumentType SshType { + get { + return this.sshTypeField; + } + set { + this.sshTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum SshArgumentType { + + /// + Interpreted, + + /// + Literal, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDependencyInfoJson { + + private string regexField; + + private string powershellArgumentsField; + + private SshScriptArgument[] sshArgumentsField; + + private SqlScriptArgument[] sqlArgumentsField; + + private OdbcConnectionArg[] odbcConnectionArgumentsField; + + private DependencyScanItemField[] dependencyScanItemFieldsField; + + private string portField; + + private string databaseField; + + private string serverKeyDigestField; + + /// + public string Regex { + get { + return this.regexField; + } + set { + this.regexField = value; + } + } + + /// + public string PowershellArguments { + get { + return this.powershellArgumentsField; + } + set { + this.powershellArgumentsField = value; + } + } + + /// + public SshScriptArgument[] SshArguments { + get { + return this.sshArgumentsField; + } + set { + this.sshArgumentsField = value; + } + } + + /// + public SqlScriptArgument[] SqlArguments { + get { + return this.sqlArgumentsField; + } + set { + this.sqlArgumentsField = value; + } + } + + /// + public OdbcConnectionArg[] OdbcConnectionArguments { + get { + return this.odbcConnectionArgumentsField; + } + set { + this.odbcConnectionArgumentsField = value; + } + } + + /// + public DependencyScanItemField[] DependencyScanItemFields { + get { + return this.dependencyScanItemFieldsField; + } + set { + this.dependencyScanItemFieldsField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + + /// + public string Database { + get { + return this.databaseField; + } + set { + this.databaseField = value; + } + } + + /// + public string ServerKeyDigest { + get { + return this.serverKeyDigestField; + } + set { + this.serverKeyDigestField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Dependency { + + private int secretIdField; + + private int secretDependencyTypeIdField; + + private string machineNameField; + + private string serviceNameField; + + private int privilegedAccountSecretIdField; + + private bool activeField; + + private bool restartOnPasswordChangeField; + + private int waitBeforeSecondsField; + + private AdditionalDependencyInfoJson additionalInfoField; + + private string descriptionField; + + private int scriptIdField; + + private int secretDependencyIdField; + + private System.Nullable sSHKeySecretIdField; + + private System.Nullable secretDependencyTemplateIdField; + + private System.Nullable secretDependencyGroupIdField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public int SecretDependencyTypeId { + get { + return this.secretDependencyTypeIdField; + } + set { + this.secretDependencyTypeIdField = value; + } + } + + /// + public string MachineName { + get { + return this.machineNameField; + } + set { + this.machineNameField = value; + } + } + + /// + public string ServiceName { + get { + return this.serviceNameField; + } + set { + this.serviceNameField = value; + } + } + + /// + public int PrivilegedAccountSecretId { + get { + return this.privilegedAccountSecretIdField; + } + set { + this.privilegedAccountSecretIdField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public bool RestartOnPasswordChange { + get { + return this.restartOnPasswordChangeField; + } + set { + this.restartOnPasswordChangeField = value; + } + } + + /// + public int WaitBeforeSeconds { + get { + return this.waitBeforeSecondsField; + } + set { + this.waitBeforeSecondsField = value; + } + } + + /// + public AdditionalDependencyInfoJson AdditionalInfo { + get { + return this.additionalInfoField; + } + set { + this.additionalInfoField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public int ScriptId { + get { + return this.scriptIdField; + } + set { + this.scriptIdField = value; + } + } + + /// + public int SecretDependencyId { + get { + return this.secretDependencyIdField; + } + set { + this.secretDependencyIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SSHKeySecretId { + get { + return this.sSHKeySecretIdField; + } + set { + this.sSHKeySecretIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretDependencyTemplateId { + get { + return this.secretDependencyTemplateIdField; + } + set { + this.secretDependencyTemplateIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretDependencyGroupId { + get { + return this.secretDependencyGroupIdField; + } + set { + this.secretDependencyGroupIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetDependenciesResult { + + private Dependency[] dependenciesField; + + private string[] errorsField; + + private bool successField; + + /// + public Dependency[] Dependencies { + get { + return this.dependenciesField; + } + set { + this.dependenciesField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchFolderResult { + + private string[] errorsField; + + private Folder[] foldersField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Folder[] Folders { + get { + return this.foldersField; + } + set { + this.foldersField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtended))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Folder { + + private int idField; + + private string nameField; + + private int typeIdField; + + private int parentFolderIdField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int TypeId { + get { + return this.typeIdField; + } + set { + this.typeIdField = value; + } + } + + /// + public int ParentFolderId { + get { + return this.parentFolderIdField; + } + set { + this.parentFolderIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtended : Folder { + + private FolderPermissions permissionSettingsField; + + private FolderSettings settingsField; + + /// + public FolderPermissions PermissionSettings { + get { + return this.permissionSettingsField; + } + set { + this.permissionSettingsField = value; + } + } + + /// + public FolderSettings Settings { + get { + return this.settingsField; + } + set { + this.settingsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderPermissions { + + private System.Nullable isChangeToPermissionsField; + + private System.Nullable inheritPermissionsEnabledField; + + private FolderPermission[] permissionsField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsChangeToPermissions { + get { + return this.isChangeToPermissionsField; + } + set { + this.isChangeToPermissionsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissionsEnabled { + get { + return this.inheritPermissionsEnabledField; + } + set { + this.inheritPermissionsEnabledField = value; + } + } + + /// + public FolderPermission[] Permissions { + get { + return this.permissionsField; + } + set { + this.permissionsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderPermission { + + private GroupOrUserRecord userOrGroupField; + + private string folderAccessRoleNameField; + + private System.Nullable folderAccessRoleIdField; + + private string secretAccessRoleNameField; + + private System.Nullable secretAccessRoleIdField; + + /// + public GroupOrUserRecord UserOrGroup { + get { + return this.userOrGroupField; + } + set { + this.userOrGroupField = value; + } + } + + /// + public string FolderAccessRoleName { + get { + return this.folderAccessRoleNameField; + } + set { + this.folderAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable FolderAccessRoleId { + get { + return this.folderAccessRoleIdField; + } + set { + this.folderAccessRoleIdField = value; + } + } + + /// + public string SecretAccessRoleName { + get { + return this.secretAccessRoleNameField; + } + set { + this.secretAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretAccessRoleId { + get { + return this.secretAccessRoleIdField; + } + set { + this.secretAccessRoleIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GroupOrUserRecord { + + private string nameField; + + private string domainNameField; + + private bool isUserField; + + private System.Nullable groupIdField; + + private System.Nullable userIdField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string DomainName { + get { + return this.domainNameField; + } + set { + this.domainNameField = value; + } + } + + /// + public bool IsUser { + get { + return this.isUserField; + } + set { + this.isUserField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable GroupId { + get { + return this.groupIdField; + } + set { + this.groupIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderSettings { + + private System.Nullable isChangeToSettingsField; + + private System.Nullable inheritSecretPolicyField; + + private System.Nullable secretPolicyIdField; + + private SecretType[] associatedTemplatesField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsChangeToSettings { + get { + return this.isChangeToSettingsField; + } + set { + this.isChangeToSettingsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritSecretPolicy { + get { + return this.inheritSecretPolicyField; + } + set { + this.inheritSecretPolicyField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public SecretType[] AssociatedTemplates { + get { + return this.associatedTemplatesField; + } + set { + this.associatedTemplatesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretType : TrackChanges { + + private string secretTypeDescriptionField; + + private int typeIDField; + + private int rPCRetryIntervalField; + + private System.Nullable rPCMaxAttemptsField; + + private bool launcherTypeReadyField; + + private bool enableHeartBeatField; + + private int secretNameHistoryLengthField; + + private string namePatternField; + + private string namePatternErrorMessageField; + + private bool activeField; + + private string nameField; + + private int organizationIdField; + + private int expirationFieldIdField; + + private int expirationDaysField; + + private int passwordTypeIdField; + + private bool passwordTypeReadyField; + + private string imageClassField; + + private int heartBeatCheckIntervalField; + + private bool validatePasswordRequirementsOnCreateField; + + private bool validatePasswordRequirementsOnEditField; + + private System.Nullable defaultPrivilegedAccountSecretIdField; + + private int basicHomeDisplayFieldIdField; + + private System.Nullable oneTimePasswordEnabledField; + + private System.Nullable oneTimePasswordHashModeField; + + private System.Nullable oneTimePasswordDurationSecondsField; + + private System.Nullable oneTimePasswordCodeLengthField; + + private System.Nullable secretCountField; + + /// + public string SecretTypeDescription { + get { + return this.secretTypeDescriptionField; + } + set { + this.secretTypeDescriptionField = value; + } + } + + /// + public int TypeID { + get { + return this.typeIDField; + } + set { + this.typeIDField = value; + } + } + + /// + public int RPCRetryInterval { + get { + return this.rPCRetryIntervalField; + } + set { + this.rPCRetryIntervalField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RPCMaxAttempts { + get { + return this.rPCMaxAttemptsField; + } + set { + this.rPCMaxAttemptsField = value; + } + } + + /// + public bool LauncherTypeReady { + get { + return this.launcherTypeReadyField; + } + set { + this.launcherTypeReadyField = value; + } + } + + /// + public bool EnableHeartBeat { + get { + return this.enableHeartBeatField; + } + set { + this.enableHeartBeatField = value; + } + } + + /// + public int SecretNameHistoryLength { + get { + return this.secretNameHistoryLengthField; + } + set { + this.secretNameHistoryLengthField = value; + } + } + + /// + public string NamePattern { + get { + return this.namePatternField; + } + set { + this.namePatternField = value; + } + } + + /// + public string NamePatternErrorMessage { + get { + return this.namePatternErrorMessageField; + } + set { + this.namePatternErrorMessageField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public int OrganizationId { + get { + return this.organizationIdField; + } + set { + this.organizationIdField = value; + } + } + + /// + public int ExpirationFieldId { + get { + return this.expirationFieldIdField; + } + set { + this.expirationFieldIdField = value; + } + } + + /// + public int ExpirationDays { + get { + return this.expirationDaysField; + } + set { + this.expirationDaysField = value; + } + } + + /// + public int PasswordTypeId { + get { + return this.passwordTypeIdField; + } + set { + this.passwordTypeIdField = value; + } + } + + /// + public bool PasswordTypeReady { + get { + return this.passwordTypeReadyField; + } + set { + this.passwordTypeReadyField = value; + } + } + + /// + public string ImageClass { + get { + return this.imageClassField; + } + set { + this.imageClassField = value; + } + } + + /// + public int HeartBeatCheckInterval { + get { + return this.heartBeatCheckIntervalField; + } + set { + this.heartBeatCheckIntervalField = value; + } + } + + /// + public bool ValidatePasswordRequirementsOnCreate { + get { + return this.validatePasswordRequirementsOnCreateField; + } + set { + this.validatePasswordRequirementsOnCreateField = value; + } + } + + /// + public bool ValidatePasswordRequirementsOnEdit { + get { + return this.validatePasswordRequirementsOnEditField; + } + set { + this.validatePasswordRequirementsOnEditField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable DefaultPrivilegedAccountSecretId { + get { + return this.defaultPrivilegedAccountSecretIdField; + } + set { + this.defaultPrivilegedAccountSecretIdField = value; + } + } + + /// + public int BasicHomeDisplayFieldId { + get { + return this.basicHomeDisplayFieldIdField; + } + set { + this.basicHomeDisplayFieldIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordEnabled { + get { + return this.oneTimePasswordEnabledField; + } + set { + this.oneTimePasswordEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordHashMode { + get { + return this.oneTimePasswordHashModeField; + } + set { + this.oneTimePasswordHashModeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordDurationSeconds { + get { + return this.oneTimePasswordDurationSecondsField; + } + set { + this.oneTimePasswordDurationSecondsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable OneTimePasswordCodeLength { + get { + return this.oneTimePasswordCodeLengthField; + } + set { + this.oneTimePasswordCodeLengthField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretCount { + get { + return this.secretCountField; + } + set { + this.secretCountField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretType))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class TrackChanges { + + private bool hasBeenDeletedField; + + private object storageField; + + /// + public bool HasBeenDeleted { + get { + return this.hasBeenDeletedField; + } + set { + this.hasBeenDeletedField = value; + } + } + + /// + public object Storage { + get { + return this.storageField; + } + set { + this.storageField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFoldersResult { + + private Folder[] foldersField; + + private string[] errorsField; + + private bool successField; + + /// + public Folder[] Folders { + get { + return this.foldersField; + } + set { + this.foldersField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFolderResult { + + private Folder folderField; + + private string[] errorsField; + + private bool successField; + + /// + public Folder Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AuditSecret { + + private int auditSecretIdField; + + private int secretIdField; + + private System.DateTime dateRecordedField; + + private string actionField; + + private string notesField; + + private int userIdField; + + private string secretNameField; + + private string ipAddressField; + + private int referenceIdField; + + private string byUserDisplayNameField; + + private string ticketNumberField; + + /// + public int AuditSecretId { + get { + return this.auditSecretIdField; + } + set { + this.auditSecretIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public System.DateTime DateRecorded { + get { + return this.dateRecordedField; + } + set { + this.dateRecordedField = value; + } + } + + /// + public string Action { + get { + return this.actionField; + } + set { + this.actionField = value; + } + } + + /// + public string Notes { + get { + return this.notesField; + } + set { + this.notesField = value; + } + } + + /// + public int UserId { + get { + return this.userIdField; + } + set { + this.userIdField = value; + } + } + + /// + public string SecretName { + get { + return this.secretNameField; + } + set { + this.secretNameField = value; + } + } + + /// + public string IpAddress { + get { + return this.ipAddressField; + } + set { + this.ipAddressField = value; + } + } + + /// + public int ReferenceId { + get { + return this.referenceIdField; + } + set { + this.referenceIdField = value; + } + } + + /// + public string ByUserDisplayName { + get { + return this.byUserDisplayNameField; + } + set { + this.byUserDisplayNameField = value; + } + } + + /// + public string TicketNumber { + get { + return this.ticketNumberField; + } + set { + this.ticketNumberField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretAuditResult { + + private string[] errorsField; + + private AuditSecret[] secretAuditsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public AuditSecret[] SecretAudits { + get { + return this.secretAuditsField; + } + set { + this.secretAuditsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetCheckOutStatusResult { + + private string[] errorsField; + + private Secret secretField; + + private int checkOutMinutesRemainingField; + + private bool isCheckedOutField; + + private string checkOutUserDisplayNameField; + + private int checkOutUserIdField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + + /// + public int CheckOutMinutesRemaining { + get { + return this.checkOutMinutesRemainingField; + } + set { + this.checkOutMinutesRemainingField = value; + } + } + + /// + public bool IsCheckedOut { + get { + return this.isCheckedOutField; + } + set { + this.isCheckedOutField = value; + } + } + + /// + public string CheckOutUserDisplayName { + get { + return this.checkOutUserDisplayNameField; + } + set { + this.checkOutUserDisplayNameField = value; + } + } + + /// + public int CheckOutUserId { + get { + return this.checkOutUserIdField; + } + set { + this.checkOutUserIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Secret { + + private string nameField; + + private SecretItem[] itemsField; + + private int idField; + + private int secretTypeIdField; + + private int folderIdField; + + private bool isWebLauncherField; + + private System.Nullable checkOutMinutesRemainingField; + + private System.Nullable isCheckedOutField; + + private string checkOutUserDisplayNameField; + + private System.Nullable checkOutUserIdField; + + private System.Nullable isOutOfSyncField; + + private System.Nullable isRestrictedField; + + private string outOfSyncReasonField; + + private SecretSettings secretSettingsField; + + private SecretPermissions secretPermissionsField; + + private System.Nullable activeField; + + private bool activeFieldSpecified; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public SecretItem[] Items { + get { + return this.itemsField; + } + set { + this.itemsField = value; + } + } + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public int SecretTypeId { + get { + return this.secretTypeIdField; + } + set { + this.secretTypeIdField = value; + } + } + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + + /// + public bool IsWebLauncher { + get { + return this.isWebLauncherField; + } + set { + this.isWebLauncherField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutMinutesRemaining { + get { + return this.checkOutMinutesRemainingField; + } + set { + this.checkOutMinutesRemainingField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsCheckedOut { + get { + return this.isCheckedOutField; + } + set { + this.isCheckedOutField = value; + } + } + + /// + public string CheckOutUserDisplayName { + get { + return this.checkOutUserDisplayNameField; + } + set { + this.checkOutUserDisplayNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutUserId { + get { + return this.checkOutUserIdField; + } + set { + this.checkOutUserIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsOutOfSync { + get { + return this.isOutOfSyncField; + } + set { + this.isOutOfSyncField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IsRestricted { + get { + return this.isRestrictedField; + } + set { + this.isRestrictedField = value; + } + } + + /// + public string OutOfSyncReason { + get { + return this.outOfSyncReasonField; + } + set { + this.outOfSyncReasonField = value; + } + } + + /// + public SecretSettings SecretSettings { + get { + return this.secretSettingsField; + } + set { + this.secretSettingsField = value; + } + } + + /// + public SecretPermissions SecretPermissions { + get { + return this.secretPermissionsField; + } + set { + this.secretPermissionsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + + /// + [System.Xml.Serialization.XmlIgnoreAttribute()] + public bool ActiveSpecified { + get { + return this.activeFieldSpecified; + } + set { + this.activeFieldSpecified = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretItem { + + private string valueField; + + private System.Nullable idField; + + private System.Nullable fieldIdField; + + private string fieldNameField; + + private bool isFileField; + + private bool isNotesField; + + private bool isPasswordField; + + private string fieldDisplayNameField; + + /// + public string Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable FieldId { + get { + return this.fieldIdField; + } + set { + this.fieldIdField = value; + } + } + + /// + public string FieldName { + get { + return this.fieldNameField; + } + set { + this.fieldNameField = value; + } + } + + /// + public bool IsFile { + get { + return this.isFileField; + } + set { + this.isFileField = value; + } + } + + /// + public bool IsNotes { + get { + return this.isNotesField; + } + set { + this.isNotesField = value; + } + } + + /// + public bool IsPassword { + get { + return this.isPasswordField; + } + set { + this.isPasswordField = value; + } + } + + /// + public string FieldDisplayName { + get { + return this.fieldDisplayNameField; + } + set { + this.fieldDisplayNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretSettings { + + private System.Nullable autoChangeEnabledField; + + private System.Nullable requiresApprovalForAccessField; + + private System.Nullable requiresCommentField; + + private System.Nullable checkOutEnabledField; + + private System.Nullable checkOutChangePasswordEnabledField; + + private System.Nullable proxyEnabledField; + + private System.Nullable sessionRecordingEnabledField; + + private System.Nullable restrictSshCommandsField; + + private System.Nullable commandRestrictionTypeField; + + private System.Nullable allowOwnersUnrestrictedSshCommandsField; + + private System.Nullable privilegedSecretIdField; + + private int[] associatedSecretIdsField; + + private GroupOrUserRecord[] approversField; + + private SshCommandMenuAccessPermission[] sshCommandMenuAccessPermissionsField; + + private SshCommandBlocklistPermissionDto[] sshCommandBlocklistPermissionsField; + + private bool isChangeToSettingsField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable AutoChangeEnabled { + get { + return this.autoChangeEnabledField; + } + set { + this.autoChangeEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RequiresApprovalForAccess { + get { + return this.requiresApprovalForAccessField; + } + set { + this.requiresApprovalForAccessField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RequiresComment { + get { + return this.requiresCommentField; + } + set { + this.requiresCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutEnabled { + get { + return this.checkOutEnabledField; + } + set { + this.checkOutEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CheckOutChangePasswordEnabled { + get { + return this.checkOutChangePasswordEnabledField; + } + set { + this.checkOutChangePasswordEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ProxyEnabled { + get { + return this.proxyEnabledField; + } + set { + this.proxyEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SessionRecordingEnabled { + get { + return this.sessionRecordingEnabledField; + } + set { + this.sessionRecordingEnabledField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable RestrictSshCommands { + get { + return this.restrictSshCommandsField; + } + set { + this.restrictSshCommandsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable CommandRestrictionType { + get { + return this.commandRestrictionTypeField; + } + set { + this.commandRestrictionTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable AllowOwnersUnrestrictedSshCommands { + get { + return this.allowOwnersUnrestrictedSshCommandsField; + } + set { + this.allowOwnersUnrestrictedSshCommandsField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable PrivilegedSecretId { + get { + return this.privilegedSecretIdField; + } + set { + this.privilegedSecretIdField = value; + } + } + + /// + public int[] AssociatedSecretIds { + get { + return this.associatedSecretIdsField; + } + set { + this.associatedSecretIdsField = value; + } + } + + /// + public GroupOrUserRecord[] Approvers { + get { + return this.approversField; + } + set { + this.approversField = value; + } + } + + /// + public SshCommandMenuAccessPermission[] SshCommandMenuAccessPermissions { + get { + return this.sshCommandMenuAccessPermissionsField; + } + set { + this.sshCommandMenuAccessPermissionsField = value; + } + } + + /// + public SshCommandBlocklistPermissionDto[] SshCommandBlocklistPermissions { + get { + return this.sshCommandBlocklistPermissionsField; + } + set { + this.sshCommandBlocklistPermissionsField = value; + } + } + + /// + public bool IsChangeToSettings { + get { + return this.isChangeToSettingsField; + } + set { + this.isChangeToSettingsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenuAccessPermission { + + private GroupOrUserRecord groupOrUserRecordField; + + private int secretIdField; + + private string concurrencyIdField; + + private string displayNameField; + + private string sshCommandMenuNameField; + + private bool isUnrestrictedField; + + private System.Nullable sshCommandMenuIdField; + + /// + public GroupOrUserRecord GroupOrUserRecord { + get { + return this.groupOrUserRecordField; + } + set { + this.groupOrUserRecordField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string ConcurrencyId { + get { + return this.concurrencyIdField; + } + set { + this.concurrencyIdField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public string SshCommandMenuName { + get { + return this.sshCommandMenuNameField; + } + set { + this.sshCommandMenuNameField = value; + } + } + + /// + public bool IsUnrestricted { + get { + return this.isUnrestrictedField; + } + set { + this.isUnrestrictedField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandBlocklistPermissionDto { + + private int sshCommandBlocklistPermissionIdField; + + private System.Nullable sshCommandBlocklistIdField; + + private int secretIdField; + + private int rolePermissionIdField; + + private string displayNameField; + + private string sshCommandBlocklistNameField; + + /// + public int SshCommandBlocklistPermissionId { + get { + return this.sshCommandBlocklistPermissionIdField; + } + set { + this.sshCommandBlocklistPermissionIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshCommandBlocklistId { + get { + return this.sshCommandBlocklistIdField; + } + set { + this.sshCommandBlocklistIdField = value; + } + } + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public int RolePermissionId { + get { + return this.rolePermissionIdField; + } + set { + this.rolePermissionIdField = value; + } + } + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public string SshCommandBlocklistName { + get { + return this.sshCommandBlocklistNameField; + } + set { + this.sshCommandBlocklistNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPermissions { + + private bool currentUserHasViewField; + + private bool currentUserHasEditField; + + private bool currentUserHasOwnerField; + + private System.Nullable inheritPermissionsEnabledField; + + private bool isChangeToPermissionsField; + + private Permission[] permissionsField; + + /// + public bool CurrentUserHasView { + get { + return this.currentUserHasViewField; + } + set { + this.currentUserHasViewField = value; + } + } + + /// + public bool CurrentUserHasEdit { + get { + return this.currentUserHasEditField; + } + set { + this.currentUserHasEditField = value; + } + } + + /// + public bool CurrentUserHasOwner { + get { + return this.currentUserHasOwnerField; + } + set { + this.currentUserHasOwnerField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissionsEnabled { + get { + return this.inheritPermissionsEnabledField; + } + set { + this.inheritPermissionsEnabledField = value; + } + } + + /// + public bool IsChangeToPermissions { + get { + return this.isChangeToPermissionsField; + } + set { + this.isChangeToPermissionsField = value; + } + } + + /// + public Permission[] Permissions { + get { + return this.permissionsField; + } + set { + this.permissionsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class Permission { + + private GroupOrUserRecord userOrGroupField; + + private bool viewField; + + private bool editField; + + private bool ownerField; + + private string secretAccessRoleNameField; + + private System.Nullable secretAccessRoleIdField; + + /// + public GroupOrUserRecord UserOrGroup { + get { + return this.userOrGroupField; + } + set { + this.userOrGroupField = value; + } + } + + /// + public bool View { + get { + return this.viewField; + } + set { + this.viewField = value; + } + } + + /// + public bool Edit { + get { + return this.editField; + } + set { + this.editField = value; + } + } + + /// + public bool Owner { + get { + return this.ownerField; + } + set { + this.ownerField = value; + } + } + + /// + public string SecretAccessRoleName { + get { + return this.secretAccessRoleNameField; + } + set { + this.secretAccessRoleNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretAccessRoleId { + get { + return this.secretAccessRoleIdField; + } + set { + this.secretAccessRoleIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class VersionGetResult { + + private string[] errorsField; + + private string versionField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public string Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GeneratePasswordResult { + + private string generatedPasswordField; + + private string[] errorsField; + + /// + public string GeneratedPassword { + get { + return this.generatedPasswordField; + } + set { + this.generatedPasswordField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretTemplate { + + private int idField; + + private string nameField; + + private SecretField[] fieldsField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public SecretField[] Fields { + get { + return this.fieldsField; + } + set { + this.fieldsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretField { + + private string displayNameField; + + private int idField; + + private bool isPasswordField; + + private bool isUrlField; + + private bool isNotesField; + + private bool isFileField; + + /// + public string DisplayName { + get { + return this.displayNameField; + } + set { + this.displayNameField = value; + } + } + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public bool IsPassword { + get { + return this.isPasswordField; + } + set { + this.isPasswordField = value; + } + } + + /// + public bool IsUrl { + get { + return this.isUrlField; + } + set { + this.isUrlField = value; + } + } + + /// + public bool IsNotes { + get { + return this.isNotesField; + } + set { + this.isNotesField = value; + } + } + + /// + public bool IsFile { + get { + return this.isFileField; + } + set { + this.isFileField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretTemplatesResult { + + private string[] errorsField; + + private SecretTemplate[] secretTemplatesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretTemplate[] SecretTemplates { + get { + return this.secretTemplatesField; + } + set { + this.secretTemplatesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretTemplateFieldsResult { + + private string[] errorsField; + + private SecretField[] fieldsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretField[] Fields { + get { + return this.fieldsField; + } + set { + this.fieldsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AddSecretResult { + + private string[] errorsField; + + private Secret secretField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetFavoritesResult { + + private string[] errorsField; + + private SecretSummary[] secretSummariesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretSummary[] SecretSummaries { + get { + return this.secretSummariesField; + } + set { + this.secretSummariesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretSummary { + + private int secretIdField; + + private string secretNameField; + + private string secretTypeNameField; + + private int secretTypeIdField; + + private int folderIdField; + + private bool isRestrictedField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string SecretName { + get { + return this.secretNameField; + } + set { + this.secretNameField = value; + } + } + + /// + public string SecretTypeName { + get { + return this.secretTypeNameField; + } + set { + this.secretTypeNameField = value; + } + } + + /// + public int SecretTypeId { + get { + return this.secretTypeIdField; + } + set { + this.secretTypeIdField = value; + } + } + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + + /// + public bool IsRestricted { + get { + return this.isRestrictedField; + } + set { + this.isRestrictedField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchSecretsResult { + + private string[] errorsField; + + private SecretSummary[] secretSummariesField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretSummary[] SecretSummaries { + get { + return this.secretSummariesField; + } + set { + this.secretSummariesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretsByFieldValueResult { + + private string[] errorsField; + + private Secret[] secretsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public Secret[] Secrets { + get { + return this.secretsField; + } + set { + this.secretsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class CodeResponse { + + private string errorCodeField; + + private string commentField; + + private string additionalCommentField; + + private System.Nullable ticketSystemIdField; + + /// + public string ErrorCode { + get { + return this.errorCodeField; + } + set { + this.errorCodeField = value; + } + } + + /// + public string Comment { + get { + return this.commentField; + } + set { + this.commentField = value; + } + } + + /// + public string AdditionalComment { + get { + return this.additionalCommentField; + } + set { + this.additionalCommentField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable TicketSystemId { + get { + return this.ticketSystemIdField; + } + set { + this.ticketSystemIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretError { + + private string errorCodeField; + + private string errorMessageField; + + private bool allowsResponseField; + + private string commentTitleField; + + private string additionalCommentTitleField; + + /// + public string ErrorCode { + get { + return this.errorCodeField; + } + set { + this.errorCodeField = value; + } + } + + /// + public string ErrorMessage { + get { + return this.errorMessageField; + } + set { + this.errorMessageField = value; + } + } + + /// + public bool AllowsResponse { + get { + return this.allowsResponseField; + } + set { + this.allowsResponseField = value; + } + } + + /// + public string CommentTitle { + get { + return this.commentTitleField; + } + set { + this.commentTitleField = value; + } + } + + /// + public string AdditionalCommentTitle { + get { + return this.additionalCommentTitleField; + } + set { + this.additionalCommentTitleField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetSecretResult { + + private string[] errorsField; + + private SecretError secretErrorField; + + private Secret secretField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + + /// + public SecretError SecretError { + get { + return this.secretErrorField; + } + set { + this.secretErrorField = value; + } + } + + /// + public Secret Secret { + get { + return this.secretField; + } + set { + this.secretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetNewRequest { + + private string folderNameField; + + private System.Nullable parentFolderIdField; + + private System.Nullable inheritPermissionsField; + + /// + public string FolderName { + get { + return this.folderNameField; + } + set { + this.folderNameField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ParentFolderId { + get { + return this.parentFolderIdField; + } + set { + this.parentFolderIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable InheritPermissions { + get { + return this.inheritPermissionsField; + } + set { + this.inheritPermissionsField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedGetNewResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedUpdateResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedGetResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FolderExtendedCreateResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedResultBase { + + private bool successField; + + private string[] errorsField; + + /// + public bool Success { + get { + return this.successField; + } + set { + this.successField = value; + } + } + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetNewResult : FolderExtendedResultBase { + + private FolderExtended folderField; + + /// + public FolderExtended Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedUpdateResult : FolderExtendedResultBase { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedGetResult : FolderExtendedResultBase { + + private FolderExtended folderField; + + /// + public FolderExtended Folder { + get { + return this.folderField; + } + set { + this.folderField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FolderExtendedCreateResult : FolderExtendedResultBase { + + private int folderIdField; + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlScriptArgument2 { + + private string nameField; + + private object valueField; + + private DbType dbTypeField; + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public object Value { + get { + return this.valueField; + } + set { + this.valueField = value; + } + } + + /// + public DbType DbType { + get { + return this.dbTypeField; + } + set { + this.dbTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class AdditionalDataSqlObject { + + private SqlScriptArgument2[] paramsField; + + private int passwordChangerIdField; + + private int versionField; + + private string databaseField; + + private string portField; + + /// + public SqlScriptArgument2[] Params { + get { + return this.paramsField; + } + set { + this.paramsField = value; + } + } + + /// + public int PasswordChangerId { + get { + return this.passwordChangerIdField; + } + set { + this.passwordChangerIdField = value; + } + } + + /// + public int Version { + get { + return this.versionField; + } + set { + this.versionField = value; + } + } + + /// + public string Database { + get { + return this.databaseField; + } + set { + this.databaseField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SshUserScript))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(PowerShellUserScript))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SqlUserScript))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public abstract partial class UserScript { + + private int scriptIdField; + + private string nameField; + + private string descriptionField; + + private string scriptField; + + private bool activeField; + + /// + public int ScriptId { + get { + return this.scriptIdField; + } + set { + this.scriptIdField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public string Script { + get { + return this.scriptField; + } + set { + this.scriptField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshUserScript : UserScript { + + private AdditionalDataSshObject additionalDataObjectField; + + /// + public AdditionalDataSshObject AdditionalDataObject { + get { + return this.additionalDataObjectField; + } + set { + this.additionalDataObjectField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class PowerShellUserScript : UserScript { + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SqlUserScript : UserScript { + + private AdditionalDataSqlObject additionalDataObjectField; + + /// + public AdditionalDataSqlObject AdditionalDataObject { + get { + return this.additionalDataObjectField; + } + set { + this.additionalDataObjectField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SshCommandMenuGroupMap { + + private System.Nullable sshCommandMenuIdField; + + private UserGroupMap userGroupMapField; + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SshCommandMenuId { + get { + return this.sshCommandMenuIdField; + } + set { + this.sshCommandMenuIdField = value; + } + } + + /// + public UserGroupMap UserGroupMap { + get { + return this.userGroupMapField; + } + set { + this.userGroupMapField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UserGroupMap { + + private int idField; + + private UserGroupMapType userGroupMapTypeField; + + /// + public int Id { + get { + return this.idField; + } + set { + this.idField = value; + } + } + + /// + public UserGroupMapType UserGroupMapType { + get { + return this.userGroupMapTypeField; + } + set { + this.userGroupMapTypeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public enum UserGroupMapType { + + /// + User, + + /// + Group, + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyItem { + + private int secretPolicyItemMapIdField; + + private int secretPolicyItemIdField; + + private string policyApplyCodeField; + + private System.Nullable enabledValueField; + + private System.Nullable integerValueField; + + private System.Nullable secretIdField; + + private string stringValueField; + + private string nameField; + + private string descriptionField; + + private string valueTypeField; + + private System.Nullable parentSecretPolicyItemIdField; + + private string sectionNameField; + + private UserGroupMap[] userGroupMapsField; + + private SshCommandMenuGroupMap[] sshCommandMenuGroupMapsField; + + /// + public int SecretPolicyItemMapId { + get { + return this.secretPolicyItemMapIdField; + } + set { + this.secretPolicyItemMapIdField = value; + } + } + + /// + public int SecretPolicyItemId { + get { + return this.secretPolicyItemIdField; + } + set { + this.secretPolicyItemIdField = value; + } + } + + /// + public string PolicyApplyCode { + get { + return this.policyApplyCodeField; + } + set { + this.policyApplyCodeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable EnabledValue { + get { + return this.enabledValueField; + } + set { + this.enabledValueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable IntegerValue { + get { + return this.integerValueField; + } + set { + this.integerValueField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + public string StringValue { + get { + return this.stringValueField; + } + set { + this.stringValueField = value; + } + } + + /// + public string Name { + get { + return this.nameField; + } + set { + this.nameField = value; + } + } + + /// + public string Description { + get { + return this.descriptionField; + } + set { + this.descriptionField = value; + } + } + + /// + public string ValueType { + get { + return this.valueTypeField; + } + set { + this.valueTypeField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable ParentSecretPolicyItemId { + get { + return this.parentSecretPolicyItemIdField; + } + set { + this.parentSecretPolicyItemIdField = value; + } + } + + /// + public string SectionName { + get { + return this.sectionNameField; + } + set { + this.sectionNameField = value; + } + } + + /// + public UserGroupMap[] UserGroupMaps { + get { + return this.userGroupMapsField; + } + set { + this.userGroupMapsField = value; + } + } + + /// + public SshCommandMenuGroupMap[] SshCommandMenuGroupMaps { + get { + return this.sshCommandMenuGroupMapsField; + } + set { + this.sshCommandMenuGroupMapsField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyDetail))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicySummary { + + private int secretPolicyIdField; + + private string secretPolicyNameField; + + private string secretPolicyDescriptionField; + + private bool activeField; + + /// + public int SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public string SecretPolicyName { + get { + return this.secretPolicyNameField; + } + set { + this.secretPolicyNameField = value; + } + } + + /// + public string SecretPolicyDescription { + get { + return this.secretPolicyDescriptionField; + } + set { + this.secretPolicyDescriptionField = value; + } + } + + /// + public bool Active { + get { + return this.activeField; + } + set { + this.activeField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyDetail : SecretPolicySummary { + + private SecretPolicyItem[] secretPolicyItemsField; + + /// + public SecretPolicyItem[] SecretPolicyItems { + get { + return this.secretPolicyItemsField; + } + set { + this.secretPolicyItemsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyForSecret { + + private int secretIdField; + + private System.Nullable secretPolicyIdField; + + private bool inheritField; + + /// + public int SecretId { + get { + return this.secretIdField; + } + set { + this.secretIdField = value; + } + } + + /// + [System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] + public System.Nullable SecretPolicyId { + get { + return this.secretPolicyIdField; + } + set { + this.secretPolicyIdField = value; + } + } + + /// + public bool Inherit { + get { + return this.inheritField; + } + set { + this.inheritField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(UpdateUserScriptResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GetUserScriptResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(GetUserScriptsResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SearchSecretPoliciesResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SecretPolicyForSecretResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(SSHCredentialsResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(FileDownloadResult))] + [System.Xml.Serialization.XmlIncludeAttribute(typeof(CreateFolderResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class WebServiceResult { + + private string[] errorsField; + + /// + public string[] Errors { + get { + return this.errorsField; + } + set { + this.errorsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class UpdateUserScriptResult : WebServiceResult { + + private UserScript userScriptField; + + /// + public UserScript UserScript { + get { + return this.userScriptField; + } + set { + this.userScriptField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserScriptResult : WebServiceResult { + + private UserScript userScriptField; + + /// + public UserScript UserScript { + get { + return this.userScriptField; + } + set { + this.userScriptField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GetUserScriptsResult : WebServiceResult { + + private UserScript[] userScriptsField; + + /// + public UserScript[] UserScripts { + get { + return this.userScriptsField; + } + set { + this.userScriptsField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyResult : WebServiceResult { + + private SecretPolicyDetail secretPolicyField; + + /// + public SecretPolicyDetail SecretPolicy { + get { + return this.secretPolicyField; + } + set { + this.secretPolicyField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SearchSecretPoliciesResult : WebServiceResult { + + private SecretPolicySummary[] secretPoliciesField; + + /// + public SecretPolicySummary[] SecretPolicies { + get { + return this.secretPoliciesField; + } + set { + this.secretPoliciesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SecretPolicyForSecretResult : WebServiceResult { + + private SecretPolicyForSecret secretPolicyForSecretField; + + /// + public SecretPolicyForSecret SecretPolicyForSecret { + get { + return this.secretPolicyForSecretField; + } + set { + this.secretPolicyForSecretField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class SSHCredentialsResult : WebServiceResult { + + private string usernameField; + + private string passwordField; + + private string hostField; + + private string portField; + + /// + public string Username { + get { + return this.usernameField; + } + set { + this.usernameField = value; + } + } + + /// + public string Password { + get { + return this.passwordField; + } + set { + this.passwordField = value; + } + } + + /// + public string Host { + get { + return this.hostField; + } + set { + this.hostField = value; + } + } + + /// + public string Port { + get { + return this.portField; + } + set { + this.portField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class FileDownloadResult : WebServiceResult { + + private byte[] fileAttachmentField; + + private string fileNameField; + + /// + [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] + public byte[] FileAttachment { + get { + return this.fileAttachmentField; + } + set { + this.fileAttachmentField = value; + } + } + + /// + public string FileName { + get { + return this.fileNameField; + } + set { + this.fileNameField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class CreateFolderResult : WebServiceResult { + + private int folderIdField; + + /// + public int FolderId { + get { + return this.folderIdField; + } + set { + this.folderIdField = value; + } + } + } + + /// + [System.Xml.Serialization.XmlIncludeAttribute(typeof(RequestApprovalResult))] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4161.0")] + [System.SerializableAttribute()] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + [System.Xml.Serialization.XmlTypeAttribute(Namespace="urn:thesecretserver.com")] + public partial class GenericResult { + + private string errorMessageField; + + private string[] debugMessagesField; + + /// + public string ErrorMessage { + get { + return this.errorMessageField; + } + set { + this.errorMessageField = value; + } + } + + /// + public string[] DebugMessages { + get { + return this.debugMessagesField; + } + set { + this.debugMessagesField = value; + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ApproveSecretAccessRequestCompletedEventHandler(object sender, ApproveSecretAccessRequestCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ApproveSecretAccessRequestCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ApproveSecretAccessRequestCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public RequestApprovalResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((RequestApprovalResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DenySecretAccessRequestCompletedEventHandler(object sender, DenySecretAccessRequestCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DenySecretAccessRequestCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DenySecretAccessRequestCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public RequestApprovalResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((RequestApprovalResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddUserCompletedEventHandler(object sender, AddUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderCreateCompletedEventHandler(object sender, FolderCreateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderCreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderCreateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public CreateFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((CreateFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedCreateCompletedEventHandler(object sender, FolderExtendedCreateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedCreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedCreateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedCreateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedCreateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedGetCompletedEventHandler(object sender, FolderExtendedGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedGetResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedGetResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedUpdateCompletedEventHandler(object sender, FolderExtendedUpdateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedUpdateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedUpdateResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedUpdateResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderExtendedGetNewCompletedEventHandler(object sender, FolderExtendedGetNewCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderExtendedGetNewCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderExtendedGetNewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FolderExtendedGetNewResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FolderExtendedGetNewResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretLegacyCompletedEventHandler(object sender, GetSecretLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretCompletedEventHandler(object sender, GetSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretsByFieldValueCompletedEventHandler(object sender, GetSecretsByFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretsByFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretsByFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretsByFieldValueResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretsByFieldValueResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFieldValueCompletedEventHandler(object sender, SearchSecretsByFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretsByExposedFieldValueCompletedEventHandler(object sender, GetSecretsByExposedFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretsByExposedFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretsByExposedFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretsByFieldValueResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretsByFieldValueResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByExposedFieldValueCompletedEventHandler(object sender, SearchSecretsByExposedFieldValueCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByExposedFieldValueCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByExposedFieldValueCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByExposedValuesCompletedEventHandler(object sender, SearchSecretsByExposedValuesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByExposedValuesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByExposedValuesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsCompletedEventHandler(object sender, SearchSecretsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsLegacyCompletedEventHandler(object sender, SearchSecretsLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFolderCompletedEventHandler(object sender, SearchSecretsByFolderCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretsByFolderLegacyCompletedEventHandler(object sender, SearchSecretsByFolderLegacyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretsByFolderLegacyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretsByFolderLegacyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ExpireSecretCompletedEventHandler(object sender, ExpireSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ExpireSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ExpireSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetFavoritesCompletedEventHandler(object sender, GetFavoritesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetFavoritesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetFavoritesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFavoritesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFavoritesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateIsFavoriteCompletedEventHandler(object sender, UpdateIsFavoriteCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateIsFavoriteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateIsFavoriteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CheckInCompletedEventHandler(object sender, CheckInCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CheckInCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CheckInCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretCompletedEventHandler(object sender, AddSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AddSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AddSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddNewSecretCompletedEventHandler(object sender, AddNewSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddNewSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddNewSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public AddSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((AddSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetNewSecretCompletedEventHandler(object sender, GetNewSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetNewSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetNewSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretTemplateFieldsCompletedEventHandler(object sender, GetSecretTemplateFieldsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretTemplateFieldsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretTemplateFieldsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretTemplateFieldsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretTemplateFieldsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateSecretCompletedEventHandler(object sender, UpdateSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretTemplatesCompletedEventHandler(object sender, GetSecretTemplatesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretTemplatesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretTemplatesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretTemplatesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretTemplatesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GeneratePasswordCompletedEventHandler(object sender, GeneratePasswordCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GeneratePasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GeneratePasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GeneratePasswordResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GeneratePasswordResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DeactivateSecretCompletedEventHandler(object sender, DeactivateSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DeactivateSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DeactivateSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void VersionGetCompletedEventHandler(object sender, VersionGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class VersionGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal VersionGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public VersionGetResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((VersionGetResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetCheckOutStatusCompletedEventHandler(object sender, GetCheckOutStatusCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetCheckOutStatusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetCheckOutStatusCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetCheckOutStatusResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetCheckOutStatusResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretAuditCompletedEventHandler(object sender, GetSecretAuditCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretAuditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretAuditCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSecretAuditResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSecretAuditResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderGetCompletedEventHandler(object sender, FolderGetCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderGetCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderGetCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderUpdateCompletedEventHandler(object sender, FolderUpdateCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderUpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderUpdateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void FolderGetAllChildrenCompletedEventHandler(object sender, FolderGetAllChildrenCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class FolderGetAllChildrenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal FolderGetAllChildrenCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetFoldersResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetFoldersResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchFoldersCompletedEventHandler(object sender, SearchFoldersCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchFolderResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchFolderResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RemoveDependencyCompletedEventHandler(object sender, RemoveDependencyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RemoveDependencyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RemoveDependencyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDependenciesCompletedEventHandler(object sender, GetDependenciesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDependenciesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDependenciesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetDependenciesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetDependenciesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddDependencyCompletedEventHandler(object sender, AddDependencyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddDependencyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddDependencyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CreateDependencyGroupForSecretCompletedEventHandler(object sender, CreateDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CreateDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CreateDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDependencyGroupsForSecretCompletedEventHandler(object sender, GetDependencyGroupsForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDependencyGroupsForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDependencyGroupsForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetDependencyGroupsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetDependencyGroupsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateDependencyGroupForSecretCompletedEventHandler(object sender, UpdateDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RemoveDependencyGroupForSecretCompletedEventHandler(object sender, RemoveDependencyGroupForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RemoveDependencyGroupForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RemoveDependencyGroupForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DownloadFileAttachmentCompletedEventHandler(object sender, DownloadFileAttachmentCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DownloadFileAttachmentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DownloadFileAttachmentCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FileDownloadResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FileDownloadResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DownloadFileAttachmentByItemIdCompletedEventHandler(object sender, DownloadFileAttachmentByItemIdCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DownloadFileAttachmentByItemIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DownloadFileAttachmentByItemIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public FileDownloadResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((FileDownloadResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UploadFileAttachmentCompletedEventHandler(object sender, UploadFileAttachmentCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UploadFileAttachmentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UploadFileAttachmentCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UploadFileAttachmentByItemIdCompletedEventHandler(object sender, UploadFileAttachmentByItemIdCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UploadFileAttachmentByItemIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UploadFileAttachmentByItemIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ImportXMLCompletedEventHandler(object sender, ImportXMLCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ImportXMLCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ImportXMLCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SetCheckOutEnabledCompletedEventHandler(object sender, SetCheckOutEnabledCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SetCheckOutEnabledCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SetCheckOutEnabledCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetDistributedEnginesCompletedEventHandler(object sender, GetDistributedEnginesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetDistributedEnginesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetDistributedEnginesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSitesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSitesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetTicketSystemsCompletedEventHandler(object sender, GetTicketSystemsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetTicketSystemsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetTicketSystemsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetTicketSystemsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetTicketSystemsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignSiteCompletedEventHandler(object sender, AssignSiteCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignSiteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignSiteCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretCustomAuditCompletedEventHandler(object sender, AddSecretCustomAuditCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretCustomAuditCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretCustomAuditCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateSecretPermissionCompletedEventHandler(object sender, UpdateSecretPermissionCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateSecretPermissionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateSecretPermissionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void CheckInByKeyCompletedEventHandler(object sender, CheckInByKeyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class CheckInByKeyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal CheckInByKeyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void WhoAmICompletedEventHandler(object sender, WhoAmICompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class WhoAmICompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal WhoAmICompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UserInfoResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UserInfoResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllGroupsCompletedEventHandler(object sender, GetAllGroupsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllGroupsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllGroupsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetAllGroupsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetAllGroupsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignUserToGroupCompletedEventHandler(object sender, AssignUserToGroupCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignUserToGroupCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignUserToGroupCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHLoginCredentialsCompletedEventHandler(object sender, GetSSHLoginCredentialsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHLoginCredentialsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHLoginCredentialsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SSHCredentialsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SSHCredentialsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHLoginCredentialsWithMachineCompletedEventHandler(object sender, GetSSHLoginCredentialsWithMachineCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHLoginCredentialsWithMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHLoginCredentialsWithMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SSHCredentialsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SSHCredentialsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchUsersCompletedEventHandler(object sender, SearchUsersCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchUsersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchUsersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUsersResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUsersResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetUserCompletedEventHandler(object sender, GetUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateUserCompletedEventHandler(object sender, UpdateUserCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateUserCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateUserCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UpdateUserResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UpdateUserResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretItemHistoryByFieldNameCompletedEventHandler(object sender, GetSecretItemHistoryByFieldNameCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretItemHistoryByFieldNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretItemHistoryByFieldNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretItemHistoryResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretItemHistoryResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSecretPolicyForSecretCompletedEventHandler(object sender, GetSecretPolicyForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSecretPolicyForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSecretPolicyForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyForSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyForSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AssignSecretPolicyForSecretCompletedEventHandler(object sender, AssignSecretPolicyForSecretCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AssignSecretPolicyForSecretCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AssignSecretPolicyForSecretCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyForSecretResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyForSecretResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SearchSecretPoliciesCompletedEventHandler(object sender, SearchSecretPoliciesCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SearchSecretPoliciesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SearchSecretPoliciesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SearchSecretPoliciesResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SearchSecretPoliciesResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RunActiveDirectorySynchronizationCompletedEventHandler(object sender, RunActiveDirectorySynchronizationCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RunActiveDirectorySynchronizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RunActiveDirectorySynchronizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddGroupToActiveDirectorySynchronizationCompletedEventHandler(object sender, AddGroupToActiveDirectorySynchronizationCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddGroupToActiveDirectorySynchronizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddGroupToActiveDirectorySynchronizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddSecretPolicyCompletedEventHandler(object sender, AddSecretPolicyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddSecretPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddSecretPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetNewSecretPolicyCompletedEventHandler(object sender, GetNewSecretPolicyCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetNewSecretPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetNewSecretPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public SecretPolicyResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((SecretPolicyResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetSSHCommandMenuCompletedEventHandler(object sender, GetSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenuResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenuResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void SaveSSHCommandMenuCompletedEventHandler(object sender, SaveSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class SaveSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal SaveSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenuResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenuResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllSSHCommandMenusCompletedEventHandler(object sender, GetAllSSHCommandMenusCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllSSHCommandMenusCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllSSHCommandMenusCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetSshCommandMenusResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetSshCommandMenusResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void DeleteSSHCommandMenuCompletedEventHandler(object sender, DeleteSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class DeleteSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal DeleteSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void RestoreSSHCommandMenuCompletedEventHandler(object sender, RestoreSSHCommandMenuCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class RestoreSSHCommandMenuCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal RestoreSSHCommandMenuCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void ValidateTwoFactorCompletedEventHandler(object sender, ValidateTwoFactorCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class ValidateTwoFactorCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal ValidateTwoFactorCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetReportCompletedEventHandler(object sender, GetReportCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetReportCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetReportCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetReportResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetReportResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void AddScriptCompletedEventHandler(object sender, AddScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class AddScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal AddScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public WebServiceResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((WebServiceResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetAllScriptsCompletedEventHandler(object sender, GetAllScriptsCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetAllScriptsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetAllScriptsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserScriptsResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserScriptsResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void GetScriptCompletedEventHandler(object sender, GetScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class GetScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal GetScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public GetUserScriptResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((GetUserScriptResult)(this.results[0])); + } + } + } + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + public delegate void UpdateScriptCompletedEventHandler(object sender, UpdateScriptCompletedEventArgs e); + + /// + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4161.0")] + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.ComponentModel.DesignerCategoryAttribute("code")] + public partial class UpdateScriptCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { + + private object[] results; + + internal UpdateScriptCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : + base(exception, cancelled, userState) { + this.results = results; + } + + /// + public UpdateUserScriptResult Result { + get { + this.RaiseExceptionIfNecessary(); + return ((UpdateUserScriptResult)(this.results[0])); + } + } + } +} + +#pragma warning restore 1591 \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.map b/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.map new file mode 100644 index 000000000..aea42ec98 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/Reference.map @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/RequestApprovalResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/RequestApprovalResult.datasource new file mode 100644 index 000000000..d4db4b226 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/RequestApprovalResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.RequestApprovalResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SSHCredentialsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSHCredentialsResult.datasource new file mode 100644 index 000000000..81e4cc52e --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSHCredentialsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SSHCredentialsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.disco b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.disco new file mode 100644 index 000000000..d8f4cc1c8 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.wsdl b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.wsdl new file mode 100644 index 000000000..2c1afd142 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SSWinAuthWebService.wsdl @@ -0,0 +1,7070 @@ + + + Webservice for windows authentication. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Webservice for windows authentication. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchFolderResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchFolderResult.datasource new file mode 100644 index 000000000..45bd3c658 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchFolderResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SearchFolderResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretPoliciesResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretPoliciesResult.datasource new file mode 100644 index 000000000..bbda4c7d0 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretPoliciesResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SearchSecretPoliciesResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretsResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretsResult.datasource new file mode 100644 index 000000000..d31de4574 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SearchSecretsResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SearchSecretsResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretItemHistoryResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretItemHistoryResult.datasource new file mode 100644 index 000000000..461abd94d --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretItemHistoryResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SecretItemHistoryResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyForSecretResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyForSecretResult.datasource new file mode 100644 index 000000000..382ea5ae0 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyForSecretResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SecretPolicyForSecretResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyResult.datasource new file mode 100644 index 000000000..6d82b3d7f --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/SecretPolicyResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.SecretPolicyResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserResult.datasource new file mode 100644 index 000000000..0b7ef7159 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.UpdateUserResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserScriptResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserScriptResult.datasource new file mode 100644 index 000000000..f8e27ac4c --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/UpdateUserScriptResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.UpdateUserScriptResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/UserInfoResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/UserInfoResult.datasource new file mode 100644 index 000000000..b45f60393 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/UserInfoResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.UserInfoResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/VersionGetResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/VersionGetResult.datasource new file mode 100644 index 000000000..48dac8be4 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/VersionGetResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.VersionGetResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/Web References/SSWebServiceWinAuth/WebServiceResult.datasource b/SecretServerInterface/Web References/SSWebServiceWinAuth/WebServiceResult.datasource new file mode 100644 index 000000000..3699050d3 --- /dev/null +++ b/SecretServerInterface/Web References/SSWebServiceWinAuth/WebServiceResult.datasource @@ -0,0 +1,10 @@ + + + + SecretServerInterface.SSWebServiceWinAuth.WebServiceResult, Web References.SSWebServiceWinAuth.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/SecretServerInterface/app.config b/SecretServerInterface/app.config new file mode 100644 index 000000000..bd5c168a0 --- /dev/null +++ b/SecretServerInterface/app.config @@ -0,0 +1,18 @@ + + + + +
+ + + + + + https://cred.sit.local/SecretServer/webservices/SSWebService.asmx + + + https://cred.sit.local/SecretServer/winauthwebservices/SSWinAuthWebService.asmx + + + + diff --git a/Tools/7zip/7za.dll b/Tools/7zip/7za.dll deleted file mode 100644 index 088f395fb..000000000 Binary files a/Tools/7zip/7za.dll and /dev/null differ diff --git a/Tools/7zip/7za.exe b/Tools/7zip/7za.exe deleted file mode 100644 index 2bdd57d2e..000000000 Binary files a/Tools/7zip/7za.exe and /dev/null differ diff --git a/Tools/7zip/7zxa.dll b/Tools/7zip/7zxa.dll deleted file mode 100644 index f755fb5c3..000000000 Binary files a/Tools/7zip/7zxa.dll and /dev/null differ diff --git a/Tools/7zip/License.txt b/Tools/7zip/License.txt deleted file mode 100644 index 48dc6c624..000000000 --- a/Tools/7zip/License.txt +++ /dev/null @@ -1,31 +0,0 @@ - 7-Zip Extra - ~~~~~~~~~~~ - License for use and distribution - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - - Copyright (C) 1999-2019 Igor Pavlov. - - 7-Zip Extra files are under the GNU LGPL license. - - - Notes: - You can use 7-Zip Extra on any computer, including a computer in a commercial - organization. You don't need to register or pay for 7-Zip. - - - GNU LGPL information - -------------------- - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You can receive a copy of the GNU Lesser General Public License from - http://www.gnu.org/ - diff --git a/Tools/7zip/history.txt b/Tools/7zip/history.txt deleted file mode 100644 index 2154c3d40..000000000 --- a/Tools/7zip/history.txt +++ /dev/null @@ -1,111 +0,0 @@ -7-Zip Extra history -------------------- - -This file contains only information about changes related to that package exclusively. -The full history of changes is listed in history.txt in main 7-Zip program. - - -19.00 2019-02-21 -------------------------- -- Encryption strength for 7z archives was increased: - the size of random initialization vector was increased from 64-bit to 128-bit, - and the pseudo-random number generator was improved. -- Some bugs were fixed. - - -18.06 2018-12-30 -------------------------- -- The speed for LZMA/LZMA2 compressing was increased by 3-10%, - and there are minor changes in compression ratio. -- Some bugs were fixed. - - -18.05 2018-04-30 -------------------------- -- The speed for LZMA/LZMA2 compressing was increased - by 8% for fastest/fast compression levels and - by 3% for normal/maximum compression levels. - - -18.03 beta 2018-03-04 -------------------------- -- The speed for single-thread LZMA/LZMA2 decoding - was increased by 30% in x64 version and by 3% in x86 version. -- 7-Zip now can use multi-threading for 7z/LZMA2 decoding, - if there are multiple independent data chunks in LZMA2 stream. - - -9.35 beta 2014-12-07 ------------------------------- - - SFX modules were moved to LZMA SDK package. - - -9.34 alpha 2014-06-22 ------------------------------- - - Minimum supported system now is Windows 2000 for EXE and DLL files. - - all EXE and DLL files use msvcrt.dll. - - 7zr.exe now support AES encryption. - - -9.18 2010-11-02 ------------------------------- - - New small SFX module for installers. - - -9.17 2010-10-04 ------------------------------- - - New 7-Zip plugin for FAR Manager x64. - - -9.10 2009-12-30 ------------------------------- - - 7-Zip for installers now supports LZMA2. - - -9.09 2009-12-12 ------------------------------- - - LZMA2 compression method support. - - Some bugs were fixed. - - -4.65 2009-02-03 ------------------------------- - - Some bugs were fixed. - - -4.38 beta 2006-04-13 ------------------------------- - - SFX for installers now supports new properties in config file: - Progress, Directory, ExecuteFile, ExecuteParameters. - - -4.34 beta 2006-02-27 ------------------------------- - - ISetProperties::SetProperties: - it's possible to specify desirable number of CPU threads: - PROPVARIANT: name=L"mt", vt = VT_UI4, ulVal = NumberOfThreads - If "mt" is not defined, 7za.dll will check number of processors in system to set - number of desirable threads. - Now 7za.dll can use: - 2 threads for LZMA compressing - N threads for BZip2 compressing - 4 threads for BZip2 decompressing - Other codecs use only one thread. - Note: 7za.dll can use additional "small" threads with low CPU load. - - It's possible to call ISetProperties::SetProperties to specify "mt" property for decoder. - - -4.33 beta 2006-02-05 ------------------------------- - - Compressing speed and Memory requirements were increased. - Default dictionary size was increased: Fastest: 64 KB, Fast: 1 MB, - Normal: 4 MB, Max: 16 MB, Ultra: 64 MB. - - 7z/LZMA now can use only these match finders: HC4, BT2, BT3, BT4 - - -4.27 2005-09-21 ------------------------------- - - Some GUIDs/interfaces were changed. - IStream.h: - ISequentialInStream::Read now works as old ReadPart - ISequentialOutStream::Write now works as old WritePart diff --git a/Tools/7zip/readme.txt b/Tools/7zip/readme.txt deleted file mode 100644 index a54a31335..000000000 --- a/Tools/7zip/readme.txt +++ /dev/null @@ -1,124 +0,0 @@ -7-Zip Extra 19.00 ------------------ - -7-Zip Extra is package of extra modules of 7-Zip. - -7-Zip Copyright (C) 1999-2019 Igor Pavlov. - -7-Zip is free software. Read License.txt for more information about license. - -Source code of binaries can be found at: - http://www.7-zip.org/ - -This package contains the following files: - -7za.exe - standalone console version of 7-Zip with reduced formats support. -7za.dll - library for working with 7z archives -7zxa.dll - library for extracting from 7z archives -License.txt - license information -readme.txt - this file - -Far\ - plugin for Far Manager -x64\ - binaries for x64 - - -All 32-bit binaries can work in: - Windows 2000 / 2003 / 2008 / XP / Vista / 7 / 8 / 10 - and in any Windows x64 version with WoW64 support. -All x64 binaries can work in any Windows x64 version. - -All binaries use msvcrt.dll. - -7za.exe -------- - -7za.exe - is a standalone console version of 7-Zip with reduced formats support. - - Extra: 7za.exe : support for only some formats of 7-Zip. - 7-Zip: 7z.exe with 7z.dll : support for all formats of 7-Zip. - -7za.exe and 7z.exe from 7-Zip have same command line interface. -7za.exe doesn't use external DLL files. - -You can read Help File (7-zip.chm) from 7-Zip package for description -of all commands and switches for 7za.exe and 7z.exe. - -7za.exe features: - - - High compression ratio in 7z format - - Supported formats: - - Packing / unpacking: 7z, xz, ZIP, GZIP, BZIP2 and TAR - - Unpacking only: Z, lzma, CAB. - - Highest compression ratio for ZIP and GZIP formats. - - Fast compression and decompression - - Strong AES-256 encryption in 7z and ZIP formats. - -Note: LZMA SDK contains 7zr.exe - more reduced version of 7za.exe. -But you can use 7zr.exe as "public domain" code. - - - -DLL files ---------- - -7za.dll and 7zxa.dll are reduced versions of 7z.dll from 7-Zip. -7za.dll and 7zxa.dll support only 7z format. -Note: 7z.dll is main DLL file that works with all archive types in 7-Zip. - -7za.dll and 7zxa.dll support the following decoding methods: - - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES, BZip2, Deflate. - -7za.dll also supports 7z encoding with the following encoding methods: - - LZMA, LZMA2, PPMD, BCJ, BCJ2, COPY, 7zAES. - -7za.dll and 7zxa.dll work via COM interfaces. -But these DLLs don't use standard COM interfaces for objects creating. - -Look also example code that calls DLL functions (in source code of 7-Zip): - - 7zip\UI\Client7z - -Another example of binary that uses these interface is 7-Zip itself. -The following binaries from 7-Zip use 7z.dll: - - 7z.exe (console version) - - 7zG.exe (GUI version) - - 7zFM.exe (7-Zip File Manager) - -Note: The source code of LZMA SDK also contains the code for similar DLLs -(DLLs without BZip2, Deflate support). And these files from LZMA SDK can be -used as "public domain" code. If you use LZMA SDK files, you don't need to -follow GNU LGPL rules, if you want to change the code. - - - - -License FAQ ------------ - -Can I use the EXE or DLL files from 7-Zip in a commercial application? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Yes, but you are required to specify in documentation for your application: - (1) that you used parts of the 7-Zip program, - (2) that 7-Zip is licensed under the GNU LGPL license and - (3) you must give a link to www.7-zip.org, where the source code can be found. - - -Can I use the source code of 7-Zip in a commercial application? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Since 7-Zip is licensed under the GNU LGPL you must follow the rules of that license. -In brief, it means that any LGPL'ed code must remain licensed under the LGPL. -For instance, you can change the code from 7-Zip or write a wrapper for some -code from 7-Zip and compile it into a DLL; but, the source code of that DLL -(including your modifications / additions / wrapper) must be licensed under -the LGPL or GPL. -Any other code in your application can be licensed as you wish. This scheme allows -users and developers to change LGPL'ed code and recompile that DLL. That is the -idea of free software. Read more here: http://www.gnu.org/. - - - -Note: You can look also LZMA SDK, which is available under a more liberal license. - - ---- -End of document diff --git a/Tools/copy_puttyng.ps1 b/Tools/copy_puttyng.ps1 deleted file mode 100644 index 786bfbe8a..000000000 --- a/Tools/copy_puttyng.ps1 +++ /dev/null @@ -1,15 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" -Write-Output "Copying PUTTYNG to correct directory" -Copy-Item -Path (Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Resources\PuTTYNG.exe") -Destination $TargetDir -Force - -Write-Output "" \ No newline at end of file diff --git a/Tools/copy_themes.ps1 b/Tools/copy_themes.ps1 deleted file mode 100644 index f332e73e5..000000000 --- a/Tools/copy_themes.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" -Write-Output "Copying THEMES folder to output" - -$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteNG\Resources\Themes' ) -$DestinationDir = [io.path]::combine($TargetDir , 'Themes') - -robocopy $sourceFiles $DestinationDir *.vstheme /s - -Write-Output "" \ No newline at end of file diff --git a/Tools/copy_tiles.ps1 b/Tools/copy_tiles.ps1 deleted file mode 100644 index a5cbc53c2..000000000 --- a/Tools/copy_tiles.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" -Write-Output "Copying TILES folder to output" - -$sourceFiles = [io.path]::combine($SolutionDir , 'mRemoteNG\Resources\Tiles' ) -robocopy $sourceFiles $TargetDir *.* - -Write-Output "" \ No newline at end of file diff --git a/Tools/img/logo.png b/Tools/img/logo.png deleted file mode 100644 index 8fc9affb2..000000000 Binary files a/Tools/img/logo.png and /dev/null differ diff --git a/Tools/postbuild_mremoteng.ps1 b/Tools/postbuild_mremoteng.ps1 index 173016172..91aa91ffe 100644 --- a/Tools/postbuild_mremoteng.ps1 +++ b/Tools/postbuild_mremoteng.ps1 @@ -37,16 +37,9 @@ Format-Table -AutoSize -Wrap -InputObject @{ "ExcludeFromSigning" = $ExcludeFromSigning } - - -& "$PSScriptRoot\copy_puttyng.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -& "$PSScriptRoot\copy_themes.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -& "$PSScriptRoot\copy_tiles.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -& "$PSScriptRoot\sphinx_docs.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir & "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName & "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName & "$PSScriptRoot\sign_binaries.ps1" -TargetDir $TargetDir -CertificatePath $CertificatePath -CertificatePassword $CertificatePassword -ConfigurationName $ConfigurationName -Exclude $ExcludeFromSigning -SolutionDir $SolutionDir & "$PSScriptRoot\verify_binary_signatures.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName -CertificatePath $CertificatePath -SolutionDir $SolutionDir -& "$PSScriptRoot\zip_symbols.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName -& "$PSScriptRoot\zip_portable_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName \ No newline at end of file +& "$PSScriptRoot\zip_files.ps1" -SolutionDir $SolutionDir -TargetDir $TargetDir -ConfigurationName $ConfigurationName \ No newline at end of file diff --git a/Tools/rename_installer_with_version.ps1 b/Tools/rename_installer_with_version.ps1 index 31ae7dc42..851e4891e 100644 --- a/Tools/rename_installer_with_version.ps1 +++ b/Tools/rename_installer_with_version.ps1 @@ -3,7 +3,7 @@ $SolutionDir ) -$renameTarget = $SolutionDir + "InstallerProjects\Installer\bin\Release\en-US\mRemoteNG-Installer.msi" +$renameTarget = $SolutionDir + "mRemoteNGInstaller\Installer\bin\Release\en-US\mRemoteNG-Installer.msi" Write-Host $SolutionDir Write-Host $renameTarget diff --git a/Tools/sphinx_docs.ps1 b/Tools/sphinx_docs.ps1 deleted file mode 100644 index 8ba3e20cf..000000000 --- a/Tools/sphinx_docs.ps1 +++ /dev/null @@ -1,33 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" - -Write-Output "Building HTML-Documentation with Sphinx" - -$path_HelpFilesDir = Join-Path -Path $TargetDir -ChildPath "Help" -$path_SphinxSourceDir = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\Documentation" - -# Remove stale Help files, if they exist -if (Test-Path -Path $path_HelpFilesDir) { - Remove-Item -Path $path_HelpFilesDir -Recurse -Force -} - -# Build docs -sphinx-build $path_SphinxSourceDir $path_HelpFilesDir - -# Place dummy html file if build failed -if (-Not (Test-Path $path_HelpFilesDir\index.html -PathType Leaf)) { - New-Item -Path $path_HelpFilesDir -ItemType "directory" - New-Item $path_HelpFilesDir\index.html - Set-Content $path_HelpFilesDir\index.html 'Welcome to mRemoteNG!' -} - -Write-Output "" \ No newline at end of file diff --git a/Tools/zip_files.ps1 b/Tools/zip_files.ps1 new file mode 100644 index 000000000..fde2225c2 --- /dev/null +++ b/Tools/zip_files.ps1 @@ -0,0 +1,72 @@ +param ( + [string] + [Parameter(Mandatory=$true)] + $SolutionDir, + + [string] + [Parameter(Mandatory=$true)] + $TargetDir, + + [string] + [Parameter(Mandatory=$true)] + $ConfigurationName +) + +Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" + +$ConfigurationName = $ConfigurationName.Trim() +Write-Output "Config Name (trimmed): '$($ConfigurationName)'" +$exe = Join-Path -Path $TargetDir -ChildPath $TargetFileName +$Version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($exe).FileVersion +Write-Output "Version is $($version)" + +# Fix for AppVeyor +if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) { + if(!(test-path "Release")) { + New-Item -ItemType Directory -Force -Path "Release" | Out-Null + } +} + +# Package debug symbols zip file +if ($ConfigurationName -match "Release") { + Write-Output "Packaging debug symbols" + + if ($ConfigurationName -match "Portable") { + $zipFilePrefix = "mRemoteNG-Portable-symbols" + } else { + $zipFilePrefix = "mRemoteNG-symbols" + } + + $debugFile = Join-Path -Path $TargetDir -ChildPath "mRemoteNG.pdb" + + # AppVeyor build + if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) { + $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\$zipFilePrefix-$($version).zip" + 7z a $outputZipPath $debugFile + } + # Local build + else { + $outputZipPath = "$($SolutionDir)Release\$zipFilePrefix-$($version).zip" + Compress-Archive $debugFile $outputZipPath -Force + } + + Remove-Item $debugFile +} + +# Package portable release zip file +if ($ConfigurationName -eq "Release Portable") { + Write-Output "Packaging portable ZIP file" + + # AppVeyor build + if(!([string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER))) { + $outputZipPath = Join-Path -Path $SolutionDir -ChildPath "Release\mRemoteNG-Portable-$($version).zip" + 7z a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath $TargetDir\* + } + # Local build + else { + $outputZipPath="$($SolutionDir)\Release\mRemoteNG-Portable-$($version).zip" + Compress-Archive $Source $outputZipPath -Force + } +} + +Write-Output "" \ No newline at end of file diff --git a/Tools/zip_portable_files.ps1 b/Tools/zip_portable_files.ps1 deleted file mode 100644 index 7b86af7fe..000000000 --- a/Tools/zip_portable_files.ps1 +++ /dev/null @@ -1,64 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir, - - [string] - [Parameter(Mandatory=$true)] - $ConfigurationName -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" - -if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) { - Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting" - Exit -} - -Write-Output "Solution Dir: '$($SolutionDir)'" -Write-Output "Target Dir: '$($TargetDir)'" -$ConfigurationName = $ConfigurationName.Trim() -Write-Output "Config Name (tirmmed): '$($ConfigurationName)'" - - -# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441 -$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe" -$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe" - -# Package Zip -if ($ConfigurationName -eq "Release Portable") { - Write-Output "Packaging Release Portable ZIP" - - $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\bin\$($ConfigurationName)\mRemoteNG.exe" - - Write-Output "Version is $($version)" - - $PortableZip="$($SolutionDir)Release\mRemoteNG-Portable-$($version).zip" - - $tempFolderPath = Join-Path -Path $SolutionDir -ChildPath "mRemoteNG\bin\package" - Remove-Item -Recurse $tempFolderPath -ErrorAction SilentlyContinue | Out-Null - New-Item $tempFolderPath -ItemType "directory" | Out-Null - - Copy-Item "$($SolutionDir)mRemoteNG\Resources\PuTTYNG.exe" -Destination $tempFolderPath - - #Write-Output "$($SolutionDir)mRemoteNG\bin\$ConfigurationName" - #Write-Output "$($SolutionDir)mRemoteNG\bin\package" - Copy-Item "$($SolutionDir)mRemoteNG\bin\$ConfigurationName\*" -Destination $tempFolderPath -Recurse -Force - # Delete any PDB files that accidentally get copied into the temp folder - Get-ChildItem -Path $tempFolderPath -Filter "*.pdb" | Remove-Item - Copy-Item "$($SolutionDir)*.txt" -Destination $tempFolderPath - - Write-Output "Creating portable ZIP file $($PortableZip)" - Remove-Item -Force $PortableZip -ErrorAction SilentlyContinue - & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $PortableZip (Join-Path -Path $tempFolderPath -ChildPath "*.*") - #& $SEVENZIP a -bt -mx=9 -tzip -y $PortableZip "$($SolutionDir)*.TXT" -} -else { - Write-Output "We will not zip anything - this isnt a portable release build." -} - -Write-Output "" \ No newline at end of file diff --git a/Tools/zip_symbols.ps1 b/Tools/zip_symbols.ps1 deleted file mode 100644 index f592c533c..000000000 --- a/Tools/zip_symbols.ps1 +++ /dev/null @@ -1,56 +0,0 @@ -param ( - [string] - [Parameter(Mandatory=$true)] - $SolutionDir, - - [string] - [Parameter(Mandatory=$true)] - $TargetDir, - - [string] - [Parameter(Mandatory=$true)] - $ConfigurationName -) - -Write-Output "===== Beginning $($PSCmdlet.MyInvocation.MyCommand) =====" - -if(-not [string]::IsNullOrEmpty($Env:APPVEYOR_BUILD_FOLDER)) { - Write-Output "Too early to run via Appveyor - artifacts don't get generated properly. Exiting" - Exit -} - -Write-Output "Solution Dir: '$($SolutionDir)'" -Write-Output "Target Dir: '$($TargetDir)'" -$ConfigurationName = $ConfigurationName.Trim() -Write-Output "Config Name (trimmed): '$($ConfigurationName)'" - - -# Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441 -$SIGCHECK="$($SolutionDir)Tools\exes\sigcheck.exe" -$SEVENZIP="$($SolutionDir)Tools\7zip\7za.exe" - -# Package Zip -if ($ConfigurationName -match "Release") { - Write-Output "Packaging debug symbols" - - $version = & $SIGCHECK /accepteula -q -n "$($SolutionDir)mRemoteNG\bin\$($ConfigurationName)\mRemoteNG.exe" - - Write-Output "Version is $($version)" - - if ($ConfigurationName -match "Portable") { - $zipFilePrefix = "mRemoteNG-Portable-symbols" - } else { - $zipFilePrefix = "mRemoteNG-symbols" - } - - $outputZipPath="$($SolutionDir)Release\$zipFilePrefix-$($version).zip" - - Write-Output "Creating debug symbols ZIP file $($outputZipPath)" - Remove-Item -Force $outputZipPath -ErrorAction SilentlyContinue - & $SEVENZIP a -bt -bd -bb1 -mx=9 -tzip -y -r $outputZipPath (Join-Path -Path $TargetDir -ChildPath "*.pdb") -} -else { - Write-Output "We will not package debug symbols - this isnt a release build." -} - -Write-Output "" \ No newline at end of file diff --git a/mRemoteNG.sln b/mRemoteNG.sln index 86d0d2f36..d272931b6 100644 --- a/mRemoteNG.sln +++ b/mRemoteNG.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.352 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31912.275 MinimumVisualStudioVersion = 14.0.25420.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNG", "mRemoteNG\mRemoteNG.csproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGTests", "mRemoteNGTests\mRemoteNGTests.csproj", "{1453B37F-8621-499E-B0B2-6091F76DC0BB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mRemoteNGInstaller", "mRemoteNGInstaller", "{4FE795BE-646E-4F1B-BAD0-A68EA26394DD}" EndProject @@ -16,108 +16,137 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "mRemoteNGInsta {5423D985-CB48-4344-B47F-E8C6D60C8B04} = {5423D985-CB48-4344-B47F-E8C6D60C8B04} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mRemoteNGSpecs", "mRemoteNGSpecs\mRemoteNGSpecs.csproj", "{16AA21E2-D6B7-427D-AB7D-AA8C611B724E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecretServerInterface", "SecretServerInterface\SecretServerInterface.csproj", "{CBEEE1A0-B917-4F61-812B-85C4C15E80FC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Portable|Any CPU = Debug Portable|Any CPU - Debug Portable|x86 = Debug Portable|x86 + Debug Portable|x64 = Debug Portable|x64 Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 + Debug|x64 = Debug|x64 Release Installer|Any CPU = Release Installer|Any CPU - Release Installer|x86 = Release Installer|x86 + Release Installer|x64 = Release Installer|x64 Release Portable|Any CPU = Release Portable|Any CPU - Release Portable|x86 = Release Portable|x86 + Release Portable|x64 = Release Portable|x64 Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.ActiveCfg = Debug Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x86.Build.0 = Debug Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.ActiveCfg = Debug|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x86.Build.0 = Debug|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.ActiveCfg = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x86.Build.0 = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.ActiveCfg = Release Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x86.Build.0 = Release Portable|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.ActiveCfg = Release|x86 - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x86.Build.0 = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.ActiveCfg = Debug Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x86.Build.0 = Debug Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.ActiveCfg = Debug|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x86.Build.0 = Debug|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.ActiveCfg = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x86.Build.0 = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.ActiveCfg = Release Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x86.Build.0 = Release Portable|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.ActiveCfg = Release|x86 - {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x86.Build.0 = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x86.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.ActiveCfg = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x86.Build.0 = Debug|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x86.Build.0 = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x86.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x86 - {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x86.ActiveCfg = Release|x86 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.ActiveCfg = Debug|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|x64.Build.0 = Debug|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.ActiveCfg = Release|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Installer|x64.Build.0 = Release|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|x64.Build.0 = Release Portable|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.ActiveCfg = Release|x64 + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|x64.Build.0 = Release|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.ActiveCfg = Debug Portable|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug Portable|x64.Build.0 = Debug Portable|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.ActiveCfg = Debug|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Debug|x64.Build.0 = Debug|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.ActiveCfg = Release|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Installer|x64.Build.0 = Release|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.ActiveCfg = Release Portable|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release Portable|x64.Build.0 = Release Portable|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|Any CPU.Build.0 = Release|Any CPU + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.ActiveCfg = Release|x64 + {1453B37F-8621-499E-B0B2-6091F76DC0BB}.Release|x64.Build.0 = Release|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|Any CPU.Build.0 = Debug Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.ActiveCfg = Debug|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug Portable|x64.Build.0 = Debug|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.ActiveCfg = Debug|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|Any CPU.Build.0 = Debug|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Debug|x64.ActiveCfg = Debug|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.ActiveCfg = Release Installer|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|Any CPU.Build.0 = Release Installer|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.ActiveCfg = Release|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Installer|x64.Build.0 = Release|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.ActiveCfg = Release Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|Any CPU.Build.0 = Release Portable|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release Portable|x64.ActiveCfg = Release|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.ActiveCfg = Release|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|Any CPU.Build.0 = Release|x64 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.ActiveCfg = Release|x86 + {5423D985-CB48-4344-B47F-E8C6D60C8B04}.Release|x64.Build.0 = Release|x86 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|x86 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|Any CPU.Build.0 = Debug Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x86.ActiveCfg = Debug Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.ActiveCfg = Debug Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug Portable|x64.Build.0 = Debug Portable|x86 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x86.ActiveCfg = Debug|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.ActiveCfg = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x86.Build.0 = Release|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|Any CPU.Build.0 = Debug|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Debug|x64.ActiveCfg = Debug|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.ActiveCfg = Release Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|Any CPU.Build.0 = Release Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.ActiveCfg = Release|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Installer|x64.Build.0 = Release|x86 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.ActiveCfg = Release Portable|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x86.ActiveCfg = Release Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|Any CPU.Build.0 = Release Portable|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release Portable|x64.ActiveCfg = Release Portable|x86 {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.ActiveCfg = Release|x86 - {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x86.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.ActiveCfg = Debug|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x86.Build.0 = Debug|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.ActiveCfg = Debug|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x86.Build.0 = Debug|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x86.Build.0 = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x86.Build.0 = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.ActiveCfg = Release|x86 - {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x86.Build.0 = Release|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|Any CPU.Build.0 = Release|x86 + {F0168B9F-6815-40DF-BA53-46CEE7683B68}.Release|x64.ActiveCfg = Release|x86 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.ActiveCfg = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug Portable|x64.Build.0 = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Debug|x64.ActiveCfg = Debug|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.ActiveCfg = Release Installer|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|Any CPU.Build.0 = Release Installer|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.ActiveCfg = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Installer|x64.Build.0 = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.ActiveCfg = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release Portable|x64.Build.0 = Release|x64 + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|Any CPU.Build.0 = Release|Any CPU + {16AA21E2-D6B7-427D-AB7D-AA8C611B724E}.Release|x64.ActiveCfg = Release|x64 + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|Any CPU.ActiveCfg = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|Any CPU.Build.0 = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.ActiveCfg = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug Portable|x64.Build.0 = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.ActiveCfg = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Debug|x64.Build.0 = Debug|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|Any CPU.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|Any CPU.Build.0 = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Installer|x64.Build.0 = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|Any CPU.Build.0 = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release Portable|x64.Build.0 = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|Any CPU.Build.0 = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.ActiveCfg = Release|Any CPU + {CBEEE1A0-B917-4F61-812B-85C4C15E80FC}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mRemoteNG/App/CompatibilityChecker.cs b/mRemoteNG/App/CompatibilityChecker.cs index 6b7913984..cc60270dd 100644 --- a/mRemoteNG/App/CompatibilityChecker.cs +++ b/mRemoteNG/App/CompatibilityChecker.cs @@ -5,9 +5,9 @@ using Microsoft.Win32; using mRemoteNG.App.Info; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.UI.TaskDialog; +using mRemoteNG.Resources.Language; namespace mRemoteNG.App { diff --git a/mRemoteNG/App/Import.cs b/mRemoteNG/App/Import.cs index 7ed9e5a36..60b502051 100644 --- a/mRemoteNG/App/Import.cs +++ b/mRemoteNG/App/Import.cs @@ -6,8 +6,8 @@ using mRemoteNG.Config.Import; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.App { diff --git a/mRemoteNG/App/Info/GeneralAppInfo.cs b/mRemoteNG/App/Info/GeneralAppInfo.cs index 289932ee8..49dbdf55e 100644 --- a/mRemoteNG/App/Info/GeneralAppInfo.cs +++ b/mRemoteNG/App/Info/GeneralAppInfo.cs @@ -15,6 +15,7 @@ namespace mRemoteNG.App.Info public const string UrlDonate = "https://mremoteng.org/contribute"; public const string UrlForum = "https://www.reddit.com/r/mRemoteNG"; public const string UrlBugs = "https://bugs.mremoteng.org"; + public const string UrlDocumentation = "https://mremoteng.readthedocs.io/en/latest/"; public static string ApplicationVersion = Application.ProductVersion; public static readonly string ProductName = Application.ProductName; diff --git a/mRemoteNG/App/Info/UpdateChannelInfo.cs b/mRemoteNG/App/Info/UpdateChannelInfo.cs index 17b038411..de1f014c9 100644 --- a/mRemoteNG/App/Info/UpdateChannelInfo.cs +++ b/mRemoteNG/App/Info/UpdateChannelInfo.cs @@ -8,17 +8,16 @@ namespace mRemoteNG.App.Info public static class UpdateChannelInfo { public const string STABLE = "Stable"; - public const string BETA = "Beta"; - public const string DEV = "Development"; + public const string PREVIEW = "Preview"; + public const string NIGHTLY = "Nightly"; - /* no #if here since they are used for unit tests as well */ public const string STABLE_PORTABLE = "update-portable.txt"; - public const string BETA_PORTABLE = "beta-update-portable.txt"; - public const string DEV_PORTABLE = "dev-update-portable.txt"; + public const string PREVIEW_PORTABLE = "preview-update-portable.txt"; + public const string NIGHTLY_PORTABLE = "nightly-update-portable.txt"; public const string STABLE_MSI = "update.txt"; - public const string BETA_MSI = "beta-update.txt"; - public const string DEV_MSI = "dev-update.txt"; + public const string PREVIEW_MSI = "preview-update.txt"; + public const string NIGHTLY_MSI = "nightly-update.txt"; public static Uri GetUpdateChannelInfo() @@ -40,10 +39,10 @@ namespace mRemoteNG.App.Info { case STABLE: return STABLE_MSI; - case BETA: - return BETA_MSI; - case DEV: - return DEV_MSI; + case PREVIEW: + return PREVIEW_MSI; + case NIGHTLY: + return NIGHTLY_MSI; default: return STABLE_MSI; } @@ -55,10 +54,10 @@ namespace mRemoteNG.App.Info { case STABLE: return STABLE_PORTABLE; - case BETA: - return BETA_PORTABLE; - case DEV: - return DEV_PORTABLE; + case PREVIEW: + return PREVIEW_PORTABLE; + case NIGHTLY: + return NIGHTLY_PORTABLE; default: return STABLE_PORTABLE; } @@ -72,7 +71,7 @@ namespace mRemoteNG.App.Info private static bool IsValidChannel(string s) { - return s.Equals(STABLE) || s.Equals(BETA) || s.Equals(DEV); + return s.Equals(STABLE) || s.Equals(PREVIEW) || s.Equals(NIGHTLY); } } } \ No newline at end of file diff --git a/mRemoteNG/App/NativeMethods.cs b/mRemoteNG/App/NativeMethods.cs index 0e15954b6..8d7dc3496 100644 --- a/mRemoteNG/App/NativeMethods.cs +++ b/mRemoteNG/App/NativeMethods.cs @@ -71,6 +71,12 @@ namespace mRemoteNG.App [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)] internal static extern IntPtr SetClipboardViewer(IntPtr hWndNewViewer); + [DllImport("User32.dll", CharSet = CharSet.Auto)] + internal static extern bool ChangeClipboardChain( + IntPtr hWndRemove, // handle to window to remove + IntPtr hWndNewNext // handle to next window + ); + [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)] internal static extern bool SetForegroundWindow(IntPtr hWnd); diff --git a/mRemoteNG/App/Runtime.cs b/mRemoteNG/App/Runtime.cs index 23d0e3aad..bf34daf5d 100644 --- a/mRemoteNG/App/Runtime.cs +++ b/mRemoteNG/App/Runtime.cs @@ -102,6 +102,10 @@ namespace mRemoteNG.App if (Settings.Default.UseSQLServer) { ConnectionsService.LastSqlUpdate = DateTime.Now; + } + else + { + ConnectionsService.LastFileUpdate = System.IO.File.GetLastWriteTime(connectionFileName); } // re-enable sql update checking after updates are loaded diff --git a/mRemoteNG/App/Shutdown.cs b/mRemoteNG/App/Shutdown.cs index dd06609ef..e69c557e4 100644 --- a/mRemoteNG/App/Shutdown.cs +++ b/mRemoteNG/App/Shutdown.cs @@ -2,11 +2,12 @@ using System; using System.Diagnostics; using System.Windows.Forms; +using mRemoteNG.Config.Connections; using mRemoteNG.Config.Putty; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Controls; using mRemoteNG.UI.Forms; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody @@ -60,8 +61,34 @@ namespace mRemoteNG.App private static void SaveConnections() { - if (Settings.Default.SaveConsOnExit) + DateTime lastUpdate; + DateTime updateDate; + DateTime currentDate = DateTime.Now; + + //OBSOLETE: Settings.Default.SaveConsOnExit is obsolete and should be removed in a future release + if (Settings.Default.SaveConsOnExit || (Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnExit)) + { Runtime.ConnectionsService.SaveConnections(); + return; + } + lastUpdate = Runtime.ConnectionsService.UsingDatabase ? Runtime.ConnectionsService.LastSqlUpdate : Runtime.ConnectionsService.LastFileUpdate; + + switch (Settings.Default.SaveConnectionsFrequency) + { + case (int)ConnectionsBackupFrequencyEnum.Daily: + updateDate = lastUpdate.AddDays(1); + break; + case (int)ConnectionsBackupFrequencyEnum.Weekly: + updateDate = lastUpdate.AddDays(7); + break; + default: + return; + } + + if (currentDate >= updateDate) + { + Runtime.ConnectionsService.SaveConnections(); + } } private static void SaveSettings(Control quickConnectToolStrip, diff --git a/mRemoteNG/App/Startup.cs b/mRemoteNG/App/Startup.cs index d92aa242c..cb54bc552 100644 --- a/mRemoteNG/App/Startup.cs +++ b/mRemoteNG/App/Startup.cs @@ -5,7 +5,6 @@ using System.Globalization; using mRemoteNG.App.Info; using mRemoteNG.App.Initialization; using mRemoteNG.App.Update; -using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Connection; using mRemoteNG.Messages; diff --git a/mRemoteNG/App/Update/AppUpdater.cs b/mRemoteNG/App/Update/AppUpdater.cs index 74e60e52c..5c21574c2 100644 --- a/mRemoteNG/App/Update/AppUpdater.cs +++ b/mRemoteNG/App/Update/AppUpdater.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Net; using System.ComponentModel; @@ -245,12 +245,19 @@ namespace mRemoteNG.App.Update if (!e.Cancelled && e.Error == null) { - CurrentUpdateInfo = UpdateInfo.FromString(e.Result); - - Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow; - if (!Settings.Default.UpdatePending) + try { - Settings.Default.UpdatePending = IsUpdateAvailable(); + CurrentUpdateInfo = UpdateInfo.FromString(e.Result); + + Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow; + if (!Settings.Default.UpdatePending) + { + Settings.Default.UpdatePending = IsUpdateAvailable(); + } + } + catch (Exception ex) + { + e = NewDownloadStringCompletedEventArgs(e.Result, ex, e.Cancelled, null); } } diff --git a/mRemoteNG/App/Windows.cs b/mRemoteNG/App/Windows.cs index 7d3bb1049..a1085cc29 100644 --- a/mRemoteNG/App/Windows.cs +++ b/mRemoteNG/App/Windows.cs @@ -1,5 +1,4 @@ using System; -using mRemoteNG.Messages; using mRemoteNG.UI; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Window; @@ -9,10 +8,8 @@ namespace mRemoteNG.App public static class Windows { private static ActiveDirectoryImportWindow _adimportForm; - private static HelpWindow _helpForm; private static ExternalToolsWindow _externalappsForm; private static PortScanWindow _portscanForm; - private static ScreenshotManagerWindow _screenshotmanagerForm; private static UltraVNCWindow _ultravncscForm; private static ConnectionTreeWindow _treeForm; @@ -24,7 +21,6 @@ namespace mRemoteNG.App internal static ConfigWindow ConfigForm { get; set; } = new ConfigWindow(); internal static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow(); - internal static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow(); private static UpdateWindow UpdateForm { get; set; } = new UpdateWindow(); internal static SSHTransferWindow SshtransferForm { get; private set; } = new SSHTransferWindow(); @@ -59,11 +55,6 @@ namespace mRemoteNG.App UpdateForm = new UpdateWindow(); UpdateForm.Show(dockPanel); break; - case WindowType.Help: - if (_helpForm == null || _helpForm.IsDisposed) - _helpForm = new HelpWindow(); - _helpForm.Show(dockPanel); - break; case WindowType.ExternalApps: if (_externalappsForm == null || _externalappsForm.IsDisposed) _externalappsForm = new ExternalToolsWindow(); @@ -73,10 +64,6 @@ namespace mRemoteNG.App _portscanForm = new PortScanWindow(); _portscanForm.Show(dockPanel); break; - case WindowType.ScreenshotManager: - _screenshotmanagerForm = new ScreenshotManagerWindow(); - _screenshotmanagerForm.Show(dockPanel); - break; case WindowType.UltraVNCSC: if (_ultravncscForm == null || _ultravncscForm.IsDisposed) _ultravncscForm = new UltraVNCWindow(); diff --git a/mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs b/mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs new file mode 100644 index 000000000..03967d3eb --- /dev/null +++ b/mRemoteNG/Config/Connections/ConnectionsBackupFrequencyEnum.cs @@ -0,0 +1,13 @@ +namespace mRemoteNG.Config.Connections +{ + public enum ConnectionsBackupFrequencyEnum + { + Unassigned = 0, + Never = 1, + OnEdit = 2, + OnExit = 3, + Daily = 4, + Weekly = 5, + Custom = 6 + } +} \ No newline at end of file diff --git a/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs b/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs index 36fd5352b..d9c7c9d6f 100644 --- a/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs +++ b/mRemoteNG/Config/Connections/Multiuser/RemoteConnectionsSyncronizer.cs @@ -8,7 +8,7 @@ namespace mRemoteNG.Config.Connections.Multiuser { public class RemoteConnectionsSyncronizer : IConnectionsUpdateChecker { - private readonly Timer _updateTimer; + private readonly System.Timers.Timer _updateTimer; private readonly IConnectionsUpdateChecker _updateChecker; public double TimerIntervalInMilliseconds @@ -19,7 +19,7 @@ namespace mRemoteNG.Config.Connections.Multiuser public RemoteConnectionsSyncronizer(IConnectionsUpdateChecker updateChecker) { _updateChecker = updateChecker; - _updateTimer = new Timer(3000); + _updateTimer = new System.Timers.Timer(3000); SetEventListeners(); } diff --git a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs index e8a31d5e4..168d42c99 100644 --- a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs +++ b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs @@ -3,6 +3,7 @@ using System.Collections.Specialized; using System.ComponentModel; using mRemoteNG.Connection; using mRemoteNG.UI.Forms; +using mRemoteNG.Properties; namespace mRemoteNG.Config.Connections { @@ -48,12 +49,14 @@ namespace mRemoteNG.Config.Connections private void SaveConnectionOnEdit(string propertyName = "") { - if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit) - return; - if (FrmMain.Default.IsClosing) - return; + //OBSOLETE: mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit is obsolete and should be removed in a future release + if (mRemoteNG.Properties.Settings.Default.SaveConnectionsAfterEveryEdit || (mRemoteNG.Properties.Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnEdit)) + { + if (FrmMain.Default.IsClosing) + return; - _connectionsService.SaveConnectionsAsync(propertyName); + _connectionsService.SaveConnectionsAsync(propertyName); + } } } } \ No newline at end of file diff --git a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs index 7329c01f0..4be3dce94 100644 --- a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs @@ -12,12 +12,12 @@ using mRemoteNG.Config.Serializers.Versioning; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.Connections { diff --git a/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs b/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs index 190193570..a93fbfb24 100644 --- a/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs +++ b/mRemoteNG/Config/DatabaseConnectors/MSSqlDatabaseConnector.cs @@ -26,10 +26,7 @@ namespace mRemoteNG.Config.DatabaseConnectors return new SqlCommand(dbCommand, (SqlConnection) _dbConnection); } - public bool IsConnected - { - get { return (_dbConnection.State == ConnectionState.Open); } - } + public bool IsConnected => (_dbConnection.State == ConnectionState.Open); public MSSqlDatabaseConnector(string sqlServer, string catalog, string username, string password) { @@ -56,12 +53,26 @@ namespace mRemoteNG.Config.DatabaseConnectors private void BuildDbConnectionStringWithCustomCredentials() { - _dbConnectionString = $"Data Source={_dbHost};Initial Catalog={_dbCatalog};User Id={_dbUsername};Password={_dbPassword}"; + string[] hostParts = _dbHost.Split(new char[] { ':' }, 2); + var _dbPort = (hostParts.Length == 2) ? hostParts[1] : "1433"; + + _dbConnectionString = new SqlConnectionStringBuilder + { + DataSource = $"{hostParts[0]},{_dbPort}", + InitialCatalog = _dbCatalog, + UserID = _dbUsername, + Password = _dbPassword, + }.ToString(); } private void BuildDbConnectionStringWithDefaultCredentials() { - _dbConnectionString = $"Data Source={_dbHost};Initial Catalog={_dbCatalog};Integrated Security=True"; + _dbConnectionString = new SqlConnectionStringBuilder + { + DataSource = _dbHost, + InitialCatalog = _dbCatalog, + IntegratedSecurity = true + }.ToString(); } public void Connect() diff --git a/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs b/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs index 9275dc3ee..a4a29a776 100644 --- a/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs +++ b/mRemoteNG/Config/DatabaseConnectors/MySqlDatabaseConnector.cs @@ -27,10 +27,7 @@ namespace mRemoteNG.Config.DatabaseConnectors return new MySqlCommand(dbCommand, (MySqlConnection) _dbConnection); } - public bool IsConnected - { - get { return (_dbConnection.State == ConnectionState.Open); } - } + public bool IsConnected => (_dbConnection.State == ConnectionState.Open); public MySqlDatabaseConnector(string host, string database, string username, string password) { diff --git a/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs b/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs index 4d8e0765e..8d81e6cc9 100644 --- a/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs +++ b/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs @@ -1,7 +1,6 @@ -using System; +using System; using System.Linq; using mRemoteNG.App; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; using mRemoteNG.Tools; diff --git a/mRemoteNG/Config/Import/PortScanImporter.cs b/mRemoteNG/Config/Import/PortScanImporter.cs index 089f6c961..6a6cb9dbe 100644 --- a/mRemoteNG/Config/Import/PortScanImporter.cs +++ b/mRemoteNG/Config/Import/PortScanImporter.cs @@ -1,6 +1,5 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs b/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs index 878ad516d..f7f103699 100644 --- a/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs +++ b/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs @@ -1,6 +1,5 @@ -using System.Linq; +using System.Linq; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs b/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs index 6e027d865..321308318 100644 --- a/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs +++ b/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs @@ -1,7 +1,6 @@ -using System.IO; +using System.IO; using System.Linq; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs b/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs index e39e6b613..c68fb4ed9 100644 --- a/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs +++ b/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs @@ -1,6 +1,5 @@ -using System.Linq; +using System.Linq; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs b/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs index 88c634a14..c6efb46d2 100644 --- a/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs +++ b/mRemoteNG/Config/Putty/AbstractPuttySessionsProvider.cs @@ -13,10 +13,7 @@ namespace mRemoteNG.Config.Putty { public virtual RootPuttySessionsNodeInfo RootInfo { get; } = new RootPuttySessionsNodeInfo(); - protected virtual List Sessions - { - get { return RootInfo.Children.OfType().ToList(); } - } + protected virtual List Sessions => RootInfo.Children.OfType().ToList(); #region Public Methods diff --git a/mRemoteNG/Config/Putty/PuttySessionsManager.cs b/mRemoteNG/Config/Putty/PuttySessionsManager.cs index 739c8590d..e937e4124 100644 --- a/mRemoteNG/Config/Putty/PuttySessionsManager.cs +++ b/mRemoteNG/Config/Putty/PuttySessionsManager.cs @@ -14,10 +14,7 @@ namespace mRemoteNG.Config.Putty private readonly List _providers = new List(); - public IEnumerable Providers - { - get { return _providers; } - } + public IEnumerable Providers => _providers; public List RootPuttySessionsNodes { get; } = new List(); @@ -134,10 +131,7 @@ namespace mRemoteNG.Config.Putty public class SessionList : StringConverter { - public static string[] Names - { - get { return Instance.GetSessionNames(); } - } + public static string[] Names => Instance.GetSessionNames(); public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs index dfd414dee..1003df125 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs @@ -136,6 +136,10 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv ? connectionCsv[headers.IndexOf("LoadBalanceInfo")] : ""; + connectionRecord.OpeningCommand = headers.Contains("OpeningCommand") + ? connectionCsv[headers.IndexOf("OpeningCommand")] + : ""; + connectionRecord.PreExtApp = headers.Contains("PreExtApp") ? connectionCsv[headers.IndexOf("PreExtApp")] : ""; @@ -544,6 +548,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv connectionRecord.Inheritance.SSHTunnelConnectionName = value; } + if (headers.Contains("InheritOpeningCommand")) + { + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritOpeningCommand")], out bool value)) + connectionRecord.Inheritance.OpeningCommand = value; + } + if (headers.Contains("InheritSSHOptions")) { if (bool.TryParse(connectionCsv[headers.IndexOf("InheritSSHOptions")], out bool value)) @@ -664,6 +674,12 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv connectionRecord.Inheritance.LoadBalanceInfo = value; } + if (headers.Contains("InheritOpeningCommand")) + { + if (bool.TryParse(connectionCsv[headers.IndexOf("InheritOpeningCommand")], out bool value)) + connectionRecord.Inheritance.OpeningCommand = value; + } + if (headers.Contains("InheritPreExtApp")) { if (bool.TryParse(connectionCsv[headers.IndexOf("InheritPreExtApp")], out bool value)) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs index 04e391726..a40666eeb 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs @@ -56,7 +56,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv if (_saveFilter.SaveDomain) sb.Append("Domain;"); - sb.Append("Hostname;Port;VmId;Protocol;SSHTunnelConnectionName;SSHOptions;PuttySession;ConnectToConsole;UseCredSsp;UseVmId;UseEnhancedMode;RenderingEngine;RDPAuthenticationLevel;" + + sb.Append("Hostname;Port;VmId;Protocol;SSHTunnelConnectionName;OpeningCommand;SSHOptions;PuttySession;ConnectToConsole;UseCredSsp;UseVmId;UseEnhancedMode;RenderingEngine;RDPAuthenticationLevel;" + "LoadBalanceInfo;Colors;Resolution;AutomaticResize;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;DisableFullWindowDrag;DisableMenuAnimations;DisableCursorShadow;DisableCursorBlinking;" + "CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectClipboard;RedirectSmartCards;RedirectSound;RedirectKeys;" + "PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;Favorite;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;" + @@ -122,6 +122,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv .Append(FormatForCsv(con.VmId)) .Append(FormatForCsv(con.Protocol)) .Append(FormatForCsv(con.SSHTunnelConnectionName)) + .Append(FormatForCsv(con.OpeningCommand)) .Append(FormatForCsv(con.SSHOptions)) .Append(FormatForCsv(con.PuttySession)) .Append(FormatForCsv(con.UseConsoleSession)) @@ -200,6 +201,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv .Append(FormatForCsv(con.Inheritance.Port)) .Append(FormatForCsv(con.Inheritance.Protocol)) .Append(FormatForCsv(con.Inheritance.SSHTunnelConnectionName)) + .Append(FormatForCsv(con.Inheritance.OpeningCommand)) .Append(FormatForCsv(con.Inheritance.SSHOptions)) .Append(FormatForCsv(con.Inheritance.PuttySession)) .Append(FormatForCsv(con.Inheritance.RedirectDiskDrives)) diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs index ff33528f7..46e43c1e8 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs @@ -1,283 +1,267 @@ -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Security; -using mRemoteNG.App; -using mRemoteNG.Connection; -using mRemoteNG.Connection.Protocol; -using mRemoteNG.Connection.Protocol.Http; -using mRemoteNG.Connection.Protocol.RDP; -using mRemoteNG.Connection.Protocol.VNC; -using mRemoteNG.Container; -using mRemoteNG.Security; -using mRemoteNG.Tools; -using mRemoteNG.Tree; -using mRemoteNG.Tree.Root; - -namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql -{ - public class DataTableDeserializer : IDeserializer - { - private readonly ICryptographyProvider _cryptographyProvider; - private readonly SecureString _decryptionKey; - - public DataTableDeserializer(ICryptographyProvider cryptographyProvider, SecureString decryptionKey) - { - _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider)); - _decryptionKey = decryptionKey.ThrowIfNull(nameof(decryptionKey)); - } - - public ConnectionTreeModel Deserialize(DataTable table) - { - var connectionList = CreateNodesFromTable(table); - var connectionTreeModel = CreateNodeHierarchy(connectionList, table); - Runtime.ConnectionsService.IsConnectionsFileLoaded = true; - return connectionTreeModel; - } - - private List CreateNodesFromTable(DataTable table) - { - var nodeList = new List(); - foreach (DataRow row in table.Rows) - { - // ReSharper disable once SwitchStatementMissingSomeCases - switch ((string)row["Type"]) - { - case "Connection": - nodeList.Add(DeserializeConnectionInfo(row)); - break; - case "Container": - nodeList.Add(DeserializeContainerInfo(row)); - break; - } - } - - return nodeList; - } - - private ConnectionInfo DeserializeConnectionInfo(DataRow row) - { - var connectionId = row["ConstantID"] as string ?? Guid.NewGuid().ToString(); - var connectionInfo = new ConnectionInfo(connectionId); - PopulateConnectionInfoFromDatarow(row, connectionInfo); - return connectionInfo; - } - - private ContainerInfo DeserializeContainerInfo(DataRow row) - { - var containerId = row["ConstantID"] as string ?? Guid.NewGuid().ToString(); - var containerInfo = new ContainerInfo(containerId); - PopulateConnectionInfoFromDatarow(row, containerInfo); - return containerInfo; - } - - private void PopulateConnectionInfoFromDatarow(DataRow dataRow, ConnectionInfo connectionInfo) - { - connectionInfo.Name = (string)dataRow["Name"]; - - // This throws a NPE - Parent is a connectionInfo object which will be null at this point. - // The Parent object is linked properly later in CreateNodeHierarchy() - //connectionInfo.Parent.ConstantID = (string)dataRow["ParentID"]; - - connectionInfo.Description = (string)dataRow["Description"]; - connectionInfo.Icon = (string)dataRow["Icon"]; - connectionInfo.Panel = (string)dataRow["Panel"]; - connectionInfo.Username = (string)dataRow["Username"]; - connectionInfo.Domain = (string)dataRow["Domain"]; - connectionInfo.Password = DecryptValue((string)dataRow["Password"]); - connectionInfo.Hostname = (string)dataRow["Hostname"]; - connectionInfo.VmId = (string)dataRow["VmId"]; - connectionInfo.UseEnhancedMode = (bool)dataRow["UseEnhancedMode"]; - connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]); - connectionInfo.SSHTunnelConnectionName = (string)dataRow["SSHTunnelConnectionName"]; - connectionInfo.SSHOptions = (string)dataRow["SSHOptions"]; - connectionInfo.PuttySession = (string)dataRow["PuttySession"]; - connectionInfo.Port = (int)dataRow["Port"]; - connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"]; - connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"]; - connectionInfo.UseVmId = (bool)dataRow["UseVmId"]; - connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), - (string)dataRow["RenderingEngine"]); - connectionInfo.RDPAuthenticationLevel = - (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel), - (string)dataRow["RDPAuthenticationLevel"]); - connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"]; - connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"]; - connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"]; - connectionInfo.Colors = - (RDPColors)Enum.Parse(typeof(RDPColors), (string)dataRow["Colors"]); - connectionInfo.Resolution = - (RDPResolutions)Enum.Parse(typeof(RDPResolutions), - (string)dataRow["Resolution"]); - connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"]; - connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"]; - connectionInfo.DisplayThemes = (bool)dataRow["DisplayThemes"]; - connectionInfo.EnableFontSmoothing = (bool)dataRow["EnableFontSmoothing"]; - connectionInfo.EnableDesktopComposition = (bool)dataRow["EnableDesktopComposition"]; - connectionInfo.DisableFullWindowDrag = (bool)dataRow["DisableFullWindowDrag"]; - connectionInfo.DisableMenuAnimations = (bool)dataRow["DisableMenuAnimations"]; - connectionInfo.DisableCursorShadow = (bool)dataRow["DisableCursorShadow"]; - connectionInfo.DisableCursorBlinking = (bool)dataRow["DisableCursorBlinking"]; - connectionInfo.CacheBitmaps = (bool)dataRow["CacheBitmaps"]; - connectionInfo.RedirectDiskDrives = (bool)dataRow["RedirectDiskDrives"]; - connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"]; - connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"]; - connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"]; - connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"]; - connectionInfo.RedirectSound = - (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]); - connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality), - (string)dataRow["SoundQuality"]); +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Security; +using mRemoteNG.App; +using mRemoteNG.Connection; +using mRemoteNG.Connection.Protocol; +using mRemoteNG.Connection.Protocol.Http; +using mRemoteNG.Connection.Protocol.RDP; +using mRemoteNG.Connection.Protocol.VNC; +using mRemoteNG.Container; +using mRemoteNG.Security; +using mRemoteNG.Tools; +using mRemoteNG.Tree; +using mRemoteNG.Tree.Root; + +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql +{ + public class DataTableDeserializer : IDeserializer + { + private readonly ICryptographyProvider _cryptographyProvider; + private readonly SecureString _decryptionKey; + + public DataTableDeserializer(ICryptographyProvider cryptographyProvider, SecureString decryptionKey) + { + _cryptographyProvider = cryptographyProvider.ThrowIfNull(nameof(cryptographyProvider)); + _decryptionKey = decryptionKey.ThrowIfNull(nameof(decryptionKey)); + } + + public ConnectionTreeModel Deserialize(DataTable table) + { + var connectionList = CreateNodesFromTable(table); + var connectionTreeModel = CreateNodeHierarchy(connectionList, table); + Runtime.ConnectionsService.IsConnectionsFileLoaded = true; + return connectionTreeModel; + } + + private List CreateNodesFromTable(DataTable table) + { + var nodeList = new List(); + foreach (DataRow row in table.Rows) + { + // ReSharper disable once SwitchStatementMissingSomeCases + switch ((string)row["Type"]) + { + case "Connection": + nodeList.Add(DeserializeConnectionInfo(row)); + break; + case "Container": + nodeList.Add(DeserializeContainerInfo(row)); + break; + } + } + + return nodeList; + } + + private ConnectionInfo DeserializeConnectionInfo(DataRow row) + { + var connectionId = row["ConstantID"] as string ?? Guid.NewGuid().ToString(); + var connectionInfo = new ConnectionInfo(connectionId); + PopulateConnectionInfoFromDatarow(row, connectionInfo); + return connectionInfo; + } + + private ContainerInfo DeserializeContainerInfo(DataRow row) + { + var containerId = row["ConstantID"] as string ?? Guid.NewGuid().ToString(); + var containerInfo = new ContainerInfo(containerId); + PopulateConnectionInfoFromDatarow(row, containerInfo); + return containerInfo; + } + + private void PopulateConnectionInfoFromDatarow(DataRow dataRow, ConnectionInfo connectionInfo) + { + connectionInfo.Name = (string)dataRow["Name"]; + + // This throws a NPE - Parent is a connectionInfo object which will be null at this point. + // The Parent object is linked properly later in CreateNodeHierarchy() + //connectionInfo.Parent.ConstantID = (string)dataRow["ParentID"]; + + connectionInfo.Description = (string)dataRow["Description"]; + connectionInfo.Icon = (string)dataRow["Icon"]; + connectionInfo.Panel = (string)dataRow["Panel"]; + connectionInfo.Username = (string)dataRow["Username"]; + connectionInfo.Domain = (string)dataRow["Domain"]; + connectionInfo.Password = DecryptValue((string)dataRow["Password"]); + connectionInfo.Hostname = (string)dataRow["Hostname"]; + connectionInfo.VmId = (string)dataRow["VmId"]; + connectionInfo.UseEnhancedMode = (bool)dataRow["UseEnhancedMode"]; + connectionInfo.Protocol = (ProtocolType)Enum.Parse(typeof(ProtocolType), (string)dataRow["Protocol"]); + connectionInfo.SSHTunnelConnectionName = (string)dataRow["SSHTunnelConnectionName"]; + connectionInfo.OpeningCommand = (string)dataRow["OpeningCommand"]; + connectionInfo.SSHOptions = (string)dataRow["SSHOptions"]; + connectionInfo.PuttySession = (string)dataRow["PuttySession"]; + connectionInfo.Port = (int)dataRow["Port"]; + connectionInfo.UseConsoleSession = (bool)dataRow["ConnectToConsole"]; + connectionInfo.UseCredSsp = (bool)dataRow["UseCredSsp"]; + connectionInfo.UseVmId = (bool)dataRow["UseVmId"]; + connectionInfo.RenderingEngine = (HTTPBase.RenderingEngine)Enum.Parse(typeof(HTTPBase.RenderingEngine), (string)dataRow["RenderingEngine"]); + connectionInfo.RDPAuthenticationLevel = (AuthenticationLevel)Enum.Parse(typeof(AuthenticationLevel), (string)dataRow["RDPAuthenticationLevel"]); + connectionInfo.RDPMinutesToIdleTimeout = (int)dataRow["RDPMinutesToIdleTimeout"]; + connectionInfo.RDPAlertIdleTimeout = (bool)dataRow["RDPAlertIdleTimeout"]; + connectionInfo.LoadBalanceInfo = (string)dataRow["LoadBalanceInfo"]; + connectionInfo.Colors = (RDPColors)Enum.Parse(typeof(RDPColors), (string)dataRow["Colors"]); + connectionInfo.Resolution = (RDPResolutions)Enum.Parse(typeof(RDPResolutions), (string)dataRow["Resolution"]); + connectionInfo.AutomaticResize = (bool)dataRow["AutomaticResize"]; + connectionInfo.DisplayWallpaper = (bool)dataRow["DisplayWallpaper"]; + connectionInfo.DisplayThemes = (bool)dataRow["DisplayThemes"]; + connectionInfo.EnableFontSmoothing = (bool)dataRow["EnableFontSmoothing"]; + connectionInfo.EnableDesktopComposition = (bool)dataRow["EnableDesktopComposition"]; + connectionInfo.DisableFullWindowDrag = (bool)dataRow["DisableFullWindowDrag"]; + connectionInfo.DisableMenuAnimations = (bool)dataRow["DisableMenuAnimations"]; + connectionInfo.DisableCursorShadow = (bool)dataRow["DisableCursorShadow"]; + connectionInfo.DisableCursorBlinking = (bool)dataRow["DisableCursorBlinking"]; + connectionInfo.CacheBitmaps = (bool)dataRow["CacheBitmaps"]; + connectionInfo.RedirectDiskDrives = (bool)dataRow["RedirectDiskDrives"]; + connectionInfo.RedirectPorts = (bool)dataRow["RedirectPorts"]; + connectionInfo.RedirectPrinters = (bool)dataRow["RedirectPrinters"]; + connectionInfo.RedirectClipboard = (bool)dataRow["RedirectClipboard"]; + connectionInfo.RedirectSmartCards = (bool)dataRow["RedirectSmartCards"]; + connectionInfo.RedirectSound = (RDPSounds)Enum.Parse(typeof(RDPSounds), (string)dataRow["RedirectSound"]); + connectionInfo.SoundQuality = (RDPSoundQuality)Enum.Parse(typeof(RDPSoundQuality), (string)dataRow["SoundQuality"]); connectionInfo.RedirectAudioCapture = (bool)dataRow["RedirectAudioCapture"]; #region Remote Desktop Services - connectionInfo.StartProgram = (string)dataRow[ConnectionInfo.Prop_StartProgram]; - connectionInfo.StartProgramWorkDir = (string)dataRow[ConnectionInfo.Prop_StartProgramWorkDir]; + connectionInfo.StartProgram = (string)dataRow[ConnectionInfo.Prop_StartProgram]; + connectionInfo.StartProgramWorkDir = (string)dataRow[ConnectionInfo.Prop_StartProgramWorkDir]; #endregion - connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"]; - connectionInfo.PreExtApp = (string)dataRow["PreExtApp"]; - connectionInfo.PostExtApp = (string)dataRow["PostExtApp"]; - connectionInfo.MacAddress = (string)dataRow["MacAddress"]; - connectionInfo.UserField = (string)dataRow["UserField"]; - connectionInfo.ExtApp = (string)dataRow["ExtApp"]; - connectionInfo.VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), - (string)dataRow["VNCCompression"]); - connectionInfo.VNCEncoding = - (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), (string)dataRow["VNCEncoding"]); - connectionInfo.VNCAuthMode = - (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), (string)dataRow["VNCAuthMode"]); - connectionInfo.VNCProxyType = - (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), (string)dataRow["VNCProxyType"]); - connectionInfo.VNCProxyIP = (string)dataRow["VNCProxyIP"]; - connectionInfo.VNCProxyPort = (int)dataRow["VNCProxyPort"]; - connectionInfo.VNCProxyUsername = (string)dataRow["VNCProxyUsername"]; - connectionInfo.VNCProxyPassword = DecryptValue((string)dataRow["VNCProxyPassword"]); - connectionInfo.VNCColors = - (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]); - connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), - (string)dataRow - ["VNCSmartSizeMode"]); - connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"]; - connectionInfo.RDGatewayUsageMethod = - (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), - (string)dataRow["RDGatewayUsageMethod"]); - connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"]; - connectionInfo.RDGatewayUseConnectionCredentials = - (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials), - (string)dataRow["RDGatewayUseConnectionCredentials"]); - connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"]; - connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]); - connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"]; - - if (!dataRow.IsNull("RdpVersion")) // table allows null values which must be handled - if (Enum.TryParse((string)dataRow["RdpVersion"], true, out RdpVersion rdpVersion)) - connectionInfo.RdpVersion = rdpVersion; - - connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"]; - connectionInfo.Inheritance.Colors = (bool)dataRow["InheritColors"]; - connectionInfo.Inheritance.Description = (bool)dataRow["InheritDescription"]; - connectionInfo.Inheritance.DisplayThemes = (bool)dataRow["InheritDisplayThemes"]; - connectionInfo.Inheritance.DisplayWallpaper = (bool)dataRow["InheritDisplayWallpaper"]; - connectionInfo.Inheritance.EnableFontSmoothing = (bool)dataRow["InheritEnableFontSmoothing"]; - connectionInfo.Inheritance.EnableDesktopComposition = (bool)dataRow["InheritEnableDesktopComposition"]; - connectionInfo.Inheritance.DisableFullWindowDrag = (bool)dataRow["InheritDisableFullWindowDrag"]; - connectionInfo.Inheritance.DisableMenuAnimations = (bool)dataRow["InheritDisableMenuAnimations"]; - connectionInfo.Inheritance.DisableCursorShadow = (bool)dataRow["InheritDisableCursorShadow"]; - connectionInfo.Inheritance.DisableCursorBlinking = (bool)dataRow["InheritDisableCursorBlinking"]; - connectionInfo.Inheritance.Domain = (bool)dataRow["InheritDomain"]; - connectionInfo.Inheritance.Icon = (bool)dataRow["InheritIcon"]; - connectionInfo.Inheritance.Panel = (bool)dataRow["InheritPanel"]; - connectionInfo.Inheritance.Password = (bool)dataRow["InheritPassword"]; - connectionInfo.Inheritance.Port = (bool)dataRow["InheritPort"]; - connectionInfo.Inheritance.Protocol = (bool)dataRow["InheritProtocol"]; - connectionInfo.Inheritance.SSHTunnelConnectionName = (bool)dataRow["InheritSSHTunnelConnectionName"]; - connectionInfo.Inheritance.SSHOptions = (bool)dataRow["InheritSSHOptions"]; - connectionInfo.Inheritance.PuttySession = (bool)dataRow["InheritPuttySession"]; - connectionInfo.Inheritance.RedirectDiskDrives = (bool)dataRow["InheritRedirectDiskDrives"]; - connectionInfo.Inheritance.RedirectKeys = (bool)dataRow["InheritRedirectKeys"]; - connectionInfo.Inheritance.RedirectPorts = (bool)dataRow["InheritRedirectPorts"]; - connectionInfo.Inheritance.RedirectPrinters = (bool)dataRow["InheritRedirectPrinters"]; - connectionInfo.Inheritance.RedirectClipboard = (bool)dataRow["InheritRedirectClipboard"]; - connectionInfo.Inheritance.RedirectSmartCards = (bool)dataRow["InheritRedirectSmartCards"]; - connectionInfo.Inheritance.RedirectSound = (bool)dataRow["InheritRedirectSound"]; - connectionInfo.Inheritance.SoundQuality = (bool)dataRow["InheritSoundQuality"]; - connectionInfo.Inheritance.RedirectAudioCapture = (bool)dataRow["InheritRedirectAudioCapture"]; - connectionInfo.Inheritance.Resolution = (bool)dataRow["InheritResolution"]; - connectionInfo.Inheritance.AutomaticResize = (bool)dataRow["InheritAutomaticResize"]; - connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"]; - connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"]; - connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"]; - connectionInfo.Inheritance.UseEnhancedMode = (bool)dataRow["InheritUseEnhancedMode"]; - connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"]; - connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"]; - connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"]; - connectionInfo.Inheritance.RDPAuthenticationLevel = (bool)dataRow["InheritRDPAuthenticationLevel"]; - connectionInfo.Inheritance.RDPAlertIdleTimeout = (bool)dataRow["InheritRDPAlertIdleTimeout"]; - connectionInfo.Inheritance.RDPMinutesToIdleTimeout = (bool)dataRow["InheritRDPMinutesToIdleTimeout"]; - connectionInfo.Inheritance.LoadBalanceInfo = (bool)dataRow["InheritLoadBalanceInfo"]; - connectionInfo.Inheritance.PreExtApp = (bool)dataRow["InheritPreExtApp"]; - connectionInfo.Inheritance.PostExtApp = (bool)dataRow["InheritPostExtApp"]; - connectionInfo.Inheritance.MacAddress = (bool)dataRow["InheritMacAddress"]; - connectionInfo.Inheritance.UserField = (bool)dataRow["InheritUserField"]; - connectionInfo.Inheritance.ExtApp = (bool)dataRow["InheritExtApp"]; - connectionInfo.Inheritance.VNCCompression = (bool)dataRow["InheritVNCCompression"]; - connectionInfo.Inheritance.VNCEncoding = (bool)dataRow["InheritVNCEncoding"]; - connectionInfo.Inheritance.VNCAuthMode = (bool)dataRow["InheritVNCAuthMode"]; - connectionInfo.Inheritance.VNCProxyType = (bool)dataRow["InheritVNCProxyType"]; - connectionInfo.Inheritance.VNCProxyIP = (bool)dataRow["InheritVNCProxyIP"]; - connectionInfo.Inheritance.VNCProxyPort = (bool)dataRow["InheritVNCProxyPort"]; - connectionInfo.Inheritance.VNCProxyUsername = (bool)dataRow["InheritVNCProxyUsername"]; - connectionInfo.Inheritance.VNCProxyPassword = (bool)dataRow["InheritVNCProxyPassword"]; - connectionInfo.Inheritance.VNCColors = (bool)dataRow["InheritVNCColors"]; - connectionInfo.Inheritance.VNCSmartSizeMode = (bool)dataRow["InheritVNCSmartSizeMode"]; - connectionInfo.Inheritance.VNCViewOnly = (bool)dataRow["InheritVNCViewOnly"]; - connectionInfo.Inheritance.RDGatewayUsageMethod = (bool)dataRow["InheritRDGatewayUsageMethod"]; - connectionInfo.Inheritance.RDGatewayHostname = (bool)dataRow["InheritRDGatewayHostname"]; - connectionInfo.Inheritance.RDGatewayUseConnectionCredentials = - (bool)dataRow["InheritRDGatewayUseConnectionCredentials"]; - connectionInfo.Inheritance.RDGatewayUsername = (bool)dataRow["InheritRDGatewayUsername"]; - connectionInfo.Inheritance.RDGatewayPassword = (bool)dataRow["InheritRDGatewayPassword"]; - connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"]; - connectionInfo.Inheritance.RdpVersion = (bool)dataRow["InheritRdpVersion"]; - } - - private string DecryptValue(string cipherText) - { - try - { - return _cryptographyProvider.Decrypt(cipherText, _decryptionKey); - } - catch (EncryptionException) - { - // value may not be encrypted - return cipherText; - } - } - - private ConnectionTreeModel CreateNodeHierarchy(List connectionList, DataTable dataTable) - { - var connectionTreeModel = new ConnectionTreeModel(); - var rootNode = new RootNodeInfo(RootNodeType.Connection, "0") - { - PasswordString = _decryptionKey.ConvertToUnsecureString() - }; - connectionTreeModel.AddRootNode(rootNode); - - foreach (DataRow row in dataTable.Rows) - { - var id = (string)row["ConstantID"]; - var connectionInfo = connectionList.First(node => node.ConstantID == id); - var parentId = (string)row["ParentID"]; - if (parentId == "0" || connectionList.All(node => node.ConstantID != parentId)) - rootNode.AddChild(connectionInfo); - else - (connectionList.First(node => node.ConstantID == parentId) as ContainerInfo)?.AddChild( - connectionInfo); - } - - return connectionTreeModel; - } - } + connectionInfo.RedirectKeys = (bool)dataRow["RedirectKeys"]; + connectionInfo.OpeningCommand = (string)dataRow["OpeningCommand"]; + connectionInfo.PreExtApp = (string)dataRow["PreExtApp"]; + connectionInfo.PostExtApp = (string)dataRow["PostExtApp"]; + connectionInfo.MacAddress = (string)dataRow["MacAddress"]; + connectionInfo.UserField = (string)dataRow["UserField"]; + connectionInfo.ExtApp = (string)dataRow["ExtApp"]; + connectionInfo.VNCCompression = (ProtocolVNC.Compression)Enum.Parse(typeof(ProtocolVNC.Compression), (string)dataRow["VNCCompression"]); + connectionInfo.VNCEncoding = (ProtocolVNC.Encoding)Enum.Parse(typeof(ProtocolVNC.Encoding), (string)dataRow["VNCEncoding"]); + connectionInfo.VNCAuthMode = (ProtocolVNC.AuthMode)Enum.Parse(typeof(ProtocolVNC.AuthMode), (string)dataRow["VNCAuthMode"]); + connectionInfo.VNCProxyType = (ProtocolVNC.ProxyType)Enum.Parse(typeof(ProtocolVNC.ProxyType), (string)dataRow["VNCProxyType"]); + connectionInfo.VNCProxyIP = (string)dataRow["VNCProxyIP"]; + connectionInfo.VNCProxyPort = (int)dataRow["VNCProxyPort"]; + connectionInfo.VNCProxyUsername = (string)dataRow["VNCProxyUsername"]; + connectionInfo.VNCProxyPassword = DecryptValue((string)dataRow["VNCProxyPassword"]); + connectionInfo.VNCColors = (ProtocolVNC.Colors)Enum.Parse(typeof(ProtocolVNC.Colors), (string)dataRow["VNCColors"]); + connectionInfo.VNCSmartSizeMode = (ProtocolVNC.SmartSizeMode)Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), (string)dataRow["VNCSmartSizeMode"]); + connectionInfo.VNCViewOnly = (bool)dataRow["VNCViewOnly"]; + connectionInfo.RDGatewayUsageMethod = (RDGatewayUsageMethod)Enum.Parse(typeof(RDGatewayUsageMethod), (string)dataRow["RDGatewayUsageMethod"]); + connectionInfo.RDGatewayHostname = (string)dataRow["RDGatewayHostname"]; + connectionInfo.RDGatewayUseConnectionCredentials = (RDGatewayUseConnectionCredentials)Enum.Parse(typeof(RDGatewayUseConnectionCredentials), (string)dataRow["RDGatewayUseConnectionCredentials"]); + connectionInfo.RDGatewayUsername = (string)dataRow["RDGatewayUsername"]; + connectionInfo.RDGatewayPassword = DecryptValue((string)dataRow["RDGatewayPassword"]); + connectionInfo.RDGatewayDomain = (string)dataRow["RDGatewayDomain"]; + + if (!dataRow.IsNull("RdpVersion")) // table allows null values which must be handled + if (Enum.TryParse((string)dataRow["RdpVersion"], true, out RdpVersion rdpVersion)) + connectionInfo.RdpVersion = rdpVersion; + + connectionInfo.Inheritance.CacheBitmaps = (bool)dataRow["InheritCacheBitmaps"]; + connectionInfo.Inheritance.Colors = (bool)dataRow["InheritColors"]; + connectionInfo.Inheritance.Description = (bool)dataRow["InheritDescription"]; + connectionInfo.Inheritance.DisplayThemes = (bool)dataRow["InheritDisplayThemes"]; + connectionInfo.Inheritance.DisplayWallpaper = (bool)dataRow["InheritDisplayWallpaper"]; + connectionInfo.Inheritance.EnableFontSmoothing = (bool)dataRow["InheritEnableFontSmoothing"]; + connectionInfo.Inheritance.EnableDesktopComposition = (bool)dataRow["InheritEnableDesktopComposition"]; + connectionInfo.Inheritance.DisableFullWindowDrag = (bool)dataRow["InheritDisableFullWindowDrag"]; + connectionInfo.Inheritance.DisableMenuAnimations = (bool)dataRow["InheritDisableMenuAnimations"]; + connectionInfo.Inheritance.DisableCursorShadow = (bool)dataRow["InheritDisableCursorShadow"]; + connectionInfo.Inheritance.DisableCursorBlinking = (bool)dataRow["InheritDisableCursorBlinking"]; + connectionInfo.Inheritance.Domain = (bool)dataRow["InheritDomain"]; + connectionInfo.Inheritance.Icon = (bool)dataRow["InheritIcon"]; + connectionInfo.Inheritance.Panel = (bool)dataRow["InheritPanel"]; + connectionInfo.Inheritance.Password = (bool)dataRow["InheritPassword"]; + connectionInfo.Inheritance.Port = (bool)dataRow["InheritPort"]; + connectionInfo.Inheritance.Protocol = (bool)dataRow["InheritProtocol"]; + connectionInfo.Inheritance.SSHTunnelConnectionName = (bool)dataRow["InheritSSHTunnelConnectionName"]; + connectionInfo.Inheritance.OpeningCommand = (bool)dataRow["InheritOpeningCommand"]; + connectionInfo.Inheritance.SSHOptions = (bool)dataRow["InheritSSHOptions"]; + connectionInfo.Inheritance.PuttySession = (bool)dataRow["InheritPuttySession"]; + connectionInfo.Inheritance.RedirectDiskDrives = (bool)dataRow["InheritRedirectDiskDrives"]; + connectionInfo.Inheritance.RedirectKeys = (bool)dataRow["InheritRedirectKeys"]; + connectionInfo.Inheritance.RedirectPorts = (bool)dataRow["InheritRedirectPorts"]; + connectionInfo.Inheritance.RedirectPrinters = (bool)dataRow["InheritRedirectPrinters"]; + connectionInfo.Inheritance.RedirectClipboard = (bool)dataRow["InheritRedirectClipboard"]; + connectionInfo.Inheritance.RedirectSmartCards = (bool)dataRow["InheritRedirectSmartCards"]; + connectionInfo.Inheritance.RedirectSound = (bool)dataRow["InheritRedirectSound"]; + connectionInfo.Inheritance.SoundQuality = (bool)dataRow["InheritSoundQuality"]; + connectionInfo.Inheritance.RedirectAudioCapture = (bool)dataRow["InheritRedirectAudioCapture"]; + connectionInfo.Inheritance.Resolution = (bool)dataRow["InheritResolution"]; + connectionInfo.Inheritance.AutomaticResize = (bool)dataRow["InheritAutomaticResize"]; + connectionInfo.Inheritance.UseConsoleSession = (bool)dataRow["InheritUseConsoleSession"]; + connectionInfo.Inheritance.UseCredSsp = (bool)dataRow["InheritUseCredSsp"]; + connectionInfo.Inheritance.UseVmId = (bool)dataRow["InheritUseVmId"]; + connectionInfo.Inheritance.UseEnhancedMode = (bool)dataRow["InheritUseEnhancedMode"]; + connectionInfo.Inheritance.VmId = (bool)dataRow["InheritVmId"]; + connectionInfo.Inheritance.RenderingEngine = (bool)dataRow["InheritRenderingEngine"]; + connectionInfo.Inheritance.Username = (bool)dataRow["InheritUsername"]; + connectionInfo.Inheritance.RDPAuthenticationLevel = (bool)dataRow["InheritRDPAuthenticationLevel"]; + connectionInfo.Inheritance.RDPAlertIdleTimeout = (bool)dataRow["InheritRDPAlertIdleTimeout"]; + connectionInfo.Inheritance.RDPMinutesToIdleTimeout = (bool)dataRow["InheritRDPMinutesToIdleTimeout"]; + connectionInfo.Inheritance.LoadBalanceInfo = (bool)dataRow["InheritLoadBalanceInfo"]; + connectionInfo.Inheritance.OpeningCommand = (bool)dataRow["InheritOpeningCommand"]; + connectionInfo.Inheritance.PreExtApp = (bool)dataRow["InheritPreExtApp"]; + connectionInfo.Inheritance.PostExtApp = (bool)dataRow["InheritPostExtApp"]; + connectionInfo.Inheritance.MacAddress = (bool)dataRow["InheritMacAddress"]; + connectionInfo.Inheritance.UserField = (bool)dataRow["InheritUserField"]; + connectionInfo.Inheritance.ExtApp = (bool)dataRow["InheritExtApp"]; + connectionInfo.Inheritance.VNCCompression = (bool)dataRow["InheritVNCCompression"]; + connectionInfo.Inheritance.VNCEncoding = (bool)dataRow["InheritVNCEncoding"]; + connectionInfo.Inheritance.VNCAuthMode = (bool)dataRow["InheritVNCAuthMode"]; + connectionInfo.Inheritance.VNCProxyType = (bool)dataRow["InheritVNCProxyType"]; + connectionInfo.Inheritance.VNCProxyIP = (bool)dataRow["InheritVNCProxyIP"]; + connectionInfo.Inheritance.VNCProxyPort = (bool)dataRow["InheritVNCProxyPort"]; + connectionInfo.Inheritance.VNCProxyUsername = (bool)dataRow["InheritVNCProxyUsername"]; + connectionInfo.Inheritance.VNCProxyPassword = (bool)dataRow["InheritVNCProxyPassword"]; + connectionInfo.Inheritance.VNCColors = (bool)dataRow["InheritVNCColors"]; + connectionInfo.Inheritance.VNCSmartSizeMode = (bool)dataRow["InheritVNCSmartSizeMode"]; + connectionInfo.Inheritance.VNCViewOnly = (bool)dataRow["InheritVNCViewOnly"]; + connectionInfo.Inheritance.RDGatewayUsageMethod = (bool)dataRow["InheritRDGatewayUsageMethod"]; + connectionInfo.Inheritance.RDGatewayHostname = (bool)dataRow["InheritRDGatewayHostname"]; + connectionInfo.Inheritance.RDGatewayUseConnectionCredentials = (bool)dataRow["InheritRDGatewayUseConnectionCredentials"]; + connectionInfo.Inheritance.RDGatewayUsername = (bool)dataRow["InheritRDGatewayUsername"]; + connectionInfo.Inheritance.RDGatewayPassword = (bool)dataRow["InheritRDGatewayPassword"]; + connectionInfo.Inheritance.RDGatewayDomain = (bool)dataRow["InheritRDGatewayDomain"]; + connectionInfo.Inheritance.RdpVersion = (bool)dataRow["InheritRdpVersion"]; + } + + private string DecryptValue(string cipherText) + { + try + { + return _cryptographyProvider.Decrypt(cipherText, _decryptionKey); + } + catch (EncryptionException) + { + // value may not be encrypted + return cipherText; + } + } + + private ConnectionTreeModel CreateNodeHierarchy(List connectionList, DataTable dataTable) + { + var connectionTreeModel = new ConnectionTreeModel(); + var rootNode = new RootNodeInfo(RootNodeType.Connection, "0") + { + PasswordString = _decryptionKey.ConvertToUnsecureString() + }; + connectionTreeModel.AddRootNode(rootNode); + + foreach (DataRow row in dataTable.Rows) + { + var id = (string)row["ConstantID"]; + var connectionInfo = connectionList.First(node => node.ConstantID == id); + var parentId = (string)row["ParentID"]; + if (parentId == "0" || connectionList.All(node => node.ConstantID != parentId)) + rootNode.AddChild(connectionInfo); + else + (connectionList.First(node => node.ConstantID == parentId) as ContainerInfo)?.AddChild( + connectionInfo); + } + + return connectionTreeModel; + } + } } \ No newline at end of file diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs index bd188d810..f1072f4ac 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs @@ -138,6 +138,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataTable.Columns.Add("RedirectAudioCapture", typeof(bool)); dataTable.Columns.Add("RedirectKeys", typeof(bool)); dataTable.Columns.Add("Connected", typeof(bool)); + dataTable.Columns.Add("OpeningCommand", typeof(string)); dataTable.Columns.Add("PreExtApp", typeof(string)); dataTable.Columns.Add("PostExtApp", typeof(string)); dataTable.Columns.Add("MacAddress", typeof(string)); @@ -194,6 +195,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataTable.Columns.Add("InheritRenderingEngine", typeof(bool)); dataTable.Columns.Add("InheritRDPAuthenticationLevel", typeof(bool)); dataTable.Columns.Add("InheritUsername", typeof(bool)); + dataTable.Columns.Add("InheritOpeningCommand", typeof(bool)); dataTable.Columns.Add("InheritPreExtApp", typeof(bool)); dataTable.Columns.Add("InheritPostExtApp", typeof(bool)); dataTable.Columns.Add("InheritMacAddress", typeof(bool)); @@ -327,6 +329,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql isFieldNotChange = isFieldNotChange && dataRow["Connected"].Equals(false) && // TODO: this column can eventually be removed. we now save this property locally + dataRow["OpeningCommand"].Equals(connectionInfo.OpeningCommand) && dataRow["PreExtApp"].Equals(connectionInfo.PreExtApp) && dataRow["PostExtApp"].Equals(connectionInfo.PostExtApp) && dataRow["MacAddress"].Equals(connectionInfo.MacAddress) && @@ -346,7 +349,6 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["RDGatewayHostname"].Equals(connectionInfo.RDGatewayHostname) && dataRow["RDGatewayUseConnectionCredentials"].Equals(connectionInfo.RDGatewayUseConnectionCredentials.ToString()) && dataRow["RDGatewayUsername"].Equals(connectionInfo.RDGatewayUsername) && - dataRow["RDGatewayDomain"].Equals(connectionInfo.RDGatewayDomain) && dataRow["RdpVersion"].Equals(connectionInfo.RdpVersion.ToString()); @@ -393,6 +395,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["InheritRDPMinutesToIdleTimeout"].Equals(connectionInfo.Inheritance.RDPMinutesToIdleTimeout) && dataRow["InheritRDPAlertIdleTimeout"].Equals(connectionInfo.Inheritance.RDPAlertIdleTimeout) && dataRow["InheritLoadBalanceInfo"].Equals(connectionInfo.Inheritance.LoadBalanceInfo) && + dataRow["InheritOpeningCommand"].Equals(connectionInfo.Inheritance.OpeningCommand) && dataRow["InheritPreExtApp"].Equals(connectionInfo.Inheritance.PreExtApp) && dataRow["InheritPostExtApp"].Equals(connectionInfo.Inheritance.PostExtApp) && dataRow["InheritMacAddress"].Equals(connectionInfo.Inheritance.MacAddress) && @@ -456,6 +459,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["InheritRDPMinutesToIdleTimeout"].Equals(false) && dataRow["InheritRDPAlertIdleTimeout"].Equals(false) && dataRow["InheritLoadBalanceInfo"].Equals(false) && + dataRow["InheritOpeningCommand"].Equals(false) && dataRow["InheritPreExtApp"].Equals(false) && dataRow["InheritPostExtApp"].Equals(false) && dataRow["InheritMacAddress"].Equals(false) && @@ -525,6 +529,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["VmId"] = connectionInfo.VmId; dataRow["Protocol"] = connectionInfo.Protocol; dataRow["SSHTunnelConnectionName"] = connectionInfo.SSHTunnelConnectionName; + dataRow["OpeningCommand"] = connectionInfo.OpeningCommand; dataRow["SSHOptions"] = connectionInfo.SSHOptions; dataRow["PuttySession"] = connectionInfo.PuttySession; dataRow["Port"] = connectionInfo.Port; @@ -559,6 +564,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["RedirectAudioCapture"] = connectionInfo.RedirectAudioCapture; dataRow["RedirectKeys"] = connectionInfo.RedirectKeys; dataRow["Connected"] = false; // TODO: this column can eventually be removed. we now save this property locally + dataRow["OpeningCommand"] = connectionInfo.OpeningCommand; dataRow["PreExtApp"] = connectionInfo.PreExtApp; dataRow["PostExtApp"] = connectionInfo.PostExtApp; dataRow["MacAddress"] = connectionInfo.MacAddress; @@ -611,6 +617,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["InheritPort"] = connectionInfo.Inheritance.Port; dataRow["InheritProtocol"] = connectionInfo.Inheritance.Protocol; dataRow["InheritSSHTunnelConnectionName"] = connectionInfo.Inheritance.SSHTunnelConnectionName; + dataRow["InheritOpeningCommand"] = connectionInfo.Inheritance.OpeningCommand; dataRow["InheritSSHOptions"] = connectionInfo.Inheritance.SSHOptions; dataRow["InheritPuttySession"] = connectionInfo.Inheritance.PuttySession; dataRow["InheritRedirectDiskDrives"] = connectionInfo.Inheritance.RedirectDiskDrives; @@ -635,6 +642,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["InheritRDPMinutesToIdleTimeout"] = connectionInfo.Inheritance.RDPMinutesToIdleTimeout; dataRow["InheritRDPAlertIdleTimeout"] = connectionInfo.Inheritance.RDPAlertIdleTimeout; dataRow["InheritLoadBalanceInfo"] = connectionInfo.Inheritance.LoadBalanceInfo; + dataRow["InheritOpeningCommand"] = connectionInfo.Inheritance.OpeningCommand; dataRow["InheritPreExtApp"] = connectionInfo.Inheritance.PreExtApp; dataRow["InheritPostExtApp"] = connectionInfo.Inheritance.PostExtApp; dataRow["InheritMacAddress"] = connectionInfo.Inheritance.MacAddress; @@ -702,6 +710,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql dataRow["InheritRDPMinutesToIdleTimeout"] = false; dataRow["InheritRDPAlertIdleTimeout"] = false; dataRow["InheritLoadBalanceInfo"] = false; + dataRow["InheritOpeningCommand"] = false; dataRow["InheritPreExtApp"] = false; dataRow["InheritPostExtApp"] = false; dataRow["InheritMacAddress"] = false; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs index b8169c332..aa9d3516a 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs @@ -16,9 +16,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml public Version Version { get; } = new Version(2, 6); - public XmlConnectionNodeSerializer26(ICryptographyProvider cryptographyProvider, - SecureString encryptionKey, - SaveFilter saveFilter) + public XmlConnectionNodeSerializer26(ICryptographyProvider cryptographyProvider, SecureString encryptionKey, SaveFilter saveFilter) { if (cryptographyProvider == null) throw new ArgumentNullException(nameof(cryptographyProvider)); @@ -53,65 +51,55 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("Id", connectionInfo.ConstantID)); element.Add(_saveFilter.SaveUsername - ? new XAttribute("Username", connectionInfo.Username) - : new XAttribute("Username", "")); + ? new XAttribute("Username", connectionInfo.Username) + : new XAttribute("Username", "")); element.Add(_saveFilter.SaveDomain - ? new XAttribute("Domain", connectionInfo.Domain) - : new XAttribute("Domain", "")); + ? new XAttribute("Domain", connectionInfo.Domain) + : new XAttribute("Domain", "")); if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password) - element.Add(new XAttribute("Password", - _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey))); + element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey))); else element.Add(new XAttribute("Password", "")); element.Add(new XAttribute("Hostname", connectionInfo.Hostname)); element.Add(new XAttribute("Protocol", connectionInfo.Protocol)); element.Add(new XAttribute("SSHTunnelConnectionName", connectionInfo.SSHTunnelConnectionName)); + element.Add(new XAttribute("OpeningCommand", connectionInfo.OpeningCommand)); element.Add(new XAttribute("SSHOptions", connectionInfo.SSHOptions)); element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession)); element.Add(new XAttribute("Port", connectionInfo.Port)); - element.Add(new XAttribute("ConnectToConsole", - connectionInfo.UseConsoleSession.ToString().ToLowerInvariant())); + element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString().ToLowerInvariant())); element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString().ToLowerInvariant())); element.Add(new XAttribute("RenderingEngine", connectionInfo.RenderingEngine)); element.Add(new XAttribute("RDPAuthenticationLevel", connectionInfo.RDPAuthenticationLevel)); element.Add(new XAttribute("RDPMinutesToIdleTimeout", connectionInfo.RDPMinutesToIdleTimeout)); - element.Add(new XAttribute("RDPAlertIdleTimeout", - connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); element.Add(new XAttribute("LoadBalanceInfo", connectionInfo.LoadBalanceInfo)); element.Add(new XAttribute("Colors", connectionInfo.Colors)); element.Add(new XAttribute("Resolution", connectionInfo.Resolution)); - element.Add(new XAttribute("AutomaticResize", - connectionInfo.AutomaticResize.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisplayWallpaper", - connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant())); + element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant())); element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString().ToLowerInvariant())); - element.Add(new XAttribute("EnableFontSmoothing", - connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant())); - element.Add(new XAttribute("EnableDesktopComposition", - connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant())); + element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant())); + element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant())); element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectDiskDrives", - connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant())); element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectPrinters", - connectionInfo.RedirectPrinters.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectClipboard", - connectionInfo.RedirectClipboard.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectSmartCards", - connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectClipboard", connectionInfo.RedirectClipboard.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant())); element.Add(new XAttribute("RedirectSound", connectionInfo.RedirectSound.ToString())); element.Add(new XAttribute("SoundQuality", connectionInfo.SoundQuality.ToString())); element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString().ToLowerInvariant())); - element.Add(new XAttribute("Connected", - (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant())); + element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant())); element.Add(new XAttribute("PreExtApp", connectionInfo.PreExtApp)); element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp)); element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress)); element.Add(new XAttribute("UserField", connectionInfo.UserField)); element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp)); + element.Add(new XAttribute("StartProgram", connectionInfo.StartProgram)); element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression)); element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding)); element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode)); @@ -120,223 +108,151 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("VNCProxyPort", connectionInfo.VNCProxyPort)); element.Add(_saveFilter.SaveUsername - ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername) - : new XAttribute("VNCProxyUsername", "")); + ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername) + : new XAttribute("VNCProxyUsername", "")); element.Add(_saveFilter.SavePassword - ? new XAttribute("VNCProxyPassword", - _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, - _encryptionKey)) - : new XAttribute("VNCProxyPassword", "")); + ? new XAttribute("VNCProxyPassword", _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey)) + : new XAttribute("VNCProxyPassword", "")); element.Add(new XAttribute("VNCColors", connectionInfo.VNCColors)); element.Add(new XAttribute("VNCSmartSizeMode", connectionInfo.VNCSmartSizeMode)); element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString().ToLowerInvariant())); element.Add(new XAttribute("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod)); element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname)); - element.Add(new XAttribute("RDGatewayUseConnectionCredentials", - connectionInfo.RDGatewayUseConnectionCredentials)); + element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials)); element.Add(_saveFilter.SaveUsername - ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername) - : new XAttribute("RDGatewayUsername", "")); + ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername) + : new XAttribute("RDGatewayUsername", "")); element.Add(_saveFilter.SavePassword - ? new XAttribute("RDGatewayPassword", - _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, - _encryptionKey)) - : new XAttribute("RDGatewayPassword", "")); + ? new XAttribute("RDGatewayPassword", _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey)) + : new XAttribute("RDGatewayPassword", "")); element.Add(_saveFilter.SaveDomain - ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain) - : new XAttribute("RDGatewayDomain", "")); + ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain) + : new XAttribute("RDGatewayDomain", "")); } private void SetInheritanceAttributes(XContainer element, IInheritable connectionInfo) { if (_saveFilter.SaveInheritance) { - element.Add(new XAttribute("InheritCacheBitmaps", - connectionInfo.Inheritance.CacheBitmaps.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritColors", - connectionInfo.Inheritance.Colors.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDescription", - connectionInfo.Inheritance.Description.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisplayThemes", - connectionInfo.Inheritance.DisplayThemes.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisplayWallpaper", - connectionInfo.Inheritance.DisplayWallpaper.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritEnableFontSmoothing", - connectionInfo - .Inheritance.EnableFontSmoothing.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritEnableDesktopComposition", - connectionInfo - .Inheritance.EnableDesktopComposition.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDomain", - connectionInfo.Inheritance.Domain.ToString().ToLowerInvariant())); - element.Add( - new XAttribute("InheritIcon", - connectionInfo.Inheritance.Icon.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPanel", - connectionInfo.Inheritance.Panel.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPassword", - connectionInfo.Inheritance.Password.ToString().ToLowerInvariant())); - element.Add( - new XAttribute("InheritPort", - connectionInfo.Inheritance.Port.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritProtocol", - connectionInfo.Inheritance.Protocol.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSSHTunnelConnectionName", - connectionInfo.Inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSSHOptions", - connectionInfo.Inheritance.SSHOptions.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPuttySession", - connectionInfo.Inheritance.PuttySession.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectDiskDrives", - connectionInfo - .Inheritance.RedirectDiskDrives.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectKeys", - connectionInfo.Inheritance.RedirectKeys.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectPorts", - connectionInfo.Inheritance.RedirectPorts.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectPrinters", - connectionInfo.Inheritance.RedirectPrinters.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectSmartCards", - connectionInfo - .Inheritance.RedirectSmartCards.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectSound", - connectionInfo.Inheritance.RedirectSound.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSoundQuality", - connectionInfo.Inheritance.SoundQuality.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritResolution", - connectionInfo.Inheritance.Resolution.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritAutomaticResize", - connectionInfo.Inheritance.AutomaticResize.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseConsoleSession", - connectionInfo.Inheritance.UseConsoleSession.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseCredSsp", - connectionInfo.Inheritance.UseCredSsp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRenderingEngine", - connectionInfo.Inheritance.RenderingEngine.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUsername", - connectionInfo.Inheritance.Username.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPAuthenticationLevel", - connectionInfo - .Inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", - connectionInfo - .Inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPAlertIdleTimeout", - connectionInfo - .Inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritLoadBalanceInfo", - connectionInfo.Inheritance.LoadBalanceInfo.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPreExtApp", - connectionInfo.Inheritance.PreExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPostExtApp", - connectionInfo.Inheritance.PostExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritMacAddress", - connectionInfo.Inheritance.MacAddress.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUserField", - connectionInfo.Inheritance.UserField.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritExtApp", - connectionInfo.Inheritance.ExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCCompression", - connectionInfo.Inheritance.VNCCompression.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCEncoding", - connectionInfo.Inheritance.VNCEncoding.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCAuthMode", - connectionInfo.Inheritance.VNCAuthMode.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyType", - connectionInfo.Inheritance.VNCProxyType.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyIP", - connectionInfo.Inheritance.VNCProxyIP.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyPort", - connectionInfo.Inheritance.VNCProxyPort.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyUsername", - connectionInfo.Inheritance.VNCProxyUsername.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyPassword", - connectionInfo.Inheritance.VNCProxyPassword.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCColors", - connectionInfo.Inheritance.VNCColors.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCSmartSizeMode", - connectionInfo.Inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCViewOnly", - connectionInfo.Inheritance.VNCViewOnly.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUsageMethod", - connectionInfo - .Inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayHostname", - connectionInfo.Inheritance.RDGatewayHostname.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", - connectionInfo - .Inheritance.RDGatewayUseConnectionCredentials.ToString() - .ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUsername", - connectionInfo.Inheritance.RDGatewayUsername.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayPassword", - connectionInfo.Inheritance.RDGatewayPassword.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayDomain", - connectionInfo.Inheritance.RDGatewayDomain.ToString().ToLowerInvariant())); - } - else - { - var falseString = false.ToString().ToLowerInvariant(); - element.Add(new XAttribute("InheritCacheBitmaps", falseString)); - element.Add(new XAttribute("InheritColors", falseString)); - element.Add(new XAttribute("InheritDescription", falseString)); - element.Add(new XAttribute("InheritDisplayThemes", falseString)); - element.Add(new XAttribute("InheritDisplayWallpaper", falseString)); - element.Add(new XAttribute("InheritEnableFontSmoothing", falseString)); - element.Add(new XAttribute("InheritEnableDesktopComposition", falseString)); - element.Add(new XAttribute("InheritDomain", falseString)); - element.Add(new XAttribute("InheritIcon", falseString)); - element.Add(new XAttribute("InheritPanel", falseString)); - element.Add(new XAttribute("InheritPassword", falseString)); - element.Add(new XAttribute("InheritPort", falseString)); - element.Add(new XAttribute("InheritProtocol", falseString)); - element.Add(new XAttribute("InheritSSHTunnelConnectionName", falseString)); - element.Add(new XAttribute("InheritSSHOptions", falseString)); - element.Add(new XAttribute("InheritPuttySession", falseString)); - element.Add(new XAttribute("InheritRedirectDiskDrives", falseString)); - element.Add(new XAttribute("InheritRedirectKeys", falseString)); - element.Add(new XAttribute("InheritRedirectPorts", falseString)); - element.Add(new XAttribute("InheritRedirectPrinters", falseString)); - element.Add(new XAttribute("InheritRedirectSmartCards", falseString)); - element.Add(new XAttribute("InheritRedirectSound", falseString)); - element.Add(new XAttribute("InheritSoundQuality", falseString)); - element.Add(new XAttribute("InheritResolution", falseString)); - element.Add(new XAttribute("InheritAutomaticResize", falseString)); - element.Add(new XAttribute("InheritUseConsoleSession", falseString)); - element.Add(new XAttribute("InheritUseCredSsp", falseString)); - element.Add(new XAttribute("InheritRenderingEngine", falseString)); - element.Add(new XAttribute("InheritUsername", falseString)); - element.Add(new XAttribute("InheritRDPAuthenticationLevel", falseString)); - element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", falseString)); - element.Add(new XAttribute("InheritRDPAlertIdleTimeout", falseString)); - element.Add(new XAttribute("InheritLoadBalanceInfo", falseString)); - element.Add(new XAttribute("InheritPreExtApp", falseString)); - element.Add(new XAttribute("InheritPostExtApp", falseString)); - element.Add(new XAttribute("InheritMacAddress", falseString)); - element.Add(new XAttribute("InheritUserField", falseString)); - element.Add(new XAttribute("InheritExtApp", falseString)); - element.Add(new XAttribute("InheritVNCCompression", falseString)); - element.Add(new XAttribute("InheritVNCEncoding", falseString)); - element.Add(new XAttribute("InheritVNCAuthMode", falseString)); - element.Add(new XAttribute("InheritVNCProxyType", falseString)); - element.Add(new XAttribute("InheritVNCProxyIP", falseString)); - element.Add(new XAttribute("InheritVNCProxyPort", falseString)); - element.Add(new XAttribute("InheritVNCProxyUsername", falseString)); - element.Add(new XAttribute("InheritVNCProxyPassword", falseString)); - element.Add(new XAttribute("InheritVNCColors", falseString)); - element.Add(new XAttribute("InheritVNCSmartSizeMode", falseString)); - element.Add(new XAttribute("InheritVNCViewOnly", falseString)); - element.Add(new XAttribute("InheritRDGatewayUsageMethod", falseString)); - element.Add(new XAttribute("InheritRDGatewayHostname", falseString)); - element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", falseString)); - element.Add(new XAttribute("InheritRDGatewayUsername", falseString)); - element.Add(new XAttribute("InheritRDGatewayPassword", falseString)); - element.Add(new XAttribute("InheritRDGatewayDomain", falseString)); + var inheritance = connectionInfo.Inheritance; + + if (inheritance.CacheBitmaps) + element.Add(new XAttribute("InheritCacheBitmaps", inheritance.CacheBitmaps.ToString().ToLowerInvariant())); + if (inheritance.Colors) + element.Add(new XAttribute("InheritColors", inheritance.Colors.ToString().ToLowerInvariant())); + if (inheritance.Description) + element.Add(new XAttribute("InheritDescription", inheritance.Description.ToString().ToLowerInvariant())); + if (inheritance.DisplayThemes) + element.Add(new XAttribute("InheritDisplayThemes", inheritance.DisplayThemes.ToString().ToLowerInvariant())); + if (inheritance.DisplayWallpaper) + element.Add(new XAttribute("InheritDisplayWallpaper", inheritance.DisplayWallpaper.ToString().ToLowerInvariant())); + if (inheritance.EnableFontSmoothing) + element.Add(new XAttribute("InheritEnableFontSmoothing", inheritance.EnableFontSmoothing.ToString().ToLowerInvariant())); + if (inheritance.EnableDesktopComposition) + element.Add(new XAttribute("InheritEnableDesktopComposition", inheritance.EnableDesktopComposition.ToString().ToLowerInvariant())); + if (inheritance.Domain) + element.Add(new XAttribute("InheritDomain", inheritance.Domain.ToString().ToLowerInvariant())); + if (inheritance.Icon) + element.Add(new XAttribute("InheritIcon", inheritance.Icon.ToString().ToLowerInvariant())); + if (inheritance.Panel) + element.Add(new XAttribute("InheritPanel", inheritance.Panel.ToString().ToLowerInvariant())); + if (inheritance.Password) + element.Add(new XAttribute("InheritPassword", inheritance.Password.ToString().ToLowerInvariant())); + if (inheritance.Port) + element.Add(new XAttribute("InheritPort", inheritance.Port.ToString().ToLowerInvariant())); + if (inheritance.Protocol) + element.Add(new XAttribute("InheritProtocol", inheritance.Protocol.ToString().ToLowerInvariant())); + if (inheritance.SSHTunnelConnectionName) + element.Add(new XAttribute("InheritSSHTunnelConnectionName", inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant())); + if (inheritance.OpeningCommand) + element.Add(new XAttribute("InheritOpeningCommand", inheritance.OpeningCommand.ToString().ToLowerInvariant())); + if (inheritance.SSHOptions) + element.Add(new XAttribute("InheritSSHOptions", inheritance.SSHOptions.ToString().ToLowerInvariant())); + if (inheritance.PuttySession) + element.Add(new XAttribute("InheritPuttySession", inheritance.PuttySession.ToString().ToLowerInvariant())); + if (inheritance.RedirectDiskDrives) + element.Add(new XAttribute("InheritRedirectDiskDrives", inheritance.RedirectDiskDrives.ToString().ToLowerInvariant())); + if (inheritance.RedirectKeys) + element.Add(new XAttribute("InheritRedirectKeys", inheritance.RedirectKeys.ToString().ToLowerInvariant())); + if (inheritance.RedirectPorts) + element.Add(new XAttribute("InheritRedirectPorts", inheritance.RedirectPorts.ToString().ToLowerInvariant())); + if (inheritance.RedirectPrinters) + element.Add(new XAttribute("InheritRedirectPrinters", inheritance.RedirectPrinters.ToString().ToLowerInvariant())); + if (inheritance.RedirectSmartCards) + element.Add(new XAttribute("InheritRedirectSmartCards", inheritance.RedirectSmartCards.ToString().ToLowerInvariant())); + if (inheritance.RedirectSound) + element.Add(new XAttribute("InheritRedirectSound", inheritance.RedirectSound.ToString().ToLowerInvariant())); + if (inheritance.SoundQuality) + element.Add(new XAttribute("InheritSoundQuality", inheritance.SoundQuality.ToString().ToLowerInvariant())); + if (inheritance.Resolution) + element.Add(new XAttribute("InheritResolution", inheritance.Resolution.ToString().ToLowerInvariant())); + if (inheritance.AutomaticResize) + element.Add(new XAttribute("InheritAutomaticResize", inheritance.AutomaticResize.ToString().ToLowerInvariant())); + if (inheritance.UseConsoleSession) + element.Add(new XAttribute("InheritUseConsoleSession", inheritance.UseConsoleSession.ToString().ToLowerInvariant())); + if (inheritance.UseCredSsp) + element.Add(new XAttribute("InheritUseCredSsp", inheritance.UseCredSsp.ToString().ToLowerInvariant())); + if (inheritance.RenderingEngine) + element.Add(new XAttribute("InheritRenderingEngine", inheritance.RenderingEngine.ToString().ToLowerInvariant())); + if (inheritance.Username) + element.Add(new XAttribute("InheritUsername", inheritance.Username.ToString().ToLowerInvariant())); + if (inheritance.RDPAuthenticationLevel) + element.Add(new XAttribute("InheritRDPAuthenticationLevel", inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant())); + if (inheritance.RDPMinutesToIdleTimeout) + element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant())); + if (inheritance.RDPAlertIdleTimeout) + element.Add(new XAttribute("InheritRDPAlertIdleTimeout", inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); + if (inheritance.LoadBalanceInfo) + element.Add(new XAttribute("InheritLoadBalanceInfo", inheritance.LoadBalanceInfo.ToString().ToLowerInvariant())); + if (inheritance.PreExtApp) + element.Add(new XAttribute("InheritPreExtApp", inheritance.PreExtApp.ToString().ToLowerInvariant())); + if (inheritance.PostExtApp) + element.Add(new XAttribute("InheritPostExtApp", inheritance.PostExtApp.ToString().ToLowerInvariant())); + if (inheritance.MacAddress) + element.Add(new XAttribute("InheritMacAddress", inheritance.MacAddress.ToString().ToLowerInvariant())); + if (inheritance.UserField) + element.Add(new XAttribute("InheritUserField", inheritance.UserField.ToString().ToLowerInvariant())); + if (inheritance.ExtApp) + element.Add(new XAttribute("InheritExtApp", inheritance.ExtApp.ToString().ToLowerInvariant())); + if (inheritance.VNCCompression) + element.Add(new XAttribute("InheritVNCCompression", inheritance.VNCCompression.ToString().ToLowerInvariant())); + if (inheritance.VNCEncoding) + element.Add(new XAttribute("InheritVNCEncoding", inheritance.VNCEncoding.ToString().ToLowerInvariant())); + if (inheritance.VNCAuthMode) + element.Add(new XAttribute("InheritVNCAuthMode", inheritance.VNCAuthMode.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyType) + element.Add(new XAttribute("InheritVNCProxyType", inheritance.VNCProxyType.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyIP) + element.Add(new XAttribute("InheritVNCProxyIP", inheritance.VNCProxyIP.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyPort) + element.Add(new XAttribute("InheritVNCProxyPort", inheritance.VNCProxyPort.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyUsername) + element.Add(new XAttribute("InheritVNCProxyUsername", inheritance.VNCProxyUsername.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyPassword) + element.Add(new XAttribute("InheritVNCProxyPassword", inheritance.VNCProxyPassword.ToString().ToLowerInvariant())); + if (inheritance.VNCColors) + element.Add(new XAttribute("InheritVNCColors", inheritance.VNCColors.ToString().ToLowerInvariant())); + if (inheritance.VNCSmartSizeMode) + element.Add(new XAttribute("InheritVNCSmartSizeMode", inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant())); + if (inheritance.VNCViewOnly) + element.Add(new XAttribute("InheritVNCViewOnly", inheritance.VNCViewOnly.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUsageMethod) + element.Add(new XAttribute("InheritRDGatewayUsageMethod", inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayHostname) + element.Add(new XAttribute("InheritRDGatewayHostname", inheritance.RDGatewayHostname.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUseConnectionCredentials) + element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", inheritance.RDGatewayUseConnectionCredentials.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUsername) + element.Add(new XAttribute("InheritRDGatewayUsername", inheritance.RDGatewayUsername.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayPassword) + element.Add(new XAttribute("InheritRDGatewayPassword", inheritance.RDGatewayPassword.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayDomain) + element.Add(new XAttribute("InheritRDGatewayDomain", inheritance.RDGatewayDomain.ToString().ToLowerInvariant())); } } } diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs index ce2d47064..17e9d6fc8 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs @@ -59,16 +59,15 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml if (!Runtime.UseCredentialManager) { element.Add(_saveFilter.SaveUsername - ? new XAttribute("Username", connectionInfo.Username) - : new XAttribute("Username", "")); + ? new XAttribute("Username", connectionInfo.Username) + : new XAttribute("Username", "")); element.Add(_saveFilter.SaveDomain - ? new XAttribute("Domain", connectionInfo.Domain) - : new XAttribute("Domain", "")); + ? new XAttribute("Domain", connectionInfo.Domain) + : new XAttribute("Domain", "")); if (_saveFilter.SavePassword && !connectionInfo.Inheritance.Password) - element.Add(new XAttribute("Password", - _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey))); + element.Add(new XAttribute("Password", _cryptographyProvider.Encrypt(connectionInfo.Password, _encryptionKey))); else element.Add(new XAttribute("Password", "")); } @@ -77,59 +76,46 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("Protocol", connectionInfo.Protocol)); element.Add(new XAttribute("RdpVersion", connectionInfo.RdpVersion.ToString().ToLowerInvariant())); element.Add(new XAttribute("SSHTunnelConnectionName", connectionInfo.SSHTunnelConnectionName)); + element.Add(new XAttribute("OpeningCommand", connectionInfo.OpeningCommand)); element.Add(new XAttribute("SSHOptions", connectionInfo.SSHOptions)); element.Add(new XAttribute("PuttySession", connectionInfo.PuttySession)); element.Add(new XAttribute("Port", connectionInfo.Port)); - element.Add(new XAttribute("ConnectToConsole", - connectionInfo.UseConsoleSession.ToString().ToLowerInvariant())); + element.Add(new XAttribute("ConnectToConsole", connectionInfo.UseConsoleSession.ToString().ToLowerInvariant())); element.Add(new XAttribute("UseCredSsp", connectionInfo.UseCredSsp.ToString().ToLowerInvariant())); element.Add(new XAttribute("RenderingEngine", connectionInfo.RenderingEngine)); element.Add(new XAttribute("RDPAuthenticationLevel", connectionInfo.RDPAuthenticationLevel)); element.Add(new XAttribute("RDPMinutesToIdleTimeout", connectionInfo.RDPMinutesToIdleTimeout)); - element.Add(new XAttribute("RDPAlertIdleTimeout", - connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RDPAlertIdleTimeout", connectionInfo.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); element.Add(new XAttribute("LoadBalanceInfo", connectionInfo.LoadBalanceInfo)); element.Add(new XAttribute("Colors", connectionInfo.Colors)); element.Add(new XAttribute("Resolution", connectionInfo.Resolution)); - element.Add(new XAttribute("AutomaticResize", - connectionInfo.AutomaticResize.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisplayWallpaper", - connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant())); + element.Add(new XAttribute("AutomaticResize", connectionInfo.AutomaticResize.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisplayWallpaper", connectionInfo.DisplayWallpaper.ToString().ToLowerInvariant())); element.Add(new XAttribute("DisplayThemes", connectionInfo.DisplayThemes.ToString().ToLowerInvariant())); - element.Add(new XAttribute("EnableFontSmoothing", - connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant())); - element.Add(new XAttribute("EnableDesktopComposition", - connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisableFullWindowDrag", - connectionInfo.DisableFullWindowDrag.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisableMenuAnimations", - connectionInfo.DisableMenuAnimations.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisableCursorShadow", - connectionInfo.DisableCursorShadow.ToString().ToLowerInvariant())); - element.Add(new XAttribute("DisableCursorBlinking", - connectionInfo.DisableCursorBlinking.ToString().ToLowerInvariant())); + element.Add(new XAttribute("EnableFontSmoothing", connectionInfo.EnableFontSmoothing.ToString().ToLowerInvariant())); + element.Add(new XAttribute("EnableDesktopComposition", connectionInfo.EnableDesktopComposition.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisableFullWindowDrag", connectionInfo.DisableFullWindowDrag.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisableMenuAnimations", connectionInfo.DisableMenuAnimations.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisableCursorShadow", connectionInfo.DisableCursorShadow.ToString().ToLowerInvariant())); + element.Add(new XAttribute("DisableCursorBlinking", connectionInfo.DisableCursorBlinking.ToString().ToLowerInvariant())); element.Add(new XAttribute("CacheBitmaps", connectionInfo.CacheBitmaps.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectDiskDrives", - connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectDiskDrives", connectionInfo.RedirectDiskDrives.ToString().ToLowerInvariant())); element.Add(new XAttribute("RedirectPorts", connectionInfo.RedirectPorts.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectPrinters", - connectionInfo.RedirectPrinters.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectClipboard", - connectionInfo.RedirectClipboard.ToString().ToLowerInvariant())); - element.Add(new XAttribute("RedirectSmartCards", - connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectPrinters", connectionInfo.RedirectPrinters.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectClipboard", connectionInfo.RedirectClipboard.ToString().ToLowerInvariant())); + element.Add(new XAttribute("RedirectSmartCards", connectionInfo.RedirectSmartCards.ToString().ToLowerInvariant())); element.Add(new XAttribute("RedirectSound", connectionInfo.RedirectSound.ToString())); element.Add(new XAttribute("SoundQuality", connectionInfo.SoundQuality.ToString())); element.Add(new XAttribute("RedirectAudioCapture", connectionInfo.RedirectAudioCapture.ToString().ToLowerInvariant())); element.Add(new XAttribute("RedirectKeys", connectionInfo.RedirectKeys.ToString().ToLowerInvariant())); - element.Add(new XAttribute("Connected", - (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant())); + element.Add(new XAttribute("Connected", (connectionInfo.OpenConnections.Count > 0).ToString().ToLowerInvariant())); element.Add(new XAttribute("PreExtApp", connectionInfo.PreExtApp)); element.Add(new XAttribute("PostExtApp", connectionInfo.PostExtApp)); element.Add(new XAttribute("MacAddress", connectionInfo.MacAddress)); element.Add(new XAttribute("UserField", connectionInfo.UserField)); element.Add(new XAttribute("Favorite", connectionInfo.Favorite)); element.Add(new XAttribute("ExtApp", connectionInfo.ExtApp)); + element.Add(new XAttribute("StartProgram", connectionInfo.StartProgram)); element.Add(new XAttribute("VNCCompression", connectionInfo.VNCCompression)); element.Add(new XAttribute("VNCEncoding", connectionInfo.VNCEncoding)); element.Add(new XAttribute("VNCAuthMode", connectionInfo.VNCAuthMode)); @@ -138,255 +124,173 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml element.Add(new XAttribute("VNCProxyPort", connectionInfo.VNCProxyPort)); element.Add(_saveFilter.SaveUsername - ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername) - : new XAttribute("VNCProxyUsername", "")); + ? new XAttribute("VNCProxyUsername", connectionInfo.VNCProxyUsername) + : new XAttribute("VNCProxyUsername", "")); element.Add(_saveFilter.SavePassword - ? new XAttribute("VNCProxyPassword", - _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, - _encryptionKey)) - : new XAttribute("VNCProxyPassword", "")); + ? new XAttribute("VNCProxyPassword", _cryptographyProvider.Encrypt(connectionInfo.VNCProxyPassword, _encryptionKey)) + : new XAttribute("VNCProxyPassword", "")); element.Add(new XAttribute("VNCColors", connectionInfo.VNCColors)); element.Add(new XAttribute("VNCSmartSizeMode", connectionInfo.VNCSmartSizeMode)); element.Add(new XAttribute("VNCViewOnly", connectionInfo.VNCViewOnly.ToString().ToLowerInvariant())); element.Add(new XAttribute("RDGatewayUsageMethod", connectionInfo.RDGatewayUsageMethod)); element.Add(new XAttribute("RDGatewayHostname", connectionInfo.RDGatewayHostname)); - element.Add(new XAttribute("RDGatewayUseConnectionCredentials", - connectionInfo.RDGatewayUseConnectionCredentials)); + element.Add(new XAttribute("RDGatewayUseConnectionCredentials", connectionInfo.RDGatewayUseConnectionCredentials)); element.Add(_saveFilter.SaveUsername - ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername) - : new XAttribute("RDGatewayUsername", "")); + ? new XAttribute("RDGatewayUsername", connectionInfo.RDGatewayUsername) + : new XAttribute("RDGatewayUsername", "")); element.Add(_saveFilter.SavePassword - ? new XAttribute("RDGatewayPassword", - _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, - _encryptionKey)) - : new XAttribute("RDGatewayPassword", "")); + ? new XAttribute("RDGatewayPassword", _cryptographyProvider.Encrypt(connectionInfo.RDGatewayPassword, _encryptionKey)) + : new XAttribute("RDGatewayPassword", "")); element.Add(_saveFilter.SaveDomain - ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain) - : new XAttribute("RDGatewayDomain", "")); + ? new XAttribute("RDGatewayDomain", connectionInfo.RDGatewayDomain) + : new XAttribute("RDGatewayDomain", "")); } private void SetInheritanceAttributes(XContainer element, IInheritable connectionInfo) { if (_saveFilter.SaveInheritance) { - element.Add(new XAttribute("InheritCacheBitmaps", - connectionInfo.Inheritance.CacheBitmaps.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritColors", - connectionInfo.Inheritance.Colors.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDescription", - connectionInfo.Inheritance.Description.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisplayThemes", - connectionInfo.Inheritance.DisplayThemes.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisplayWallpaper", - connectionInfo.Inheritance.DisplayWallpaper.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritEnableFontSmoothing", - connectionInfo - .Inheritance.EnableFontSmoothing.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritEnableDesktopComposition", - connectionInfo - .Inheritance.EnableDesktopComposition.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisableFullWindowDrag", - connectionInfo - .Inheritance.DisableFullWindowDrag.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisableMenuAnimations", - connectionInfo - .Inheritance.DisableMenuAnimations.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisableCursorShadow", - connectionInfo - .Inheritance.DisableCursorShadow.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDisableCursorBlinking", - connectionInfo - .Inheritance.DisableCursorBlinking.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritDomain", - connectionInfo.Inheritance.Domain.ToString().ToLowerInvariant())); - element.Add( - new XAttribute("InheritIcon", - connectionInfo.Inheritance.Icon.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPanel", - connectionInfo.Inheritance.Panel.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPassword", - connectionInfo.Inheritance.Password.ToString().ToLowerInvariant())); - element.Add( - new XAttribute("InheritPort", - connectionInfo.Inheritance.Port.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritProtocol", - connectionInfo.Inheritance.Protocol.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRdpVersion", - connectionInfo.Inheritance.RdpVersion.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSSHTunnelConnectionName", - connectionInfo.Inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSSHOptions", - connectionInfo.Inheritance.SSHOptions.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPuttySession", - connectionInfo.Inheritance.PuttySession.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectDiskDrives", - connectionInfo - .Inheritance.RedirectDiskDrives.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectKeys", - connectionInfo.Inheritance.RedirectKeys.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectPorts", - connectionInfo.Inheritance.RedirectPorts.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectPrinters", - connectionInfo.Inheritance.RedirectPrinters.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectClipboard", - connectionInfo.Inheritance.RedirectClipboard.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectSmartCards", - connectionInfo.Inheritance.RedirectSmartCards.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectSound", - connectionInfo.Inheritance.RedirectSound.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritSoundQuality", - connectionInfo.Inheritance.SoundQuality.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRedirectAudioCapture", - connectionInfo.Inheritance.RedirectAudioCapture.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritResolution", - connectionInfo.Inheritance.Resolution.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritAutomaticResize", - connectionInfo.Inheritance.AutomaticResize.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseConsoleSession", - connectionInfo.Inheritance.UseConsoleSession.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseCredSsp", - connectionInfo.Inheritance.UseCredSsp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRenderingEngine", - connectionInfo.Inheritance.RenderingEngine.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUsername", - connectionInfo.Inheritance.Username.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPAuthenticationLevel", - connectionInfo - .Inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", - connectionInfo - .Inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDPAlertIdleTimeout", - connectionInfo - .Inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritLoadBalanceInfo", - connectionInfo.Inheritance.LoadBalanceInfo.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPreExtApp", - connectionInfo.Inheritance.PreExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritPostExtApp", - connectionInfo.Inheritance.PostExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritMacAddress", - connectionInfo.Inheritance.MacAddress.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUserField", - connectionInfo.Inheritance.UserField.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritFavorite", - connectionInfo.Inheritance.Favorite.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritExtApp", - connectionInfo.Inheritance.ExtApp.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCCompression", - connectionInfo.Inheritance.VNCCompression.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCEncoding", - connectionInfo.Inheritance.VNCEncoding.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCAuthMode", - connectionInfo.Inheritance.VNCAuthMode.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyType", - connectionInfo.Inheritance.VNCProxyType.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyIP", - connectionInfo.Inheritance.VNCProxyIP.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyPort", - connectionInfo.Inheritance.VNCProxyPort.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyUsername", - connectionInfo.Inheritance.VNCProxyUsername.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCProxyPassword", - connectionInfo.Inheritance.VNCProxyPassword.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCColors", - connectionInfo.Inheritance.VNCColors.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCSmartSizeMode", - connectionInfo.Inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVNCViewOnly", - connectionInfo.Inheritance.VNCViewOnly.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUsageMethod", - connectionInfo - .Inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayHostname", - connectionInfo.Inheritance.RDGatewayHostname.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", - connectionInfo - .Inheritance.RDGatewayUseConnectionCredentials.ToString() - .ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayUsername", - connectionInfo.Inheritance.RDGatewayUsername.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayPassword", - connectionInfo.Inheritance.RDGatewayPassword.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritRDGatewayDomain", - connectionInfo.Inheritance.RDGatewayDomain.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritVmId", - connectionInfo.Inheritance.VmId.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseVmId", - connectionInfo.Inheritance.UseVmId.ToString().ToLowerInvariant())); - element.Add(new XAttribute("InheritUseEnhancedMode", - connectionInfo.Inheritance.UseEnhancedMode.ToString().ToLowerInvariant())); - } - else - { - var falseString = false.ToString().ToLowerInvariant(); - element.Add(new XAttribute("InheritCacheBitmaps", falseString)); - element.Add(new XAttribute("InheritColors", falseString)); - element.Add(new XAttribute("InheritDescription", falseString)); - element.Add(new XAttribute("InheritDisplayThemes", falseString)); - element.Add(new XAttribute("InheritDisplayWallpaper", falseString)); - element.Add(new XAttribute("InheritEnableFontSmoothing", falseString)); - element.Add(new XAttribute("InheritEnableDesktopComposition", falseString)); - element.Add(new XAttribute("InheritDisableFullWindowDrag", falseString)); - element.Add(new XAttribute("InheritDisableMenuAnimations", falseString)); - element.Add(new XAttribute("InheritDisableCursorShadow", falseString)); - element.Add(new XAttribute("InheritDisableCursorBlinking", falseString)); - element.Add(new XAttribute("InheritDomain", falseString)); - element.Add(new XAttribute("InheritIcon", falseString)); - element.Add(new XAttribute("InheritPanel", falseString)); - element.Add(new XAttribute("InheritPassword", falseString)); - element.Add(new XAttribute("InheritPort", falseString)); - element.Add(new XAttribute("InheritProtocol", falseString)); - element.Add(new XAttribute("InheritSSHTunnelConnectionName", falseString)); - element.Add(new XAttribute("InheritSSHOptions", falseString)); - element.Add(new XAttribute("InheritPuttySession", falseString)); - element.Add(new XAttribute("InheritRedirectDiskDrives", falseString)); - element.Add(new XAttribute("InheritRedirectKeys", falseString)); - element.Add(new XAttribute("InheritRedirectPorts", falseString)); - element.Add(new XAttribute("InheritRedirectPrinters", falseString)); - element.Add(new XAttribute("InheritRedirectClipboard", falseString)); - element.Add(new XAttribute("InheritRedirectSmartCards", falseString)); - element.Add(new XAttribute("InheritRedirectSound", falseString)); - element.Add(new XAttribute("InheritSoundQuality", falseString)); - element.Add(new XAttribute("InheritRedirectAudioCapture", falseString)); - element.Add(new XAttribute("InheritResolution", falseString)); - element.Add(new XAttribute("InheritAutomaticResize", falseString)); - element.Add(new XAttribute("InheritUseConsoleSession", falseString)); - element.Add(new XAttribute("InheritUseCredSsp", falseString)); - element.Add(new XAttribute("InheritRenderingEngine", falseString)); - element.Add(new XAttribute("InheritUsername", falseString)); - element.Add(new XAttribute("InheritRDPAuthenticationLevel", falseString)); - element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", falseString)); - element.Add(new XAttribute("InheritRDPAlertIdleTimeout", falseString)); - element.Add(new XAttribute("InheritLoadBalanceInfo", falseString)); - element.Add(new XAttribute("InheritPreExtApp", falseString)); - element.Add(new XAttribute("InheritPostExtApp", falseString)); - element.Add(new XAttribute("InheritMacAddress", falseString)); - element.Add(new XAttribute("InheritUserField", falseString)); - element.Add(new XAttribute("InheritFavorite", falseString)); - element.Add(new XAttribute("InheritExtApp", falseString)); - element.Add(new XAttribute("InheritVNCCompression", falseString)); - element.Add(new XAttribute("InheritVNCEncoding", falseString)); - element.Add(new XAttribute("InheritVNCAuthMode", falseString)); - element.Add(new XAttribute("InheritVNCProxyType", falseString)); - element.Add(new XAttribute("InheritVNCProxyIP", falseString)); - element.Add(new XAttribute("InheritVNCProxyPort", falseString)); - element.Add(new XAttribute("InheritVNCProxyUsername", falseString)); - element.Add(new XAttribute("InheritVNCProxyPassword", falseString)); - element.Add(new XAttribute("InheritVNCColors", falseString)); - element.Add(new XAttribute("InheritVNCSmartSizeMode", falseString)); - element.Add(new XAttribute("InheritVNCViewOnly", falseString)); - element.Add(new XAttribute("InheritRDGatewayUsageMethod", falseString)); - element.Add(new XAttribute("InheritRDGatewayHostname", falseString)); - element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", falseString)); - element.Add(new XAttribute("InheritRDGatewayUsername", falseString)); - element.Add(new XAttribute("InheritRDGatewayPassword", falseString)); - element.Add(new XAttribute("InheritRDGatewayDomain", falseString)); + var inheritance = connectionInfo.Inheritance; + + if (inheritance.CacheBitmaps) + element.Add(new XAttribute("InheritCacheBitmaps", inheritance.CacheBitmaps.ToString().ToLowerInvariant())); + if (inheritance.Colors) + element.Add(new XAttribute("InheritColors", inheritance.Colors.ToString().ToLowerInvariant())); + if (inheritance.Description) + element.Add(new XAttribute("InheritDescription", inheritance.Description.ToString().ToLowerInvariant())); + if (inheritance.DisplayThemes) + element.Add(new XAttribute("InheritDisplayThemes", inheritance.DisplayThemes.ToString().ToLowerInvariant())); + if (inheritance.DisplayWallpaper) + element.Add(new XAttribute("InheritDisplayWallpaper", inheritance.DisplayWallpaper.ToString().ToLowerInvariant())); + if (inheritance.EnableFontSmoothing) + element.Add(new XAttribute("InheritEnableFontSmoothing", inheritance.EnableFontSmoothing.ToString().ToLowerInvariant())); + if (inheritance.EnableDesktopComposition) + element.Add(new XAttribute("InheritEnableDesktopComposition", inheritance.EnableDesktopComposition.ToString().ToLowerInvariant())); + if (inheritance.DisableFullWindowDrag) + element.Add(new XAttribute("InheritDisableFullWindowDrag", inheritance.DisableFullWindowDrag.ToString().ToLowerInvariant())); + if (inheritance.DisableMenuAnimations) + element.Add(new XAttribute("InheritDisableMenuAnimations", inheritance.DisableMenuAnimations.ToString().ToLowerInvariant())); + if (inheritance.DisableCursorShadow) + element.Add(new XAttribute("InheritDisableCursorShadow", inheritance.DisableCursorShadow.ToString().ToLowerInvariant())); + if (inheritance.DisableCursorBlinking) + element.Add(new XAttribute("InheritDisableCursorBlinking", inheritance.DisableCursorBlinking.ToString().ToLowerInvariant())); + if (inheritance.Domain) + element.Add(new XAttribute("InheritDomain", inheritance.Domain.ToString().ToLowerInvariant())); + if (inheritance.Icon) + element.Add(new XAttribute("InheritIcon", inheritance.Icon.ToString().ToLowerInvariant())); + if (inheritance.Panel) + element.Add(new XAttribute("InheritPanel", inheritance.Panel.ToString().ToLowerInvariant())); + if (inheritance.Password) + element.Add(new XAttribute("InheritPassword", inheritance.Password.ToString().ToLowerInvariant())); + if (inheritance.Port) + element.Add(new XAttribute("InheritPort", inheritance.Port.ToString().ToLowerInvariant())); + if (inheritance.Protocol) + element.Add(new XAttribute("InheritProtocol", inheritance.Protocol.ToString().ToLowerInvariant())); + if (inheritance.RdpVersion) + element.Add(new XAttribute("InheritRdpVersion", inheritance.RdpVersion.ToString().ToLowerInvariant())); + if (inheritance.SSHTunnelConnectionName) + element.Add(new XAttribute("InheritSSHTunnelConnectionName", inheritance.SSHTunnelConnectionName.ToString().ToLowerInvariant())); + if (inheritance.OpeningCommand) + element.Add(new XAttribute("InheritOpeningCommand", inheritance.OpeningCommand.ToString().ToLowerInvariant())); + if (inheritance.SSHOptions) + element.Add(new XAttribute("InheritSSHOptions", inheritance.SSHOptions.ToString().ToLowerInvariant())); + if (inheritance.PuttySession) + element.Add(new XAttribute("InheritPuttySession", inheritance.PuttySession.ToString().ToLowerInvariant())); + if (inheritance.RedirectDiskDrives) + element.Add(new XAttribute("InheritRedirectDiskDrives", inheritance.RedirectDiskDrives.ToString().ToLowerInvariant())); + if (inheritance.RedirectKeys) + element.Add(new XAttribute("InheritRedirectKeys", inheritance.RedirectKeys.ToString().ToLowerInvariant())); + if (inheritance.RedirectPorts) + element.Add(new XAttribute("InheritRedirectPorts", inheritance.RedirectPorts.ToString().ToLowerInvariant())); + if (inheritance.RedirectPrinters) + element.Add(new XAttribute("InheritRedirectPrinters", inheritance.RedirectPrinters.ToString().ToLowerInvariant())); + if (inheritance.RedirectClipboard) + element.Add(new XAttribute("InheritRedirectClipboard", inheritance.RedirectClipboard.ToString().ToLowerInvariant())); + if (inheritance.RedirectSmartCards) + element.Add(new XAttribute("InheritRedirectSmartCards", inheritance.RedirectSmartCards.ToString().ToLowerInvariant())); + if (inheritance.RedirectSound) + element.Add(new XAttribute("InheritRedirectSound", inheritance.RedirectSound.ToString().ToLowerInvariant())); + if (inheritance.SoundQuality) + element.Add(new XAttribute("InheritSoundQuality", inheritance.SoundQuality.ToString().ToLowerInvariant())); + if (inheritance.RedirectAudioCapture) + element.Add(new XAttribute("InheritRedirectAudioCapture", inheritance.RedirectAudioCapture.ToString().ToLowerInvariant())); + if (inheritance.Resolution) + element.Add(new XAttribute("InheritResolution", inheritance.Resolution.ToString().ToLowerInvariant())); + if (inheritance.AutomaticResize) + element.Add(new XAttribute("InheritAutomaticResize", inheritance.AutomaticResize.ToString().ToLowerInvariant())); + if (inheritance.UseConsoleSession) + element.Add(new XAttribute("InheritUseConsoleSession", inheritance.UseConsoleSession.ToString().ToLowerInvariant())); + if (inheritance.UseCredSsp) + element.Add(new XAttribute("InheritUseCredSsp", inheritance.UseCredSsp.ToString().ToLowerInvariant())); + if (inheritance.RenderingEngine) + element.Add(new XAttribute("InheritRenderingEngine", inheritance.RenderingEngine.ToString().ToLowerInvariant())); + if (inheritance.Username) + element.Add(new XAttribute("InheritUsername", inheritance.Username.ToString().ToLowerInvariant())); + if (inheritance.RDPAuthenticationLevel) + element.Add(new XAttribute("InheritRDPAuthenticationLevel", inheritance.RDPAuthenticationLevel.ToString().ToLowerInvariant())); + if (inheritance.RDPMinutesToIdleTimeout) + element.Add(new XAttribute("InheritRDPMinutesToIdleTimeout", inheritance.RDPMinutesToIdleTimeout.ToString().ToLowerInvariant())); + if (inheritance.RDPAlertIdleTimeout) + element.Add(new XAttribute("InheritRDPAlertIdleTimeout", inheritance.RDPAlertIdleTimeout.ToString().ToLowerInvariant())); + if (inheritance.LoadBalanceInfo) + element.Add(new XAttribute("InheritLoadBalanceInfo", inheritance.LoadBalanceInfo.ToString().ToLowerInvariant())); + if (inheritance.PreExtApp) + element.Add(new XAttribute("InheritPreExtApp", inheritance.PreExtApp.ToString().ToLowerInvariant())); + if (inheritance.PostExtApp) + element.Add(new XAttribute("InheritPostExtApp", inheritance.PostExtApp.ToString().ToLowerInvariant())); + if (inheritance.MacAddress) + element.Add(new XAttribute("InheritMacAddress", inheritance.MacAddress.ToString().ToLowerInvariant())); + if (inheritance.UserField) + element.Add(new XAttribute("InheritUserField", inheritance.UserField.ToString().ToLowerInvariant())); + if (inheritance.Favorite) + element.Add(new XAttribute("InheritFavorite", inheritance.Favorite.ToString().ToLowerInvariant())); + if (inheritance.ExtApp) + element.Add(new XAttribute("InheritExtApp", inheritance.ExtApp.ToString().ToLowerInvariant())); + if (inheritance.VNCCompression) + element.Add(new XAttribute("InheritVNCCompression", inheritance.VNCCompression.ToString().ToLowerInvariant())); + if (inheritance.VNCEncoding) + element.Add(new XAttribute("InheritVNCEncoding", inheritance.VNCEncoding.ToString().ToLowerInvariant())); + if (inheritance.VNCAuthMode) + element.Add(new XAttribute("InheritVNCAuthMode", inheritance.VNCAuthMode.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyType) + element.Add(new XAttribute("InheritVNCProxyType", inheritance.VNCProxyType.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyIP) + element.Add(new XAttribute("InheritVNCProxyIP", inheritance.VNCProxyIP.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyPort) + element.Add(new XAttribute("InheritVNCProxyPort", inheritance.VNCProxyPort.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyUsername) + element.Add(new XAttribute("InheritVNCProxyUsername", inheritance.VNCProxyUsername.ToString().ToLowerInvariant())); + if (inheritance.VNCProxyPassword) + element.Add(new XAttribute("InheritVNCProxyPassword", inheritance.VNCProxyPassword.ToString().ToLowerInvariant())); + if (inheritance.VNCColors) + element.Add(new XAttribute("InheritVNCColors", inheritance.VNCColors.ToString().ToLowerInvariant())); + if (inheritance.VNCSmartSizeMode) + element.Add(new XAttribute("InheritVNCSmartSizeMode", inheritance.VNCSmartSizeMode.ToString().ToLowerInvariant())); + if (inheritance.VNCViewOnly) + element.Add(new XAttribute("InheritVNCViewOnly", inheritance.VNCViewOnly.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUsageMethod) + element.Add(new XAttribute("InheritRDGatewayUsageMethod", inheritance.RDGatewayUsageMethod.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayHostname) + element.Add(new XAttribute("InheritRDGatewayHostname", inheritance.RDGatewayHostname.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUseConnectionCredentials) + element.Add(new XAttribute("InheritRDGatewayUseConnectionCredentials", inheritance.RDGatewayUseConnectionCredentials.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayUsername) + element.Add(new XAttribute("InheritRDGatewayUsername", inheritance.RDGatewayUsername.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayPassword) + element.Add(new XAttribute("InheritRDGatewayPassword", inheritance.RDGatewayPassword.ToString().ToLowerInvariant())); + if (inheritance.RDGatewayDomain) + element.Add(new XAttribute("InheritRDGatewayDomain", inheritance.RDGatewayDomain.ToString().ToLowerInvariant())); + if (inheritance.VmId) + element.Add(new XAttribute("InheritVmId", inheritance.VmId.ToString().ToLowerInvariant())); + if (inheritance.UseVmId) + element.Add(new XAttribute("InheritUseVmId", inheritance.UseVmId.ToString().ToLowerInvariant())); + if (inheritance.UseEnhancedMode) + element.Add(new XAttribute("InheritUseEnhancedMode", inheritance.UseEnhancedMode.ToString().ToLowerInvariant())); } } } diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs index 06eaaa8f3..613411942 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs @@ -11,13 +11,13 @@ using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Container; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Forms; using mRemoteNG.UI.TaskDialog; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { @@ -539,7 +539,9 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml connectionInfo.UseEnhancedMode = xmlnode.GetAttributeAsBool("UseEnhancedMode"); connectionInfo.RdpVersion = xmlnode.GetAttributeAsEnum("RdpVersion", RdpVersion.Highest); connectionInfo.SSHTunnelConnectionName = xmlnode.GetAttributeAsString("SSHTunnelConnectionName"); + connectionInfo.OpeningCommand = xmlnode.GetAttributeAsString("OpeningCommand"); connectionInfo.SSHOptions = xmlnode.GetAttributeAsString("SSHOptions"); + connectionInfo.StartProgram = xmlnode.GetAttributeAsString("StartProgram"); connectionInfo.DisableFullWindowDrag = xmlnode.GetAttributeAsBool("DisableFullWindowDrag"); connectionInfo.DisableMenuAnimations = xmlnode.GetAttributeAsBool("DisableMenuAnimations"); connectionInfo.DisableCursorShadow = xmlnode.GetAttributeAsBool("DisableCursorShadow"); @@ -551,6 +553,7 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml connectionInfo.Inheritance.VmId = xmlnode.GetAttributeAsBool("InheritVmId"); connectionInfo.Inheritance.UseEnhancedMode = xmlnode.GetAttributeAsBool("InheritUseEnhancedMode"); connectionInfo.Inheritance.SSHTunnelConnectionName = xmlnode.GetAttributeAsBool("InheritSSHTunnelConnectionName"); + connectionInfo.Inheritance.OpeningCommand = xmlnode.GetAttributeAsBool("InheritOpeningCommand"); connectionInfo.Inheritance.SSHOptions = xmlnode.GetAttributeAsBool("InheritSSHOptions"); connectionInfo.Inheritance.DisableFullWindowDrag = xmlnode.GetAttributeAsBool("InheritDisableFullWindowDrag"); connectionInfo.Inheritance.DisableMenuAnimations = xmlnode.GetAttributeAsBool("InheritDisableMenuAnimations"); diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs index 3ae0d6b4f..15ca955c6 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs @@ -6,10 +6,10 @@ using mRemoteNG.Config.Import; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.Serializers.MiscSerializers { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs index f710f9df1..7740ed46f 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs @@ -151,6 +151,9 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers case "gatewayhostname": connectionInfo.RDGatewayHostname = value; break; + case "alternate shell": + connectionInfo.StartProgram = value; + break; } } } diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index fa31737c5..dee482d02 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -7,9 +7,9 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.Serializers.MiscSerializers { @@ -183,7 +183,7 @@ namespace mRemoteNG.Config.Serializers.MiscSerializers { if (bool.TryParse(connectionSettingsNode.SelectSingleNode("./connectToConsole")?.InnerText, out var useConsole)) connectionInfo.UseConsoleSession = useConsole; - // ./startProgram + connectionInfo.StartProgram = connectionSettingsNode.SelectSingleNode("./startProgram")?.InnerText; // ./workingDir if (int.TryParse(connectionSettingsNode.SelectSingleNode("./port")?.InnerText, out var port)) connectionInfo.Port = port; diff --git a/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs b/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs index f4b8e1fbd..84081be0a 100644 --- a/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs +++ b/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs @@ -2,8 +2,8 @@ using mRemoteNG.App.Info; using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Messages; -using System; using mRemoteNG.Resources.Language; +using System; namespace mRemoteNG.Config.Serializers.Versioning { diff --git a/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs b/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs index 4995384db..511161106 100644 --- a/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs +++ b/mRemoteNG/Config/Settings/DockPanelLayoutLoader.cs @@ -77,9 +77,6 @@ namespace mRemoteNG.Config.Settings if (persistString == typeof(ErrorAndInfoWindow).ToString()) return Windows.ErrorsForm; - - if (persistString == typeof(ScreenshotManagerWindow).ToString()) - return Windows.ScreenshotForm; } catch (Exception ex) { diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index 0b9de8e42..fa7c9f0f2 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -1,382 +1,394 @@ -using System.Collections.Generic; -using System.ComponentModel; -using mRemoteNG.Connection.Protocol; -using mRemoteNG.Connection.Protocol.Http; -using mRemoteNG.Connection.Protocol.RDP; -using mRemoteNG.Connection.Protocol.VNC; -using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; -using mRemoteNG.Tools.Attributes; - - -namespace mRemoteNG.Connection -{ - public abstract class AbstractConnectionRecord : INotifyPropertyChanged +using System.Collections.Generic; +using System.ComponentModel; +using mRemoteNG.Connection.Protocol; +using mRemoteNG.Connection.Protocol.Http; +using mRemoteNG.Connection.Protocol.RDP; +using mRemoteNG.Connection.Protocol.VNC; +using mRemoteNG.Properties; +using mRemoteNG.Tools; +using mRemoteNG.Tools.Attributes; +using mRemoteNG.Resources.Language; + + +namespace mRemoteNG.Connection +{ + public abstract class AbstractConnectionRecord : INotifyPropertyChanged { #region Property Names public const string Prop_StartProgram = "StartProgram"; public const string Prop_StartProgramWorkDir = "StartProgramWorkDir"; #endregion - #region Fields + #region Fields - private string _name; - private string _description; - private string _icon; - private string _panel; - - private string _hostname; - private string _username = ""; - private string _password = ""; - private string _domain = ""; - private string _vmId = ""; - private bool _useEnhancedMode; + private string _name; + private string _description; + private string _icon; + private string _panel; + + private string _hostname; + private string _username = ""; + private string _password = ""; + private string _domain = ""; + private string _vmId = ""; + private bool _useEnhancedMode; private string _startProgram = ""; private string _startProgramWorkDir = ""; - private string _sshTunnelConnectionName = ""; - private ProtocolType _protocol; - private RdpVersion _rdpProtocolVersion; - private string _extApp; - private int _port; - private string _sshOptions = ""; - private string _puttySession; - private bool _useConsoleSession; - private AuthenticationLevel _rdpAuthenticationLevel; - private int _rdpMinutesToIdleTimeout; - private bool _rdpAlertIdleTimeout; - private string _loadBalanceInfo; - private HTTPBase.RenderingEngine _renderingEngine; - private bool _useCredSsp; - private bool _useVmId; - - private RDGatewayUsageMethod _rdGatewayUsageMethod; - private string _rdGatewayHostname; - private RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials; - private string _rdGatewayUsername; - private string _rdGatewayPassword; - private string _rdGatewayDomain; - - private RDPResolutions _resolution; - private bool _automaticResize; - private RDPColors _colors; - private bool _cacheBitmaps; - private bool _displayWallpaper; - private bool _displayThemes; - private bool _enableFontSmoothing; - private bool _enableDesktopComposition; - private bool _disableFullWindowDrag; - private bool _disableMenuAnimations; - private bool _disableCursorShadow; - private bool _disableCursorBlinking; - - private bool _redirectKeys; - private bool _redirectDiskDrives; - private bool _redirectPrinters; - private bool _redirectClipboard; - private bool _redirectPorts; - private bool _redirectSmartCards; - private RDPSounds _redirectSound; - private RDPSoundQuality _soundQuality; - private bool _redirectAudioCapture; - - private string _preExtApp; - private string _postExtApp; - private string _macAddress; - private string _userField; - private bool _favorite; - - private ProtocolVNC.Compression _vncCompression; - private ProtocolVNC.Encoding _vncEncoding; - private ProtocolVNC.AuthMode _vncAuthMode; - private ProtocolVNC.ProxyType _vncProxyType; - private string _vncProxyIp; - private int _vncProxyPort; - private string _vncProxyUsername; - private string _vncProxyPassword; - private ProtocolVNC.Colors _vncColors; - private ProtocolVNC.SmartSizeMode _vncSmartSizeMode; - private bool _vncViewOnly; - - #endregion - - #region Properties - - #region Display - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Name)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionName))] - public virtual string Name - { - get => _name; - set => SetField(ref _name, value, "Name"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Description)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDescription))] - public virtual string Description - { - get => GetPropertyValue("Description", _description); - set => SetField(ref _description, value, "Description"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), - TypeConverter(typeof(ConnectionIcon)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Icon)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionIcon))] - public virtual string Icon - { - get => GetPropertyValue("Icon", _icon); - set => SetField(ref _icon, value, "Icon"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Panel)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))] - public virtual string Panel - { - get => GetPropertyValue("Panel", _panel); - set => SetField(ref _panel, value, "Panel"); - } - - #endregion - - #region Connection - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.HostnameIp)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionHostnameIp)), - AttributeUsedInAllProtocolsExcept()] - public virtual string Hostname - { - get => _hostname.Trim(); - set => SetField(ref _hostname, value?.Trim(), "Hostname"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Port)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPort)), - AttributeUsedInAllProtocolsExcept()] - public virtual int Port - { - get => GetPropertyValue("Port", _port); - set => SetField(ref _port, value, "Port"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Username)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUsername)), - AttributeUsedInAllProtocolsExcept(ProtocolType.VNC, ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)] - public virtual string Username - { - get => GetPropertyValue("Username", _username); - set => SetField(ref _username, Settings.Default.DoNotTrimUsername ? value : value?.Trim(), "Username"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Password)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPassword)), - PasswordPropertyText(true), - AttributeUsedInAllProtocolsExcept(ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)] - public virtual string Password - { - get => GetPropertyValue("Password", _password); - set => SetField(ref _password, value, "Password"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Domain)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDomain)), - AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.IntApp, ProtocolType.PowerShell)] - public string Domain - { - get => GetPropertyValue("Domain", _domain).Trim(); - set => SetField(ref _domain, value?.Trim(), "Domain"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.VmId)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVmId)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string VmId - { - get => GetPropertyValue("VmId", _vmId).Trim(); - set => SetField(ref _vmId, value?.Trim(), "VmId"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshTunnel)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshTunnel)), - TypeConverter(typeof(SshTunnelTypeConverter)), - AttributeUsedInAllProtocolsExcept()] - public string SSHTunnelConnectionName - { - get => GetPropertyValue("SSHTunnelConnectionName", _sshTunnelConnectionName).Trim(); - set => SetField(ref _sshTunnelConnectionName, value?.Trim(), "SSHTunnelConnectionName"); - } - #endregion - - #region Protocol - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Protocol)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionProtocol)), - TypeConverter(typeof(MiscTools.EnumTypeConverter))] - public virtual ProtocolType Protocol - { - get => GetPropertyValue("Protocol", _protocol); - set => SetField(ref _protocol, value, "Protocol"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpVersion)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpVersion)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public virtual RdpVersion RdpVersion - { - get => GetPropertyValue("RdpVersion", _rdpProtocolVersion); - set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion)); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalTool)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalTool)), - TypeConverter(typeof(ExternalToolsTypeConverter)), - AttributeUsedInProtocol(ProtocolType.IntApp)] - public string ExtApp - { - get => GetPropertyValue("ExtApp", _extApp); - set => SetField(ref _extApp, value, "ExtApp"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.PuttySession)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPuttySession)), - TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList)), - AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2, ProtocolType.Telnet, - ProtocolType.RAW, ProtocolType.Rlogin)] - public virtual string PuttySession - { - get => GetPropertyValue("PuttySession", _puttySession); - set => SetField(ref _puttySession, value, "PuttySession"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshOptions)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshOptions)), - AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)] - public virtual string SSHOptions - { - get => GetPropertyValue("SSHOptions", _sshOptions); - set => SetField(ref _sshOptions, value, "SSHOptions"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseConsoleSession)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseConsoleSession)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool UseConsoleSession - { - get => GetPropertyValue("UseConsoleSession", _useConsoleSession); - set => SetField(ref _useConsoleSession, value, "UseConsoleSession"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationLevel)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationLevel)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public AuthenticationLevel RDPAuthenticationLevel - { - get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); - set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public virtual int RDPMinutesToIdleTimeout - { - get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); - set - { - if (value < 0) - value = 0; - else if (value > 240) - value = 240; - SetField(ref _rdpMinutesToIdleTimeout, value, "RDPMinutesToIdleTimeout"); - } - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RDPAlertIdleTimeout - { - get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); - set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.LoadBalanceInfo)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionLoadBalanceInfo)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string LoadBalanceInfo - { - get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); - set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RenderingEngine)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRenderingEngine)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.HTTP, ProtocolType.HTTPS)] - public HTTPBase.RenderingEngine RenderingEngine - { - get => GetPropertyValue("RenderingEngine", _renderingEngine); - set => SetField(ref _renderingEngine, value, "RenderingEngine"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseCredSsp)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseCredSsp)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool UseCredSsp - { - get => GetPropertyValue("UseCredSsp", _useCredSsp); - set => SetField(ref _useCredSsp, value, "UseCredSsp"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseVmId)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseVmId)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool UseVmId - { - get => GetPropertyValue("UseVmId", _useVmId); - set => SetField(ref _useVmId, value, "UseVmId"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseEnhancedMode)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseEnhancedMode)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool UseEnhancedMode - { - get => GetPropertyValue("UseEnhancedMode", _useEnhancedMode); - set => SetField(ref _useEnhancedMode, value, "UseEnhancedMode"); - } + private string _sshTunnelConnectionName = ""; + private ProtocolType _protocol; + private RdpVersion _rdpProtocolVersion; + private string _extApp; + private int _port; + private string _sshOptions = ""; + private string _puttySession; + private bool _useConsoleSession; + private AuthenticationLevel _rdpAuthenticationLevel; + private int _rdpMinutesToIdleTimeout; + private bool _rdpAlertIdleTimeout; + private string _loadBalanceInfo; + private HTTPBase.RenderingEngine _renderingEngine; + private bool _useCredSsp; + private bool _useVmId; + + private RDGatewayUsageMethod _rdGatewayUsageMethod; + private string _rdGatewayHostname; + private RDGatewayUseConnectionCredentials _rdGatewayUseConnectionCredentials; + private string _rdGatewayUsername; + private string _rdGatewayPassword; + private string _rdGatewayDomain; + + private RDPResolutions _resolution; + private bool _automaticResize; + private RDPColors _colors; + private bool _cacheBitmaps; + private bool _displayWallpaper; + private bool _displayThemes; + private bool _enableFontSmoothing; + private bool _enableDesktopComposition; + private bool _disableFullWindowDrag; + private bool _disableMenuAnimations; + private bool _disableCursorShadow; + private bool _disableCursorBlinking; + + private bool _redirectKeys; + private bool _redirectDiskDrives; + private bool _redirectPrinters; + private bool _redirectClipboard; + private bool _redirectPorts; + private bool _redirectSmartCards; + private RDPSounds _redirectSound; + private RDPSoundQuality _soundQuality; + private bool _redirectAudioCapture; + + private string _preExtApp; + private string _postExtApp; + private string _macAddress; + private string _openingCommand; + private string _userField; + private string _startProgram; + private bool _favorite; + + private ProtocolVNC.Compression _vncCompression; + private ProtocolVNC.Encoding _vncEncoding; + private ProtocolVNC.AuthMode _vncAuthMode; + private ProtocolVNC.ProxyType _vncProxyType; + private string _vncProxyIp; + private int _vncProxyPort; + private string _vncProxyUsername; + private string _vncProxyPassword; + private ProtocolVNC.Colors _vncColors; + private ProtocolVNC.SmartSizeMode _vncSmartSizeMode; + private bool _vncViewOnly; + + #endregion + + #region Properties + + #region Display + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Name)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionName))] + public virtual string Name + { + get => _name; + set => SetField(ref _name, value, "Name"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Description)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDescription))] + public virtual string Description + { + get => GetPropertyValue("Description", _description); + set => SetField(ref _description, value, "Description"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), + TypeConverter(typeof(ConnectionIcon)), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Icon)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionIcon))] + public virtual string Icon + { + get => GetPropertyValue("Icon", _icon); + set => SetField(ref _icon, value, "Icon"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Panel)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))] + public virtual string Panel + { + get => GetPropertyValue("Panel", _panel); + set => SetField(ref _panel, value, "Panel"); + } + + #endregion + + #region Connection + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.HostnameIp)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionHostnameIp)), + AttributeUsedInAllProtocolsExcept()] + public virtual string Hostname + { + get => _hostname.Trim(); + set => SetField(ref _hostname, value?.Trim(), "Hostname"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Port)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPort)), + AttributeUsedInAllProtocolsExcept()] + public virtual int Port + { + get => GetPropertyValue("Port", _port); + set => SetField(ref _port, value, "Port"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Username)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUsername)), + AttributeUsedInAllProtocolsExcept(ProtocolType.VNC, ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)] + public virtual string Username + { + get => GetPropertyValue("Username", _username); + set => SetField(ref _username, Settings.Default.DoNotTrimUsername ? value : value?.Trim(), "Username"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Password)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPassword)), + PasswordPropertyText(true), + AttributeUsedInAllProtocolsExcept(ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)] + public virtual string Password + { + get => GetPropertyValue("Password", _password); + set => SetField(ref _password, value, "Password"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Domain)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDomain)), + AttributeUsedInProtocol(ProtocolType.RDP, ProtocolType.IntApp, ProtocolType.PowerShell)] + public string Domain + { + get => GetPropertyValue("Domain", _domain).Trim(); + set => SetField(ref _domain, value?.Trim(), "Domain"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.VmId)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVmId)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string VmId + { + get => GetPropertyValue("VmId", _vmId).Trim(); + set => SetField(ref _vmId, value?.Trim(), "VmId"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshTunnel)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshTunnel)), + TypeConverter(typeof(SshTunnelTypeConverter)), + AttributeUsedInAllProtocolsExcept()] + public string SSHTunnelConnectionName + { + get => GetPropertyValue("SSHTunnelConnectionName", _sshTunnelConnectionName).Trim(); + set => SetField(ref _sshTunnelConnectionName, value?.Trim(), "SSHTunnelConnectionName"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.OpeningCommand)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionOpeningCommand)), + AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)] + public virtual string OpeningCommand + { + get => GetPropertyValue("OpeningCommand", _openingCommand); + set => SetField(ref _openingCommand, value, "OpeningCommand"); + } + #endregion + + #region Protocol + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Protocol)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionProtocol)), + TypeConverter(typeof(MiscTools.EnumTypeConverter))] + public virtual ProtocolType Protocol + { + get => GetPropertyValue("Protocol", _protocol); + set => SetField(ref _protocol, value, "Protocol"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpVersion)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpVersion)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public virtual RdpVersion RdpVersion + { + get => GetPropertyValue("RdpVersion", _rdpProtocolVersion); + set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion)); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalTool)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalTool)), + TypeConverter(typeof(ExternalToolsTypeConverter)), + AttributeUsedInProtocol(ProtocolType.IntApp)] + public string ExtApp + { + get => GetPropertyValue("ExtApp", _extApp); + set => SetField(ref _extApp, value, "ExtApp"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.PuttySession)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPuttySession)), + TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList)), + AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2, ProtocolType.Telnet, + ProtocolType.RAW, ProtocolType.Rlogin)] + public virtual string PuttySession + { + get => GetPropertyValue("PuttySession", _puttySession); + set => SetField(ref _puttySession, value, "PuttySession"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshOptions)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshOptions)), + AttributeUsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)] + public virtual string SSHOptions + { + get => GetPropertyValue("SSHOptions", _sshOptions); + set => SetField(ref _sshOptions, value, "SSHOptions"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseConsoleSession)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseConsoleSession)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool UseConsoleSession + { + get => GetPropertyValue("UseConsoleSession", _useConsoleSession); + set => SetField(ref _useConsoleSession, value, "UseConsoleSession"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationLevel)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationLevel)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public AuthenticationLevel RDPAuthenticationLevel + { + get => GetPropertyValue("RDPAuthenticationLevel", _rdpAuthenticationLevel); + set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public virtual int RDPMinutesToIdleTimeout + { + get => GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); + set + { + if (value < 0) + value = 0; + else if (value > 240) + value = 240; + SetField(ref _rdpMinutesToIdleTimeout, value, "RDPMinutesToIdleTimeout"); + } + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RDPAlertIdleTimeout + { + get => GetPropertyValue("RDPAlertIdleTimeout", _rdpAlertIdleTimeout); + set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.LoadBalanceInfo)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionLoadBalanceInfo)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string LoadBalanceInfo + { + get => GetPropertyValue("LoadBalanceInfo", _loadBalanceInfo).Trim(); + set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RenderingEngine)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRenderingEngine)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.HTTP, ProtocolType.HTTPS)] + public HTTPBase.RenderingEngine RenderingEngine + { + get => GetPropertyValue("RenderingEngine", _renderingEngine); + set => SetField(ref _renderingEngine, value, "RenderingEngine"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseCredSsp)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseCredSsp)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool UseCredSsp + { + get => GetPropertyValue("UseCredSsp", _useCredSsp); + set => SetField(ref _useCredSsp, value, "UseCredSsp"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseVmId)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseVmId)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool UseVmId + { + get => GetPropertyValue("UseVmId", _useVmId); + set => SetField(ref _useVmId, value, "UseVmId"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseEnhancedMode)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseEnhancedMode)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool UseEnhancedMode + { + get => GetPropertyValue("UseEnhancedMode", _useEnhancedMode); + set => SetField(ref _useEnhancedMode, value, "UseEnhancedMode"); + } #endregion #region Remote Desktop Services @@ -401,522 +413,533 @@ namespace mRemoteNG.Connection set => SetField(ref _startProgramWorkDir, value, Prop_StartProgramWorkDir); } #endregion - - #region RD Gateway - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsageMethod)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDGatewayUsageMethod RDGatewayUsageMethod - { - get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); - set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayHostname)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayHostname)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string RDGatewayHostname - { - get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); - set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUseConnectionCredentials)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials - { - get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); - set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsername)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUsername)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string RDGatewayUsername - { - get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); - set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayPassword)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayPassword)), - PasswordPropertyText(true), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string RDGatewayPassword - { - get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); - set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayDomain)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayDomain)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public string RDGatewayDomain - { - get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); - set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); - } - - #endregion - - #region Appearance - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Resolution)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionResolution)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDPResolutions Resolution - { - get => GetPropertyValue("Resolution", _resolution); - set => SetField(ref _resolution, value, "Resolution"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.AutomaticResize)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAutomaticResize)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool AutomaticResize - { - get => GetPropertyValue("AutomaticResize", _automaticResize); - set => SetField(ref _automaticResize, value, "AutomaticResize"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDPColors Colors - { - get => GetPropertyValue("Colors", _colors); - set => SetField(ref _colors, value, "Colors"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.CacheBitmaps)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCacheBitmaps)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool CacheBitmaps - { - get => GetPropertyValue("CacheBitmaps", _cacheBitmaps); - set => SetField(ref _cacheBitmaps, value, "CacheBitmaps"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayWallpaper)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayWallpaper)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisplayWallpaper - { - get => GetPropertyValue("DisplayWallpaper", _displayWallpaper); - set => SetField(ref _displayWallpaper, value, "DisplayWallpaper"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayThemes)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayThemes)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisplayThemes - { - get => GetPropertyValue("DisplayThemes", _displayThemes); - set => SetField(ref _displayThemes, value, "DisplayThemes"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.FontSmoothing)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableFontSmoothing)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool EnableFontSmoothing - { - get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); - set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.EnableDesktopComposition)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableDesktopComposition)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool EnableDesktopComposition - { - get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); - set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableFullWindowDrag)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableFullWindowDrag)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisableFullWindowDrag - { - get => GetPropertyValue("DisableFullWindowDrag", _disableFullWindowDrag); - set => SetField(ref _disableFullWindowDrag, value, "DisableFullWindowDrag"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableMenuAnimations)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableMenuAnimations)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisableMenuAnimations - { - get => GetPropertyValue("DisableMenuAnimations", _disableMenuAnimations); - set => SetField(ref _disableMenuAnimations, value, "DisableMenuAnimations"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisableCursorShadow - { - get => GetPropertyValue("DisableCursorShadow", _disableCursorShadow); - set => SetField(ref _disableCursorShadow, value, "DisableCursorShadow"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool DisableCursorBlinking - { - get => GetPropertyValue("DisableCursorBlinking", _disableCursorBlinking); - set => SetField(ref _disableCursorBlinking, value, "DisableCursorBlinking"); - } - #endregion - - #region Redirect - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectKeys)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectKeys)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectKeys - { - get => GetPropertyValue("RedirectKeys", _redirectKeys); - set => SetField(ref _redirectKeys, value, "RedirectKeys"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectDrives)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectDrives)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectDiskDrives - { - get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); - set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Printers)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPrinters)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectPrinters - { - get => GetPropertyValue("RedirectPrinters", _redirectPrinters); - set => SetField(ref _redirectPrinters, value, "RedirectPrinters"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Clipboard)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectClipboard)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectClipboard - { - get { return GetPropertyValue("RedirectClipboard", _redirectClipboard); } - set { SetField(ref _redirectClipboard, value, "RedirectClipboard"); } - } - - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Ports)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPorts)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectPorts - { - get => GetPropertyValue("RedirectPorts", _redirectPorts); - set => SetField(ref _redirectPorts, value, "RedirectPorts"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectSmartCards)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSmartCards)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectSmartCards - { - get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards); - set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Sounds)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSounds)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDPSounds RedirectSound - { - get => GetPropertyValue("RedirectSound", _redirectSound); - set => SetField(ref _redirectSound, value, "RedirectSound"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.SoundQuality)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSoundQuality)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public RDPSoundQuality SoundQuality - { - get => GetPropertyValue("SoundQuality", _soundQuality); - set => SetField(ref _soundQuality, value, "SoundQuality"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.AudioCapture)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectAudioCapture)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.RDP)] - public bool RedirectAudioCapture - { - get => GetPropertyValue("RedirectAudioCapture", _redirectAudioCapture); - set => SetField(ref _redirectAudioCapture, value, nameof(RedirectAudioCapture)); - } - - #endregion - - #region Misc - - [Browsable(false)] public string ConstantID { get; } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolBefore)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolBefore)), - TypeConverter(typeof(ExternalToolsTypeConverter))] - public virtual string PreExtApp - { - get => GetPropertyValue("PreExtApp", _preExtApp); - set => SetField(ref _preExtApp, value, "PreExtApp"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolAfter)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolAfter)), - TypeConverter(typeof(ExternalToolsTypeConverter))] - public virtual string PostExtApp - { - get => GetPropertyValue("PostExtApp", _postExtApp); - set => SetField(ref _postExtApp, value, "PostExtApp"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.MacAddress)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionMACAddress))] - public virtual string MacAddress - { - get => GetPropertyValue("MacAddress", _macAddress); - set => SetField(ref _macAddress, value, "MacAddress"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.UserField)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUser1))] - public virtual string UserField - { - get => GetPropertyValue("UserField", _userField); - set => SetField(ref _userField, value, "UserField"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Favorite)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionFavorite)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter))] - public virtual bool Favorite - { - get => GetPropertyValue("Favorite", _favorite); - set => SetField(ref _favorite, value, "Favorite"); - } - #endregion - - #region VNC - // TODO: it seems all these VNC properties were added and serialized but - // never hooked up to the VNC protocol or shown to the user - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Compression)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCompression)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public ProtocolVNC.Compression VNCCompression - { - get => GetPropertyValue("VNCCompression", _vncCompression); - set => SetField(ref _vncCompression, value, "VNCCompression"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Encoding)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEncoding)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public ProtocolVNC.Encoding VNCEncoding - { - get => GetPropertyValue("VNCEncoding", _vncEncoding); - set => SetField(ref _vncEncoding, value, "VNCEncoding"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationMode)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationMode)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public ProtocolVNC.AuthMode VNCAuthMode - { - get => GetPropertyValue("VNCAuthMode", _vncAuthMode); - set => SetField(ref _vncAuthMode, value, "VNCAuthMode"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyType)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyType)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public ProtocolVNC.ProxyType VNCProxyType - { - get => GetPropertyValue("VNCProxyType", _vncProxyType); - set => SetField(ref _vncProxyType, value, "VNCProxyType"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyAddress)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyAddress)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public string VNCProxyIP - { - get => GetPropertyValue("VNCProxyIP", _vncProxyIp); - set => SetField(ref _vncProxyIp, value, "VNCProxyIP"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPort)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPort)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public int VNCProxyPort - { - get => GetPropertyValue("VNCProxyPort", _vncProxyPort); - set => SetField(ref _vncProxyPort, value, "VNCProxyPort"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyUsername)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyUsername)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public string VNCProxyUsername - { - get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername); - set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPassword)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPassword)), - PasswordPropertyText(true), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public string VNCProxyPassword - { - get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword); - set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC), - Browsable(false)] - public ProtocolVNC.Colors VNCColors - { - get => GetPropertyValue("VNCColors", _vncColors); - set => SetField(ref _vncColors, value, "VNCColors"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartSizeMode)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSmartSizeMode)), - TypeConverter(typeof(MiscTools.EnumTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC)] - public ProtocolVNC.SmartSizeMode VNCSmartSizeMode - { - get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); - set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); - } - - [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), - LocalizedAttributes.LocalizedDisplayName(nameof(Language.ViewOnly)), - LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionViewOnly)), - TypeConverter(typeof(MiscTools.YesNoTypeConverter)), - AttributeUsedInProtocol(ProtocolType.VNC)] - public bool VNCViewOnly - { - get => GetPropertyValue("VNCViewOnly", _vncViewOnly); - set => SetField(ref _vncViewOnly, value, "VNCViewOnly"); - } - - #endregion - - #endregion - - protected AbstractConnectionRecord(string uniqueId) - { - ConstantID = uniqueId.ThrowIfNullOrEmpty(nameof(uniqueId)); - } - - protected virtual TPropertyType GetPropertyValue(string propertyName, TPropertyType value) - { - return (TPropertyType)GetType().GetProperty(propertyName)?.GetValue(this, null); - } - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void RaisePropertyChangedEvent(object sender, PropertyChangedEventArgs args) - { - PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName)); - } - - protected void SetField(ref T field, T value, string propertyName = null) - { - if (EqualityComparer.Default.Equals(field, value)) return; - field = value; - RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName)); - } - } + #region RD Gateway + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsageMethod)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDGatewayUsageMethod RDGatewayUsageMethod + { + get => GetPropertyValue("RDGatewayUsageMethod", _rdGatewayUsageMethod); + set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayHostname)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayHostname)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string RDGatewayHostname + { + get => GetPropertyValue("RDGatewayHostname", _rdGatewayHostname).Trim(); + set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUseConnectionCredentials)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials + { + get => GetPropertyValue("RDGatewayUseConnectionCredentials", _rdGatewayUseConnectionCredentials); + set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsername)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUsername)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string RDGatewayUsername + { + get => GetPropertyValue("RDGatewayUsername", _rdGatewayUsername).Trim(); + set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayPassword)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayPassword)), + PasswordPropertyText(true), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string RDGatewayPassword + { + get => GetPropertyValue("RDGatewayPassword", _rdGatewayPassword); + set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayDomain)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayDomain)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public string RDGatewayDomain + { + get => GetPropertyValue("RDGatewayDomain", _rdGatewayDomain).Trim(); + set => SetField(ref _rdGatewayDomain, value?.Trim(), "RDGatewayDomain"); + } + + #endregion + + #region Appearance + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Resolution)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionResolution)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDPResolutions Resolution + { + get => GetPropertyValue("Resolution", _resolution); + set => SetField(ref _resolution, value, "Resolution"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.AutomaticResize)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAutomaticResize)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool AutomaticResize + { + get => GetPropertyValue("AutomaticResize", _automaticResize); + set => SetField(ref _automaticResize, value, "AutomaticResize"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDPColors Colors + { + get => GetPropertyValue("Colors", _colors); + set => SetField(ref _colors, value, "Colors"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.CacheBitmaps)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCacheBitmaps)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool CacheBitmaps + { + get => GetPropertyValue("CacheBitmaps", _cacheBitmaps); + set => SetField(ref _cacheBitmaps, value, "CacheBitmaps"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayWallpaper)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayWallpaper)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisplayWallpaper + { + get => GetPropertyValue("DisplayWallpaper", _displayWallpaper); + set => SetField(ref _displayWallpaper, value, "DisplayWallpaper"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayThemes)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayThemes)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisplayThemes + { + get => GetPropertyValue("DisplayThemes", _displayThemes); + set => SetField(ref _displayThemes, value, "DisplayThemes"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.FontSmoothing)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableFontSmoothing)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool EnableFontSmoothing + { + get => GetPropertyValue("EnableFontSmoothing", _enableFontSmoothing); + set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.EnableDesktopComposition)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableDesktopComposition)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool EnableDesktopComposition + { + get => GetPropertyValue("EnableDesktopComposition", _enableDesktopComposition); + set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableFullWindowDrag)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableFullWindowDrag)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisableFullWindowDrag + { + get => GetPropertyValue("DisableFullWindowDrag", _disableFullWindowDrag); + set => SetField(ref _disableFullWindowDrag, value, "DisableFullWindowDrag"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableMenuAnimations)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableMenuAnimations)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisableMenuAnimations + { + get => GetPropertyValue("DisableMenuAnimations", _disableMenuAnimations); + set => SetField(ref _disableMenuAnimations, value, "DisableMenuAnimations"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisableCursorShadow + { + get => GetPropertyValue("DisableCursorShadow", _disableCursorShadow); + set => SetField(ref _disableCursorShadow, value, "DisableCursorShadow"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool DisableCursorBlinking + { + get => GetPropertyValue("DisableCursorBlinking", _disableCursorBlinking); + set => SetField(ref _disableCursorBlinking, value, "DisableCursorBlinking"); + } + #endregion + + #region Redirect + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectKeys)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectKeys)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectKeys + { + get => GetPropertyValue("RedirectKeys", _redirectKeys); + set => SetField(ref _redirectKeys, value, "RedirectKeys"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.DiskDrives)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectDrives)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectDiskDrives + { + get => GetPropertyValue("RedirectDiskDrives", _redirectDiskDrives); + set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Printers)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPrinters)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectPrinters + { + get => GetPropertyValue("RedirectPrinters", _redirectPrinters); + set => SetField(ref _redirectPrinters, value, "RedirectPrinters"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Clipboard)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectClipboard)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectClipboard + { + get => GetPropertyValue("RedirectClipboard", _redirectClipboard); + set => SetField(ref _redirectClipboard, value, "RedirectClipboard"); + } + + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Ports)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPorts)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectPorts + { + get => GetPropertyValue("RedirectPorts", _redirectPorts); + set => SetField(ref _redirectPorts, value, "RedirectPorts"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartCard)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSmartCards)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectSmartCards + { + get => GetPropertyValue("RedirectSmartCards", _redirectSmartCards); + set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Sounds)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSounds)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDPSounds RedirectSound + { + get => GetPropertyValue("RedirectSound", _redirectSound); + set => SetField(ref _redirectSound, value, "RedirectSound"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.SoundQuality)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSoundQuality)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public RDPSoundQuality SoundQuality + { + get => GetPropertyValue("SoundQuality", _soundQuality); + set => SetField(ref _soundQuality, value, "SoundQuality"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.AudioCapture)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectAudioCapture)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public bool RedirectAudioCapture + { + get => GetPropertyValue("RedirectAudioCapture", _redirectAudioCapture); + set => SetField(ref _redirectAudioCapture, value, nameof(RedirectAudioCapture)); + } + + #endregion + + #region Misc + + [Browsable(false)] public string ConstantID { get; } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolBefore)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolBefore)), + TypeConverter(typeof(ExternalToolsTypeConverter))] + public virtual string PreExtApp + { + get => GetPropertyValue("PreExtApp", _preExtApp); + set => SetField(ref _preExtApp, value, "PreExtApp"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolAfter)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolAfter)), + TypeConverter(typeof(ExternalToolsTypeConverter))] + public virtual string PostExtApp + { + get => GetPropertyValue("PostExtApp", _postExtApp); + set => SetField(ref _postExtApp, value, "PostExtApp"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.MacAddress)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionMACAddress))] + public virtual string MacAddress + { + get => GetPropertyValue("MacAddress", _macAddress); + set => SetField(ref _macAddress, value, "MacAddress"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.UserField)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUser1))] + public virtual string UserField + { + get => GetPropertyValue("UserField", _userField); + set => SetField(ref _userField, value, "UserField"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Favorite)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionFavorite)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter))] + public virtual bool Favorite + { + get => GetPropertyValue("Favorite", _favorite); + set => SetField(ref _favorite, value, "Favorite"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.StartProgram)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionStartProgram)), + AttributeUsedInProtocol(ProtocolType.RDP)] + public virtual string StartProgram + { + get => GetPropertyValue("StartProgram", _startProgram); + set => SetField(ref _startProgram, value, "StartProgram"); + } + + #endregion + + #region VNC + // TODO: it seems all these VNC properties were added and serialized but + // never hooked up to the VNC protocol or shown to the user + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Compression)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCompression)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public ProtocolVNC.Compression VNCCompression + { + get => GetPropertyValue("VNCCompression", _vncCompression); + set => SetField(ref _vncCompression, value, "VNCCompression"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Encoding)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEncoding)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public ProtocolVNC.Encoding VNCEncoding + { + get => GetPropertyValue("VNCEncoding", _vncEncoding); + set => SetField(ref _vncEncoding, value, "VNCEncoding"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationMode)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationMode)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public ProtocolVNC.AuthMode VNCAuthMode + { + get => GetPropertyValue("VNCAuthMode", _vncAuthMode); + set => SetField(ref _vncAuthMode, value, "VNCAuthMode"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyType)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyType)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public ProtocolVNC.ProxyType VNCProxyType + { + get => GetPropertyValue("VNCProxyType", _vncProxyType); + set => SetField(ref _vncProxyType, value, "VNCProxyType"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyAddress)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyAddress)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public string VNCProxyIP + { + get => GetPropertyValue("VNCProxyIP", _vncProxyIp); + set => SetField(ref _vncProxyIp, value, "VNCProxyIP"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPort)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPort)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public int VNCProxyPort + { + get => GetPropertyValue("VNCProxyPort", _vncProxyPort); + set => SetField(ref _vncProxyPort, value, "VNCProxyPort"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyUsername)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyUsername)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public string VNCProxyUsername + { + get => GetPropertyValue("VNCProxyUsername", _vncProxyUsername); + set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPassword)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPassword)), + PasswordPropertyText(true), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public string VNCProxyPassword + { + get => GetPropertyValue("VNCProxyPassword", _vncProxyPassword); + set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC), + Browsable(false)] + public ProtocolVNC.Colors VNCColors + { + get => GetPropertyValue("VNCColors", _vncColors); + set => SetField(ref _vncColors, value, "VNCColors"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartSizeMode)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSmartSizeMode)), + TypeConverter(typeof(MiscTools.EnumTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC)] + public ProtocolVNC.SmartSizeMode VNCSmartSizeMode + { + get => GetPropertyValue("VNCSmartSizeMode", _vncSmartSizeMode); + set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode"); + } + + [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5), + LocalizedAttributes.LocalizedDisplayName(nameof(Language.ViewOnly)), + LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionViewOnly)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter)), + AttributeUsedInProtocol(ProtocolType.VNC)] + public bool VNCViewOnly + { + get => GetPropertyValue("VNCViewOnly", _vncViewOnly); + set => SetField(ref _vncViewOnly, value, "VNCViewOnly"); + } + + #endregion + + #endregion + + protected AbstractConnectionRecord(string uniqueId) + { + ConstantID = uniqueId.ThrowIfNullOrEmpty(nameof(uniqueId)); + } + + protected virtual TPropertyType GetPropertyValue(string propertyName, TPropertyType value) + { + return (TPropertyType)GetType().GetProperty(propertyName)?.GetValue(this, null); + } + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void RaisePropertyChangedEvent(object sender, PropertyChangedEventArgs args) + { + PropertyChanged?.Invoke(sender, new PropertyChangedEventArgs(args.PropertyName)); + } + + protected void SetField(ref T field, T value, string propertyName = null) + { + if (EqualityComparer.Default.Equals(field, value)) return; + field = value; + RaisePropertyChangedEvent(this, new PropertyChangedEventArgs(propertyName)); + } + } } \ No newline at end of file diff --git a/mRemoteNG/Connection/ConnectionInfo.cs b/mRemoteNG/Connection/ConnectionInfo.cs index 0bd7391af..fe1de1b71 100644 --- a/mRemoteNG/Connection/ConnectionInfo.cs +++ b/mRemoteNG/Connection/ConnectionInfo.cs @@ -15,8 +15,8 @@ using mRemoteNG.Connection.Protocol.Telnet; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Tree; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection @@ -363,6 +363,8 @@ namespace mRemoteNG.Connection MacAddress = Settings.Default.ConDefaultMacAddress; UserField = Settings.Default.ConDefaultUserField; Favorite = Settings.Default.ConDefaultFavorite; + StartProgram = Settings.Default.ConDefaultStartProgram; + OpeningCommand = Settings.Default.OpeningCommand; } private void SetVncDefaults() diff --git a/mRemoteNG/Connection/ConnectionInfoInheritance.cs b/mRemoteNG/Connection/ConnectionInfoInheritance.cs index 3ba69905c..d3e1298bb 100644 --- a/mRemoteNG/Connection/ConnectionInfoInheritance.cs +++ b/mRemoteNG/Connection/ConnectionInfoInheritance.cs @@ -2,8 +2,8 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection { @@ -92,6 +92,15 @@ namespace mRemoteNG.Connection [Browsable(true)] public bool SSHTunnelConnectionName { get; set; } + [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3), + LocalizedAttributes.LocalizedDisplayNameInheritAttribute(nameof(Language.OpeningCommand)), + LocalizedAttributes.LocalizedDescriptionInheritAttribute(nameof(Language.PropertyDescriptionOpeningCommand)), + TypeConverter(typeof(MiscTools.YesNoTypeConverter))] + [Browsable(true)] + public bool OpeningCommand { get; set; } + + + #endregion #region Protocol diff --git a/mRemoteNG/Connection/ConnectionInitiator.cs b/mRemoteNG/Connection/ConnectionInitiator.cs index 4c52e6c63..ff8d07803 100644 --- a/mRemoteNG/Connection/ConnectionInitiator.cs +++ b/mRemoteNG/Connection/ConnectionInitiator.cs @@ -6,14 +6,12 @@ using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; -using mRemoteNG.Tree; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Panels; using mRemoteNG.UI.Tabs; using mRemoteNG.UI.Window; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection diff --git a/mRemoteNG/Connection/ConnectionsService.cs b/mRemoteNG/Connection/ConnectionsService.cs index ced891909..4e8a57124 100644 --- a/mRemoteNG/Connection/ConnectionsService.cs +++ b/mRemoteNG/Connection/ConnectionsService.cs @@ -13,12 +13,12 @@ using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Connection.Protocol; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection { @@ -37,6 +37,7 @@ namespace mRemoteNG.Connection public string ConnectionFileName { get; private set; } public RemoteConnectionsSyncronizer RemoteConnectionsSyncronizer { get; set; } public DateTime LastSqlUpdate { get; set; } + public DateTime LastFileUpdate { get; set; } public ConnectionTreeModel ConnectionTreeModel { get; private set; } diff --git a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.DownloadHandler.cs b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.DownloadHandler.cs deleted file mode 100644 index 214a768f2..000000000 --- a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.DownloadHandler.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright © 2013 The CefSharp Authors. All rights reserved. -// -// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. - -using CefSharp; -using System; - -namespace mRemoteNG.Connection.Protocol.Http -{ - public class DownloadHandler : IDownloadHandler - { - public event EventHandler OnBeforeDownloadFired; - - public event EventHandler OnDownloadUpdatedFired; - - public void OnBeforeDownload(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback) - { - OnBeforeDownloadFired?.Invoke(this, downloadItem); - - if (!callback.IsDisposed) - { - using (callback) - { - callback.Continue(downloadItem.SuggestedFileName, showDialog: true); - } - } - } - - public void OnDownloadUpdated(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback) - { - OnDownloadUpdatedFired?.Invoke(this, downloadItem); - } - } -} \ No newline at end of file diff --git a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.RequestHandler.cs b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.RequestHandler.cs deleted file mode 100644 index 34379a119..000000000 --- a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTP.RequestHandler.cs +++ /dev/null @@ -1,64 +0,0 @@ -using CefSharp; -using System.Diagnostics; -using System.Security.Cryptography.X509Certificates; - -namespace mRemoteNG.Connection.Protocol.Http -{ - partial class RequestHandler : IRequestHandler - { - public bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback) - { - return false; - } - - public IResourceRequestHandler GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) - { - return null; - } - - public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect) - { - if (request.Url.StartsWith(Cef.CefCommitHash)) - { - return false; - } - else - { - Process.Start(request.Url); - return true; - } - } - - public bool OnCertificateError(IWebBrowser chromiumWebBrowser, IBrowser browser, CefErrorCode errorCode, string requestUrl, ISslInfo sslInfo, IRequestCallback callback) - { - return false; - } - - public bool OnOpenUrlFromTab(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture) - { - return false; - } - - public void OnPluginCrashed(IWebBrowser chromiumWebBrowser, IBrowser browser, string pluginPath) - { - } - - public bool OnQuotaRequest(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, long newSize, IRequestCallback callback) - { - return true; - } - - public void OnRenderProcessTerminated(IWebBrowser chromiumWebBrowser, IBrowser browser, CefTerminationStatus status) - { - } - - public void OnRenderViewReady(IWebBrowser chromiumWebBrowser, IBrowser browser) - { - } - - public bool OnSelectClientCertificate(IWebBrowser chromiumWebBrowser, IBrowser browser, bool isProxy, string host, int port, X509Certificate2Collection certificates, ISelectClientCertificateCallback callback) - { - return true; - } - } -} \ No newline at end of file diff --git a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs index 823a4fe36..00df0dbed 100644 --- a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs +++ b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs @@ -1,11 +1,10 @@ using System; using System.Windows.Forms; -using CefSharp; -using CefSharp.WinForms; +using Microsoft.Web.WebView2.WinForms; using mRemoteNG.Tools; using mRemoteNG.App; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Tabs; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.Http @@ -14,24 +13,22 @@ namespace mRemoteNG.Connection.Protocol.Http { #region Private Properties - private Control wBrowser; + private Control _wBrowser; + private string _tabTitle; protected string httpOrS; protected int defaultPort; - private string tabTitle; - private bool browserInitialised = false; - private bool connectCalled = false; #endregion #region Public Methods - protected HTTPBase(RenderingEngine RenderingEngine) + protected HTTPBase(RenderingEngine renderingEngine) { try { - if (RenderingEngine == RenderingEngine.CEF) + if (renderingEngine == RenderingEngine.EdgeChromium) { - Control = new ChromiumWebBrowser("about:blank") + Control = new WebView2() { Dock = DockStyle.Fill, }; @@ -53,33 +50,26 @@ namespace mRemoteNG.Connection.Protocol.Http try { - if (InterfaceControl.Parent is ConnectionTab objConnectionTab) tabTitle = objConnectionTab.TabText; + if (InterfaceControl.Parent is ConnectionTab objConnectionTab) _tabTitle = objConnectionTab.TabText; } catch (Exception) { - tabTitle = ""; + _tabTitle = ""; } try { - wBrowser = Control; + _wBrowser = Control; - if (InterfaceControl.Info.RenderingEngine == RenderingEngine.CEF) + if (InterfaceControl.Info.RenderingEngine == RenderingEngine.EdgeChromium) { - var CEFBrowser = (ChromiumWebBrowser)wBrowser; - if (CEFBrowser != null) - { - CEFBrowser.LoadingStateChanged += CefBrowser_LoadingStateChanged; - CEFBrowser.TitleChanged += WBrowser_DocumentTitleChanged; - } - else - { - throw new Exception("Failed to initialize CEF Rendering Engine."); - } + var edge = (WebView2)_wBrowser; + + edge.CoreWebView2InitializationCompleted += Edge_CoreWebView2InitializationCompleted; } else { - var objWebBrowser = (WebBrowser)wBrowser; + var objWebBrowser = (WebBrowser)_wBrowser; objWebBrowser.ScrollBarsEnabled = true; // http://stackoverflow.com/questions/4655662/how-to-ignore-script-errors-in-webbrowser @@ -87,7 +77,6 @@ namespace mRemoteNG.Connection.Protocol.Http objWebBrowser.Navigated += WBrowser_Navigated; objWebBrowser.DocumentTitleChanged += WBrowser_DocumentTitleChanged; - browserInitialised = true; } return true; @@ -103,20 +92,16 @@ namespace mRemoteNG.Connection.Protocol.Http { try { - if (InterfaceControl.Info.RenderingEngine == RenderingEngine.CEF) + if (InterfaceControl.Info.RenderingEngine == RenderingEngine.EdgeChromium) { - if (browserInitialised) - { - ((ChromiumWebBrowser)wBrowser).Load(GetURL()); - } + ((WebView2)_wBrowser).Source = new Uri(GetUrl()); } else { - ((WebBrowser)wBrowser).Navigate(GetURL()); + ((WebBrowser)_wBrowser).Navigate(GetUrl()); } base.Connect(); - connectCalled = true; return true; } catch (Exception ex) @@ -130,22 +115,12 @@ namespace mRemoteNG.Connection.Protocol.Http #region Private Methods - private string GetURL() + private string GetUrl() { try { var strHost = InterfaceControl.Info.Hostname; - /* - * Commenting out since this codes doesn't actually do anything at this time... - * Possibly related to MR-221 and/or MR-533 ???? - * - string strAuth = ""; - if (((int)Force & (int)ConnectionInfo.Force.NoCredentials) != (int)ConnectionInfo.Force.NoCredentials && !string.IsNullOrEmpty(InterfaceControl.Info.Username) && !string.IsNullOrEmpty(InterfaceControl.Info.Password)) - { - strAuth = "Authorization: Basic " + Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(InterfaceControl.Info.Username + ":" + InterfaceControl.Info.Password)) + Environment.NewLine; - } - */ if (InterfaceControl.Info.Port != defaultPort) { if (strHost.EndsWith("/")) @@ -161,6 +136,7 @@ namespace mRemoteNG.Connection.Protocol.Http if (strHost.Contains(httpOrS + "://") == false) strHost = httpOrS + "://" + strHost; } + return strHost; } catch (Exception ex) @@ -174,26 +150,17 @@ namespace mRemoteNG.Connection.Protocol.Http #region Events - private void CefBrowser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e) + private void Edge_CoreWebView2InitializationCompleted(object sender, Microsoft.Web.WebView2.Core.CoreWebView2InitializationCompletedEventArgs e) { - browserInitialised = !e.IsLoading; - if (browserInitialised) + if (!e.IsSuccess) { - // Unhook the loading state changes now, as navigation is done by the user on links in the control - ((ChromiumWebBrowser)wBrowser).LoadingStateChanged -= CefBrowser_LoadingStateChanged; - - // If this Connection has already been asked to connect but the browser hadn't finished initalising - // then the connect wouldn't have been allowed to take place, so now we can call it! - if (connectCalled) - { - Connect(); - } + Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpFailedUrlBuild, e.InitializationException); } } private void WBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e) { - if (!(wBrowser is WebBrowser objWebBrowser)) return; + if (!(_wBrowser is WebBrowser objWebBrowser)) return; // This can only be set once the WebBrowser control is shown, it will throw a COM exception otherwise. objWebBrowser.AllowWebBrowserDrop = false; @@ -207,33 +174,18 @@ namespace mRemoteNG.Connection.Protocol.Http { if (!(InterfaceControl.Parent is ConnectionTab tabP)) return; string shortTitle; - - if (InterfaceControl.Info.RenderingEngine == RenderingEngine.CEF) + if (((WebBrowser)_wBrowser).DocumentTitle.Length >= 15) { - if (((TitleChangedEventArgs)e).Title.Length >= 15) - { - shortTitle = ((TitleChangedEventArgs)e).Title.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((CefSharp.TitleChangedEventArgs)e).Title; - } + shortTitle = ((WebBrowser)_wBrowser).DocumentTitle.Substring(0, 10) + "..."; } else { - if (((WebBrowser)wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((WebBrowser)wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((WebBrowser)wBrowser).DocumentTitle; - } + shortTitle = ((WebBrowser)_wBrowser).DocumentTitle; } - if (!string.IsNullOrEmpty(tabTitle)) + if (!string.IsNullOrEmpty(_tabTitle)) { - tabP.TabText = tabTitle + @" - " + shortTitle; + tabP.TabText = _tabTitle + @" - " + shortTitle; } else { @@ -246,38 +198,6 @@ namespace mRemoteNG.Connection.Protocol.Http } } - - private void geckoBrowser_DocumentTitleChanged(object sender, EventArgs e) - { - try - { - if (!(InterfaceControl.Parent is ConnectionTab tabP)) return; - string shortTitle; - - if (((WebBrowser)wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((WebBrowser)wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((WebBrowser)wBrowser).DocumentTitle; - } - - if (!string.IsNullOrEmpty(tabTitle)) - { - tabP.TabText = tabTitle + @" - " + shortTitle; - } - else - { - tabP.TabText = shortTitle; - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpDocumentTileChangeFailed, ex); - } - } - #endregion #region Enums @@ -288,7 +208,7 @@ namespace mRemoteNG.Connection.Protocol.Http IE = 1, [LocalizedAttributes.LocalizedDescription(nameof(Language.HttpCEF))] - CEF = 2 + EdgeChromium = 2 } #endregion diff --git a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs index 377ca760a..42c72d0c2 100644 --- a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs +++ b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs @@ -6,8 +6,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol { diff --git a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs index 9730d382d..8f20464a5 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs @@ -51,7 +51,7 @@ namespace mRemoteNG.Connection.Protocol return new IntegratedProgram(); } - return default; + return default(ProtocolBase); } } } \ No newline at end of file diff --git a/mRemoteNG/Connection/Protocol/ProtocolList.cs b/mRemoteNG/Connection/Protocol/ProtocolList.cs index 0edbe3257..27d8b2148 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolList.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolList.cs @@ -21,10 +21,7 @@ namespace mRemoteNG.Connection.Protocol } } - public new int Count - { - get { return List.Count; } - } + public new int Count => List.Count; public void Add(ProtocolBase cProt) diff --git a/mRemoteNG/Connection/Protocol/ProtocolType.cs b/mRemoteNG/Connection/Protocol/ProtocolType.cs index 5f273ddf8..6f4016fdf 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolType.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolType.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol { diff --git a/mRemoteNG/Connection/Protocol/PuttyBase.cs b/mRemoteNG/Connection/Protocol/PuttyBase.cs index cec7971f8..a6bb44491 100644 --- a/mRemoteNG/Connection/Protocol/PuttyBase.cs +++ b/mRemoteNG/Connection/Protocol/PuttyBase.cs @@ -11,6 +11,7 @@ using System.Threading; using System.Windows.Forms; using mRemoteNG.Properties; using mRemoteNG.Resources.Language; +using SecretServerInterface; // ReSharper disable ArrangeAccessorOwnerBody @@ -34,10 +35,7 @@ namespace mRemoteNG.Connection.Protocol public static string PuttyPath { get; set; } - public bool Focused - { - get { return NativeMethods.GetForegroundWindow() == PuttyHandle; } - } + public bool Focused => NativeMethods.GetForegroundWindow() == PuttyHandle; #endregion @@ -117,6 +115,20 @@ namespace mRemoteNG.Connection.Protocol } } + // access secret server api if necessary + if (username.StartsWith("SSAPI:")) + { + var domain = ""; // dummy + try + { + SecretServerInterface.SecretServerInterface.fetchSecretFromServer(username, out username, out password, out domain); + } + catch (Exception ex) + { + Event_ErrorOccured(this, "Secret Server Interface Error: " + ex.Message, 0); + } + } + arguments.Add("-" + (int)PuttySSHVersion); if (!Force.HasFlag(ConnectionInfo.Force.NoCredentials)) @@ -191,6 +203,13 @@ namespace mRemoteNG.Connection.Protocol string.Format(Language.PanelHandle, InterfaceControl.Parent.Handle), true); + if (!string.IsNullOrEmpty(InterfaceControl.Info?.OpeningCommand)) + { + NativeMethods.SetForegroundWindow(PuttyHandle); + var finalCommand = InterfaceControl.Info.OpeningCommand.TrimEnd() + "\n"; + SendKeys.SendWait(finalCommand); + } + Resize(this, new EventArgs()); base.Connect(); return true; diff --git a/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs b/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs index c9dce37e4..008e02eb8 100644 --- a/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs +++ b/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs index 63f062be4..cc3eb38c4 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs index 5782790fb..49e7c0844 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs b/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs index 64618efce..ca45ff7a6 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs b/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs index 0e1c70210..c34f30552 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs b/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs index cd6fa2d88..2e9f37416 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs b/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs index f33cf362e..45f18beb6 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs @@ -1,5 +1,5 @@ -using mRemoteNG.Resources.Language; -using mRemoteNG.Tools; +using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index 9936a9d17..636bbea61 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -8,23 +8,23 @@ using AxMSTSCLib; using mRemoteNG.App; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.UI; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Tabs; using MSTSCLib; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { public class RdpProtocol6 : ProtocolBase, ISupportsViewOnly { /* RDP v8 requires Windows 7 with: - * https://support.microsoft.com/en-us/kb/2592687 + * https://support.microsoft.com/en-us/kb/2592687 * OR * https://support.microsoft.com/en-us/kb/2923545 - * + * * Windows 8+ support RDP v8 out of the box. */ private MsRdpClient6NotSafeForScripting _rdpClient; @@ -43,19 +43,13 @@ namespace mRemoteNG.Connection.Protocol.RDP public virtual bool SmartSize { get => _rdpClient.AdvancedSettings2.SmartSizing; - protected set - { - _rdpClient.AdvancedSettings2.SmartSizing = value; - } + protected set => _rdpClient.AdvancedSettings2.SmartSizing = value; } public virtual bool Fullscreen { get => _rdpClient.FullScreen; - protected set - { - _rdpClient.FullScreen = value; - } + protected set => _rdpClient.FullScreen = value; } private bool RedirectKeys @@ -308,6 +302,8 @@ namespace mRemoteNG.Connection.Protocol.RDP _rdpClient.AdvancedSettings2.overallConnectionTimeout = Settings.Default.ConRDPOverallConnectionTimeout; + _rdpClient.SecuredSettings2.StartProgram = connectionInfo.StartProgram; + _rdpClient.AdvancedSettings2.BitmapPeristence = Convert.ToInt32(connectionInfo.CacheBitmaps); if (_rdpVersion >= Versions.RDC61) { @@ -470,6 +466,20 @@ namespace mRemoteNG.Connection.Protocol.RDP var password = connectionInfo?.Password ?? ""; var domain = connectionInfo?.Domain ?? ""; + // access secret server api if necessary + if (userName.StartsWith("SSAPI:")) + { + try + { + SecretServerInterface.SecretServerInterface.fetchSecretFromServer(userName, out userName, out password, out domain); + } + catch (Exception ex) + { + Event_ErrorOccured(this, "Secret Server Interface Error: " + ex.Message, 0); + } + + } + if (string.IsNullOrEmpty(userName)) { if (Settings.Default.EmptyCredentials == "windows") @@ -529,7 +539,7 @@ namespace mRemoteNG.Connection.Protocol.RDP { try { - var scaleFactor = (uint)_displayProperties.ResolutionScalingFactor.Width * 100; + var scaleFactor = (uint)(_displayProperties.ResolutionScalingFactor.Width * 100); SetExtendedProperty("DesktopScaleFactor", scaleFactor); SetExtendedProperty("DeviceScaleFactor", (uint)100); @@ -611,28 +621,28 @@ namespace mRemoteNG.Connection.Protocol.RDP var pFlags = 0; if (connectionInfo.DisplayThemes == false) pFlags += (int)RDPPerformanceFlags.DisableThemes; - + if (connectionInfo.DisplayWallpaper == false) pFlags += (int)RDPPerformanceFlags.DisableWallpaper; - + if (connectionInfo.EnableFontSmoothing) pFlags += (int)RDPPerformanceFlags.EnableFontSmoothing; if (connectionInfo.EnableDesktopComposition) pFlags += (int)RDPPerformanceFlags.EnableDesktopComposition; - + if (connectionInfo.DisableFullWindowDrag) pFlags += (int)RDPPerformanceFlags.DisableFullWindowDrag; - + if (connectionInfo.DisableMenuAnimations) pFlags += (int)RDPPerformanceFlags.DisableMenuAnimations; - + if (connectionInfo.DisableCursorShadow) pFlags += (int)RDPPerformanceFlags.DisableCursorShadow; - + if (connectionInfo.DisableCursorBlinking) pFlags += (int)RDPPerformanceFlags.DisableCursorBlinking; - + _rdpClient.AdvancedSettings2.PerformanceFlags = pFlags; } catch (Exception ex) diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs index 2e1248629..c1cb10572 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs @@ -4,8 +4,8 @@ using System.Windows.Forms; using AxMSTSCLib; using mRemoteNG.App; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using MSTSCLib; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs index 5efd07ccf..1d77b99b4 100644 --- a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs +++ b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs @@ -3,33 +3,17 @@ using System.Threading; using System.ComponentModel; using System.Net.Sockets; using mRemoteNG.App; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.UI.Forms; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody namespace mRemoteNG.Connection.Protocol.VNC { - public class ProtocolVNC : ProtocolBase, ISupportsViewOnly + public class ProtocolVNC : ProtocolBase { - #region Properties - - public bool SmartSize - { - get { return _vnc.Scaled; } - set { _vnc.Scaled = value; } - } - - public bool ViewOnly - { - get { return _vnc.ViewOnly; } - set => _vnc.ViewOnly = value; - } - - #endregion - #region Private Declarations private VncSharp.RemoteDesktop _vnc; @@ -124,36 +108,6 @@ namespace mRemoteNG.Connection.Protocol.VNC } } - public void ToggleSmartSize() - { - try - { - SmartSize = !SmartSize; - RefreshScreen(); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - Language.VncToggleSmartSizeFailed + Environment.NewLine + - ex.Message, true); - } - } - - public void ToggleViewOnly() - { - try - { - ViewOnly = !ViewOnly; - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - Language.VncToggleViewOnlyFailed + Environment.NewLine + - ex.Message, true); - } - } - - public void StartChat() { throw new NotImplementedException(); diff --git a/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs b/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs index 0c056d1e1..8d632b341 100644 --- a/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs +++ b/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.VNC { diff --git a/mRemoteNG/Connection/PuttySessionInfo.cs b/mRemoteNG/Connection/PuttySessionInfo.cs index 76dbc9b5c..f609dd6af 100644 --- a/mRemoteNG/Connection/PuttySessionInfo.cs +++ b/mRemoteNG/Connection/PuttySessionInfo.cs @@ -1,12 +1,12 @@ -using mRemoteNG.App; +using mRemoteNG.App; using mRemoteNG.Messages; using mRemoteNG.Tools; using System; using System.ComponentModel; using mRemoteNG.Connection.Protocol; -using mRemoteNG.Resources.Language; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection diff --git a/mRemoteNG/Container/ContainerInfo.cs b/mRemoteNG/Container/ContainerInfo.cs index fa2e901c1..b5b361273 100644 --- a/mRemoteNG/Container/ContainerInfo.cs +++ b/mRemoteNG/Container/ContainerInfo.cs @@ -26,7 +26,7 @@ namespace mRemoteNG.Container [Browsable(false)] public override bool IsContainer { - get { return true; } + get => true; set { } } diff --git a/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs b/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs index bbd1d6ca2..5afdcb1e1 100644 --- a/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs +++ b/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.Tree; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Credential diff --git a/mRemoteNG/Credential/CredentialRecord.cs b/mRemoteNG/Credential/CredentialRecord.cs index decf53271..e0e77edbc 100644 --- a/mRemoteNG/Credential/CredentialRecord.cs +++ b/mRemoteNG/Credential/CredentialRecord.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.Credential public string Title { - get { return _title; } + get => _title; set { _title = value; @@ -26,7 +26,7 @@ namespace mRemoteNG.Credential public string Username { - get { return _username; } + get => _username; set { _username = value; @@ -36,7 +36,7 @@ namespace mRemoteNG.Credential public SecureString Password { - get { return _password; } + get => _password; set { _password = value; @@ -46,7 +46,7 @@ namespace mRemoteNG.Credential public string Domain { - get { return _domain; } + get => _domain; set { _domain = value; diff --git a/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs b/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs index 1b3575e8a..a2e6703d5 100644 --- a/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs +++ b/mRemoteNG/Credential/Repositories/CredentialRepositoryConfig.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.Credential.Repositories public string Title { - get { return _title; } + get => _title; set { _title = value; @@ -26,7 +26,7 @@ namespace mRemoteNG.Credential.Repositories public string TypeName { - get { return _typeName; } + get => _typeName; set { _typeName = value; @@ -36,7 +36,7 @@ namespace mRemoteNG.Credential.Repositories public string Source { - get { return _source; } + get => _source; set { _source = value; @@ -46,7 +46,7 @@ namespace mRemoteNG.Credential.Repositories public SecureString Key { - get { return _key; } + get => _key; set { _key = value; @@ -56,7 +56,7 @@ namespace mRemoteNG.Credential.Repositories public bool Loaded { - get { return _loaded; } + get => _loaded; set { _loaded = value; diff --git a/mRemoteNG/Documentation/_static/theme_overrides.css b/mRemoteNG/Documentation/_static/theme_overrides.css deleted file mode 100644 index 174fade5f..000000000 --- a/mRemoteNG/Documentation/_static/theme_overrides.css +++ /dev/null @@ -1,13 +0,0 @@ -/* override table width restrictions */ -@media screen and (min-width: 767px) { - - .wy-table-responsive table td { - /* !important prevents the common CSS stylesheets from overriding - this as on RTD they are loaded after this stylesheet */ - white-space: normal !important; - } - - .wy-table-responsive { - overflow: visible !important; - } -} \ No newline at end of file diff --git a/mRemoteNG/Documentation/conf.py b/mRemoteNG/Documentation/conf.py deleted file mode 100644 index 66a3ddacc..000000000 --- a/mRemoteNG/Documentation/conf.py +++ /dev/null @@ -1,233 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Configuration file for the Sphinx documentation builder. -# -# This file does only contain a selection of the most common options. For a -# full list see the documentation: -# http://www.sphinx-doc.org/en/master/config -# -- Path setup -------------------------------------------------------------- - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -# -# import os -# import sys -# sys.path.insert(0, os.path.abspath('.')) - - -# -- Project information ----------------------------------------------------- - -project = 'mRemoteNG' -copyright = '2020 The mRemoteNG Team' -author = 'The mRemoteNG Team' - -# The short X.Y version -version = '0.0' -# The full version, including alpha/beta/rc tags -release = '0.0.alpha' - - - -######################### Begin mRemoteNG Stuff ############################### - -import re - -# Load assembly information -try: - file = open("..\\Properties\\AssemblyInfo.cs", "r") - - for line in file: - if re.match(r'(\[assembly: AssemblyTitle.*)', line): - project = line - elif re.match(r'(\[assembly: AssemblyCompany.*)', line): - author = line - elif re.match(r'(\[assembly: AssemblyVersion.*)', line): - version = line - release = line - elif re.match(r'(\[assembly: AssemblyCopyright.*)', line): - copyright = line - - project = re.search(r'\".*\"', project) - project = project.group(0).replace('\"', '') - - author = re.search(r'\".*\"', author) - author = author.group(0).replace('\"', '') - - version = re.search(r'\".*\"', version) - version = re.search(r'\"[\d].[\d].', version.group(0)) - version = version.group(0).replace('\"', '') - - release = re.search(r'\".*\"', release) - release = release.group(0).replace('\"', '') - - copyright = re.search(r'\".*\"', copyright) - copyright = copyright.group(0).replace('\"', '') -except: - print("Assembly file cannot be found, using default values") - -########################### End mRemoteNG Stuff ############################### - - - -# -- General configuration --------------------------------------------------- - -# If your documentation needs a minimal Sphinx version, state it here. -# -# needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones.For a full list see the documentation: -# http://www.sphinx-doc.org/en/master/usage/extensions/index.html -#extensions = [ -#] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix(es) of source filenames. -# You can specify multiple suffix as a list of string: -# -# source_suffix = ['.rst', '.md'] -source_suffix = '.rst' - -# The master toctree document. -master_doc = 'index' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -# -# This is also used if you do content translation via gettext catalogs. -# Usually you set "language" from the command line for these cases. -language = None - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -# This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = None - - -# -- Options for HTML output ------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -# -html_theme = 'sphinx_rtd_theme' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -# -# html_theme_options = {} - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Custom sidebar templates, must be a dictionary that maps document names -# to template names. -# -# The default sidebars (for documents that don't match any pattern) are -# defined by theme itself. Builtin themes are using these templates by -# default: ``['localtoc.html', 'relations.html', 'sourcelink.html', -# 'searchbox.html']``. - -# Remove page source editing -html_show_sourcelink = False - - -# -- Options for HTMLHelp output --------------------------------------------- - -# Output file base name for HTML help builder. -htmlhelp_basename = 'mRemoteNGdoc' - - -# -- Options for LaTeX output ------------------------------------------------ - -latex_elements = { - # The paper size ('letterpaper' or 'a4paper'). - # - # 'papersize': 'letterpaper', - - # The font size ('10pt', '11pt' or '12pt'). - # - # 'pointsize': '10pt', - - # Additional stuff for the LaTeX preamble. - # - # 'preamble': '', - - # Latex figure (float) alignment - # - # 'figure_align': 'htbp', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - (master_doc, 'mRemoteNG.tex', 'mRemoteNG Documentation', - 'The mRemoteNG Team', 'manual'), -] - - -# -- Options for manual page output ------------------------------------------ - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - (master_doc, 'mremoteng', 'mRemoteNG Documentation', - [author], 1) -] - - -# -- Options for Texinfo output ---------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - (master_doc, 'mRemoteNG', 'mRemoteNG Documentation', - author, 'mRemoteNG', 'One line description of project.', - 'Miscellaneous'), -] - - -# -- Options for Epub output ------------------------------------------------- - -# Bibliographic Dublin Core info. -epub_title = project - -# The unique identifier of the text. This can be a ISBN number -# or the project homepage. -# -# epub_identifier = '' - -# A unique identification for the text. -# -# epub_uid = '' - -# A list of files that should not be packed into the epub file. -epub_exclude_files = ['search.html'] - - -# -- Extension configuration ------------------------------------------------- - -# -- Options for todo extension ---------------------------------------------- - -# If true, `todo` and `todoList` produce output, else they produce nothing. -todo_include_todos = True - - - - -html_context = { - 'css_files': [ - '_static/theme_overrides.css', # override wide tables in RTD theme - ], - } \ No newline at end of file diff --git a/mRemoteNG/Icons/RaspberryPi.ico b/mRemoteNG/Icons/RaspberryPi.ico new file mode 100644 index 000000000..bfaadd84a Binary files /dev/null and b/mRemoteNG/Icons/RaspberryPi.ico differ diff --git a/mRemoteNG/Resources/Language/Language.Designer.cs b/mRemoteNG/Language/Language.Designer.cs similarity index 92% rename from mRemoteNG/Resources/Language/Language.Designer.cs rename to mRemoteNG/Language/Language.Designer.cs index 5b5f1a09c..f9c2418af 100644 --- a/mRemoteNG/Resources/Language/Language.Designer.cs +++ b/mRemoteNG/Language/Language.Designer.cs @@ -19,7 +19,7 @@ namespace mRemoteNG.Resources.Language { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Language { @@ -39,7 +39,7 @@ namespace mRemoteNG.Resources.Language { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Resources.Language.Language", typeof(Language).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Language.Language", typeof(Language).Assembly); resourceMan = temp; } return resourceMan; @@ -88,7 +88,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to &Warn me when closing connections. + /// Looks up a localized string similar to Warn me when closing connections. /// internal static string _CloseWarnAll { get { @@ -96,15 +96,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to &Connect:. - /// - internal static string _Connect { - get { - return ResourceManager.GetString("_Connect", resourceCulture); - } - } - /// /// Looks up a localized string similar to &Delete. /// @@ -519,15 +510,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Basic. - /// - internal static string Basic { - get { - return ResourceManager.GetString("Basic", resourceCulture); - } - } - /// /// Looks up a localized string similar to Default Inheritance. /// @@ -573,93 +555,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to ICA requires that the XenDesktop Online Plugin is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/. - /// - internal static string CcICAFailed { - get { - return ResourceManager.GetString("CcICAFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to All ICA components were found and seem to be registered properly. - ///Citrix ICA Client Control Version {0}. - /// - internal static string CcICAOK { - get { - return ResourceManager.GetString("CcICAOK", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to not installed properly. - /// - internal static string CcNotInstalledProperly { - get { - return ResourceManager.GetString("CcNotInstalledProperly", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path. - ///Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path). - /// - internal static string CcPuttyFailed { - get { - return ResourceManager.GetString("CcPuttyFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The PuTTY executable was found and should be ready to use.. - /// - internal static string CcPuttyOK { - get { - return ResourceManager.GetString("CcPuttyOK", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services) Client 8.0 installed. You can download it here: http://support.microsoft.com/kb/925876 - ///If this check still fails or you are unable to use RDP, please consult the at {0}.. - /// - internal static string CcRDPFailed { - get { - return ResourceManager.GetString("CcRDPFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The following RDP protocol versions are supported on this machine: {0}. - /// - internal static string CcRDPOK { - get { - return ResourceManager.GetString("CcRDPOK", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to VNC requires VncSharp.dll to be located in your mRemoteNG application folder. - ///Please make sure that you have the VncSharp.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\). - ///If you are still not able to pass this check or use VNC in mRemoteNG please consult the at {0}.. - /// - internal static string CcVNCFailed { - get { - return ResourceManager.GetString("CcVNCFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to All VNC components were found and seem to be registered properly. - ///VncSharp Control Version {0}. - /// - internal static string CcVNCOK { - get { - return ResourceManager.GetString("CcVNCOK", resourceCulture); - } - } - /// /// Looks up a localized string similar to Change. /// @@ -777,15 +672,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Checking for updates.... - /// - internal static string CheckingForUpdates { - get { - return ResourceManager.GetString("CheckingForUpdates", resourceCulture); - } - } - /// /// Looks up a localized string similar to Check now. /// @@ -804,15 +690,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Check succeeded!. - /// - internal static string CheckSucceeded { - get { - return ResourceManager.GetString("CheckSucceeded", resourceCulture); - } - } - /// /// Looks up a localized string similar to Choose a path for the mRemoteNG log file. /// @@ -948,15 +825,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Components Check. - /// - internal static string ComponentsCheck { - get { - return ResourceManager.GetString("ComponentsCheck", resourceCulture); - } - } - /// /// Looks up a localized string similar to Compression. /// @@ -1282,11 +1150,47 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Connections and Config. + /// Looks up a localized string similar to Daily. /// - internal static string ConnectionsAndConfig { + internal static string ConnectionsBackupFrequencyDaily { get { - return ResourceManager.GetString("ConnectionsAndConfig", resourceCulture); + return ResourceManager.GetString("ConnectionsBackupFrequencyDaily", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Never backup connections. + /// + internal static string ConnectionsBackupFrequencyNever { + get { + return ResourceManager.GetString("ConnectionsBackupFrequencyNever", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to On Edit. + /// + internal static string ConnectionsBackupFrequencyOnEdit { + get { + return ResourceManager.GetString("ConnectionsBackupFrequencyOnEdit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to On Exit. + /// + internal static string ConnectionsBackupFrequencyOnExit { + get { + return ResourceManager.GetString("ConnectionsBackupFrequencyOnExit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Weekly. + /// + internal static string ConnectionsBackupFrequencyWeekly { + get { + return ResourceManager.GetString("ConnectionsBackupFrequencyWeekly", resourceCulture); } } @@ -1318,7 +1222,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Connections file "{0}" could not be loaded! + /// Looks up a localized string similar to Connections file "{0}" could not be loaded! ///Starting with new connections file.. /// internal static string ConnectionsFileCouldNotBeLoadedNew { @@ -1561,15 +1465,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Delete Connection.... - /// - internal static string DeleteConnection { - get { - return ResourceManager.GetString("DeleteConnection", resourceCulture); - } - } - /// /// Looks up a localized string similar to Delete External Tool.... /// @@ -1579,15 +1474,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Delete Folder.... - /// - internal static string DeleteFolder { - get { - return ResourceManager.GetString("DeleteFolder", resourceCulture); - } - } - /// /// Looks up a localized string similar to Description. /// @@ -1804,24 +1690,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Duplicate Connection. - /// - internal static string DuplicateConnection { - get { - return ResourceManager.GetString("DuplicateConnection", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Duplicate Folder. - /// - internal static string DuplicateFolder { - get { - return ResourceManager.GetString("DuplicateFolder", resourceCulture); - } - } - /// /// Looks up a localized string similar to Duplicate Tab. /// @@ -1867,42 +1735,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to 128-bit. - /// - internal static string Enc128Bit { - get { - return ResourceManager.GetString("Enc128Bit", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 128-bit (logon only). - /// - internal static string Enc128BitLogonOnly { - get { - return ResourceManager.GetString("Enc128BitLogonOnly", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 40-bit. - /// - internal static string Enc40Bit { - get { - return ResourceManager.GetString("Enc40Bit", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to 56-bit. - /// - internal static string Enc56Bit { - get { - return ResourceManager.GetString("Enc56Bit", resourceCulture); - } - } - /// /// Looks up a localized string similar to Encoding. /// @@ -1948,15 +1780,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Encryption Strength. - /// - internal static string EncryptionStrength { - get { - return ResourceManager.GetString("EncryptionStrength", resourceCulture); - } - } - /// /// Looks up a localized string similar to Encryption Test. /// @@ -2048,10 +1871,10 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. - /// - ///See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information. - /// + /// Looks up a localized string similar to The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. + /// + ///See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information. + /// ///{0} is not fully FIPS compliant. Click OK to proceed at your own discretion, or Cancel to Exit.. /// internal static string ErrorFipsPolicyIncompatible { @@ -2538,7 +2361,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to CEF (Chromium). + /// Looks up a localized string similar to Edge Chromium. /// internal static string HttpCEF { get { @@ -2609,69 +2432,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to ICA. - /// - internal static string ICA { - get { - return ResourceManager.GetString("ICA", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Couldn't create new ICA Connection!. - /// - internal static string IcaConnectionFailed { - get { - return ResourceManager.GetString("IcaConnectionFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Loading ICA Plugin failed!. - /// - internal static string IcaControlFailed { - get { - return ResourceManager.GetString("IcaControlFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ICA SetCredentials failed!. - /// - internal static string IcaSetCredentialsFailed { - get { - return ResourceManager.GetString("IcaSetCredentialsFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ICA Set Event Handlers Failed!. - /// - internal static string IcaSetEventHandlersFailed { - get { - return ResourceManager.GetString("IcaSetEventHandlersFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ICA Set Props Failed!. - /// - internal static string IcaSetPropsFailed { - get { - return ResourceManager.GetString("IcaSetPropsFailed", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ICA Set Resolution Failed!. - /// - internal static string IcaSetResolutionFailed { - get { - return ResourceManager.GetString("IcaSetResolutionFailed", resourceCulture); - } - } - /// /// Looks up a localized string similar to Icon. /// @@ -2699,15 +2459,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Import failed. - /// - internal static string ImportFailed { - get { - return ResourceManager.GetString("ImportFailed", resourceCulture); - } - } - /// /// Looks up a localized string similar to An error occurred while importing the file "{0}".. /// @@ -2762,15 +2513,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Installed version. - /// - internal static string InstalledVersion { - get { - return ResourceManager.GetString("InstalledVersion", resourceCulture); - } - } - /// /// Looks up a localized string similar to Dispose of Int App process failed!. /// @@ -2834,15 +2576,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Jump to. - /// - internal static string JumpTo { - get { - return ResourceManager.GetString("JumpTo", resourceCulture); - } - } - /// /// Looks up a localized string similar to (Automatically Detect). /// @@ -3357,7 +3090,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error. + /// Looks up a localized string similar to You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error. ///If you run into such an error, please create a new connection file!. /// internal static string OldConffile { @@ -3393,6 +3126,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Opening Command. + /// + internal static string OpeningCommand { + get { + return ResourceManager.GetString("OpeningCommand", resourceCulture); + } + } + /// /// Looks up a localized string similar to Open new tab to the right of the currently selected tab. /// @@ -3870,15 +3612,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Select the encryption strength of the remote host.. - /// - internal static string PropertyDescriptionEncryptionStrength { - get { - return ResourceManager.GetString("PropertyDescriptionEncryptionStrength", resourceCulture); - } - } - /// /// Looks up a localized string similar to Select the external tool to be started.. /// @@ -3960,6 +3693,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to A command to run on the remote server after successfully connecting.. + /// + internal static string PropertyDescriptionOpeningCommand { + get { + return ResourceManager.GetString("PropertyDescriptionOpeningCommand", resourceCulture); + } + } + /// /// Looks up a localized string similar to Sets the panel in which the connection will open.. /// @@ -4239,6 +3981,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Start Program/alternate shell. + /// + internal static string PropertyDescriptionStartProgram { + get { + return ResourceManager.GetString("PropertyDescriptionStartProgram", resourceCulture); + } + } + /// /// Looks up a localized string similar to Connect to the console session of the remote host.. /// @@ -4375,7 +4126,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Protocol Event Disconnected failed. + /// Looks up a localized string similar to Protocol Event Disconnected failed. ///{0}. /// internal static string ProtocolEventDisconnectFailed { @@ -4717,15 +4468,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Alert on Idle disconnect. - /// - internal static string RdpAlertIdleTimeout { - get { - return ResourceManager.GetString("RdpAlertIdleTimeout", resourceCulture); - } - } - /// /// Looks up a localized string similar to Couldn't create RDP control, please check mRemoteNG requirements.. /// @@ -5050,15 +4792,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Smart Size. - /// - internal static string RdpSmartSize { - get { - return ResourceManager.GetString("RdpSmartSize", resourceCulture); - } - } - /// /// Looks up a localized string similar to Bring to this computer. /// @@ -5140,15 +4873,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Reconnect All Open Connections. - /// - internal static string ReconnectAll { - get { - return ResourceManager.GetString("ReconnectAll", resourceCulture); - } - } - /// /// Looks up a localized string similar to Reconnect All Connections. /// @@ -5231,9 +4955,9 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Stable channel includes final releases only. - ///Beta channel includes Betas & Release Candidates. - ///Development Channel includes Alphas, Betas & Release Candidates.. + /// Looks up a localized string similar to Stable channel includes final releases only. + ///Preview channel includes Betas & Release Candidates. + ///Nightly Channel includes Alphas, Betas & Release Candidates.. /// internal static string ReleaseChannelExplanation { get { @@ -5286,24 +5010,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Rename Connection. - /// - internal static string RenameConnection { - get { - return ResourceManager.GetString("RenameConnection", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Rename Folder. - /// - internal static string RenameFolder { - get { - return ResourceManager.GetString("RenameFolder", resourceCulture); - } - } - /// /// Looks up a localized string similar to Rename Tab. /// @@ -5421,15 +5127,6 @@ namespace mRemoteNG.Resources.Language { } } - /// - /// Looks up a localized string similar to Save connections on exit. - /// - internal static string SaveConsOnExit { - get { - return ResourceManager.GetString("SaveConsOnExit", resourceCulture); - } - } - /// /// Looks up a localized string similar to Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png. /// @@ -5656,11 +5353,11 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Smart Cards. + /// Looks up a localized string similar to SmartCard. /// - internal static string SmartCards { + internal static string SmartCard { get { - return ResourceManager.GetString("SmartCards", resourceCulture); + return ResourceManager.GetString("SmartCard", resourceCulture); } } @@ -5898,6 +5595,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Start Program. + /// + internal static string StartProgram { + get { + return ResourceManager.GetString("StartProgram", resourceCulture); + } + } + /// /// Looks up a localized string similar to Startup/Exit. /// @@ -5916,6 +5622,51 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to Backup. + /// + internal static string strBackup { + get { + return ResourceManager.GetString("strBackup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Browse.... + /// + internal static string strBrowse { + get { + return ResourceManager.GetString("strBrowse", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Connection Backup Frequency. + /// + internal static string strConnectionBackupFrequency { + get { + return ResourceManager.GetString("strConnectionBackupFrequency", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Maximum number of backups. + /// + internal static string strConnectionsBackupMaxCount { + get { + return ResourceManager.GetString("strConnectionsBackupMaxCount", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Location of connection file backup. + /// + internal static string strConnectionsBackupPath { + get { + return ResourceManager.GetString("strConnectionsBackupPath", resourceCulture); + } + } + /// /// Looks up a localized string similar to Support Forum. /// @@ -6196,7 +5947,7 @@ namespace mRemoteNG.Resources.Language { } /// - /// Looks up a localized string similar to Download complete! + /// Looks up a localized string similar to Download complete! ///mRemoteNG will now quit and begin with the installation.. /// internal static string UpdateDownloadComplete { @@ -6511,6 +6262,15 @@ namespace mRemoteNG.Resources.Language { } } + /// + /// Looks up a localized string similar to WebView2 creation failed with exception. + /// + internal static string WebView2InitializationFailed { + get { + return ResourceManager.GetString("WebView2InitializationFailed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Weekly. /// diff --git a/mRemoteNG/Resources/Language/Language.cs-CZ.resx b/mRemoteNG/Language/Language.cs-CZ.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.cs-CZ.resx rename to mRemoteNG/Language/Language.cs-CZ.resx index c0d7784ac..41f1d16ee 100644 --- a/mRemoteNG/Resources/Language/Language.cs-CZ.resx +++ b/mRemoteNG/Language/Language.cs-CZ.resx @@ -246,46 +246,6 @@ Kontrola selhala! - - Kontrola úspěšná! - - - Funkcionalita ICA vyžaduje, aby byl nainstalován XenDesktop Online Plugin a knihovna wfica.ocx byla zaregistrována. Klienta můžete stáhnout zde: http://www.citrix.com/download/ -Pokud máte XenDesktop Online Plugin nainstalován a kontrola stále selhává, pokuste se zaregistrovat wfica.ocx ručně. -K tomu otevřete dialog "Spustit" (Start->Spustit) a zadejte následující text: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (kde c:\Program Files\Citrix\ICA Client\ je cesta ke složce s Vaší instalací XenDesktop Online Plugin). -Pokud tato kontrola stále selhává nebo nejste schopni používat funkcionalitu ICA v mRemoteNG, prosím obraťte se na diskuzní fórum mRemoteNG na adrese http://forum.mremoteng.org/. - - - Všechny komponenty ICA byly nalezeny a zdají se být řádně zaregistrovány. -Citrix ICA Client Control verze {0} - - - není správně instalováno - - - Protokoly SSH, Telnet, Rlogin and RAW potřebují ke své práci program PuTTY. PuTTY je součástí každého balíčku s mRemoteNG a je k nalezení ve složce, kde je mRemoteNG nainstalován. -Prosím ujistěte se, že budťo máte soubor Putty.exe ve složce vašeho mRemoteNG (výchozí je: c:\Program Files\mRemoteNG\) nebo že jste zadali správnou cestu ke složce obsahující program PuTTY v Nástrojích (menu Nástroje -> Možnosti -> Pokročilé -> Vlastní cesta k PuTTY) - - - Program PuTTY byl nalezen a měl by být připraven k použití. - - - Aby RDP fungovalo, musíte mí nainstlaovanou poslední verzi Remote Desktop Connection (Terminal Services) Client 8.0. Můžete jej stáhnout zde : http://support.microsoft.com/kb/925876 -Pokud tato kontrola stále selhává nebo nejste schopni používat RDP v mRemoteNG, prosím prosím obraťte se na diskuzní fórum mRemoteNG na adrese http://forum.mremoteng.org/. - - - Všechny komponenty RDP byly nalezeny a zdají se být řádně zaregistrovány. -Remote Desktop Connection Control verze {0} - - - Funkcionalita VNC vyžaduje knihovnu VncSharp.dll ve složce s vaší instalací mRemoteNG. -Prosím ujistěte se, že máte v aplikační složce vaší instalace mRemoteNG soubor VncSharp.dll (zpravidla složka C:\Program Files\mRemoteNG\). -Pokud tato kontrola stále selhává nebo nejste schopni používat VNC v mRemoteNG, prosím prosím obraťte se na diskuzní fórum mRemoteNG na adrese http://forum.mremoteng.org/. - - - Všechny VNC součásti byly nalezeny a zdají se být řádně zaregistrovány. -VncSharp Control verze {0} - Automaticky obnovit připojení v případě přerušení spojení se serverem(pouze RDP && ICA) @@ -358,9 +318,6 @@ VncSharp Control verze {0} Detekován porblém s kompatibilitou - - Kontrola komponent - Operace btnIcon_Click selhala! @@ -476,9 +433,6 @@ Otevírám nový prázdný soubor seznamu spojení. Nepovedlo se najít ovládací prvek ToolStrip control v objektu FilteredPropertyGrid. - - Instalovaná verze - Detekovat @@ -503,21 +457,6 @@ Otevírám nový prázdný soubor seznamu spojení. Pro prázdná políčka Login, Heslo nebo Doména použít: - - 128-bit - - - 128-bit (jen pro logon) - - - 40-bit - - - 56-bit - - - Basic - Zakódovat celý soubor seznamu připojení @@ -668,18 +607,12 @@ Otevírám nový prázdný soubor seznamu spojení. Nastavení vlast. HTTP selhalo! - - Označ záložky rychlého připojení prefixem "Quick:" - Import z Active Directory Při importování souboru "{0}" došlo k chybě. - - Import selhal - Import ze &souboru... @@ -716,9 +649,6 @@ Otevírám nový prázdný soubor seznamu spojení. Když se ukončují spojení: - - &Připojit: - Zobrazený název: @@ -791,9 +721,6 @@ Otevírám nový prázdný soubor seznamu spojení. Panely - - Nastavení spojení - Kopírovat @@ -803,24 +730,12 @@ Otevírám nový prázdný soubor seznamu spojení. Ctrl-Esc - - Smazat spojení... - Smazat vnější nástroj... - - Smazat složku... - Přispějte - - Klonovat připojení - - - Klonovat složku - Klonovat záložku tabu @@ -839,9 +754,6 @@ Otevírám nový prázdný soubor seznamu spojení. Nápověda mRemoteNG - - Jít na - Spustit externí nástroj @@ -878,12 +790,6 @@ Otevírám nový prázdný soubor seznamu spojení. Obnovit obraz (VNC) - - Přejmenovat spojení - - - Přejmenovat složku - Přejmonovat záložku tabu @@ -1077,9 +983,6 @@ Pokud k takové chybě dojde, prosím vytvořte nový soubor se seznamem spojen Vyberte způsob kódování přenosu. - - Vyberte požadovanou sílu šifrování vzdáleného hostitele. - Vyberte externí nástroj, který má být spuštěn. @@ -1230,9 +1133,6 @@ Pokud k takové chybě dojde, prosím vytvořte nový soubor se seznamem spojen Kódování - - Síla šifrování - Externí nástroj @@ -1293,9 +1193,6 @@ Pokud k takové chybě dojde, prosím vytvořte nový soubor se seznamem spojen Připoj tiskárny - - Poskytuj karty - Zvuky @@ -1527,9 +1424,6 @@ Zpráva: Metoda RDP SetResolution selhala! - - Autom. velikost - Přehrávat v místním počítači @@ -1548,9 +1442,6 @@ Zpráva: Znovu se připojit k předchozím otevřeným relacím při startu aplikace - - Obnovit - Vzdálený soubor @@ -1719,9 +1610,6 @@ Zpráva: Informace o aktualizacích nemohly být staženy. - - Vyhledávám aktualizace... - Stahování ukončeno! mRemoteNG se nyní ukončí a zahájí instalaci. @@ -1798,9 +1686,6 @@ mRemoteNG se nyní ukončí a zahájí instalaci. Ano - - Obnovit všechna otevřená spojení - Čas čekání (timeout) na RDP spojení @@ -1867,9 +1752,6 @@ mRemoteNG se nyní ukončí a zahájí instalaci. Zapsat zprávu logu když se RDP sezení odpojí kvůli neaktivitě. - - Upozornit při odpojení z neaktivity - Heslo musí obsahovat alespoň {0} z těchto písmen: {1} diff --git a/mRemoteNG/Resources/Language/Language.de.resx b/mRemoteNG/Language/Language.de.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.de.resx rename to mRemoteNG/Language/Language.de.resx index e584473b8..b25908c3e 100644 --- a/mRemoteNG/Resources/Language/Language.de.resx +++ b/mRemoteNG/Language/Language.de.resx @@ -240,55 +240,6 @@ Prüfung fehlgeschlagen! - - Prüfung erfolgreich! - - - Die (RDP-) Sitzungsfunktion benötigt die Datei eolwtscom.dll. Diese muss korrekt registriert sein. -Alle mRemoteNG-Pakete beinhalten diese Datei, jedoch muss sie, wenn Sie eines der nicht-Setup Pakete verwenden, manuell registriert werden. -Öffnen Sie hierzu den Ausführen-Dialog (Start - Ausführen) und geben Sie Folgendes ein: regsvr32 "c:\Programme\mRemoteNG\eolwtscom.dll" (Wobei c:\Programme\mRemoteNG\ Ihr mRemoteNG-Installationspfad ist). -Wenn Sie noch immer Probleme mit der (RDP-) Sitzungsfunktion in mRemoteNG haben, konsultieren Sie bitte das mRemoteNG-Forum: http://forum.mremoteng.org/ - - - EOLWTSCOM wurde gefunden und scheint korrekt registriert zu sein. - - - Um die Gecko Rendering Engine benutzen zu können, benötigen Sie XULrunner 1.8.1.x und einen korrekt eingetragenen Pfad in den Optionen. -Hier können Sie XULrunner 1.8.1.3 herunterladen: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ -Wenn der Download abgeschlossen ist, entpacken Sie das Paket (Der Speicherort ist dabei ihnen überlassen). Als nächstes öffnen Sie (in mRemoteNG) Extras - Optionen - Erweitert und geben Sie den korrekten Pfad im XULrunner Feld an. -Wenn Sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren Sie bitte das mRemoteNG-Forum: http://forum.mremoteng.org/ - - - GeckoFx wurde gefunden und scheint korrekt installiert zu sein. - - - nicht korrekt installiert - - - Die Protokolle SSH, Telnet, Rlogin und RAW benötigen PuTTY. PuTTY wird in allen mRemote Paketen mitgeliefert und befindet sich im Installationspfad. -Bitte versichern Sie sich, dass sich die Datei PuttyNG.exe in ihrem mRemote Installationspfad befindet (Standard: c:\Programme\mRemoteNG\) oder dass Sie einen korrekten Pfad in den Optionen (Extras - Optionen - Erweitert - Eigener PuTTY-Pfad) angegeben haben. - - - PuTTY wurde gefunden und scheint betriebsbereit zu sein. - - - Um RDP korrekt betreiben können, muss mindestens Remote Desktop Connection (Terminal Services Client) 6.0 installiert sein. Hier können Sie die Software herunterladen: http://support.microsoft.com/kb/951616 -Wenn Sie RDP 6.1 bereits installiert haben und die Prüfung noch immer fehlschlägt, versuchen Sie, die Datei mstscax.dll manuell zu registrieren. Öffnen Sie hierzu den Ausführen-Dialog (Start - Ausführen) und geben Sie Folgendes ein: regsvr32 "c:\windows\system32\mstscax.dll" (Wobei c:\ Ihr System-Laufwerk ist). -Wenn Sie noch immer Probleme mit RDP haben, konsultieren Sie bitte das mRemoteNG-Forum: http://forum.mremoteng.org/ - - - Alle RDP-Komponenten wurden gefunden und scheinen korrekt registriert zu sein. -Remote Desktop Verbindung Control Version {0} - - - VNC benötigt die Datei VncSharp.dll im mRemoteNG-Programmordner. -Bitte stellen Sie sicher, dass Sie die Datei VncSharp.dll in Ihrem mRemoteNG-Programmordner haben (üblicherweise C:\Programme\mRemoteNG\). -Wenn Sie noch immer Probleme mit VNC haben, konsultieren Sie bitte das mRemoteNG-Forum: http://forum.mremoteng.org/ - - - Alle VNC-Komponenten wurden gefunden und scheinen korrekt registriert zu sein. -VncSharp Control Version {0} - Automatisch versuchen zu verbinden, wenn Verbindung getrennt wird (nur RDP && ICA) @@ -352,9 +303,6 @@ VncSharp Control Version {0} Kompatibilitätsproblem entdeckt - - Komponenten prüfen - Bild Knopf Ereignis fehlgeschlagen! @@ -468,9 +416,6 @@ Starte mit neuer Datei. Das ToolStrip-Steuerelement konnte in FilteredPropertyGrid nicht gefunden werden. - - Aktuelle Version - Erkennen @@ -492,21 +437,6 @@ Starte mit neuer Datei. Bei leeren Feldern für Benutzername, Passwort oder Domäne verwende: - - 128 Bit - - - 128 Bit (nur Anmeldung) - - - 40 Bit - - - 56 Bit - - - Einfach - Verbindungsdatendatei vollständig verschlüsseln @@ -609,9 +539,6 @@ Starte mit neuer Datei. Setzen der HTTP-Parameter fehlgeschlagen! - - QuickConnect-Tabs identifizieren, indem das Präfix "Quick" benutzt wird - Von Active Directory importieren @@ -648,9 +575,6 @@ Starte mit neuer Datei. Beim Schließen der Verbindungen: - - &Verbinden: - Anzeigename @@ -720,9 +644,6 @@ Starte mit neuer Datei. Verbindungs-Panels - - Verbindungen und Konfiguration - Kopieren @@ -732,24 +653,12 @@ Starte mit neuer Datei. STRG-ESC - - Verbindung löschen - Entfernen - - Ordner löschen - Spenden - - Verbindung duplizieren - - - Ordner duplizieren - Tab klonen @@ -768,9 +677,6 @@ Starte mit neuer Datei. Hilfe - - Springe zu - Starten @@ -804,12 +710,6 @@ Starte mit neuer Datei. Anzeige aktualisieren (VNC) - - Verbindung umbenennen - - - Ordner umbenennen - Tab umbenennen @@ -982,9 +882,6 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Wählen Sie die zu verwendende Codierung. - - Wählen Sie die Verschlüsselungsstärke des Remote Hosts. - Wählen Sie die zu startende externe Applikation. @@ -1129,9 +1026,6 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Codierung - - Verschlüsselungsstärke - Externes Programm @@ -1189,9 +1083,6 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Drucker - - Smartcards - Töne @@ -1419,9 +1310,6 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Setzen der Auflösung fehlgeschlagen! - - Automatisch skalieren - Hier wiedergeben @@ -1440,9 +1328,6 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Offene Verbindungen speichern und beim nächsten Start wiederverbinden - - Aktualisieren - Entfernte Datei @@ -1681,9 +1566,6 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Ja - - Alle offenen Verbindungen neu verbinden - &Starten @@ -1711,18 +1593,12 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Alle wichtigen Dateien - - Import-Vorgang fehlgeschlagen - Von &Datei importieren Testen... - - Nach Updates suchen... - Verschlüsselungs-Engine @@ -1850,7 +1726,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Verbindung testen - In Datei &exportieren + In Datei &exportieren... Beim Importieren der Datei ist ein Fehler aufgetreten ("{0}"). @@ -1891,9 +1767,6 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Wählen Sie, ob eine Benachrichtigung empfangen werden soll, nachdem die RDP-Sitzung aufgrund von Inaktivität getrennt wurde - - Benachrichtigung bei Leerlauftrennung - Das Passwort muss mindestens {0} der folgenden Zeichen enthalten: {1} @@ -1973,9 +1846,6 @@ Die Passwortlänge muss zwischen {0} und {1} liegen HTTPS - - ICA - Download @@ -1990,8 +1860,8 @@ Die Passwortlänge muss zwischen {0} und {1} liegen Stable enthält nur finale Versionen. -Beta beinhaltet Betas & Release Candidates. -Development umfasst Alphas, Betas und Release Candidates. +Preview beinhaltet Betas & Release Candidates. +Nightly umfasst Alphas, Betas und Release Candidates. Aktive Verbindung im Verbindungsbaum verfolgen @@ -2101,4 +1971,58 @@ Development umfasst Alphas, Betas und Release Candidates. Verstecke/Zeige Menü + + Arbeitsverzeichnis + + + Arbeitsverzeichnis: + + + Erweiterten Modus verwenden + + + Eine unbehandelte Ausnahme ist aufgetreten + + + Alle Verbindungen wieder verbinden + + + Schnellverbindung + + + SSH-Optionen + + + SSH-Tunnel + + + Muss zwischen 0 und 255 liegen + + + Beim Versuch, die Verbindung zum RDP-Host '{0}' wiederherzustellen, ist ein Fehler aufgetreten + + + Beim Versuch, die Verbindungsauflösung auf den Host '{0}' zu ändern, ist ein Fehler aufgetreten + + + Sind Sie sicher, dass Sie alle Verbindungen bis auf "{0}" schließen wollen? + + + Hostnamen kopieren + + + Löschen + + + Alles außer dieser Verbindung trennen + + + Position der Symbolleiste sperren + + + Fehlermeldung + + + WebView2-Erstellung fehlgeschlagen + \ No newline at end of file diff --git a/mRemoteNG/Resources/Language/Language.el.resx b/mRemoteNG/Language/Language.el.resx similarity index 81% rename from mRemoteNG/Resources/Language/Language.el.resx rename to mRemoteNG/Language/Language.el.resx index 5917f722f..8ecc995e2 100644 --- a/mRemoteNG/Resources/Language/Language.el.resx +++ b/mRemoteNG/Language/Language.el.resx @@ -237,24 +237,6 @@ Ο ελέγχος απέτυχε! - - Ο ελεγχος πέτυχε! - - - Η δυνατότητα (RDP) συνεδρίες προϋποθέτει ότι έχετε μια εγγεγραμμένο αντίγραφο του eolwtscom.dll στο σύστημά σας. mRemoteNG πλοία με αυτό το στοιχείο αλλά θα δεν εγγραφείτε αυτόματα εκτός αν η εκτέλεση του πακέτου εγκατάστασης. Να εγγραφείτε δεν με μη αυτόματο τρόπο αυτό: Ανοίξτε στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (όπου c:\Program Files\mRemoteNG\ είναι η διαδρομή προς την εγκατάσταση mRemoteNG). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε τη δυνατότητα συνεδρίες (RDP) στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/ - - - Το EOLWTSCOM βρέθηκε και φαίνεται να έχει καταχωρηθεί σωστά. - - - Για να χρησιμοποιήσετε το μηχανισμό απόδοσης Gecko πρέπει να έχετε XULrunner 1.8.1.x και ο δρόμος για την εγκατάσταση ορίστε στις επιλογές σας. Μπορείτε να κατεβάσετε XULrunner 1.8.1.3 εδώ: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ όταν ολοκληρώσετε τη λήψη κάντε εξαγωγή του πακέτου για την πορεία της επιλογής σας. Στη συνέχεια, στο mRemoteNG πηγαίνετε στο εργαλεία - επιλογές - προηγμένες και πληκτρολογήσει τη σωστή διαδρομή στο πεδίο διαδρομή XULrunner. Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή χρησιμοποιούν την μηχανή Gecko στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/ - - - Το GeckoFx βρέθηκε και φαίνεται να έχει εγκατασταθεί σωστά. - - - δεν έχει εγκατασταθεί σωστά - Σύνδεση σε λειτουργία πλήρους οθόνης diff --git a/mRemoteNG/Resources/Language/Language.en-US.resx b/mRemoteNG/Language/Language.en-US.resx similarity index 100% rename from mRemoteNG/Resources/Language/Language.en-US.resx rename to mRemoteNG/Language/Language.en-US.resx diff --git a/mRemoteNG/Resources/Language/Language.es-AR.resx b/mRemoteNG/Language/Language.es-AR.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.es-AR.resx rename to mRemoteNG/Language/Language.es-AR.resx index 9520f29c3..704bc8f7b 100644 --- a/mRemoteNG/Resources/Language/Language.es-AR.resx +++ b/mRemoteNG/Language/Language.es-AR.resx @@ -147,19 +147,6 @@ Varios - - no está correctamente instalado - - - El ejecutable de PuTTY se encontró y debería estar listo para usarse. - - - Todos los componentes RDP se encontraron y parecen estar registrados correctamente. Versión de escritorio remoto {0} - - - Todos los componentes de VNC se encontraron y parecen estar registrados correctamente. -VncSharp Control {0} - Intentar reconectar automáticamente cuando se desconecte (solo para RDP && ICA) @@ -205,9 +192,6 @@ VncSharp Control {0} Contraer todas las carpetas - - Comprobación de componentes - btnIcon_Click falló! @@ -277,9 +261,6 @@ VncSharp Control {0} No se pudo crear el nuevo archivo de conexiones! - - Versión instalada - Detectar @@ -298,15 +279,6 @@ VncSharp Control {0} Si desea Nombre de usuario, password o dominio vacio use: - - 128-bit - - - 128-bit (iniciar sesión) - - - Básica - Encriptar completamente el archivo de conexiones diff --git a/mRemoteNG/Resources/Language/Language.es.resx b/mRemoteNG/Language/Language.es.resx similarity index 90% rename from mRemoteNG/Resources/Language/Language.es.resx rename to mRemoteNG/Language/Language.es.resx index f1b830a99..f80570a4a 100644 --- a/mRemoteNG/Resources/Language/Language.es.resx +++ b/mRemoteNG/Language/Language.es.resx @@ -240,46 +240,6 @@ Comprobación fallida! - - Comprobación realizada! - - - ICA necesita que esté instalado XenDesktop Online Plugin y que la librería wfica.ocx esté registrada. Puede descargar el cliente aquí: http://www.citrix.com/download/ -Si tiene instalado XenDesktop Online Plugin y la comprobación continúa fallando, pruebe a registrar wfica.ocx manualmente. -Para hacer ésto, abra el diálogo ejecutar (Inicio - Ejecutar) e introduzca lo siguiente: regsvr32 "c:\Archivos de Programa\Citrix\ICA Client\wfica.ocx" (Donde c:\Archivos de Programa\Citrix\ICA Client\ es la ruta a su instalación de XenDesktop Online Plugin). -Si continúa sin funcionar la comprobación ó no puede utilizar ICA en mRemoteNG, consulte el Foro de mRemoteNG en http://forum.mremoteng.org/ - - - Todos los componentes de ICA han sido localizados y parecen estar registrados correctamente. -Versión {0} de Citrix ICA Client Control - - - no instalado adecuadamente - - - Los protocolos SSH, Telnet, Rlogin y RAW necesitan PuTTY para funcionar. PuTTY viene con cada paquete de mRemoteNG y se encuentra en la ruta de instalación. -Por favor, asegúrese de que tiene Putty.exe en el directorio de mRemoteNG (por defecto: c:\Archivos de Programa\mRemoteNG) ó que ha especificado una ruta correcta a su ejecutable de PuTTY en las Opciones (Herramientas-Opciones-Avanzado-Ruta personalizada a PuTTY) - - - El ejecutable de PuTTY ha sido localizado y está listo para usarse. - - - Para que RDP funcione adecuadamente necesita tener instalada al menos la versión 8.0 de Remote Desktop Connection (Cliente de Servicios de Terminal). Puede descargarlo de la dirección: https://support.microsoft.com/kb/2592687. Si tiene instalado RDP 8.0 y la comprobación sigue fallando, intente registrar la librería mstscax.dll manualmente. Para hacerlo, abra el diálogo de ejecutar (Inicio-Ejecutar) e introduzca lo siguiente: regsvr32 "c:\windows\system32\mstscax.dll" (donde c:\ es su unidad de sistema). -Si continúa teniendo problemas para hacer funcionar RDP, consulte el Foro de mRemoteNG en http://forum.mremoteng.org/ - - - Todos los componentes RDP han sido localizados y parecen registrados adecuadamente. -Versión de Control {0} de la Conexión de Escritorio Remoto - - - VNC necesita que VncSharp.dll esté situada en la carpeta donde está instalado mRemoteNG. -Por favor, compruebe que tiene el archivo VncSharp.dll en la carpeta de instalación de mRemoteNG (normalmente C:\Archivos de Programa\mRemoteNG\). -Si continúa sin funcionar la comprobación ó no puede utilizar VNC en mRemoteNG, consulte el Foro de mRemoteNG en http://forum.mremoteng.org/ - - - Todos los componentes VNC han sido localizados y parecen registrados adecuadamente. -Versión de Control {0} de VncSharp - Tratar de reconectar automáticamente al ser desconectado del servidor (solo RDP && ICA) @@ -340,9 +300,6 @@ Versión de Control {0} de VncSharp Detectado problema de compatibilidad - - Comprobación de Componentes - ¡Error en btnIcon_Click! @@ -452,9 +409,6 @@ Arrancando con un nuevo archivo de conexiones. ¡No se pudo crear un nuevo archivo de conexiones! - - Versión Instalada - Detectar @@ -476,15 +430,6 @@ Arrancando con un nuevo archivo de conexiones. Para campos de Nombre de Usuario, Contraseña y Dominio vacíos usar: - - 128-bit - - - 128-bit (sólo inicio de sesión) - - - Básico - Cifrar por completo el archivo de conexión @@ -587,24 +532,6 @@ Arrancando con un nuevo archivo de conexiones. ¡Asignación de Propiedades HTTP fallida! - - ¡No se pudo crear una nueva conexión ICA! - - - ¡Fallo en la carga del Plugin ICA! - - - ¡Asignación de Credenciales ICA fallida! - - - ¡Asignación de Manejadores de Eventos ICA fallida! - - - ¡Asignación de Propiedades ICA fallida! - - - ¡Asignación de Resolución ICA fallida! - Importar desde Directorio Activo @@ -641,9 +568,6 @@ Arrancando con un nuevo archivo de conexiones. Al cerrar las conexiones: - - &Conectar: - Nombre Mostrado @@ -713,9 +637,6 @@ Arrancando con un nuevo archivo de conexiones. Paneles de Conexión - - Conexiones y Configuración - Copiar @@ -725,24 +646,12 @@ Arrancando con un nuevo archivo de conexiones. Ctrl-Esc - - Borrar Conexión... - Borrar Herramienta Externa... - - Borrar Carpeta... - Donar - - Duplicar Conexión - - - Duplicar Carpeta - Duplicar Pestaña @@ -761,9 +670,6 @@ Arrancando con un nuevo archivo de conexiones. Ayuda de mRemoteNG - - Saltar a - Lanzar Aplicación Externa @@ -800,12 +706,6 @@ Arrancando con un nuevo archivo de conexiones. Refrescar Pantalla (VNC) - - Renombrar Conexión - - - Renombrar Carpeta - Renombrar Pestaña @@ -978,9 +878,6 @@ Arrancando con un nuevo archivo de conexiones. Seleccione el modo de codificación a emplear. - - Seleccione la fortaleza de cifrado del host remoto. - Seleccione la herramienta externa a iniciar. @@ -1125,9 +1022,6 @@ Arrancando con un nuevo archivo de conexiones. Codificación - - Fortaleza del Cifrado - Herramienta Externa @@ -1188,9 +1082,6 @@ Arrancando con un nuevo archivo de conexiones. Portapapeles - - Tarjetas Inteligentes - Sonidos @@ -1400,9 +1291,6 @@ Mensaje: ¡RDP Asignación de Resolución fallida! - - Tamaño inteligente - Traer a este equipo @@ -1421,9 +1309,6 @@ Mensaje: Reconectar en el arranque sesiones previamente abiertas - - Actualziar - Archivo remoto diff --git a/mRemoteNG/Language/Language.fi-FI.resx b/mRemoteNG/Language/Language.fi-FI.resx new file mode 100644 index 000000000..028971666 --- /dev/null +++ b/mRemoteNG/Language/Language.fi-FI.resx @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Valitse käytettävä värilaatu. + + + Värit + + + 16777216 Värit (24-bit) + + + 256 Värit (8-bit) + + + 32768 Värit (15-bit) + + + 16777216 Värit (32-bit) + + + 65536 Värit (16-bit) + + diff --git a/mRemoteNG/Resources/Language/Language.fr.resx b/mRemoteNG/Language/Language.fr.resx similarity index 57% rename from mRemoteNG/Resources/Language/Language.fr.resx rename to mRemoteNG/Language/Language.fr.resx index b85e5e6e0..4fef3e057 100644 --- a/mRemoteNG/Resources/Language/Language.fr.resx +++ b/mRemoteNG/Language/Language.fr.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - A propos + À propos AddNodeFromXML a échoué ! @@ -142,10 +142,10 @@ Toujours afficher l'icône dans la zone de notification - Demandez-moi plus tard + Me le demander plus tard - Personnalisez les paramètres maintenant + Personnaliser les paramètres maintenant Utiliser les paramètres recommandés @@ -160,7 +160,7 @@ Apparence - Sauvegarde automatique toutes les: + Sauvegarde automatique en minutes (0 = désactivé) : Dernière version @@ -211,10 +211,10 @@ &Arrêter - Tester le Proxy + Tester le proxy - Impossible de démarrer le scan de port, format d'addresse IP incorrect ! + Impossible de démarrer le scan de port : format d'adresse IP incorrect ! Apparence @@ -229,7 +229,7 @@ Passerelle - Autre + Divers Protocole @@ -240,39 +240,6 @@ Vérification échouée ! - - Verification réussie ! - - - ICA requiert l'installation du Plugin XenDesktop Online, ainsi que l'enregistrement de la librairie wfica.ocx. Vous pouvez télécharger le client ici : http://www.citrix.com/download/ -Si le Plugin XenDesktop Online est installé, et que la vérification des composants échoue, essayez d'enregistrer la librairie manuellement. -Pour cela, ouvrez la fenêtre "Exécuter" (Démarrer - Exécuter), et entrez cette commande : regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (Où c:\Program Files\Citrix\ICA Client\ est le chemin vers votre installation du plugin XenDesktop). -Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, consultez le forum de mRemoteNG ici : http://forum.mremoteng.org/ - - - Tous les composants de l'ICA ont été trouvés et semblent être enregistrés correctement. Citrix ICA Client Version Control {0} - - - pas correctement installé - - - Le SSH, Telnet, rlogin et protocoles RAW nécessite PuTTY. PuTTY est fourni dans chaque paquet de mRemoteNG et se trouve dans le dossier d'installation. Assurez-vous que votre répertoire mRemoteNG (par défaut: C:\ Program Files\mRemoteNG\) contienne Putty.exe, ou que vous avez spécifié un chemin d'accès valide dans les options (Outils - Options - Avancé - Custom PuTTY chemin d'accès) - - - L'exécutable PuTTY a été trouvé et devrait être prêt à l'emploi. - - - Pour que RDP fonctionne correctement, vous devez avoir au moins Remote Desktop Connection (Terminal Services Client) 6.1 installé. Vous pouvez le télécharger ici: http://support.microsoft.com/kb/951616 Si vous avez RDP 6.1 installé et que la vérification échoue, essayez d'enregistrer mstscax.dll manuellement. Pour ce faire, ouvrez la boîte de dialogue Exécuter (Démarrer - Exécuter) et entrer la commande suivante: regsvr32 "c:\ windows\system32\mstscax.dll" (où C:\ est votre lecteur système). Si vous avez encore des difficultés à faire fonctionner RDP veuillez consulter le Forum mRemoteNG: http://forum.mremoteng.org/ - - - Tous les composants RDP ont été trouvés et semblent être enregistrés correctement. Remote Desktop Connection Version Control {0} - - - VNC nécessite VncSharp.dll qui doit se trouver dans le dossier de mRemoteNG. Assurez-vous que le fichier VncSharp.dll est présent dans le dossier de mRemoteNG (habituellement C:\Program Files\mRemoteNG\). Si la vérification de VNC échoue, veuillez consulter le Forum mRemoteNG: http://forum.mremoteng.org/ - - - Tous les composants VNC ont été trouvés et semblent être enregistrés correctement. Version Control VncSharp {0} - Reconnexion automatique en cas de déconnexion du serveur (RDP seulement) @@ -283,7 +250,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Ce serveur proxy requiert une authentification - Utilisez un chemin personnalisé pour PuTTY : + Utiliser un chemin personnalisé pour PuTTY : Se reconnecter une fois prêt @@ -298,7 +265,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, En attente de fermeture - Vérifier Encore une fois + Vérifier de nouveau Vérifier les mises à jour au démarrage @@ -310,10 +277,10 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Vérifier l'installation correcte des composants au démarrage - Choisissez panneau avant de se connecter + Choisir un panneau avant de se connecter - Ports Fermés + Ports fermés Réduire tous les dossiers @@ -331,14 +298,11 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Impossible de convertir les arguments de la ligne de commande ! - {0} a détecté que l'utilitaire Lenovo Auto Scroll Utility est executé sur le système. Cet utilitaire est connu pour générer des problèmes avec {0}. Il est recommandé de le désactiver ou de le désinstaller. + {0} a détecté que l'utilitaire Lenovo Auto Scroll Utility est exécuté sur le système. Cet utilitaire est connu pour générer des problèmes avec {0}. Il est recommandé de le désactiver ou de le désinstaller. Problème de compatibilité détecté - - Vérifiez les composants - btnIcon_Click a échoué ! @@ -358,25 +322,25 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, pGrid_PopertyValueChanged a échoué ! - Fenêtre de configuration échec du chargement ! + Échec du chargement de la fenêtre de configuration ! - Êtes-vous sûr de vouloir fermer le panneau, "{0}"? Toutes les connexions contenues dans ce panneau seront fermées également. + Êtes-vous sûr de vouloir fermer le panneau "{0}" ? Toutes les connexions contenues dans ce panneau seront également fermées. - Êtes-vous sûr de vouloir supprimer l'outil externe, "{0}"? + Êtes-vous sûr de vouloir supprimer l'outil externe "{0}" ? - Êtes-vous sûr de vouloir supprimer l'outil externe séléctioné :"{0}"? + Êtes-vous sûr de vouloir supprimer l'outil externe sélectionné "{0}" ? - Êtes-vous sûr de vouloir supprimer la connexion, "{0}"? + Êtes-vous sûr de vouloir supprimer la connexion "{0}" ? - Êtes-vous sûr de vouloir supprimer le dossier vide, "{0}"? + Êtes-vous sûr de vouloir supprimer le dossier vide "{0}" ? - Êtes-vous sûr de vouloir supprimer le dossier, "{0}"? Tous les dossiers ou les connexions qu'il contient seront également supprimés. + Êtes-vous sûr de vouloir supprimer le dossier "{0}" ? Tous les dossiers et connexions qu'il contient seront également supprimés. Voulez-vous fermer toutes les connexions ouvertes ? @@ -397,19 +361,16 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Évènement de protocole connecté - Connexion à "{0}"via "{1}"créé par l'utilisateur "{2}"; (Description: "{3}"Champ Utilisateur: "{4}") + Connexion à "{0}" via "{1}" créée par l'utilisateur "{2}" (Description : "{3}" Champ utilisateur : "{4}") Connexion échouée ! - - Erreur de protocole - - L'ouverture de la connexion a échouée ! + L'ouverture de la connexion a échoué ! - Impossible d'ouvrir la connexion : Aucun nom d'hôte spécifié ! + Impossible d'ouvrir la connexion : aucun nom d'hôte spécifié ! Connexions @@ -418,19 +379,20 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Impossible de définir le port par défaut ! - Impossible de créer le fichier de sauvegarde de connexions ! + Impossible de créer le fichier de sauvegarde des connexions ! - Connexions fichier "{0}" ne peut être chargé ! + Le fichier des connexions "{0}" ne peut pas être chargé ! - Connexions fichier "{0}" ne peut être chargé ! À partir de fichiers de nouvelles connexions. + Le fichier des connexions "{0}" ne peut pas être chargé ! +Démarrage avec un nouveau fichier de connexions. - Impossible d'enregistrer le fichier de connexions sous "{0}" ! + Impossible d'enregistrer le fichier des connexions sous "{0}" ! - Connectez-vous à une session de console + Se connecter à une session de console Connexion (avec options) @@ -445,14 +407,11 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Échec de fermeture de la connexion ! - Impossible de créer le nouveau fichier de connexions ! + Impossible de créer le nouveau fichier des connexions ! Le contrôle ToolStrip est introuvable dans le FilteredPropertyGrid. - - Version installée - Détecter @@ -466,25 +425,16 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Télécharger et installer - Double + Doublon Voulez-vous continuer sans mot de passe ? - Pour un Login, Mot de passe ou Domaine vide, utiliser : - - - 128 bits - - - 128 bits (ouverture de session) - - - Basique + Pour un identifiant, mot de passe ou domaine vide, utiliser : - Chiffrer complètement le fichier de connexion + Chiffrer complètement le fichier des connexions IP de fin @@ -499,10 +449,10 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Échec de l'ajout du dossier (UI.Window.Tree).{0} - La base de données version {0} n'est pas compatible avec cette version de {1}. + La base de données version {0} n'est pas compatible avec cette version {1}. - La liste de connexion n'as pu être sauvegardée. + La liste des connexions n'a pas pu être sauvegardée. Échec du déchiffrement.{0} @@ -514,7 +464,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Erreurs - Le fichier de connexion ne peut pas être chargé. {0}{0}{2}{0}{3}{0}{0} Pour éviter la perte de données, {1} va être fermé. + Le fichier des connexions ne peut pas être chargé. {0}{0}{2}{0}{3}{0}{0} Pour éviter la perte de données, {1} va être fermé. Échec de VerifyDatabaseVersion (Config.Connections.Save). {0} @@ -532,28 +482,28 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Tous les fichiers (*.*) - Les dossiers de candidature (*. exe) + Applications (*.exe) - Fichiers mRemote CSV (*. csv) + Fichiers CSV mRemoteNG (*.csv) - Fichiers mRemote XML (*. xml) + Fichiers XML mRemoteNG (*.xml) - Fichiers RDP (*. rdp) + Fichiers RDP (*.rdp) Hériter {0} - Description de la propriété héritée: {0} + Description de la propriété héritée : {0} Gratuit - Plein Écran + Plein écran Général @@ -580,37 +530,19 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Impossible de créer de nouvelles connexions HTTP ! - Échec de changement de Tuile du Document HTTP ! + Échec de changement de tuile du document HTTP ! Échec de Set HTTP Props ! - - Impossible de créer une nouvelle connexion ICA ! - - - Le chargement du plugin ICA a échoué ! - - - Échec de ICA SetCredentials ! - - - Échec de ICA Set Event Handlers ! - - - Échec de ICA Set Props ! - - - Échec de ICA Set Resolution ! - - Identifier les onglets de connexion rapide en ajoutant le préfixe "Rapide". + Identifier les onglets de connexion rapide en ajoutant le préfixe "Rapide" Importer à partir d'Active Directory - Importer à partir du balayage de ports + Importer à partir du scan de ports Informations @@ -619,22 +551,22 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Échec de l'arrêt du processus Int App ! - Échec du Focus Int App ! + Échec du focus Int App ! - Handle Int App: {0} + Handle Int App : {0} - Échec de l'arrêt forcé du Processus Int App ! + Échec de l'arrêt forcé du processus Int App ! Échec du redimensionnement Int App ! - --- Éléments IntApp --- + --- Éléments Int App --- - Titre Int App: {0} + Titre Int App : {0} Adresse : @@ -642,11 +574,8 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Lors de la fermeture des connexions : - - &Connecter: - - Nom Affiché + Nom affiché Domaine @@ -655,25 +584,25 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Nom d'hôte : - Édition Portable + Édition portable - Pour configurer les sessions PuTTY cliquez sur ce bouton : + Configurer les sessions PuTTY : - Temps d'attente maximum pour Putty et les composants externes : + Temps d'attente max. pour PuTTY : - Paru sous la GNU General Public License (GPL) + Paru sous la licence GNU General Public License (GPL) - seconde + secondes - Sélectionnez un groupe dans la liste ci-dessous ou cliquez sur Nouveau pour en ajouter un nouveau. Cliquez sur OK pour continuer. + Sélectionner un groupe dans la liste ci-dessous ou cliquer sur Nouveau pour en ajouter un nouveau. Cliquer sur OK pour continuer. - L'état du serveur : + État du serveur : Base de données : @@ -691,10 +620,10 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, {0} doit être redémarré pour que le changement de langue prenne effet. - La lecture à partir de SQL a échouée ! + Le chargement à partir de la base de données SQL a échoué - Le chargement à partir du XML a échoué ! + Le chargement à partir du fichier XML a échoué ! Fichier local @@ -706,7 +635,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Ajouter un panneau de connexion - Rechercher des mises à jour + Rechercher les mises à jour Configuration @@ -714,36 +643,21 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Panneaux de connexion - - Connexions et configuration - Copier - Ctrl-Alt-Del + Ctrl-Alt-Suppr Ctrl-Échap - - Supprimer la connexion... - Supprimer l'outil externe... - - Supprimer le dossier... - Faire un don - - Dupliquer la connexion - - - Dupliquer le dossier - Dupliquer l'onglet @@ -762,14 +676,11 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Aide mRemoteNG - - Aller à - Lancer l'outil externe - Nouveau fichier de connexion + Nouveau fichier de connexions Nouvel outil externe @@ -781,16 +692,16 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Tout copier - Supprimer tout + Tout supprimer - Ouvrir un fichier de connexion... + Ouvrir un fichier de connexions... Options - Scan de port + Scan de ports Barre de connexion rapide @@ -801,12 +712,6 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Rafraîchir l'écran (VNC) - - Renommer la connexion - - - Renommer le dossier - Renommer l'onglet @@ -814,7 +719,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Signaler un bug - Réinitialisation de la disposition des panneaux + Réinitialiser la disposition des panneaux Enregistrer le fichier de connexions @@ -823,7 +728,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Enregistrer le fichier de connexions sous... - Envoyer les touches spéciales (VNC) + Envoyer des touches spéciales (VNC) &Afficher le texte d'aide @@ -838,7 +743,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Transfert de fichiers SSH - Démarrer le Chat (VNC) + Démarrer le chat (VNC) Forum du support @@ -856,10 +761,10 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Voir seulement (VNC) - Site Web + Site web - Réduire dans la zone de notification. + Réduire dans la zone de notification Déplacer vers le bas @@ -868,7 +773,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Déplacer vers le haut - Mes identifiants de connexion actuels (Informations de connexion Windows) + Mes identifiants de connexion actuels (informations de connexion Windows) Jamais @@ -880,7 +785,7 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Nouveau dossier - Nouveau Panneau + Nouveau panneau Nouveau titre @@ -889,10 +794,10 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Non - Pas de compression + Aucune compression - Pas d'application externe spécifiée. + Aucune application externe spécifiée. Aucun @@ -907,8 +812,8 @@ Si la vérification des composants ou l'utilisation d'ICA échoue malgré tout, Aucune mise à jour disponible - Vous essayez de charger un fichier de connexion qui a été créé avec une version plus ancienne de mRemote, des erreurs internes pourraient survenir. -Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous plait ! + Vous essayez de charger un fichier de connexions qui a été créé avec une version plus ancienne de mRemoteNG. Des erreurs internes peuvent survenir. +Si vous rencontrez une erreur, créez un nouveau fichier de connexions ! Ouvrir les nouveaux onglets à droite de l'onglet actuellement sélectionné @@ -935,40 +840,40 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Merci de remplir tous les champs - Impossible de charger le panneau Scan de port ! + Impossible de charger le panneau Scan de ports ! - Entrez le nom ou l'adresse ip de l'hôte auquel vous souhaitez vous connecter. + Entrer le nom ou l'adresse IP de l'hôte auquel vous souhaitez vous connecter. Sélectionner toutes les options d'héritage. - Sélectionnez le niveau d'authentification que cette connexion doit utiliser. + Sélectionner le niveau d'authentification que cette connexion doit utiliser. - Sélectionnez la manière de vous authentifier auprès du serveur VNC. + Sélectionner la manière de vous authentifier auprès du serveur VNC. - Indiquez si vous souhaitez utiliser le cache bitmap ou non. + Indiquer si vous souhaitez utiliser le cache bitmap ou non. - Sélectionnez la qualité de couleur à utiliser. + Sélectionner la qualité des couleurs à utiliser. - Sélectionnez la valeur de compression à utiliser. + Sélectionner la valeur de compression à utiliser. - Mettez vos notes ou une description de l'hôte ici. + Entrer des notes ou une description de l'hôte ici. - Choisir oui si le thème de l'hôte distant doit être affiché. + Sélectionner Oui pour afficher le thème de l'hôte distant. - Sélectionnez oui si vous voulez afficher le fond d'ecran de l'hôte distant. + Sélectionner Oui pour afficher le fond d'écran de l'hôte distant. - Entrez votre nom de domaine. + Entrer un nom de domaine. Choisir d'utiliser la composition du bureau ou non. @@ -977,115 +882,112 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Choisir d'utiliser le lissage des polices ou non. - Choisissez l'encodage à utiliser. - - - Sélectionnez le niveau de chiffrement de l'hôte distant. + Choisir l'encodage à utiliser. - Sélectionnez l'outil externe qui doit être démarré. + Sélectionner l'outil externe à démarrer. - Sélectionnez un outil externe qui doit être lancé après la déconnexion de l'hôte distant. + Sélectionner un outil externe à démarrer après la déconnexion de l'hôte distant. - Sélectionnez un outil externe qui doit être lancé avant que la connexion à l'hôte distant ne soit établie. + Sélectionner un outil externe à démarrer avant que la connexion à l'hôte distant ne soit établie. - Choisissez une icône qui s'affichera lorsque vous serez connecté à l'hôte. + Choisir une icône qui s'affichera lorsque vous serez connecté à l'hôte. - Entrez l'adresse MAC de l'hôte distant si vous souhaitez l'utiliser dans un outil externe. + Entrer l'adresse MAC de l'hôte distant si vous souhaitez l'utiliser dans un outil externe. - Nom affiché dans l'arborescence de connexions. + Nom affiché dans l'arborescence des connexions. Panneau dans lequel la connexion sera ouverte. - Entrez votre mot de passe. + Entrer un mot de passe. - Entrez le port d'écoute du protocole choisi + Entrer le port d'écoute du protocole choisi. - Choisissez le protocole utilisé par mRemoteNG pour se connecter à l'hôte. + Choisir le protocole utilisé par mRemoteNG pour se connecter à l'hôte. - Sélectionnez une session PuTTY à utiliser lors de la connexion. + Sélectionner une session PuTTY à utiliser lors de la connexion. - Spécifie le nom de domaine fourni par l'utilisateur pour se connecter au serveur RD Gateway. + Spécifier le nom de domaine fourni par l'utilisateur pour se connecter au serveur RD Gateway. - Indiquer le nom d'hôte du serveur Remote Desktop Gateway. + Indiquer le nom d'hôte du serveur RD Gateway. - Spécifie quand utiliser un serveur Remote Desktop Gateway (RD Gateway). + Spécifier quand utiliser un serveur RD Gateway. - Spécifie de se connecter ou non à la passerelle en utilisant les mêmes identifiants que la connexion. + Spécifier de se connecter ou non à la passerelle en utilisant les mêmes identifiants que la connexion. - Spécifie le nom de domaine que l'utilisateur fourni pour se connecter au serveur RD Gateway. + Spécifier le nom de domaine que l'utilisateur fournit pour se connecter au serveur RD Gateway. - Choisissez si les lecteurs de disque locaux doivent être redirigés sur l'hôte distant. + Choisir si les lecteurs de disques locaux doivent être redirigés vers l'hôte distant. - Choisissez si les combinaisons de touches (par exemple, Alt-Tab) doivent être redirigées vers l'hôte distant. + Choisir si les combinaisons de touches (par exemple Alt-Tab) doivent être redirigées vers l'hôte distant. - Choisissez si les ports locaux doivent être redirigés sur l'hôte distant. + Choisir si les ports locaux doivent être redirigés vers l'hôte distant. - Choisissez si les imprimantes locales doivent être redirigées sur l'hôte distant. + Choisir si les imprimantes locales doivent être redirigées vers l'hôte distant. - Précisez si les cartes à puce doivent être disponibles sur l'hôte distant. + Choisir si les cartes à puce doivent être disponibles sur l'hôte distant. - Choisi de quelle manière les sons de l'hôte distant doivent être redirigés. + Choisir de quelle manière les sons de l'hôte distant doivent être redirigés. - Choisi quel moteur de rendu disponible sera utilisé pour afficher du HTML. + Choisir quel moteur de rendu disponible sera utilisé pour afficher du HTML. - Choisi la résolution ou le mode pour lesquels la connexion sera ouverte. + Choisir la résolution ou le mode pour lesquels la connexion sera ouverte. - Sélectionnez le mode de Taille Intelligente à utiliser. + Sélectionner le mode de taille intelligente à utiliser. Connexion à la console de l'hôte distant. - Utilisez les informations d'identification Security Support Provider (CredSSP) pour l'authentification si elle est disponible. + Utiliser les informations d'identification Security Support Provider (CredSSP) pour l'authentification si disponibles. - N'hésitez pas à entrer toutes les informations dont vous avez besoin ici. + Entrer toutes les informations dont vous avez besoin ici. - Entrez votre nom d'utilisateur. + Entrer le nom d'utilisateur. - Si vous souhaitez établir une vue uniquement de l'hôte distant, sélectionnez oui. + Si vous souhaitez établir une vue uniquement de l'hôte distant, sélectionnez Oui. - Entrez l'adresse du proxy à utiliser. + Entrer l'adresse du proxy à utiliser. - Entrez votre mot de passe pour l'authentification contre le proxy. + Entrer le mot de passe pour l'authentification au proxy. - Entrez le port d'écoute du serveur proxy + Entrer le port d'écoute du serveur proxy. Si vous utilisez un proxy pour tunneler vos connexions VNC, sélectionnez son type. - Entrez votre nom d'utilisateur pour vous authentifier sur le proxy. + Entrer le nom d'utilisateur pour vous authentifier sur le proxy. Nom d'hôte / IP @@ -1094,7 +996,7 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Tous - Serveur d'authentification + Niveau d'authentification Mode d'authentification @@ -1112,13 +1014,13 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Description - Afficher le Thème + Afficher les thèmes - Afficher le Fond d'écran + Afficher le fond d'écran - Composition du bureau + Activer la composition du bureau Lissage des polices @@ -1126,14 +1028,11 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Encodage - - Niveau de cryptage - Outil externe - Outil Externe Après + Outil externe après Outil externe avant @@ -1157,22 +1056,22 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Session PuTTY - Domaine de la Passerelle + Domaine de la passerelle RDP - Nom d'Hôte de la Passerelle + Nom d'hôte de la passerelle RDP - Mot de passe pour la Passerelle RDP + Mot de passe de la passerelle RDP - Utiliser Gateway + Utilisation de la passerelle RDP - Identifiant pour la Passerelle + Utiliser les informations de connexion pour l'identification à la passerelle RDP - Nom d'utilisateur pour la Passerelle RDP + Nom d'utilisateur de la passerelle RDP Lecteurs de disque @@ -1186,9 +1085,6 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Imprimantes - - Cartes à puce - Sons @@ -1202,7 +1098,7 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Mode SmartSize - Utilisez la session console + Utiliser la session console Utiliser CredSSP @@ -1211,54 +1107,53 @@ Si vous rencontrez une erreur, créez un nouveau fichier de connexion s'il vous Champ utilisateur - Adresse proxy + Adresse du proxy - Mot de passe du Proxy + Mot de passe du proxy - Port du Proxy + Port du proxy - Type de proxy + Type du proxy - Nom d'utilisateur du Proxy + Nom d'utilisateur du proxy - Évènement de Protocole Déconnecté. -Message: -{0} + Évènement de déconnexion du protocole. Hôte : "{1}" ; Protocole : "{2}" ; Message : "{0}" - Échec de Déconnexion du Protocole d’Évènement. {0} + Évènement d'échec de déconnexion du protocole. +{0} Protocole à importer - Le test du proxy a échoué ! + Test du proxy échoué ! - Test du Proxy réussi ! + Test du proxy réussi ! - Échec de l'arrêt du processus Putty ! + Échec de l'arrêt du processus PuTTY ! Impossible de définir le focus ! - Handle Putty : {0} + Prise en charge de PuTTY : {0} - Échec de la fermeture du processus Putty ! + Échec de la fermeture forcée du processus PuTTY ! - Handle Panneau : {0} + Prise en charge du panneau : {0} - Échec du redimensionnement de Putty ! + Échec du redimensionnement du processus PuTTY ! Sessions PuTTY sauvegardées @@ -1267,7 +1162,7 @@ Message: Paramètres de PuTTY - Échec de l'affichage de la fenêtre de paramètres de Putty ! + Échec de l'affichage de la fenêtre des paramètres de PuTTY ! --- Outils PuTTY --- @@ -1282,19 +1177,19 @@ Message: Connexion rapide - Échec de l'ajout de connexion rapide ! + Échec de l'ajout d'une connexion rapide ! - La connexion rapide à échouée + La connexion rapide a échoué &M'avertir lors de la fermeture des connexions - M'avertir uniquement lorsque mRemoteNG se f&erme + M'avertir uniquement à la f&ermeture de mRemoteNG - M'avertir seulement lors de la fermeture de connexions &multiples + M'avertir uniquement lors de la fermeture de connexions &multiples &Ne pas m'avertir lors de la fermeture des connexions @@ -1321,34 +1216,34 @@ Message: 65536 couleurs (16 bits) - Impossible de lancer une connexion RDP, vérifiez les prérequis mRemoteNG. + Impossible de lancer une connexion RDP. Vérifiez les prérequis mRemoteNG. - Désactiver le curseur clignotant + Désactiver le clignotement du curseur - Désactiver l'Ombre du pointeur + Désactiver l'ombre du curseur - Désactiver le glissement de fenêtre complet + Désactiver le glissement de la fenêtre complète Désactiver les animations du menu - Échec de Déconnexion RDP, tentative d'arrêt en cours ! + Échec de la déconnexion RDP. Tentative d'arrêt en cours ! - Code d'erreur interne 1. + Code d'erreur RDP 1. - Code d'erreur interne 2. + Code d'erreur RDP 2. - Code d'erreur interne 3. Ce n'est pas un état valide. + Code d'erreur RDP 3. - Code d'erreur interne 4. + Code d'erreur RDP 4. Une erreur irrécupérable s'est produite lors de la connexion au client. @@ -1363,22 +1258,22 @@ Message: Une erreur inconnue s'est produite. - Une erreur de création de fenêtre a été commise. + Une erreur de création de fenêtre s'est produite. - Erreur d'initialisation de Winsock. + Une erreur d'initialisation de Winsock s'est produite. Ajuster au panneau - Échec de RDP Focus ! + Échec du focus RDP ! - La passerelle Bureau à distance est prise en charge. + La passerelle RDP est prise en charge. - La passerelle Bureau à distance n'est pas prise en charge ! + La passerelle RDP n'est pas prise en charge ! Nombre de reconnexions RDP : @@ -1390,7 +1285,7 @@ Message: Échec de RDP SetUseConsoleSession ! - Configuration du basculement de console pour RDC {0}. + Configuration du basculement de la console pour RDP {0}. Échec de RDP SetCredentials ! @@ -1411,25 +1306,22 @@ Message: Échec de RDP SetProps ! - Échec de Rdp Set Redirection ! + Échec de RDP SetRedirection ! - Échec de Rdp Set Redirect Keys ! + Échec de RDP SetRedirectKeys ! Échec de RDP SetResolution ! - - Taille intelligente - - Apporter à cet ordinateur + Transférer le son vers cet ordinateur - Ne pas jouer + Ne pas lire - Laisser à un ordinateur distant + Sortir le son sur l'ordinateur distant Échec de RDP ToggleFullscreen ! @@ -1440,14 +1332,11 @@ Message: Reconnecter les sessions ouvertes au démarrage - - Actualiser - Fichier distant - Supprimer tout + Tout supprimer Renommer @@ -1459,13 +1348,13 @@ Message: Enregistrer - Enregistrer tout + Tout enregistrer Souhaitez-vous enregistrer le fichier actuel de connexions avant d'en charger un autre ? - Enregistrer les connexions à la sortie + Enregistrer les connexions à la fermeture Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png @@ -1474,40 +1363,40 @@ Message: Écran - Captures d'écran + Capture d'écran Captures d'écran - Rechercher + Invite de recherche - Envoyer à ... + Envoyer à... Utiliser le nom d'hôte comme nom affiché lors de la création ou le renommage de connexions - Échec de sauvegarde des paramètres ou de suppression de l'Icône de la Barre des tâches ! + Échec de sauvegarde des paramètres ou de suppression de l'icône de la barre des tâches ! - Afficher la description des info-bulles dans l'arborescence + Afficher des info-bulles avec les descriptions dans l'arborescence Afficher le chemin d'accès complet du fichier de connexions dans le titre de la fenêtre - Afficher les informations de connexion dans le nom des onglets + Afficher les informations de connexion dans le titre des onglets - Afficher le protocole dans le nom de l'onglet + Afficher le protocole dans le titre des onglets - Un simple clic sur une connexion l'ouvre + Un simple clic sur une connexion ouvre celle-ci - Un simple clic sur une connexion ouverte nous renvoie dessus + Un simple clic sur une connexion ouverte affiche l'onglet correspondant Socks 5 @@ -1516,13 +1405,13 @@ Message: Trier - Croissant (AZ) + Croissant (A-Z) - Décroissant (ZA) + Décroissant (Z-A) - Consultez l'aide - Getting started - SQL Configuration pour plus d'informations ! + Consulter l'aide - Démarrage rapide - Configuration SQL - pour plus d'informations ! SQL Server @@ -1552,13 +1441,13 @@ Message: Statut - Se déplacer sur le panneau des Notifications : + Se rendre sur le panneau des notifications : - Avancée + Avancé - Onglets && Panneaux + Onglets && panneaux Mises à jour @@ -1591,34 +1480,35 @@ Message: Essayer d'intégrer - Ultra VNC Repeater + UltraVNC Repeater Port UltraVNC SingleClick : - Décochez les propriétés que vous souhaitez ne pas être enregistrée ! + Décocher les propriétés que vous ne souhaitez pas enregistrer ! - mRemoteNG nécessite une mise à jour + Une mise à jour est disponible pour mRemoteNG mRemoteNG peut se connecter périodiquement sur le site mRemoteNG pour vérifier les mises à jour. - La vérification de la fin de mise à jour a échouée ! + Le téléchargement des informations de mise à jour a échoué. - Téléchargement terminé ! mRemoteNG va se fermer et l'installation va commencer. + Téléchargement terminé ! +mRemoteNG va se fermer et l'installation va commencer. - Téléchargement échoué ! + Le téléchargement de la mise à jour a échoué. - Le téléchargement de la mise à jour a échoué ! + Le téléchargement de la mise à jour a échoué. - Chaque {0} jours + Tous les {0} jours Quotidien @@ -1630,19 +1520,19 @@ Message: Hebdomadaire - Utilisez d'autres nom d'utilisateur et mot de passe + Utiliser des noms d'utilisateur et mots de passe différents Utilisateur - Utilisez les mêmes nom d'utilisateur et mot de passe + Utiliser les mêmes noms d'utilisateur et mots de passe Utiliser une carte à puce - Utilisez SQL Server pour charger && enregistrer les connexions + Utiliser SQL Server pour charger et enregistrer les connexions Version @@ -1651,25 +1541,25 @@ Message: VNC - VNC déconnexion échouée ! + Déconnexion de VNC échouée ! - Le rafraîchissement de l'écran VNC a échoué ! + Échec du rafraîchissement de l'écran VNC ! - VNC SendSpecialKeys a échoué ! + Échec de VNC SendSpecialKeys ! - Échec de VNC Set Event Handlers ! + Échec de VNC SetEventHandlers ! - Échec de VNC Set Props ! + Échec de VNC SetProps ! - Toggle VNC SmartSize échoué ! + Échec de VNC ToggleSmartSize ! - Échec de VNC Toggle ViewOnly ! + Échec de VNC ToggleViewOnly ! M'avertir si l'authentification échoue @@ -1683,4 +1573,584 @@ Message: Crédits + + Démarrer minimisé + + + Fermer vers la zone de notification + + + &Exporter vers le fichier... + + + &Démarrer + + + &Réessayer + + + Active Directory + + + Ajouter + + + Options de sécurité avancées + + + Toujours afficher les onglets des connexions + + + Appliquer + + + Capture audio + + + Redimensionner automatiquement + + + Historique des modifications + + + Sélectionner un chemin pour le fichier de log de mRemoteNG + + + Sélectionner un chemin + + + Effacer la chaîne de recherche + + + Presse-papiers + + + &Ouvrir un fichier de connexions + + + Tous les fichiers importables + + + Une erreur est survenue lors de l'import du fichier "{0}". + + + Une exception non gérée s'est produite + + + Les deux mots de passe doivent correspondre. + + + Impossible de créer le thème : le libellé existe déjà ou des caractères spéciaux sont présents dans le nom + + + Impossible de glisser-déposer un noeud sur lui-même. + + + Favori + + + Favoris + + + Utiliser les paramètres par défaut + + + UltraVNC SingleClick + + + Entrer le nouveau nom du thème + + + Titre + + + Délai d'expiration [secondes] + + + Ce noeud n'est pas sélectionnable pour glisser-déposer. + + + Cette exception va forcer la fermeture de mRemoteNG + + + Le mot de passe doit faire au minimum 3 caractères. + + + En cours de test... + + + Test de la connexion + + + Tester les paramètres + + + Tester la connexion + + + Démarrer un programme / un shell alternatif + + + Démarrer un programme + + + Pile d'appels + + + En dehors de l'index + + + Dynamique + + + Quitter {0} + + + Qualité du son + + + Multi SSH : + + + Barre d'outils multi SSH + + + Répertoire de travail : + + + Répertoire de travail + + + Fenêtre + + + Proxy + + + Popups + + + PowerShell + + + SmartCard + + + VM ID + + + Utiliser le VM ID + + + Utiliser le mode amélioré + + + Traquer la connexion active dans l'arborescence des connexions + + + Ce noeud est déjà présent dans ce dossier. + + + Tunnel SSH + + + Options SSH + + + Afficher/masquer les menus + + + Afficher dans la barre d'outils + + + Utiliser un chemin de fichier personnalisé + + + Le fichier de connexions est introuvable. + + + Sécurité + + + Enregistrer les connexions après chaque modification + + + Démarrer avec des privilèges élevés + + + Canal stable + + + Lecture seule : + + + Version RDP + + + Minutes avant la veille + + + Une erreur du protocole de connexion s'est produite. Hôte : "{1}" ; Code d'erreur : "{2}" ; Description de l'erreur : "{0}" + + + Exception non gérée mRemoteNG + + + Message de l'exception + + + Supprimer + + + Tout déconnecter sauf cet onglet + + + Déconnecter les onglets à droite + + + Reconnecter toutes les connexions + + + Doit être entre 0 et 255 + + + Options mRemoteNG + + + Verrouiller la position de la barre d'outils + + + Connexion réussie + + + Le serveur '{0}' n'était pas accessible. + + + Importer un fichier existant + + + Base de données '{0}' indisponible. + + + Identification échouée pour l'utilisateur '{0}'. + + + Avertissement : un redémarrage est nécessaire pour prendre en compte les modifications apportées aux thèmes. + + + Nouveau nom du thème + + + Copier le nom d'hôte + + + Edge Chromium + + + Environnement + + + Ne pas supprimer les espaces dans les noms d'utilisateurs + + + Créer un panneau vide au démarrage de mRemoteNG + + + Licence + + + Informations de connexion + + + Informations de connexion non disponibles + + + Télécharger + + + Moteur de chiffrage + + + Débugage + + + Tout exporter + + + Exporter le fichier + + + Exporter les éléments + + + Test de chiffrage + + + Exporter les propriétés + + + &Format de fichier : + + + Téléchargement terminé ! + + + Exporter la connexion sélectionnée + + + Exporter le dossier sélectionné + + + Construction de l'URL à charger échouée + + + Haut + + + HTTP + + + HTTPS + + + Importer depuis le &fichier... + + + Internet Explorer + + + Itérations de la fonction de clé de dérivation + + + Impossible de glisser le noeud parent sur l'enfant. + + + Créer un nouveau fichier de connexions + + + Filtrer les résultats de la recherche dans l'arborescence des connexions + + + Charger les informations de répartition + + + Logger vers le répertoire de l'application + + + Logger les types de messages suivants + + + Chemin du fichier de log + + + Moyen + + + CSV mRemoteNG + + + Mot de passe mRemoteNG pour {0} + + + XML mRemoteNG + + + Nouvel outil externe + + + Ouvrir un fichier différent + + + Ouvrir un fichier + + + Scan des ports terminé. + + + Appuyer sur ENTRER pour envoyer. Ctrl+C est envoyé immédiatement. + + + Placer la barre de recherche au-dessus de l'arborescence des connexions + + + Ne pas se connecter à la session console + + + L'historique des changements n'a pas pu être téléchargé. + + + Les informations de connexion n'ont pas pu être chargées depuis SQL Server. + + + L'ID de la machine virtuelle Hyper-V à laquelle se connecter. + + + PuTTY n'a pas pu être démarré. + + + Afficher sur la colonne de la barre d'outils + + + Afficher les types de messages suivants + + + Afficher cette connexion dans le menu des favoris. + + + La longueur du mot de passe doit être entre {0} et {1} + + + Le mot de passe doit contenir au minimum {0} caractère(s) minuscule(s) + + + Le mot de passe doit contenir au minimum {0} caractère(s) numérique(s) + + + Le mot de passe doit contenir au minimum {0} caractères suivants : {1} + + + Le mot de passe doit contenir au minimum {0} caractère(s) majuscule(s) + + + Une erreur s'est produite en tentant de changer la résolution de l'hôte '{0}' + + + Log en cours + + + Délai d'expiration de la connexion RDP + + + Se connecter sans informations de connexion + + + Fichiers du gestionnaire de connexions PuTTY + + + Fichiers Remote Desktop Connection Manager (*.rdg) + + + Informations de connexion assignées + + + Impossible de trouver l'outil externe "{0}" + + + Détermine si l'ombre du curseur doit être visible. + + + Détermine si le clignotement du curseur doit être désactivé. + + + Le canal stable ne concerne que les versions finalisées. +Le canal preview inclut les versions beta et release candidates. +Le canal nightly inclut les versions alpha, beta et release candidates. + + + Une erreur s'est produite en tentant de se reconnecter à l'hôte RDP '{0}' + + + Voulez-vous vraiment supprimer les informations de connexion {0} ? + + + Bloquer le mode de chiffrement + + + Se connecter en visualisation seulement + + + Création WebView2 échouée avec une exception + + + Utiliser le VM ID pour se connecter à la machine virtuelle en fonctionnement sur Hyper-V. + + + Utiliser l'encodage UTF-8 pour la propriété RDP "Load Balance Info" + + + Le paramètre de sécurité Windows "Utiliser des algorithmes compatibles FIPS pour le chiffrement, le hachage et la signature" est activé. + +Voir l'article de support Microsoft http://support.microsoft.com/kb/811833 pour plus d'informations. + +{0} n'est pas totalement compatible avec FIPS. Cliquer sur OK pour poursuivre à vos risques et périls ou Annuler pour quitter. + + + Voulez-vous vraiment fermer toutes les connexions à l'exception de "{0}" ? + + + Sélectionner la qualité audio fournie par le protocole : dynamique, moyenne, élevée + + + Se connecter à un hôte Hyper-V avec le mode amélioré activé. + + + Impossible de créer un client RDP. La version du protocole RDP {0} n'est pas supportée sur cette machine. Veuillez choisir une ancienne version du protocole. + + + Détermine si les menus et fenêtres doivent être affichés avec des animations dans la session à distance. + + + Détermine si le contenu de la fenêtre est affiché lors du glisser-déposer vers un autre emplacement. + + + Voulez-vous vraiment supprimer le thème ? + + + Le chiffrement de {0} entrée(s) en utilisant {1}/{2} et {3} itérations a duré {4} secondes. + + + Importer les sub OUs + + + Sélectionner si le presse-papiers doit être partagé. + + + Sélectionner si le périphérique d'entrée audio par défaut sur la machine distance doit être redirigé vers cet ordinateur. + + + Sélectionner de redimensionner automatiquement la connexion quand la fenêtre est redimensionnée ou lorsque le mode plein écran est activé. +Nécessite RCD 8.0 ou postérieur. + + + Pour les connexions à travers un tunnel SSH, spécifier la connexion SSH à utiliser pour établir le tunnel SSH. + + + Choisir de recevoir une alerte lors de la déconnexion de la session RDP pour cause d'inactivité + + + Spécifier un mot de passe pour chiffrer le fichier de connexions. Ce mot de passe vous sera demandé au démarrage de mRemoteNG. + + + Spécifier la version de RDP à utiliser pour ouvrir les connexions. + + + Spécifier les informations de répartition de charge à utiliser par les routeurs pour choisir le meilleur serveur. + + + Spécifier le mot de passe du serveur Remote Desktop Gateway. + + + Préciser ici les options additionnelles à utiliser pour les connexions SSH. Se reporter à la documentation PuTTY pour plus de détails. + + + Problème de configuration du tunnel SSH. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. Une connexion de tunnel SSH a été trouvée dans l'arborescence mais le protocole n'est pas dérivé de PuTTY. Vérifiez que la connexion de tunnel SSH utilise bien le protocole SSH. + + + Problème de configuration du tunnel SSH. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. Aucune connexion de tunnel SSH utilisant le protocole SSH 1 ou 2 n'a été trouvée dans l'arborescence. Supprimez le tunnel SSH ou spécifiez un tunnel SSH existant. + + + Problème de configuration du tunnel SSH. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. Le processus PuTTY s'est terminé. Vérifiez d'éventuels problèmes avec la connexion de tunnel SSH. + + + Problème de configuration du tunnel SSH. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. La connexion SSH a échoué. Vérifiez d'éventuels problèmes avec la connexion de tunnel SSH. + + + Expiration du délai pour la connexion au tunnel SSH. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. Le port du tunnel local n'as pas répondu à temps. Vérifiez d'éventuels problèmes avec la connexion de tunnel SSH. + + + Initialisation du tunnel SSH échouée. La connexion vers : "{0}" via le tunnel SSH : "{1}" est impossible. La connexion SSH n'a pas pu être initialisée. Vérifiez d'éventuels problèmes avec la connexion de tunnel SSH. + + + Nombre de minutes pendant lesquelles laisser la session RDP en veille avant déconnexion (utiliser 0 pour ne pas mettre de limite) + \ No newline at end of file diff --git a/mRemoteNG/Resources/Language/Language.hu.resx b/mRemoteNG/Language/Language.hu.resx similarity index 96% rename from mRemoteNG/Resources/Language/Language.hu.resx rename to mRemoteNG/Language/Language.hu.resx index 19061f06b..bfc1adc7e 100644 --- a/mRemoteNG/Resources/Language/Language.hu.resx +++ b/mRemoteNG/Language/Language.hu.resx @@ -198,9 +198,6 @@ Az ellenőrzés sikertelen! - - Az ellenőrzés sikeres! - Többé ne mutasd ezt az üzenetet. @@ -222,9 +219,6 @@ Kapcsolatok - - Telepített verzió - Ne kapcsolódj sikertelen hitelesítéskor @@ -279,9 +273,6 @@ Frissítés keresése - - Ugrás - Külső eszköz indítása @@ -303,12 +294,6 @@ Újrakapcsolódás - - Kapcsolat átnevezése - - - Könyvtár átnevezése - Fül átnevezése diff --git a/mRemoteNG/Resources/Language/Language.it.resx b/mRemoteNG/Language/Language.it.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.it.resx rename to mRemoteNG/Language/Language.it.resx index b63ce8b2c..4ac931eed 100644 --- a/mRemoteNG/Resources/Language/Language.it.resx +++ b/mRemoteNG/Language/Language.it.resx @@ -240,46 +240,6 @@ Controllo fallito! - - Controllo riuscito! - - - ICA richiede che il plugin XenDesktop Online sia installato e che la libreria wfica.ocx sia registrata. Il client è scaricabile all'indirizzo http://www.citrix.com/download/ -Se il plugin XenDesktop Online è installato ma il controllo fallisce, provare a registrare wfica.ocx manualmente. Aprire la finestra "Esegui" (WIN+R) ed inserire il testo: regsvr32 "C:\Programmi\Citrix\ICA Client\wfica.ocx" (dove C:\Programmi\Citrix\ICA Client\ è il percorso di installazione del plugin XenDesktop Online). -Se il controllo fallisce e risulta impossibile utilizzare ICA con mRemoteNG, per favore consulta il forum di mRemoteNG all'indirizzo http://forum.mremoteng.org/ - - - Tutti i componenti ICA sono stati installati e sembrano registrati correttamente. -Citrix ICA Client Control versione {0} - - - non installato correttamente - - - I protocolli SSH, Relnet, Rlogin e RAW richiedono PuTTY per funzionare. PuTTY è fornito insieme al pacchetto mRemoteNG ed è situato nel percorso di installazione. -Assicurarsi che Putty.exe sia contenuto nella cartella mRemoteNG (default: C:\Programmi\mRemoteNG\) oppure che il percorso PuTTY specificato nelle opzioni (Strumenti - Opzioni - Avanzate - Percorso PuTTY personalizzato) sia valido. - - - L'eseguibile PuTTY è stato trovato e dovrebbe essere pronto per l'uso. - - - Per fare funzionare RDP correttamente è necessario avere installato Remote Desktop Connection (Terminal Services Client) versione 8.0, disponibile all'indirizzo https://support.microsoft.com/kb/2592687/it -Se RDP 8.0 è installato e questo controllo fallisce, tentare di registrare mstscax.dll manualmente. Aprire la schermata "Esegui" (combinazione tasti WIN+R) ed inserire il seguente testo: regsvr32 "C:\Windows\System32\mstscax.dll" -Se il problema con RDP persiste consultare il forum di mRemoteNG all'indirizzo http://forum.mremoteng.org/ - - - Tutti i componenti RDP sono stati rilevati e sembrano registrati correttamente. -Remote Desktop Connection Control versione {0} - - - VNC richiede che VncSharp.dll sia presente nella cartella del programma mRemoteNG. -Per favore assicurarsi che il file VncSharp.dll sia presente nella cartella del programma mRemoteNG (solitamente C:\Programmi\mRemoteNG\). -Se risulta ancora impossibile utilizzare VNC con mRemoteNG, contattare il forum all'indirizzo http://forum.mremoteng.org/ - - - Tutti i componenti VNC sono stati rilevati e sembrano registrati correttamente. -VncSharp Control versione {0} - Prova a riconnettersi automaticamente quando disconnesso (solo RDP ed ICA) @@ -337,9 +297,6 @@ VncSharp Control versione {0} Impossibile processare i parametri da linea di comando! - - Controllo componenti - btnIcon_Click fallito! @@ -449,9 +406,6 @@ Creazione di un nuovo file delle connessioni. Impossibile creare un nuovo file delle connessioni! - - Versione installata - Rileva @@ -473,15 +427,6 @@ Creazione di un nuovo file delle connessioni. Quando i campi "Nome utente", "Password" o "Dominio" sono vuoti, utilizza i seguenti: - - 128-bit - - - 128-bit (solo accesso) - - - Base - Crittografa completamente il file delle connessioni @@ -581,24 +526,6 @@ Creazione di un nuovo file delle connessioni. Impostazione delle proprietà HTTP fallita! - - Impossibile creare una nuova connessione ICA! - - - Caricamento del plugin ICA fallito! - - - ICA SetCredentials fallito! - - - ICA Set Event Handlers fallito! - - - ICA Set Props fallito! - - - ICA Set Resolution fallito! - Aggiungi il prefisso "Quick:" alle schede di connessioni rapide @@ -638,9 +565,6 @@ Creazione di un nuovo file delle connessioni. Alla chiusura delle connessioni: - - &Connetti: - Nome visualizzato @@ -710,9 +634,6 @@ Creazione di un nuovo file delle connessioni. Pannelli di connessione - - Connessioni e configurazione - Copia @@ -722,24 +643,12 @@ Creazione di un nuovo file delle connessioni. Ctrl-Esc - - Elimina connessione... - Elimina applicazione esterna... - - Elimina cartella... - Effettua una donazione - - Duplica connessione - - - Duplica cartella - Duplica tab @@ -758,9 +667,6 @@ Creazione di un nuovo file delle connessioni. Guida di mRemoteNG - - Vai a - Esegui applicazione esterna @@ -797,12 +703,6 @@ Creazione di un nuovo file delle connessioni. Aggiorna lo schermo (VNC) - - Rinomina connessione - - - Rinomina cartella - Rinomina tab @@ -974,9 +874,6 @@ Creazione di un nuovo file delle connessioni. Seleziona la modalità di codifica da utilizzare. - - Seleziona il livello di crittografia dell'host remoto. - Seleziona l'applicazione esterna da avviare. @@ -1121,9 +1018,6 @@ Creazione di un nuovo file delle connessioni. Codifica - - Livello di crittografia - Applicazione esterna @@ -1181,9 +1075,6 @@ Creazione di un nuovo file delle connessioni. Stampanti - - Smart card - Audio @@ -1412,9 +1303,6 @@ Messaggio: RDP SetResolution fallito! - - SmartSize - Portare su questo computer @@ -1433,9 +1321,6 @@ Messaggio: All'avvio, riconnetti alle sessioni precentemente aperte - - Aggiorna - File remoto diff --git a/mRemoteNG/Resources/Language/Language.ja-JP.resx b/mRemoteNG/Language/Language.ja-JP.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.ja-JP.resx rename to mRemoteNG/Language/Language.ja-JP.resx index 081939eba..277722fb9 100644 --- a/mRemoteNG/Resources/Language/Language.ja-JP.resx +++ b/mRemoteNG/Language/Language.ja-JP.resx @@ -248,48 +248,6 @@ 確認に失敗しました - - Check succeeded! - - - ICA requires that the XenDesktop Online Plugin is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/ -If you have the XenDesktop Online Plugin installed and the check still fails, try to register wfica.ocx manually. -To do this open up the run dialog (Start - Run) and enter the following: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (Where c:\Program Files\Citrix\ICA Client\ is the path to your XenDesktop Online Plugin installation). -If you are still not able to pass this check or use ICA in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/" - - - All ICA components were found and seem to be registered properly. -Citrix ICA Client Control Version {0} - - - 正しくインストールされていません - - - The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path. -Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path) - - - The PuTTY executable was found and should be ready to use. - - - - For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services) Client 6.0 installed. You can download it here: http://support.microsoft.com/kb/925876 -If this check still fails or you are unable to use RDP, please consult the mRemoteNG Forum at http://forum.mremoteng.org/. - - - - All RDP components were found and seem to be registered properly.　 -Remote Desktop Connection Control Version {0} - - - VNC requires VncSharp.dll to be located in your mRemoteNG application folder. -Please make sure that you have the VncSharp.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\). -If you are still not able to pass this check or use VNC in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/ - - - All VNC components were found and seem to be registered properly. -VncSharp Control Version {0} - Automatically try to reconnect when disconnected from server (RDP && ICA only) @@ -365,9 +323,6 @@ VncSharp Control Version {0} 互換性の問題が検出されました - - コンポーネントの確認 - btnIcon_Clickがエラーを発生しました @@ -486,9 +441,6 @@ Starting with new connections file. Could not find ToolStrip control in FilteredPropertyGrid. - - バージョン - 検出する @@ -513,21 +465,6 @@ Starting with new connections file. For empty Username, Password or Domain fields use: - - 128ビット - - - 128-bit (logon only) - - - 40ビット - - - 56ビット - - - Basic - 接続設定ファイルをすべて暗号化する @@ -678,27 +615,6 @@ Starting with new connections file. Set HTTP Props failed! - - ICA - - - Couldn't create new ICA Connection! - - - Loading ICA Plugin failed! - - - ICA SetCredentials failed! - - - ICA Set Event Handlers Failed! - - - ICA Set Props Failed! - - - ICA Set Resolution Failed! - Identify quick connect tabs by adding the prefix "Quick:" @@ -708,9 +624,6 @@ Starting with new connections file. ファイル「{0}」のインポート中にエラーが発生しました - - インポートに失敗しました - ファイルからインポート...(&F) @@ -747,9 +660,6 @@ Starting with new connections file. 切断時： - - 接続(&C)： - ディスプレイ名 @@ -825,9 +735,6 @@ Starting with new connections file. 接続表示パネル - - 接続と設定 - コピー @@ -837,24 +744,12 @@ Starting with new connections file. Ctrl-Esc - - 接続を削除... - 外部ツールを削除... - - フォルダを削除... - 寄付のお願い - - 接続を複製する - - - フォルダを複製する - タブを複製する @@ -873,9 +768,6 @@ Starting with new connections file. mRemoteNGヘルプ - - 移動先 - 外部ツールの立ち上げ @@ -912,12 +804,6 @@ Starting with new connections file. スクリーンを更新する (VNC) - - 接続名を変更 - - - フォルダ名を変更 - タブ名を変更 @@ -1115,9 +1001,6 @@ If you run into such an error, please create a new connection file! Select the encoding mode to be used. - - Select the encryption strength of the remote host. - Select the external tool to be started. @@ -1270,9 +1153,6 @@ If you run into such an error, please create a new connection file! エンコード - - Encryption Strength - 外部ツール @@ -1333,9 +1213,6 @@ If you run into such an error, please create a new connection file! プリンター - - スマートカード - サウンド @@ -1569,9 +1446,6 @@ Message: RDP SetResolution failed! - - Smart Size - このコンピューターで再生 @@ -1591,9 +1465,6 @@ Message: 起動時に前セッション時の接続を開始する Reconnect to previously opened sessions on startup - - 更新 - 遠隔ファイル @@ -1768,9 +1639,6 @@ Message: The update information could not be downloaded. - - 更新を確認しています… - ダウンロードが終了しました mRemoteNGを終了してインストールを開始します diff --git a/mRemoteNG/Resources/Language/Language.ko-KR.resx b/mRemoteNG/Language/Language.ko-KR.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.ko-KR.resx rename to mRemoteNG/Language/Language.ko-KR.resx index ff1b4a7e0..06586bdcf 100644 --- a/mRemoteNG/Resources/Language/Language.ko-KR.resx +++ b/mRemoteNG/Language/Language.ko-KR.resx @@ -246,46 +246,6 @@ 검사 실패! - - 검사 성공! - - - ICA를 사용하려면 XenDesktop Online Plugin이 설치되어 있고 wfica.ocx 라이브러리가 등록되어 있어야합니다. 클라이언트는 http://www.citrix.com/download/에서 다운로드 할 수 있습니다. -XenDesktop Online Plugin이 설치되어 있고 검사가 여전히 실패하면 wfica.ocx를 수동으로 등록 해보십시오. -이렇게하려면 실행 대화 상자 (시작 - 실행)를 열고 다음을 입력하십시오. regsvr32 "c : ₩ Program Files ₩ Citrix ₩ ICA Client ₩ wfica.ocx"(여기서 c : \ Program Files \ Citrix \ ICA Client \는 XenDesktop Online Plugin 설치 경로). -그래도이 수표를 통과하거나 mRemoteNG에서 ICA를 사용할 수 없다면 mRemoteNG 포럼 (http://forum.mremoteng.org/)을 참조하십시오. - - - 모든 ICA 구성 요소가 발견되어 제대로 등록 된 것으로 보입니다. -Citrix ICA 클라이언트 제어 버전 {0} - - - 제대로 설치가 되어 있지 않습니다. - - - SSH, Telnet, Rlogin 및 RAW 프로토콜은 PuTTY가 작동해야합니다. PuTTY는 모든 mRemoteNG 패키지와 함께 제공되며 설치 경로에 있습니다. -putty.exe가 mRemoteNG 디렉토리 (기본값 : c : \ Program Files \ mRemoteNG \)에 있거나 PuTTY 실행 파일의 유효한 경로를 옵션 (도구 - 옵션 - 고급 - 사용자 정의 PuTTY)에 지정했는지 확인하십시오 통로) - - - PuTTY 실행 파일을 찾았으므로 사용할 준비가되었습니다. - - - RDP가 제대로 작동하려면 적어도 원격 데스크톱 연결 (터미널 서비스) 클라이언트 8.0이 설치되어 있어야합니다. 다음 사이트에서 다운로드 할 수 있습니다. http://support.microsoft.com/kb/925876 -이 검사가 여전히 실패하거나 RDP를 사용할 수없는 경우 mRemoteNG 포럼 (http://forum.mremoteng.org/)을 참조하십시오. - - - 모든 RDP 구성 요소가 발견되어 제대로 등록 된 것으로 보입니다. -원격 데스크톱 연결 제어 버전 {0} - - - VNC를 사용하려면 mRemoteNG 응용 프로그램 폴더에 VncSharp.dll이 있어야합니다. -mRemoteNG 응용 프로그램 폴더 (일반적으로 C : \ Program Files \ mRemoteNG \)에 VncSharp.dll 파일이 있는지 확인하십시오. -그래도 확인을 통과 할 수 없거나 mRemoteNG에서 VNC를 사용할 수 없다면 mRemoteNG 포럼 (http://forum.mremoteng.org/)에 문의하십시오. - - - 모든 VNC 구성 요소가 발견되어 제대로 등록 된 것으로 보입니다. -VncSharp 제어 버전 {0} - 서버와의 연결이 끊어지면 자동으로 다시 연결을 시도합니다 (RDP && ICA 만 해당). @@ -370,9 +330,6 @@ VncSharp 제어 버전 {0} 비활성으로 인해 RDP 세션 연결이 끊어진 후 알림 수신 여부 선택 - - 유휴 연결 끊김 경고 - 비밀번호는 {0} 이상의 문자를 포함해야합니다 : {1} @@ -460,9 +417,6 @@ VncSharp 제어 버전 {0} 호환성 문제 감지 - - 구성 요소 확인 - btnIcon_Click 실패! @@ -578,9 +532,6 @@ VncSharp 제어 버전 {0} FilteredPropertyGrid에서의 ToolStrip 컨트롤을 찾을 수 없습니다. - - 설치된 버전 - 검색 @@ -605,21 +556,6 @@ VncSharp 제어 버전 {0} 빈 사용자 이름, 비밀번호 또는 도메인 필드의 경우 다음을 사용 : - - 128 비트 - - - 128 비트 (로그온 만) - - - 40 비트 - - - 56 비트 - - - 기본 - 연결 파일을 완전히 암호화 @@ -770,27 +706,6 @@ VncSharp 제어 버전 {0} HTTP Props 설정에 실패! - - ICA - - - 새 ICA 연결을 생성할 수 없습니다. - - - ICA 플러그 인을 로드하지 못 했습니다! - - - ICA SetCredentials failed! - - - ICA Set Event Handlers Failed! - - - ICA Set Props Failed! - - - ICA Set Resolution Failed! - "빠른"접두어를 추가하여 빠른 연결 탭을 확인하십시오. @@ -800,9 +715,6 @@ VncSharp 제어 버전 {0} "{0}"파일을 가져 오는 중 오류가 발생했습니다. - - 가져 오기 실패 - 파일에서 가져 오기(&F) ... @@ -839,9 +751,6 @@ VncSharp 제어 버전 {0} 연결을 닫을 때 : - - 연결(&C) - 표시 이름 @@ -914,9 +823,6 @@ VncSharp 제어 버전 {0} 연결 패널 - - 연결 및 구성 - 복사 @@ -926,24 +832,12 @@ VncSharp 제어 버전 {0} Ctrl-Esc - - 연결 삭제 ... - 외부 도구를 삭제 ... - - 폴더 삭제 ... - 기부 - - 중복 연결 - - - 중복 폴더 - 중복 탭 @@ -962,9 +856,6 @@ VncSharp 제어 버전 {0} mRemoteNG 도움말 - - 바로 가기 - 외부 도구 실행 @@ -1001,12 +892,6 @@ VncSharp 제어 버전 {0} 화면 새로 고침 (VNC) - - 연결 이름 바꾸기 - - - 폴더 이름 바꾸기 - 탭 이름 바꾸기 @@ -1200,9 +1085,6 @@ VncSharp 제어 버전 {0} 사용할 인코딩 모드를 선택하십시오. - - 원격 호스트의 암호화 강도를 선택하십시오. - 시작할 외부 도구를 선택하십시오. @@ -1353,9 +1235,6 @@ VncSharp 제어 버전 {0} 인코딩 - - 암호화 강도 - 외부 도구 @@ -1416,9 +1295,6 @@ VncSharp 제어 버전 {0} 프린터 - - 스마트 카드 - 사운드 @@ -1650,9 +1526,6 @@ VncSharp 제어 버전 {0} RDP 해상도 설정 실패! - - 스마트 사이즈 - 컴퓨터 가져 오기 @@ -1671,9 +1544,6 @@ VncSharp 제어 버전 {0} 시작시 이전에 열린 세션에 다시 연결 - - 새로 고침 - 원격 파일 @@ -1842,9 +1712,6 @@ VncSharp 제어 버전 {0} 업데이트 정보를 다운로드 할 수 없습니다. - - 업데이트 확인 중 ... - 다운로드 완료! mRemoteNG는 이제 종료되고 설치로 시작됩니다. @@ -1921,9 +1788,6 @@ mRemoteNG는 이제 종료되고 설치로 시작됩니다. 예 - - 모든 연결을 다시 연결 - RDP 연결 시간 초과 diff --git a/mRemoteNG/Resources/Language/Language.lt.resx b/mRemoteNG/Language/Language.lt.resx similarity index 98% rename from mRemoteNG/Resources/Language/Language.lt.resx rename to mRemoteNG/Language/Language.lt.resx index 95a7a38bc..4b3af83d0 100644 --- a/mRemoteNG/Resources/Language/Language.lt.resx +++ b/mRemoteNG/Language/Language.lt.resx @@ -219,8 +219,8 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for Stable channel includes final releases only. -Beta channel includes Betas & Release Candidates. -Development Channel includes Alphas, Betas & Release Candidates. +Preview channel includes Betas & Release Candidates. +Nightly Channel includes Alphas, Betas & Release Candidates. Apply diff --git a/mRemoteNG/Resources/Language/Language.nb-NO.resx b/mRemoteNG/Language/Language.nb-NO.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.nb-NO.resx rename to mRemoteNG/Language/Language.nb-NO.resx index 4a4d75bd8..449cb202b 100644 --- a/mRemoteNG/Resources/Language/Language.nb-NO.resx +++ b/mRemoteNG/Language/Language.nb-NO.resx @@ -240,47 +240,6 @@ Sjekk mislyktes! - - Sjekk lyktes! - - - ICA krever at XenDesktop Online Plugin er installert og at wfica.ocx-biblioteket er registrert. Du kan laste ned klienten herfra: http://www.citrix.com/download/ -Hvis du har XenDesktop Online Pluginen installert og kontrollen fremdeles feiler, kan du forsøke å registrere wfica.ocx manuelt. -For å gjøre dette, åpne Kjør-dialogboksen (Start - Kjør) og skriv inn følgende: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (der c:\Program Files\Citrix\ICA Client\ er stien til XenDesktop Online Plugin-installasjonen). -Hvis denne kontrollen fortsatt feiler eller ICA i mRemoteNG ikke fungerer, vennligst se {0}. - - - Alle ICA-komponenter ble funnet, og ser ut til å være korrekt registrert. -Citrix ICA Client Control Version {0} - - - ikke korrekt installert - - - SSH-, Telnet-, Rlogin- og RAW-protokollene trenger PuTTY for å fungere. PuTTY kommer med hver mRemoteNG-pakke, og ligger i installasjonsstien. -Vennligst kontroller at du enten har putty.exe i mRemoteNG-mappen (standard: C:\Program Files\mRemoteNG\) eller at du har angitt en gyldig sti til putty.exe i Alternativer (Verktøy - Alternativer - Avansert - Egendefinert bane til PuTTY) - - - PuTTY ble funnet og er klar til bruk. - - - For at RDP skal fungere korrekt må du som et minimum ha Remote Desktop Connection (Terminal Services Client) 8.0 installert. Denne kan lastes ned herfra: https://support.microsoft.com/kb/2592687 -Hvis du har RDP 8.0 installert og kontrollen fremdeles feiler, kan du prøve å registrere mstscax.dll manuelt. For å gjøre dette, åpne Kjør-dialogboksen (Start - Kjør) og skriv inn følgende: regsvr32 "c:\windows\system32\mstscax.dll" (der c:\ er systemdisken). -Hvis du fremdeles har problemer med å få RDP til å fungere, vennligst se {0}. - - - Alle RDP-komponenter ble funnet og ser ut til å være korrekt registrert. -Remote Desktop Connection Control Version {0} - - - VNC krever at VncSharp.dll finnes i mappen mRemoteNG er installert i. -Vennligst kontroller at du har VncSharp.dll i installasjonsmappen til mRemoteNG (vanligvis C:\Program Files\mRemoteNG\). -Hvis kontrollen feiler eller VNC ikke fungerer i mRemoteNG, vennligst se {0}. - - - Alle VNC-komponenter ble funnet og ser ut til å være korrekt registrert. -VncSharp Control Version {0} - Forsøk å automatisk koble til på nytt ved frakobling fra server (kun RDP && ICA) @@ -344,9 +303,6 @@ VncSharp Control Version {0} Kompatibilitetsproblem oppdaget - - Komponentkontroll - btnIcon_Click mislyktes! @@ -459,9 +415,6 @@ Starter med ny tilkoblingsfil. Fant ikke ToolStrip-kontroll i FilteredPropertyGrid. - - Installert versjon - Oppdag @@ -483,15 +436,6 @@ Starter med ny tilkoblingsfil. For tomt brukernavn, passord eller domenefelt, bruk: - - 128-biters - - - 128-biters (kun pålogging) - - - Grunnleggende - Krypter tilkoblingsfil fullstendig @@ -594,24 +538,6 @@ Starter med ny tilkoblingsfil. Angi HTTP-egenskaper mislyktes! - - Kunne ikke opprette ny ICA-tilkobling! - - - Innlasting av ICA Plugin mislyktes! - - - ICA SetCredentials mislyktes! - - - ICA Set Event Handlers mislyktes! - - - ICA Set Props mislyktes! - - - ICA Set Resolution mislyktes! - Identifisere hurtigkoblingsfaner ved prefikset "Hurtig:" @@ -651,9 +577,6 @@ Starter med ny tilkoblingsfil. Ved lukking av tilkoblinger: - - &Koble til: - Visningsnavn @@ -723,9 +646,6 @@ Starter med ny tilkoblingsfil. Tilkoblingspaneler - - Tilkoblinger og oppsett - Kopier @@ -735,24 +655,12 @@ Starter med ny tilkoblingsfil. Ctrl-Esc - - Slett tilkobling... - Slett eksternt verktøy... - - Slett mappe... - Donér - - Duplisér tilkobling - - - Kopier mappe - Kopier fane @@ -771,9 +679,6 @@ Starter med ny tilkoblingsfil. mRemoteNG-hjelp - - Hopp til - Kjør eksternt verktøy @@ -810,12 +715,6 @@ Starter med ny tilkoblingsfil. Oppdater skjerm (VNC) - - Gi nytt navn til tilkobling - - - &Gi nytt navn til mappe - Gi nytt navn til fane @@ -987,9 +886,6 @@ Starter med ny tilkoblingsfil. Velg hvilken tekstkodingsmodus som skal brukes. - - Velg krypteringsstyrke for den eksterne verten. - Velg det eksterne verktøyet som skal startes. @@ -1134,9 +1030,6 @@ Starter med ny tilkoblingsfil. Tekstkoding - - Krypteringsnivå - Eksternt verktøy @@ -1194,9 +1087,6 @@ Starter med ny tilkoblingsfil. Skrivere - - Smartkort - Lyder @@ -1426,9 +1316,6 @@ Starter med ny tilkoblingsfil. RDP SetResolution mislyktes! - - SmartSize - Hent til denne datamaskinen @@ -1447,9 +1334,6 @@ Starter med ny tilkoblingsfil. Koble til tidligere åpnede økter ved oppstart - - Oppdater - Ekstern fil @@ -1756,9 +1640,6 @@ Se Microsofts support-artikkel på http://support.microsoft.com/kb/811833 for me En feil har oppstått under import av filen "{0}". - - Import feilet - Importer fra &fil... @@ -1804,15 +1685,9 @@ Se Microsofts support-artikkel på http://support.microsoft.com/kb/811833 for me Vis på verktøylinjen - - Sjekker om det finnes oppdateringer... - Endringsloggen kunne ikke lastes ned. - - &Koble til alle åpne tilkoblinger på nytt - RDP tidsavbrudd @@ -1879,9 +1754,6 @@ Se Microsofts support-artikkel på http://support.microsoft.com/kb/811833 for me Velg om du ønsker et varsel når RDP-sesjonen avsluttes på grunn av inaktivitet - - Varsel ved inaktivitet - Passordet må inneholde minst {0} av de følgende tegnene: {1} @@ -2097,8 +1969,8 @@ Se Microsofts support-artikkel på http://support.microsoft.com/kb/811833 for me Stable-kanalen inkluderer bare endelige versjoner. -Beta-kanalen inkluderer beta- og release candidate-versjoner. -Development-kanalen inkluderer alpha-, beta- og release candidate-versjoner. +Preview-kanalen inkluderer beta- og release candidate-versjoner. +Nightly-kanalen inkluderer alpha-, beta- og release candidate-versjoner. Bruk diff --git a/mRemoteNG/Resources/Language/Language.nl.resx b/mRemoteNG/Language/Language.nl.resx similarity index 90% rename from mRemoteNG/Resources/Language/Language.nl.resx rename to mRemoteNG/Language/Language.nl.resx index 9ca0151af..b35f40822 100644 --- a/mRemoteNG/Resources/Language/Language.nl.resx +++ b/mRemoteNG/Language/Language.nl.resx @@ -240,55 +240,6 @@ Controle mislukt! - - Controle geslaagd! - - - De (RDP) Sessies optie vereist dat u een geregistreerde versie van eolwtscom.dll op uw systeem heeft. -mRemoteNG neemt dit onderdeel automatisch mee bij instalatie, maar zal niet automatisch registreren al u handmatig heeft geïnstalleerd, tenzij u het installatieprogramma opnieuw uitvoert. -Om handmatig te registreren : Open het dialoogvenster Uitvoeren (Start - Uitvoeren) en typ het volgende: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (Waar c:\Program Files\mRemoteNG\ het pad is naar uw mRemoteNG installatie). -Als u nog steeds niet in staat bent om de langs check te komen gebruik dan ICA in mRemoteNG of raadpleeg mRemoteNG Forum op http://forum.mremoteng.org/ - - - EOLWTSCOM werd gevonden en lijkt correct te zijn geïnstalleerd. - - - Voor het gebruik van de Gecko Rendering Engine heb je XULrunner 1.8.1.x nodig en correcte pad naar de installatiemap welke onder Opties kunnen worden ingesteld. -U kunt XULrunner 1.8.1.3 vanaf deze locatie downloaden: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ -Wanneer de download van het pakket is voltooid kunt u deze uitpakken naar een willekeurige locatie. Ga daarna vervolgens in mRemoteNG naar Extra - Opties - Geavanceerd en voer het juiste pad in naar de uitgepakte XULrunner bestanden. -Als u nog steeds niet in staat bent om de langs check te komen gebruik dan de Gecko Engine in mRemoteNG of raadpleeg mRemoteNG Forum op http://forum.mremoteng.org/ - - - GeckoFx werd gevonden en lijkt correct te zijn geïnstalleerd. - - - Niet correct geïnstalleerd - - - De SSH, Telnet, Rlogin en RAW protocollen zijn nodig PuTTY om te laten functioneren. PuTTY wordt standaard geleverd bij de mRemoteNG installatie en bevind zich in het installatiepad. -Zorg ervoor dat u ofwel de Putty.exe in uw mRemoteNG directory staat(standaard: c:\Program Files\mRemoteNG\) of een geldig pad heeft opgegeven naar het PuTTY programmabestand onder Opties (Extra - Opties - Geavanceerd - Aangepast PuTTY pad) - - - Het programmabestand PuTTY werd gevonden en is klaar voor gebruik - - - Om RDP goed te laten werken moet je minimaal Verbinding met extern bureaublad (Terminal Services Client) 8.0 geïnstalleerd te hebben. U kunt het hier downloaden: https://support.microsoft.com/kb/2592687 -Als u RDP 8.0 heeft geïnstalleerd en de check nog niet lukt, probeer dan om handmatig mstscax.dll te registreren. Om dit uit te voeren opent u het dialoogvenster Uitvoeren (Start - Uitvoeren) en typ het volgende: regsvr32 "c:\windows\system32\mstscax.dll" (Waarbij c: \ je systeem schijf is). -Als u nog steeds niet in staat bent om de langs check te komen voor RDP raadpleeg mRemoteNG Forum op http://forum.mremoteng.org/ - - - Alle RDP componenten werden gevonden en lijken correct te zijn geregistreerd. -Verbinding met extern bureaublad Versie {0} - - - VNC vereist dat VncSharp.dll in de mRemoteNG installatiemap is geplaatst. -Zorg ervoor dat u VncSharp.dll bestand in de mRemoteNG installatiemap wordt geplaatst (standaard C:\Program Files\mRemoteNG\). -Als u nog steeds niet in staat bent om de langs check te komen gebruik dan VNC in mRemoteNG of raadpleeg mRemoteNG Forum op http://forum.mremoteng.org/ - - - Alle VNC componenten werden gevonden en lijken correct te zijn geregistreerd. -VncSharp Versie {0} - Automatisch proberen opnieuw te verbinden wanneer de verbinding is verbroken van de server (RDP && ICA Alleen) @@ -352,9 +303,6 @@ VncSharp Versie {0} Compatibiliteits probleem ontdekt - - Controle Componenten - btnIcon_Click mislukt! @@ -467,9 +415,6 @@ Beginnen met nieuwe Connectie bestand. Kan geen ToolStrip vinden in FilteredPropertyGrid. - - Geïnstalleerde versie - Detecteer @@ -491,15 +436,6 @@ Beginnen met nieuwe Connectie bestand. Voor lege gebruikersnaam, wachtwoord of domein velden gebruiken: - - 128-bit - - - 128-bit (aanmelding alleen) - - - Basis - Volledig versleutelen connection bestand @@ -602,9 +538,6 @@ Beginnen met nieuwe Connectie bestand. Instellen HTTP Eigenschappen mislukt! - - Vindt de Snel aansluit tabs met het voorzetsel "Quick" - Importeer van Active Directory @@ -641,9 +574,6 @@ Beginnen met nieuwe Connectie bestand. Bij het sluiten van connecties: - - &Verbind: - Weergavenaam @@ -713,9 +643,6 @@ Beginnen met nieuwe Connectie bestand. Connectie Panelen - - Verbindingen en Configuratie - Kopiëren @@ -725,24 +652,12 @@ Beginnen met nieuwe Connectie bestand. CTRL-Esc - - Verwijder Connectie... - Verwijder Externe Applicatie... - - Verwijder Map... - Doneer - - Dupliceer Connectie - - - Dupliceer Map - Dupliceer Tab @@ -761,9 +676,6 @@ Beginnen met nieuwe Connectie bestand. mRemoteNG Help - - Ga naar - Start Externe Applicatie @@ -800,12 +712,6 @@ Beginnen met nieuwe Connectie bestand. Vernieuw Scherm (VNC) - - Hernoem Connectie - - - Naam map wijzigen - Hernoem Tab @@ -978,9 +884,6 @@ Als dergelijke problemen voorkomen maak dan een nieuwe verbindings bestand aan!< Selecteer de codering modus welke moet worden gebruikt. - - Selecteer de codering sterkte van de externe host. - Selecteer een externe applicatie welke gestart moet worden. @@ -1125,9 +1028,6 @@ Als dergelijke problemen voorkomen maak dan een nieuwe verbindings bestand aan!< Codering - - Coderingsniveau - Externe Applicatie @@ -1185,9 +1085,6 @@ Als dergelijke problemen voorkomen maak dan een nieuwe verbindings bestand aan!< Printers - - Smartcards - Geluiden @@ -1419,9 +1316,6 @@ Bericht: RDP instellen resolutie mislukt! - - Smart Size - Afspelen op deze computer @@ -1440,9 +1334,6 @@ Bericht: Opnieuw verbinding maken met eerder geopende sessies bij het opstarten - - Vernieuwen - Extern bestand diff --git a/mRemoteNG/Resources/Language/Language.pl.resx b/mRemoteNG/Language/Language.pl.resx similarity index 90% rename from mRemoteNG/Resources/Language/Language.pl.resx rename to mRemoteNG/Language/Language.pl.resx index ed1c068fc..85875429a 100644 --- a/mRemoteNG/Resources/Language/Language.pl.resx +++ b/mRemoteNG/Language/Language.pl.resx @@ -243,38 +243,6 @@ Sprawdzenie nie powiodło się! - - Sprawdzenie powiodło się! - - - ICA wymaga zainstalowania wtyczki Online XenDesktop, i aby była zarejestrowana biblioteka wfica.ocx. Możesz pobrać klienta tutaj: http://www.citrix.com/download/ Jeżeli masz zainstalowany Plugin Online XenDesktop a nadal nie działa, spróbuj ręcznie zarejestrować bibliotekę wfica.ocx. Aby to zrobić wybierz polecenie Uruchom (Start - Uruchom) i wprowadź w linii komend: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (gdzie c:\Program Files\Citrix\ICA Client\ jest ścieżką instalacji XenDesktop Online Plugin). Jeśli nadal nie można użyć ICA w mRemoteNG prosimy o kontakt mRemoteNG Forum na http://forum.mremoteng.org/ - - - Wszystkie składniki ICA zostały znalezione i wydają się być poprawnie zarejestrowane. -Wersja klienta Citrix ICA {0} - - - nie jest zainstalowany prawidłowo - - - SSH, Telnet, Rlogin i protokołów RAW używają programu PuTTY. PuTTY zawarty jest pakiecie mRemoteNG i znajduje się w ścieżce instalacji programu. -Proszę upewnić się, że albo masz Putty.exe w katalogu mRemoteNG (domyślnie: c:\Program Files\mRemoteNG\) lub że podałeś prawidłową ścieżkę do narzędzia PuTTY w opcjach programu(Narzędzia - Opcje - zaawansowane - ścieżka programu PuTTY) - - - Aplikacja PuTTY została odnaleziona i powinna być gotowa do użytku. - - - Aby połączenia RDP działały poprawnie trzeba mieć zainstalowane Podłączanie Pulpitu Zdalnego (Klient Usług Terminalowych) w wersji 8.0. Można go pobrać ze strony: https://support.microsoft.com/kb/2592687. Jeśli RDP 8.0 jest już zainstalowany i nadal nie działają połączenia RDP, spróbuj ręcznie zarejestrować plik mstscax.dll. Aby zarejestrować plik wybierz Uruchom (Start - Uruchom) i wprowadź w linii polecń: regsvr32 "c:\windows\system32\mstscax.dll" (gdzie c:\ jest dyskiem systemowym). Jeśli nadal masz problemy z połączeniem RDP skonsultuj się z mRemoteNG Forum na http://forum.mremoteng.org/ - - - Wszystkie składniki RDP zostały znalezione i wydają się być poprawnie zarejestrowane. Wersja Podłączanie Pulpitu Zdalnego {0} - - - VNC wymaga, aby biblioteka VncSharp.dll znajdowała się w folderze instalacji mRemoteNG. Upewnij się, że masz plik VncSharp.dll w folderze aplikacji mRemoteNG (domyślnie C:\Program Files\mRemoteNG\). Jeśli nadal nie można użyć VNC w mRemoteNG prosimy o kontakt mRemoteNG Forum na http://forum.mremoteng.org/ - - - Wszystkie składniki VNC zostały znalezione i wydają się być poprawnie zarejestrowane. Wersja VncSharp {0} - Automatycznie połącz ponownie jeśli nastąpi odłączenie od serwera (tylko RDP && ICA) @@ -341,9 +309,6 @@ Proszę upewnić się, że albo masz Putty.exe w katalogu mRemoteNG (domyślnie: Wykryto problem z kompatybilnością - - Sprawdzenie komponentów - Wykonanie btnIcon_Click nie powiodło się! @@ -441,9 +406,6 @@ Załadowano nowy plik połączeń. Nie można odnaleźć ToolStrip w FilteredPropertyGrid. - - Zainstalowana wersja - Wykryj @@ -465,21 +427,6 @@ Załadowano nowy plik połączeń. Dla pustej nazwy pola użytkownika, hasła lub domeny użyj: - - 128-bit - - - 128-bit (tylko logowanie) - - - 40-bitowe - - - 56-bitowe - - - Podstawowe - Całkowicie szyfruj plik połączeń @@ -591,15 +538,6 @@ Załadowano nowy plik połączeń. Konfiguracja ustawień HTTP nie powiodła się! - - Nie można utworzyć nowego połączenia ICA! - - - Ładowanie wtyczki ICA nie powiodło się! - - - Wykonanie ICA SetCredentials nie powiodło się! - Importów z Active Directory @@ -615,9 +553,6 @@ Załadowano nowy plik połączeń. Przy zamykaniu połączeń: - - &Połącz - Widoczna nazwa @@ -684,9 +619,6 @@ Załadowano nowy plik połączeń. Panele połączeń - - Połączenia i konfiguracja - Kopiuj @@ -696,24 +628,12 @@ Załadowano nowy plik połączeń. Ctrl-Esc - - Usuń połączenie... - Skazuj zewnętrzne narzędzie... - - Usuń folder... - Darowizna - - Duplikuj połączenie - - - Duplikuj folder - Duplikuj zakładkę @@ -732,9 +652,6 @@ Załadowano nowy plik połączeń. Pomoc mRemoteNG - - Idz do - Uruchom narzędzie zewnętrzne @@ -771,12 +688,6 @@ Załadowano nowy plik połączeń. Odśwież ekran (VNC) - - Zmień nazwę połączenia - - - Zmień nazwę folderu - Zmień nazwę zakładki @@ -1014,9 +925,6 @@ Załadowano nowy plik połączeń. Kodowanie - - Siła szyfrowania - Zewnętrzne narzędzie @@ -1074,9 +982,6 @@ Załadowano nowy plik połączeń. Drukarki - - Karty inteligentne - Dźwięki @@ -1239,9 +1144,6 @@ Załadowano nowy plik połączeń. Wykonanie RDP SetResolution nie powiodło się! - - Dopasuj rozmiar - Przenieś na ten komputer @@ -1260,9 +1162,6 @@ Załadowano nowy plik połączeń. Przy otwarciu programu podłącz ostatnio otwarte połączenia - - Odświerz - Plik zdalny diff --git a/mRemoteNG/Resources/Language/Language.pt-BR.resx b/mRemoteNG/Language/Language.pt-BR.resx similarity index 88% rename from mRemoteNG/Resources/Language/Language.pt-BR.resx rename to mRemoteNG/Language/Language.pt-BR.resx index 39b2c1edd..de44c454f 100644 --- a/mRemoteNG/Resources/Language/Language.pt-BR.resx +++ b/mRemoteNG/Language/Language.pt-BR.resx @@ -237,28 +237,6 @@ Falha na verificação! - - Verificação com sucesso! - - - ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica.ocs registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ -Se você tiver o Plugin Online XenDesktop instalado e a verificação ainda falhar, tente registrar manualmente o wfica.ocx -Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (onde c:\Program Files\Citrix\ICA Client\ é o caminho para a instalação do Plugin Online do XenDesktop). -Se você ainda não puder passar por esta verificação ou usar ICA em mRemoteNG, por favor, consulte o fórum de mRemoteNG no http://forum.mremoteng.org/" - - - Todos os componentes de ICA, foram encontrados e parecem ser registrado corretamente. Citrix ICA cliente controle versão {0} - - - não instalado corretamente - - - O SSH, Telnet, Rlogin e protocolos RAW precisam PuTTY para trabalhar. PuTTY vem com cada pacote de mRemoteNG e está localizado no caminho de instalação. -Por favor, certifique-se de que você tem o Putty.exe em seu diretório mRemoteNG (padrão: c:\Program Files\mRemoteNG\) ou que você tenha especificado um caminho válido para seu executável PuTTY nas opções (ferramentas - opções - avançadas - caminho personalizado PuTTY) - - - O executável PuTTY foi encontrado e está pronto para usar. - Não mostre esta mensagem novamente. @@ -304,9 +282,6 @@ Por favor, certifique-se de que você tem o Putty.exe em seu diretório mRemoteN Mensagem - - Validação de componentes - btnIcon_Click falhou! diff --git a/mRemoteNG/Resources/Language/Language.pt.resx b/mRemoteNG/Language/Language.pt.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.pt.resx rename to mRemoteNG/Language/Language.pt.resx index 1a9447bc4..2485dcf38 100644 --- a/mRemoteNG/Resources/Language/Language.pt.resx +++ b/mRemoteNG/Language/Language.pt.resx @@ -240,36 +240,6 @@ Falha na verificação! - - Verificação com sucesso! - - - ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ se você tiver o Plugin Online XenDesktop instalado e a verificação ainda falhar, tente registrar manualmente o wfica. Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (onde c:\Program Files\Citrix\ICA Client\ é o caminho para a instalação do Plugin Online do XenDesktop). Se você ainda não pode passar essa verificação ou usar ICA em mRemoteNG, por favor, consulte o fórum de mRemoteNG no http://forum.mremoteng.org/" - - - Todos os componentes de ICA, foram encontrados e parecem ser registrado corretamente. Citrix ICA cliente controle versão {0} - - - não instalado corretamente - - - O SSH, Telnet, Rlogin e protocolos crus precisam PuTTY para trabalhar. PuTTY vem com cada pacote de mRemoteNG e situa-se no caminho de instalação. Por favor, certifique-se de que ou você tem o Putty.exe no diretório mRemoteNG (padrão: c:\Program Files\mRemoteNG\) ou que você especificou um caminho válido para seu executável PuTTY nas opções (ferramentas - opções - avançadas - caminho personalizado PuTTY) - - - O executável PuTTY foi encontrado e está pronto para usar. - - - Para que o RDP funcione corretamente é necessário ter pelo menos o Remote Desktop Connection (Terminal Services Client) 8.0 instalado. Pode obtê-lo aqui: https://support.microsoft.com/kb/2592687 se tiver RDP 8.0 instalado e a verificação ainda falhar, tente registrar manualmente o mstscax.dll. Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\windows\system32\mstscax.dll" (onde c:\ é sua unidade do sistema). Se você ainda tiver problemas para obter o RDP para trabalhar por favor consulte o fórum de mRemoteNG em http://forum.mremoteng.org/ - - - Todos os componentes RDP foram encontrados e parecem estar registrados corretamente. RDP versão {0} - - - O VNC requer VncSharp.dll estar localizado na pasta do aplicativo mRemoteNG. Por favor, certifique-se de que você tem o arquivo VncSharp.dll na pasta do aplicativo mRemoteNG (geralmente, C:\Program Files\mRemoteNG\). Se você ainda não pode efetuar essa verificação ou usar o VNC em mRemoteNG por favor consulte o fórum de mRemoteNG em http://forum.mremoteng.org/ - - - Todos os componentes do VNC foram encontrados e parecem estar registrados corretamente. VncSharp versão {0} - Tentar reconectar automaticamente quando desconectado do servidor (RDP && ICA somente) @@ -327,9 +297,6 @@ Impossível processar argumentos da linha de comando! - - Validação de componentes - btnIcon_Click falhou! @@ -441,9 +408,6 @@ Não foi possível encontrar o controlo ToolStrip em FilteredPropertyGrid. - - Versão instalada - Detetar @@ -465,15 +429,6 @@ Para Nome de utilizador, senha ou domínio vazios, usar: - - 128-bit - - - 128-bit (apenas em início de sessão) - - - Básico - Encriptar todo o arquivo de ligações @@ -576,24 +531,6 @@ Falhou configuração de props HTTP! - - Impossível criar nova ligação ICA! - - - Falha ao carregar o Plugin ICA! - - - Falha ICA SetCredentials! - - - Manipuladores de evento conjunto ICA falharam! - - - Configuração de props ICA falhou! - - - Configuração de resolução ICA falhou! - Identificar guias de ligação rápida, adicionando o prefixo "rápido:" @@ -633,9 +570,6 @@ Ao fechar ligações: - - &Ligar: - Nome a exibir @@ -705,9 +639,6 @@ Painéis de ligações - - Configurações e ligações - Copiar @@ -717,24 +648,12 @@ Ctrl-Esc - - Excluir a conexão... - Excluir ferramenta externa... - - Excluir a pasta... - Doar - - Duplicar ligação - - - Duplicar pasta - Duplicar Aba @@ -753,9 +672,6 @@ Ajuda mRemoteNG - - Ir para - Executar Ferramenta Externa @@ -792,12 +708,6 @@ Atualizar ecrã (VNC) - - Renomear ligação - - - Renomear pasta - Renomear aba @@ -966,9 +876,6 @@ Selecione o modo de codificação a ser usado. - - Selecione a força da criptografia do host remoto. - Selecione a ferramenta externa a ser iniciada. @@ -1113,9 +1020,6 @@ Codificação - - Força de Criptografia - Ferramenta externa @@ -1173,9 +1077,6 @@ Impressoras - - Smart Cards - Sons @@ -1401,9 +1302,6 @@ RDP SetResolution falhou! - - Tamanho inteligente - Trazer para este computador @@ -1422,9 +1320,6 @@ Reconectar as sessões anteriormente abertas na inicialização - - Refrescar - Arquivo remoto diff --git a/mRemoteNG/Resources/Language/Language.resx b/mRemoteNG/Language/Language.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.resx rename to mRemoteNG/Language/Language.resx index a41a28a03..6e763afd9 100644 --- a/mRemoteNG/Resources/Language/Language.resx +++ b/mRemoteNG/Language/Language.resx @@ -246,42 +246,6 @@ Check failed! - - Check succeeded! - - - ICA requires that the XenDesktop Online Plugin is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/ - - - All ICA components were found and seem to be registered properly. -Citrix ICA Client Control Version {0} - - - not installed properly - - - The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path. -Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path) - - - The PuTTY executable was found and should be ready to use. - - - For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services) Client 8.0 installed. You can download it here: http://support.microsoft.com/kb/925876 -If this check still fails or you are unable to use RDP, please consult the at {0}. - - - The following RDP protocol versions are supported on this machine: {0} - - - VNC requires VncSharp.dll to be located in your mRemoteNG application folder. -Please make sure that you have the VncSharp.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\). -If you are still not able to pass this check or use VNC in mRemoteNG please consult the at {0}. - - - All VNC components were found and seem to be registered properly. -VncSharp Control Version {0} - Automatically try to reconnect when disconnected from server (RDP && ICA only) @@ -354,9 +318,6 @@ VncSharp Control Version {0} Compatibility problem detected - - Components Check - btnIcon_Click failed! @@ -442,7 +403,7 @@ VncSharp Control Version {0} Connections file "{0}" could not be loaded! - Connections file "{0}" could not be loaded! + Connections file "{0}" could not be loaded! Starting with new connections file. @@ -472,9 +433,6 @@ Starting with new connections file. Could not find ToolStrip control in FilteredPropertyGrid. - - Installed version - Detect @@ -499,21 +457,6 @@ Starting with new connections file. For empty Username, Password or Domain fields use: - - 128-bit - - - 128-bit (logon only) - - - 40-bit - - - 56-bit - - - Basic - Completely encrypt connection file @@ -545,10 +488,10 @@ Starting with new connections file. Encryption failed. {0} - The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. - -See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information. - + The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. + +See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information. + {0} is not fully FIPS compliant. Click OK to proceed at your own discretion, or Cancel to Exit. @@ -671,27 +614,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for Set HTTP Props failed! - - ICA - - - Couldn't create new ICA Connection! - - - Loading ICA Plugin failed! - - - ICA SetCredentials failed! - - - ICA Set Event Handlers Failed! - - - ICA Set Props Failed! - - - ICA Set Resolution Failed! - Identify quick connect tabs by adding the prefix "Quick:" @@ -701,9 +623,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for An error occurred while importing the file "{0}". - - Import failed - Import from &File... @@ -740,9 +659,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for When closing connections: - - &Connect: - Display Name @@ -815,9 +731,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for Connection Panels - - Connections and Config - Copy @@ -827,24 +740,12 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for Ctrl-Esc - - Delete Connection... - Delete External Tool... - - Delete Folder... - Donate - - Duplicate Connection - - - Duplicate Folder - Duplicate Tab @@ -863,9 +764,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for mRemoteNG Help - - Jump to - Launch External Tool @@ -902,12 +800,6 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for Refresh Screen (VNC) - - Rename Connection - - - Rename Folder - Rename Tab @@ -1014,7 +906,7 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for No update available - You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error. + You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error. If you run into such an error, please create a new connection file! @@ -1101,9 +993,6 @@ If you run into such an error, please create a new connection file! Select the encoding mode to be used. - - Select the encryption strength of the remote host. - Select the external tool to be started. @@ -1260,9 +1149,6 @@ If you run into such an error, please create a new connection file! Encoding - - Encryption Strength - External Tool @@ -1326,9 +1212,6 @@ If you run into such an error, please create a new connection file! Clipboard - - Smart Cards - Sounds @@ -1372,7 +1255,7 @@ If you run into such an error, please create a new connection file! Protocol Event Disconnected. Host: "{1}"; Protocol: "{2}" Message: "{0}" - Protocol Event Disconnected failed. + Protocol Event Disconnected failed. {0} @@ -1430,7 +1313,7 @@ If you run into such an error, please create a new connection file! Creating quick connect failed - &Warn me when closing connections + Warn me when closing connections Warn me only when e&xiting mRemoteNG @@ -1561,9 +1444,6 @@ If you run into such an error, please create a new connection file! RDP SetResolution failed! - - Smart Size - Bring to this computer @@ -1582,9 +1462,6 @@ If you run into such an error, please create a new connection file! Reconnect to previously opened sessions on startup - - Refresh - Remote file @@ -1606,8 +1483,35 @@ If you run into such an error, please create a new connection file! Do you want to save the current connections file before loading another? - - Save connections on exit + + Daily + + + Connection Backup Frequency + + + Weekly + + + Maximum number of backups + + + Location of connection file backup + + + On Edit + + + On Exit + + + Never backup connections + + + Browse... + + + Backup Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png @@ -1756,11 +1660,8 @@ If you run into such an error, please create a new connection file! The update information could not be downloaded. - - Checking for updates... - - Download complete! + Download complete! mRemoteNG will now quit and begin with the installation. @@ -1835,9 +1736,6 @@ mRemoteNG will now quit and begin with the installation. Yes - - Reconnect All Open Connections - RDP Connection Timeout @@ -1904,9 +1802,6 @@ mRemoteNG will now quit and begin with the installation. Select whether to receive an alert after the RDP session disconnects due to inactivity - - Alert on Idle disconnect - Password must contain at least {0} of the following characters: {1} @@ -2121,9 +2016,9 @@ mRemoteNG will now quit and begin with the installation. Release Channel - Stable channel includes final releases only. -Beta channel includes Betas & Release Candidates. -Development Channel includes Alphas, Betas & Release Candidates. + Stable channel includes final releases only. +Preview channel includes Betas & Release Candidates. +Nightly Channel includes Alphas, Betas & Release Candidates. Apply @@ -2264,7 +2159,7 @@ Development Channel includes Alphas, Betas & Release Candidates. Determines whether menus and windows can be displayed with animation effects in the remote session. - CEF (Chromium) + Edge Chromium Failed to contruct the URL to load diff --git a/mRemoteNG/Resources/Language/Language.ru.resx b/mRemoteNG/Language/Language.ru.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.ru.resx rename to mRemoteNG/Language/Language.ru.resx index a900c596e..c268639f9 100644 --- a/mRemoteNG/Resources/Language/Language.ru.resx +++ b/mRemoteNG/Language/Language.ru.resx @@ -240,47 +240,6 @@ Ошибка проверки! - - Успешно проверено! - - - ICA требуется установленный XenDesktop Online Plugin и зарегистрированная библиотека wfica.ocx. Вы можете скачать клиент здесь: http://www.citrix.com/download/ -Если у вас есть установленный XenDesktop Online Plugin и ничего не работает, попробуйте зарегистрировать wfica.ocx вручную. -Для этого откройте (Пуск - Выполнить) и введите следующую команду: regsvr32 "C:\Program Files\Citrix\ICA Client\wfica.ocx" (где C:\Program Files\Citrix \ICA Client\ это путь к XenDesktop Online Plugin). -Если у вас все же не работает ICA в mRemoteNG обратитесь на {0}. - - - Все компоненты ICA были найдены и зарегистрированы. -Citrix ICA Client Control версии {0} - - - установлен неправильно - - - SSH, Telnet, Rlogin и RAW протоколам нужен для работы PuTTY. PuTTY поставляется с каждым mRemoteNG и находится в папке с программой. -Убедитесь, что putty.exe есть в папке с mRemoteNG (по умолчанию: C:\Program Files\mRemoteNG\), или что вы указали правильный путь к исполняемому файлу PuTTY в Инструменты - Опции - Дополнительно - Путь к PuTTY) - - - Исполняемый файл PuTTY найден и готов к использованию. - - - Для правильной работы RDP необходимо иметь установленный Remote Desktop Connection (Terminal Services Client) 8.0. Вы можете получить его здесь: https://support.microsoft.com/kb/2592687 -Если у вас есть установленный RDP 8.0 и подключиться не удается, попробуйте зарегистрироваться mstscax.dll вручную. Для этого откройте (Пуск - Выполнить) и введите следующую команду: regsvr32 "C:\Windows\system32\mstscax.dll" (где C:\ваш системный диск). -Если у вас возникли проблемы при работе с RDP обратитесь на {0}. - - - Все RDP компоненты были найдены и зарегистрированы. -Remote Desktop Connection, Control Version {0} - - - VNC требуется VncSharp.dll который находится в папке с mRemoteNG. -Убедитесь, что у вас есть VncSharp.dll в папке mRemoteNG (обычно C:\Program Files\mRemoteNG\). -Если у вас все же не работает VNC в mRemoteNG обратитесь на {0}. - - - Все VNC компоненты были найдены и зарегистрированы. -VncSharp Control Version {0} - Автоматически пытаться восстановить связь при отключении от сервера (только RDP и ICA) @@ -344,9 +303,6 @@ VncSharp Control Version {0} Обнаружена проблема совместимости - - Проверка компонентов - Ошибка btnIcon_Click! @@ -459,9 +415,6 @@ VncSharp Control Version {0} Не удалось найти элемент управления ToolStrip в FilteredPropertyGrid. - - Установленная версия - Обнаружение @@ -483,21 +436,6 @@ VncSharp Control Version {0} Использовать пустое имя пользователя пароль или домен: - - 128-бит - - - 128-бит (только при входе) - - - 40-бит - - - 56-бит - - - Основное - Шифровать файл подключения @@ -600,24 +538,6 @@ VncSharp Control Version {0} Не удалось задать параметры HTTP! - - Не удается создать новое подключение ICA! - - - Не удалось загрузить ICA-плагин! - - - Ошибка установки учетных данных ICA! - - - Не удалось установить обработчик событий ICA! - - - Не удалось задать параметры ICA! - - - Ошибка установки разрешений ICA! - Определить вкладки быстрых подключений, добавляя префикс «Quick:» @@ -657,9 +577,6 @@ VncSharp Control Version {0} При закрытии подключений: - - &Подключение: - Отображаемое имя: @@ -729,9 +646,6 @@ VncSharp Control Version {0} Панель подключений - - Подключения и конфигурация - Копировать @@ -741,24 +655,12 @@ VncSharp Control Version {0} Ctrl-Esc - - Удалить подключение... - Удалить внешний инструмент... - - Удалить папку... - Помочь проекту - - Дубликат подключения - - - Дублировать папку - Дублировать вкладку @@ -777,9 +679,6 @@ VncSharp Control Version {0} Справка mRemoteNG - - Перейти к - Запуск внешних инструментов @@ -816,12 +715,6 @@ VncSharp Control Version {0} Обновить экран (VNC) - - Переименовать подключение - - - Переименовать папку - Переименовать закладку @@ -994,9 +887,6 @@ VncSharp Control Version {0} Режим кодирования. - - Шифрование на удаленном хосте. - Внешний инструмент, который нужно запустить. @@ -1141,9 +1031,6 @@ VncSharp Control Version {0} Кодирование - - Шифрование - Внешний инструмент @@ -1201,9 +1088,6 @@ VncSharp Control Version {0} Принтеры - - Смарт-карты - Звуки @@ -1435,9 +1319,6 @@ VncSharp Control Version {0} Ошибка установки разрешения RDP! - - Smart Size - Передать на этот компьютер @@ -1456,11 +1337,8 @@ VncSharp Control Version {0} При запуске подключаться к предыдущим сессиям - - Обновление - - Удалить файл + Удалённый файл Удалить все @@ -1697,9 +1575,6 @@ mRemoteNG сейчас прекратит работу и начнет проц Да - - Переподключить все открытые соединения - Рабочий каталог: @@ -1805,15 +1680,9 @@ mRemoteNG сейчас прекратит работу и начнет проц HTTPS - - ICA - Произошла ошибка при импорте файла "{0}". - - Импортировать не удалось - Не удалось загрузить информацию о соединении с SQL-сервера. @@ -1850,9 +1719,6 @@ mRemoteNG сейчас прекратит работу и начнет проц Пароль для {0} - - Проверка обновлений... - Журнал изменений не может быть загружен. @@ -1922,9 +1788,6 @@ mRemoteNG сейчас прекратит работу и начнет проц Выберите, следует ли получать оповещение после отключения сеанса RDP из-за неактивности - - Предупреждение о отключении питания - Пароль должен содержать не менее {0} следующих символов: {1} diff --git a/mRemoteNG/Resources/Language/Language.tr-TR.resx b/mRemoteNG/Language/Language.tr-TR.resx similarity index 91% rename from mRemoteNG/Resources/Language/Language.tr-TR.resx rename to mRemoteNG/Language/Language.tr-TR.resx index 49a3579ba..a77970fb8 100644 --- a/mRemoteNG/Resources/Language/Language.tr-TR.resx +++ b/mRemoteNG/Language/Language.tr-TR.resx @@ -228,9 +228,6 @@ Kontrol başarısız! - - Kontrol başarılı! - Bu mesajı tekrar gösterme @@ -279,43 +276,6 @@ İndir - - ICA, XenDesktop Online Plugin'in kurulu olmasını ve wfica.ocx kitaplığının kayıtlı olmasını gerektirir. İstemciyi şu adresten indirebilirsiniz: http://www.citrix.com/download/ -XenDesktop Çevrimiçi Eklentisi'ni yüklediyseniz ve kontrol hala başarısız olursa, el ile wfica.ocx kaydetmeyi deneyin. -Bunu yapmak için çalıştır iletişim kutusunu açın (Başlat - Çalıştır) ve aşağıdakileri girin: regsvr32 "c:\Program Files\Citrix\ICA İstemci\wfica.ocx" (c:\Program Files\Citrix\ICA Client\ XenDesktop Online Plugin yüklemenizin yolu). -Bu kontrolden sonuç alamıyorsanız veya ICA'yi mRemoteNG'de kullanamıyorsanız, http://forum.mremoteng.org/ adresindeki mRemoteNG Forumu'na başvurun " - - - Tüm ICA bileşenleri bulundu ve düzgün kaydedilmiş gibi görünüyor. -Citrix ICA Client Control Sürümü {0} - - - Düzgün kurulmamış - - - SSH, Telnet, Rlogin ve RAW protokolleri çalışmak için PuTTY'ye ihtiyaç duyar. PuTTY her mRemoteNG paketi ile birlikte gelir ve kurulum yolunda bulunur. -PutTy.exe'yi mRemoteNG dizininizde (varsayılan: c:\Program Files\mRemoteNG\) bulundurduğunuzdan veya PuTTY çalıştırılabilir dosyanız için Seçenekler'de (Araçlar - Seçenekler - Gelişmiş - Özel PuTTY yolu) geçerli bir yol belirttiğinizden emin olun. - - - PuTTY çalışabilir dosyası bulundu ve kullanıma hazır. - - - RDP'nin düzgün çalışabilmesi için Uzak Masaüstü Bağlantısı (Terminal Hizmetleri) İstemcisinin en az 8.0 sürümü yüklü olması gerekir. Onu buradan indirebilirsiniz: http://support.microsoft.com/kb/925876 -Bu kontrol hala başarısız olursa veya RDP'yi kullanamazsanız lütfen http://forum.mremoteng.org/ adresindeki mRemoteNG Forumu'na başvurun. - - - Tüm RDP bileşenleri bulundu ve düzgün bir şekilde kayıtlı görünüyorlar. -Uzak Masaüstü Bağlantısı Kontrol Sürümü {0} - - - VNC, VncSharp.dll dosyasının mRemoteNG uygulama klasöründe bulunmasını gerektirir. -Lütfen VncSharp.dll dosyasını mRemoteNG uygulama klasörünüzde (genellikle C:\Program Files\mRemoteNG\) bulundurduğunuzdan emin olun. -Bu kontrolten sonuç alamıyorsanız veya VNC'yi mRemoteNG'de kullanamıyorsanız lütfen http://forum.mremoteng.org/ adresindeki mRemoteNG Forumu'na başvurun. - - - Tüm VNC bileşenleri bulundu ve düzgün bir şekilde kayıtlı görünüyorlar. -VncSharp Kontrol Sürümü {0} - Sunucu bağlantısı kesildiğinde otomatik olarak yeniden bağlanmayı deneyin (yalnızca RDP && ICA) @@ -358,9 +318,6 @@ VncSharp Kontrol Sürümü {0} Uyumluluk sorunu tespit edildi - - Bileşenler Kontrolü - btnIcon_Click başarısız! @@ -507,9 +464,6 @@ Yeni bağlantılar dosyası ile başlanıyor. ToolStrip kontrolü FilteredPropertyGrid içinde bulunamadı. - - Yüklü sürüm - Algıla @@ -534,12 +488,6 @@ Yeni bağlantılar dosyası ile başlanıyor. Boş bırakılan Kullanıcı adı, Parola ve Domain için: - - 128-bit (yalnızca oturum açma) - - - Basit - Bağlantı dosyası şifreleme @@ -678,12 +626,6 @@ Yeni bağlantılar dosyası ile başlanıyor. HTTP Prop'larını değiştirme başarısız! - - Yeni ICA Bağlantısı oluşturulamadı! - - - ICA eklentisini yükleme başarısız! - Veritabanı: @@ -726,30 +668,15 @@ Yeni bağlantılar dosyası ile başlanıyor. Bağlantı Paneli - - Bağlantılar ve Ayar - Kopyala - - Bağlantıyı Sil... - Harici Aracı Sil... - - Klasörü Sil... - Bağış Yap - - Bağlantıyı Çoğalt - - - Klasörü Çoğalt - Sekmeyi Çoğalt @@ -768,9 +695,6 @@ Yeni bağlantılar dosyası ile başlanıyor. mRemoteNG Yardım - - Atla - Harici Aracı Çalıştır @@ -807,12 +731,6 @@ Yeni bağlantılar dosyası ile başlanıyor. Ekranı Yenile (VNC) - - Bağlantıyı Yeniden Adlandır - - - Klasörü Yeniden Adlandır - Sekmeyi Yeniden Adlandır @@ -940,9 +858,6 @@ Böyle bir hatayla karşılaşırsanız, lütfen yeni bir bağlantı dosyası ol Uyarılar - - Tüm Açık Bağlantılara Yeniden Bağlanın - RDP Bağlantısı Zamanaşımı @@ -1024,9 +939,6 @@ Böyle bir hatayla karşılaşırsanız, lütfen yeni bir bağlantı dosyası ol Güncelleştirme bilgileri indirilemedi. - - Güncelleştirmeler kontrol ediliyor... - İndirme tamamlandı! MRemoteNG şimdi kapanacak ve kurulum başlayacak. @@ -1034,18 +946,6 @@ MRemoteNG şimdi kapanacak ve kurulum başlayacak. Güncelleme indirilemedi. - - ICA Kimlik ayarlama başarısız! - - - ICA Olay İşleyicileri Ayarlama Başarısız! - - - ICA Props Ayarlama başarısız! - - - ICA Çözünürlük ayarlama başarısız! - "Hızlı:" önekini ekleyerek hızlı bağlantı sekmelerini belirleyin @@ -1055,9 +955,6 @@ MRemoteNG şimdi kapanacak ve kurulum başlayacak. Dosya alınırken bir hata oluştu, "{0}". - - İçe alma başarısız! - &Dosyadan içe aktar... @@ -1094,9 +991,6 @@ MRemoteNG şimdi kapanacak ve kurulum başlayacak. Bağlantı kapatılırken: - - &Bağlan: - Görünen Ad @@ -1188,9 +1082,6 @@ PuTTY ve harici araçlar için en fazla bekleme süresi: Kullanılacak kodlama modunu seçin. - - Uzak host için şifreleme gücünü seçin. - Başlatılacak harici aracı seçin. @@ -1362,9 +1253,6 @@ PuTTY ve harici araçlar için en fazla bekleme süresi: Kodlama - - Şifreleme Gücü - Harici Araç @@ -1413,9 +1301,6 @@ PuTTY ve harici araçlar için en fazla bekleme süresi: Yazıcılar - - Smart Kartlar - Sesler @@ -1620,9 +1505,6 @@ Mesaj: RDP Çözünürlük ayarlama başarısız! - - Akıllı boyut - Bu bilgisayara getirin @@ -1641,9 +1523,6 @@ Mesaj: Başlangıçta daha önce açılmış oturumlara yeniden bağlan - - Yenile - Uzak Dosya diff --git a/mRemoteNG/Resources/Language/Language.uk.resx b/mRemoteNG/Language/Language.uk.resx similarity index 92% rename from mRemoteNG/Resources/Language/Language.uk.resx rename to mRemoteNG/Language/Language.uk.resx index dfdbfc1cd..4965fe742 100644 --- a/mRemoteNG/Resources/Language/Language.uk.resx +++ b/mRemoteNG/Language/Language.uk.resx @@ -237,46 +237,6 @@ Помилка перевірки! - - Успішно перевірено! - - - ICA вимагає встановити XenDesktop Online Plugin та зареєструвати бібліотеку wfica.ocx. Ви можете завантажити клієнт тут: http://www.citrix.com/download/ -Якщо у вас є встановлений XenDesktop Online Plugin і нічого не працює, спробуйте зареєструвати wfica.ocx вручну. -Для цього відкрийте (Пуск - Виконати) і введіть наступну команду: regsvr32 "C:\Program Files\Citrix\ICA Client\wfica.ocx" (де C:\Program Files\Citrix ICA Client\ це шлях до XenDesktop Online Plugin). -Якщо у вас все таки не працює ICA в mRemoteNG зверніться за адресою: {0}. - - - Всі компоненти ICA були знайдені і зареєстровані. -Citrix ICA Client Control версії {0} - - - встановлений неправильно - - - SSH, Telnet, Rlogin і RAW протоколам потрібен для роботи PuTTY. PuTTY поставляється з кожним mRemoteNG і знаходиться в папці з програмою. -Переконайтеся, що putty.exe є в папці з mRemoteNG (за замовчунням: C:\Program Files mRemoteNG\), або ящо ви вказали правильний шлях до виконуваного файлу PuTTY в Інструменти - Опції - Додатково - Шлях до PuTTY) - - - Виконуваний файл PuTTY знайдений і готовий до використання. - - - Для правильної роботи RDP необхідно мати встановлений клієнт Remote Desktop Connection (Terminal Services) не менше версії 8.0. Ви можете отримати його тут: https://support.microsoft.com/kb/2592687 -Якщо у вас є встановлений RDP 8.0 і підключитися не вдається, спробуйте зареєструватися mstscax.dll вручну. Для цього відкрийте (Пуск - Виконати) і введіть наступну команду: regsvr32 "C:\Windows\system32\mstscax.dll" (де C: \ - ваш системний диск). -Якщо у вас виникли проблеми при роботі з RDP зверніться зверніться за адресою: {0}. - - - На цій машині підтримуються наступні версії протоколів RDP: {0} - - - VNC вимагає, щоб VncSharp.dll знаходився у папці додатків mRemoteNG. -Переконайтеся, що у папці програми mRemoteNG файл VncSharp.dll (як правило, C:C:\Program Files\mRemoteNG\). -Якщо ви все ще не можете пройти цю перевірку або використовувати VNC в mRemoteNG, будь ласка, зверніться за адресою {0}. - - - Всі VNC компоненти були знайдені і зареєстровані. -VncSharp Control Version {0} - Автоматично намагатися відновити зв'язок при відключенні від сервера (тільки RDP і ICA) @@ -334,9 +294,6 @@ VncSharp Control Version {0} Неможливо розібрати аргументи командного рядка! - - Перевірка компонентів - Помилка btnIcon_Click! @@ -446,9 +403,6 @@ VncSharp Control Version {0} Не вдається створити новий файл з'єднань! - - Встановлена версія - Виявлення @@ -470,21 +424,6 @@ VncSharp Control Version {0} Використовувати пусте ім'я користувача, пароль або домен: - - 128-біт - - - 128-біт (тільки при вході) - - - 40-біт - - - 56-біт - - - Основне - Повністю зашифрувати файл з'єднання @@ -581,24 +520,6 @@ VncSharp Control Version {0} Не вдалося задати параметри HTTP! - - Не вдається створити нове з'єднання ICA! - - - Не вдалося завантажити ICA-плагін! - - - Помилка встановлення облікових даних ICA! - - - Не вдалося встановити оброблювач подій ICA! - - - Не вдалося задати параметри ICA! - - - Помилка встановлення дозволів ICA! - Імпорт з Active Directory @@ -626,9 +547,6 @@ VncSharp Control Version {0} Адреса: - - &З'єднання: - Коротке ім'я @@ -698,9 +616,6 @@ VncSharp Control Version {0} Панель з'єднань - - З'єднання та конфігурація - Копіювати @@ -710,24 +625,12 @@ VncSharp Control Version {0} Ctrl+Esc - - Видалити з'єднання… - Видалити зовнішній інструмент… - - Видалити папку… - Пожертва - - Дублювати з'єднання - - - Дублювати папку - Дублювати вкладку @@ -746,9 +649,6 @@ VncSharp Control Version {0} Довідка mRemoteNG - - Перейти до - Запуск зовнішніх інструментів @@ -779,12 +679,6 @@ VncSharp Control Version {0} Оновити екран (VNC) - - Перейменувати з'єднання - - - Перейменувати папку - Перейменувати вкладку @@ -942,9 +836,6 @@ VncSharp Control Version {0} Виберіть режим кодування, який буде використовуватися. - - Виберіть ступінь шифрування віддаленого хоста. - Виберіть зовнішній інструмент для запуску. @@ -1086,9 +977,6 @@ VncSharp Control Version {0} Кодування - - Шифрування - Зовнішній інструмент @@ -1146,9 +1034,6 @@ VncSharp Control Version {0} Принтери - - Смарт-карти - Звуки @@ -1366,9 +1251,6 @@ VncSharp Control Version {0} При запуску підключатися до попередніх сесій - - Оновити - Віддалений файл @@ -1674,9 +1556,6 @@ mRemoteNG зараз припинить роботу і почне процес Під час імпорту файлу «{0}» сталася помилка. - - Не вдалося імпортувати - Імпорт з &файлу… @@ -1773,15 +1652,9 @@ mRemoteNG зараз припинить роботу і почне процес Показати на панелі інструментів - - Перевірка оновлень… - Не вдалося завантажити журнал змін. - - Повторно підключити усі відкриті з'єднання - Тайм-аут RDP з'єднання @@ -1848,9 +1721,6 @@ mRemoteNG зараз припинить роботу і почне процес Виберіть, чи отримувати попередження після відключення сеансу RDP через неактивність - - Попереджати про відключення через неактивність - Пароль повинен містити принаймні {0} таких символів: {1} @@ -2054,8 +1924,8 @@ mRemoteNG зараз припинить роботу і почне процес Канал «Stable» включає лише остаточні стабільні випуски. -Канал «Beta» включає Beta та Release Candidate. -Канал «Development» включає Alpha, Beta та Release Candidate версії. +Канал «Preview» включає Beta та Release Candidate. +Канал «Nightly» включає Alpha, Beta та Release Candidate версії. Застосувати diff --git a/mRemoteNG/Resources/Language/Language.zh-CN.resx b/mRemoteNG/Language/Language.zh-CN.resx similarity index 93% rename from mRemoteNG/Resources/Language/Language.zh-CN.resx rename to mRemoteNG/Language/Language.zh-CN.resx index 683031b11..b79ec3473 100644 --- a/mRemoteNG/Resources/Language/Language.zh-CN.resx +++ b/mRemoteNG/Language/Language.zh-CN.resx @@ -246,45 +246,6 @@ 检查失败！ - - 检查成功！ - - - 启用 ICA 需要提前安装 XenDesktop Online 插件，并正确注册 wfica.ocx 库文件。您可以在此下载此插件：http://www.citrix.com/download/ -如果您已安装 XenDesktop Online 插件，但仍旧检测失败，请手动注册 wfica.ocx。 -请打开运行对话框（开始菜单/运行），并输入如下内容：“regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" ”（c:\Program Files\Citrix\ICA Client\ 是您安装 XenDesktop Online 插件的路径）。 -如果仍然无法通过此检查或在 mRemoteNG 中使用 ICA，请咨询 {0}。 - - - 发现 ICA 组件。 -Citrix ICA 客户端空间版本：{0} - - - 安装不正确 - - - SSH、Telnet、Rlogin和RAW协议均基于PuTTY。mRemoteNG安装时会自动安装内置的PuTTY到安装目录中。 -请确保Putty.exe在mRemoteNG目录中（默认为 c:\Program Files\mRemoteNG\）或是在选项（工具/选项/高级/自定义PuTTY路径）中指定Putty的有效路径。 - - - 发现 PuTTY 执行文件。 - - - 要使 RDP 正常工作，您至少需要安装远程桌面连接（终端服务）客户端 8.0。您可以在此处下载：http://support.microsoft.com/kb/925876 -如果此检查仍然失败或无法使用 RDP，请咨询 {0}。 - - - 此计算机上支持以下 RDP 协议版本：{0} - - - VNC 要求 VncSharp.dll 位于 mRemoteNG 应用程序文件夹中。 -请确认 VncSharp.dll 在您安装 mRemoteNG 的目录中（一般为 C:\Program Files\mRemoteNG\）。 -如果仍然无法通过此检查或在 mRemoteNG 中使用 VNC，请咨询 {0}。 - - - 发现 VNC 组件。 -VncSharp 版本 {0} - 服务器连接断开时，自动重试连接(仅限 RDP 和 ICA) @@ -357,9 +318,6 @@ VncSharp 版本 {0} 检测到系统存在兼容性问题 - - 组件检查 - btnIcon_Click 函数执行失败！ @@ -475,9 +433,6 @@ VncSharp 版本 {0} 在 FilteredPropertyGrid 中找不到 ToolStrip 控件。 - - 已安装版本 - 检测 @@ -502,21 +457,6 @@ VncSharp 版本 {0} 对于空用户名、密码或域名使用： - - 128 位 - - - 128位(仅用于登录) - - - 40位 - - - 56位 - - - 基本 - 完全加密连接配置文件 @@ -674,27 +614,6 @@ VncSharp 版本 {0} 设置 HTTP 属性失败！ - - ICA - - - 无法创建新 ICA 连接！ - - - ICA 插件加载失败！ - - - ICA 凭据设置失败！ - - - ICA 事件句柄设置失败！ - - - ICA 属性设置失败！ - - - ICA 分辨率设置失败！ - 通过添加前缀“快速：”来识别快速连接选项卡 @@ -704,9 +623,6 @@ VncSharp 版本 {0} 导入文件“{0}”时发生错误。 - - 导入失败 - 从文件导入(&F)... @@ -743,9 +659,6 @@ VncSharp 版本 {0} 当关闭连接时： - - 连接(&C) - 显示名称 @@ -818,9 +731,6 @@ VncSharp 版本 {0} 连接面板 - - 连接和配置 - 复制 @@ -830,24 +740,12 @@ VncSharp 版本 {0} Ctrl+Esc - - 删除连接... - 删除外部工具... - - 删除目录… - 捐赠 - - 重复连接 - - - 重复目录 - 重复标签 @@ -866,9 +764,6 @@ VncSharp 版本 {0} mRemoteNG 帮助 - - 转到 - 启动外部工具 @@ -905,12 +800,6 @@ VncSharp 版本 {0} 刷新(VNC) - - 重命名连接 - - - 重命名目录 - 重命名标签 @@ -1104,9 +993,6 @@ VncSharp 版本 {0} 请选择编码模式。 - - 请选择远程主机的加密强度： - 请选择要启动的外部工具。 @@ -1263,9 +1149,6 @@ VncSharp 版本 {0} 编码 - - 加密强度 - 外部工具 @@ -1329,9 +1212,6 @@ VncSharp 版本 {0} 剪贴板 - - 智能卡 - 声音 @@ -1564,9 +1444,6 @@ VncSharp 版本 {0} RDP 分辨率设置失败！ - - 自适应大小 - 带到这台计算机 @@ -1585,9 +1462,6 @@ VncSharp 版本 {0} 启动时自动连接上次打开的会话 - - 刷新 - 远程文件 @@ -1759,9 +1633,6 @@ VncSharp 版本 {0} 升级检查未完成！ - - 检查更新... - 下载完成！ mRemoteNG 将退出并安装更新。 @@ -1838,9 +1709,6 @@ mRemoteNG 将退出并安装更新。 确定 - - 重新连接所有打开的连接 - RDP 连接超时 @@ -1907,9 +1775,6 @@ mRemoteNG 将退出并安装更新。 选择是否在RDP会话由于不活动而断开连接后收到警报 - - 空闲断开警报 - 密码必须至少包含 {0} 个以下所示字符：{1} diff --git a/mRemoteNG/Resources/Language/Language.zh-TW.resx b/mRemoteNG/Language/Language.zh-TW.resx similarity index 94% rename from mRemoteNG/Resources/Language/Language.zh-TW.resx rename to mRemoteNG/Language/Language.zh-TW.resx index 306b7fc28..526929c31 100644 --- a/mRemoteNG/Resources/Language/Language.zh-TW.resx +++ b/mRemoteNG/Language/Language.zh-TW.resx @@ -240,27 +240,6 @@ 檢查失敗! - - 檢查成功! - - - 找到所有 ICA 元件並似乎正確註冊。 -Citrix ICA Client Control 版本 {0} - - - 未正確安裝 - - - 找到 PuTTY 執行檔且準備好使用。 - - - 找到所有 RDP 元件並似乎正確註冊。 -Remote Desktop Connection Control 版本 {0} - - - 找到所有 VNC 元件並似乎正確註冊。 -VncSharp Control 版本 {0} - 從伺服器中斷連線時自動嘗試重新連線 (僅限 RDP && ICA) @@ -324,9 +303,6 @@ VncSharp Control 版本 {0} 偵測到相容問題 - - 元件檢查 - btnIcon_Click 失敗! @@ -439,9 +415,6 @@ VncSharp Control 版本 {0} 無法在 FilteredPropertyGrid 找到 ToolStrip 控制。 - - 安裝的版本 - 偵測 @@ -463,15 +436,6 @@ VncSharp Control 版本 {0} 針對空的使用者名稱、密碼或網域欄位使用: - - 128 位元 - - - 128 位元 (只有登入) - - - 基本 - 完整加密連線檔案 @@ -574,24 +538,6 @@ VncSharp Control 版本 {0} 設定 HTTP Props 失敗! - - 無法建立新的 ICA 連線! - - - 載入 ICA Plugin 失敗! - - - ICA SetCredentials 失敗! - - - ICA Set Event Handlers 失敗! - - - ICA Set Props 失敗! - - - ICA Set Resolution 失敗! - 加入字首「Quick:」以識別快速連線索引標籤 @@ -631,9 +577,6 @@ VncSharp Control 版本 {0} 關閉連線時: - - 連線(&C): - 顯示名稱 @@ -703,9 +646,6 @@ VncSharp Control 版本 {0} 連線面板 - - 連線和組態 - 複製 @@ -715,24 +655,12 @@ VncSharp Control 版本 {0} Ctrl-Esc - - 刪除連線... - 刪除外部工具... - - 刪除資料夾... - 捐贈 - - 複製連線 - - - 複製資料夾 - 複製索引標籤 @@ -751,9 +679,6 @@ VncSharp Control 版本 {0} mRemoteNG 說明 - - 跳至 - 啟動外部工具 @@ -790,12 +715,6 @@ VncSharp Control 版本 {0} 重新整理螢幕 (VNC) - - 重新命名連線 - - - 重新命名資料夾 - 重新命名索引標籤 @@ -968,9 +887,6 @@ VncSharp Control 版本 {0} 選取使用的編碼模式。 - - 選取遠端主機的加密長度。 - 選取啟動的外部工具。 @@ -1115,9 +1031,6 @@ VncSharp Control 版本 {0} 編碼 - - 加密長度 - 外部工具 @@ -1175,9 +1088,6 @@ VncSharp Control 版本 {0} 印表機 - - 智慧卡 - 音訊 @@ -1409,9 +1319,6 @@ VncSharp Control 版本 {0} RDP SetResolution 失敗! - - 智慧大小 - 送到此電腦 @@ -1430,9 +1337,6 @@ VncSharp Control 版本 {0} 啟動時重新連線到先前開啟的工作階段 - - 重新整理 - 遠端檔案 diff --git a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs index 8a45e3c20..915568ecb 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.TextLogMessageWriterWriteDebugMsgs; } - set { Settings.Default.TextLogMessageWriterWriteDebugMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteDebugMsgs; + set => Settings.Default.TextLogMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.TextLogMessageWriterWriteInfoMsgs; } - set { Settings.Default.TextLogMessageWriterWriteInfoMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteInfoMsgs; + set => Settings.Default.TextLogMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.TextLogMessageWriterWriteWarningMsgs; } - set { Settings.Default.TextLogMessageWriterWriteWarningMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteWarningMsgs; + set => Settings.Default.TextLogMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.TextLogMessageWriterWriteErrorMsgs; } - set { Settings.Default.TextLogMessageWriterWriteErrorMsgs = value; } + get => Settings.Default.TextLogMessageWriterWriteErrorMsgs; + set => Settings.Default.TextLogMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs index 6996b9512..21c22bc10 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.NotificationPanelWriterWriteDebugMsgs; } - set { Settings.Default.NotificationPanelWriterWriteDebugMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteDebugMsgs; + set => Settings.Default.NotificationPanelWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.NotificationPanelWriterWriteInfoMsgs; } - set { Settings.Default.NotificationPanelWriterWriteInfoMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteInfoMsgs; + set => Settings.Default.NotificationPanelWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.NotificationPanelWriterWriteWarningMsgs; } - set { Settings.Default.NotificationPanelWriterWriteWarningMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteWarningMsgs; + set => Settings.Default.NotificationPanelWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.NotificationPanelWriterWriteErrorMsgs; } - set { Settings.Default.NotificationPanelWriterWriteErrorMsgs = value; } + get => Settings.Default.NotificationPanelWriterWriteErrorMsgs; + set => Settings.Default.NotificationPanelWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs index 9c3a4393b..debbbee6c 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return false; } + get => false; set { } } public bool AllowInfoMessages { - get { return Settings.Default.SwitchToMCOnInformation; } - set { Settings.Default.SwitchToMCOnInformation = value; } + get => Settings.Default.SwitchToMCOnInformation; + set => Settings.Default.SwitchToMCOnInformation = value; } public bool AllowWarningMessages { - get { return Settings.Default.SwitchToMCOnWarning; } - set { Settings.Default.SwitchToMCOnWarning = value; } + get => Settings.Default.SwitchToMCOnWarning; + set => Settings.Default.SwitchToMCOnWarning = value; } public bool AllowErrorMessages { - get { return Settings.Default.SwitchToMCOnError; } - set { Settings.Default.SwitchToMCOnError = value; } + get => Settings.Default.SwitchToMCOnError; + set => Settings.Default.SwitchToMCOnError = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs index 3f7240cc5..55786a689 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get { return Settings.Default.PopupMessageWriterWriteDebugMsgs; } - set { Settings.Default.PopupMessageWriterWriteDebugMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteDebugMsgs; + set => Settings.Default.PopupMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get { return Settings.Default.PopupMessageWriterWriteInfoMsgs; } - set { Settings.Default.PopupMessageWriterWriteInfoMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteInfoMsgs; + set => Settings.Default.PopupMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get { return Settings.Default.PopupMessageWriterWriteWarningMsgs; } - set { Settings.Default.PopupMessageWriterWriteWarningMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteWarningMsgs; + set => Settings.Default.PopupMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get { return Settings.Default.PopupMessageWriterWriteErrorMsgs; } - set { Settings.Default.PopupMessageWriterWriteErrorMsgs = value; } + get => Settings.Default.PopupMessageWriterWriteErrorMsgs; + set => Settings.Default.PopupMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageWriters/NotificationPanelMessageWriter.cs b/mRemoteNG/Messages/MessageWriters/NotificationPanelMessageWriter.cs index a33054c1d..0a4df2be1 100644 --- a/mRemoteNG/Messages/MessageWriters/NotificationPanelMessageWriter.cs +++ b/mRemoteNG/Messages/MessageWriters/NotificationPanelMessageWriter.cs @@ -1,7 +1,6 @@ using System; using System.Windows.Forms; using mRemoteNG.UI; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Window; namespace mRemoteNG.Messages.MessageWriters diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs deleted file mode 100644 index 32b384e05..000000000 --- a/mRemoteNG/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -// Review the values of the assembly attributes - -[assembly: AssemblyTitle("mRemoteNG")] -[assembly: AssemblyDescription("Multi-protocol remote connections manager")] -[assembly: AssemblyCompany("mRemoteNG")] -[assembly: AssemblyProduct("mRemoteNG")] -[assembly: AssemblyCopyright("2020 mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel")] -[assembly: AssemblyTrademark("")] - -[assembly: ComVisible(false)] - -//The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("A99669B2-FAEB-11DE-995A-826C56D89593")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// - -[assembly: AssemblyVersion("1.77.1.*")] -[assembly: NeutralResourcesLanguage("en")] \ No newline at end of file diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs index 4887bc3f2..20f3b7c1b 100644 --- a/mRemoteNG/Properties/Resources.Designer.cs +++ b/mRemoteNG/Properties/Resources.Designer.cs @@ -9,6 +9,9 @@ //------------------------------------------------------------------------------ namespace mRemoteNG.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -16,7 +19,7 @@ namespace mRemoteNG.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -60,9 +63,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _Error { + internal static System.Drawing.Bitmap Add_16x { get { - object obj = ResourceManager.GetObject("_Error", resourceCulture); + object obj = ResourceManager.GetObject("Add_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -70,9 +73,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap _lock { + internal static System.Drawing.Bitmap AddFolder_16x { get { - object obj = ResourceManager.GetObject("_lock", resourceCulture); + object obj = ResourceManager.GetObject("AddFolder_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -80,39 +83,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ActiveDirectory { + internal static System.Drawing.Bitmap AddItem_16x { get { - object obj = ResourceManager.GetObject("ActiveDirectory", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon ActiveDirectory_Icon { - get { - object obj = ResourceManager.GetObject("ActiveDirectory_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Appearance_Icon { - get { - object obj = ResourceManager.GetObject("Appearance_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap application_side_tree { - get { - object obj = ResourceManager.GetObject("application_side_tree", resourceCulture); + object obj = ResourceManager.GetObject("AddItem_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -120,9 +93,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Arrow_Down { + internal static System.Drawing.Bitmap AppearanceEditor_16x { get { - object obj = ResourceManager.GetObject("Arrow_Down", resourceCulture); + object obj = ResourceManager.GetObject("AppearanceEditor_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -130,9 +103,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_left { + internal static System.Drawing.Bitmap ASPWebSite_16x { get { - object obj = ResourceManager.GetObject("arrow_left", resourceCulture); + object obj = ResourceManager.GetObject("ASPWebSite_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -140,9 +113,10 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow_out { + internal static System.Drawing.Bitmap DocumentsFolder_16x + { get { - object obj = ResourceManager.GetObject("arrow_out", resourceCulture); + object obj = ResourceManager.GetObject("DocumentsFolder_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -150,9 +124,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Arrow_Up { + internal static System.Drawing.Bitmap Close_16x { get { - object obj = ResourceManager.GetObject("Arrow_Up", resourceCulture); + object obj = ResourceManager.GetObject("Close_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -160,9 +134,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Bad_Symbol { + internal static System.Drawing.Bitmap CloseSolution_16x { get { - object obj = ResourceManager.GetObject("Bad_Symbol", resourceCulture); + object obj = ResourceManager.GetObject("CloseSolution_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -170,113 +144,13 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap brick { + internal static System.Drawing.Bitmap CollapseAll_16x { get { - object obj = ResourceManager.GetObject("brick", resourceCulture); + object obj = ResourceManager.GetObject("CollapseAll_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Bug { - get { - object obj = ResourceManager.GetObject("Bug", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Chat { - get { - object obj = ResourceManager.GetObject("Chat", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap cog { - get { - object obj = ResourceManager.GetObject("cog", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap cog_error { - get { - object obj = ResourceManager.GetObject("cog_error", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Collapse { - get { - object obj = ResourceManager.GetObject("Collapse", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Comments_Icon { - get { - object obj = ResourceManager.GetObject("Comments_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ComponentsCheck { - get { - object obj = ResourceManager.GetObject("ComponentsCheck", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon ComponentsCheck_Icon { - get { - object obj = ResourceManager.GetObject("ComponentsCheck_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Config { - get { - object obj = ResourceManager.GetObject("Config", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Config_Icon { - get { - object obj = ResourceManager.GetObject("Config_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -290,9 +164,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connection_Add { + internal static System.Drawing.Bitmap Console_16x { get { - object obj = ResourceManager.GetObject("Connection_Add", resourceCulture); + object obj = ResourceManager.GetObject("Console_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -300,9 +174,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connection_Duplicate { + internal static System.Drawing.Bitmap Copy_16x { get { - object obj = ResourceManager.GetObject("Connection_Duplicate", resourceCulture); + object obj = ResourceManager.GetObject("Copy_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -310,9 +184,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connections_Load { + internal static System.Drawing.Bitmap Diagram_16x { get { - object obj = ResourceManager.GetObject("Connections_Load", resourceCulture); + object obj = ResourceManager.GetObject("Diagram_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -320,9 +194,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connections_New { + internal static System.Drawing.Bitmap Disconnect_16x { get { - object obj = ResourceManager.GetObject("Connections_New", resourceCulture); + object obj = ResourceManager.GetObject("Disconnect_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -330,9 +204,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connections_Save { + internal static System.Drawing.Bitmap Document_16x { get { - object obj = ResourceManager.GetObject("Connections_Save", resourceCulture); + object obj = ResourceManager.GetObject("Document_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -340,29 +214,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Connections_SaveAs { + internal static System.Drawing.Bitmap ExpandAll_16x { get { - object obj = ResourceManager.GetObject("Connections_SaveAs", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon ConnectionsSaveAs_Icon { - get { - object obj = ResourceManager.GetObject("ConnectionsSaveAs_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Console { - get { - object obj = ResourceManager.GetObject("Console", resourceCulture); + object obj = ResourceManager.GetObject("ExpandAll_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -370,29 +224,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Copy { + internal static System.Drawing.Bitmap ExpandDown_16x { get { - object obj = ResourceManager.GetObject("Copy", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Database_Icon { - get { - object obj = ResourceManager.GetObject("Database_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Delete { - get { - object obj = ResourceManager.GetObject("Delete", resourceCulture); + object obj = ResourceManager.GetObject("ExpandDown_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -400,39 +234,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Donate { + internal static System.Drawing.Bitmap Export_16x { get { - object obj = ResourceManager.GetObject("Donate", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon EditPage_Icon { - get { - object obj = ResourceManager.GetObject("EditPage_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Error_Icon { - get { - object obj = ResourceManager.GetObject("Error_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ErrorsAndInfos { - get { - object obj = ResourceManager.GetObject("ErrorsAndInfos", resourceCulture); + object obj = ResourceManager.GetObject("Export_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -440,9 +244,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ErrorSmall { + internal static System.Drawing.Bitmap ExtendedProperty_16x { get { - object obj = ResourceManager.GetObject("ErrorSmall", resourceCulture); + object obj = ResourceManager.GetObject("ExtendedProperty_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -450,9 +254,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap exclamation { + internal static System.Drawing.Bitmap F1Help_16x { get { - object obj = ResourceManager.GetObject("exclamation", resourceCulture); + object obj = ResourceManager.GetObject("F1Help_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -460,9 +264,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Expand { + internal static System.Drawing.Bitmap Favorite_16x { get { - object obj = ResourceManager.GetObject("Expand", resourceCulture); + object obj = ResourceManager.GetObject("Favorite_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -470,9 +274,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ExtApp { + internal static System.Drawing.Bitmap FolderClosed_16x { get { - object obj = ResourceManager.GetObject("ExtApp", resourceCulture); + object obj = ResourceManager.GetObject("FolderClosed_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -480,9 +284,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ExtApp_Add { + internal static System.Drawing.Bitmap FullScreen_16x { get { - object obj = ResourceManager.GetObject("ExtApp_Add", resourceCulture); + object obj = ResourceManager.GetObject("FullScreen_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -490,29 +294,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap ExtApp_Delete { + internal static System.Drawing.Bitmap GlyphDown_16x { get { - object obj = ResourceManager.GetObject("ExtApp_Delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon ExtApp_Icon { - get { - object obj = ResourceManager.GetObject("ExtApp_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ExtApp_Start { - get { - object obj = ResourceManager.GetObject("ExtApp_Start", resourceCulture); + object obj = ResourceManager.GetObject("GlyphDown_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -520,9 +304,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap File { + internal static System.Drawing.Bitmap GlyphLeft_16x { get { - object obj = ResourceManager.GetObject("File", resourceCulture); + object obj = ResourceManager.GetObject("GlyphLeft_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -530,9 +314,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Folder { + internal static System.Drawing.Bitmap GlyphRight_16x { get { - object obj = ResourceManager.GetObject("Folder", resourceCulture); + object obj = ResourceManager.GetObject("GlyphRight_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -540,59 +324,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Folder_Add { + internal static System.Drawing.Bitmap GlyphUp_16x { get { - object obj = ResourceManager.GetObject("Folder_Add", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap folder_key { - get { - object obj = ResourceManager.GetObject("folder_key", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Fullscreen { - get { - object obj = ResourceManager.GetObject("Fullscreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Good_Symbol { - get { - object obj = ResourceManager.GetObject("Good_Symbol", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap green_arrow1 { - get { - object obj = ResourceManager.GetObject("green_arrow1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap green_arrow2 { - get { - object obj = ResourceManager.GetObject("green_arrow2", resourceCulture); + object obj = ResourceManager.GetObject("GlyphUp_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -607,26 +341,6 @@ namespace mRemoteNG.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Help { - get { - object obj = ResourceManager.GetObject("Help", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Help_Icon { - get { - object obj = ResourceManager.GetObject("Help_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -660,29 +374,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Info { + internal static System.Drawing.Bitmap InsertPanel_16x { get { - object obj = ResourceManager.GetObject("Info", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Info_Icon { - get { - object obj = ResourceManager.GetObject("Info_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Information { - get { - object obj = ResourceManager.GetObject("Information", resourceCulture); + object obj = ResourceManager.GetObject("InsertPanel_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -690,9 +384,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap InformationSmall { + internal static System.Drawing.Bitmap Key_16x { get { - object obj = ResourceManager.GetObject("InformationSmall", resourceCulture); + object obj = ResourceManager.GetObject("Key_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -700,9 +394,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Inheritance { + internal static System.Drawing.Bitmap Loading_Spinner { get { - object obj = ResourceManager.GetObject("Inheritance", resourceCulture); + object obj = ResourceManager.GetObject("Loading_Spinner", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -710,9 +404,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Inheritance_Default { + internal static System.Drawing.Bitmap Lock_16x { get { - object obj = ResourceManager.GetObject("Inheritance_Default", resourceCulture); + object obj = ResourceManager.GetObject("Lock_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -720,9 +414,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap JumpTo { + internal static System.Drawing.Bitmap LogError_16x { get { - object obj = ResourceManager.GetObject("JumpTo", resourceCulture); + object obj = ResourceManager.GetObject("LogError_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -730,9 +424,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap keepass_32x32 { + internal static System.Drawing.Bitmap LogWarning_16x { get { - object obj = ResourceManager.GetObject("keepass_32x32", resourceCulture); + object obj = ResourceManager.GetObject("LogWarning_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -740,9 +434,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap key { + internal static System.Drawing.Bitmap Message_16x { get { - object obj = ResourceManager.GetObject("key", resourceCulture); + object obj = ResourceManager.GetObject("Message_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -750,119 +444,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap key_add { + internal static System.Drawing.Bitmap Monitor_16x { get { - object obj = ResourceManager.GetObject("key_add", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap key_delete { - get { - object obj = ResourceManager.GetObject("key_delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Key_Icon { - get { - object obj = ResourceManager.GetObject("Key_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Keyboard { - get { - object obj = ResourceManager.GetObject("Keyboard", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Keyboard_Icon { - get { - object obj = ResourceManager.GetObject("Keyboard_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap loading_spinner { - get { - object obj = ResourceManager.GetObject("loading_spinner", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Lock { - get { - object obj = ResourceManager.GetObject("Lock", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Monitor { - get { - object obj = ResourceManager.GetObject("Monitor", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap monitor_delete { - get { - object obj = ResourceManager.GetObject("monitor_delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap monitor_go { - get { - object obj = ResourceManager.GetObject("monitor_go", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Monitor_GoTo { - get { - object obj = ResourceManager.GetObject("Monitor_GoTo", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap mRemoteNG { - get { - object obj = ResourceManager.GetObject("mRemoteNG", resourceCulture); + object obj = ResourceManager.GetObject("Monitor_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -896,49 +480,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap News { + internal static System.Drawing.Bitmap NewFile_16x { get { - object obj = ResourceManager.GetObject("News", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon News_Icon { - get { - object obj = ResourceManager.GetObject("News_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Options { - get { - object obj = ResourceManager.GetObject("Options", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Options_Icon { - get { - object obj = ResourceManager.GetObject("Options_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Page { - get { - object obj = ResourceManager.GetObject("Page", resourceCulture); + object obj = ResourceManager.GetObject("NewFile_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -946,9 +490,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap page_copy { + internal static System.Drawing.Bitmap OpenFile_16x { get { - object obj = ResourceManager.GetObject("page_copy", resourceCulture); + object obj = ResourceManager.GetObject("OpenFile_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -956,9 +500,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Panel_Add { + internal static System.Drawing.Bitmap Panel_16x { get { - object obj = ResourceManager.GetObject("Panel_Add", resourceCulture); + object obj = ResourceManager.GetObject("Panel_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -966,119 +510,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Panel_Close { + internal static System.Drawing.Bitmap Property_16x { get { - object obj = ResourceManager.GetObject("Panel_Close", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Panels { - get { - object obj = ResourceManager.GetObject("Panels", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Panels_Icon { - get { - object obj = ResourceManager.GetObject("Panels_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Pause { - get { - object obj = ResourceManager.GetObject("Pause", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Play { - get { - object obj = ResourceManager.GetObject("Play", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Play_Quick { - get { - object obj = ResourceManager.GetObject("Play_Quick", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap PortScan { - get { - object obj = ResourceManager.GetObject("PortScan", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon PortScan_Icon { - get { - object obj = ResourceManager.GetObject("PortScan_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon PowerShell { - get { - object obj = ResourceManager.GetObject("PowerShell", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Properties { - get { - object obj = ResourceManager.GetObject("Properties", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Properties_Default { - get { - object obj = ResourceManager.GetObject("Properties_Default", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap puttycm { - get { - object obj = ResourceManager.GetObject("puttycm", resourceCulture); + object obj = ResourceManager.GetObject("Property_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1106,9 +540,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Quit { + internal static System.Drawing.Bitmap Refresh_16x { get { - object obj = ResourceManager.GetObject("Quit", resourceCulture); + object obj = ResourceManager.GetObject("Refresh_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1116,9 +550,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RDP { + internal static System.Drawing.Bitmap Remove_16x { get { - object obj = ResourceManager.GetObject("RDP", resourceCulture); + object obj = ResourceManager.GetObject("Remove_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1126,9 +560,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Refresh { + internal static System.Drawing.Bitmap Rename_16x { get { - object obj = ResourceManager.GetObject("Refresh", resourceCulture); + object obj = ResourceManager.GetObject("Rename_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1136,9 +570,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Rename { + internal static System.Drawing.Bitmap Resize_16x { get { - object obj = ResourceManager.GetObject("Rename", resourceCulture); + object obj = ResourceManager.GetObject("Resize_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1146,49 +580,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Root { + internal static System.Drawing.Bitmap Run_16x { get { - object obj = ResourceManager.GetObject("Root", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Root_Icon { - get { - object obj = ResourceManager.GetObject("Root_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Save { - get { - object obj = ResourceManager.GetObject("Save", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Save_Icon { - get { - object obj = ResourceManager.GetObject("Save_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Screenshot { - get { - object obj = ResourceManager.GetObject("Screenshot", resourceCulture); + object obj = ResourceManager.GetObject("Run_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1196,9 +590,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Screenshot_Add { + internal static System.Drawing.Bitmap RunUpdate_16x { get { - object obj = ResourceManager.GetObject("Screenshot_Add", resourceCulture); + object obj = ResourceManager.GetObject("RunUpdate_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1206,9 +600,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Screenshot_Copy { + internal static System.Drawing.Bitmap Save_16x { get { - object obj = ResourceManager.GetObject("Screenshot_Copy", resourceCulture); + object obj = ResourceManager.GetObject("Save_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1216,29 +610,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Screenshot_Delete { + internal static System.Drawing.Bitmap Schema_16x { get { - object obj = ResourceManager.GetObject("Screenshot_Delete", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Screenshot_Icon { - get { - object obj = ResourceManager.GetObject("Screenshot_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Screenshot_Save { - get { - object obj = ResourceManager.GetObject("Screenshot_Save", resourceCulture); + object obj = ResourceManager.GetObject("Schema_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1246,9 +620,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Search { + internal static System.Drawing.Bitmap SchemaObjectProperty_16x { get { - object obj = ResourceManager.GetObject("Search", resourceCulture); + object obj = ResourceManager.GetObject("SchemaObjectProperty_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1256,9 +630,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Session_LogOff { + internal static System.Drawing.Bitmap Search_16x { get { - object obj = ResourceManager.GetObject("Session_LogOff", resourceCulture); + object obj = ResourceManager.GetObject("Search_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1266,39 +640,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Sessions { + internal static System.Drawing.Bitmap SearchAndApps_16x { get { - object obj = ResourceManager.GetObject("Sessions", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Sessions_Icon { - get { - object obj = ResourceManager.GetObject("Sessions_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Shield_Icon { - get { - object obj = ResourceManager.GetObject("Shield_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap SmartSize { - get { - object obj = ResourceManager.GetObject("SmartSize", resourceCulture); + object obj = ResourceManager.GetObject("SearchAndApps_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1306,9 +650,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Sort_AZ { + internal static System.Drawing.Bitmap Settings_16x { get { - object obj = ResourceManager.GetObject("Sort_AZ", resourceCulture); + object obj = ResourceManager.GetObject("Settings_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1316,9 +660,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Sort_ZA { + internal static System.Drawing.Bitmap SortAscending_16x { get { - object obj = ResourceManager.GetObject("Sort_ZA", resourceCulture); + object obj = ResourceManager.GetObject("SortAscending_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1326,49 +670,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap SSHTransfer { + internal static System.Drawing.Bitmap SortDescending_16x { get { - object obj = ResourceManager.GetObject("SSHTransfer", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon SSHTransfer_Icon { - get { - object obj = ResourceManager.GetObject("SSHTransfer_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap star { - get { - object obj = ResourceManager.GetObject("star", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon StartupExit_Icon { - get { - object obj = ResourceManager.GetObject("StartupExit_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap tab_add { - get { - object obj = ResourceManager.GetObject("tab_add", resourceCulture); + object obj = ResourceManager.GetObject("SortDescending_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1376,9 +680,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap tab_delete { + internal static System.Drawing.Bitmap SQLDatabase_16x { get { - object obj = ResourceManager.GetObject("tab_delete", resourceCulture); + object obj = ResourceManager.GetObject("SQLDatabase_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1386,29 +690,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap tab_edit { + internal static System.Drawing.Bitmap StartupProject_16x { get { - object obj = ResourceManager.GetObject("tab_edit", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Tab_Icon { - get { - object obj = ResourceManager.GetObject("Tab_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap TabExit { - get { - object obj = ResourceManager.GetObject("TabExit", resourceCulture); + object obj = ResourceManager.GetObject("StartupProject_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1416,9 +700,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap TabOption { + internal static System.Drawing.Bitmap StatusInformation_16x { get { - object obj = ResourceManager.GetObject("TabOption", resourceCulture); + object obj = ResourceManager.GetObject("StatusInformation_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1426,9 +710,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap TabOverflow { + internal static System.Drawing.Bitmap Stop_16x { get { - object obj = ResourceManager.GetObject("TabOverflow", resourceCulture); + object obj = ResourceManager.GetObject("Stop_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1436,9 +720,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap tick { + internal static System.Drawing.Bitmap SyncArrow_16x { get { - object obj = ResourceManager.GetObject("tick", resourceCulture); + object obj = ResourceManager.GetObject("SyncArrow_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1446,9 +730,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Tools { + internal static System.Drawing.Bitmap Tab_16x { get { - object obj = ResourceManager.GetObject("Tools", resourceCulture); + object obj = ResourceManager.GetObject("Tab_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1456,29 +740,9 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Update { + internal static System.Drawing.Bitmap Test_16x { get { - object obj = ResourceManager.GetObject("Update", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Update_Icon { - get { - object obj = ResourceManager.GetObject("Update_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap user_comment { - get { - object obj = ResourceManager.GetObject("user_comment", resourceCulture); + object obj = ResourceManager.GetObject("Test_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1486,29 +750,39 @@ namespace mRemoteNG.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap UVNC_SC { + internal static System.Drawing.Bitmap ToggleOfficeKeyboardScheme_16x { get { - object obj = ResourceManager.GetObject("UVNC_SC", resourceCulture); + object obj = ResourceManager.GetObject("ToggleOfficeKeyboardScheme_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon UVNC_SC_Icon { - get { - object obj = ResourceManager.GetObject("UVNC_SC_Icon", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap View { + internal static System.Drawing.Bitmap UIAboutBox_16x { get { - object obj = ResourceManager.GetObject("View", resourceCulture); + object obj = ResourceManager.GetObject("UIAboutBox_16x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap UniqueKeyError_16x { + get { + object obj = ResourceManager.GetObject("UniqueKeyError_16x", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ViewDownBySchema_16x { + get { + object obj = ResourceManager.GetObject("ViewDownBySchema_16x", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -1532,45 +806,5 @@ namespace mRemoteNG.Properties { return ((System.Drawing.Bitmap)(obj)); } } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Warning { - get { - object obj = ResourceManager.GetObject("Warning", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap WarningSmall { - get { - object obj = ResourceManager.GetObject("WarningSmall", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap Website { - get { - object obj = ResourceManager.GetObject("Website", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap xml { - get { - object obj = ResourceManager.GetObject("xml", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } } } diff --git a/mRemoteNG/Properties/Resources.resx b/mRemoteNG/Properties/Resources.resx index c2236b323..697396b15 100644 --- a/mRemoteNG/Properties/Resources.resx +++ b/mRemoteNG/Properties/Resources.resx @@ -112,463 +112,232 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\ActiveDirectory.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Collapse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\ErrorSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Expand.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\HostStatus_Check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\HostStatus_Off.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\HostStatus_On.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\InformationSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Rename.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Root.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\PuttyConfig.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Play_Quick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Connections_Load.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Connections_New.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Connections_Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Connections_SaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\ErrorsAndInfos.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Sort_AZ.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Sort_ZA.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\RDP.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Config.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Donate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Inheritance.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Keyboard.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Options.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Panels.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Panel_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Panel_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Quit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Screenshot_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Screenshot_Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Screenshot_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Screenshot_Save.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\View.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\WarningSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Website.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Arrow_Down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Arrow_Up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Bug.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Connection_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Connection_Duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\ExtApp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\ExtApp_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\ExtApp_Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\ExtApp_Start.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\File.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Folder_Add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Page.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\PortScan.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Properties_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Sessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Session_LogOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\SmartSize.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\SSHTransfer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Tools.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Update.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Console.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Inheritance_Default.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Chat.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\JumpTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\Monitor_GoTo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\UVNC_SC.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Bad_Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\ComponentsCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Good_Symbol.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\PuttySessions.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\key_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\application_side_tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\cog_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\user_comment.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\monitor_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\monitor_go.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\Images\FamFamFam\cog.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\Images\FamFamFam\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\images\puttycm.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\green_arrow1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\green_arrow2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\key_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\brick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\folder_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\keepass_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\xml.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\FamFamFam\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + - ..\Resources\Images\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\loading_spinner.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\Header_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ConnectedOverlay.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Tiles\mRemoteNG.VisualElementsManifest.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\mRemoteNG.VisualElementsManifest.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\Resources\Tiles\VisualElements_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\VisualElements_150.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Tiles\VisualElements_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\VisualElements_70.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\ActiveDirectory_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Loading_Spinner.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Appearance_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddFolder_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Comments_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CloseSolution_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\ComponentsCheck_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CollapseAll_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Config_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Copy_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\ConnectionsSaveAs_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Diagram_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Database_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Disconnect_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\EditPage_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Document_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Error_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ExpandAll_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\ExtApp_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ExpandDown_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Help_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\F1Help_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Info_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Favorite_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Keyboard_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FolderClosed_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Key_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FullScreen_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GlyphDown_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GlyphLeft_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GlyphRight_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\GlyphUp_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Header_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\HostStatus_Check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\HostStatus_Off.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\HostStatus_On.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Message_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\NewFile_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PuttyConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PuttySessions.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Refresh_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Rename_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\RunUpdate_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Save_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Search_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Settings_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SortAscending_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SortDescending_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Test_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ToggleOfficeKeyboardScheme_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\UIAboutBox_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\AddItem_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ASPWebSite_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OpenFile_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Console_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SearchAndApps_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\InsertPanel_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Panel_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Run_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Stop_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Close_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Add_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Monitor_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Remove_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Resize_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LogError_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\LogWarning_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SchemaObjectProperty_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Schema_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\StatusInformation_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SyncArrow_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\UniqueKeyError_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ViewDownBySchema_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Icons\mRemoteNG_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mRemoteNG_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\News_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Key_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Options_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SQLDatabase_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Panels_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Tab_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\PortScan_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AppearanceEditor_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Root_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Export_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Save_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Lock_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Screenshot_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\StartupProject_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Sessions_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ExtendedProperty_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\Shield_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Property_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Icons\SSHTransfer_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Icons\StartupExit_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Icons\Tab_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\TabOption.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\TabOverflow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\TabExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Icons\Update_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Icons\UVNC_SC_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\mRemoteNG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\tab_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\tab_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\tab_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Images\star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Icons\PowerShell.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DocumentsFolder_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index a71af6867..afeaaf09e 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace mRemoteNG.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.7.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -1523,18 +1523,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("CEF")] - public string ConDefaultRenderingEngine { - get { - return ((string)(this["ConDefaultRenderingEngine"])); - } - set { - this["ConDefaultRenderingEngine"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2797,7 +2785,7 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] + [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool PlaceSearchBarAboveConnectionTree { get { return ((bool)(this["PlaceSearchBarAboveConnectionTree"])); @@ -2915,6 +2903,18 @@ namespace mRemoteNG.Properties { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int SaveConnectionsFrequency { + get { + return ((int)(this["SaveConnectionsFrequency"])); + } + set { + this["SaveConnectionsFrequency"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Highest")] @@ -3038,9 +3038,9 @@ namespace mRemoteNG.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] - public string StartupComponentsCheck { + public bool StartupComponentsCheck { get { - return ((string)(this["StartupComponentsCheck"])); + return ((bool)(this["StartupComponentsCheck"])); } set { this["StartupComponentsCheck"] = value; @@ -3095,6 +3095,18 @@ namespace mRemoteNG.Properties { } } + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string ConDefaultStartProgram { + get { + return ((string)(this["ConDefaultStartProgram"])); + } + set { + this["ConDefaultStartProgram"] = value; + } + } + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("EncrBasic")] @@ -3118,5 +3130,89 @@ namespace mRemoteNG.Properties { this["InhDefaultICAEncryptionStrength"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool StartFullScreen { + get { + return ((bool)(this["StartFullScreen"])); + } + set { + this["StartFullScreen"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ViewMenuMessages { + get { + return ((bool)(this["ViewMenuMessages"])); + } + set { + this["ViewMenuMessages"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ViewMenuQuickConnect { + get { + return ((bool)(this["ViewMenuQuickConnect"])); + } + set { + this["ViewMenuQuickConnect"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ViewMenuExternalTools { + get { + return ((bool)(this["ViewMenuExternalTools"])); + } + set { + this["ViewMenuExternalTools"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ViewMenuMultiSSH { + get { + return ((bool)(this["ViewMenuMultiSSH"])); + } + set { + this["ViewMenuMultiSSH"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("EdgeChromium")] + public string ConDefaultRenderingEngine { + get { + return ((string)(this["ConDefaultRenderingEngine"])); + } + set { + this["ConDefaultRenderingEngine"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string OpeningCommand { + get { + return ((string)(this["OpeningCommand"])); + } + set { + this["OpeningCommand"] = value; + } + } } } diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings index 45e149b21..cb74c10ef 100644 --- a/mRemoteNG/Properties/Settings.settings +++ b/mRemoteNG/Properties/Settings.settings @@ -1,5 +1,5 @@  - + @@ -377,9 +377,6 @@ - - CEF - False @@ -696,7 +693,7 @@ False - False + True True @@ -725,6 +722,9 @@ False + + 0 + Highest @@ -755,7 +755,7 @@ False - + False @@ -770,11 +770,36 @@ False + + + EncrBasic False + + False + + + False + + + False + + + False + + + False + + + EdgeChromium + + + + + \ No newline at end of file diff --git a/mRemoteNG/PuTTYNG.exe b/mRemoteNG/PuTTYNG.exe new file mode 100644 index 000000000..41d1eb926 Binary files /dev/null and b/mRemoteNG/PuTTYNG.exe differ diff --git a/mRemoteNG/Resources/ASPWebSite_16x.png b/mRemoteNG/Resources/ASPWebSite_16x.png new file mode 100644 index 000000000..fe2cbbbec Binary files /dev/null and b/mRemoteNG/Resources/ASPWebSite_16x.png differ diff --git a/mRemoteNG/Resources/AddFolder_16x.png b/mRemoteNG/Resources/AddFolder_16x.png new file mode 100644 index 000000000..fd61978a9 Binary files /dev/null and b/mRemoteNG/Resources/AddFolder_16x.png differ diff --git a/mRemoteNG/Resources/AddItem_16x.png b/mRemoteNG/Resources/AddItem_16x.png new file mode 100644 index 000000000..1721ccbf9 Binary files /dev/null and b/mRemoteNG/Resources/AddItem_16x.png differ diff --git a/mRemoteNG/Resources/Add_16x.png b/mRemoteNG/Resources/Add_16x.png new file mode 100644 index 000000000..7754d65e5 Binary files /dev/null and b/mRemoteNG/Resources/Add_16x.png differ diff --git a/mRemoteNG/Resources/AppearanceEditor_16x.png b/mRemoteNG/Resources/AppearanceEditor_16x.png new file mode 100644 index 000000000..86c59f7ff Binary files /dev/null and b/mRemoteNG/Resources/AppearanceEditor_16x.png differ diff --git a/mRemoteNG/Resources/CloseSolution_16x.png b/mRemoteNG/Resources/CloseSolution_16x.png new file mode 100644 index 000000000..41ff45a94 Binary files /dev/null and b/mRemoteNG/Resources/CloseSolution_16x.png differ diff --git a/mRemoteNG/Resources/Close_16x.png b/mRemoteNG/Resources/Close_16x.png new file mode 100644 index 000000000..6760c5a4b Binary files /dev/null and b/mRemoteNG/Resources/Close_16x.png differ diff --git a/mRemoteNG/Resources/CollapseAll_16x.png b/mRemoteNG/Resources/CollapseAll_16x.png new file mode 100644 index 000000000..315b1764c Binary files /dev/null and b/mRemoteNG/Resources/CollapseAll_16x.png differ diff --git a/mRemoteNG/Resources/Images/ConnectedOverlay.png b/mRemoteNG/Resources/ConnectedOverlay.png similarity index 100% rename from mRemoteNG/Resources/Images/ConnectedOverlay.png rename to mRemoteNG/Resources/ConnectedOverlay.png diff --git a/mRemoteNG/Resources/Console_16x.png b/mRemoteNG/Resources/Console_16x.png new file mode 100644 index 000000000..d6a022c88 Binary files /dev/null and b/mRemoteNG/Resources/Console_16x.png differ diff --git a/mRemoteNG/Resources/Copy_16x.png b/mRemoteNG/Resources/Copy_16x.png new file mode 100644 index 000000000..e06a04214 Binary files /dev/null and b/mRemoteNG/Resources/Copy_16x.png differ diff --git a/mRemoteNG/Resources/Diagram_16x.png b/mRemoteNG/Resources/Diagram_16x.png new file mode 100644 index 000000000..f4822ecbe Binary files /dev/null and b/mRemoteNG/Resources/Diagram_16x.png differ diff --git a/mRemoteNG/Resources/Disconnect_16x.png b/mRemoteNG/Resources/Disconnect_16x.png new file mode 100644 index 000000000..31a6de9e6 Binary files /dev/null and b/mRemoteNG/Resources/Disconnect_16x.png differ diff --git a/mRemoteNG/Resources/Document_16x.png b/mRemoteNG/Resources/Document_16x.png new file mode 100644 index 000000000..576043566 Binary files /dev/null and b/mRemoteNG/Resources/Document_16x.png differ diff --git a/mRemoteNG/Resources/DocumentsFolder_16x.png b/mRemoteNG/Resources/DocumentsFolder_16x.png new file mode 100644 index 000000000..859569652 Binary files /dev/null and b/mRemoteNG/Resources/DocumentsFolder_16x.png differ diff --git a/mRemoteNG/Resources/ExpandAll_16x.png b/mRemoteNG/Resources/ExpandAll_16x.png new file mode 100644 index 000000000..7fe3a9ce0 Binary files /dev/null and b/mRemoteNG/Resources/ExpandAll_16x.png differ diff --git a/mRemoteNG/Resources/ExpandDown_16x.png b/mRemoteNG/Resources/ExpandDown_16x.png new file mode 100644 index 000000000..3521c9cf5 Binary files /dev/null and b/mRemoteNG/Resources/ExpandDown_16x.png differ diff --git a/mRemoteNG/Resources/Export_16x.png b/mRemoteNG/Resources/Export_16x.png new file mode 100644 index 000000000..ace97e20f Binary files /dev/null and b/mRemoteNG/Resources/Export_16x.png differ diff --git a/mRemoteNG/Resources/ExtendedProperty_16x.png b/mRemoteNG/Resources/ExtendedProperty_16x.png new file mode 100644 index 000000000..1b3adb395 Binary files /dev/null and b/mRemoteNG/Resources/ExtendedProperty_16x.png differ diff --git a/mRemoteNG/Resources/F1Help_16x.png b/mRemoteNG/Resources/F1Help_16x.png new file mode 100644 index 000000000..f38f04d3e Binary files /dev/null and b/mRemoteNG/Resources/F1Help_16x.png differ diff --git a/mRemoteNG/Resources/Favorite_16x.png b/mRemoteNG/Resources/Favorite_16x.png new file mode 100644 index 000000000..c75b5845e Binary files /dev/null and b/mRemoteNG/Resources/Favorite_16x.png differ diff --git a/mRemoteNG/Resources/FolderClosed_16x.png b/mRemoteNG/Resources/FolderClosed_16x.png new file mode 100644 index 000000000..b82d94f17 Binary files /dev/null and b/mRemoteNG/Resources/FolderClosed_16x.png differ diff --git a/mRemoteNG/Resources/FullScreen_16x.png b/mRemoteNG/Resources/FullScreen_16x.png new file mode 100644 index 000000000..bc21cb28e Binary files /dev/null and b/mRemoteNG/Resources/FullScreen_16x.png differ diff --git a/mRemoteNG/Resources/GlyphDown_16x.png b/mRemoteNG/Resources/GlyphDown_16x.png new file mode 100644 index 000000000..9e51e3f76 Binary files /dev/null and b/mRemoteNG/Resources/GlyphDown_16x.png differ diff --git a/mRemoteNG/Resources/GlyphLeft_16x.png b/mRemoteNG/Resources/GlyphLeft_16x.png new file mode 100644 index 000000000..0a095ad71 Binary files /dev/null and b/mRemoteNG/Resources/GlyphLeft_16x.png differ diff --git a/mRemoteNG/Resources/GlyphRight_16x.png b/mRemoteNG/Resources/GlyphRight_16x.png new file mode 100644 index 000000000..e6e3f0e56 Binary files /dev/null and b/mRemoteNG/Resources/GlyphRight_16x.png differ diff --git a/mRemoteNG/Resources/GlyphUp_16x.png b/mRemoteNG/Resources/GlyphUp_16x.png new file mode 100644 index 000000000..27f9ab916 Binary files /dev/null and b/mRemoteNG/Resources/GlyphUp_16x.png differ diff --git a/mRemoteNG/Resources/Images/Header_dark.png b/mRemoteNG/Resources/Header_dark.png similarity index 100% rename from mRemoteNG/Resources/Images/Header_dark.png rename to mRemoteNG/Resources/Header_dark.png diff --git a/mRemoteNG/Resources/HostStatus_Check.png b/mRemoteNG/Resources/HostStatus_Check.png new file mode 100644 index 000000000..45948e48e Binary files /dev/null and b/mRemoteNG/Resources/HostStatus_Check.png differ diff --git a/mRemoteNG/Resources/HostStatus_Off.png b/mRemoteNG/Resources/HostStatus_Off.png new file mode 100644 index 000000000..d6d807db7 Binary files /dev/null and b/mRemoteNG/Resources/HostStatus_Off.png differ diff --git a/mRemoteNG/Resources/HostStatus_On.png b/mRemoteNG/Resources/HostStatus_On.png new file mode 100644 index 000000000..76bebdf7b Binary files /dev/null and b/mRemoteNG/Resources/HostStatus_On.png differ diff --git a/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico b/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico deleted file mode 100644 index 2c1b2b23e..000000000 Binary files a/mRemoteNG/Resources/Icons/ActiveDirectory_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Appearance_Icon.ico b/mRemoteNG/Resources/Icons/Appearance_Icon.ico deleted file mode 100644 index 4aea5a645..000000000 Binary files a/mRemoteNG/Resources/Icons/Appearance_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Comments_Icon.ico b/mRemoteNG/Resources/Icons/Comments_Icon.ico deleted file mode 100644 index bfa94ca15..000000000 Binary files a/mRemoteNG/Resources/Icons/Comments_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/ComponentsCheck_Icon.ico b/mRemoteNG/Resources/Icons/ComponentsCheck_Icon.ico deleted file mode 100644 index 090e14f59..000000000 Binary files a/mRemoteNG/Resources/Icons/ComponentsCheck_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Config_Icon.ico b/mRemoteNG/Resources/Icons/Config_Icon.ico deleted file mode 100644 index 04736abcb..000000000 Binary files a/mRemoteNG/Resources/Icons/Config_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico b/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico deleted file mode 100644 index 0cb5d8896..000000000 Binary files a/mRemoteNG/Resources/Icons/ConnectionsSaveAs_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Database_Icon.ico b/mRemoteNG/Resources/Icons/Database_Icon.ico deleted file mode 100644 index 9704872c8..000000000 Binary files a/mRemoteNG/Resources/Icons/Database_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/EditPage_Icon.ico b/mRemoteNG/Resources/Icons/EditPage_Icon.ico deleted file mode 100644 index 99983485f..000000000 Binary files a/mRemoteNG/Resources/Icons/EditPage_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Error_Icon.ico b/mRemoteNG/Resources/Icons/Error_Icon.ico deleted file mode 100644 index 3c1460f46..000000000 Binary files a/mRemoteNG/Resources/Icons/Error_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/ExtApp_Icon.ico b/mRemoteNG/Resources/Icons/ExtApp_Icon.ico deleted file mode 100644 index f8d9517b9..000000000 Binary files a/mRemoteNG/Resources/Icons/ExtApp_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Help_Icon.ico b/mRemoteNG/Resources/Icons/Help_Icon.ico deleted file mode 100644 index 48f3c5289..000000000 Binary files a/mRemoteNG/Resources/Icons/Help_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Info_Icon.ico b/mRemoteNG/Resources/Icons/Info_Icon.ico deleted file mode 100644 index 2728dd14c..000000000 Binary files a/mRemoteNG/Resources/Icons/Info_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Key_Icon.ico b/mRemoteNG/Resources/Icons/Key_Icon.ico deleted file mode 100644 index f1372678f..000000000 Binary files a/mRemoteNG/Resources/Icons/Key_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Keyboard_Icon.ico b/mRemoteNG/Resources/Icons/Keyboard_Icon.ico deleted file mode 100644 index cb4322d2f..000000000 Binary files a/mRemoteNG/Resources/Icons/Keyboard_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/News_Icon.ico b/mRemoteNG/Resources/Icons/News_Icon.ico deleted file mode 100644 index e443efa28..000000000 Binary files a/mRemoteNG/Resources/Icons/News_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Options_Icon.ico b/mRemoteNG/Resources/Icons/Options_Icon.ico deleted file mode 100644 index 75ea960da..000000000 Binary files a/mRemoteNG/Resources/Icons/Options_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Panels_Icon.ico b/mRemoteNG/Resources/Icons/Panels_Icon.ico deleted file mode 100644 index d2e3a095b..000000000 Binary files a/mRemoteNG/Resources/Icons/Panels_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/PortScan_Icon.ico b/mRemoteNG/Resources/Icons/PortScan_Icon.ico deleted file mode 100644 index 60f0200b9..000000000 Binary files a/mRemoteNG/Resources/Icons/PortScan_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Root_Icon.ico b/mRemoteNG/Resources/Icons/Root_Icon.ico deleted file mode 100644 index 95cc05e00..000000000 Binary files a/mRemoteNG/Resources/Icons/Root_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico b/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico deleted file mode 100644 index 0d3f2527e..000000000 Binary files a/mRemoteNG/Resources/Icons/SSHTransfer_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Save_Icon.ico b/mRemoteNG/Resources/Icons/Save_Icon.ico deleted file mode 100644 index eb522217d..000000000 Binary files a/mRemoteNG/Resources/Icons/Save_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Screenshot_Icon.ico b/mRemoteNG/Resources/Icons/Screenshot_Icon.ico deleted file mode 100644 index 5f0da7ac6..000000000 Binary files a/mRemoteNG/Resources/Icons/Screenshot_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Sessions_Icon.ico b/mRemoteNG/Resources/Icons/Sessions_Icon.ico deleted file mode 100644 index 8b3d2c1ad..000000000 Binary files a/mRemoteNG/Resources/Icons/Sessions_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Shield_Icon.ico b/mRemoteNG/Resources/Icons/Shield_Icon.ico deleted file mode 100644 index cae34721c..000000000 Binary files a/mRemoteNG/Resources/Icons/Shield_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/StartupExit_Icon.ico b/mRemoteNG/Resources/Icons/StartupExit_Icon.ico deleted file mode 100644 index 0f733a92d..000000000 Binary files a/mRemoteNG/Resources/Icons/StartupExit_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Tab_Icon.ico b/mRemoteNG/Resources/Icons/Tab_Icon.ico deleted file mode 100644 index 434212737..000000000 Binary files a/mRemoteNG/Resources/Icons/Tab_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico b/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico deleted file mode 100644 index 393489755..000000000 Binary files a/mRemoteNG/Resources/Icons/UVNC_SC_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/Icons/Update_Icon.ico b/mRemoteNG/Resources/Icons/Update_Icon.ico deleted file mode 100644 index 57ea6cc8a..000000000 Binary files a/mRemoteNG/Resources/Icons/Update_Icon.ico and /dev/null differ diff --git a/mRemoteNG/Resources/ImageConverter.cs b/mRemoteNG/Resources/ImageConverter.cs new file mode 100644 index 000000000..b4d9811fe --- /dev/null +++ b/mRemoteNG/Resources/ImageConverter.cs @@ -0,0 +1,19 @@ +using System.Drawing; + +namespace mRemoteNG.Resources +{ + class ImageConverter + { + /// + /// Draws an Icon from a Bitmap + /// + /// + /// + internal static Icon GetImageAsIcon(Bitmap bitmap) + { + var icon = Icon.FromHandle(bitmap.GetHicon()); + + return icon; + } + } +} diff --git a/mRemoteNG/Resources/Images/ActiveDirectory.png b/mRemoteNG/Resources/Images/ActiveDirectory.png deleted file mode 100644 index 3e459ae67..000000000 Binary files a/mRemoteNG/Resources/Images/ActiveDirectory.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Arrow_Down.png b/mRemoteNG/Resources/Images/Arrow_Down.png deleted file mode 100644 index eedc8b8e6..000000000 Binary files a/mRemoteNG/Resources/Images/Arrow_Down.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Arrow_Up.png b/mRemoteNG/Resources/Images/Arrow_Up.png deleted file mode 100644 index ea46c0d4f..000000000 Binary files a/mRemoteNG/Resources/Images/Arrow_Up.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Bad_Symbol.png b/mRemoteNG/Resources/Images/Bad_Symbol.png deleted file mode 100644 index ca97ab755..000000000 Binary files a/mRemoteNG/Resources/Images/Bad_Symbol.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Collapse.png b/mRemoteNG/Resources/Images/Collapse.png deleted file mode 100644 index 045bec35f..000000000 Binary files a/mRemoteNG/Resources/Images/Collapse.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/ComponentsCheck.png b/mRemoteNG/Resources/Images/ComponentsCheck.png deleted file mode 100644 index 0111960e9..000000000 Binary files a/mRemoteNG/Resources/Images/ComponentsCheck.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Config.png b/mRemoteNG/Resources/Images/Config.png deleted file mode 100644 index c3038cfe3..000000000 Binary files a/mRemoteNG/Resources/Images/Config.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Connections_Load.png b/mRemoteNG/Resources/Images/Connections_Load.png deleted file mode 100644 index 2396025df..000000000 Binary files a/mRemoteNG/Resources/Images/Connections_Load.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Connections_New.png b/mRemoteNG/Resources/Images/Connections_New.png deleted file mode 100644 index f03158547..000000000 Binary files a/mRemoteNG/Resources/Images/Connections_New.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Connections_Save.png b/mRemoteNG/Resources/Images/Connections_Save.png deleted file mode 100644 index b36436473..000000000 Binary files a/mRemoteNG/Resources/Images/Connections_Save.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Connections_SaveAs.png b/mRemoteNG/Resources/Images/Connections_SaveAs.png deleted file mode 100644 index 7ebb679a7..000000000 Binary files a/mRemoteNG/Resources/Images/Connections_SaveAs.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Copy.png b/mRemoteNG/Resources/Images/Copy.png deleted file mode 100644 index cb3d8717a..000000000 Binary files a/mRemoteNG/Resources/Images/Copy.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Delete.png b/mRemoteNG/Resources/Images/Delete.png deleted file mode 100644 index 7f830593d..000000000 Binary files a/mRemoteNG/Resources/Images/Delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Duplicate.png b/mRemoteNG/Resources/Images/Duplicate.png deleted file mode 100644 index 36635f0bb..000000000 Binary files a/mRemoteNG/Resources/Images/Duplicate.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Error.png b/mRemoteNG/Resources/Images/Error.png deleted file mode 100644 index 9d9737afd..000000000 Binary files a/mRemoteNG/Resources/Images/Error.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/ErrorSmall.png b/mRemoteNG/Resources/Images/ErrorSmall.png deleted file mode 100644 index ed633b43a..000000000 Binary files a/mRemoteNG/Resources/Images/ErrorSmall.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/ErrorsAndInfos.png b/mRemoteNG/Resources/Images/ErrorsAndInfos.png deleted file mode 100644 index e623ba282..000000000 Binary files a/mRemoteNG/Resources/Images/ErrorsAndInfos.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Exit.png b/mRemoteNG/Resources/Images/Exit.png deleted file mode 100644 index a70a2aba4..000000000 Binary files a/mRemoteNG/Resources/Images/Exit.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Expand.png b/mRemoteNG/Resources/Images/Expand.png deleted file mode 100644 index b5f775c14..000000000 Binary files a/mRemoteNG/Resources/Images/Expand.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/ExtApp.png b/mRemoteNG/Resources/Images/ExtApp.png deleted file mode 100644 index 9561ce73f..000000000 Binary files a/mRemoteNG/Resources/Images/ExtApp.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Arrow_Down.png b/mRemoteNG/Resources/Images/FamFamFam/Arrow_Down.png deleted file mode 100644 index 9b23c06d7..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Arrow_Down.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Arrow_Up.png b/mRemoteNG/Resources/Images/FamFamFam/Arrow_Up.png deleted file mode 100644 index 24df0f421..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Arrow_Up.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Bug.png b/mRemoteNG/Resources/Images/FamFamFam/Bug.png deleted file mode 100644 index 2d5fb90ec..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Bug.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Chat.png b/mRemoteNG/Resources/Images/FamFamFam/Chat.png deleted file mode 100644 index 39433cf78..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Chat.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Config.png b/mRemoteNG/Resources/Images/FamFamFam/Config.png deleted file mode 100644 index 768bb25ee..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Config.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Connection_Add.png b/mRemoteNG/Resources/Images/FamFamFam/Connection_Add.png deleted file mode 100644 index 21492c2ec..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Connection_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Connection_Duplicate.png b/mRemoteNG/Resources/Images/FamFamFam/Connection_Duplicate.png deleted file mode 100644 index 02649ab66..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Connection_Duplicate.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Console.png b/mRemoteNG/Resources/Images/FamFamFam/Console.png deleted file mode 100644 index c28dd6381..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Console.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Copy.png b/mRemoteNG/Resources/Images/FamFamFam/Copy.png deleted file mode 100644 index 195dc6d6c..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Copy.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Delete.png b/mRemoteNG/Resources/Images/FamFamFam/Delete.png deleted file mode 100644 index 1514d51a3..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Donate.png b/mRemoteNG/Resources/Images/FamFamFam/Donate.png deleted file mode 100644 index 42c52d05f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Donate.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/ExtApp.png b/mRemoteNG/Resources/Images/FamFamFam/ExtApp.png deleted file mode 100644 index b3d8ce01e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/ExtApp.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Add.png b/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Add.png deleted file mode 100644 index 4c2875304..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Delete.png b/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Delete.png deleted file mode 100644 index 5f8635a6e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Start.png b/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Start.png deleted file mode 100644 index 4e9b34f67..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/ExtApp_Start.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/File.png b/mRemoteNG/Resources/Images/FamFamFam/File.png deleted file mode 100644 index 03ddd799f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/File.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Folder.png b/mRemoteNG/Resources/Images/FamFamFam/Folder.png deleted file mode 100644 index 784e8fa48..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Folder.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Folder_Add.png b/mRemoteNG/Resources/Images/FamFamFam/Folder_Add.png deleted file mode 100644 index 529fe8fe0..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Folder_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Help.png b/mRemoteNG/Resources/Images/FamFamFam/Help.png deleted file mode 100644 index 5c870176d..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Help.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Info.png b/mRemoteNG/Resources/Images/FamFamFam/Info.png deleted file mode 100644 index 12cd1aef9..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Info.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Inheritance.png b/mRemoteNG/Resources/Images/FamFamFam/Inheritance.png deleted file mode 100644 index c32d25c16..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Inheritance.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Inheritance_Default.png b/mRemoteNG/Resources/Images/FamFamFam/Inheritance_Default.png deleted file mode 100644 index eae300fd7..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Inheritance_Default.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/JumpTo.png b/mRemoteNG/Resources/Images/FamFamFam/JumpTo.png deleted file mode 100644 index 29039e6a8..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/JumpTo.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Keyboard.png b/mRemoteNG/Resources/Images/FamFamFam/Keyboard.png deleted file mode 100644 index 898d402d7..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Keyboard.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Link.png b/mRemoteNG/Resources/Images/FamFamFam/Link.png deleted file mode 100644 index 25eacb7c2..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Link.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Monitor.png b/mRemoteNG/Resources/Images/FamFamFam/Monitor.png deleted file mode 100644 index d040bd022..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Monitor.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Monitor_GoTo.png b/mRemoteNG/Resources/Images/FamFamFam/Monitor_GoTo.png deleted file mode 100644 index 8af3eda9f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Monitor_GoTo.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/News.png b/mRemoteNG/Resources/Images/FamFamFam/News.png deleted file mode 100644 index 356c3b860..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/News.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Options.png b/mRemoteNG/Resources/Images/FamFamFam/Options.png deleted file mode 100644 index 5c8213fef..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Options.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Page.png b/mRemoteNG/Resources/Images/FamFamFam/Page.png deleted file mode 100644 index 813f712f7..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Page.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Panel_Add.png b/mRemoteNG/Resources/Images/FamFamFam/Panel_Add.png deleted file mode 100644 index 62037221c..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Panel_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Panel_Close.png b/mRemoteNG/Resources/Images/FamFamFam/Panel_Close.png deleted file mode 100644 index 4bd45f131..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Panel_Close.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Panels.png b/mRemoteNG/Resources/Images/FamFamFam/Panels.png deleted file mode 100644 index b4aaad9a4..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Panels.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Pause.png b/mRemoteNG/Resources/Images/FamFamFam/Pause.png deleted file mode 100644 index 2d9ce9c4e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Pause.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Play.png b/mRemoteNG/Resources/Images/FamFamFam/Play.png deleted file mode 100644 index f8c8ec683..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Play.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/PortScan.png b/mRemoteNG/Resources/Images/FamFamFam/PortScan.png deleted file mode 100644 index b80ec6d9d..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/PortScan.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Properties.png b/mRemoteNG/Resources/Images/FamFamFam/Properties.png deleted file mode 100644 index abcd93689..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Properties.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Properties_Default.png b/mRemoteNG/Resources/Images/FamFamFam/Properties_Default.png deleted file mode 100644 index 2a3e5c4df..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Properties_Default.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Quit.png b/mRemoteNG/Resources/Images/FamFamFam/Quit.png deleted file mode 100644 index 41676a0a5..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Quit.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Refresh.png b/mRemoteNG/Resources/Images/FamFamFam/Refresh.png deleted file mode 100644 index 0de26566d..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Refresh.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/SSHTransfer.png b/mRemoteNG/Resources/Images/FamFamFam/SSHTransfer.png deleted file mode 100644 index 258c16c63..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/SSHTransfer.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Save.png b/mRemoteNG/Resources/Images/FamFamFam/Save.png deleted file mode 100644 index 99d532e8b..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Save.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Screenshot.png b/mRemoteNG/Resources/Images/FamFamFam/Screenshot.png deleted file mode 100644 index 4a158fef7..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Screenshot.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Add.png b/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Add.png deleted file mode 100644 index d6d3f8564..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Copy.png b/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Copy.png deleted file mode 100644 index d9591c13f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Copy.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Delete.png b/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Delete.png deleted file mode 100644 index cca9f535d..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Save.png b/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Save.png deleted file mode 100644 index 777fb5d2e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Screenshot_Save.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Search.png b/mRemoteNG/Resources/Images/FamFamFam/Search.png deleted file mode 100644 index cf3d97f75..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Search.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Session_LogOff.png b/mRemoteNG/Resources/Images/FamFamFam/Session_LogOff.png deleted file mode 100644 index acbb5630e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Session_LogOff.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Sessions.png b/mRemoteNG/Resources/Images/FamFamFam/Sessions.png deleted file mode 100644 index c1a52a520..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Sessions.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/SmartSize.png b/mRemoteNG/Resources/Images/FamFamFam/SmartSize.png deleted file mode 100644 index ce27fe3a0..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/SmartSize.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Tools.png b/mRemoteNG/Resources/Images/FamFamFam/Tools.png deleted file mode 100644 index dbac6eae8..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Tools.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Update.png b/mRemoteNG/Resources/Images/FamFamFam/Update.png deleted file mode 100644 index 8850a8355..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Update.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/View.png b/mRemoteNG/Resources/Images/FamFamFam/View.png deleted file mode 100644 index 00818f636..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/View.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Warning_Small.png b/mRemoteNG/Resources/Images/FamFamFam/Warning_Small.png deleted file mode 100644 index 628cf2dae..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Warning_Small.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/Website.png b/mRemoteNG/Resources/Images/FamFamFam/Website.png deleted file mode 100644 index b8edc1265..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/Website.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/application_side_tree.png b/mRemoteNG/Resources/Images/FamFamFam/application_side_tree.png deleted file mode 100644 index f04a52b3d..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/application_side_tree.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/arrow_left.png b/mRemoteNG/Resources/Images/FamFamFam/arrow_left.png deleted file mode 100644 index 5dc696781..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/arrow_left.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/arrow_out.png b/mRemoteNG/Resources/Images/FamFamFam/arrow_out.png deleted file mode 100644 index 2e9bc42be..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/arrow_out.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/brick.png b/mRemoteNG/Resources/Images/FamFamFam/brick.png deleted file mode 100644 index 7851cf34c..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/brick.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/cog.png b/mRemoteNG/Resources/Images/FamFamFam/cog.png deleted file mode 100644 index 67de2c6cc..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/cog.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/cog_error.png b/mRemoteNG/Resources/Images/FamFamFam/cog_error.png deleted file mode 100644 index 47667430a..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/cog_error.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/database.png b/mRemoteNG/Resources/Images/FamFamFam/database.png deleted file mode 100644 index 3d09261a2..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/database.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/exclamation.png b/mRemoteNG/Resources/Images/FamFamFam/exclamation.png deleted file mode 100644 index c37bd062e..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/exclamation.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/folder_key.png b/mRemoteNG/Resources/Images/FamFamFam/folder_key.png deleted file mode 100644 index fb9b4c2bb..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/folder_key.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/key.png b/mRemoteNG/Resources/Images/FamFamFam/key.png deleted file mode 100644 index 4ec1a9281..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/key.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/key_add.png b/mRemoteNG/Resources/Images/FamFamFam/key_add.png deleted file mode 100644 index d40740396..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/key_add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/key_delete.png b/mRemoteNG/Resources/Images/FamFamFam/key_delete.png deleted file mode 100644 index 00dec80d8..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/key_delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/key_go.png b/mRemoteNG/Resources/Images/FamFamFam/key_go.png deleted file mode 100644 index 30b0dc316..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/key_go.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/lock.png b/mRemoteNG/Resources/Images/FamFamFam/lock.png deleted file mode 100644 index 2ebc4f6f9..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/lock.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/monitor_delete.png b/mRemoteNG/Resources/Images/FamFamFam/monitor_delete.png deleted file mode 100644 index 37332563f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/monitor_delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/monitor_go.png b/mRemoteNG/Resources/Images/FamFamFam/monitor_go.png deleted file mode 100644 index 8af3eda9f..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/monitor_go.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/page_copy.png b/mRemoteNG/Resources/Images/FamFamFam/page_copy.png deleted file mode 100644 index 195dc6d6c..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/page_copy.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/shield.png b/mRemoteNG/Resources/Images/FamFamFam/shield.png deleted file mode 100644 index 3cb4e2578..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/shield.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/tick.png b/mRemoteNG/Resources/Images/FamFamFam/tick.png deleted file mode 100644 index a9925a06a..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/tick.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/FamFamFam/user_comment.png b/mRemoteNG/Resources/Images/FamFamFam/user_comment.png deleted file mode 100644 index e54ebebaf..000000000 Binary files a/mRemoteNG/Resources/Images/FamFamFam/user_comment.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/File.png b/mRemoteNG/Resources/Images/File.png deleted file mode 100644 index a6a9206c1..000000000 Binary files a/mRemoteNG/Resources/Images/File.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Folder.png b/mRemoteNG/Resources/Images/Folder.png deleted file mode 100644 index 0c35ef7ce..000000000 Binary files a/mRemoteNG/Resources/Images/Folder.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Fullscreen.png b/mRemoteNG/Resources/Images/Fullscreen.png deleted file mode 100644 index 511e7a08a..000000000 Binary files a/mRemoteNG/Resources/Images/Fullscreen.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Good_Symbol.png b/mRemoteNG/Resources/Images/Good_Symbol.png deleted file mode 100644 index 22af10bf9..000000000 Binary files a/mRemoteNG/Resources/Images/Good_Symbol.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Help.png b/mRemoteNG/Resources/Images/Help.png deleted file mode 100644 index edf9d2922..000000000 Binary files a/mRemoteNG/Resources/Images/Help.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/HostStatus_Check.png b/mRemoteNG/Resources/Images/HostStatus_Check.png deleted file mode 100644 index a2b16bf06..000000000 Binary files a/mRemoteNG/Resources/Images/HostStatus_Check.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/HostStatus_Off.png b/mRemoteNG/Resources/Images/HostStatus_Off.png deleted file mode 100644 index 8d6f32544..000000000 Binary files a/mRemoteNG/Resources/Images/HostStatus_Off.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/HostStatus_On.png b/mRemoteNG/Resources/Images/HostStatus_On.png deleted file mode 100644 index ceaf83c44..000000000 Binary files a/mRemoteNG/Resources/Images/HostStatus_On.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Info.png b/mRemoteNG/Resources/Images/Info.png deleted file mode 100644 index 4f07f8454..000000000 Binary files a/mRemoteNG/Resources/Images/Info.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Information.png b/mRemoteNG/Resources/Images/Information.png deleted file mode 100644 index 705d27d42..000000000 Binary files a/mRemoteNG/Resources/Images/Information.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/InformationSmall.png b/mRemoteNG/Resources/Images/InformationSmall.png deleted file mode 100644 index c82358499..000000000 Binary files a/mRemoteNG/Resources/Images/InformationSmall.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Inheritance.png b/mRemoteNG/Resources/Images/Inheritance.png deleted file mode 100644 index f62137498..000000000 Binary files a/mRemoteNG/Resources/Images/Inheritance.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Keyboard.png b/mRemoteNG/Resources/Images/Keyboard.png deleted file mode 100644 index 4b4676f18..000000000 Binary files a/mRemoteNG/Resources/Images/Keyboard.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Lock.png b/mRemoteNG/Resources/Images/Lock.png deleted file mode 100644 index b70b50f65..000000000 Binary files a/mRemoteNG/Resources/Images/Lock.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Minimize.png b/mRemoteNG/Resources/Images/Minimize.png deleted file mode 100644 index 9c61bf1eb..000000000 Binary files a/mRemoteNG/Resources/Images/Minimize.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/New.png b/mRemoteNG/Resources/Images/New.png deleted file mode 100644 index bed8d2cbc..000000000 Binary files a/mRemoteNG/Resources/Images/New.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/NewConnection.png b/mRemoteNG/Resources/Images/NewConnection.png deleted file mode 100644 index 2985b8d77..000000000 Binary files a/mRemoteNG/Resources/Images/NewConnection.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/NewFolder.png b/mRemoteNG/Resources/Images/NewFolder.png deleted file mode 100644 index 872173231..000000000 Binary files a/mRemoteNG/Resources/Images/NewFolder.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Open.png b/mRemoteNG/Resources/Images/Open.png deleted file mode 100644 index 1f5e38cd8..000000000 Binary files a/mRemoteNG/Resources/Images/Open.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Options.png b/mRemoteNG/Resources/Images/Options.png deleted file mode 100644 index fe9b9c62b..000000000 Binary files a/mRemoteNG/Resources/Images/Options.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Pause.png b/mRemoteNG/Resources/Images/Pause.png deleted file mode 100644 index d89667218..000000000 Binary files a/mRemoteNG/Resources/Images/Pause.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Play.png b/mRemoteNG/Resources/Images/Play.png deleted file mode 100644 index d54035da7..000000000 Binary files a/mRemoteNG/Resources/Images/Play.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Play_Quick.png b/mRemoteNG/Resources/Images/Play_Quick.png deleted file mode 100644 index 72064726e..000000000 Binary files a/mRemoteNG/Resources/Images/Play_Quick.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/PortScan.png b/mRemoteNG/Resources/Images/PortScan.png deleted file mode 100644 index 32dbe8c86..000000000 Binary files a/mRemoteNG/Resources/Images/PortScan.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Properties.png b/mRemoteNG/Resources/Images/Properties.png deleted file mode 100644 index 0c5ec1c05..000000000 Binary files a/mRemoteNG/Resources/Images/Properties.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/PropertiesDefault.png b/mRemoteNG/Resources/Images/PropertiesDefault.png deleted file mode 100644 index 03dca1781..000000000 Binary files a/mRemoteNG/Resources/Images/PropertiesDefault.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/RDP.png b/mRemoteNG/Resources/Images/RDP.png deleted file mode 100644 index 56aef05b6..000000000 Binary files a/mRemoteNG/Resources/Images/RDP.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Refresh.png b/mRemoteNG/Resources/Images/Refresh.png deleted file mode 100644 index 56fb0eb14..000000000 Binary files a/mRemoteNG/Resources/Images/Refresh.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Rename.png b/mRemoteNG/Resources/Images/Rename.png deleted file mode 100644 index 16ba7ca9b..000000000 Binary files a/mRemoteNG/Resources/Images/Rename.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Root.png b/mRemoteNG/Resources/Images/Root.png deleted file mode 100644 index 5915cb451..000000000 Binary files a/mRemoteNG/Resources/Images/Root.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/SSHTransfer.png b/mRemoteNG/Resources/Images/SSHTransfer.png deleted file mode 100644 index 7447e6291..000000000 Binary files a/mRemoteNG/Resources/Images/SSHTransfer.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Save.png b/mRemoteNG/Resources/Images/Save.png deleted file mode 100644 index 353e93d11..000000000 Binary files a/mRemoteNG/Resources/Images/Save.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Screenshot.png b/mRemoteNG/Resources/Images/Screenshot.png deleted file mode 100644 index b11d6aa57..000000000 Binary files a/mRemoteNG/Resources/Images/Screenshot.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Screenshot_Add.png b/mRemoteNG/Resources/Images/Screenshot_Add.png deleted file mode 100644 index caba335b5..000000000 Binary files a/mRemoteNG/Resources/Images/Screenshot_Add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Search.png b/mRemoteNG/Resources/Images/Search.png deleted file mode 100644 index 851d54a33..000000000 Binary files a/mRemoteNG/Resources/Images/Search.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Sessions.png b/mRemoteNG/Resources/Images/Sessions.png deleted file mode 100644 index 7d58120ed..000000000 Binary files a/mRemoteNG/Resources/Images/Sessions.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Sort_AZ.png b/mRemoteNG/Resources/Images/Sort_AZ.png deleted file mode 100644 index 02e7740ff..000000000 Binary files a/mRemoteNG/Resources/Images/Sort_AZ.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Sort_ZA.png b/mRemoteNG/Resources/Images/Sort_ZA.png deleted file mode 100644 index 6ad8f5c08..000000000 Binary files a/mRemoteNG/Resources/Images/Sort_ZA.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/TabExit.png b/mRemoteNG/Resources/Images/TabExit.png deleted file mode 100644 index a70a2aba4..000000000 Binary files a/mRemoteNG/Resources/Images/TabExit.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/TabOption.png b/mRemoteNG/Resources/Images/TabOption.png deleted file mode 100644 index 455c453a4..000000000 Binary files a/mRemoteNG/Resources/Images/TabOption.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/TabOverflow.png b/mRemoteNG/Resources/Images/TabOverflow.png deleted file mode 100644 index 84619ba13..000000000 Binary files a/mRemoteNG/Resources/Images/TabOverflow.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Tools.png b/mRemoteNG/Resources/Images/Tools.png deleted file mode 100644 index 78c1dcf18..000000000 Binary files a/mRemoteNG/Resources/Images/Tools.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/UVNC_SC.png b/mRemoteNG/Resources/Images/UVNC_SC.png deleted file mode 100644 index 8154a2459..000000000 Binary files a/mRemoteNG/Resources/Images/UVNC_SC.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Update.png b/mRemoteNG/Resources/Images/Update.png deleted file mode 100644 index dc5c27799..000000000 Binary files a/mRemoteNG/Resources/Images/Update.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/View.png b/mRemoteNG/Resources/Images/View.png deleted file mode 100644 index 27ef5e33b..000000000 Binary files a/mRemoteNG/Resources/Images/View.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Warning.png b/mRemoteNG/Resources/Images/Warning.png deleted file mode 100644 index 3390da3e9..000000000 Binary files a/mRemoteNG/Resources/Images/Warning.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/WarningSmall.png b/mRemoteNG/Resources/Images/WarningSmall.png deleted file mode 100644 index 87419a6c6..000000000 Binary files a/mRemoteNG/Resources/Images/WarningSmall.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/Website.png b/mRemoteNG/Resources/Images/Website.png deleted file mode 100644 index cbd90f88d..000000000 Binary files a/mRemoteNG/Resources/Images/Website.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/database.bmp b/mRemoteNG/Resources/Images/database.bmp deleted file mode 100644 index 3233dcdb9..000000000 Binary files a/mRemoteNG/Resources/Images/database.bmp and /dev/null differ diff --git a/mRemoteNG/Resources/Images/green_arrow1.png b/mRemoteNG/Resources/Images/green_arrow1.png deleted file mode 100644 index 8e01bbbb0..000000000 Binary files a/mRemoteNG/Resources/Images/green_arrow1.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/green_arrow2.png b/mRemoteNG/Resources/Images/green_arrow2.png deleted file mode 100644 index 64d0ddb38..000000000 Binary files a/mRemoteNG/Resources/Images/green_arrow2.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/keepass_32x32.png b/mRemoteNG/Resources/Images/keepass_32x32.png deleted file mode 100644 index 996786023..000000000 Binary files a/mRemoteNG/Resources/Images/keepass_32x32.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/mRemoteNG.png b/mRemoteNG/Resources/Images/mRemoteNG.png deleted file mode 100644 index 56018bbbe..000000000 Binary files a/mRemoteNG/Resources/Images/mRemoteNG.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/puttycm.png b/mRemoteNG/Resources/Images/puttycm.png deleted file mode 100644 index 9eae419a8..000000000 Binary files a/mRemoteNG/Resources/Images/puttycm.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/star.png b/mRemoteNG/Resources/Images/star.png deleted file mode 100644 index b88c85789..000000000 Binary files a/mRemoteNG/Resources/Images/star.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/tab_add.png b/mRemoteNG/Resources/Images/tab_add.png deleted file mode 100644 index d3b99364a..000000000 Binary files a/mRemoteNG/Resources/Images/tab_add.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/tab_delete.png b/mRemoteNG/Resources/Images/tab_delete.png deleted file mode 100644 index 100da2f1a..000000000 Binary files a/mRemoteNG/Resources/Images/tab_delete.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/tab_edit.png b/mRemoteNG/Resources/Images/tab_edit.png deleted file mode 100644 index 4c09c0fd7..000000000 Binary files a/mRemoteNG/Resources/Images/tab_edit.png and /dev/null differ diff --git a/mRemoteNG/Resources/Images/xml.png b/mRemoteNG/Resources/Images/xml.png deleted file mode 100644 index e19e31fcb..000000000 Binary files a/mRemoteNG/Resources/Images/xml.png and /dev/null differ diff --git a/mRemoteNG/Resources/InsertPanel_16x.png b/mRemoteNG/Resources/InsertPanel_16x.png new file mode 100644 index 000000000..4f9f4e296 Binary files /dev/null and b/mRemoteNG/Resources/InsertPanel_16x.png differ diff --git a/mRemoteNG/Resources/Key_16x.png b/mRemoteNG/Resources/Key_16x.png new file mode 100644 index 000000000..258480fa2 Binary files /dev/null and b/mRemoteNG/Resources/Key_16x.png differ diff --git a/mRemoteNG/Resources/Images/loading_spinner.gif b/mRemoteNG/Resources/Loading_Spinner.gif similarity index 100% rename from mRemoteNG/Resources/Images/loading_spinner.gif rename to mRemoteNG/Resources/Loading_Spinner.gif diff --git a/mRemoteNG/Resources/Lock_16x.png b/mRemoteNG/Resources/Lock_16x.png new file mode 100644 index 000000000..f41aeeb4c Binary files /dev/null and b/mRemoteNG/Resources/Lock_16x.png differ diff --git a/mRemoteNG/Resources/LogError_16x.png b/mRemoteNG/Resources/LogError_16x.png new file mode 100644 index 000000000..907f1f613 Binary files /dev/null and b/mRemoteNG/Resources/LogError_16x.png differ diff --git a/mRemoteNG/Resources/LogWarning_16x.png b/mRemoteNG/Resources/LogWarning_16x.png new file mode 100644 index 000000000..c857c19dd Binary files /dev/null and b/mRemoteNG/Resources/LogWarning_16x.png differ diff --git a/mRemoteNG/Resources/Message_16x.png b/mRemoteNG/Resources/Message_16x.png new file mode 100644 index 000000000..7d06b1995 Binary files /dev/null and b/mRemoteNG/Resources/Message_16x.png differ diff --git a/mRemoteNG/Resources/Monitor_16x.png b/mRemoteNG/Resources/Monitor_16x.png new file mode 100644 index 000000000..98b9a820c Binary files /dev/null and b/mRemoteNG/Resources/Monitor_16x.png differ diff --git a/mRemoteNG/Resources/NewFile_16x.png b/mRemoteNG/Resources/NewFile_16x.png new file mode 100644 index 000000000..12354ce14 Binary files /dev/null and b/mRemoteNG/Resources/NewFile_16x.png differ diff --git a/mRemoteNG/Resources/OpenFile_16x.png b/mRemoteNG/Resources/OpenFile_16x.png new file mode 100644 index 000000000..a791a6aba Binary files /dev/null and b/mRemoteNG/Resources/OpenFile_16x.png differ diff --git a/mRemoteNG/Resources/Panel_16x.png b/mRemoteNG/Resources/Panel_16x.png new file mode 100644 index 000000000..5c87bed24 Binary files /dev/null and b/mRemoteNG/Resources/Panel_16x.png differ diff --git a/mRemoteNG/Resources/Property_16x.png b/mRemoteNG/Resources/Property_16x.png new file mode 100644 index 000000000..4abd1a4a4 Binary files /dev/null and b/mRemoteNG/Resources/Property_16x.png differ diff --git a/mRemoteNG/Resources/PuTTYNG.exe b/mRemoteNG/Resources/PuTTYNG.exe deleted file mode 100644 index 16717b8e0..000000000 Binary files a/mRemoteNG/Resources/PuTTYNG.exe and /dev/null differ diff --git a/mRemoteNG/Resources/Images/PuttyConfig.png b/mRemoteNG/Resources/PuttyConfig.png similarity index 100% rename from mRemoteNG/Resources/Images/PuttyConfig.png rename to mRemoteNG/Resources/PuttyConfig.png diff --git a/mRemoteNG/Resources/Images/PuttySessions.png b/mRemoteNG/Resources/PuttySessions.png similarity index 100% rename from mRemoteNG/Resources/Images/PuttySessions.png rename to mRemoteNG/Resources/PuttySessions.png diff --git a/mRemoteNG/Resources/Refresh_16x.png b/mRemoteNG/Resources/Refresh_16x.png new file mode 100644 index 000000000..23ffe551e Binary files /dev/null and b/mRemoteNG/Resources/Refresh_16x.png differ diff --git a/mRemoteNG/Resources/Remove_16x.png b/mRemoteNG/Resources/Remove_16x.png new file mode 100644 index 000000000..3adee77dd Binary files /dev/null and b/mRemoteNG/Resources/Remove_16x.png differ diff --git a/mRemoteNG/Resources/Rename_16x.png b/mRemoteNG/Resources/Rename_16x.png new file mode 100644 index 000000000..496d33b62 Binary files /dev/null and b/mRemoteNG/Resources/Rename_16x.png differ diff --git a/mRemoteNG/Resources/Resize_16x.png b/mRemoteNG/Resources/Resize_16x.png new file mode 100644 index 000000000..3ae7b38b6 Binary files /dev/null and b/mRemoteNG/Resources/Resize_16x.png differ diff --git a/mRemoteNG/Resources/RunUpdate_16x.png b/mRemoteNG/Resources/RunUpdate_16x.png new file mode 100644 index 000000000..b464f0c0e Binary files /dev/null and b/mRemoteNG/Resources/RunUpdate_16x.png differ diff --git a/mRemoteNG/Resources/Run_16x.png b/mRemoteNG/Resources/Run_16x.png new file mode 100644 index 000000000..a5634bcab Binary files /dev/null and b/mRemoteNG/Resources/Run_16x.png differ diff --git a/mRemoteNG/Resources/SQLDatabase_16x.png b/mRemoteNG/Resources/SQLDatabase_16x.png new file mode 100644 index 000000000..7bc21aaa0 Binary files /dev/null and b/mRemoteNG/Resources/SQLDatabase_16x.png differ diff --git a/mRemoteNG/Resources/Save_16x.png b/mRemoteNG/Resources/Save_16x.png new file mode 100644 index 000000000..34a3c5b70 Binary files /dev/null and b/mRemoteNG/Resources/Save_16x.png differ diff --git a/mRemoteNG/Resources/SchemaObjectProperty_16x.png b/mRemoteNG/Resources/SchemaObjectProperty_16x.png new file mode 100644 index 000000000..0cdd20ca2 Binary files /dev/null and b/mRemoteNG/Resources/SchemaObjectProperty_16x.png differ diff --git a/mRemoteNG/Resources/Schema_16x.png b/mRemoteNG/Resources/Schema_16x.png new file mode 100644 index 000000000..bbfc742b1 Binary files /dev/null and b/mRemoteNG/Resources/Schema_16x.png differ diff --git a/mRemoteNG/Resources/SearchAndApps_16x.png b/mRemoteNG/Resources/SearchAndApps_16x.png new file mode 100644 index 000000000..a7b27a8a0 Binary files /dev/null and b/mRemoteNG/Resources/SearchAndApps_16x.png differ diff --git a/mRemoteNG/Resources/Search_16x.png b/mRemoteNG/Resources/Search_16x.png new file mode 100644 index 000000000..06da21465 Binary files /dev/null and b/mRemoteNG/Resources/Search_16x.png differ diff --git a/mRemoteNG/Resources/Settings_16x.png b/mRemoteNG/Resources/Settings_16x.png new file mode 100644 index 000000000..2e2a83d99 Binary files /dev/null and b/mRemoteNG/Resources/Settings_16x.png differ diff --git a/mRemoteNG/Resources/SortAscending_16x.png b/mRemoteNG/Resources/SortAscending_16x.png new file mode 100644 index 000000000..f065b4858 Binary files /dev/null and b/mRemoteNG/Resources/SortAscending_16x.png differ diff --git a/mRemoteNG/Resources/SortDescending_16x.png b/mRemoteNG/Resources/SortDescending_16x.png new file mode 100644 index 000000000..ee70e3660 Binary files /dev/null and b/mRemoteNG/Resources/SortDescending_16x.png differ diff --git a/mRemoteNG/Resources/StartupProject_16x.png b/mRemoteNG/Resources/StartupProject_16x.png new file mode 100644 index 000000000..6791f811e Binary files /dev/null and b/mRemoteNG/Resources/StartupProject_16x.png differ diff --git a/mRemoteNG/Resources/StatusInformation_16x.png b/mRemoteNG/Resources/StatusInformation_16x.png new file mode 100644 index 000000000..3acae84a2 Binary files /dev/null and b/mRemoteNG/Resources/StatusInformation_16x.png differ diff --git a/mRemoteNG/Resources/Stop_16x.png b/mRemoteNG/Resources/Stop_16x.png new file mode 100644 index 000000000..2ab785e31 Binary files /dev/null and b/mRemoteNG/Resources/Stop_16x.png differ diff --git a/mRemoteNG/Resources/SyncArrow_16x.png b/mRemoteNG/Resources/SyncArrow_16x.png new file mode 100644 index 000000000..556402ca7 Binary files /dev/null and b/mRemoteNG/Resources/SyncArrow_16x.png differ diff --git a/mRemoteNG/Resources/Tab_16x.png b/mRemoteNG/Resources/Tab_16x.png new file mode 100644 index 000000000..7d9d55292 Binary files /dev/null and b/mRemoteNG/Resources/Tab_16x.png differ diff --git a/mRemoteNG/Resources/Test_16x.png b/mRemoteNG/Resources/Test_16x.png new file mode 100644 index 000000000..90454b2d0 Binary files /dev/null and b/mRemoteNG/Resources/Test_16x.png differ diff --git a/mRemoteNG/Resources/ToggleOfficeKeyboardScheme_16x.png b/mRemoteNG/Resources/ToggleOfficeKeyboardScheme_16x.png new file mode 100644 index 000000000..08abf0f84 Binary files /dev/null and b/mRemoteNG/Resources/ToggleOfficeKeyboardScheme_16x.png differ diff --git a/mRemoteNG/Resources/UIAboutBox_16x.png b/mRemoteNG/Resources/UIAboutBox_16x.png new file mode 100644 index 000000000..2eb45a08e Binary files /dev/null and b/mRemoteNG/Resources/UIAboutBox_16x.png differ diff --git a/mRemoteNG/Resources/UniqueKeyError_16x.png b/mRemoteNG/Resources/UniqueKeyError_16x.png new file mode 100644 index 000000000..4fab4c313 Binary files /dev/null and b/mRemoteNG/Resources/UniqueKeyError_16x.png differ diff --git a/mRemoteNG/Resources/ViewDownBySchema_16x.png b/mRemoteNG/Resources/ViewDownBySchema_16x.png new file mode 100644 index 000000000..c468fc8bc Binary files /dev/null and b/mRemoteNG/Resources/ViewDownBySchema_16x.png differ diff --git a/mRemoteNG/Resources/Icons/mRemoteNG_Icon.ico b/mRemoteNG/Resources/mRemoteNG_Icon.ico similarity index 100% rename from mRemoteNG/Resources/Icons/mRemoteNG_Icon.ico rename to mRemoteNG/Resources/mRemoteNG_Icon.ico diff --git a/mRemoteNG/Security/EncryptedSecureString.cs b/mRemoteNG/Security/EncryptedSecureString.cs index 66319d6fa..1bf59ea97 100644 --- a/mRemoteNG/Security/EncryptedSecureString.cs +++ b/mRemoteNG/Security/EncryptedSecureString.cs @@ -61,11 +61,8 @@ namespace mRemoteNG.Security { if (!disposing) return; - if(_machineKey != null) - _machineKey.Dispose(); - - if(_secureString != null) - _secureString.Dispose(); + _machineKey?.Dispose(); + _secureString?.Dispose(); } public void Dispose() diff --git a/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs b/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs index 6042c9bda..b3f4c64c9 100644 --- a/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs +++ b/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs @@ -1,4 +1,4 @@ -/* +/* * Initial work: * This work (Modern Encryption of a String C#, by James Tuley), * identified by James Tuley, is free of known copyright restrictions. @@ -10,13 +10,13 @@ using System; using System.IO; using System.Security; using System.Text; -using mRemoteNG.Resources.Language; using mRemoteNG.Security.KeyDerivation; using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.Modes; using Org.BouncyCastle.Crypto.Parameters; using Org.BouncyCastle.Security; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs b/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs index dbc5d31bd..476f11407 100644 --- a/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs +++ b/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Security; using System.Security.Cryptography; diff --git a/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs b/mRemoteNG/Themes/ColorMapTheme.Designer.cs similarity index 99% rename from mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs rename to mRemoteNG/Themes/ColorMapTheme.Designer.cs index 4c8f7bad1..8a023f373 100644 --- a/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs +++ b/mRemoteNG/Themes/ColorMapTheme.Designer.cs @@ -8,7 +8,10 @@ // //------------------------------------------------------------------------------ -namespace mRemoteNG.Resources.Themes { +namespace mRemoteNG { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -16,7 +19,7 @@ namespace mRemoteNG.Resources.Themes { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ColorMapTheme { @@ -36,7 +39,7 @@ namespace mRemoteNG.Resources.Themes { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Resources.Themes.ColorMapTheme", typeof(ColorMapTheme).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mRemoteNG.Themes.ColorMapTheme", typeof(ColorMapTheme).Assembly); resourceMan = temp; } return resourceMan; diff --git a/mRemoteNG/Resources/Themes/ColorMapTheme.resx b/mRemoteNG/Themes/ColorMapTheme.resx similarity index 100% rename from mRemoteNG/Resources/Themes/ColorMapTheme.resx rename to mRemoteNG/Themes/ColorMapTheme.resx diff --git a/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs b/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs index 704f828b2..13a8e1c13 100644 --- a/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs +++ b/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Globalization; using System.IO; using System.Xml; -using mRemoteNG.Resources.Themes; +using mRemoteNG.Themes; namespace mRemoteNG.Themes { diff --git a/mRemoteNG/Themes/ThemeManager.cs b/mRemoteNG/Themes/ThemeManager.cs index 07ce282b5..4edbdaaa4 100644 --- a/mRemoteNG/Themes/ThemeManager.cs +++ b/mRemoteNG/Themes/ThemeManager.cs @@ -1,4 +1,4 @@ -using mRemoteNG.App; +using mRemoteNG.App; using System; using System.Collections; using System.Collections.Generic; @@ -167,18 +167,6 @@ namespace mRemoteNG.Themes //Load the embedded themes, extended palettes are taken from the vs2015 themes, trying to match the color theme - // 2003 - var vs2003 = new ThemeInfo("vs2003", new VS2003Theme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2003, - ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); - themes.Add(vs2003.Name, vs2003); - - // 2005 - var vs2005 = new ThemeInfo("vs2005", new VS2005Theme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2005, - ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); - themes.Add(vs2005.Name, vs2005); - // 2012 var vs2012Light = new ThemeInfo("vs2012Light", new VS2012LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, diff --git a/mRemoteNG/Resources/Themes/darcula.vstheme b/mRemoteNG/Themes/darcula.vstheme similarity index 100% rename from mRemoteNG/Resources/Themes/darcula.vstheme rename to mRemoteNG/Themes/darcula.vstheme diff --git a/mRemoteNG/Resources/Themes/vs2015blue.vstheme b/mRemoteNG/Themes/vs2015blue.vstheme similarity index 100% rename from mRemoteNG/Resources/Themes/vs2015blue.vstheme rename to mRemoteNG/Themes/vs2015blue.vstheme diff --git a/mRemoteNG/Resources/Themes/vs2015dark.vstheme b/mRemoteNG/Themes/vs2015dark.vstheme similarity index 100% rename from mRemoteNG/Resources/Themes/vs2015dark.vstheme rename to mRemoteNG/Themes/vs2015dark.vstheme diff --git a/mRemoteNG/Resources/Themes/vs2015light.vstheme b/mRemoteNG/Themes/vs2015light.vstheme similarity index 100% rename from mRemoteNG/Resources/Themes/vs2015light.vstheme rename to mRemoteNG/Themes/vs2015light.vstheme diff --git a/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs b/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs index c66e47f5e..da69f37b5 100644 --- a/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs +++ b/mRemoteNG/Tools/Cmdline/CmdArgumentsInterpreter.cs @@ -23,10 +23,7 @@ namespace mRemoteNG.Tools.Cmdline private readonly StringDictionary _parameters; // Retrieve a parameter value if it exists - public string this[string param] - { - get { return (_parameters[param]); } - } + public string this[string param] => (_parameters[param]); public CmdArgumentsInterpreter(IEnumerable args) { diff --git a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs index 9e2e635bd..109d19952 100644 --- a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs +++ b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs @@ -56,7 +56,7 @@ namespace mRemoteNG.Tools var nodeAsContainer = node as ContainerInfo; if (nodeAsContainer != null) { - menuItem.Image = Properties.Resources.Folder; + menuItem.Image = Properties.Resources.FolderClosed_16x; menuItem.Tag = nodeAsContainer; AddSubMenuNodes(nodeAsContainer.Children, menuItem); } @@ -67,7 +67,7 @@ namespace mRemoteNG.Tools } else if (node.GetTreeNodeType() == TreeNodeType.Connection) { - menuItem.Image = node.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause; + menuItem.Image = node.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x; menuItem.Tag = node; } diff --git a/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs b/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs index 3094e6aa5..c1b44ce4c 100644 --- a/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs +++ b/mRemoteNG/Tools/CustomCollections/FullyObservableCollection.cs @@ -17,8 +17,8 @@ namespace mRemoteNG.Tools.CustomCollections public T this[int index] { - get { return _list[index]; } - set { _list[index] = value; } + get => _list[index]; + set => _list[index] = value; } public FullyObservableCollection() diff --git a/mRemoteNG/Tools/ExternalTool.cs b/mRemoteNG/Tools/ExternalTool.cs index 6998c6633..a574e52de 100644 --- a/mRemoteNG/Tools/ExternalTool.cs +++ b/mRemoteNG/Tools/ExternalTool.cs @@ -31,19 +31,19 @@ namespace mRemoteNG.Tools public string DisplayName { - get { return _displayName; } - set { SetField(ref _displayName, value, nameof(DisplayName)); } + get => _displayName; + set => SetField(ref _displayName, value, nameof(DisplayName)); } public string FileName { - get { return _fileName; } - set { SetField(ref _fileName, value, nameof(FileName)); } + get => _fileName; + set => SetField(ref _fileName, value, nameof(FileName)); } public bool WaitForExit { - get { return _waitForExit; } + get => _waitForExit; set { // WaitForExit cannot be turned on when TryIntegrate is true @@ -55,19 +55,19 @@ namespace mRemoteNG.Tools public string Arguments { - get { return _arguments; } - set { SetField(ref _arguments, value, nameof(Arguments)); } + get => _arguments; + set => SetField(ref _arguments, value, nameof(Arguments)); } public string WorkingDir { - get { return _workingDir; } - set { SetField(ref _workingDir, value, nameof(WorkingDir)); } + get => _workingDir; + set => SetField(ref _workingDir, value, nameof(WorkingDir)); } public bool TryIntegrate { - get { return _tryIntegrate; } + get => _tryIntegrate; set { // WaitForExit cannot be turned on when TryIntegrate is true @@ -79,27 +79,21 @@ namespace mRemoteNG.Tools public bool ShowOnToolbar { - get { return _showOnToolbar; } - set { SetField(ref _showOnToolbar, value, nameof(ShowOnToolbar)); } + get => _showOnToolbar; + set => SetField(ref _showOnToolbar, value, nameof(ShowOnToolbar)); } public bool RunElevated { - get { return _runElevated; } - set { SetField(ref _runElevated, value, nameof(RunElevated)); } + get => _runElevated; + set => SetField(ref _runElevated, value, nameof(RunElevated)); } public ConnectionInfo ConnectionInfo { get; set; } - public Icon Icon - { - get { return File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Properties.Resources.mRemoteNG_Icon; } - } + public Icon Icon => File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Properties.Resources.mRemoteNG_Icon; - public Image Image - { - get { return Icon?.ToBitmap() ?? Properties.Resources.mRemoteNG_Icon.ToBitmap(); } - } + public Image Image => Icon?.ToBitmap() ?? Properties.Resources.mRemoteNG_Icon.ToBitmap(); #endregion diff --git a/mRemoteNG/Tools/IeBrowserEmulation.cs b/mRemoteNG/Tools/IeBrowserEmulation.cs index c374626b4..8e89d2c01 100644 --- a/mRemoteNG/Tools/IeBrowserEmulation.cs +++ b/mRemoteNG/Tools/IeBrowserEmulation.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics; using System.IO; using System.Linq; diff --git a/mRemoteNG/Tools/MiscTools.cs b/mRemoteNG/Tools/MiscTools.cs index f031208b6..2e0f508ab 100644 --- a/mRemoteNG/Tools/MiscTools.cs +++ b/mRemoteNG/Tools/MiscTools.cs @@ -9,9 +9,9 @@ using System.Security; using mRemoteNG.App; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using MySql.Data.Types; +using mRemoteNG.Resources.Language; using static System.String; namespace mRemoteNG.Tools diff --git a/mRemoteNG/Tools/NotificationAreaIcon.cs b/mRemoteNG/Tools/NotificationAreaIcon.cs index af5afc616..14902a2a7 100644 --- a/mRemoteNG/Tools/NotificationAreaIcon.cs +++ b/mRemoteNG/Tools/NotificationAreaIcon.cs @@ -5,8 +5,8 @@ using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools @@ -28,7 +28,7 @@ namespace mRemoteNG.Tools _cMenCons = new ToolStripMenuItem { Text = Language.Connections, - Image = Properties.Resources.Root + Image = Properties.Resources.ASPWebSite_16x }; var cMenSep1 = new ToolStripSeparator(); diff --git a/mRemoteNG/Tools/PropertyGridCommandSite.cs b/mRemoteNG/Tools/PropertyGridCommandSite.cs index 046253a79..8dfb7043c 100644 --- a/mRemoteNG/Tools/PropertyGridCommandSite.cs +++ b/mRemoteNG/Tools/PropertyGridCommandSite.cs @@ -103,25 +103,16 @@ namespace mRemoteNG.Tools return serviceType == typeof(IMenuCommandService) ? this : null; } - public IComponent Component - { - get { throw new NotSupportedException(); } - } + public IComponent Component => throw new NotSupportedException(); - public IContainer Container - { - get { return null; } - } + public IContainer Container => null; - public bool DesignMode - { - get { return true; } - } + public bool DesignMode => true; public string Name { - get { throw new NotSupportedException(); } - set { throw new NotSupportedException(); } + get => throw new NotSupportedException(); + set => throw new NotSupportedException(); } public void AddCommand(MenuCommand command) diff --git a/mRemoteNG/Tools/ReconnectGroup.Designer.cs b/mRemoteNG/Tools/ReconnectGroup.Designer.cs index f364a81c6..2166207c4 100644 --- a/mRemoteNG/Tools/ReconnectGroup.Designer.cs +++ b/mRemoteNG/Tools/ReconnectGroup.Designer.cs @@ -1,4 +1,5 @@ using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools { @@ -69,7 +70,7 @@ namespace mRemoteNG.Tools this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(159, 23); this.btnClose.TabIndex = 7; - this.btnClose.Text = global::mRemoteNG.Resources.Language.Language._Close; + this.btnClose.Text = Language._Close; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // @@ -91,7 +92,7 @@ namespace mRemoteNG.Tools this.chkReconnectWhenReady.Name = "chkReconnectWhenReady"; this.chkReconnectWhenReady.Size = new System.Drawing.Size(140, 17); this.chkReconnectWhenReady.TabIndex = 6; - this.chkReconnectWhenReady.Text = global::mRemoteNG.Resources.Language.Language.CheckboxReconnectWhenReady; + this.chkReconnectWhenReady.Text = Language.CheckboxReconnectWhenReady; this.chkReconnectWhenReady.UseVisualStyleBackColor = true; this.chkReconnectWhenReady.CheckedChanged += new System.EventHandler(this.chkReconnectWhenReady_CheckedChanged); // diff --git a/mRemoteNG/Tools/ScanHost.cs b/mRemoteNG/Tools/ScanHost.cs index 26c673be5..ad347ae80 100644 --- a/mRemoteNG/Tools/ScanHost.cs +++ b/mRemoteNG/Tools/ScanHost.cs @@ -87,40 +87,19 @@ namespace mRemoteNG.Tools } } - public string RdpName - { - get { return BoolToYesNo(Rdp); } - } + public string RdpName => BoolToYesNo(Rdp); - public string VncName - { - get { return BoolToYesNo(Vnc); } - } + public string VncName => BoolToYesNo(Vnc); - public string SshName - { - get { return BoolToYesNo(Rdp); } - } + public string SshName => BoolToYesNo(Rdp); - public string TelnetName - { - get { return BoolToYesNo(Telnet); } - } + public string TelnetName => BoolToYesNo(Telnet); - public string RloginName - { - get { return BoolToYesNo(Rlogin); } - } + public string RloginName => BoolToYesNo(Rlogin); - public string HttpName - { - get { return BoolToYesNo(Http); } - } + public string HttpName => BoolToYesNo(Http); - public string HttpsName - { - get { return BoolToYesNo(Https); } - } + public string HttpsName => BoolToYesNo(Https); public string OpenPortsName { diff --git a/mRemoteNG/Tools/SecureTransfer.cs b/mRemoteNG/Tools/SecureTransfer.cs index 04c4e12b7..2c93e0521 100644 --- a/mRemoteNG/Tools/SecureTransfer.cs +++ b/mRemoteNG/Tools/SecureTransfer.cs @@ -1,10 +1,10 @@ using System; using System.IO; using mRemoteNG.App; -using mRemoteNG.Resources.Language; using Renci.SshNet; using Renci.SshNet.Sftp; using static System.IO.FileMode; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools { diff --git a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs index 0f7c00aa1..d4c2d7fb6 100644 --- a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs +++ b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.ComponentModel; using mRemoteNG.Resources.Language; @@ -90,10 +90,7 @@ namespace mRemoteNG.Tools // This allows localized attributes in a derived class to override a matching // non-localized attribute inherited from its base class - public override object TypeId - { - get { return typeof(DefaultValueAttribute); } - } + public override object TypeId => typeof(DefaultValueAttribute); } #region Special localization - with String.Format diff --git a/mRemoteNG/Tools/Tools.WindowPlacement.cs b/mRemoteNG/Tools/Tools.WindowPlacement.cs index b6a34d553..11171286b 100644 --- a/mRemoteNG/Tools/Tools.WindowPlacement.cs +++ b/mRemoteNG/Tools/Tools.WindowPlacement.cs @@ -20,8 +20,8 @@ namespace mRemoteNG.Tools public Form Form { - get { return _form; } - set { _form = value; } + get => _form; + set => _form = value; } public bool RestoreToMaximized diff --git a/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs b/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs index 31ec0a1b6..b97f6bf19 100644 --- a/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs +++ b/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs @@ -4,8 +4,8 @@ using System.Windows.Forms; using BrightIdeasSoftware; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tree @@ -22,8 +22,11 @@ namespace mRemoteNG.Tree public void HandleEvent_ModelDropped(object sender, ModelDropEventArgs e) { if (!(e.TargetModel is ConnectionInfo dropTarget)) return; - var dropSource = (ConnectionInfo)e.SourceModels[0]; - DropModel(dropSource, dropTarget, e.DropTargetLocation); + foreach(var dropSource in e.SourceModels.Cast()) + { + DropModel(dropSource, dropTarget, e.DropTargetLocation); + } + e.Handled = true; } @@ -72,13 +75,15 @@ namespace mRemoteNG.Tree _enableFeedback = true; _currentFeedbackColor = DropDeniedFeedbackColor; _infoMessage = null; - var dropSource = e.SourceModels.Cast().First(); - var dropTarget = e.TargetModel as ConnectionInfo; + foreach (var dropSource in e.SourceModels.Cast()) + { + var dropTarget = e.TargetModel as ConnectionInfo; - e.Effect = CanModelDrop(dropSource, dropTarget, e.DropTargetLocation); - e.InfoMessage = _infoMessage; - e.DropSink.EnableFeedback = _enableFeedback; - e.DropSink.FeedbackColor = _currentFeedbackColor; + e.Effect = CanModelDrop(dropSource, dropTarget, e.DropTargetLocation); + e.InfoMessage = _infoMessage; + e.DropSink.EnableFeedback = _enableFeedback; + e.DropSink.FeedbackColor = _currentFeedbackColor; + } e.Handled = true; } diff --git a/mRemoteNG/Tree/PreviousSessionOpener.cs b/mRemoteNG/Tree/PreviousSessionOpener.cs index 20c33d2af..a18299453 100644 --- a/mRemoteNG/Tree/PreviousSessionOpener.cs +++ b/mRemoteNG/Tree/PreviousSessionOpener.cs @@ -1,6 +1,5 @@ using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.UI.Controls; using System; using System.Linq; using mRemoteNG.UI.Controls.ConnectionTree; diff --git a/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs b/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs index 14334b088..ab42c43e9 100644 --- a/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs +++ b/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs @@ -1,6 +1,5 @@ using System.Linq; using mRemoteNG.Container; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; diff --git a/mRemoteNG/Tree/Root/RootNodeInfo.cs b/mRemoteNG/Tree/Root/RootNodeInfo.cs index 1f96db224..fd5f78561 100644 --- a/mRemoteNG/Tree/Root/RootNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootNodeInfo.cs @@ -2,8 +2,8 @@ using System.ComponentModel; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tree.Root diff --git a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs index c0f926ffc..748fd1dfe 100644 --- a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs @@ -1,6 +1,6 @@ using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tree.Root { @@ -24,12 +24,9 @@ namespace mRemoteNG.Tree.Root [LocalizedAttributes.LocalizedDefaultValue("strPuttySavedSessionsRootName")] public override string Name { - get { return _name; } - set - { - _name = value; - //Settings.Default.PuttySavedSessionsName = value; - } + get => _name; + set => _name = value; + //Settings.Default.PuttySavedSessionsName = value; } [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)), @@ -37,7 +34,7 @@ namespace mRemoteNG.Tree.Root LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))] public override string Panel { - get { return _panel; } + get => _panel; set { _panel = value; diff --git a/mRemoteNG/Tree/RootNodeExpander.cs b/mRemoteNG/Tree/RootNodeExpander.cs index 569c81ac2..ec6010af9 100644 --- a/mRemoteNG/Tree/RootNodeExpander.cs +++ b/mRemoteNG/Tree/RootNodeExpander.cs @@ -1,5 +1,4 @@ -using mRemoteNG.UI.Controls; -using mRemoteNG.UI.Controls.ConnectionTree; +using mRemoteNG.UI.Controls.ConnectionTree; namespace mRemoteNG.Tree diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs index 6e26ebb82..87f7c5e64 100644 --- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs +++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs @@ -6,11 +6,11 @@ using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; // ReSharper disable UnusedParameter.Local @@ -146,7 +146,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnect // - _cMenTreeConnect.Image = Properties.Resources.Play; + _cMenTreeConnect.Image = Properties.Resources.Run_16x; _cMenTreeConnect.Name = "_cMenTreeConnect"; _cMenTreeConnect.Size = new System.Drawing.Size(199, 22); _cMenTreeConnect.Text = "Connect"; @@ -169,7 +169,6 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsConnectToConsoleSession // - _cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Properties.Resources.monitor_go; _cMenTreeConnectWithOptionsConnectToConsoleSession.Name = "_cMenTreeConnectWithOptionsConnectToConsoleSession"; _cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); @@ -178,7 +177,6 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsDontConnectToConsoleSession // - _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Properties.Resources.monitor_delete; _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name = "_cMenTreeConnectWithOptionsDontConnectToConsoleSession"; _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); @@ -188,7 +186,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsConnectInFullscreen // - _cMenTreeConnectWithOptionsConnectInFullscreen.Image = Properties.Resources.arrow_out; + _cMenTreeConnectWithOptionsConnectInFullscreen.Image = Properties.Resources.FullScreen_16x; _cMenTreeConnectWithOptionsConnectInFullscreen.Name = "_cMenTreeConnectWithOptionsConnectInFullscreen"; _cMenTreeConnectWithOptionsConnectInFullscreen.Size = new System.Drawing.Size(245, 22); _cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen"; @@ -196,7 +194,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsNoCredentials // - _cMenTreeConnectWithOptionsNoCredentials.Image = Properties.Resources.key_delete; + _cMenTreeConnectWithOptionsNoCredentials.Image = Properties.Resources.UniqueKeyError_16x; _cMenTreeConnectWithOptionsNoCredentials.Name = "_cMenTreeConnectWithOptionsNoCredentials"; _cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(245, 22); _cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials"; @@ -204,7 +202,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsChoosePanelBeforeConnecting // - _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Properties.Resources.Panels; + _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Properties.Resources.Panel_16x; _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "_cMenTreeConnectWithOptionsChoosePanelBeforeConnecting"; _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = new System.Drawing.Size(245, 22); @@ -213,7 +211,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsViewOnly // - _cMenTreeConnectWithOptionsViewOnly.Image = Properties.Resources.View; + _cMenTreeConnectWithOptionsViewOnly.Image = Properties.Resources.Monitor_16x; _cMenTreeConnectWithOptionsViewOnly.Name = "_cMenTreeConnectWithOptionsViewOnly"; _cMenTreeConnectWithOptionsViewOnly.Size = new System.Drawing.Size(245, 22); @@ -222,7 +220,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDisconnect // - _cMenTreeDisconnect.Image = Properties.Resources.Pause; + _cMenTreeDisconnect.Image = Properties.Resources.Stop_16x; _cMenTreeDisconnect.Name = "_cMenTreeDisconnect"; _cMenTreeDisconnect.Size = new System.Drawing.Size(199, 22); _cMenTreeDisconnect.Text = "Disconnect"; @@ -235,14 +233,14 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsExternalApps // - _cMenTreeToolsExternalApps.Image = Properties.Resources.ExtApp; + _cMenTreeToolsExternalApps.Image = Properties.Resources.Console_16x; _cMenTreeToolsExternalApps.Name = "_cMenTreeToolsExternalApps"; _cMenTreeToolsExternalApps.Size = new System.Drawing.Size(199, 22); _cMenTreeToolsExternalApps.Text = "External Applications"; // // cMenTreeToolsTransferFile // - _cMenTreeToolsTransferFile.Image = Properties.Resources.SSHTransfer; + _cMenTreeToolsTransferFile.Image = Properties.Resources.SyncArrow_16x; _cMenTreeToolsTransferFile.Name = "_cMenTreeToolsTransferFile"; _cMenTreeToolsTransferFile.Size = new System.Drawing.Size(199, 22); _cMenTreeToolsTransferFile.Text = "Transfer File (SSH)"; @@ -255,7 +253,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDuplicate // - _cMenTreeDuplicate.Image = Properties.Resources.page_copy; + _cMenTreeDuplicate.Image = Properties.Resources.Copy_16x; _cMenTreeDuplicate.Name = "_cMenTreeDuplicate"; _cMenTreeDuplicate.Size = new System.Drawing.Size(199, 22); _cMenTreeDuplicate.Text = "Duplicate"; @@ -263,7 +261,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeRename // - _cMenTreeRename.Image = Properties.Resources.Rename; + _cMenTreeRename.Image = Properties.Resources.Rename_16x; _cMenTreeRename.Name = "_cMenTreeRename"; _cMenTreeRename.Size = new System.Drawing.Size(199, 22); _cMenTreeRename.Text = "Rename"; @@ -271,7 +269,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDelete // - _cMenTreeDelete.Image = Properties.Resources.Delete; + _cMenTreeDelete.Image = Properties.Resources.Close_16x; _cMenTreeDelete.Name = "_cMenTreeDelete"; _cMenTreeDelete.Size = new System.Drawing.Size(199, 22); _cMenTreeDelete.Text = "Delete"; @@ -336,7 +334,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeAddConnection // - _cMenTreeAddConnection.Image = Properties.Resources.Connection_Add; + _cMenTreeAddConnection.Image = Properties.Resources.AddItem_16x; _cMenTreeAddConnection.Name = "_cMenTreeAddConnection"; _cMenTreeAddConnection.Size = new System.Drawing.Size(199, 22); _cMenTreeAddConnection.Text = "New Connection"; @@ -344,7 +342,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeAddFolder // - _cMenTreeAddFolder.Image = Properties.Resources.Folder_Add; + _cMenTreeAddFolder.Image = Properties.Resources.AddFolder_16x; _cMenTreeAddFolder.Name = "_cMenTreeAddFolder"; _cMenTreeAddFolder.Size = new System.Drawing.Size(199, 22); _cMenTreeAddFolder.Text = "New Folder"; @@ -368,7 +366,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsSortAscending // - _cMenTreeToolsSortAscending.Image = Properties.Resources.Sort_AZ; + _cMenTreeToolsSortAscending.Image = Properties.Resources.SortAscending_16x; _cMenTreeToolsSortAscending.Name = "_cMenTreeToolsSortAscending"; _cMenTreeToolsSortAscending.Size = new System.Drawing.Size(161, 22); _cMenTreeToolsSortAscending.Text = "Ascending (A-Z)"; @@ -376,7 +374,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsSortDescending // - _cMenTreeToolsSortDescending.Image = Properties.Resources.Sort_ZA; + _cMenTreeToolsSortDescending.Image = Properties.Resources.SortDescending_16x; _cMenTreeToolsSortDescending.Name = "_cMenTreeToolsSortDescending"; _cMenTreeToolsSortDescending.Size = new System.Drawing.Size(161, 22); _cMenTreeToolsSortDescending.Text = "Descending (Z-A)"; @@ -384,7 +382,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeMoveUp // - _cMenTreeMoveUp.Image = Properties.Resources.Arrow_Up; + _cMenTreeMoveUp.Image = Properties.Resources.GlyphUp_16x; _cMenTreeMoveUp.Name = "_cMenTreeMoveUp"; _cMenTreeMoveUp.Size = new System.Drawing.Size(199, 22); _cMenTreeMoveUp.Text = "Move up"; @@ -392,7 +390,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeMoveDown // - _cMenTreeMoveDown.Image = Properties.Resources.Arrow_Down; + _cMenTreeMoveDown.Image = Properties.Resources.GlyphDown_16x; _cMenTreeMoveDown.Name = "_cMenTreeMoveDown"; _cMenTreeMoveDown.Size = new System.Drawing.Size(199, 22); _cMenTreeMoveDown.Text = "Move down"; diff --git a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs index 5a2eb7413..3bf8322b4 100644 --- a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs +++ b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs @@ -12,11 +12,11 @@ using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tools.Attributes; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs index 7cbc6b5be..95a900442 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs @@ -10,12 +10,12 @@ using mRemoteNG.Config.Putty; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; using mRemoteNG.Tree.Root; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody @@ -98,11 +98,8 @@ namespace mRemoteNG.UI.Controls.ConnectionTree { if (disposing) { - if(components != null) - components.Dispose(); - - if(_statusImageList != null) - _statusImageList.Dispose(); + components?.Dispose(); + _statusImageList?.Dispose(); _themeManager.ThemeChanged -= ThemeManagerOnThemeChanged; } diff --git a/mRemoteNG/UI/Controls/CredentialRecordListView.cs b/mRemoteNG/UI/Controls/CredentialRecordListView.cs index 58397ca60..c51cea3a7 100644 --- a/mRemoteNG/UI/Controls/CredentialRecordListView.cs +++ b/mRemoteNG/UI/Controls/CredentialRecordListView.cs @@ -4,9 +4,9 @@ using System.Linq; using BrightIdeasSoftware; using mRemoteNG.Credential; using mRemoteNG.Credential.Repositories; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools.CustomCollections; using mRemoteNG.UI.Controls.PageSequence; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { @@ -16,7 +16,7 @@ namespace mRemoteNG.UI.Controls public ICredentialRepositoryList CredentialRepositoryList { - get { return _credentialRepositoryList; } + get => _credentialRepositoryList; set { _credentialRepositoryList.RepositoriesUpdated -= CredentialRepositoryListOnRepositoriesUpdated; diff --git a/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs b/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs index 74805d0b4..5225eb8b1 100644 --- a/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs +++ b/mRemoteNG/UI/Controls/CredentialRepositoryListView.cs @@ -15,7 +15,7 @@ namespace mRemoteNG.UI.Controls public ICredentialRepositoryList CredentialRepositoryList { - get { return _credentialRepositoryList; } + get => _credentialRepositoryList; set { _credentialRepositoryList.RepositoriesUpdated -= OnRepositoriesUpdated; diff --git a/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs b/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs index d89a46dac..eac400593 100644 --- a/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs +++ b/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs @@ -3,9 +3,9 @@ using System.ComponentModel; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { @@ -100,7 +100,7 @@ namespace mRemoteNG.UI.Controls var extA = (ExternalTool)((ToolStripButton)sender).Tag; var selectedTreeNode = Windows.TreeForm.SelectedNode; - if (selectedTreeNode != null && selectedTreeNode.GetTreeNodeType() == TreeNodeType.Connection | + if (selectedTreeNode != null && selectedTreeNode.GetTreeNodeType() == TreeNodeType.Connection || selectedTreeNode.GetTreeNodeType() == TreeNodeType.PuttySession) extA.Start(selectedTreeNode); else diff --git a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs index 992e2c534..64f99a4c9 100644 --- a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs +++ b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs @@ -67,7 +67,7 @@ // // imgError // - this.imgError.Image = global::mRemoteNG.Properties.Resources.ErrorSmall; + this.imgError.Image = global::mRemoteNG.Properties.Resources.LogError_16x; this.imgError.Location = new System.Drawing.Point(3, 81); this.imgError.Name = "imgError"; this.imgError.Size = new System.Drawing.Size(16, 16); diff --git a/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs b/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs index 419481b1e..2a4ae999b 100644 --- a/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs +++ b/mRemoteNG/UI/Controls/NewPasswordWithVerification.cs @@ -20,7 +20,7 @@ namespace mRemoteNG.UI.Controls [Browsable(true)] public char PasswordChar { - get { return _passwordChar; } + get => _passwordChar; set { _passwordChar = value; @@ -32,7 +32,7 @@ namespace mRemoteNG.UI.Controls [Browsable(true)] public bool UseSystemPasswordChar { - get { return _useSystemPasswordChar; } + get => _useSystemPasswordChar; set { _useSystemPasswordChar = value; diff --git a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs index 43c9b329e..1a1a4038e 100644 --- a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs +++ b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs @@ -199,14 +199,8 @@ namespace mRemoteNG.UI.Controls public event ConnectRequestedEventHandler ConnectRequested { - add - { - ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Combine(ConnectRequestedEvent, value); - } - remove - { - ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Remove(ConnectRequestedEvent, value); - } + add => ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Combine(ConnectRequestedEvent, value); + remove => ConnectRequestedEvent = (ConnectRequestedEventHandler)Delegate.Remove(ConnectRequestedEvent, value); } @@ -232,8 +226,8 @@ namespace mRemoteNG.UI.Controls public event ProtocolChangedEventHandler ProtocolChanged { - add { ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Combine(ProtocolChangedEvent, value); } - remove { ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Remove(ProtocolChangedEvent, value); } + add => ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Combine(ProtocolChangedEvent, value); + remove => ProtocolChangedEvent = (ProtocolChangedEventHandler)Delegate.Remove(ProtocolChangedEvent, value); } diff --git a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs index e718be5ad..2586a8536 100644 --- a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs @@ -9,9 +9,9 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { @@ -106,7 +106,7 @@ namespace mRemoteNG.UI.Controls // btnQuickConnect // _btnQuickConnect.DropDown = _mnuQuickConnectProtocol; - _btnQuickConnect.Image = Properties.Resources.Play_Quick; + _btnQuickConnect.Image = Properties.Resources.Run_16x; _btnQuickConnect.ImageTransparentColor = Color.Magenta; _btnQuickConnect.Margin = new Padding(0, 1, 3, 2); _btnQuickConnect.Name = "btnQuickConnect"; @@ -127,7 +127,7 @@ namespace mRemoteNG.UI.Controls // _btnConnections.DisplayStyle = ToolStripItemDisplayStyle.Image; _btnConnections.DropDown = _mnuConnections; - _btnConnections.Image = Properties.Resources.Root; + _btnConnections.Image = Properties.Resources.ASPWebSite_16x; _btnConnections.ImageScaling = ToolStripItemImageScaling.SizeToFit; _btnConnections.ImageTransparentColor = Color.Magenta; _btnConnections.Name = "btnConnections"; @@ -258,7 +258,7 @@ namespace mRemoteNG.UI.Controls .ConnectionTreeModel).ToArray(); _btnConnections.DropDownItems.AddRange(rootMenuItems); - ToolStripMenuItem favorites = new ToolStripMenuItem(Language.Favorites, Properties.Resources.star); + ToolStripMenuItem favorites = new ToolStripMenuItem(Language.Favorites, Properties.Resources.Favorite_16x); var rootNodes = Runtime.ConnectionsService.ConnectionTreeModel.RootNodes; List favoritesList = new List(); @@ -270,7 +270,7 @@ namespace mRemoteNG.UI.Controls { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x }; favoriteMenuItem.MouseUp += ConnectionsMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Controls/mrngIpTextBox.cs b/mRemoteNG/UI/Controls/mrngIpTextBox.cs index 5808b9659..3ad5dc489 100644 --- a/mRemoteNG/UI/Controls/mrngIpTextBox.cs +++ b/mRemoteNG/UI/Controls/mrngIpTextBox.cs @@ -5,8 +5,8 @@ using System; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { diff --git a/mRemoteNG/UI/Controls/mrngSearchBox.cs b/mRemoteNG/UI/Controls/mrngSearchBox.cs index 29d5c2341..eab3887d6 100644 --- a/mRemoteNG/UI/Controls/mrngSearchBox.cs +++ b/mRemoteNG/UI/Controls/mrngSearchBox.cs @@ -27,7 +27,7 @@ namespace mRemoteNG.UI.Controls private void AddClearButton() { - _pbClear.Image = Properties.Resources.Delete; + _pbClear.Image = Properties.Resources.Close_16x; _pbClear.Width = 20; _pbClear.Dock = DockStyle.Right; _pbClear.Cursor = Cursors.Default; diff --git a/mRemoteNG/UI/Controls/mrngTextBox.cs b/mRemoteNG/UI/Controls/mrngTextBox.cs index 43bba235f..e40ef7089 100644 --- a/mRemoteNG/UI/Controls/mrngTextBox.cs +++ b/mRemoteNG/UI/Controls/mrngTextBox.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Drawing; using System.Windows.Forms; using mRemoteNG.Themes; diff --git a/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs b/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs index 6b395a445..d211255f0 100644 --- a/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs +++ b/mRemoteNG/UI/Controls/mrngToolStripSplitButton.cs @@ -7,7 +7,7 @@ namespace mRemoteNG.UI.Controls { public new ToolStripDropDown DropDown { - get { return base.DropDown; } + get => base.DropDown; set { if (base.DropDown != value) diff --git a/mRemoteNG/UI/DialogFactory.cs b/mRemoteNG/UI/DialogFactory.cs index ac734c916..64b1b71ca 100644 --- a/mRemoteNG/UI/DialogFactory.cs +++ b/mRemoteNG/UI/DialogFactory.cs @@ -4,8 +4,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.TaskDialog; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI { diff --git a/mRemoteNG/UI/Forms/FrmAbout.Designer.cs b/mRemoteNG/UI/Forms/FrmAbout.Designer.cs index 0fa1c6bcd..698e8275f 100644 --- a/mRemoteNG/UI/Forms/FrmAbout.Designer.cs +++ b/mRemoteNG/UI/Forms/FrmAbout.Designer.cs @@ -144,7 +144,6 @@ this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.SystemColors.ControlText; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MaximumSize = new System.Drawing.Size(20000, 10000); this.MinimizeBox = false; diff --git a/mRemoteNG/UI/Forms/FrmAbout.cs b/mRemoteNG/UI/Forms/FrmAbout.cs index dcb59c122..35632f00e 100644 --- a/mRemoteNG/UI/Forms/FrmAbout.cs +++ b/mRemoteNG/UI/Forms/FrmAbout.cs @@ -1,8 +1,8 @@ using System.Diagnostics; using System.Windows.Forms; using mRemoteNG.App.Info; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -13,6 +13,7 @@ namespace mRemoteNG.UI.Forms private FrmAbout() { InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.UIAboutBox_16x); ThemeManager.getInstance().ThemeChanged += ApplyTheme; ApplyLanguage(); ApplyTheme(); diff --git a/mRemoteNG/UI/Forms/FrmExport.Designer.cs b/mRemoteNG/UI/Forms/FrmExport.Designer.cs index d6d81caee..5951ff366 100644 --- a/mRemoteNG/UI/Forms/FrmExport.Designer.cs +++ b/mRemoteNG/UI/Forms/FrmExport.Designer.cs @@ -295,7 +295,6 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.btnOK); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::mRemoteNG.Properties.Resources.ConnectionsSaveAs_Icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ExportForm"; diff --git a/mRemoteNG/UI/Forms/FrmExport.cs b/mRemoteNG/UI/Forms/FrmExport.cs index 7a7d003ba..29dc32468 100644 --- a/mRemoteNG/UI/Forms/FrmExport.cs +++ b/mRemoteNG/UI/Forms/FrmExport.cs @@ -5,8 +5,8 @@ using System.Windows.Forms; using mRemoteNG.Config.Connections; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -131,6 +131,7 @@ namespace mRemoteNG.UI.Forms public FrmExport() { InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Export_16x); FontOverrider.FontOverride(this); SelectedFolder = null; SelectedConnection = null; diff --git a/mRemoteNG/UI/Forms/FrmInputBox.cs b/mRemoteNG/UI/Forms/FrmInputBox.cs index 2026199e5..a04afb955 100644 --- a/mRemoteNG/UI/Forms/FrmInputBox.cs +++ b/mRemoteNG/UI/Forms/FrmInputBox.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { diff --git a/mRemoteNG/UI/Forms/FrmPassword.Designer.cs b/mRemoteNG/UI/Forms/FrmPassword.Designer.cs index 78afa5dd8..090e6ceec 100644 --- a/mRemoteNG/UI/Forms/FrmPassword.Designer.cs +++ b/mRemoteNG/UI/Forms/FrmPassword.Designer.cs @@ -1,4 +1,5 @@ using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -75,7 +76,7 @@ namespace mRemoteNG.UI.Forms this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 7; - this.btnOK.Text = global::mRemoteNG.Resources.Language.Language._Ok; + this.btnOK.Text = Language._Ok; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.BtnOK_Click); // @@ -88,7 +89,7 @@ namespace mRemoteNG.UI.Forms this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 6; - this.btnCancel.Text = global::mRemoteNG.Resources.Language.Language._Cancel; + this.btnCancel.Text = Language._Cancel; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click); // @@ -108,7 +109,7 @@ namespace mRemoteNG.UI.Forms // // pbLock // - this.pbLock.Image = global::mRemoteNG.Properties.Resources.Lock; + this.pbLock.Image = global::mRemoteNG.Properties.Resources.ASPWebSite_16x; this.pbLock.Location = new System.Drawing.Point(3, 12); this.pbLock.Name = "pbLock"; this.tableLayoutPanel1.SetRowSpan(this.pbLock, 6); diff --git a/mRemoteNG/UI/Forms/FrmPassword.cs b/mRemoteNG/UI/Forms/FrmPassword.cs index 3a81f3759..20363086a 100644 --- a/mRemoteNG/UI/Forms/FrmPassword.cs +++ b/mRemoteNG/UI/Forms/FrmPassword.cs @@ -1,10 +1,10 @@ using System; using System.Security; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Themes; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { diff --git a/mRemoteNG/UI/Forms/FrmSplashScreen.cs b/mRemoteNG/UI/Forms/FrmSplashScreen.cs index f8882e8de..9c53f02f1 100644 --- a/mRemoteNG/UI/Forms/FrmSplashScreen.cs +++ b/mRemoteNG/UI/Forms/FrmSplashScreen.cs @@ -1,4 +1,6 @@ -using System.Windows.Forms; +using System; +using System.Runtime.InteropServices; +using System.Windows.Forms; namespace mRemoteNG.UI.Forms { @@ -6,7 +8,23 @@ namespace mRemoteNG.UI.Forms { static FrmSplashScreen instance = null; - private FrmSplashScreen() => InitializeComponent(); + private FrmSplashScreen() + { + InitializeComponent(); + + Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(0, 0, Width, Height, 20, 20)); + } + + [DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn")] + private static extern IntPtr CreateRoundRectRgn + ( + int nLeftRect, // x-coordinate of upper-left corner + int nTopRect, // y-coordinate of upper-left corner + int nRightRect, // x-coordinate of lower-right corner + int nBottomRect, // y-coordinate of lower-right corner + int nWidthEllipse, // width of ellipse + int nHeightEllipse // height of ellipse + ); public static FrmSplashScreen getInstance() { diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs index 6a4698302..e6ec5b61e 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs @@ -6,8 +6,8 @@ using mRemoteNG.App.Info; using mRemoteNG.Config.Putty; using mRemoteNG.Connection.Protocol; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -17,7 +17,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Config_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Settings_16x); var display = new DisplayProperties(); var img = display.ScaleImage(Properties.Resources.PuttyConfig); btnLaunchPutty.Image = img; diff --git a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs index 7077288c2..6663a038c 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs @@ -2,8 +2,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -13,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Panels_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Panel_16x); } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs new file mode 100644 index 000000000..2e28e94d3 --- /dev/null +++ b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.Designer.cs @@ -0,0 +1,164 @@ + + +namespace mRemoteNG.UI.Forms.OptionsPages +{ + + public sealed partial class BackupPage : OptionsPage + { + + //UserControl overrides dispose to clean up the component list. + [System.Diagnostics.DebuggerNonUserCode()]protected override void Dispose(bool disposing) + { + try + { + if (disposing && components != null) + { + components.Dispose(); + } + } + finally + { + base.Dispose(disposing); + } + } + + //Required by the Windows Form Designer + private System.ComponentModel.Container components = null; + + //NOTE: The following procedure is required by the Windows Form Designer + //It can be modified using the Windows Form Designer. + //Do not modify it using the code editor. + [System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent() + { + this.tableLayoutPanelBackupFile = new System.Windows.Forms.TableLayoutPanel(); + this.textBoxConnectionBackupPath = new System.Windows.Forms.TextBox(); + this.lblConnectionsBackupPath = new System.Windows.Forms.Label(); + this.lblConnectionsBackupFrequency = new System.Windows.Forms.Label(); + this.lblConnectionsBackupMaxCount = new System.Windows.Forms.Label(); + this.cmbConnectionBackupFrequency = new System.Windows.Forms.ComboBox(); + this.buttonBrowsePath = new System.Windows.Forms.Button(); + this.numMaxBackups = new System.Windows.Forms.NumericUpDown(); + this.tableLayoutPanelBackupFile.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numMaxBackups)).BeginInit(); + this.SuspendLayout(); + // + // tableLayoutPanelBackupFile + // + this.tableLayoutPanelBackupFile.ColumnCount = 4; + this.tableLayoutPanelBackupFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelBackupFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelBackupFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelBackupFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanelBackupFile.Controls.Add(this.textBoxConnectionBackupPath, 1, 2); + this.tableLayoutPanelBackupFile.Controls.Add(this.lblConnectionsBackupPath, 0, 2); + this.tableLayoutPanelBackupFile.Controls.Add(this.lblConnectionsBackupFrequency, 0, 0); + this.tableLayoutPanelBackupFile.Controls.Add(this.lblConnectionsBackupMaxCount, 0, 1); + this.tableLayoutPanelBackupFile.Controls.Add(this.cmbConnectionBackupFrequency, 1, 0); + this.tableLayoutPanelBackupFile.Controls.Add(this.buttonBrowsePath, 2, 2); + this.tableLayoutPanelBackupFile.Controls.Add(this.numMaxBackups, 1, 1); + this.tableLayoutPanelBackupFile.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanelBackupFile.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanelBackupFile.Name = "tableLayoutPanelBackupFile"; + this.tableLayoutPanelBackupFile.RowCount = 4; + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanelBackupFile.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanelBackupFile.Size = new System.Drawing.Size(630, 412); + this.tableLayoutPanelBackupFile.TabIndex = 15; + // + // textBoxConnectionBackupPath + // + this.textBoxConnectionBackupPath.Dock = System.Windows.Forms.DockStyle.Fill; + this.textBoxConnectionBackupPath.Location = new System.Drawing.Point(195, 58); + this.textBoxConnectionBackupPath.Name = "textBoxConnectionBackupPath"; + this.textBoxConnectionBackupPath.Size = new System.Drawing.Size(250, 22); + this.textBoxConnectionBackupPath.TabIndex = 14; + // + // lblConnectionsBackupPath + // + this.lblConnectionsBackupPath.AutoSize = true; + this.lblConnectionsBackupPath.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblConnectionsBackupPath.Location = new System.Drawing.Point(3, 55); + this.lblConnectionsBackupPath.Name = "lblConnectionsBackupPath"; + this.lblConnectionsBackupPath.Size = new System.Drawing.Size(186, 29); + this.lblConnectionsBackupPath.TabIndex = 13; + this.lblConnectionsBackupPath.Text = "Location of connection file backup"; + this.lblConnectionsBackupPath.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lblConnectionsBackupFrequency + // + this.lblConnectionsBackupFrequency.AutoSize = true; + this.lblConnectionsBackupFrequency.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblConnectionsBackupFrequency.Location = new System.Drawing.Point(3, 0); + this.lblConnectionsBackupFrequency.Name = "lblConnectionsBackupFrequency"; + this.lblConnectionsBackupFrequency.Size = new System.Drawing.Size(186, 27); + this.lblConnectionsBackupFrequency.TabIndex = 14; + this.lblConnectionsBackupFrequency.Text = "Connection Backup Frequency"; + this.lblConnectionsBackupFrequency.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // lblConnectionsBackupMaxCount + // + this.lblConnectionsBackupMaxCount.AutoSize = true; + this.lblConnectionsBackupMaxCount.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblConnectionsBackupMaxCount.Location = new System.Drawing.Point(3, 27); + this.lblConnectionsBackupMaxCount.Name = "lblConnectionsBackupMaxCount"; + this.lblConnectionsBackupMaxCount.Size = new System.Drawing.Size(186, 28); + this.lblConnectionsBackupMaxCount.TabIndex = 13; + this.lblConnectionsBackupMaxCount.Text = "Maximum number of backups"; + this.lblConnectionsBackupMaxCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // cmbConnectionBackupFrequency + // + this.cmbConnectionBackupFrequency.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbConnectionBackupFrequency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbConnectionBackupFrequency.FormattingEnabled = true; + this.cmbConnectionBackupFrequency.Location = new System.Drawing.Point(195, 3); + this.cmbConnectionBackupFrequency.Name = "cmbConnectionBackupFrequency"; + this.cmbConnectionBackupFrequency.Size = new System.Drawing.Size(250, 21); + this.cmbConnectionBackupFrequency.TabIndex = 13; + // + // buttonBrowsePath + // + this.buttonBrowsePath.Location = new System.Drawing.Point(451, 58); + this.buttonBrowsePath.Name = "buttonBrowsePath"; + this.buttonBrowsePath.Size = new System.Drawing.Size(75, 23); + this.buttonBrowsePath.TabIndex = 15; + this.buttonBrowsePath.Text = "Browse"; + this.buttonBrowsePath.UseVisualStyleBackColor = true; + this.buttonBrowsePath.Click += new System.EventHandler(this.ButtonBrowsePath_Click); + // + // numMaxBackups + // + this.numMaxBackups.Location = new System.Drawing.Point(195, 30); + this.numMaxBackups.Name = "numMaxBackups"; + this.numMaxBackups.Size = new System.Drawing.Size(60, 22); + this.numMaxBackups.TabIndex = 16; + // + // BackupPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.tableLayoutPanelBackupFile); + this.Name = "BackupPage"; + this.Size = new System.Drawing.Size(630, 412); + this.tableLayoutPanelBackupFile.ResumeLayout(false); + this.tableLayoutPanelBackupFile.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numMaxBackups)).EndInit(); + this.ResumeLayout(false); + + } + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanelBackupFile; + private System.Windows.Forms.TextBox textBoxConnectionBackupPath; + private System.Windows.Forms.Label lblConnectionsBackupPath; + private System.Windows.Forms.Label lblConnectionsBackupFrequency; + private System.Windows.Forms.Label lblConnectionsBackupMaxCount; + private System.Windows.Forms.ComboBox cmbConnectionBackupFrequency; + private System.Windows.Forms.Button buttonBrowsePath; + private System.Windows.Forms.NumericUpDown numMaxBackups; + } +} \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs new file mode 100644 index 000000000..daa6ed9d1 --- /dev/null +++ b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs @@ -0,0 +1,149 @@ +using mRemoteNG.Config; +using System; +using System.Collections.Generic; +using System.Windows.Forms; +using mRemoteNG.App; +using mRemoteNG.Config.Connections; +using mRemoteNG.Security; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; + +namespace mRemoteNG.UI.Forms.OptionsPages +{ + public sealed partial class BackupPage + { + private readonly FrmMain _frmMain = FrmMain.Default; + private List _connectionBackup; + + public BackupPage() + { + InitializeComponent(); + ApplyTheme(); + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.DocumentsFolder_16x); + } + + public override string PageName + { + get => Language.strBackup; + set { } + } + + public override void ApplyLanguage() + { + base.ApplyLanguage(); + + buttonBrowsePath.Text = Language.strBrowse; + + _connectionBackup = new List + { + { + new DropdownList((int) ConnectionsBackupFrequencyEnum.Never, + Language.ConnectionsBackupFrequencyNever) + }, + { + new DropdownList((int) ConnectionsBackupFrequencyEnum.OnEdit, + Language.ConnectionsBackupFrequencyOnEdit) + }, + { + new DropdownList((int) ConnectionsBackupFrequencyEnum.OnExit, + Language.ConnectionsBackupFrequencyOnExit) + }, + { + new DropdownList((int) ConnectionsBackupFrequencyEnum.Daily, + Language.ConnectionsBackupFrequencyDaily) + }, + { + new DropdownList((int) ConnectionsBackupFrequencyEnum.Weekly, + Language.ConnectionsBackupFrequencyWeekly) + }, + //{ new DropdownList( (int)ConnectionsBackupFrequencyEnum.Custom, Language.ConnectionsBackupFrequencyCustom)} + }; + + cmbConnectionBackupFrequency.DataSource = _connectionBackup; + cmbConnectionBackupFrequency.DisplayMember = "DisplayString"; + cmbConnectionBackupFrequency.ValueMember = "Index"; + + lblConnectionsBackupFrequency.Text = Language.strConnectionBackupFrequency; + lblConnectionsBackupMaxCount.Text = Language.strConnectionsBackupMaxCount; + lblConnectionsBackupPath.Text = Language.strConnectionsBackupPath; + } + + public override void LoadSettings() + { + numMaxBackups.Value = Convert.ToDecimal(Settings.Default.BackupFileKeepCount); + + if (Settings.Default.SaveConnectionsFrequency == (int) ConnectionsBackupFrequencyEnum.Unassigned) + { + if (Settings.Default.SaveConnectionsAfterEveryEdit) + { + Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnEdit; + } + else if (Settings.Default.SaveConsOnExit) + { + Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnExit; + } + else + { + Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.Never; + } + } + + cmbConnectionBackupFrequency.SelectedValue = Settings.Default.SaveConnectionsFrequency; + textBoxConnectionBackupPath.Text = Settings.Default.CustomConsPath; + + } + + public override void SaveSettings() + { + Settings.Default.BackupFileKeepCount = (int) numMaxBackups.Value; + + if (Settings.Default.AutoSaveEveryMinutes > 0) + { + _frmMain.tmrAutoSave.Interval = Settings.Default.AutoSaveEveryMinutes * 60000; + _frmMain.tmrAutoSave.Enabled = true; + } + else + { + _frmMain.tmrAutoSave.Enabled = false; + } + + Settings.Default.SaveConnectionsFrequency = (int) cmbConnectionBackupFrequency.SelectedValue; + + if (textBoxConnectionBackupPath.Text.Trim().Length <= 0) + { + Settings.Default.LoadConsFromCustomLocation = false; + Settings.Default.CustomConsPath = String.Empty; + } + else + { + var newFileName = textBoxConnectionBackupPath.Text; + + Runtime.ConnectionsService.SaveConnections(Runtime.ConnectionsService.ConnectionTreeModel, false, + new SaveFilter(), newFileName); + + if (newFileName == Runtime.ConnectionsService.GetDefaultStartupConnectionFileName()) + { + Settings.Default.LoadConsFromCustomLocation = false; + } + else + { + Settings.Default.LoadConsFromCustomLocation = true; + Settings.Default.CustomConsPath = newFileName; + } + } + + //Obsolete. Set to false + Settings.Default.SaveConnectionsAfterEveryEdit = false; + Settings.Default.SaveConsOnExit = false; + } + + private void ButtonBrowsePath_Click(object sender, EventArgs e) + { + var saveDialog = DialogFactory.ConnectionsSaveAsDialog(); + + var dialogResult = saveDialog.ShowDialog(this); + + textBoxConnectionBackupPath.Text = dialogResult == DialogResult.OK ? saveDialog.FileName : string.Empty; + } + } +} \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.resx b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.resx similarity index 99% rename from mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.resx rename to mRemoteNG/UI/Forms/OptionsPages/BackupPage.resx index d58980a38..392a4fa0e 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.resx +++ b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.resx @@ -53,7 +53,6 @@ value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. - mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter diff --git a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.Designer.cs deleted file mode 100644 index 5a9f9d33f..000000000 --- a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.Designer.cs +++ /dev/null @@ -1,400 +0,0 @@ - - -using mRemoteNG.UI.Controls; - -namespace mRemoteNG.UI.Forms.OptionsPages -{ - - public sealed partial class ComponentsPage : OptionsPage - { - - //UserControl overrides dispose to clean up the component list. - [System.Diagnostics.DebuggerNonUserCode()] - protected override void Dispose(bool disposing) - { - try - { - if (disposing && components != null) - { - components.Dispose(); - } - } - finally - { - base.Dispose(disposing); - } - } - - //Required by the Windows Form Designer - private System.ComponentModel.Container components = null; - - //NOTE: The following procedure is required by the Windows Form Designer - //It can be modified using the Windows Form Designer. - //Do not modify it using the code editor. - [System.Diagnostics.DebuggerStepThrough()] - private void InitializeComponent() - { - this.pnlCheck1 = new System.Windows.Forms.Panel(); - this.txtCheck1 = new mRemoteNG.UI.Controls.MrngTextBox(); - this.lblCheck1 = new mRemoteNG.UI.Controls.MrngLabel(); - this.pbCheck1 = new System.Windows.Forms.PictureBox(); - this.pnlCheck2 = new System.Windows.Forms.Panel(); - this.txtCheck2 = new mRemoteNG.UI.Controls.MrngTextBox(); - this.lblCheck2 = new mRemoteNG.UI.Controls.MrngLabel(); - this.pbCheck2 = new System.Windows.Forms.PictureBox(); - this.pnlCheck3 = new System.Windows.Forms.Panel(); - this.txtCheck3 = new mRemoteNG.UI.Controls.MrngTextBox(); - this.lblCheck3 = new mRemoteNG.UI.Controls.MrngLabel(); - this.pbCheck3 = new System.Windows.Forms.PictureBox(); - this.pnlCheck4 = new System.Windows.Forms.Panel(); - this.txtCheck4 = new mRemoteNG.UI.Controls.MrngTextBox(); - this.lblCheck4 = new mRemoteNG.UI.Controls.MrngLabel(); - this.pbCheck4 = new System.Windows.Forms.PictureBox(); - this.pnlCheck5 = new System.Windows.Forms.Panel(); - this.txtCheck5 = new mRemoteNG.UI.Controls.MrngTextBox(); - this.lblCheck5 = new mRemoteNG.UI.Controls.MrngLabel(); - this.pbCheck5 = new System.Windows.Forms.PictureBox(); - this.btnCheck = new MrngButton(); - this.tblCheck = new System.Windows.Forms.TableLayoutPanel(); - this.pnlCheck1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck1)).BeginInit(); - this.pnlCheck2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck2)).BeginInit(); - this.pnlCheck3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck3)).BeginInit(); - this.pnlCheck4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck4)).BeginInit(); - this.pnlCheck5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck5)).BeginInit(); - this.tblCheck.SuspendLayout(); - this.SuspendLayout(); - // - // pnlCheck1 - // - this.pnlCheck1.Controls.Add(this.txtCheck1); - this.pnlCheck1.Controls.Add(this.lblCheck1); - this.pnlCheck1.Controls.Add(this.pbCheck1); - this.pnlCheck1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlCheck1.Location = new System.Drawing.Point(3, 3); - this.pnlCheck1.Name = "pnlCheck1"; - this.pnlCheck1.Size = new System.Drawing.Size(604, 84); - this.pnlCheck1.TabIndex = 10; - this.pnlCheck1.Visible = false; - // - // txtCheck1 - // - this.txtCheck1.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.txtCheck1.BackColor = System.Drawing.SystemColors.Control; - this.txtCheck1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCheck1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCheck1.Location = new System.Drawing.Point(35, 25); - this.txtCheck1.Multiline = true; - this.txtCheck1.Name = "txtCheck1"; - this.txtCheck1.ReadOnly = true; - this.txtCheck1.Size = new System.Drawing.Size(566, 55); - this.txtCheck1.TabIndex = 2; - // - // lblCheck1 - // - this.lblCheck1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblCheck1.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCheck1.ForeColor = System.Drawing.SystemColors.ControlText; - this.lblCheck1.Location = new System.Drawing.Point(32, -1); - this.lblCheck1.Name = "lblCheck1"; - this.lblCheck1.Size = new System.Drawing.Size(493, 23); - this.lblCheck1.TabIndex = 1; - this.lblCheck1.Text = "RDP check succeeded!"; - // - // pbCheck1 - // - this.pbCheck1.Location = new System.Drawing.Point(0, 0); - this.pbCheck1.Name = "pbCheck1"; - this.pbCheck1.Size = new System.Drawing.Size(30, 30); - this.pbCheck1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbCheck1.TabIndex = 0; - this.pbCheck1.TabStop = false; - // - // pnlCheck2 - // - this.pnlCheck2.Controls.Add(this.txtCheck2); - this.pnlCheck2.Controls.Add(this.lblCheck2); - this.pnlCheck2.Controls.Add(this.pbCheck2); - this.pnlCheck2.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlCheck2.Location = new System.Drawing.Point(3, 93); - this.pnlCheck2.Name = "pnlCheck2"; - this.pnlCheck2.Size = new System.Drawing.Size(604, 84); - this.pnlCheck2.TabIndex = 20; - this.pnlCheck2.Visible = false; - // - // txtCheck2 - // - this.txtCheck2.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.txtCheck2.BackColor = System.Drawing.SystemColors.Control; - this.txtCheck2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCheck2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCheck2.Location = new System.Drawing.Point(35, 25); - this.txtCheck2.Multiline = true; - this.txtCheck2.Name = "txtCheck2"; - this.txtCheck2.ReadOnly = true; - this.txtCheck2.Size = new System.Drawing.Size(566, 55); - this.txtCheck2.TabIndex = 2; - // - // lblCheck2 - // - this.lblCheck2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblCheck2.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCheck2.Location = new System.Drawing.Point(32, -1); - this.lblCheck2.Name = "lblCheck2"; - this.lblCheck2.Size = new System.Drawing.Size(489, 23); - this.lblCheck2.TabIndex = 1; - this.lblCheck2.Text = "RDP check succeeded!"; - // - // pbCheck2 - // - this.pbCheck2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.pbCheck2.Location = new System.Drawing.Point(0, -1); - this.pbCheck2.Name = "pbCheck2"; - this.pbCheck2.Size = new System.Drawing.Size(30, 31); - this.pbCheck2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbCheck2.TabIndex = 0; - this.pbCheck2.TabStop = false; - // - // pnlCheck3 - // - this.pnlCheck3.Controls.Add(this.txtCheck3); - this.pnlCheck3.Controls.Add(this.lblCheck3); - this.pnlCheck3.Controls.Add(this.pbCheck3); - this.pnlCheck3.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlCheck3.Location = new System.Drawing.Point(3, 183); - this.pnlCheck3.Name = "pnlCheck3"; - this.pnlCheck3.Size = new System.Drawing.Size(604, 84); - this.pnlCheck3.TabIndex = 30; - this.pnlCheck3.Visible = false; - // - // txtCheck3 - // - this.txtCheck3.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.txtCheck3.BackColor = System.Drawing.SystemColors.Control; - this.txtCheck3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCheck3.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCheck3.Location = new System.Drawing.Point(35, 25); - this.txtCheck3.Multiline = true; - this.txtCheck3.Name = "txtCheck3"; - this.txtCheck3.ReadOnly = true; - this.txtCheck3.Size = new System.Drawing.Size(566, 55); - this.txtCheck3.TabIndex = 2; - // - // lblCheck3 - // - this.lblCheck3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblCheck3.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCheck3.Location = new System.Drawing.Point(32, -1); - this.lblCheck3.Name = "lblCheck3"; - this.lblCheck3.Size = new System.Drawing.Size(489, 23); - this.lblCheck3.TabIndex = 1; - this.lblCheck3.Text = "RDP check succeeded!"; - // - // pbCheck3 - // - this.pbCheck3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.pbCheck3.Location = new System.Drawing.Point(0, -1); - this.pbCheck3.Name = "pbCheck3"; - this.pbCheck3.Size = new System.Drawing.Size(30, 31); - this.pbCheck3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbCheck3.TabIndex = 0; - this.pbCheck3.TabStop = false; - // - // pnlCheck4 - // - this.pnlCheck4.Controls.Add(this.txtCheck4); - this.pnlCheck4.Controls.Add(this.lblCheck4); - this.pnlCheck4.Controls.Add(this.pbCheck4); - this.pnlCheck4.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlCheck4.Location = new System.Drawing.Point(3, 273); - this.pnlCheck4.Name = "pnlCheck4"; - this.pnlCheck4.Size = new System.Drawing.Size(604, 84); - this.pnlCheck4.TabIndex = 40; - this.pnlCheck4.Visible = false; - // - // txtCheck4 - // - this.txtCheck4.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.txtCheck4.BackColor = System.Drawing.SystemColors.Control; - this.txtCheck4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCheck4.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCheck4.Location = new System.Drawing.Point(35, 25); - this.txtCheck4.Multiline = true; - this.txtCheck4.Name = "txtCheck4"; - this.txtCheck4.ReadOnly = true; - this.txtCheck4.Size = new System.Drawing.Size(566, 55); - this.txtCheck4.TabIndex = 2; - // - // lblCheck4 - // - this.lblCheck4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblCheck4.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCheck4.Location = new System.Drawing.Point(32, -1); - this.lblCheck4.Name = "lblCheck4"; - this.lblCheck4.Size = new System.Drawing.Size(489, 23); - this.lblCheck4.TabIndex = 1; - this.lblCheck4.Text = "RDP check succeeded!"; - // - // pbCheck4 - // - this.pbCheck4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.pbCheck4.Location = new System.Drawing.Point(0, 0); - this.pbCheck4.Name = "pbCheck4"; - this.pbCheck4.Size = new System.Drawing.Size(30, 31); - this.pbCheck4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbCheck4.TabIndex = 0; - this.pbCheck4.TabStop = false; - // - // pnlCheck5 - // - this.pnlCheck5.Controls.Add(this.txtCheck5); - this.pnlCheck5.Controls.Add(this.lblCheck5); - this.pnlCheck5.Controls.Add(this.pbCheck5); - this.pnlCheck5.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlCheck5.Location = new System.Drawing.Point(3, 363); - this.pnlCheck5.Name = "pnlCheck5"; - this.pnlCheck5.Size = new System.Drawing.Size(604, 84); - this.pnlCheck5.TabIndex = 50; - this.pnlCheck5.Visible = false; - // - // txtCheck5 - // - this.txtCheck5.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.txtCheck5.BackColor = System.Drawing.SystemColors.Control; - this.txtCheck5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCheck5.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtCheck5.Location = new System.Drawing.Point(35, 25); - this.txtCheck5.Multiline = true; - this.txtCheck5.Name = "txtCheck5"; - this.txtCheck5.ReadOnly = true; - this.txtCheck5.Size = new System.Drawing.Size(566, 55); - this.txtCheck5.TabIndex = 2; - // - // lblCheck5 - // - this.lblCheck5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lblCheck5.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblCheck5.Location = new System.Drawing.Point(32, -1); - this.lblCheck5.Name = "lblCheck5"; - this.lblCheck5.Size = new System.Drawing.Size(489, 23); - this.lblCheck5.TabIndex = 1; - this.lblCheck5.Text = "RDP check succeeded!"; - // - // pbCheck5 - // - this.pbCheck5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left))); - this.pbCheck5.Location = new System.Drawing.Point(0, -1); - this.pbCheck5.Name = "pbCheck5"; - this.pbCheck5.Size = new System.Drawing.Size(30, 31); - this.pbCheck5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pbCheck5.TabIndex = 0; - this.pbCheck5.TabStop = false; - // - // btnCheck - // - this.btnCheck._mice = MrngButton.MouseState.OUT; - this.btnCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnCheck.Location = new System.Drawing.Point(3, 453); - this.btnCheck.Name = "btnCheck"; - this.btnCheck.Size = new System.Drawing.Size(104, 23); - this.btnCheck.TabIndex = 0; - this.btnCheck.Text = "Check"; - this.btnCheck.UseVisualStyleBackColor = true; - this.btnCheck.Click += new System.EventHandler(this.BtnCheckAgain_Click); - // - // tblCheck - // - this.tblCheck.ColumnCount = 1; - this.tblCheck.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tblCheck.Controls.Add(this.pnlCheck5, 0, 4); - this.tblCheck.Controls.Add(this.pnlCheck2, 0, 1); - this.tblCheck.Controls.Add(this.pnlCheck3, 0, 2); - this.tblCheck.Controls.Add(this.pnlCheck4, 0, 3); - this.tblCheck.Controls.Add(this.pnlCheck1, 0, 0); - this.tblCheck.Controls.Add(this.btnCheck, 0, 5); - this.tblCheck.Dock = System.Windows.Forms.DockStyle.Fill; - this.tblCheck.Location = new System.Drawing.Point(0, 0); - this.tblCheck.Name = "tblCheck"; - this.tblCheck.RowCount = 6; - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 90F)); - this.tblCheck.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tblCheck.Size = new System.Drawing.Size(610, 490); - this.tblCheck.TabIndex = 51; - // - // ComponentsPage - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.tblCheck); - this.Name = "ComponentsPage"; - this.Size = new System.Drawing.Size(610, 490); - this.pnlCheck1.ResumeLayout(false); - this.pnlCheck1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck1)).EndInit(); - this.pnlCheck2.ResumeLayout(false); - this.pnlCheck2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck2)).EndInit(); - this.pnlCheck3.ResumeLayout(false); - this.pnlCheck3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck3)).EndInit(); - this.pnlCheck4.ResumeLayout(false); - this.pnlCheck4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck4)).EndInit(); - this.pnlCheck5.ResumeLayout(false); - this.pnlCheck5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pbCheck5)).EndInit(); - this.tblCheck.ResumeLayout(false); - this.ResumeLayout(false); - - } - private System.Windows.Forms.PictureBox pbCheck1; - private Controls.MrngLabel lblCheck1; - private System.Windows.Forms.Panel pnlCheck2; - private Controls.MrngLabel lblCheck2; - private System.Windows.Forms.PictureBox pbCheck2; - private System.Windows.Forms.Panel pnlCheck3; - private Controls.MrngLabel lblCheck3; - private System.Windows.Forms.PictureBox pbCheck3; - private System.Windows.Forms.Panel pnlCheck4; - private Controls.MrngLabel lblCheck4; - private System.Windows.Forms.PictureBox pbCheck4; - private System.Windows.Forms.Panel pnlCheck5; - private Controls.MrngLabel lblCheck5; - private System.Windows.Forms.PictureBox pbCheck5; - private MrngButton btnCheck; - private Controls.MrngTextBox txtCheck1; - private Controls.MrngTextBox txtCheck2; - private Controls.MrngTextBox txtCheck3; - private Controls.MrngTextBox txtCheck4; - private Controls.MrngTextBox txtCheck5; - private System.Windows.Forms.Panel pnlCheck1; - private System.Windows.Forms.TableLayoutPanel tblCheck; - } -} diff --git a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs deleted file mode 100644 index 64e81dafd..000000000 --- a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs +++ /dev/null @@ -1,156 +0,0 @@ -using System; -using System.Diagnostics; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Threading; -using mRemoteNG.App; -using mRemoteNG.App.Info; -using mRemoteNG.Connection.Protocol.RDP; -using mRemoteNG.Messages; -using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; -using mRemoteNG.Themes; - -namespace mRemoteNG.UI.Forms.OptionsPages -{ - public partial class ComponentsPage - { - public ComponentsPage() - { - ApplyTheme(); - PageIcon = Properties.Resources.ComponentsCheck_Icon; - InitializeComponent(); - FontOverrider.FontOverride(this); - ThemeManager.getInstance().ThemeChanged += ApplyTheme; - } - - public override string PageName - { - get => Language.ComponentsCheck; - set { } - } - - #region Form Stuff - - public override void ApplyLanguage() - { - base.ApplyLanguage(); - - Text = Language.ComponentsCheck; - btnCheck.Text = Language.Refresh; - } - - private void BtnCheckAgain_Click(object sender, EventArgs e) - { - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Beginning component check", true); - CheckRdp(); - CheckVnc(); - CheckPutty(); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Finished component check", true); - } - - #endregion - - private void CheckRdp() - { - pnlCheck1.Visible = true; - var rdpProtocolFactory = new RdpProtocolFactory(); - var supportedVersions = rdpProtocolFactory.GetSupportedVersions(); - - if (supportedVersions.Any()) - { - pbCheck1.Image = Properties.Resources.Good_Symbol; - lblCheck1.ForeColor = Color.DarkOliveGreen; - lblCheck1.Text = "RDP (Remote Desktop) " + Language.CheckSucceeded; - txtCheck1.Text = string.Format(Language.CcRDPOK, string.Join(", ", supportedVersions)); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "RDP versions installed: "+ string.Join(",", supportedVersions), true); - } - else - { - pbCheck1.Image = Properties.Resources.Bad_Symbol; - lblCheck1.ForeColor = Color.Firebrick; - lblCheck1.Text = "RDP (Remote Desktop) " + Language.CheckFailed; - txtCheck1.Text = string.Format(Language.CcRDPFailed, GeneralAppInfo.UrlForum); - - Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, - "RDP " + Language.CcNotInstalledProperly, true); - } - } - - private void CheckVnc() - { - pnlCheck2.Visible = true; - - try - { - using (var vnc = new VncSharp.RemoteDesktop()) - { - vnc.CreateControl(); - - while (!vnc.Created) - { - Thread.Sleep(10); - System.Windows.Forms.Application.DoEvents(); - } - - pbCheck2.Image = Properties.Resources.Good_Symbol; - lblCheck2.ForeColor = Color.DarkOliveGreen; - lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.CheckSucceeded; - txtCheck2.Text = string.Format(Language.CcVNCOK, vnc.ProductVersion); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "VNC installed", true); - } - } - catch (Exception) - { - pbCheck2.Image = Properties.Resources.Bad_Symbol; - lblCheck2.ForeColor = Color.Firebrick; - lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.CheckFailed; - txtCheck2.Text = string.Format(Language.CcVNCFailed, GeneralAppInfo.UrlForum); - - Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, - "VNC " + Language.CcNotInstalledProperly, true); - } - } - - private void CheckPutty() - { - pnlCheck3.Visible = true; - string pPath; - if (Settings.Default.UseCustomPuttyPath == false) - { - pPath = GeneralAppInfo.HomePath + "\\PuTTYNG.exe"; - } - else - { - pPath = Settings.Default.CustomPuttyPath; - } - - if (File.Exists(pPath)) - { - var versionInfo = FileVersionInfo.GetVersionInfo(pPath); - - pbCheck3.Image = Properties.Resources.Good_Symbol; - lblCheck3.ForeColor = Color.DarkOliveGreen; - lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.CheckSucceeded; - txtCheck3.Text = - $"{Language.CcPuttyOK}{Environment.NewLine}Version: {versionInfo.ProductName} Release: {versionInfo.FileVersion}"; - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "PuTTY installed", true); - } - else - { - pbCheck3.Image = Properties.Resources.Bad_Symbol; - lblCheck3.ForeColor = Color.Firebrick; - lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.CheckFailed; - txtCheck3.Text = Language.CcPuttyFailed; - - Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, - "PuTTY " + Language.CcNotInstalledProperly, true); - Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "File " + pPath + " does not exist.", - true); - } - } - - - } -} \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs index 505886b99..89d4fc9b8 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs @@ -1,6 +1,5 @@ - - -using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -154,7 +153,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkSingleClickOnOpenedConnectionSwitchesToIt.Name = "chkSingleClickOnOpenedConnectionSwitchesToIt"; this.chkSingleClickOnOpenedConnectionSwitchesToIt.Size = new System.Drawing.Size(492, 17); this.chkSingleClickOnOpenedConnectionSwitchesToIt.TabIndex = 1; - this.chkSingleClickOnOpenedConnectionSwitchesToIt.Text = global::mRemoteNG.Resources.Language.Language.SingleClickOnOpenConnectionSwitchesToIt; + this.chkSingleClickOnOpenedConnectionSwitchesToIt.Text = Language.SingleClickOnOpenConnectionSwitchesToIt; this.chkSingleClickOnOpenedConnectionSwitchesToIt.UseVisualStyleBackColor = true; // // lblAutoSave1 diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs index f4d306dee..6649cbcb7 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs @@ -1,5 +1,7 @@ using mRemoteNG.Config; using System; +using System.Collections.Generic; +using mRemoteNG.Config.Connections; using mRemoteNG.Properties; using mRemoteNG.Resources.Language; @@ -8,12 +10,13 @@ namespace mRemoteNG.UI.Forms.OptionsPages public sealed partial class ConnectionsPage { private readonly FrmMain _frmMain = FrmMain.Default; + private List _connectionWarning; public ConnectionsPage() { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Root_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.ASPWebSite_16x); } public override string PageName @@ -25,12 +28,23 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void ApplyLanguage() { base.ApplyLanguage(); + + _connectionWarning = new List + { + { new DropdownList((int)ConfirmCloseEnum.Never, Language.RadioCloseWarnMultiple)}, + { new DropdownList((int)ConfirmCloseEnum.Exit, Language.RadioCloseWarnExit)}, + { new DropdownList((int)ConfirmCloseEnum.Multiple, Language.RadioCloseWarnMultiple)}, + { new DropdownList((int)ConfirmCloseEnum.All, Language._CloseWarnAll)} + }; + + //comboBoxConnectionWarning.DataSource = _connectionWarning; + //comboBoxConnectionWarning.DisplayMember = "DisplayString"; + //comboBoxConnectionWarning.ValueMember = "Index"; chkSingleClickOnConnectionOpensIt.Text = Language.SingleClickOnConnectionOpensIt; chkSingleClickOnOpenedConnectionSwitchesToIt.Text = Language.SingleClickOnOpenConnectionSwitchesToIt; chkConnectionTreeTrackActiveConnection.Text = Language.TrackActiveConnectionInConnectionTree; chkHostnameLikeDisplayName.Text = Language.SetHostnameLikeDisplayName; - chkSaveConnectionsAfterEveryEdit.Text = Language.SaveConnectionsAfterEveryEdit; chkUseFilterSearch.Text = Language.FilterSearchMatchesInConnectionTree; chkPlaceSearchBarAboveConnectionTree.Text = Language.PlaceSearchBarAboveConnectionTree; chkDoNotTrimUsername.Text = Language.DoNotTrimUsername; @@ -38,12 +52,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages lblRdpReconnectionCount.Text = Language.RdpReconnectCount; lblRDPConTimeout.Text = Language.RdpOverallConnectionTimeout; lblAutoSave1.Text = Language.AutoSaveEvery; + //ngLabel1.Text = Language.strLabelClosingConnections; - lblClosingConnections.Text = Language.ClosingConnections; - radCloseWarnAll.Text = Language._CloseWarnAll; - radCloseWarnMultiple.Text = Language.RadioCloseWarnMultiple; - radCloseWarnExit.Text = Language.RadioCloseWarnExit; - radCloseWarnNever.Text = Language.RadioCloseWarnNever; } public override void LoadSettings() @@ -52,7 +62,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages chkSingleClickOnOpenedConnectionSwitchesToIt.Checked = Settings.Default.SingleClickSwitchesToOpenConnection; chkConnectionTreeTrackActiveConnection.Checked = Settings.Default.TrackActiveConnectionInConnectionTree; chkHostnameLikeDisplayName.Checked = Settings.Default.SetHostnameLikeDisplayName; - chkSaveConnectionsAfterEveryEdit.Checked = Settings.Default.SaveConnectionsAfterEveryEdit; + chkUseFilterSearch.Checked = Settings.Default.UseFilterSearch; chkPlaceSearchBarAboveConnectionTree.Checked = Settings.Default.PlaceSearchBarAboveConnectionTree; chkDoNotTrimUsername.Checked = Settings.Default.DoNotTrimUsername; @@ -61,20 +71,22 @@ namespace mRemoteNG.UI.Forms.OptionsPages numRDPConTimeout.Value = Convert.ToDecimal(Settings.Default.ConRDPOverallConnectionTimeout); numAutoSave.Value = Convert.ToDecimal(Settings.Default.AutoSaveEveryMinutes); - switch (Settings.Default.ConfirmCloseConnection) + //comboBoxConnectionWarning.SelectedValue = Settings.Default.ConfirmCloseConnection; + + if (Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.Unassigned) { - case (int)ConfirmCloseEnum.Never: - radCloseWarnNever.Checked = true; - break; - case (int)ConfirmCloseEnum.Exit: - radCloseWarnExit.Checked = true; - break; - case (int)ConfirmCloseEnum.Multiple: - radCloseWarnMultiple.Checked = true; - break; - default: - radCloseWarnAll.Checked = true; - break; + if (Settings.Default.SaveConnectionsAfterEveryEdit) + { + Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnEdit; + } + else if (Settings.Default.SaveConsOnExit) + { + Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnExit; + } + else + { + Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.Never; + } } } @@ -84,7 +96,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages Settings.Default.SingleClickSwitchesToOpenConnection = chkSingleClickOnOpenedConnectionSwitchesToIt.Checked; Settings.Default.TrackActiveConnectionInConnectionTree = chkConnectionTreeTrackActiveConnection.Checked; Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked; - Settings.Default.SaveConnectionsAfterEveryEdit = chkSaveConnectionsAfterEveryEdit.Checked; + Settings.Default.UseFilterSearch = chkUseFilterSearch.Checked; Settings.Default.PlaceSearchBarAboveConnectionTree = chkPlaceSearchBarAboveConnectionTree.Checked; Settings.Default.DoNotTrimUsername = chkDoNotTrimUsername.Checked; @@ -102,25 +114,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages _frmMain.tmrAutoSave.Enabled = false; } - if (radCloseWarnAll.Checked) - { - Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.All; - } - - if (radCloseWarnMultiple.Checked) - { - Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Multiple; - } - - if (radCloseWarnExit.Checked) - { - Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Exit; - } - - if (radCloseWarnNever.Checked) - { - Settings.Default.ConfirmCloseConnection = (int)ConfirmCloseEnum.Never; - } + //Settings.Default.ConfirmCloseConnection = (int)comboBoxConnectionWarning.SelectedValue; } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs index 29ffa06fa..50c6982f6 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs @@ -1,8 +1,8 @@ using System; using mRemoteNG.App; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -12,7 +12,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Key_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Key_16x); } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs index aad68bf63..c3bcdb6bd 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs @@ -13,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Error_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.LogError_16x); } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/OptionsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/OptionsPage.cs index 550ccf3e9..8360424a4 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/OptionsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/OptionsPage.cs @@ -64,4 +64,15 @@ namespace mRemoteNG.UI.Forms.OptionsPages ResumeLayout(false); } } + internal class DropdownList + { + public int Index { get; set; } + public string DisplayString { get; set; } + + public DropdownList(int argIndex, string argDisplay) + { + Index = argIndex; + DisplayString = argDisplay; + } + } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs index bb59d2511..f11cc2b80 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs @@ -6,9 +6,9 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Security.Factories; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -20,7 +20,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages PopulateEncryptionEngineDropDown(); PopulateBlockCipherDropDown(); ApplyTheme(); - PageIcon = Properties.Resources.Shield_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Lock_16x); } [Browsable(false)] diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs index 4043f0cc9..123b1d76d 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs @@ -187,7 +187,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // imgConnectionStatus // - this.imgConnectionStatus.Image = global::mRemoteNG.Properties.Resources.Help; + this.imgConnectionStatus.Image = global::mRemoteNG.Properties.Resources.F1Help_16x; this.imgConnectionStatus.Location = new System.Drawing.Point(162, 272); this.imgConnectionStatus.Name = "imgConnectionStatus"; this.imgConnectionStatus.Size = new System.Drawing.Size(16, 16); diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs index 4bfdd0c48..b5118bf78 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs @@ -1,11 +1,10 @@ using System; using mRemoteNG.App; -using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -17,7 +16,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Database_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.SQLDatabase_16x); _databaseConnectionTester = new DatabaseConnectionTester(); } @@ -122,7 +121,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages var password = txtSQLPassword.Text; lblTestConnectionResults.Text = Language.TestingConnection; - imgConnectionStatus.Image = Properties.Resources.loading_spinner; + imgConnectionStatus.Image = Properties.Resources.Loading_Spinner; btnTestConnection.Enabled = false; var connectionTestResult = @@ -165,8 +164,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void UpdateConnectionImage(bool connectionSuccess) { imgConnectionStatus.Image = connectionSuccess - ? Properties.Resources.tick - : Properties.Resources.exclamation; + ? Properties.Resources.Test_16x + : Properties.Resources.LogError_16x; } private string BuildTestFailedMessage(string specificMessage) diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs index 42a8c8fbf..3b4e7cec2 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.Designer.cs @@ -1,4 +1,4 @@ - + using mRemoteNG.UI.Controls; @@ -33,16 +33,16 @@ namespace mRemoteNG.UI.Forms.OptionsPages [System.Diagnostics.DebuggerStepThrough()] private void InitializeComponent() { - this.chkReconnectOnStart = new MrngCheckBox(); - this.chkSaveConsOnExit = new MrngCheckBox(); - this.chkSingleInstance = new MrngCheckBox(); - this.chkProperInstallationOfComponentsAtStartup = new MrngCheckBox(); - this.chkStartMinimized = new MrngCheckBox(); + this.chkReconnectOnStart = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkSaveConsOnExit = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkSingleInstance = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkStartMinimized = new mRemoteNG.UI.Controls.MrngCheckBox(); + this.chkStartFullScreen = new mRemoteNG.UI.Controls.MrngCheckBox(); this.SuspendLayout(); // // chkReconnectOnStart // - this.chkReconnectOnStart._mice = MrngCheckBox.MouseState.OUT; + this.chkReconnectOnStart._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkReconnectOnStart.AutoSize = true; this.chkReconnectOnStart.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkReconnectOnStart.Location = new System.Drawing.Point(3, 26); @@ -54,7 +54,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSaveConsOnExit // - this.chkSaveConsOnExit._mice = MrngCheckBox.MouseState.OUT; + this.chkSaveConsOnExit._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkSaveConsOnExit.AutoSize = true; this.chkSaveConsOnExit.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSaveConsOnExit.Location = new System.Drawing.Point(3, 2); @@ -66,7 +66,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSingleInstance // - this.chkSingleInstance._mice = MrngCheckBox.MouseState.OUT; + this.chkSingleInstance._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkSingleInstance.AutoSize = true; this.chkSingleInstance.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSingleInstance.Location = new System.Drawing.Point(3, 50); @@ -76,39 +76,41 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkSingleInstance.Text = "Allow only a single instance of the application (mRemote restart required)"; this.chkSingleInstance.UseVisualStyleBackColor = true; // - // chkProperInstallationOfComponentsAtStartup - // - this.chkProperInstallationOfComponentsAtStartup._mice = MrngCheckBox.MouseState.OUT; - this.chkProperInstallationOfComponentsAtStartup.AutoSize = true; - this.chkProperInstallationOfComponentsAtStartup.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chkProperInstallationOfComponentsAtStartup.Location = new System.Drawing.Point(3, 74); - this.chkProperInstallationOfComponentsAtStartup.Name = "chkProperInstallationOfComponentsAtStartup"; - this.chkProperInstallationOfComponentsAtStartup.Size = new System.Drawing.Size(290, 17); - this.chkProperInstallationOfComponentsAtStartup.TabIndex = 3; - this.chkProperInstallationOfComponentsAtStartup.Text = "Check proper installation of components at startup"; - this.chkProperInstallationOfComponentsAtStartup.UseVisualStyleBackColor = true; - // // chkStartMinimized // - this.chkStartMinimized._mice = MrngCheckBox.MouseState.OUT; + this.chkStartMinimized._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; this.chkStartMinimized.AutoSize = true; this.chkStartMinimized.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chkStartMinimized.Location = new System.Drawing.Point(3, 97); + this.chkStartMinimized.Location = new System.Drawing.Point(3, 73); this.chkStartMinimized.Name = "chkStartMinimized"; this.chkStartMinimized.Size = new System.Drawing.Size(105, 17); this.chkStartMinimized.TabIndex = 3; this.chkStartMinimized.Text = "Start minimized"; this.chkStartMinimized.UseVisualStyleBackColor = true; + this.chkStartMinimized.CheckedChanged += new System.EventHandler(this.chkStartMinimized_CheckedChanged); + // + // chkStartFullScreen + // + this.chkStartFullScreen._mice = mRemoteNG.UI.Controls.MrngCheckBox.MouseState.OUT; + this.chkStartFullScreen.AutoSize = true; + this.chkStartFullScreen.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.chkStartFullScreen.Location = new System.Drawing.Point(3, 96); + this.chkStartFullScreen.Name = "chkStartFullScreen"; + this.chkStartFullScreen.Size = new System.Drawing.Size(109, 17); + this.chkStartFullScreen.TabIndex = 4; + this.chkStartFullScreen.Text = "Start Full Screen"; + this.chkStartFullScreen.UseVisualStyleBackColor = true; + this.chkStartFullScreen.CheckedChanged += new System.EventHandler(this.chkStartFullScreen_CheckedChanged); // // StartupExitPage // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.Controls.Add(this.chkStartFullScreen); this.Controls.Add(this.chkReconnectOnStart); this.Controls.Add(this.chkSaveConsOnExit); this.Controls.Add(this.chkSingleInstance); this.Controls.Add(this.chkStartMinimized); - this.Controls.Add(this.chkProperInstallationOfComponentsAtStartup); this.Name = "StartupExitPage"; this.Size = new System.Drawing.Size(610, 490); this.Load += new System.EventHandler(this.StartupExitPage_Load); @@ -119,7 +121,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages internal MrngCheckBox chkReconnectOnStart; internal MrngCheckBox chkSaveConsOnExit; internal MrngCheckBox chkSingleInstance; - internal MrngCheckBox chkProperInstallationOfComponentsAtStartup; internal MrngCheckBox chkStartMinimized; + internal MrngCheckBox chkStartFullScreen; } } diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs index bbce35bc1..836dbcb88 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs @@ -10,7 +10,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.StartupExit_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.StartupProject_16x); } public override string PageName @@ -23,29 +23,44 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.ApplyLanguage(); - chkSaveConsOnExit.Text = Language.SaveConsOnExit; chkReconnectOnStart.Text = Language.ReconnectAtStartup; chkSingleInstance.Text = Language.AllowOnlySingleInstance; chkStartMinimized.Text = Language.StartMinimized; - chkProperInstallationOfComponentsAtStartup.Text = Language.CheckProperInstallationOfComponentsAtStartup; } public override void SaveSettings() { base.SaveSettings(); - Settings.Default.SaveConsOnExit = chkSaveConsOnExit.Checked; Settings.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked; Settings.Default.SingleInstance = chkSingleInstance.Checked; Settings.Default.StartMinimized = chkStartMinimized.Checked; + Settings.Default.StartFullScreen = chkStartFullScreen.Checked; } private void StartupExitPage_Load(object sender, EventArgs e) { - chkSaveConsOnExit.Checked = Settings.Default.SaveConsOnExit; chkReconnectOnStart.Checked = Settings.Default.OpenConsFromLastSession; chkSingleInstance.Checked = Settings.Default.SingleInstance; chkStartMinimized.Checked = Settings.Default.StartMinimized; + chkStartFullScreen.Checked = Settings.Default.StartFullScreen; + ; + } + + private void chkStartFullScreen_CheckedChanged(object sender, EventArgs e) + { + if (chkStartFullScreen.Checked && chkStartMinimized.Checked) + { + chkStartMinimized.Checked = false; + } + } + + private void chkStartMinimized_CheckedChanged(object sender, EventArgs e) + { + if (chkStartMinimized.Checked && chkStartFullScreen.Checked) + { + chkStartFullScreen.Checked = false; + } } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs index 3b00e54d8..404aecb99 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs @@ -1,6 +1,5 @@ - - -using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -80,7 +79,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkIdentifyQuickConnectTabs.Name = "chkIdentifyQuickConnectTabs"; this.chkIdentifyQuickConnectTabs.Size = new System.Drawing.Size(315, 17); this.chkIdentifyQuickConnectTabs.TabIndex = 4; - this.chkIdentifyQuickConnectTabs.Text = global::mRemoteNG.Resources.Language.Language.IdentifyQuickConnectTabs; + this.chkIdentifyQuickConnectTabs.Text = Language.IdentifyQuickConnectTabs; this.chkIdentifyQuickConnectTabs.UseVisualStyleBackColor = true; // // chkOpenNewTabRightOfSelected diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs index 14440ffb8..c89997945 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs @@ -1,4 +1,4 @@ -using mRemoteNG.Properties; +using mRemoteNG.Properties; using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages @@ -9,7 +9,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Tab_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Tab_16x); } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs index 8bb02aed1..6266db90b 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs @@ -5,8 +5,8 @@ using System.Linq; using System.Collections.Generic; using BrightIdeasSoftware; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.TaskDialog; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -23,7 +23,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages public ThemePage() { InitializeComponent(); - PageIcon = Properties.Resources.Appearance_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.AppearanceEditor_16x); _themeManager = ThemeManager.getInstance(); if (!_themeManager.ThemingActive) return; _themeManager = ThemeManager.getInstance(); diff --git a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs index e9a852948..4e336e544 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs @@ -5,10 +5,10 @@ using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.App.Update; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.UI.TaskDialog; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -24,7 +24,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Properties.Resources.Update_Icon; + PageIcon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.RunUpdate_16x); } #region Public Methods @@ -93,17 +93,17 @@ namespace mRemoteNG.UI.Forms.OptionsPages } var stable = cboReleaseChannel.Items.Add(UpdateChannelInfo.STABLE); - var beta = cboReleaseChannel.Items.Add(UpdateChannelInfo.BETA); - var dev = cboReleaseChannel.Items.Add(UpdateChannelInfo.DEV); + var beta = cboReleaseChannel.Items.Add(UpdateChannelInfo.PREVIEW); + var dev = cboReleaseChannel.Items.Add(UpdateChannelInfo.NIGHTLY); switch (Settings.Default.UpdateChannel) { case UpdateChannelInfo.STABLE: cboReleaseChannel.SelectedIndex = stable; break; - case UpdateChannelInfo.BETA: + case UpdateChannelInfo.PREVIEW: cboReleaseChannel.SelectedIndex = beta; break; - case UpdateChannelInfo.DEV: + case UpdateChannelInfo.NIGHTLY: cboReleaseChannel.SelectedIndex = dev; break; default: diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs index 1e5059f73..4f6b341ec 100644 --- a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs +++ b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs @@ -1,6 +1,5 @@ - - -using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -54,7 +53,7 @@ namespace mRemoteNG.UI.Forms this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 24); this.btnOK.TabIndex = 20; - this.btnOK.Text = global::mRemoteNG.Resources.Language.Language._Ok; + this.btnOK.Text = Language._Ok; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // @@ -70,13 +69,13 @@ namespace mRemoteNG.UI.Forms // btnNew // this.btnNew._mice = MrngButton.MouseState.HOVER; - this.btnNew.Image = global::mRemoteNG.Properties.Resources.Panel_Add; + this.btnNew.Image = global::mRemoteNG.Properties.Resources.InsertPanel_16x; this.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnNew.Location = new System.Drawing.Point(86, 72); this.btnNew.Name = "btnNew"; this.btnNew.Size = new System.Drawing.Size(75, 24); this.btnNew.TabIndex = 40; - this.btnNew.Text = global::mRemoteNG.Resources.Language.Language._New; + this.btnNew.Text = Language._New; this.btnNew.UseVisualStyleBackColor = true; this.btnNew.Click += new System.EventHandler(this.btnNew_Click); // @@ -92,7 +91,6 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.cbPanels); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::mRemoteNG.Properties.Resources.Panels_Icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmChoosePanel"; diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.cs b/mRemoteNG/UI/Forms/frmChoosePanel.cs index 8b69c86aa..432b782fa 100644 --- a/mRemoteNG/UI/Forms/frmChoosePanel.cs +++ b/mRemoteNG/UI/Forms/frmChoosePanel.cs @@ -1,8 +1,8 @@ using System.Windows.Forms; using mRemoteNG.App; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.UI.Panels; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -13,6 +13,7 @@ namespace mRemoteNG.UI.Forms public FrmChoosePanel() { InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Panel_16x); _panelAdder = new PanelAdder(); } diff --git a/mRemoteNG/UI/Forms/frmMain.Designer.cs b/mRemoteNG/UI/Forms/frmMain.Designer.cs index 899582f67..124247ab4 100644 --- a/mRemoteNG/UI/Forms/frmMain.Designer.cs +++ b/mRemoteNG/UI/Forms/frmMain.Designer.cs @@ -60,7 +60,7 @@ this.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingSdi; this.pnlDock.Location = new System.Drawing.Point(0, 0); this.pnlDock.Name = "pnlDock"; - this.pnlDock.Size = new System.Drawing.Size(1129, 471); + this.pnlDock.Size = new System.Drawing.Size(1129, 496); this.pnlDock.TabIndex = 13; this.pnlDock.ActiveDocumentChanged += new System.EventHandler(this.pnlDock_ActiveDocumentChanged); // @@ -78,7 +78,7 @@ this.msMain.Location = new System.Drawing.Point(3, 50); this.msMain.Name = "msMain"; this.msMain.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.msMain.Size = new System.Drawing.Size(184, 25); + this.msMain.Size = new System.Drawing.Size(303, 25); this.msMain.Stretch = false; this.msMain.TabIndex = 0; this.msMain.Text = "Main Toolbar"; @@ -91,7 +91,6 @@ this.fileMenu.Size = new System.Drawing.Size(37, 19); this.fileMenu.Text = "&File"; this.fileMenu.TreeWindow = null; - this.fileMenu.DropDownOpening += new System.EventHandler(this.mainFileMenu1_DropDownOpening); // // viewMenu // @@ -112,7 +111,7 @@ this.toolsMenu.MainForm = null; this.toolsMenu.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.toolsMenu.Name = "mMenTools"; - this.toolsMenu.Size = new System.Drawing.Size(47, 19); + this.toolsMenu.Size = new System.Drawing.Size(46, 19); this.toolsMenu.Text = "&Tools"; // // helpMenu @@ -134,7 +133,7 @@ // tsContainer.ContentPanel // this.tsContainer.ContentPanel.Controls.Add(this.pnlDock); - this.tsContainer.ContentPanel.Size = new System.Drawing.Size(1129, 471); + this.tsContainer.ContentPanel.Size = new System.Drawing.Size(1129, 496); this.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill; this.tsContainer.Location = new System.Drawing.Point(0, 0); this.tsContainer.Name = "tsContainer"; @@ -144,9 +143,9 @@ // // tsContainer.TopToolStripPanel // + this.tsContainer.TopToolStripPanel.Controls.Add(this.msMain); this.tsContainer.TopToolStripPanel.Controls.Add(this._quickConnectToolStrip); this.tsContainer.TopToolStripPanel.Controls.Add(this._multiSshToolStrip); - this.tsContainer.TopToolStripPanel.Controls.Add(this.msMain); this.tsContainer.TopToolStripPanel.Controls.Add(this._externalToolsToolStrip); this.tsContainer.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; // @@ -156,15 +155,15 @@ this._quickConnectToolStrip.ConnectionInitiator = connectionInitiator1; this._quickConnectToolStrip.Dock = System.Windows.Forms.DockStyle.None; this._quickConnectToolStrip.ForeColor = System.Drawing.SystemColors.ControlText; - this._quickConnectToolStrip.Location = new System.Drawing.Point(3, 0); + this._quickConnectToolStrip.Location = new System.Drawing.Point(114, 25); this._quickConnectToolStrip.Name = "_quickConnectToolStrip"; - this._quickConnectToolStrip.Size = new System.Drawing.Size(364, 25); + this._quickConnectToolStrip.Size = new System.Drawing.Size(395, 25); this._quickConnectToolStrip.TabIndex = 18; // // _multiSshToolStrip // this._multiSshToolStrip.Dock = System.Windows.Forms.DockStyle.None; - this._multiSshToolStrip.Location = new System.Drawing.Point(3, 25); + this._multiSshToolStrip.Location = new System.Drawing.Point(3, 0); this._multiSshToolStrip.MinimumSize = new System.Drawing.Size(300, 0); this._multiSshToolStrip.Name = "_multiSshToolStrip"; this._multiSshToolStrip.Size = new System.Drawing.Size(376, 25); @@ -175,7 +174,7 @@ this._externalToolsToolStrip.BackColor = System.Drawing.SystemColors.Control; this._externalToolsToolStrip.Dock = System.Windows.Forms.DockStyle.None; this._externalToolsToolStrip.ForeColor = System.Drawing.SystemColors.ControlText; - this._externalToolsToolStrip.Location = new System.Drawing.Point(3, 75); + this._externalToolsToolStrip.Location = new System.Drawing.Point(3, 25); this._externalToolsToolStrip.Name = "_externalToolsToolStrip"; this._externalToolsToolStrip.Size = new System.Drawing.Size(111, 25); this._externalToolsToolStrip.TabIndex = 17; @@ -201,6 +200,7 @@ this.MinimumSize = new System.Drawing.Size(400, 400); this.Name = "FrmMain"; this.Opacity = 0D; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = " "; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing); this.Load += new System.EventHandler(this.FrmMain_Load); diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs index dae8ff872..a05b7d7e7 100644 --- a/mRemoteNG/UI/Forms/frmMain.cs +++ b/mRemoteNG/UI/Forms/frmMain.cs @@ -28,12 +28,9 @@ using System.Text; using System.Windows.Forms; using mRemoteNG.UI.Panels; using WeifenLuo.WinFormsUI.Docking; -using CefSharp; -using CefSharp.WinForms; -using CefSharp.SchemeHandler; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Controls; using Settings = mRemoteNG.Properties.Settings; +using mRemoteNG.Resources.Language; // ReSharper disable MemberCanBePrivate.Global @@ -160,44 +157,6 @@ namespace mRemoteNG.UI.Forms SetMenuDependencies(); - //Monitor parent process exit and close subprocesses if parent process exits first - //This will at some point in the future becomes the default - CefSharpSettings.SubprocessExitIfParentProcessClosed = true; - - //For Windows 7 and above, best to include relevant app.manifest entries as well - Cef.EnableHighDPISupport(); - - string dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName); - if (Runtime.IsPortableEdition) dir = SettingsFileInfo.SettingsPath; - - CefSettings settings = new CefSettings() - { - CachePath = Path.Combine(dir, "CEFCache"), - LogFile = Path.Combine(dir, "mRemoteNG_cef.log"), - }; - - if (Settings.Default.TextLogMessageWriterWriteDebugMsgs) - settings.LogSeverity = LogSeverity.Verbose; - else if (Settings.Default.TextLogMessageWriterWriteInfoMsgs) - settings.LogSeverity = LogSeverity.Info; - else if (Settings.Default.TextLogMessageWriterWriteWarningMsgs) - settings.LogSeverity = LogSeverity.Warning; - else if (Settings.Default.TextLogMessageWriterWriteErrorMsgs) - settings.LogSeverity = LogSeverity.Error; - - //Implement scheme to be allowed to view local help files - settings.RegisterScheme(new CefCustomScheme - { - SchemeName = Cef.CefCommitHash, - DomainName = "help", - SchemeHandlerFactory = new FolderSchemeHandlerFactory( - rootFolder: $@"{GeneralAppInfo.HomePath}\Help\", - defaultPage: "index.html" - ) - }); - - Cef.Initialize(settings); - var uiLoader = new DockPanelLayoutLoader(this, messageCollector); uiLoader.LoadPanelsFromXml(); @@ -212,6 +171,8 @@ namespace mRemoteNG.UI.Forms if (Settings.Default.ResetPanels) SetDefaultLayout(); + else + SetLayout(); Runtime.ConnectionsService.ConnectionsLoaded += ConnectionsServiceOnConnectionsLoaded; Runtime.ConnectionsService.ConnectionsSaved += ConnectionsServiceOnConnectionsSaved; @@ -241,6 +202,10 @@ namespace mRemoteNG.UI.Forms if (Settings.Default.MinimizeToTray) ShowInTaskbar = false; } + if (Settings.Default.StartFullScreen) + { + Fullscreen.Value = true; + } if (!Settings.Default.CreateEmptyPanelOnStartUp) return; var panelName = !string.IsNullOrEmpty(Settings.Default.StartUpPanelName) @@ -262,10 +227,26 @@ namespace mRemoteNG.UI.Forms private void OnApplicationSettingChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs) { - if (propertyChangedEventArgs.PropertyName != nameof(Settings.LockToolbars)) - return; - - LockToolbarPositions(Settings.Default.LockToolbars); + switch (propertyChangedEventArgs.PropertyName) + { + case nameof(Settings.LockToolbars): + LockToolbarPositions(Settings.Default.LockToolbars); + break; + case nameof(Settings.ViewMenuExternalTools): + LockToolbarPositions(Settings.Default.LockToolbars); + break; + case nameof(Settings.ViewMenuMessages): + LockToolbarPositions(Settings.Default.LockToolbars); + break; + case nameof(Settings.ViewMenuMultiSSH): + LockToolbarPositions(Settings.Default.LockToolbars); + break; + case nameof(Settings.ViewMenuQuickConnect): + LockToolbarPositions(Settings.Default.LockToolbars); + break; + default: + return; + } } private void LockToolbarPositions(bool shouldBeLocked) @@ -409,6 +390,18 @@ namespace mRemoteNG.UI.Forms private void frmMain_FormClosing(object sender, FormClosingEventArgs e) { + if (Runtime.WindowList != null) + { + foreach (BaseWindow window in Runtime.WindowList) + { + window.Close(); + } + } + + IsClosing = true; + + Hide(); + if (Settings.Default.CloseToTray) { if (Runtime.NotificationAreaIcon == null) @@ -461,20 +454,9 @@ namespace mRemoteNG.UI.Forms } } + NativeMethods.ChangeClipboardChain(Handle, _fpChainedWindowHandle); Shutdown.Cleanup(_quickConnectToolStrip, _externalToolsToolStrip, _multiSshToolStrip, this); - IsClosing = true; - - Cef.Shutdown(); - - if (Runtime.WindowList != null) - { - foreach (BaseWindow window in Runtime.WindowList) - { - window.Close(); - } - } - Shutdown.StartUpdate(); Debug.Print("[END] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture)); @@ -602,9 +584,25 @@ namespace mRemoteNG.UI.Forms _clipboardChangedEvent?.Invoke(); break; case NativeMethods.WM_CHANGECBCHAIN: - //Send to the next window - NativeMethods.SendMessage(_fpChainedWindowHandle, m.Msg, m.LParam, m.WParam); - _fpChainedWindowHandle = m.LParam; + // When a clipboard viewer window receives the WM_CHANGECBCHAIN message, + // it should call the SendMessage function to pass the message to the + // next window in the chain, unless the next window is the window + // being removed. In this case, the clipboard viewer should save + // the handle specified by the lParam parameter as the next window in the chain. + // + // wParam is the Handle to the window being removed from + // the clipboard viewer chain + // lParam is the Handle to the next window in the chain + // following the window being removed. + if (m.WParam == _fpChainedWindowHandle) { + // If wParam is the next clipboard viewer then it + // is being removed so update pointer to the next + // window in the clipboard chain + _fpChainedWindowHandle = m.LParam; + } else { + //Send to the next window + NativeMethods.SendMessage(_fpChainedWindowHandle, m.Msg, m.LParam, m.WParam); + } break; } } @@ -743,15 +741,73 @@ namespace mRemoteNG.UI.Forms pnlDock.Visible = false; Windows.TreeForm.Show(pnlDock, DockState.DockLeft); - viewMenu._mMenViewConnections.Checked = true; Windows.ConfigForm.Show(pnlDock, DockState.DockLeft); - viewMenu._mMenViewConfig.Checked = true; Windows.ErrorsForm.Show(pnlDock, DockState.DockBottomAutoHide); viewMenu._mMenViewErrorsAndInfos.Checked = true; pnlDock.Visible = true; } + public void SetLayout() + { + pnlDock.Visible = false; + + if (Settings.Default.ViewMenuMessages == true) + { + Windows.ErrorsForm.Show(pnlDock, DockState.DockBottomAutoHide); + viewMenu._mMenViewErrorsAndInfos.Checked = true; + } + else + viewMenu._mMenViewErrorsAndInfos.Checked = false; + + + if (Settings.Default.ViewMenuExternalTools == true) + { + viewMenu.TsExternalTools.Visible = true; + viewMenu._mMenViewExtAppsToolbar.Checked = true; + } + else + { + viewMenu.TsExternalTools.Visible = false; + viewMenu._mMenViewExtAppsToolbar.Checked = false; + } + + if (Settings.Default.ViewMenuMultiSSH == true) + { + viewMenu.TsMultiSsh.Visible = true; + viewMenu._mMenViewMultiSshToolbar.Checked = true; + } + else + { + viewMenu.TsMultiSsh.Visible = false; + viewMenu._mMenViewMultiSshToolbar.Checked = false; + } + + if (Settings.Default.ViewMenuQuickConnect == true) + { + viewMenu.TsQuickConnect.Visible = true; + viewMenu._mMenViewQuickConnectToolbar.Checked = true; + } + else + { + viewMenu.TsQuickConnect.Visible = false; + viewMenu._mMenViewQuickConnectToolbar.Checked = false; + } + + if (Settings.Default.LockToolbars == true) + { + Settings.Default.LockToolbars = true; + viewMenu._mMenViewLockToolbars.Checked = true; + } + else + { + Settings.Default.LockToolbars = false; + viewMenu._mMenViewLockToolbars.Checked = false; + } + + pnlDock.Visible = true; + } + public void ShowHideMenu() => tsContainer.TopToolStripPanelVisible = !tsContainer.TopToolStripPanelVisible; #endregion @@ -776,10 +832,5 @@ namespace mRemoteNG.UI.Forms { viewMenu.mMenView_DropDownOpening(sender, e); } - - private void mainFileMenu1_DropDownOpening(object sender, EventArgs e) - { - fileMenu.mMenFile_DropDownOpening(sender, e); - } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/frmOptions.Designer.cs b/mRemoteNG/UI/Forms/frmOptions.Designer.cs index 7167a89cf..f8c12440b 100644 --- a/mRemoteNG/UI/Forms/frmOptions.Designer.cs +++ b/mRemoteNG/UI/Forms/frmOptions.Designer.cs @@ -164,7 +164,6 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.pnlBottom); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmOptions"; diff --git a/mRemoteNG/UI/Forms/frmOptions.cs b/mRemoteNG/UI/Forms/frmOptions.cs index 0989631cc..0ed14f957 100644 --- a/mRemoteNG/UI/Forms/frmOptions.cs +++ b/mRemoteNG/UI/Forms/frmOptions.cs @@ -26,6 +26,7 @@ namespace mRemoteNG.UI.Forms Cursor.Current = Cursors.WaitCursor; Application.DoEvents(); InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Settings_16x); _pageName = pn; Cursor.Current = Cursors.Default; } @@ -81,7 +82,8 @@ namespace mRemoteNG.UI.Forms {typeof(ThemePage).Name, new ThemePage {Dock = DockStyle.Fill}}, {typeof(SecurityPage).Name, new SecurityPage {Dock = DockStyle.Fill}}, {typeof(AdvancedPage).Name, new AdvancedPage {Dock = DockStyle.Fill}}, - {typeof(ComponentsPage).Name, new ComponentsPage {Dock = DockStyle.Fill}}, + {typeof(BackupPage).Name, new BackupPage {Dock = DockStyle.Fill}}, + //{typeof(ComponentsPage).Name, new ComponentsPage {Dock = DockStyle.Fill}}, }; } @@ -101,7 +103,7 @@ namespace mRemoteNG.UI.Forms private object ImageGetter(object rowobject) { var page = rowobject as OptionsPage; - return page?.PageIcon == null ? _display.ScaleImage(Properties.Resources.Help) : _display.ScaleImage(page.PageIcon); + return page?.PageIcon == null ? _display.ScaleImage(Properties.Resources.F1Help_16x) : _display.ScaleImage(page.PageIcon); } private void SetInitiallyActivatedPage() diff --git a/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs b/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs index db8385ab5..965502453 100644 --- a/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs +++ b/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Menu { diff --git a/mRemoteNG/UI/Menu/FileMenu.cs b/mRemoteNG/UI/Menu/FileMenu.cs index cc8507787..80ba29650 100644 --- a/mRemoteNG/UI/Menu/FileMenu.cs +++ b/mRemoteNG/UI/Menu/FileMenu.cs @@ -1,41 +1,25 @@ using System; -using System.Linq; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Connection; -using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Security; -using mRemoteNG.Tree; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Window; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Menu { public class FileMenu : ToolStripMenuItem { + private ToolStripMenuItem _mMenToolsOptions; private ToolStripMenuItem _mMenFileNew; private ToolStripMenuItem _mMenFileLoad; private ToolStripMenuItem _mMenFileSave; private ToolStripMenuItem _mMenFileSaveAs; - private ToolStripSeparator _mMenFileSep1; private ToolStripMenuItem _mMenFileExit; - private ToolStripMenuItem _mMenFileDuplicate; private ToolStripSeparator _mMenFileSep2; - private ToolStripMenuItem _mMenFileNewConnection; - private ToolStripMenuItem _mMenFileNewFolder; - private ToolStripSeparator _mMenFileSep3; - private ToolStripSeparator _mMenFileSep4; - private ToolStripMenuItem _mMenFileDelete; - private ToolStripMenuItem _mMenFileRename; - private ToolStripSeparator _mMenFileSep5; - private ToolStripMenuItem _mMenFileExport; - private ToolStripMenuItem _mMenFileImportFromFile; - private ToolStripMenuItem _mMenFileImportFromActiveDirectory; - private ToolStripMenuItem _mMenFileImportFromPortScan; - private ToolStripMenuItem _mMenFileImport; - private ToolStripMenuItem _mMenReconnectAll; + private ToolStripSeparator _mMenFileSep1; public ConnectionTreeWindow TreeWindow { get; set; } public IConnectionInitiator ConnectionInitiator { get; set; } @@ -47,93 +31,45 @@ namespace mRemoteNG.UI.Menu private void Initialize() { - _mMenFileNewConnection = new ToolStripMenuItem(); - _mMenFileNewFolder = new ToolStripMenuItem(); - _mMenFileSep1 = new ToolStripSeparator(); _mMenFileNew = new ToolStripMenuItem(); _mMenFileLoad = new ToolStripMenuItem(); _mMenFileSave = new ToolStripMenuItem(); _mMenFileSaveAs = new ToolStripMenuItem(); _mMenFileSep2 = new ToolStripSeparator(); - _mMenFileDelete = new ToolStripMenuItem(); - _mMenFileRename = new ToolStripMenuItem(); - _mMenFileDuplicate = new ToolStripMenuItem(); - _mMenFileSep4 = new ToolStripSeparator(); - _mMenReconnectAll = new ToolStripMenuItem(); - _mMenFileSep3 = new ToolStripSeparator(); - _mMenFileImport = new ToolStripMenuItem(); - _mMenFileImportFromFile = new ToolStripMenuItem(); - _mMenFileImportFromActiveDirectory = new ToolStripMenuItem(); - _mMenFileImportFromPortScan = new ToolStripMenuItem(); - _mMenFileExport = new ToolStripMenuItem(); - _mMenFileSep5 = new ToolStripSeparator(); + _mMenFileSep1 = new ToolStripSeparator(); _mMenFileExit = new ToolStripMenuItem(); + _mMenToolsOptions = new ToolStripMenuItem(); // // mMenFile // DropDownItems.AddRange(new ToolStripItem[] { - _mMenFileNewConnection, - _mMenFileNewFolder, - _mMenFileSep1, _mMenFileNew, _mMenFileLoad, _mMenFileSave, _mMenFileSaveAs, + _mMenFileSep1, + _mMenToolsOptions, _mMenFileSep2, - _mMenFileDelete, - _mMenFileRename, - _mMenFileDuplicate, - _mMenFileSep4, - _mMenReconnectAll, - _mMenFileSep3, - _mMenFileImport, - _mMenFileExport, - _mMenFileSep5, _mMenFileExit }); Name = "mMenFile"; Size = new System.Drawing.Size(37, 20); Text = Language._File; - //DropDownOpening += mMenFile_DropDownOpening; - DropDownClosed += OnDropDownClosed; - // - // mMenFileNewConnection - // - _mMenFileNewConnection.Image = Properties.Resources.Connection_Add; - _mMenFileNewConnection.Name = "mMenFileNewConnection"; - _mMenFileNewConnection.ShortcutKeys = Keys.Control | Keys.N; - _mMenFileNewConnection.Size = new System.Drawing.Size(281, 22); - _mMenFileNewConnection.Text = Language.NewConnection; - _mMenFileNewConnection.Click += mMenFileNewConnection_Click; - // - // mMenFileNewFolder - // - _mMenFileNewFolder.Image = Properties.Resources.Folder_Add; - _mMenFileNewFolder.Name = "mMenFileNewFolder"; - _mMenFileNewFolder.ShortcutKeys = (Keys.Control | Keys.Shift) - | Keys.N; - _mMenFileNewFolder.Size = new System.Drawing.Size(281, 22); - _mMenFileNewFolder.Text = Language.NewFolder; - _mMenFileNewFolder.Click += mMenFileNewFolder_Click; - // - // mMenFileSep1 - // - _mMenFileSep1.Name = "mMenFileSep1"; - _mMenFileSep1.Size = new System.Drawing.Size(278, 6); // // mMenFileNew // - _mMenFileNew.Image = Properties.Resources.Connections_New; + _mMenFileNew.Image = Properties.Resources.NewFile_16x; _mMenFileNew.Name = "mMenFileNew"; + _mMenFileLoad.ShortcutKeys = Keys.Control | Keys.N; _mMenFileNew.Size = new System.Drawing.Size(281, 22); _mMenFileNew.Text = Language.NewConnectionFile; _mMenFileNew.Click += mMenFileNew_Click; // // mMenFileLoad // - _mMenFileLoad.Image = Properties.Resources.Connections_Load; + _mMenFileLoad.Image = Properties.Resources.OpenFile_16x; _mMenFileLoad.Name = "mMenFileLoad"; _mMenFileLoad.ShortcutKeys = Keys.Control | Keys.O; _mMenFileLoad.Size = new System.Drawing.Size(281, 22); @@ -142,7 +78,6 @@ namespace mRemoteNG.UI.Menu // // mMenFileSave // - _mMenFileSave.Image = Properties.Resources.Connections_Save; _mMenFileSave.Name = "mMenFileSave"; _mMenFileSave.ShortcutKeys = Keys.Control | Keys.S; _mMenFileSave.Size = new System.Drawing.Size(281, 22); @@ -151,7 +86,6 @@ namespace mRemoteNG.UI.Menu // // mMenFileSaveAs // - _mMenFileSaveAs.Image = Properties.Resources.Connections_SaveAs; _mMenFileSaveAs.Name = "mMenFileSaveAs"; _mMenFileSaveAs.ShortcutKeys = (Keys.Control | Keys.Shift) | Keys.S; @@ -164,96 +98,22 @@ namespace mRemoteNG.UI.Menu _mMenFileSep2.Name = "mMenFileSep2"; _mMenFileSep2.Size = new System.Drawing.Size(278, 6); // - // mMenFileDelete + // mMenFileSep1 // - _mMenFileDelete.Image = Properties.Resources.Delete; - _mMenFileDelete.Name = "mMenFileDelete"; - _mMenFileDelete.Size = new System.Drawing.Size(281, 22); - _mMenFileDelete.Text = Language.Delete; - _mMenFileDelete.Click += mMenFileDelete_Click; + _mMenFileSep1.Name = "mMenFileSep3"; + _mMenFileSep1.Size = new System.Drawing.Size(278, 6); // - // mMenFileRename + // mMenToolsOptions // - _mMenFileRename.Image = Properties.Resources.Rename; - _mMenFileRename.Name = "mMenFileRename"; - _mMenFileRename.Size = new System.Drawing.Size(281, 22); - _mMenFileRename.Text = Language.Rename; - _mMenFileRename.Click += mMenFileRename_Click; - // - // mMenFileDuplicate - // - _mMenFileDuplicate.Image = Properties.Resources.page_copy; - _mMenFileDuplicate.Name = "mMenFileDuplicate"; - _mMenFileDuplicate.Size = new System.Drawing.Size(281, 22); - _mMenFileDuplicate.Text = Language.Duplicate; - _mMenFileDuplicate.Click += mMenFileDuplicate_Click; - // - // mMenFileSep4 - // - _mMenFileSep4.Name = "mMenFileSep4"; - _mMenFileSep4.Size = new System.Drawing.Size(278, 6); - // - // mMenReconnectAll - // - _mMenReconnectAll.Image = Properties.Resources.Refresh; - _mMenReconnectAll.Name = "mMenReconnectAll"; - _mMenReconnectAll.Size = new System.Drawing.Size(281, 22); - _mMenReconnectAll.Text = Language.ReconnectAllConnections; - _mMenReconnectAll.Click += mMenReconnectAll_Click; - // - // mMenFileSep3 - // - _mMenFileSep3.Name = "mMenFileSep3"; - _mMenFileSep3.Size = new System.Drawing.Size(278, 6); - // - // mMenFileImport - // - _mMenFileImport.DropDownItems.AddRange(new ToolStripItem[] - { - _mMenFileImportFromFile, - _mMenFileImportFromActiveDirectory, - _mMenFileImportFromPortScan - }); - _mMenFileImport.Name = "mMenFileImport"; - _mMenFileImport.Size = new System.Drawing.Size(281, 22); - _mMenFileImport.Text = Language._Import; - // - // mMenFileImportFromFile - // - _mMenFileImportFromFile.Name = "mMenFileImportFromFile"; - _mMenFileImportFromFile.Size = new System.Drawing.Size(235, 22); - _mMenFileImportFromFile.Text = Language.ImportFromFile; - _mMenFileImportFromFile.Click += mMenFileImportFromFile_Click; - // - // mMenFileImportFromActiveDirectory - // - _mMenFileImportFromActiveDirectory.Name = "mMenFileImportFromActiveDirectory"; - _mMenFileImportFromActiveDirectory.Size = new System.Drawing.Size(235, 22); - _mMenFileImportFromActiveDirectory.Text = Language.ImportAD; - _mMenFileImportFromActiveDirectory.Click += mMenFileImportFromActiveDirectory_Click; - // - // mMenFileImportFromPortScan - // - _mMenFileImportFromPortScan.Name = "mMenFileImportFromPortScan"; - _mMenFileImportFromPortScan.Size = new System.Drawing.Size(235, 22); - _mMenFileImportFromPortScan.Text = Language.ImportPortScan; - _mMenFileImportFromPortScan.Click += mMenFileImportFromPortScan_Click; - // - // mMenFileExport - // - _mMenFileExport.Name = "mMenFileExport"; - _mMenFileExport.Size = new System.Drawing.Size(281, 22); - _mMenFileExport.Text = Language._ExportToFile; - _mMenFileExport.Click += mMenFileExport_Click; - // - // mMenFileSep5 - // - _mMenFileSep5.Name = "mMenFileSep5"; - _mMenFileSep5.Size = new System.Drawing.Size(278, 6); + _mMenToolsOptions.Image = Properties.Resources.Settings_16x; + _mMenToolsOptions.Name = "mMenToolsOptions"; + _mMenToolsOptions.Size = new System.Drawing.Size(184, 22); + _mMenToolsOptions.Text = Language.Options; + _mMenToolsOptions.Click += mMenToolsOptions_Click; // // mMenFileExit // - _mMenFileExit.Image = Properties.Resources.Quit; + _mMenFileExit.Image = Properties.Resources.CloseSolution_16x; _mMenFileExit.Name = "mMenFileExit"; _mMenFileExit.ShortcutKeys = Keys.Alt | Keys.F4; _mMenFileExit.Size = new System.Drawing.Size(281, 22); @@ -264,112 +124,16 @@ namespace mRemoteNG.UI.Menu public void ApplyLanguage() { Text = Language._File; - _mMenFileNewConnection.Text = Language.NewConnection; - _mMenFileNewFolder.Text = Language.NewFolder; _mMenFileNew.Text = Language.NewConnectionFile; _mMenFileLoad.Text = Language.OpenConnectionFile; _mMenFileSave.Text = Language.SaveConnectionFile; _mMenFileSaveAs.Text = Language.SaveConnectionFileAs; - _mMenFileImport.Text = Language._Import; - _mMenFileImportFromFile.Text = Language.ImportFromFile; - _mMenFileImportFromActiveDirectory.Text = Language.ImportAD; - _mMenFileImportFromPortScan.Text = Language.ImportPortScan; - _mMenFileExport.Text = Language._ExportToFile; + _mMenToolsOptions.Text = Language.Options; _mMenFileExit.Text = Language.Exit; } #region File - internal void mMenFile_DropDownOpening(object sender, EventArgs e) - { - var selectedNodeType = TreeWindow.SelectedNode?.GetTreeNodeType(); - // ReSharper disable once SwitchStatementMissingSomeCases - switch (selectedNodeType) - { - case TreeNodeType.Root: - _mMenFileNewConnection.Enabled = true; - _mMenFileNewFolder.Enabled = true; - _mMenFileDelete.Enabled = false; - _mMenFileRename.Enabled = true; - _mMenFileDuplicate.Enabled = false; - _mMenReconnectAll.Enabled = true; - _mMenFileDelete.Text = Language.Delete; - _mMenFileRename.Text = Language.RenameFolder; - _mMenFileDuplicate.Text = Language.Duplicate; - _mMenReconnectAll.Text = Language.ReconnectAll; - break; - case TreeNodeType.Container: - _mMenFileNewConnection.Enabled = true; - _mMenFileNewFolder.Enabled = true; - _mMenFileDelete.Enabled = true; - _mMenFileRename.Enabled = true; - _mMenFileDuplicate.Enabled = true; - _mMenReconnectAll.Enabled = true; - _mMenFileDelete.Text = Language.DeleteFolder; - _mMenFileRename.Text = Language.RenameFolder; - _mMenFileDuplicate.Text = Language.DuplicateFolder; - _mMenReconnectAll.Text = Language.ReconnectAll; - break; - case TreeNodeType.Connection: - _mMenFileNewConnection.Enabled = true; - _mMenFileNewFolder.Enabled = true; - _mMenFileDelete.Enabled = true; - _mMenFileRename.Enabled = true; - _mMenFileDuplicate.Enabled = true; - _mMenReconnectAll.Enabled = true; - _mMenFileDelete.Text = Language.DeleteConnection; - _mMenFileRename.Text = Language.RenameConnection; - _mMenFileDuplicate.Text = Language.DuplicateConnection; - _mMenReconnectAll.Text = Language.ReconnectAll; - break; - case TreeNodeType.PuttyRoot: - case TreeNodeType.PuttySession: - _mMenFileNewConnection.Enabled = false; - _mMenFileNewFolder.Enabled = false; - _mMenFileDelete.Enabled = false; - _mMenFileRename.Enabled = false; - _mMenFileDuplicate.Enabled = false; - _mMenReconnectAll.Enabled = true; - _mMenFileDelete.Text = Language.Delete; - _mMenFileRename.Text = Language.Rename; - _mMenFileDuplicate.Text = Language.Duplicate; - _mMenReconnectAll.Text = Language.ReconnectAll; - break; - default: - _mMenFileNewConnection.Enabled = true; - _mMenFileNewFolder.Enabled = true; - _mMenFileDelete.Enabled = false; - _mMenFileRename.Enabled = false; - _mMenFileDuplicate.Enabled = false; - _mMenReconnectAll.Enabled = true; - _mMenFileDelete.Text = Language.Delete; - _mMenFileRename.Text = Language.Rename; - _mMenFileDuplicate.Text = Language.Duplicate; - _mMenReconnectAll.Text = Language.ReconnectAll; - break; - } - } - - private void OnDropDownClosed(object sender, EventArgs eventArgs) - { - _mMenFileNewConnection.Enabled = true; - _mMenFileNewFolder.Enabled = true; - _mMenFileDelete.Enabled = true; - _mMenFileRename.Enabled = true; - _mMenFileDuplicate.Enabled = true; - _mMenReconnectAll.Enabled = true; - } - - private void mMenFileNewConnection_Click(object sender, EventArgs e) - { - TreeWindow.ConnectionTree.AddConnection(); - } - - private void mMenFileNewFolder_Click(object sender, EventArgs e) - { - TreeWindow.ConnectionTree.AddFolder(); - } - private void mMenFileNew_Click(object sender, EventArgs e) { using (var saveFileDialog = DialogFactory.ConnectionsSaveAsDialog()) @@ -432,64 +196,16 @@ namespace mRemoteNG.UI.Menu } } - private void mMenFileDelete_Click(object sender, EventArgs e) - { - TreeWindow.ConnectionTree.DeleteSelectedNode(); - } - - private void mMenFileRename_Click(object sender, EventArgs e) - { - TreeWindow.ConnectionTree.RenameSelectedNode(); - } - - private void mMenFileDuplicate_Click(object sender, EventArgs e) - { - TreeWindow.ConnectionTree.DuplicateSelectedNode(); - } - - private void mMenReconnectAll_Click(object sender, EventArgs e) - { - if (Runtime.WindowList == null || Runtime.WindowList.Count == 0) return; - foreach (BaseWindow window in Runtime.WindowList) - { - if (!(window is ConnectionWindow connectionWindow)) - return; - - connectionWindow.reconnectAll(ConnectionInitiator); - } - } - - private void mMenFileImportFromFile_Click(object sender, EventArgs e) - { - var selectedNode = TreeWindow.SelectedNode; - ContainerInfo importDestination; - if (selectedNode == null) - importDestination = Runtime.ConnectionsService.ConnectionTreeModel.RootNodes.First(); - else - importDestination = selectedNode as ContainerInfo ?? selectedNode.Parent; - Import.ImportFromFile(importDestination); - } - - private void mMenFileImportFromActiveDirectory_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.ActiveDirectoryImport); - } - - private void mMenFileImportFromPortScan_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.PortScan); - } - - private void mMenFileExport_Click(object sender, EventArgs e) - { - Export.ExportToFile(Windows.TreeForm.SelectedNode, Runtime.ConnectionsService.ConnectionTreeModel); - } - private void mMenFileExit_Click(object sender, EventArgs e) { Shutdown.Quit(); } + private void mMenToolsOptions_Click(object sender, EventArgs e) + { + Windows.Show(WindowType.Options); + } + #endregion } } \ No newline at end of file diff --git a/mRemoteNG/UI/Menu/HelpMenu.cs b/mRemoteNG/UI/Menu/HelpMenu.cs index a0e42f8bb..973047f6a 100644 --- a/mRemoteNG/UI/Menu/HelpMenu.cs +++ b/mRemoteNG/UI/Menu/HelpMenu.cs @@ -3,9 +3,8 @@ using System.Diagnostics; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; -using mRemoteNG.UI.Window; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Menu { @@ -16,11 +15,11 @@ namespace mRemoteNG.UI.Menu private ToolStripSeparator _mMenInfoSep1; private ToolStripMenuItem _mMenInfoAbout; private ToolStripMenuItem _mMenInfoDonate; - private ToolStripMenuItem _mMenToolsUpdate; private ToolStripSeparator _mMenInfoSep2; - private ToolStripMenuItem _mMenInfoBugReport; - private ToolStripSeparator _toolStripSeparator2; + private ToolStripSeparator _mMenInfoSep3; + private ToolStripSeparator _mMenInfoSep4; private ToolStripMenuItem _mMenInfoForum; + private ToolStripMenuItem _mMenToolsUpdate; public HelpMenu() { @@ -34,10 +33,10 @@ namespace mRemoteNG.UI.Menu _mMenInfoWebsite = new ToolStripMenuItem(); _mMenInfoDonate = new ToolStripMenuItem(); _mMenInfoForum = new ToolStripMenuItem(); - _mMenInfoBugReport = new ToolStripMenuItem(); - _toolStripSeparator2 = new ToolStripSeparator(); - _mMenInfoSep2 = new ToolStripSeparator(); _mMenToolsUpdate = new ToolStripMenuItem(); + _mMenInfoSep2 = new ToolStripSeparator(); + _mMenInfoSep3 = new ToolStripSeparator(); + _mMenInfoSep4 = new ToolStripSeparator(); _mMenInfoAbout = new ToolStripMenuItem(); // @@ -48,12 +47,12 @@ namespace mRemoteNG.UI.Menu _mMenInfoHelp, _mMenInfoSep1, _mMenInfoWebsite, - _mMenInfoDonate, _mMenInfoForum, - _mMenInfoBugReport, - _toolStripSeparator2, - _mMenToolsUpdate, _mMenInfoSep2, + _mMenToolsUpdate, + _mMenInfoSep3, + _mMenInfoDonate, + _mMenInfoSep4, _mMenInfoAbout }); Name = "mMenInfo"; @@ -63,13 +62,21 @@ namespace mRemoteNG.UI.Menu // // mMenInfoHelp // - _mMenInfoHelp.Image = Properties.Resources.Help; + _mMenInfoHelp.Image = Properties.Resources.F1Help_16x; _mMenInfoHelp.Name = "mMenInfoHelp"; _mMenInfoHelp.ShortcutKeys = Keys.F1; _mMenInfoHelp.Size = new System.Drawing.Size(190, 22); _mMenInfoHelp.Text = Language.HelpContents; _mMenInfoHelp.Click += mMenInfoHelp_Click; // + // mMenToolsUpdate + // + _mMenToolsUpdate.Image = Properties.Resources.RunUpdate_16x; + _mMenToolsUpdate.Name = "mMenToolsUpdate"; + _mMenToolsUpdate.Size = new System.Drawing.Size(190, 22); + _mMenToolsUpdate.Text = Language.CheckForUpdates; + _mMenToolsUpdate.Click += mMenToolsUpdate_Click; + // // mMenInfoSep1 // _mMenInfoSep1.Name = "mMenInfoSep1"; @@ -77,7 +84,6 @@ namespace mRemoteNG.UI.Menu // // mMenInfoWebsite // - _mMenInfoWebsite.Image = Properties.Resources.Website; _mMenInfoWebsite.Name = "mMenInfoWebsite"; _mMenInfoWebsite.Size = new System.Drawing.Size(190, 22); _mMenInfoWebsite.Text = Language.Website; @@ -85,7 +91,6 @@ namespace mRemoteNG.UI.Menu // // mMenInfoDonate // - _mMenInfoDonate.Image = Properties.Resources.Donate; _mMenInfoDonate.Name = "mMenInfoDonate"; _mMenInfoDonate.Size = new System.Drawing.Size(190, 22); _mMenInfoDonate.Text = Language.Donate; @@ -93,41 +98,29 @@ namespace mRemoteNG.UI.Menu // // mMenInfoForum // - _mMenInfoForum.Image = Properties.Resources.user_comment; _mMenInfoForum.Name = "mMenInfoForum"; _mMenInfoForum.Size = new System.Drawing.Size(190, 22); _mMenInfoForum.Text = Language.SupportForum; _mMenInfoForum.Click += mMenInfoForum_Click; // - // mMenInfoBugReport - // - _mMenInfoBugReport.Image = Properties.Resources.Bug; - _mMenInfoBugReport.Name = "mMenInfoBugReport"; - _mMenInfoBugReport.Size = new System.Drawing.Size(190, 22); - _mMenInfoBugReport.Text = Language.ReportBug; - _mMenInfoBugReport.Click += mMenInfoBugReport_Click; - // - // ToolStripSeparator2 - // - _toolStripSeparator2.Name = "ToolStripSeparator2"; - _toolStripSeparator2.Size = new System.Drawing.Size(187, 6); - // - // mMenToolsUpdate - // - _mMenToolsUpdate.Image = Properties.Resources.Update; - _mMenToolsUpdate.Name = "mMenToolsUpdate"; - _mMenToolsUpdate.Size = new System.Drawing.Size(190, 22); - _mMenToolsUpdate.Text = Language.CheckForUpdates; - _mMenToolsUpdate.Click += mMenToolsUpdate_Click; - // // mMenInfoSep2 // _mMenInfoSep2.Name = "mMenInfoSep2"; _mMenInfoSep2.Size = new System.Drawing.Size(187, 6); // + // mMenInfoSep3 + // + _mMenInfoSep3.Name = "mMenInfoSep2"; + _mMenInfoSep3.Size = new System.Drawing.Size(187, 6); + // + // mMenInfoSep4 + // + _mMenInfoSep4.Name = "mMenInfoSep2"; + _mMenInfoSep4.Size = new System.Drawing.Size(187, 6); + // // mMenInfoAbout // - _mMenInfoAbout.Image = Properties.Resources.mRemoteNG; + _mMenInfoAbout.Image = Properties.Resources.UIAboutBox_16x; _mMenInfoAbout.Name = "mMenInfoAbout"; _mMenInfoAbout.Size = new System.Drawing.Size(190, 22); _mMenInfoAbout.Text = Language.About; @@ -141,24 +134,21 @@ namespace mRemoteNG.UI.Menu _mMenInfoWebsite.Text = Language.Website; _mMenInfoDonate.Text = Language.Donate; _mMenInfoForum.Text = Language.SupportForum; - _mMenInfoBugReport.Text = Language.ReportBug; - _mMenToolsUpdate.Text = Language.CheckForUpdates; _mMenInfoAbout.Text = Language.About; + _mMenToolsUpdate.Text = Language.CheckForUpdates; } #region Info private void mMenToolsUpdate_Click(object sender, EventArgs e) => Windows.Show(WindowType.Update); - private void mMenInfoHelp_Click(object sender, EventArgs e) => Windows.Show(WindowType.Help); + private void mMenInfoHelp_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlDocumentation); - private void mMenInfoForum_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlForum); - - private void mMenInfoBugReport_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlBugs); + private void mMenInfoForum_Click(object sender, EventArgs e) => Process.Start("explorer.exe", GeneralAppInfo.UrlForum); private void mMenInfoWebsite_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlHome); - private void mMenInfoDonate_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlDonate); + private void mMenInfoDonate_Click(object sender, EventArgs e) => Process.Start("explorer.exe", GeneralAppInfo.UrlDonate); private void mMenInfoAbout_Click(object sender, EventArgs e) => FrmAbout.Instance.Show(); diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/ToolsMenu.cs index a69440224..32f83022e 100644 --- a/mRemoteNG/UI/Menu/ToolsMenu.cs +++ b/mRemoteNG/UI/Menu/ToolsMenu.cs @@ -8,13 +8,10 @@ namespace mRemoteNG.UI.Menu { public class ToolsMenu : ToolStripMenuItem { - private ToolStripSeparator _mMenToolsSep1; - private ToolStripMenuItem _mMenToolsOptions; private ToolStripMenuItem _mMenToolsSshTransfer; private ToolStripMenuItem _mMenToolsExternalApps; private ToolStripMenuItem _mMenToolsPortScan; private ToolStripMenuItem _mMenToolsUvncsc; - private ToolStripMenuItem _mMenViewScreenshotManager; public Form MainForm { get; set; } public ICredentialRepositoryList CredentialProviderCatalog { get; set; } @@ -30,9 +27,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsUvncsc = new ToolStripMenuItem(); _mMenToolsExternalApps = new ToolStripMenuItem(); _mMenToolsPortScan = new ToolStripMenuItem(); - _mMenToolsSep1 = new ToolStripSeparator(); - _mMenToolsOptions = new ToolStripMenuItem(); - _mMenViewScreenshotManager = new ToolStripMenuItem(); // // mMenTools // @@ -41,10 +35,7 @@ namespace mRemoteNG.UI.Menu _mMenToolsSshTransfer, _mMenToolsUvncsc, _mMenToolsExternalApps, - _mMenToolsPortScan, - _mMenViewScreenshotManager, - _mMenToolsSep1, - _mMenToolsOptions + _mMenToolsPortScan }); Name = "mMenTools"; Size = new System.Drawing.Size(48, 20); @@ -52,7 +43,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsSSHTransfer // - _mMenToolsSshTransfer.Image = Properties.Resources.SSHTransfer; + _mMenToolsSshTransfer.Image = Properties.Resources.SyncArrow_16x; _mMenToolsSshTransfer.Name = "mMenToolsSSHTransfer"; _mMenToolsSshTransfer.Size = new System.Drawing.Size(184, 22); _mMenToolsSshTransfer.Text = Language.SshFileTransfer; @@ -60,7 +51,6 @@ namespace mRemoteNG.UI.Menu // // mMenToolsUVNCSC // - _mMenToolsUvncsc.Image = Properties.Resources.UVNC_SC; _mMenToolsUvncsc.Name = "mMenToolsUVNCSC"; _mMenToolsUvncsc.Size = new System.Drawing.Size(184, 22); _mMenToolsUvncsc.Text = Language.UltraVNCSingleClick; @@ -69,7 +59,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsExternalApps // - _mMenToolsExternalApps.Image = Properties.Resources.ExtApp; + _mMenToolsExternalApps.Image = Properties.Resources.Console_16x; _mMenToolsExternalApps.Name = "mMenToolsExternalApps"; _mMenToolsExternalApps.Size = new System.Drawing.Size(184, 22); _mMenToolsExternalApps.Text = Language.ExternalTool; @@ -77,32 +67,11 @@ namespace mRemoteNG.UI.Menu // // mMenToolsPortScan // - _mMenToolsPortScan.Image = Properties.Resources.PortScan; + _mMenToolsPortScan.Image = Properties.Resources.SearchAndApps_16x; _mMenToolsPortScan.Name = "mMenToolsPortScan"; _mMenToolsPortScan.Size = new System.Drawing.Size(184, 22); _mMenToolsPortScan.Text = Language.PortScan; _mMenToolsPortScan.Click += mMenToolsPortScan_Click; - // - // mMenViewScreenshotManager - // - _mMenViewScreenshotManager.Image = Properties.Resources.Screenshot; - _mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"; - _mMenViewScreenshotManager.Size = new System.Drawing.Size(228, 22); - _mMenViewScreenshotManager.Text = Language.Screenshots; - _mMenViewScreenshotManager.Click += mMenViewScreenshotManager_Click; - // - // mMenToolsSep1 - // - _mMenToolsSep1.Name = "mMenToolsSep1"; - _mMenToolsSep1.Size = new System.Drawing.Size(181, 6); - // - // mMenToolsOptions - // - _mMenToolsOptions.Image = Properties.Resources.Options; - _mMenToolsOptions.Name = "mMenToolsOptions"; - _mMenToolsOptions.Size = new System.Drawing.Size(184, 22); - _mMenToolsOptions.Text = Language.Options; - _mMenToolsOptions.Click += mMenToolsOptions_Click; } public void ApplyLanguage() @@ -111,8 +80,6 @@ namespace mRemoteNG.UI.Menu _mMenToolsSshTransfer.Text = Language.SshFileTransfer; _mMenToolsExternalApps.Text = Language.ExternalTool; _mMenToolsPortScan.Text = Language.PortScan; - _mMenViewScreenshotManager.Text = Language.Screenshots; - _mMenToolsOptions.Text = Language.Options; } #region Tools @@ -137,11 +104,6 @@ namespace mRemoteNG.UI.Menu Windows.Show(WindowType.PortScan); } - private void mMenViewScreenshotManager_Click(object sender, EventArgs e) - { - Windows.Show(WindowType.ScreenshotManager); - } - private void mMenToolsOptions_Click(object sender, EventArgs e) { Windows.Show(WindowType.Options); diff --git a/mRemoteNG/UI/Menu/ViewMenu.cs b/mRemoteNG/UI/Menu/ViewMenu.cs index cd89b28b2..1d79eee99 100644 --- a/mRemoteNG/UI/Menu/ViewMenu.cs +++ b/mRemoteNG/UI/Menu/ViewMenu.cs @@ -1,34 +1,29 @@ using System; using System.Windows.Forms; using mRemoteNG.App; +using mRemoteNG.Connection; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Panels; using mRemoteNG.UI.Window; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Menu { public class ViewMenu : ToolStripMenuItem { private ToolStripMenuItem _mMenViewConnectionPanels; + private ToolStripMenuItem _mMenReconnectAll; private ToolStripSeparator _mMenViewSep1; - public ToolStripMenuItem _mMenViewConnections; - public ToolStripMenuItem _mMenViewConfig; public ToolStripMenuItem _mMenViewErrorsAndInfos; private ToolStripMenuItem _mMenViewAddConnectionPanel; private ToolStripSeparator _mMenViewSep2; private ToolStripMenuItem _mMenViewFullscreen; - private ToolStripMenuItem _mMenViewExtAppsToolbar; - private ToolStripMenuItem _mMenViewQuickConnectToolbar; - private ToolStripMenuItem _mMenViewMultiSshToolbar; - private ToolStripSeparator _mMenViewSep3; - private ToolStripMenuItem _mMenViewJumpTo; - private ToolStripMenuItem _mMenViewJumpToConnectionsConfig; - private ToolStripMenuItem _mMenViewJumpToErrorsInfos; + public ToolStripMenuItem _mMenViewExtAppsToolbar; + public ToolStripMenuItem _mMenViewQuickConnectToolbar; + public ToolStripMenuItem _mMenViewMultiSshToolbar; private ToolStripMenuItem _mMenViewResetLayout; - private ToolStripMenuItem _mMenViewLockToolbars; - private ToolStripSeparator _toolStripSeparator1; + public ToolStripMenuItem _mMenViewLockToolbars; private readonly PanelAdder _panelAdder; @@ -37,6 +32,7 @@ namespace mRemoteNG.UI.Menu public ToolStrip TsMultiSsh { get; set; } public FullscreenHandler FullscreenHandler { get; set; } public FrmMain MainForm { get; set; } + public IConnectionInitiator ConnectionInitiator { get; set; } public ViewMenu() @@ -50,42 +46,32 @@ namespace mRemoteNG.UI.Menu _mMenViewAddConnectionPanel = new ToolStripMenuItem(); _mMenViewConnectionPanels = new ToolStripMenuItem(); _mMenViewSep1 = new ToolStripSeparator(); - _mMenViewConnections = new ToolStripMenuItem(); - _mMenViewConfig = new ToolStripMenuItem(); _mMenViewErrorsAndInfos = new ToolStripMenuItem(); - _mMenViewJumpTo = new ToolStripMenuItem(); - _mMenViewJumpToConnectionsConfig = new ToolStripMenuItem(); - _mMenViewJumpToErrorsInfos = new ToolStripMenuItem(); _mMenViewResetLayout = new ToolStripMenuItem(); _mMenViewLockToolbars = new ToolStripMenuItem(); _mMenViewSep2 = new ToolStripSeparator(); _mMenViewQuickConnectToolbar = new ToolStripMenuItem(); + _mMenReconnectAll = new ToolStripMenuItem(); _mMenViewExtAppsToolbar = new ToolStripMenuItem(); _mMenViewMultiSshToolbar = new ToolStripMenuItem(); - _mMenViewSep3 = new ToolStripSeparator(); _mMenViewFullscreen = new ToolStripMenuItem(); - _toolStripSeparator1 = new ToolStripSeparator(); // // mMenView // DropDownItems.AddRange(new ToolStripItem[] { - _mMenViewAddConnectionPanel, - _mMenViewConnectionPanels, - _mMenViewSep1, - _mMenViewConnections, - _mMenViewConfig, _mMenViewErrorsAndInfos, - _toolStripSeparator1, - _mMenViewJumpTo, - _mMenViewResetLayout, - _mMenViewLockToolbars, - _mMenViewSep2, _mMenViewQuickConnectToolbar, _mMenViewExtAppsToolbar, _mMenViewMultiSshToolbar, - _mMenViewSep3, + _mMenViewSep1, + _mMenReconnectAll, + _mMenViewAddConnectionPanel, + _mMenViewConnectionPanels, + _mMenViewResetLayout, + _mMenViewLockToolbars, + _mMenViewSep2, _mMenViewFullscreen }); Name = "mMenView"; @@ -95,15 +81,23 @@ namespace mRemoteNG.UI.Menu // // mMenViewAddConnectionPanel // - _mMenViewAddConnectionPanel.Image = Properties.Resources.Panel_Add; + _mMenViewAddConnectionPanel.Image = Properties.Resources.InsertPanel_16x; _mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"; _mMenViewAddConnectionPanel.Size = new System.Drawing.Size(228, 22); _mMenViewAddConnectionPanel.Text = Language.AddConnectionPanel; _mMenViewAddConnectionPanel.Click += mMenViewAddConnectionPanel_Click; // + // mMenReconnectAll + // + _mMenReconnectAll.Image = Properties.Resources.Refresh_16x; + _mMenReconnectAll.Name = "mMenReconnectAll"; + _mMenReconnectAll.Size = new System.Drawing.Size(281, 22); + _mMenReconnectAll.Text = Language.ReconnectAllConnections; + _mMenReconnectAll.Click += mMenReconnectAll_Click; + // // mMenViewConnectionPanels // - _mMenViewConnectionPanels.Image = Properties.Resources.Panels; + _mMenViewConnectionPanels.Image = Properties.Resources.Panel_16x; _mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"; _mMenViewConnectionPanels.Size = new System.Drawing.Size(228, 22); _mMenViewConnectionPanels.Text = Language.ConnectionPanels; @@ -113,74 +107,17 @@ namespace mRemoteNG.UI.Menu _mMenViewSep1.Name = "mMenViewSep1"; _mMenViewSep1.Size = new System.Drawing.Size(225, 6); // - // mMenViewConnections - // - _mMenViewConnections.Checked = true; - _mMenViewConnections.CheckState = CheckState.Checked; - _mMenViewConnections.Image = Properties.Resources.Root; - _mMenViewConnections.Name = "mMenViewConnections"; - _mMenViewConnections.Size = new System.Drawing.Size(228, 22); - _mMenViewConnections.Text = Language.Connections; - _mMenViewConnections.Click += mMenViewConnections_Click; - // - // mMenViewConfig - // - _mMenViewConfig.Checked = true; - _mMenViewConfig.CheckState = CheckState.Checked; - _mMenViewConfig.Image = Properties.Resources.cog; - _mMenViewConfig.Name = "mMenViewConfig"; - _mMenViewConfig.Size = new System.Drawing.Size(228, 22); - _mMenViewConfig.Text = Language.Config; - _mMenViewConfig.Click += mMenViewConfig_Click; - // // mMenViewErrorsAndInfos // _mMenViewErrorsAndInfos.Checked = true; _mMenViewErrorsAndInfos.CheckState = CheckState.Checked; - _mMenViewErrorsAndInfos.Image = Properties.Resources.ErrorsAndInfos; _mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"; _mMenViewErrorsAndInfos.Size = new System.Drawing.Size(228, 22); _mMenViewErrorsAndInfos.Text = Language.Notifications; _mMenViewErrorsAndInfos.Click += mMenViewErrorsAndInfos_Click; // - // ToolStripSeparator1 - // - _toolStripSeparator1.Name = "ToolStripSeparator1"; - _toolStripSeparator1.Size = new System.Drawing.Size(225, 6); - // - // mMenViewJumpTo - // - _mMenViewJumpTo.DropDownItems.AddRange(new ToolStripItem[] - { - _mMenViewJumpToConnectionsConfig, - _mMenViewJumpToErrorsInfos - }); - _mMenViewJumpTo.Image = Properties.Resources.JumpTo; - _mMenViewJumpTo.Name = "mMenViewJumpTo"; - _mMenViewJumpTo.Size = new System.Drawing.Size(228, 22); - _mMenViewJumpTo.Text = Language.JumpTo; - // - // mMenViewJumpToConnectionsConfig - // - _mMenViewJumpToConnectionsConfig.Image = Properties.Resources.Root; - _mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig"; - _mMenViewJumpToConnectionsConfig.ShortcutKeys = Keys.Control | Keys.Alt | Keys.C; - _mMenViewJumpToConnectionsConfig.Size = new System.Drawing.Size(258, 22); - _mMenViewJumpToConnectionsConfig.Text = Language.ConnectionsAndConfig; - _mMenViewJumpToConnectionsConfig.Click += mMenViewJumpToConnectionsConfig_Click; - // - // mMenViewJumpToErrorsInfos - // - _mMenViewJumpToErrorsInfos.Image = Properties.Resources.InformationSmall; - _mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos"; - _mMenViewJumpToErrorsInfos.ShortcutKeys = Keys.Control | Keys.Alt | Keys.E; - _mMenViewJumpToErrorsInfos.Size = new System.Drawing.Size(258, 22); - _mMenViewJumpToErrorsInfos.Text = Language.Notifications; - _mMenViewJumpToErrorsInfos.Click += mMenViewJumpToErrorsInfos_Click; - // // mMenViewResetLayout // - _mMenViewResetLayout.Image = Properties.Resources.application_side_tree; _mMenViewResetLayout.Name = "mMenViewResetLayout"; _mMenViewResetLayout.Size = new System.Drawing.Size(228, 22); _mMenViewResetLayout.Text = Language.ResetLayout; @@ -188,7 +125,6 @@ namespace mRemoteNG.UI.Menu // // mMenViewLockToolbars // - _mMenViewLockToolbars.Image = Properties.Resources.application_side_tree; _mMenViewLockToolbars.Name = "mMenViewLockToolbars"; _mMenViewLockToolbars.Size = new System.Drawing.Size(228, 22); _mMenViewLockToolbars.Text = Language.LockToolbars; @@ -201,7 +137,6 @@ namespace mRemoteNG.UI.Menu // // mMenViewQuickConnectToolbar // - _mMenViewQuickConnectToolbar.Image = Properties.Resources.Play_Quick; _mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"; _mMenViewQuickConnectToolbar.Size = new System.Drawing.Size(228, 22); _mMenViewQuickConnectToolbar.Text = Language.QuickConnectToolbar; @@ -209,7 +144,6 @@ namespace mRemoteNG.UI.Menu // // mMenViewExtAppsToolbar // - _mMenViewExtAppsToolbar.Image = Properties.Resources.ExtApp; _mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar"; _mMenViewExtAppsToolbar.Size = new System.Drawing.Size(228, 22); _mMenViewExtAppsToolbar.Text = Language.ExternalToolsToolbar; @@ -217,20 +151,14 @@ namespace mRemoteNG.UI.Menu // // mMenViewMultiSSHToolbar // - _mMenViewMultiSshToolbar.Image = Properties.Resources.Panels; _mMenViewMultiSshToolbar.Name = "mMenViewMultiSSHToolbar"; _mMenViewMultiSshToolbar.Size = new System.Drawing.Size(279, 26); _mMenViewMultiSshToolbar.Text = Language.MultiSshToolbar; _mMenViewMultiSshToolbar.Click += mMenViewMultiSSHToolbar_Click; // - // mMenViewSep3 - // - _mMenViewSep3.Name = "mMenViewSep3"; - _mMenViewSep3.Size = new System.Drawing.Size(225, 6); - // // mMenViewFullscreen // - _mMenViewFullscreen.Image = Properties.Resources.arrow_out; + _mMenViewFullscreen.Image = Properties.Resources.FullScreen_16x; _mMenViewFullscreen.Name = "mMenViewFullscreen"; _mMenViewFullscreen.ShortcutKeys = Keys.F11; _mMenViewFullscreen.Size = new System.Drawing.Size(228, 22); @@ -245,12 +173,7 @@ namespace mRemoteNG.UI.Menu Text = Language._View; _mMenViewAddConnectionPanel.Text = Language.AddConnectionPanel; _mMenViewConnectionPanels.Text = Language.ConnectionPanels; - _mMenViewConnections.Text = Language.Connections; - _mMenViewConfig.Text = Language.Config; _mMenViewErrorsAndInfos.Text = Language.Notifications; - _mMenViewJumpTo.Text = Language.JumpTo; - _mMenViewJumpToConnectionsConfig.Text = Language.ConnectionsAndConfig; - _mMenViewJumpToErrorsInfos.Text = Language.Notifications; _mMenViewResetLayout.Text = Language.ResetLayout; _mMenViewLockToolbars.Text = Language.LockToolbars; _mMenViewQuickConnectToolbar.Text = Language.QuickConnectToolbar; @@ -263,8 +186,6 @@ namespace mRemoteNG.UI.Menu internal void mMenView_DropDownOpening(object sender, EventArgs e) { - _mMenViewConnections.Checked = !Windows.TreeForm.IsHidden; - _mMenViewConfig.Checked = !Windows.ConfigForm.IsHidden; _mMenViewErrorsAndInfos.Checked = !Windows.ErrorsForm.IsHidden; _mMenViewLockToolbars.Checked = Settings.Default.LockToolbars; @@ -282,7 +203,7 @@ namespace mRemoteNG.UI.Menu _mMenViewConnectionPanels.DropDownItems.Add(tItem); } - _mMenViewConnectionPanels.Enabled = _mMenViewConnectionPanels.DropDownItems.Count > 0; + _mMenViewConnectionPanels.Visible = _mMenViewConnectionPanels.DropDownItems.Count > 0; } private void ConnectionPanelMenuItem_Click(object sender, EventArgs e) @@ -291,34 +212,6 @@ namespace mRemoteNG.UI.Menu ((BaseWindow)((ToolStripMenuItem)sender).Tag).Focus(); } - private void mMenViewConnections_Click(object sender, EventArgs e) - { - if (_mMenViewConnections.Checked == false) - { - Windows.TreeForm.Show(MainForm.pnlDock); - _mMenViewConnections.Checked = true; - } - else - { - Windows.TreeForm.Hide(); - _mMenViewConnections.Checked = false; - } - } - - private void mMenViewConfig_Click(object sender, EventArgs e) - { - if (_mMenViewConfig.Checked == false) - { - Windows.ConfigForm.Show(MainForm.pnlDock); - _mMenViewConfig.Checked = true; - } - else - { - Windows.ConfigForm.Hide(); - _mMenViewConfig.Checked = false; - } - } - private void mMenViewErrorsAndInfos_Click(object sender, EventArgs e) { if (_mMenViewErrorsAndInfos.Checked == false) @@ -333,23 +226,6 @@ namespace mRemoteNG.UI.Menu } } - private void mMenViewJumpToConnectionsConfig_Click(object sender, EventArgs e) - { - if (MainForm.pnlDock.ActiveContent == Windows.TreeForm) - { - Windows.ConfigForm.Activate(); - } - else - { - Windows.TreeForm.Activate(); - } - } - - private void mMenViewJumpToErrorsInfos_Click(object sender, EventArgs e) - { - Windows.ErrorsForm.Activate(); - } - private void mMenViewResetLayout_Click(object sender, EventArgs e) { var msgBoxResult = MessageBox.Show(Language.ConfirmResetLayout, string.Empty, MessageBoxButtons.YesNo, @@ -362,7 +238,7 @@ namespace mRemoteNG.UI.Menu private void mMenViewLockToolbars_Click(object sender, EventArgs eventArgs) { - if (Settings.Default.LockToolbars) + if (_mMenViewLockToolbars.Checked) { Settings.Default.LockToolbars = false; _mMenViewLockToolbars.Checked = false; @@ -381,43 +257,43 @@ namespace mRemoteNG.UI.Menu private void mMenViewExtAppsToolbar_Click(object sender, EventArgs e) { - if (_mMenViewExtAppsToolbar.Checked == false) + if (_mMenViewExtAppsToolbar.Checked) { - TsExternalTools.Visible = true; - _mMenViewExtAppsToolbar.Checked = true; + Settings.Default.ViewMenuExternalTools = false; + _mMenViewExtAppsToolbar.Checked = false; } else { - TsExternalTools.Visible = false; - _mMenViewExtAppsToolbar.Checked = false; + Settings.Default.ViewMenuExternalTools = true; + _mMenViewExtAppsToolbar.Checked = true; } } private void mMenViewQuickConnectToolbar_Click(object sender, EventArgs e) { - if (_mMenViewQuickConnectToolbar.Checked == false) + if (_mMenViewQuickConnectToolbar.Checked) { - TsQuickConnect.Visible = true; - _mMenViewQuickConnectToolbar.Checked = true; + Settings.Default.ViewMenuQuickConnect = false; + _mMenViewQuickConnectToolbar.Checked = false; } else { - TsQuickConnect.Visible = false; - _mMenViewQuickConnectToolbar.Checked = false; + Settings.Default.ViewMenuQuickConnect = true; + _mMenViewQuickConnectToolbar.Checked = true; } } private void mMenViewMultiSSHToolbar_Click(object sender, EventArgs e) { - if (_mMenViewMultiSshToolbar.Checked == false) + if (_mMenViewMultiSshToolbar.Checked) { - TsMultiSsh.Visible = true; - _mMenViewMultiSshToolbar.Checked = true; + Settings.Default.ViewMenuMultiSSH = false; + _mMenViewMultiSshToolbar.Checked = false; } else { - TsMultiSsh.Visible = false; - _mMenViewMultiSshToolbar.Checked = false; + Settings.Default.ViewMenuMultiSSH = true; + _mMenViewMultiSshToolbar.Checked = true; } } @@ -427,6 +303,18 @@ namespace mRemoteNG.UI.Menu _mMenViewFullscreen.Checked = FullscreenHandler.Value; } + private void mMenReconnectAll_Click(object sender, EventArgs e) + { + if (Runtime.WindowList == null || Runtime.WindowList.Count == 0) return; + foreach (BaseWindow window in Runtime.WindowList) + { + if (!(window is ConnectionWindow connectionWindow)) + return; + + connectionWindow.reconnectAll(ConnectionInitiator); + } + } + #endregion } } \ No newline at end of file diff --git a/mRemoteNG/UI/Panels/PanelAdder.cs b/mRemoteNG/UI/Panels/PanelAdder.cs index 249686f92..239b0df46 100644 --- a/mRemoteNG/UI/Panels/PanelAdder.cs +++ b/mRemoteNG/UI/Panels/PanelAdder.cs @@ -6,8 +6,8 @@ using System; using System.Collections; using System.Linq; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Panels { @@ -70,7 +70,7 @@ namespace mRemoteNG.UI.Panels var cMenScreens = new ToolStripMenuItem { Text = Language.SendTo, - Image = Properties.Resources.Monitor, + Image = Properties.Resources.Monitor_16x, Tag = pnlcForm }; cMenScreens.DropDownItems.Add("Dummy"); @@ -83,7 +83,7 @@ namespace mRemoteNG.UI.Panels var cMenRen = new ToolStripMenuItem { Text = Language.Rename, - Image = Properties.Resources.Rename, + Image = Properties.Resources.Rename_16x, Tag = pnlcForm }; cMenRen.Click += cMenConnectionPanelRename_Click; @@ -95,7 +95,7 @@ namespace mRemoteNG.UI.Panels var cMenClose = new ToolStripMenuItem { Text = Language._Close, - Image = Properties.Resources.Panel_Close, + Image = Properties.Resources.Close_16x, Tag = pnlcForm }; cMenClose.Click += cMenConnectionPanelClose_Click; @@ -145,7 +145,7 @@ namespace mRemoteNG.UI.Panels var cMenScreen = new ToolStripMenuItem(Language.Screen + " " + Convert.ToString(i + 1)) { Tag = new ArrayList(), - Image = Properties.Resources.Monitor_GoTo + Image = Properties.Resources.Monitor_16x }; ((ArrayList)cMenScreen.Tag).Add(Screen.AllScreens[i]); ((ArrayList)cMenScreen.Tag).Add(cMenScreens.Tag); diff --git a/mRemoteNG/UI/StatusImageList.cs b/mRemoteNG/UI/StatusImageList.cs index 83b4f4591..69f987bf7 100644 --- a/mRemoteNG/UI/StatusImageList.cs +++ b/mRemoteNG/UI/StatusImageList.cs @@ -96,8 +96,8 @@ namespace mRemoteNG.UI { try { - imageList.Images.Add("Root", Properties.Resources.Root); - imageList.Images.Add("Folder", Properties.Resources.Folder); + imageList.Images.Add("Root", Properties.Resources.ASPWebSite_16x); + imageList.Images.Add("Folder", Properties.Resources.FolderClosed_16x); imageList.Images.Add("PuttySessions", Properties.Resources.PuttySessions); } catch (Exception ex) diff --git a/mRemoteNG/UI/Tabs/ConnectionTab.cs b/mRemoteNG/UI/Tabs/ConnectionTab.cs index d8d1baab6..31c9faffa 100644 --- a/mRemoteNG/UI/Tabs/ConnectionTab.cs +++ b/mRemoteNG/UI/Tabs/ConnectionTab.cs @@ -7,9 +7,9 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.TaskDialog; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Tabs { diff --git a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs index 2bb3da421..a769424a1 100644 --- a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs +++ b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs @@ -6,8 +6,8 @@ using System.Security.Permissions; using System.Windows.Forms; using mRemoteNG.Connection; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Tabs { diff --git a/mRemoteNG/UI/TaskDialog/CommandButton.cs b/mRemoteNG/UI/TaskDialog/CommandButton.cs index db2700a06..e94de6243 100644 --- a/mRemoteNG/UI/TaskDialog/CommandButton.cs +++ b/mRemoteNG/UI/TaskDialog/CommandButton.cs @@ -1,4 +1,4 @@ -using mRemoteNG.Themes; +using mRemoteNG.Themes; using System; using System.ComponentModel; using System.Drawing; @@ -40,7 +40,7 @@ namespace mRemoteNG.UI.TaskDialog // Override this to make sure the control is invalidated (repainted) when 'Text' is changed public override string Text { - get { return base.Text; } + get => base.Text; set { base.Text = value; @@ -61,7 +61,7 @@ namespace mRemoteNG.UI.TaskDialog [DefaultValue(true)] public bool AutoHeight { - get { return m_autoHeight; } + get => m_autoHeight; set { m_autoHeight = value; @@ -152,8 +152,8 @@ namespace mRemoteNG.UI.TaskDialog protected override void OnCreateControl() { base.OnCreateControl(); - imgArrow1 = Properties.Resources.green_arrow1; - imgArrow2 = Properties.Resources.green_arrow2; + imgArrow1 = Properties.Resources.GlyphRight_16x; + imgArrow2 = Properties.Resources.GlyphRight_16x; } //-------------------------------------------------------------------------------- diff --git a/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs b/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs index d838c1750..38eef4a6c 100644 --- a/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs +++ b/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.TaskDialog { diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs index b78fa638a..9f18cdafc 100644 --- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs @@ -116,7 +116,6 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.btnChangeDomain); this.Controls.Add(this.btnImport); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Properties.Resources.ActiveDirectory_Icon; this.Name = "ActiveDirectoryImportWindow"; this.TabText = "Active Directory Import"; this.Text = "Active Directory Import"; diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs index 95a2dfc7d..96383d38a 100644 --- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs +++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs @@ -4,8 +4,8 @@ using System.Windows.Forms; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; using mRemoteNG.Container; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -17,6 +17,7 @@ namespace mRemoteNG.UI.Window { WindowType = WindowType.ActiveDirectoryImport; DockPnl = new DockContent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Schema_16x); InitializeComponent(); FontOverrider.FontOverride(this); ApplyTheme(); diff --git a/mRemoteNG/UI/Window/ConfigWindow.cs b/mRemoteNG/UI/Window/ConfigWindow.cs index 522e51a31..0666e358f 100644 --- a/mRemoteNG/UI/Window/ConfigWindow.cs +++ b/mRemoteNG/UI/Window/ConfigWindow.cs @@ -10,11 +10,11 @@ using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window @@ -129,7 +129,7 @@ namespace mRemoteNG.UI.Window //btnShowInheritance // _btnShowInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowInheritance.Image = Properties.Resources.Inheritance; + _btnShowInheritance.Image = Properties.Resources.Schema_16x; _btnShowInheritance.ImageTransparentColor = Color.Magenta; _btnShowInheritance.Name = "_btnShowInheritance"; _btnShowInheritance.Size = new Size(23, 22); @@ -138,7 +138,7 @@ namespace mRemoteNG.UI.Window //btnShowDefaultInheritance // _btnShowDefaultInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowDefaultInheritance.Image = Properties.Resources.Inheritance_Default; + _btnShowDefaultInheritance.Image = Properties.Resources.ViewDownBySchema_16x; _btnShowDefaultInheritance.ImageTransparentColor = Color.Magenta; _btnShowDefaultInheritance.Name = "_btnShowDefaultInheritance"; _btnShowDefaultInheritance.Size = new Size(23, 22); @@ -149,7 +149,7 @@ namespace mRemoteNG.UI.Window _btnShowProperties.Checked = true; _btnShowProperties.CheckState = CheckState.Checked; _btnShowProperties.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowProperties.Image = Properties.Resources.Properties; + _btnShowProperties.Image = Properties.Resources.Property_16x; _btnShowProperties.ImageTransparentColor = Color.Magenta; _btnShowProperties.Name = "_btnShowProperties"; _btnShowProperties.Size = new Size(23, 22); @@ -158,7 +158,7 @@ namespace mRemoteNG.UI.Window //btnShowDefaultProperties // _btnShowDefaultProperties.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowDefaultProperties.Image = Properties.Resources.Properties_Default; + _btnShowDefaultProperties.Image = Properties.Resources.ExtendedProperty_16x; _btnShowDefaultProperties.ImageTransparentColor = Color.Magenta; _btnShowDefaultProperties.Name = "_btnShowDefaultProperties"; _btnShowDefaultProperties.Size = new Size(23, 22); @@ -195,7 +195,6 @@ namespace mRemoteNG.UI.Window Controls.Add(_pGrid); Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0)); HideOnClose = true; - Icon = Properties.Resources.Config_Icon; Name = "ConfigWindow"; TabText = @"Config"; Text = @"Config"; @@ -238,6 +237,7 @@ namespace mRemoteNG.UI.Window WindowType = WindowType.Config; DockPnl = panel; InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Settings_16x); ApplyLanguage(); } diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs index 99f89c400..b293ffb23 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs @@ -55,7 +55,7 @@ namespace mRemoteNG.UI.Window this.ConnectionTree.IsSimpleDragSource = true; this.ConnectionTree.LabelEdit = true; this.ConnectionTree.Location = new System.Drawing.Point(0, 24); - this.ConnectionTree.MultiSelect = false; + this.ConnectionTree.MultiSelect = true; this.ConnectionTree.Name = "ConnectionTree"; this.ConnectionTree.NodeDeletionConfirmer = alwaysConfirmYes2; this.ConnectionTree.PostSetupActions = new IConnectionTreeDelegate[0]; @@ -94,7 +94,7 @@ namespace mRemoteNG.UI.Window // mMenAddConnection // this.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddConnection.Image = global::mRemoteNG.Properties.Resources.Connection_Add; + this.mMenAddConnection.Image = global::mRemoteNG.Properties.Resources.AddItem_16x; this.mMenAddConnection.Name = "mMenAddConnection"; this.mMenAddConnection.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); this.mMenAddConnection.Size = new System.Drawing.Size(24, 20); @@ -103,7 +103,7 @@ namespace mRemoteNG.UI.Window // mMenAddFolder // this.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddFolder.Image = global::mRemoteNG.Properties.Resources.Folder_Add; + this.mMenAddFolder.Image = global::mRemoteNG.Properties.Resources.AddFolder_16x; this.mMenAddFolder.Name = "mMenAddFolder"; this.mMenAddFolder.Size = new System.Drawing.Size(28, 20); this.mMenAddFolder.Click += new System.EventHandler(this.CMenTreeAddFolder_Click); @@ -111,7 +111,7 @@ namespace mRemoteNG.UI.Window // mMenViewExpandAllFolders // this.mMenViewExpandAllFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenViewExpandAllFolders.Image = global::mRemoteNG.Properties.Resources.Expand; + this.mMenViewExpandAllFolders.Image = global::mRemoteNG.Properties.Resources.ExpandAll_16x; this.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders"; this.mMenViewExpandAllFolders.Size = new System.Drawing.Size(28, 20); this.mMenViewExpandAllFolders.Text = "Expand all folders"; @@ -119,7 +119,7 @@ namespace mRemoteNG.UI.Window // mMenViewCollapseAllFolders // this.mMenViewCollapseAllFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenViewCollapseAllFolders.Image = global::mRemoteNG.Properties.Resources.Collapse; + this.mMenViewCollapseAllFolders.Image = global::mRemoteNG.Properties.Resources.CollapseAll_16x; this.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders"; this.mMenViewCollapseAllFolders.Size = new System.Drawing.Size(28, 20); this.mMenViewCollapseAllFolders.Text = "Collapse all folders"; @@ -127,14 +127,14 @@ namespace mRemoteNG.UI.Window // mMenSortAscending // this.mMenSort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenSort.Image = global::mRemoteNG.Properties.Resources.Sort_AZ; + this.mMenSort.Image = global::mRemoteNG.Properties.Resources.SortAscending_16x; this.mMenSort.Name = "mMenSort"; this.mMenSort.Size = new System.Drawing.Size(28, 20); // // mMenFavorites // this.mMenFavorites.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenFavorites.Image = global::mRemoteNG.Properties.Resources.star; + this.mMenFavorites.Image = global::mRemoteNG.Properties.Resources.Favorite_16x; this.mMenFavorites.Name = "mMenFavorites"; this.mMenFavorites.Size = new System.Drawing.Size(28, 20); this.mMenFavorites.Text = "Favorites"; @@ -146,7 +146,7 @@ namespace mRemoteNG.UI.Window // pbSearch // this.pbSearch.Dock = System.Windows.Forms.DockStyle.Fill; - this.pbSearch.Image = global::mRemoteNG.Properties.Resources.Search; + this.pbSearch.Image = global::mRemoteNG.Properties.Resources.Search_16x; this.pbSearch.Location = new System.Drawing.Point(0, 0); this.pbSearch.Margin = new System.Windows.Forms.Padding(0); this.pbSearch.Name = "pbSearch"; @@ -197,7 +197,6 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.msMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; - this.Icon = global::mRemoteNG.Properties.Resources.Root_Icon; this.Name = "ConnectionTreeWindow"; this.TabText = "Connections"; this.Text = "Connections"; diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs index 9868435e1..bc32b3f3a 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs @@ -9,15 +9,14 @@ using mRemoteNG.Config.Connections; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; using mRemoteNG.Tree.Root; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using mRemoteNG.UI.TaskDialog; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody @@ -41,6 +40,7 @@ namespace mRemoteNG.UI.Window { WindowType = WindowType.Tree; DockPnl = panel; + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.ASPWebSite_16x); InitializeComponent(); SetMenuEventHandlers(); SetConnectionTreeEventHandlers(); @@ -198,13 +198,13 @@ namespace mRemoteNG.UI.Window if (_sortedAz) { ConnectionTree.SortRecursive(ConnectionTree.GetRootConnectionNode(), ListSortDirection.Ascending); - mMenSort.Image = Properties.Resources.Sort_ZA; + mMenSort.Image = Properties.Resources.SortDescending_16x; _sortedAz = false; } else { ConnectionTree.SortRecursive(ConnectionTree.GetRootConnectionNode(), ListSortDirection.Descending); - mMenSort.Image = Properties.Resources.Sort_AZ; + mMenSort.Image = Properties.Resources.SortAscending_16x; _sortedAz = true; } }; @@ -222,7 +222,7 @@ namespace mRemoteNG.UI.Window { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Run_16x : Properties.Resources.Stop_16x }; favoriteMenuItem.MouseUp += FavoriteMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs index 64048050b..70bff5b06 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs @@ -9,7 +9,6 @@ namespace mRemoteNG.UI.Window { internal ContextMenuStrip cmenTab; private ToolStripMenuItem cmenTabFullscreen; - private ToolStripMenuItem cmenTabScreenshot; private ToolStripMenuItem cmenTabTransferFile; private ToolStripMenuItem cmenTabSendSpecialKeys; private ToolStripSeparator cmenTabSep1; @@ -53,7 +52,6 @@ namespace mRemoteNG.UI.Window this.cmenTabSendSpecialKeysCtrlAltDel = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabSendSpecialKeysCtrlEsc = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.cmenTabScreenshot = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabPuttySettings = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTabExternalApps = new System.Windows.Forms.ToolStripMenuItem(); this.cmenTab.SuspendLayout(); @@ -88,7 +86,6 @@ namespace mRemoteNG.UI.Window this.cmenTabTransferFile, this.cmenTabSendSpecialKeys, this.cmenTabSep2, - this.cmenTabScreenshot, this.cmenTabPuttySettings, this.cmenTabExternalApps}); this.cmenTab.Name = "cmenTab"; @@ -104,35 +101,35 @@ namespace mRemoteNG.UI.Window // // cmenTabDisconnect // - this.cmenTabDisconnect.Image = global::mRemoteNG.Properties.Resources.tab_delete; + this.cmenTabDisconnect.Image = global::mRemoteNG.Properties.Resources.Remove_16x; this.cmenTabDisconnect.Name = "cmenTabDisconnect"; this.cmenTabDisconnect.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnect.Text = "Disconnect"; // // cmenTabDisconnectOthers // - this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Properties.Resources.tab_delete; + this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Properties.Resources.Remove_16x; this.cmenTabDisconnectOthers.Name = "cmenTabDisconnectOthers"; this.cmenTabDisconnectOthers.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnectOthers.Text = "Disconnect Other Tabs"; // // cmenTabDisconnectOthersRight // - this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Properties.Resources.tab_delete; + this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Properties.Resources.Remove_16x; this.cmenTabDisconnectOthersRight.Name = "cmenTabDisconnectOthersRight"; this.cmenTabDisconnectOthersRight.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnectOthersRight.Text = "Disconnect Tabs To The Right"; // // cmenTabRenameTab // - this.cmenTabRenameTab.Image = global::mRemoteNG.Properties.Resources.tab_edit; + this.cmenTabRenameTab.Image = global::mRemoteNG.Properties.Resources.Rename_16x; this.cmenTabRenameTab.Name = "cmenTabRenameTab"; this.cmenTabRenameTab.Size = new System.Drawing.Size(230, 22); this.cmenTabRenameTab.Text = "Rename Tab"; // // cmenTabDuplicateTab // - this.cmenTabDuplicateTab.Image = global::mRemoteNG.Properties.Resources.tab_add; + this.cmenTabDuplicateTab.Image = global::mRemoteNG.Properties.Resources.Add_16x; this.cmenTabDuplicateTab.Name = "cmenTabDuplicateTab"; this.cmenTabDuplicateTab.Size = new System.Drawing.Size(230, 22); this.cmenTabDuplicateTab.Text = "Duplicate Tab"; @@ -144,28 +141,28 @@ namespace mRemoteNG.UI.Window // // cmenTabFullscreen // - this.cmenTabFullscreen.Image = global::mRemoteNG.Properties.Resources.arrow_out; + this.cmenTabFullscreen.Image = global::mRemoteNG.Properties.Resources.FullScreen_16x; this.cmenTabFullscreen.Name = "cmenTabFullscreen"; this.cmenTabFullscreen.Size = new System.Drawing.Size(230, 22); this.cmenTabFullscreen.Text = "Fullscreen (RDP)"; // // cmenTabSmartSize // - this.cmenTabSmartSize.Image = global::mRemoteNG.Properties.Resources.SmartSize; + this.cmenTabSmartSize.Image = global::mRemoteNG.Properties.Resources.Resize_16x; this.cmenTabSmartSize.Name = "cmenTabSmartSize"; this.cmenTabSmartSize.Size = new System.Drawing.Size(230, 22); this.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)"; // // cmenTabViewOnly // - this.cmenTabViewOnly.Image = global::mRemoteNG.Properties.Resources.View; + this.cmenTabViewOnly.Image = global::mRemoteNG.Properties.Resources.Monitor_16x; this.cmenTabViewOnly.Name = "cmenTabViewOnly"; this.cmenTabViewOnly.Size = new System.Drawing.Size(230, 22); this.cmenTabViewOnly.Text = "View Only (VNC)"; // // cmenTabStartChat // - this.cmenTabStartChat.Image = global::mRemoteNG.Properties.Resources.Chat; + this.cmenTabStartChat.Image = global::mRemoteNG.Properties.Resources.Message_16x; this.cmenTabStartChat.Name = "cmenTabStartChat"; this.cmenTabStartChat.Size = new System.Drawing.Size(230, 22); this.cmenTabStartChat.Text = "Start Chat (VNC)"; @@ -173,14 +170,14 @@ namespace mRemoteNG.UI.Window // // cmenTabRefreshScreen // - this.cmenTabRefreshScreen.Image = global::mRemoteNG.Properties.Resources.Refresh; + this.cmenTabRefreshScreen.Image = global::mRemoteNG.Properties.Resources.Refresh_16x; this.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen"; this.cmenTabRefreshScreen.Size = new System.Drawing.Size(230, 22); this.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)"; // // cmenTabTransferFile // - this.cmenTabTransferFile.Image = global::mRemoteNG.Properties.Resources.SSHTransfer; + this.cmenTabTransferFile.Image = global::mRemoteNG.Properties.Resources.SyncArrow_16x; this.cmenTabTransferFile.Name = "cmenTabTransferFile"; this.cmenTabTransferFile.Size = new System.Drawing.Size(230, 22); this.cmenTabTransferFile.Text = "Transfer File (SSH)"; @@ -190,7 +187,7 @@ namespace mRemoteNG.UI.Window this.cmenTabSendSpecialKeys.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmenTabSendSpecialKeysCtrlAltDel, this.cmenTabSendSpecialKeysCtrlEsc}); - this.cmenTabSendSpecialKeys.Image = global::mRemoteNG.Properties.Resources.Keyboard; + this.cmenTabSendSpecialKeys.Image = global::mRemoteNG.Properties.Resources.ToggleOfficeKeyboardScheme_16x; this.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys"; this.cmenTabSendSpecialKeys.Size = new System.Drawing.Size(230, 22); this.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)"; @@ -212,13 +209,6 @@ namespace mRemoteNG.UI.Window this.cmenTabSep2.Name = "cmenTabSep2"; this.cmenTabSep2.Size = new System.Drawing.Size(227, 6); // - // cmenTabScreenshot - // - this.cmenTabScreenshot.Image = global::mRemoteNG.Properties.Resources.Screenshot_Add; - this.cmenTabScreenshot.Name = "cmenTabScreenshot"; - this.cmenTabScreenshot.Size = new System.Drawing.Size(230, 22); - this.cmenTabScreenshot.Text = "Screenshot"; - // // cmenTabPuttySettings // this.cmenTabPuttySettings.Image = global::mRemoteNG.Properties.Resources.PuttyConfig; diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs index 9cdb99659..0af2b66f4 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.cs @@ -12,13 +12,13 @@ using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Messages; using mRemoteNG.Properties; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Tabs; using mRemoteNG.UI.TaskDialog; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -77,7 +77,6 @@ namespace mRemoteNG.UI.Window cmenTabFullscreen.Click += (sender, args) => ToggleFullscreen(); cmenTabSmartSize.Click += (sender, args) => ToggleSmartSize(); cmenTabViewOnly.Click += (sender, args) => ToggleViewOnly(); - cmenTabScreenshot.Click += (sender, args) => CreateScreenshot(); cmenTabStartChat.Click += (sender, args) => StartChat(); cmenTabTransferFile.Click += (sender, args) => TransferFile(); cmenTabRefreshScreen.Click += (sender, args) => RefreshScreen(); @@ -268,7 +267,6 @@ namespace mRemoteNG.UI.Window cmenTabFullscreen.Text = Language.Fullscreen; cmenTabSmartSize.Text = Language.SmartSize; cmenTabViewOnly.Text = Language.ViewOnly; - cmenTabScreenshot.Text = Language.Screenshot; cmenTabStartChat.Text = Language.StartChat; cmenTabTransferFile.Text = Language.TransferFile; cmenTabRefreshScreen.Text = Language.RefreshScreen; @@ -396,7 +394,6 @@ namespace mRemoteNG.UI.Window cmenTabStartChat.Visible = true; cmenTabRefreshScreen.Visible = true; cmenTabTransferFile.Visible = false; - cmenTabSmartSize.Checked = vnc.SmartSize; } else { @@ -438,9 +435,6 @@ namespace mRemoteNG.UI.Window case RdpProtocol6 rdp: rdp.ToggleSmartSize(); break; - case ProtocolVNC vnc: - vnc.ToggleSmartSize(); - break; } } catch (Exception ex) @@ -781,15 +775,6 @@ namespace mRemoteNG.UI.Window } } - private void CreateScreenshot() - { - cmenTab.Close(); - Application.DoEvents(); - //var selectedTab = (ConnectionTab)GetInterfaceControl()?.Parent; - if (TabHelper.Instance.CurrentTab == null) return; - Windows.ScreenshotForm.AddScreenshot(MiscTools.TakeScreenshot(TabHelper.Instance.CurrentTab)); - } - #endregion #region Protocols diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs index 85c3d6c02..3c547af1f 100644 --- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs @@ -1,5 +1,6 @@  using mRemoteNG.UI.Controls; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -82,7 +83,7 @@ namespace mRemoteNG.UI.Window // // clmMessage // - this.clmMessage.Text = global::mRemoteNG.Resources.Language.Language.Message; + this.clmMessage.Text = Language.Message; this.clmMessage.Width = 184; // // cMenMC @@ -98,20 +99,20 @@ namespace mRemoteNG.UI.Window // // cMenMCCopy // - this.cMenMCCopy.Image = global::mRemoteNG.Properties.Resources.Copy; + this.cMenMCCopy.Image = global::mRemoteNG.Properties.Resources.Copy_16x; this.cMenMCCopy.Name = "cMenMCCopy"; this.cMenMCCopy.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.cMenMCCopy.Size = new System.Drawing.Size(140, 22); - this.cMenMCCopy.Text = global::mRemoteNG.Resources.Language.Language.Copy; + this.cMenMCCopy.Text = Language.Copy; this.cMenMCCopy.Click += new System.EventHandler(this.cMenMCCopy_Click); // // cMenMCDelete // - this.cMenMCDelete.Image = global::mRemoteNG.Properties.Resources.Delete; + this.cMenMCDelete.Image = global::mRemoteNG.Properties.Resources.Close_16x; this.cMenMCDelete.Name = "cMenMCDelete"; this.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.cMenMCDelete.Size = new System.Drawing.Size(140, 22); - this.cMenMCDelete.Text = global::mRemoteNG.Resources.Language.Language.Delete; + this.cMenMCDelete.Text = Language.Delete; this.cMenMCDelete.Click += new System.EventHandler(this.cMenMCDelete_Click); // // imgListMC @@ -151,9 +152,8 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.pnlErrorMsg); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; - this.Icon = global::mRemoteNG.Properties.Resources.Info_Icon; this.Name = "ErrorAndInfoWindow"; - this.TabText = global::mRemoteNG.Resources.Language.Language.Notifications; + this.TabText = Language.Notifications; this.Text = "Notifications"; this.Load += new System.EventHandler(this.ErrorsAndInfos_Load); this.Resize += new System.EventHandler(this.ErrorsAndInfos_Resize); diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs index 796ad3918..51e5f6331 100644 --- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs +++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs @@ -7,9 +7,9 @@ using System.Text; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.Themes; +using mRemoteNG.Resources.Language; using Message = mRemoteNG.Messages.Message; namespace mRemoteNG.UI.Window @@ -32,6 +32,7 @@ namespace mRemoteNG.UI.Window DockPnl = panel; _display = new DisplayProperties(); InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.StatusInformation_16x); lblMsgDate.Width = _display.ScaleWidth(lblMsgDate.Width); _themeManager = ThemeManager.getInstance(); ApplyTheme(); @@ -77,10 +78,10 @@ namespace mRemoteNG.UI.Window private void FillImageList() { imgListMC.ImageSize = _display.ScaleSize(imgListMC.ImageSize); - imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.brick)); - imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.InformationSmall)); - imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.WarningSmall)); - imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.ErrorSmall)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.Test_16x)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.StatusInformation_16x)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.LogWarning_16x)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.LogError_16x)); } private void LayoutVertical() @@ -219,7 +220,7 @@ namespace mRemoteNG.UI.Window switch (eMsg.Class) { case MessageClass.DebugMsg: - pbError.Image = _display.ScaleImage(Properties.Resources.brick); + pbError.Image = _display.ScaleImage(Properties.Resources.Test_16x); if (_themeManager.ThemingActive) { pnlErrorMsg.BackColor = Color.LightSteelBlue; @@ -229,7 +230,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.InformationMsg: - pbError.Image = _display.ScaleImage(Properties.Resources.Information); + pbError.Image = _display.ScaleImage(Properties.Resources.StatusInformation_16x); if (_themeManager.ThemingActive) { pnlErrorMsg.BackColor = Color.LightSteelBlue; @@ -239,7 +240,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.WarningMsg: - pbError.Image = _display.ScaleImage(Properties.Resources.Warning); + pbError.Image = _display.ScaleImage(Properties.Resources.LogWarning_16x); if (_themeManager.ActiveAndExtended) { //Inverse colors for dramatic effect @@ -259,7 +260,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.ErrorMsg: - pbError.Image = _display.ScaleImage(Properties.Resources._Error); + pbError.Image = _display.ScaleImage(Properties.Resources.LogError_16x); if (_themeManager.ActiveAndExtended) { pnlErrorMsg.BackColor = diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs index 559931f12..5d4fc833d 100644 --- a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs @@ -215,7 +215,7 @@ namespace mRemoteNG.UI.Window // // NewToolMenuItem // - this.NewToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add; + this.NewToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Add_16x; this.NewToolMenuItem.Name = "NewToolMenuItem"; this.NewToolMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4))); this.NewToolMenuItem.Size = new System.Drawing.Size(219, 22); @@ -225,7 +225,7 @@ namespace mRemoteNG.UI.Window // DeleteToolMenuItem // this.DeleteToolMenuItem.Enabled = false; - this.DeleteToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete; + this.DeleteToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Remove_16x; this.DeleteToolMenuItem.Name = "DeleteToolMenuItem"; this.DeleteToolMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.DeleteToolMenuItem.Size = new System.Drawing.Size(219, 22); @@ -240,7 +240,7 @@ namespace mRemoteNG.UI.Window // LaunchToolMenuItem // this.LaunchToolMenuItem.Enabled = false; - this.LaunchToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start; + this.LaunchToolMenuItem.Image = global::mRemoteNG.Properties.Resources.Run_16x; this.LaunchToolMenuItem.Name = "LaunchToolMenuItem"; this.LaunchToolMenuItem.Size = new System.Drawing.Size(219, 22); this.LaunchToolMenuItem.Text = "Launch External Tool"; @@ -517,7 +517,7 @@ namespace mRemoteNG.UI.Window // // NewToolToolstripButton // - this.NewToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add; + this.NewToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Add_16x; this.NewToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.NewToolToolstripButton.Name = "NewToolToolstripButton"; this.NewToolToolstripButton.Size = new System.Drawing.Size(51, 22); @@ -527,7 +527,7 @@ namespace mRemoteNG.UI.Window // DeleteToolToolstripButton // this.DeleteToolToolstripButton.Enabled = false; - this.DeleteToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete; + this.DeleteToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Remove_16x; this.DeleteToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.DeleteToolToolstripButton.Name = "DeleteToolToolstripButton"; this.DeleteToolToolstripButton.Size = new System.Drawing.Size(60, 22); @@ -542,7 +542,7 @@ namespace mRemoteNG.UI.Window // LaunchToolToolstripButton // this.LaunchToolToolstripButton.Enabled = false; - this.LaunchToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start; + this.LaunchToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.Run_16x; this.LaunchToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.LaunchToolToolstripButton.Name = "LaunchToolToolstripButton"; this.LaunchToolToolstripButton.Size = new System.Drawing.Size(66, 22); @@ -560,7 +560,6 @@ namespace mRemoteNG.UI.Window this.ClientSize = new System.Drawing.Size(827, 401); this.Controls.Add(this.ToolStripContainer); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "ExternalToolsWindow"; this.TabText = "External Applications"; this.Text = "External Tools"; diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.cs b/mRemoteNG/UI/Window/ExternalToolsWindow.cs index 9ecd96fdb..d164d01ef 100644 --- a/mRemoteNG/UI/Window/ExternalToolsWindow.cs +++ b/mRemoteNG/UI/Window/ExternalToolsWindow.cs @@ -4,12 +4,12 @@ using System.Windows.Forms; using BrightIdeasSoftware; using mRemoteNG.App; using mRemoteNG.Config.Settings; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.UI.Forms; using mRemoteNG.Themes; using mRemoteNG.Tools.CustomCollections; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -22,6 +22,7 @@ namespace mRemoteNG.UI.Window public ExternalToolsWindow() { InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.Console_16x); WindowType = WindowType.ExternalApps; DockPnl = new DockContent(); _themeManager = ThemeManager.getInstance(); diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.resx b/mRemoteNG/UI/Window/ExternalToolsWindow.resx deleted file mode 100644 index be385a189..000000000 --- a/mRemoteNG/UI/Window/ExternalToolsWindow.resx +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 177, 17 - - - 357, 17 - - - 17, 17 - - - 54 - - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAgXdub5CEe9KShHvfjoF134t9cd+HeGzfg3Ro335vZN95bGDfdWhc33BjWd9tYFXfaFxS32VZ - UN9gVEvSVEtDQJySifJRUVH/UlJS/1NTU/9UVFT/VVVV/1ZWVv9WVlb/V1dX/1hYWP9ZWVn/Wlpa/1tb - W/9bW1v/XFxc/2BVS4yonpX/TU1N/zw8PP88PDz/PT09/z4+Pv9AQED/QUFB/0JCQv9DQ0P/RERE/0VF - Rf9FRUX/R0dH/1lZWf9oXFKUraOb/0pKSv83Nzf/ODg4/zk5Of87Ozv/PDw8/z4+Pv8+Pj7/QEBA/0FB - Qf9BQUH/Q0ND/0RERP9WVlb/bWBVlLGooP9GRkb/MjIy/zMzM/81NTX/NjY2/zg4OP85OTn/Ojo6/zs7 - O/89PT3/Pj4+/z8/P/9AQED/VFRU/3JlWpS1rab/QUFB/y4uLv8vLy//MDAw/zIyMv8zMzP/NTU1/zU1 - Nf83Nzf/OTk5/zo6Ov88PDz/PDw8/1FRUf93al6UubGr/zw8PP8oKCj/0dHR/6ysrP8tLS3/Li4u/zAw - MP8xMTH/MzMz/zU1Nf82Njb/Nzc3/zk5Of9NTU3/fW5ilL22sf84ODj/JCQk/yUlJf/e3t7/c3Nz/ykp - Kf8rKyv/LCws/y4uLv8wMDD/MTEx/zMzM/80NDT/SkpK/4R1Z5TAubT/MzMz/x8fH//Pz8//p6en/yMj - I/8kJCT/JSUl/ycnJ/8pKSn/Kysr/ywsLP8uLi7/MDAw/0VFRf+Kem2Uwr24/zMzM/8fHx//ICAg/yEh - If8jIyP/JCQk/yUlJf8nJyf/KSkp/ysrK/8sLCz/Li4u/zAwMP9FRUX/jn5ylMS/uf8wMDD/MTEx/zIy - Mv8zMzP/NDQ0/zU1Nf82Njb/ODg4/zo6Ov87Ozv/PDw8/z4+Pv9AQED/QkJC/35vY5TJwr7/t7rx/5Pk - 9v+x5bP/7enm/+3p5v/t6eb/7enm/+3p5v/t6eb/7enm/+3p5v/t6eb/7enm//X08v+FdmiUwr66/klO - 0/8WrOL/Pa9B/+Hb1v/h29b/4dvW/+Hb1v/h29b/4dvW/+Hb1v/h29b/4dvW/+Hc1//t6uf/inptk6mi - nZnCvrr6yMO+/8jBvf/Ev7n/wLm0/7y1sP+4sar/tKuk/6+mnv+qn5f/pZqR/6CUiv+bjoT/k4Z7+n1y - am4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//+cQQAAnEEAAJxBAACcQQAAnEEAAJxBAACcQQAAnEEAAJxBAACcQQAAnEEAAJxBAACcQQAA - nEEAAJxB//+cQQ== - - - \ No newline at end of file diff --git a/mRemoteNG/UI/Window/HelpWindow.Designer.cs b/mRemoteNG/UI/Window/HelpWindow.Designer.cs deleted file mode 100644 index 8306555f6..000000000 --- a/mRemoteNG/UI/Window/HelpWindow.Designer.cs +++ /dev/null @@ -1,42 +0,0 @@ - -namespace mRemoteNG.UI.Window -{ - partial class HelpWindow - { - #region Windows Form Designer generated code - private void InitializeComponent() - { - this.cefBrwoser = new CefSharp.WinForms.ChromiumWebBrowser(); - this.SuspendLayout(); - // - // chromiumWebBrowser1 - // - this.cefBrwoser.ActivateBrowserOnCreation = false; - this.cefBrwoser.Dock = System.Windows.Forms.DockStyle.Fill; - this.cefBrwoser.Location = new System.Drawing.Point(0, 0); - this.cefBrwoser.Name = "chromiumWebBrowser1"; - this.cefBrwoser.Size = new System.Drawing.Size(1117, 705); - this.cefBrwoser.TabIndex = 0; - // - // HelpWindow - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1117, 705); - this.Controls.Add(this.cefBrwoser); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ForeColor = System.Drawing.SystemColors.ControlText; - this.Icon = global::mRemoteNG.Properties.Resources.Help_Icon; - this.Name = "HelpWindow"; - this.TabText = "Help"; - this.Text = "Help"; - this.Load += new System.EventHandler(this.HelpWindow_Load); - this.ResumeLayout(false); - - } - #endregion - - private CefSharp.WinForms.ChromiumWebBrowser cefBrwoser; - } -} diff --git a/mRemoteNG/UI/Window/HelpWindow.cs b/mRemoteNG/UI/Window/HelpWindow.cs deleted file mode 100644 index 286ca3a52..000000000 --- a/mRemoteNG/UI/Window/HelpWindow.cs +++ /dev/null @@ -1,24 +0,0 @@ -using CefSharp; -using mRemoteNG.Connection.Protocol.Http; -using System; -using WeifenLuo.WinFormsUI.Docking; - - -namespace mRemoteNG.UI.Window -{ - public partial class HelpWindow : BaseWindow - { - public HelpWindow() - { - WindowType = WindowType.Help; - DockPnl = new DockContent(); - InitializeComponent(); - } - - private void HelpWindow_Load(object sender, EventArgs e) - { - cefBrwoser.RequestHandler = new RequestHandler(); - cefBrwoser.Load($@"{Cef.CefCommitHash}://help/"); - } - } -} \ No newline at end of file diff --git a/mRemoteNG/UI/Window/PortScanWindow.Designer.cs b/mRemoteNG/UI/Window/PortScanWindow.Designer.cs index bf66938cc..6c44539da 100644 --- a/mRemoteNG/UI/Window/PortScanWindow.Designer.cs +++ b/mRemoteNG/UI/Window/PortScanWindow.Designer.cs @@ -412,7 +412,7 @@ namespace mRemoteNG.UI.Window // this.btnScan._mice = MrngButton.MouseState.OUT; this.btnScan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnScan.Image = global::mRemoteNG.Properties.Resources.Search; + this.btnScan.Image = global::mRemoteNG.Properties.Resources.Search_16x; this.btnScan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnScan.Location = new System.Drawing.Point(765, 99); this.btnScan.Name = "btnScan"; @@ -494,7 +494,6 @@ namespace mRemoteNG.UI.Window this.ClientSize = new System.Drawing.Size(884, 461); this.Controls.Add(this.pnlMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "PortScanWindow"; this.TabText = "Port Scan"; this.Text = "Port Scan"; diff --git a/mRemoteNG/UI/Window/PortScanWindow.cs b/mRemoteNG/UI/Window/PortScanWindow.cs index 97367f6fc..27824807c 100644 --- a/mRemoteNG/UI/Window/PortScanWindow.cs +++ b/mRemoteNG/UI/Window/PortScanWindow.cs @@ -8,10 +8,10 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree.Root; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -22,7 +22,7 @@ namespace mRemoteNG.UI.Window public PortScanWindow() { InitializeComponent(); - + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.SearchAndApps_16x); WindowType = WindowType.PortScan; DockPnl = new DockContent(); ApplyTheme(); diff --git a/mRemoteNG/UI/Window/PortScanWindow.resx b/mRemoteNG/UI/Window/PortScanWindow.resx deleted file mode 100644 index 19402096a..000000000 --- a/mRemoteNG/UI/Window/PortScanWindow.resx +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 161, 17 - - - - - AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAGxsbP9sbGz/EVuT/xRclP8XX5f/GmGZ/x1jm/8hZp7/JGig/yhro/8sbqb/MHGp/66u - rv+3t7f/AAAAAAAAAAAAAAAAAAAAABVdlf90qNH/dqrS/3mr0/97rdT/fa/V/4Gy1v+Ds9f/hrbY/zZ1 - rf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZYJj/d6vT/1SVx/9Yl8j/W5rJ/1+dy/9ioM3/ZqLO/4u5 - 2v88ebH/IGqqAiZqoJMbYpl3AAAAAAAAAAAAAAAAHmSc/3ut1P9Zmcn/XJvK/2CezP9koc3/Z6TP/3an - yf+buMv/Tn+u/0OEv5t6qNL/MnKotwAAAAAAAAAAAAAAACNnn/9/sNX/XpzL/2KfzP9mos7/aaXP/4+u - wP/bxK//682z/9y9o/+sr7b/UYzCvSJopBgAAAAAAAAAAAAAAAAoa6P/gbTX/1TC7f9bt+P/a6fQ/2+p - 0v/ezrz/9+PQ//Xcw//64cf/4cGm/WGCpCoAAAAAAAAAAAAAAAAAAAAALm+n/3y74P9L1P//X7rk/3Gr - 0v91rdT/8d3J//bizv/03MP/9t3E/+3Qtv/TpH4qAAAAAAAAAAAAAAAAAAAAADNzq/+Mutr/bavU/3Os - 0/93r9X/erLW/+LYy//46dr/9uPQ//jl0//qzLLr3bGNGQAAAAAAAAAAAAAAAAAAAAA5d6//j73c/3St - 1P95sNX/fLPX/4C22P+bwNX/49nN//Phzv/czcH/58KhSgAAAAAAAAAAAAAAAAAAAAAAAAAAP3y0/5TB - 3f96stb/frTX/4G32f+Futv/iL3c/4y/3f+oz+X/Y5XN/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWA - uP+ZxOD/gLbY/4O42v+Hu9v/ir7c/43A3v+Qwt//q9Hn/2eY0P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AABLhLz/ncfh/6DJ4v+iy+T/pc3k/6jP5f+q0ef/q9Po/67U6P9rm9P/AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAUYjA/1WLw/9Zjsb/XJDI/2CTy/9jlc3/ZpfP/2ma0v9sm9P/bp3V/wAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAA//+cQYABnEHgB5xB4ACcQeAAnEHgAJxB4AGcQeABnEHgAZxB4AOcQeAHnEHgB5xB4AecQeAH - nEH//5xB//+cQQ== - - - \ No newline at end of file diff --git a/mRemoteNG/UI/Window/SSHTransferWindow.cs b/mRemoteNG/UI/Window/SSHTransferWindow.cs index b24b13f2d..b102bf350 100644 --- a/mRemoteNG/UI/Window/SSHTransferWindow.cs +++ b/mRemoteNG/UI/Window/SSHTransferWindow.cs @@ -6,9 +6,9 @@ using mRemoteNG.Tools; using WeifenLuo.WinFormsUI.Docking; using System.Windows.Forms; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.UI.Controls; using mRemoteNG.UI.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -104,7 +104,7 @@ namespace mRemoteNG.UI.Window // btnTransfer._mice = MrngButton.MouseState.HOVER; btnTransfer.FlatStyle = FlatStyle.Flat; - btnTransfer.Image = Properties.Resources.SSHTransfer; + btnTransfer.Image = Properties.Resources.SyncArrow_16x; btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; btnTransfer.Location = new System.Drawing.Point(562, 145); btnTransfer.Name = "btnTransfer"; @@ -296,7 +296,6 @@ namespace mRemoteNG.UI.Window Controls.Add(pbStatus); Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); Name = "SSHTransferWindow"; TabText = "SSH File Transfer"; Text = "SSH File Transfer"; @@ -350,6 +349,7 @@ namespace mRemoteNG.UI.Window { ApplyTheme(); ApplyLanguage(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.SyncArrow_16x); var display = new DisplayProperties(); btnTransfer.Image = display.ScaleImage(btnTransfer.Image); } diff --git a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs b/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs deleted file mode 100644 index ded58043d..000000000 --- a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs +++ /dev/null @@ -1,458 +0,0 @@ -using System; -using System.Drawing; -using System.Windows.Forms; -using WeifenLuo.WinFormsUI.Docking; -using mRemoteNG.App; -using System.IO; -using mRemoteNG.Resources.Language; -using mRemoteNG.UI.Forms; -using mRemoteNG.Themes; - -namespace mRemoteNG.UI.Window -{ - public class ScreenshotManagerWindow : BaseWindow - { - #region Form Init - - internal MenuStrip msMain; - private ToolStripMenuItem mMenFile; - private ToolStripMenuItem mMenFileSaveAll; - private ToolStripMenuItem mMenFileRemoveAll; - internal ContextMenuStrip cMenScreenshot; - private System.ComponentModel.IContainer components; - private ToolStripMenuItem cMenScreenshotCopy; - private ToolStripMenuItem cMenScreenshotSave; - internal SaveFileDialog dlgSaveSingleImage; - internal FolderBrowserDialog dlgSaveAllImages; - - private FlowLayoutPanel flpScreenshots; - private VisualStudioToolStripExtender vsToolStripExtender; - private readonly ToolStripRenderer _toolStripProfessionalRenderer = new ToolStripProfessionalRenderer(); - - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - flpScreenshots = new FlowLayoutPanel(); - msMain = new MenuStrip(); - mMenFile = new ToolStripMenuItem(); - mMenFileSaveAll = new ToolStripMenuItem(); - mMenFileRemoveAll = new ToolStripMenuItem(); - cMenScreenshot = new ContextMenuStrip(components); - cMenScreenshotCopy = new ToolStripMenuItem(); - cMenScreenshotSave = new ToolStripMenuItem(); - dlgSaveSingleImage = new SaveFileDialog(); - dlgSaveAllImages = new FolderBrowserDialog(); - msMain.SuspendLayout(); - cMenScreenshot.SuspendLayout(); - SuspendLayout(); - // - // flpScreenshots - // - flpScreenshots.Anchor = AnchorStyles.Top | AnchorStyles.Bottom - | AnchorStyles.Left - | AnchorStyles.Right; - flpScreenshots.AutoScroll = true; - flpScreenshots.Location = new Point(0, 26); - flpScreenshots.Name = "flpScreenshots"; - flpScreenshots.Size = new Size(542, 296); - flpScreenshots.TabIndex = 0; - // - // msMain - // - msMain.Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); - msMain.Items.AddRange(new ToolStripItem[] - { - mMenFile - }); - msMain.Location = new Point(0, 0); - msMain.Name = "msMain"; - msMain.RenderMode = ToolStripRenderMode.Professional; - msMain.Size = new Size(542, 24); - msMain.TabIndex = 1; - msMain.Text = "MenuStrip1"; - // - // mMenFile - // - mMenFile.DropDownItems.AddRange(new ToolStripItem[] - { - mMenFileSaveAll, - mMenFileRemoveAll - }); - mMenFile.Image = Properties.Resources.File; - mMenFile.Name = "mMenFile"; - mMenFile.Size = new Size(53, 20); - mMenFile.Text = "&File"; - mMenFile.DropDownOpening += mMenFile_DropDownOpening; - // - // mMenFileSaveAll - // - mMenFileSaveAll.Image = Properties.Resources.Screenshot_Save; - mMenFileSaveAll.Name = "mMenFileSaveAll"; - mMenFileSaveAll.Size = new Size(130, 22); - mMenFileSaveAll.Text = "Save All"; - mMenFileSaveAll.Click += mMenFileSaveAll_Click; - // - // mMenFileRemoveAll - // - mMenFileRemoveAll.Image = Properties.Resources.Screenshot_Delete; - mMenFileRemoveAll.Name = "mMenFileRemoveAll"; - mMenFileRemoveAll.Size = new Size(130, 22); - mMenFileRemoveAll.Text = "Remove All"; - mMenFileRemoveAll.Click += mMenFileRemoveAll_Click; - // - // cMenScreenshot - // - cMenScreenshot.Items.AddRange(new ToolStripItem[] - { - cMenScreenshotCopy, - cMenScreenshotSave - }); - cMenScreenshot.Name = "cMenScreenshot"; - cMenScreenshot.Size = new Size(103, 48); - // - // cMenScreenshotCopy - // - cMenScreenshotCopy.Image = Properties.Resources.Screenshot_Copy; - cMenScreenshotCopy.Name = "cMenScreenshotCopy"; - cMenScreenshotCopy.Size = new Size(102, 22); - cMenScreenshotCopy.Text = "Copy"; - cMenScreenshotCopy.Click += cMenScreenshotCopy_Click; - // - // cMenScreenshotSave - // - cMenScreenshotSave.Image = Properties.Resources.Screenshot_Save; - cMenScreenshotSave.Name = "cMenScreenshotSave"; - cMenScreenshotSave.Size = new Size(102, 22); - cMenScreenshotSave.Text = "Save"; - cMenScreenshotSave.Click += cMenScreenshotSave_Click; - // - // dlgSaveSingleImage - // - dlgSaveSingleImage.Filter = - "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group Fi" + - "le (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Ne" + - "twork Graphics File (.png)|*.png"; - dlgSaveSingleImage.FilterIndex = 4; - // - // ScreenshotManagerWindow - // - AutoScaleDimensions = new SizeF(96F, 96F); - AutoScaleMode = AutoScaleMode.Dpi; - ClientSize = new Size(542, 323); - Controls.Add(flpScreenshots); - Controls.Add(msMain); - Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); - HideOnClose = true; - Icon = Properties.Resources.Screenshot_Icon; - MainMenuStrip = msMain; - Name = "ScreenshotManagerWindow"; - TabText = "Screenshots"; - Text = "Screenshots"; - Load += ScreenshotManager_Load; - msMain.ResumeLayout(false); - msMain.PerformLayout(); - cMenScreenshot.ResumeLayout(false); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - #region Form Stuff - - private void ScreenshotManager_Load(object sender, EventArgs e) - { - ApplyTheme(); - ThemeManager.getInstance().ThemeChanged += ApplyTheme; - ApplyLanguage(); - } - - private new void ApplyTheme() - { - if (!ThemeManager.getInstance().ThemingActive) return; - base.ApplyTheme(); - vsToolStripExtender = new VisualStudioToolStripExtender(components) - { - DefaultRenderer = _toolStripProfessionalRenderer - }; - vsToolStripExtender.SetStyle(cMenScreenshot, ThemeManager.getInstance().ActiveTheme.Version, - ThemeManager.getInstance().ActiveTheme.Theme); - } - - private void ApplyLanguage() - { - mMenFile.Text = Language._File; - mMenFileSaveAll.Text = Language.SaveAll; - mMenFileRemoveAll.Text = Language.RemoveAll; - cMenScreenshotCopy.Text = Language.Copy; - cMenScreenshotSave.Text = Language.Save; - dlgSaveSingleImage.Filter = Language.SaveImageFilter; - TabText = Language.Screenshots; - Text = Language.Screenshots; - } - - #endregion - - #region Public Methods - - public ScreenshotManagerWindow() : this(new DockContent()) - { - } - - internal ScreenshotManagerWindow(DockContent panel) - { - WindowType = WindowType.ScreenshotManager; - DockPnl = panel; - InitializeComponent(); - } - - public void AddScreenshot(Image Screenshot) - { - try - { - var nPB = new PictureBox(); - nPB.MouseDown += pbScreenshot_MouseDown; - - nPB.Parent = flpScreenshots; - nPB.SizeMode = PictureBoxSizeMode.StretchImage; - nPB.BorderStyle = BorderStyle.FixedSingle; - nPB.ContextMenuStrip = cMenScreenshot; - nPB.Image = Screenshot; - nPB.Size = new Size(100, 100); //New Size((Screenshot.Width / 100) * 20, (Screenshot.Height / 100) * 20) - nPB.Show(); - - var nBtn = new Button(); - nBtn.Click += btnCloseScreenshot_Click; - - nBtn.Parent = nPB; - nBtn.FlatStyle = FlatStyle.Flat; - nBtn.Text = "×"; - nBtn.Size = new Size(22, 22); - nBtn.Location = new Point(nPB.Width - nBtn.Width, -1); - nBtn.Show(); - - Show(FrmMain.Default.pnlDock); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "AddScreenshot (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - #endregion - - #region Private Methods - - private void pbScreenshot_MouseDown(object sender, MouseEventArgs e) - { - cMenScreenshot.Tag = sender; - - if (e.Button == MouseButtons.Left) - { - OpenScreenshot((PictureBox)sender); - } - } - - private void pbScreenshotOpen_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left) - { - CloseOpenedScreenshot((Form)((PictureBox)sender).Parent); - } - } - - private void CloseOpenedScreenshot(Form form) - { - form.Close(); - } - - private void OpenScreenshot(PictureBox sender) - { - try - { - var mImage = sender.Image; - - var nForm = new Form - { - StartPosition = FormStartPosition.CenterParent, - ShowInTaskbar = false, - ShowIcon = false, - MaximizeBox = false, - MinimizeBox = false, - Width = mImage.Width + 2, - Height = mImage.Height + 2, - FormBorderStyle = FormBorderStyle.None - }; - - var nPB = new PictureBox - { - Parent = nForm, - BorderStyle = BorderStyle.FixedSingle, - Location = new Point(0, 0), - SizeMode = PictureBoxSizeMode.AutoSize, - Anchor = AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top, - Image = mImage, - ContextMenuStrip = cMenScreenshot - }; - nPB.Show(); - - nPB.MouseDown += pbScreenshotOpen_MouseDown; - - nForm.ShowDialog(); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "OpenScreenshot (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void btnCloseScreenshot_Click(object sender, EventArgs e) - { - try - { - ((PictureBox)((Button)sender).Parent).Dispose(); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, - true); - } - } - - private void mMenFileRemoveAll_Click(object sender, EventArgs e) - { - RemoveAllImages(); - } - - private void RemoveAllImages() - { - flpScreenshots.Controls.Clear(); - } - - private void mMenFileSaveAll_Click(object sender, EventArgs e) - { - SaveAllImages(); - } - - private void SaveAllImages() - { - try - { - var pCount = 1; - - if (dlgSaveAllImages.ShowDialog() != DialogResult.OK) return; - foreach (var fPath in Directory.GetFiles(dlgSaveAllImages.SelectedPath, "Screenshot_*", - SearchOption.TopDirectoryOnly)) - { - var f = new FileInfo(fPath); - - var fCount = f.Name; - fCount = fCount.Replace(f.Extension, ""); - fCount = fCount.Replace("Screenshot_", ""); - - pCount = (int)(double.Parse(fCount) + 1); - } - - foreach (Control ctrl in flpScreenshots.Controls) - { - if (!(ctrl is PictureBox)) continue; - (ctrl as PictureBox).Image.Save( - dlgSaveAllImages.SelectedPath + "\\Screenshot_" + - Tools.MiscTools.LeadingZero(Convert.ToString(pCount)) + ".png", - System.Drawing.Imaging.ImageFormat.Png); - pCount++; - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "SaveAllImages (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void cMenScreenshotCopy_Click(object sender, EventArgs e) - { - CopyImageToClipboard(); - } - - private void CopyImageToClipboard() - { - try - { - Clipboard.SetImage(((PictureBox)cMenScreenshot.Tag).Image); - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, - true); - } - } - - private void cMenScreenshotSave_Click(object sender, EventArgs e) - { - SaveSingleImage(); - } - - private void SaveSingleImage() - { - try - { - if (dlgSaveSingleImage.ShowDialog() != DialogResult.OK) return; - // ReSharper disable once SwitchStatementMissingSomeCases - switch (dlgSaveSingleImage.FileName - .Substring(dlgSaveSingleImage - .FileName.LastIndexOf(".", StringComparison.Ordinal) + 1) - .ToLower()) - { - case "gif": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Gif); - break; - case "jpeg": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "jpg": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Jpeg); - break; - case "png": - ((PictureBox)cMenScreenshot.Tag).Image.Save(dlgSaveSingleImage.FileName, - System.Drawing.Imaging.ImageFormat.Png); - break; - } - } - catch (Exception ex) - { - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, - "SaveSingleImage (UI.Window.ScreenshotManager) failed" + - Environment.NewLine + ex.Message, true); - } - } - - private void mMenFile_DropDownOpening(object sender, EventArgs e) - { - if (flpScreenshots.Controls.Count < 1) - { - mMenFileSaveAll.Enabled = false; - mMenFileRemoveAll.Enabled = false; - } - else - { - mMenFileSaveAll.Enabled = true; - mMenFileRemoveAll.Enabled = true; - } - } - - #endregion - } -} \ No newline at end of file diff --git a/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx b/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx deleted file mode 100644 index 3919c7064..000000000 --- a/mRemoteNG/UI/Window/ScreenshotManagerWindow.resx +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 19, 45 - - - 146, 16 - - - 146, 45 - - \ No newline at end of file diff --git a/mRemoteNG/UI/Window/UltraVNCWindow.cs b/mRemoteNG/UI/Window/UltraVNCWindow.cs index b847b51da..e6d829d5c 100644 --- a/mRemoteNG/UI/Window/UltraVNCWindow.cs +++ b/mRemoteNG/UI/Window/UltraVNCWindow.cs @@ -1,7 +1,7 @@ using System; using mRemoteNG.App; -using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window @@ -68,7 +68,6 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.tsMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Properties.Resources.UVNC_SC_Icon; this.Name = "UltraVNCWindow"; this.TabText = "UltraVNC SC"; this.Text = "UltraVNC SC"; diff --git a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs index 4cdf7dd2c..e19c49175 100644 --- a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs +++ b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs @@ -203,7 +203,6 @@ namespace mRemoteNG.UI.Window this.ClientSize = new System.Drawing.Size(734, 418); this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Properties.Resources.Update_Icon; this.Name = "UpdateWindow"; this.TabText = "Update"; this.Text = "Update"; diff --git a/mRemoteNG/UI/Window/UpdateWindow.cs b/mRemoteNG/UI/Window/UpdateWindow.cs index 912efb41a..0d0da2214 100644 --- a/mRemoteNG/UI/Window/UpdateWindow.cs +++ b/mRemoteNG/UI/Window/UpdateWindow.cs @@ -8,9 +8,9 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Update; using mRemoteNG.Messages; -using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using WeifenLuo.WinFormsUI.Docking; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Window { @@ -30,6 +30,7 @@ namespace mRemoteNG.UI.Window WindowType = WindowType.Update; DockPnl = panel; InitializeComponent(); + Icon = Resources.ImageConverter.GetImageAsIcon(Properties.Resources.RunUpdate_16x); FontOverrider.FontOverride(this); } diff --git a/mRemoteNG/UI/WindowType.cs b/mRemoteNG/UI/WindowType.cs index 0e3e73199..45876a210 100644 --- a/mRemoteNG/UI/WindowType.cs +++ b/mRemoteNG/UI/WindowType.cs @@ -6,12 +6,10 @@ Connection = 1, Config = 2, ErrorsAndInfos = 4, - ScreenshotManager = 5, Options = 6, Update = 9, SSHTransfer = 10, ActiveDirectoryImport = 11, - Help = 12, ExternalApps = 13, PortScan = 14, UltraVNCSC = 16, diff --git a/mRemoteNG/Resources/Tiles/VisualElements_150.png b/mRemoteNG/VisualElements_150.png similarity index 100% rename from mRemoteNG/Resources/Tiles/VisualElements_150.png rename to mRemoteNG/VisualElements_150.png diff --git a/mRemoteNG/Resources/Tiles/VisualElements_70.png b/mRemoteNG/VisualElements_70.png similarity index 100% rename from mRemoteNG/Resources/Tiles/VisualElements_70.png rename to mRemoteNG/VisualElements_70.png diff --git a/mRemoteNG/app.config b/mRemoteNG/app.config index f23b3a486..d9d62c1d9 100644 --- a/mRemoteNG/app.config +++ b/mRemoteNG/app.config @@ -1,854 +1,831 @@ - - - -
- -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0, 0 - - - 0, 0 - - - Normal - - - False - - - True - - - - - - True - - - True - - - True - - - False - - - - - - True - - - True - - - False - - - False - - - True - - - False - - - False - - - noinfo - - - - - - - - - - - - False - - - True - - - False - - - False - - - False - - - - - - 80 - - - False - - - - - - - - - - - - RDP - - - Default Settings - - - False - - - FitToWindow - - - Colors16Bit - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - DoNotPlay - - - False - - - 2 - - - False - - - False - - - False - - - 0 - - - False - - - True - - - 0, 0 - - - Bottom - - - True - - - 3, 24 - - - Top - - - False - - - False - - - - - - - - - - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - + + + +
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0, 0 + + + 0, 0 + + + Normal + + + False + + + True + + + + + + True + + + True + + + True + + + False + + + + + + True + + + True + + + False + + + False + + + True + + + False + + + False + + + noinfo + + + + + + + + + + + + False + + + True + + + False + + + False + + + False + + + + + + 80 + + + False + + + + + + + + + + + + RDP + + + Default Settings + + + False + + + FitToWindow + + + Colors16Bit + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + DoNotPlay + + + False + + + 2 + + + False + + + False + + + False + + + 0 + + + False + + + True + + + 0, 0 + + + Bottom + + + True + + + 3, 24 + + + Top + + + False + + + False + + + + + + + + + + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + + + + + + + False + + + False + + + False + + + True + + + False + + + False + + + AuthVNC + + + ColNormal + + + SmartSAspect + + + False + + + CompNone + + + EncHextile + + + + + + + + + 0 + + + ProxyNone + + + + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + NoAuth + + + False + + + 5500 + + + + + + False + + + + + + False + + + False + + + + + + False + + + + + + False + + + False + + + 14 + + + 1980-01-01 + + + False + + + Never + + + Yes + + + mRemoteNG + + + False + + + False + + + False + + + False + + + False + + + False + + + 5 + + + + + + + + + + + + + + + + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + 4 + + + mRemoteNG + + + 10 + + + {0}.{1:yyyyMMdd-HHmmssffff}.backup + + + False + + + True + + + False + + + False + + + False + + + release + + + + + + True + + + + + + + + + True + + + + + + True + + + False + + + False + + + RDP + + + 9/9, 33/8 + + + 9/8, 34/8 + + + False + + + 20 + + + 10000 + + + Dynamic + + + False + + + 0 + + + False + + + False + + + False + + + False + + + 00000000-0000-0000-0000-000000000000 + + + + + + False + + + True + + + True + + + True + + + False + + + False + + + True + + + True + + + False + + + False + + + False + + + False + + + True + + + True + + + True + + + + + + + + + + + + General + + + True + + + False + + + False + + + False + + + False + + + 0, 0 + + + + + + False + + + False + + + General + + + False + + + True + + + True + + + False + + + False + + + False + + + mssql + + + False + + + + + + False + + + False + + + 0 + + + Highest + + + False + + + False + + + + + + False + + + + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + + EncrBasic False - - - - - - - - False - - - False - - - False - - - True - - - False - - - False - - - AuthVNC - - - ColNormal - - - SmartSAspect - - - False - - - CompNone - - - EncHextile - - - - - - - - - 0 - - - ProxyNone - - - - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - NoAuth - - - False - - - 5500 - - - - - - CEF - - - False - - - - - - False - - - False - - - - - - False - - - - - - False - - - False - - - 14 - - - 1980-01-01 - - - False - - - Never - - - Yes - - - mRemoteNG - - - False - - - False - - - False - - - False - - - False - - - False - - - 5 - - - - - - - - - - - - - - - - - - False - - - False - - - False - - - False - - - 4 - - - mRemoteNG - - - 10 - - - {0}.{1:yyyyMMdd-HHmmssffff}.backup - - - False - - - True - - - False - - - False - - - False - - - release - - - - - - True - - - - - - - - - True - - - - - - True - - - False - - - False - - - RDP - - - 9/9, 33/8 - - - 9/8, 34/8 - - - False - - - 20 - - - AES - - - GCM - - - 10000 - - - Dynamic - - - False - - - 0 - - - False - - - False - - - False - - - False - - - 00000000-0000-0000-0000-000000000000 - - - - - - False - - - True - - - True - - - True - - - False - - - False - - - True - - - True - - - False - - - False - - - False - - - False - - - True - - - True - - - True - - - - - - - - - - - - General - - - True - - - False - - - False - - - False - - - False - - - 0, 0 - - - - - - False - - - False - - - General - - - False - - - False - - - True - - - False - - - False - - - False - - - mssql - - - False - - - - - - False - - - False - - - Highest - - - False - - - False - - - - - - False - - - - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - False - - - - - - - https://mremoteng.org/ - - - cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + False + + + False + + + False + + + False + + + False + + + EdgeChromium + + + + + + + https://mremoteng.org/ + + + cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW + + + + + + \ No newline at end of file diff --git a/mRemoteNG/Resources/Tiles/mRemoteNG.VisualElementsManifest.xml b/mRemoteNG/mRemoteNG.VisualElementsManifest.xml similarity index 100% rename from mRemoteNG/Resources/Tiles/mRemoteNG.VisualElementsManifest.xml rename to mRemoteNG/mRemoteNG.VisualElementsManifest.xml diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 05129572b..039c5296b 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -1,1732 +1,276 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {4934A491-40BC-4E5B-9166-EA1169A220F6} WinExe - mRemoteNG.App.ProgramRoot - mRemoteNG - mRemoteNG - WindowsForms - On - - - 3.5 - - - false - Properties\app.manifest - Resources\Icons\mRemoteNG_Icon.ico - Off - B249710A6BB08171F8E75082CF2355AE2890911A - mRemoteV1_TemporaryKey.pfx - false - false - v4.7.2 - - - - True - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 1 - 1.64.0.1 - false - true - true - true + net6.0-windows + true + Icons\mRemoteNG.ico + 1.77.2 + Multi-protocol remote connections manager + 2020 mRemoteNG Dev Team, 2010-2013 Riley McArdle, 2007-2009 Felix Deimel + COPYING.TXT + https://mremoteng.org/ + AnyCPU;ARM64;x64 + Debug;Release;Debug Portable;Release Portable;Release Installer + false + preview + + DEBUG + false + + bin\Debug\ + + + + + false + bin\Release\ + false + + + + + DEBUG;PORTABLE + false + bin\Debug Portable\ + false + + + + + PORTABLE + false + bin\Release Portable\ + false + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - True - True - Language.resx - - - True - True - ColorMapTheme.resx - - - - - - - - - - Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UserControl - - - MrngAdTree.cs - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - MrngPictureBox.cs - - - Component - - - Component - - - Component - - - Component - - - Component - - - Component - - - ConnectionInfoPropertyGrid.cs - - - - Component - - - ConnectionTree.cs - - - - Component - - - CredentialRecordComboBox.cs - - - - Component - - - CredentialRecordListBox.cs - - - UserControl - - - CredentialRecordListView.cs - - - UserControl - - - CredentialRepositoryListView.cs - - - Component - - - Component - - - FilteredPropertyGrid.cs - - - - - Component - - - - UserControl - - - - Component - - - Component - - - - UserControl - - - NewPasswordWithVerification.cs - - - - - UserControl - - - - Component - - - Component - - - Component - - - SecureTextBox.cs - - - - - Component - - - - - - - Form - - - FrmOptions.cs - - - Form - - - FrmSplashScreen.cs - - - - Form - - - FrmInputBox.cs - - - AdvancedPage.cs - - - UserControl - - - AppearancePage.cs - - - UserControl - - - ComponentsPage.cs - - - UserControl - - - CredentialsPage.cs - - - UserControl - - - NotificationsPage.cs - - - ConnectionsPage.cs - - - UserControl - - - UserControl - - - UserControl - - - SecurityPage.cs - - - SqlServerPage.cs - - - UserControl - - - StartupExitPage.cs - - - UserControl - - - TabsPanelsPage.cs - - - UserControl - - - ThemePage.cs - - - UserControl - - - UpdatesPage.cs - - - UserControl - - - - - - - - - - - - InterfaceControl.cs - - - Component - - - - - - - - - - - - - - - - - - - - - - FrmChoosePanel.cs - - - Form - - - FrmMain.cs - - - Form - - - FrmPassword.cs - - - Form - - - - - True + + aximp + 0 + 1 + 8c11efa1-92c3-11d1-bc1e-00c04fa31489 + 0 + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True Settings.settings - - - - - - - - ReconnectGroup.cs - - - UserControl - - - - - - - - - Form - - - FrmUnhandledException.cs - - - - - Component - - - Component - - - - Component - - - Component - - - - - Form - - - ConnectionTab.cs - - - Component - - - Form - - - Component - - - - Component - - - CommandButton.cs - - - - Form - - - frmTaskDialog.cs - - - Form - - - FrmAbout.cs - - - ActiveDirectoryImportWindow.cs - - - Form - - - Form - - - UserControl - - - Form - - - Form - - - ConnectionWindow.cs - - - Form - - - FrmExport.cs - - - ErrorAndInfoWindow.cs - - - ExternalToolsWindow.cs - - - Form - - - Form - - - - HelpWindow.cs - - - PortScanWindow.cs - - - Form - - - Form - - - Form - - - Form - - - ConnectionTreeWindow.cs - - - Form - - - - Form - - - UpdateWindow.cs - - - Form - + - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - ResXFileCodeGenerator - ColorMapTheme.Designer.cs - mRemoteNG - - - MrngAdTree.cs - - - MrngButton.cs - - - MrngCheckBox.cs - - - MrngComboBox.cs - - - MrngGroupBox.cs - - - MrngLabel.cs - - - MrngListView.cs - - - MrngNumericUpDown.cs - - - MrngRadioButton.cs - - - MrngSearchBox.cs - - - MrngTextBox.cs - - - ConnectionTree.cs - - - CredentialRecordComboBox.cs - - - CredentialRecordListBox.cs - - - CredentialRecordListView.cs - - - CredentialRepositoryListView.cs - - - FilteredPropertyGrid.cs - - - HeadlessTabControl.cs - - - MrngIpTextBox.cs - - - NewPasswordWithVerification.cs - - - SequencedControl.cs - - - SecureTextBox.cs - - - FrmChoosePanel.cs - Designer - - - FrmMain.cs - Designer - - - FrmOptions.cs - - - FrmSplashScreen.cs - - - FrmInputBox.cs - - - AdvancedPage.cs - - - AppearancePage.cs - - - ConnectionsPage.cs - - - CredentialsPage.cs - - - NotificationsPage.cs - - - OptionsPage.cs - - - SecurityPage.cs - - - SqlServerPage.cs - Designer - - - StartupExitPage.cs - - - TabsPanelsPage.cs - - - ThemePage.cs - - - UpdatesPage.cs - - - FrmPassword.cs - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - ResXFileCodeGenerator - Designer - Language.Designer.cs - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - Designer - - - ResXFileCodeGenerator - mRemoteNG - Designer - Resources.Designer.cs - - - ReconnectGroup.cs - Designer - - - FrmUnhandledException.cs - - - ConnectionTab.cs - - - CommandButton.cs - - - frmTaskDialog.cs - - - FrmAbout.cs - Designer - - - ActiveDirectoryImportWindow.cs - Designer - - - BaseWindow.cs - - - ComponentsPage.cs - Designer - - - Designer - ConfigWindow.cs - - - ConnectionWindow.cs - Designer - - - ErrorAndInfoWindow.cs - Designer - - - ExternalToolsWindow.cs - Designer - - - HelpWindow.cs - Designer - - - PortScanWindow.cs - Designer - - - FrmExport.cs - Designer - - - ScreenshotManagerWindow.cs - Designer - - - SSHTransferWindow.cs - Designer - - - ConnectionTreeWindow.cs - Designer - - - UltraVNCWindow.cs - Designer - - - UpdateWindow.cs - Designer - - - - - - Designer + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - - - - - Designer - PreserveNewest + + Always - - Designer - PreserveNewest + + Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - PreserveNewest + + Always - - PreserveNewest + + Always - - PreserveNewest + + Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - Designer - PreserveNewest - - - Designer - PreserveNewest + + Always - - Designer - PreserveNewest + + Always - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - - - - - - + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + SettingsSingleFileGenerator Settings.Designer.cs - Designer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + True + + - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - References\VncSharp.dll - - - - - - - - 1.8.6.1 - - - 81.3.100 - - - 81.3.100 - - - 1.3.0 - - - 3.0.6 - - - 3.0.6 - - - 3.0.6 - - - 3.0.6 - - - 3.0.6 - - - 3.12.1 - - - 2.0.8 - - - 8.0.20 - - - 3.16.1 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - 2.9.1 - - - 4.7.0 - - - 4.7.0 - - - 4.7.0 - - - 4.5.4 - - - 4.7.1 - - - 4.7.0 - - - 3.5.21022.801 - - - - - {8C11EFA1-92C3-11D1-BC1E-00C04FA31489} - 1 - 0 - 0 - aximp - False - - - {8C11EFA1-92C3-11D1-BC1E-00C04FA31489} - 1 - 0 - 0 - tlbimp - False - - - - :: When passing paths to powershell scripts, check if the path ends with a backslash "\" -:: If it does, then the backslash may be interpreted as an escape character. Add another backslash to cancel the first one. -powershell -noprofile -command "sleep 2" - -set /p buildenv=<buildenv.tmp - -:: Manual builds, set the cert password and uncomment below. -:: IF "%25APPVEYOR_BUILD_FOLDER"=="" ( set cert_pwd= ) - -:: Call the post build powershell script -powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mremoteng.ps1" -SolutionDir "$(SolutionDir)\" -TargetDir "%25cd%25" -TargetFileName "mRemoteNG.exe" -ConfigurationName "%25buildenv%25" -CertificatePath "$(CertPath)" -CertificatePassword "$(CertPassword)" -ExcludeFromSigning "PuTTYNG.exe" - - - true - true - true - bin\Debug\ - DEBUG - 1591,660,661 - full - x86 - false - MinimumRecommendedRules.ruleset - false - - - true - true - bin\Release\ - 1591,660,661 - full - x86 - AllRules.ruleset - 1 - false - false - - - - - true - true - bin\Release Portable\ - PORTABLE - 1591,660,661 - full - x86 - false - MinimumRecommendedRules.ruleset - false - - - true - true - true - bin\Debug Portable\ - DEBUG;PORTABLE - 1591,660,661,618 - full - x86 - false - MinimumRecommendedRules.ruleset - false - Off - - - LocalIntranet - - - OnBuildSuccess - - - - - echo $(ConfigurationName) > buildenv.tmp - + + + + + + + + + + + + + \ No newline at end of file diff --git a/mRemoteNGDocumentation/_static/css/custom.css b/mRemoteNGDocumentation/_static/css/custom.css new file mode 100644 index 000000000..744bda4c0 --- /dev/null +++ b/mRemoteNGDocumentation/_static/css/custom.css @@ -0,0 +1,46 @@ + +body { + --themecolor: #4F8AFF; + color: var(--themecolor); +} + +.wy-nav-content { + max-width: none; + background-color: #E9ECEF; +} + +.wy-side-nav-search { + background-color: var(--themecolor); +} + +.wy-nav-top { + background-color: var(--themecolor); +} + +.caption-text { + color: var(--themecolor); +} + +.reference_internal { + color: var(--themecolor); +} + +a:link { + color: var(--themecolor); +} + +a:visited { + color: var(--themecolor); +} + +a:hover { + color: var(--themecolor); +} + +a:active { + color: var(--themecolor); +} + +a { + color: var(--themecolor); +} diff --git a/mRemoteNG/Documentation/command_line_switches.rst b/mRemoteNGDocumentation/command_line_switches.rst similarity index 100% rename from mRemoteNG/Documentation/command_line_switches.rst rename to mRemoteNGDocumentation/command_line_switches.rst diff --git a/mRemoteNGDocumentation/conf.py b/mRemoteNGDocumentation/conf.py new file mode 100644 index 000000000..fe88411f2 --- /dev/null +++ b/mRemoteNGDocumentation/conf.py @@ -0,0 +1,18 @@ +project = 'mRemoteNG' +copyright = '2021, The mRemoteNG Team' +author = 'The mRemoteNG Team' +language = 'en' +master_doc = 'index' +source_suffix = '.rst' +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +templates_path = ['_templates'] +htmlhelp_basename = 'mRemoteNGdoc' +html_theme = 'sphinx_rtd_theme' +html_static_path = ['_static'] +html_logo = 'logo.png'; +html_theme_options = {'logo_only': True, 'display_version': True} +html_css_files = ['css/custom.css'] +man_pages = [(master_doc, 'mremoteng', 'mRemoteNG Documentation', [author], 1)] +pygments_style = None +todo_include_todos = True +html_show_sourcelink = False \ No newline at end of file diff --git a/mRemoteNG/Documentation/contact_mail.rst b/mRemoteNGDocumentation/contact_mail.rst similarity index 100% rename from mRemoteNG/Documentation/contact_mail.rst rename to mRemoteNGDocumentation/contact_mail.rst diff --git a/mRemoteNG/Documentation/external_tools_cheat_sheet.rst b/mRemoteNGDocumentation/external_tools_cheat_sheet.rst similarity index 77% rename from mRemoteNG/Documentation/external_tools_cheat_sheet.rst rename to mRemoteNGDocumentation/external_tools_cheat_sheet.rst index 2c1743eab..ff247c20e 100644 --- a/mRemoteNG/Documentation/external_tools_cheat_sheet.rst +++ b/mRemoteNGDocumentation/external_tools_cheat_sheet.rst @@ -27,7 +27,8 @@ WinSCP is a free GUI Secure Copy program. - Filename: C:\\Program Files\\WinSCP\\WinSCP.exe (example path) - Arguments: scp://%Username%:%Password%@%Hostname%/ -- Can integrate: Unknown +- Optional Arguments - turn on compression and ignore any host key errors: -rawsetting Compression=1 -hostkey=* +- Can integrate: No `FileZilla S/FTP `_ =================================================== @@ -56,7 +57,7 @@ Google Chrome is a freeware web browser developed by Google. `Internet Explorer `_ ============================================== -Description +Standard browser included with Windows installation. - Filename: C:\\Program Files\\Internet Explorer\\iexplore.exe - Arguments: %Hostname% @@ -115,10 +116,20 @@ Create a new connection entry with the following information: - External Tool: COM Serial Port - Port: your desired COM port # here -`Windows PowerShell (ISE) `_ +`Windows PowerShell `_ ========================================================================================================================================================================= Windows PowerShell is a task-based command-line shell and scripting language designed especially for system administration. +Running with suggested argument will open a PS session connected to a host. No prompt for credintials will popup. + +- Filename: %WINDIR%\system32\WindowsPowerShell\v1.0\PowerShell.exe +- Arguments: -noexit $pw = \"%password%\" -replace '\^', ''; $password = ConvertTo-SecureString $pw -AsPlainText -Force; $Cred= New-Object System.Management.Automation.PSCredential (\"%username%\", $password); Enter-PSSession -ComputerName %hostname% -credential $Cred +- Can integrate: No + +`Windows PowerShell (ISE) `_ +========================================================================================================================================================================= +Windows PowerShell Integrated Scripting Environment (ISE) is a graphical host application that enables you to read, write, run, debug, and test scripts and modules in a graphic-assisted environment. + - Filename: %WINDIR%\\system32\\WindowsPowerShell\\v1.0\\PowerShell_ISE.exe - Arguments: args here - Can integrate: Yes diff --git a/mRemoteNG/Documentation/faq.rst b/mRemoteNGDocumentation/faq.rst similarity index 100% rename from mRemoteNG/Documentation/faq.rst rename to mRemoteNGDocumentation/faq.rst diff --git a/mRemoteNG/Documentation/folders_and_inheritance.rst b/mRemoteNGDocumentation/folders_and_inheritance.rst similarity index 100% rename from mRemoteNG/Documentation/folders_and_inheritance.rst rename to mRemoteNGDocumentation/folders_and_inheritance.rst diff --git a/mRemoteNG/Documentation/howtos/bulk_connections.rst b/mRemoteNGDocumentation/howtos/bulk_connections.rst similarity index 100% rename from mRemoteNG/Documentation/howtos/bulk_connections.rst rename to mRemoteNGDocumentation/howtos/bulk_connections.rst diff --git a/mRemoteNG/Documentation/howtos/external_tools.rst b/mRemoteNGDocumentation/howtos/external_tools.rst similarity index 100% rename from mRemoteNG/Documentation/howtos/external_tools.rst rename to mRemoteNGDocumentation/howtos/external_tools.rst diff --git a/mRemoteNG/Documentation/howtos/sshtunnel.rst b/mRemoteNGDocumentation/howtos/sshtunnel.rst similarity index 100% rename from mRemoteNG/Documentation/howtos/sshtunnel.rst rename to mRemoteNGDocumentation/howtos/sshtunnel.rst diff --git a/mRemoteNG/Documentation/howtos/vmrdp.rst b/mRemoteNGDocumentation/howtos/vmrdp.rst similarity index 100% rename from mRemoteNG/Documentation/howtos/vmrdp.rst rename to mRemoteNGDocumentation/howtos/vmrdp.rst diff --git a/mRemoteNG/Documentation/images/config_top_bar.png b/mRemoteNGDocumentation/images/config_top_bar.png similarity index 100% rename from mRemoteNG/Documentation/images/config_top_bar.png rename to mRemoteNGDocumentation/images/config_top_bar.png diff --git a/mRemoteNG/Documentation/images/connections_config.png b/mRemoteNGDocumentation/images/connections_config.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_config.png rename to mRemoteNGDocumentation/images/connections_config.png diff --git a/mRemoteNG/Documentation/images/connections_main.png b/mRemoteNGDocumentation/images/connections_main.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_main.png rename to mRemoteNGDocumentation/images/connections_main.png diff --git a/mRemoteNG/Documentation/images/connections_open.png b/mRemoteNGDocumentation/images/connections_open.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_open.png rename to mRemoteNGDocumentation/images/connections_open.png diff --git a/mRemoteNG/Documentation/images/connections_rightclick_menu.png b/mRemoteNGDocumentation/images/connections_rightclick_menu.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_rightclick_menu.png rename to mRemoteNGDocumentation/images/connections_rightclick_menu.png diff --git a/mRemoteNG/Documentation/images/connections_status.png b/mRemoteNGDocumentation/images/connections_status.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_status.png rename to mRemoteNGDocumentation/images/connections_status.png diff --git a/mRemoteNG/Documentation/images/connections_test_item.png b/mRemoteNGDocumentation/images/connections_test_item.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_test_item.png rename to mRemoteNGDocumentation/images/connections_test_item.png diff --git a/mRemoteNG/Documentation/images/connections_top_bar.png b/mRemoteNGDocumentation/images/connections_top_bar.png similarity index 100% rename from mRemoteNG/Documentation/images/connections_top_bar.png rename to mRemoteNGDocumentation/images/connections_top_bar.png diff --git a/mRemoteNG/Documentation/images/credssp-error.png b/mRemoteNGDocumentation/images/credssp-error.png similarity index 100% rename from mRemoteNG/Documentation/images/credssp-error.png rename to mRemoteNGDocumentation/images/credssp-error.png diff --git a/mRemoteNG/Documentation/images/default_properties.png b/mRemoteNGDocumentation/images/default_properties.png similarity index 100% rename from mRemoteNG/Documentation/images/default_properties.png rename to mRemoteNGDocumentation/images/default_properties.png diff --git a/mRemoteNG/Documentation/images/example_et_start_application_01.png b/mRemoteNGDocumentation/images/example_et_start_application_01.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_start_application_01.png rename to mRemoteNGDocumentation/images/example_et_start_application_01.png diff --git a/mRemoteNG/Documentation/images/example_et_start_application_02.png b/mRemoteNGDocumentation/images/example_et_start_application_02.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_start_application_02.png rename to mRemoteNGDocumentation/images/example_et_start_application_02.png diff --git a/mRemoteNG/Documentation/images/example_et_traceroute_01.png b/mRemoteNGDocumentation/images/example_et_traceroute_01.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_traceroute_01.png rename to mRemoteNGDocumentation/images/example_et_traceroute_01.png diff --git a/mRemoteNG/Documentation/images/example_et_traceroute_02.png b/mRemoteNGDocumentation/images/example_et_traceroute_02.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_traceroute_02.png rename to mRemoteNGDocumentation/images/example_et_traceroute_02.png diff --git a/mRemoteNG/Documentation/images/example_et_traceroute_03.png b/mRemoteNGDocumentation/images/example_et_traceroute_03.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_traceroute_03.png rename to mRemoteNGDocumentation/images/example_et_traceroute_03.png diff --git a/mRemoteNG/Documentation/images/example_et_traceroute_04.png b/mRemoteNGDocumentation/images/example_et_traceroute_04.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_traceroute_04.png rename to mRemoteNGDocumentation/images/example_et_traceroute_04.png diff --git a/mRemoteNG/Documentation/images/example_et_traceroute_05.png b/mRemoteNGDocumentation/images/example_et_traceroute_05.png similarity index 100% rename from mRemoteNG/Documentation/images/example_et_traceroute_05.png rename to mRemoteNGDocumentation/images/example_et_traceroute_05.png diff --git a/mRemoteNG/Documentation/images/external_tools_external_tool_properties_01.png b/mRemoteNGDocumentation/images/external_tools_external_tool_properties_01.png similarity index 100% rename from mRemoteNG/Documentation/images/external_tools_external_tool_properties_01.png rename to mRemoteNGDocumentation/images/external_tools_external_tool_properties_01.png diff --git a/mRemoteNG/Documentation/images/external_tools_main_ui_01.png b/mRemoteNGDocumentation/images/external_tools_main_ui_01.png similarity index 100% rename from mRemoteNG/Documentation/images/external_tools_main_ui_01.png rename to mRemoteNGDocumentation/images/external_tools_main_ui_01.png diff --git a/mRemoteNG/Documentation/images/external_tools_toolbar_01.png b/mRemoteNGDocumentation/images/external_tools_toolbar_01.png similarity index 100% rename from mRemoteNG/Documentation/images/external_tools_toolbar_01.png rename to mRemoteNGDocumentation/images/external_tools_toolbar_01.png diff --git a/mRemoteNG/Documentation/images/external_tools_tools_list_01.png b/mRemoteNGDocumentation/images/external_tools_tools_list_01.png similarity index 100% rename from mRemoteNG/Documentation/images/external_tools_tools_list_01.png rename to mRemoteNGDocumentation/images/external_tools_tools_list_01.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_01.png b/mRemoteNGDocumentation/images/folders_and_inheritance_01.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_01.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_01.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_02.png b/mRemoteNGDocumentation/images/folders_and_inheritance_02.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_02.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_02.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_03.png b/mRemoteNGDocumentation/images/folders_and_inheritance_03.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_03.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_03.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_04.png b/mRemoteNGDocumentation/images/folders_and_inheritance_04.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_04.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_04.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_05.png b/mRemoteNGDocumentation/images/folders_and_inheritance_05.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_05.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_05.png diff --git a/mRemoteNG/Documentation/images/folders_and_inheritance_06.png b/mRemoteNGDocumentation/images/folders_and_inheritance_06.png similarity index 100% rename from mRemoteNG/Documentation/images/folders_and_inheritance_06.png rename to mRemoteNGDocumentation/images/folders_and_inheritance_06.png diff --git a/mRemoteNG/Documentation/images/import_export_dialog.png b/mRemoteNGDocumentation/images/import_export_dialog.png similarity index 100% rename from mRemoteNG/Documentation/images/import_export_dialog.png rename to mRemoteNGDocumentation/images/import_export_dialog.png diff --git a/mRemoteNG/Documentation/images/import_from_active_directory.png b/mRemoteNGDocumentation/images/import_from_active_directory.png similarity index 100% rename from mRemoteNG/Documentation/images/import_from_active_directory.png rename to mRemoteNGDocumentation/images/import_from_active_directory.png diff --git a/mRemoteNG/Documentation/images/import_from_port_scan.png b/mRemoteNGDocumentation/images/import_from_port_scan.png similarity index 100% rename from mRemoteNG/Documentation/images/import_from_port_scan.png rename to mRemoteNGDocumentation/images/import_from_port_scan.png diff --git a/mRemoteNG/Documentation/images/menus_hide_menu_strip.png b/mRemoteNGDocumentation/images/menus_hide_menu_strip.png similarity index 100% rename from mRemoteNG/Documentation/images/menus_hide_menu_strip.png rename to mRemoteNGDocumentation/images/menus_hide_menu_strip.png diff --git a/mRemoteNG/Documentation/images/menus_main_menu.png b/mRemoteNGDocumentation/images/menus_main_menu.png similarity index 100% rename from mRemoteNG/Documentation/images/menus_main_menu.png rename to mRemoteNGDocumentation/images/menus_main_menu.png diff --git a/mRemoteNG/Documentation/images/mremoteng_favicon_32.png b/mRemoteNGDocumentation/images/mremoteng_favicon_32.png similarity index 100% rename from mRemoteNG/Documentation/images/mremoteng_favicon_32.png rename to mRemoteNGDocumentation/images/mremoteng_favicon_32.png diff --git a/mRemoteNG/Documentation/images/mremoteng_logo.png b/mRemoteNGDocumentation/images/mremoteng_logo.png similarity index 100% rename from mRemoteNG/Documentation/images/mremoteng_logo.png rename to mRemoteNGDocumentation/images/mremoteng_logo.png diff --git a/mRemoteNG/Documentation/images/mremoteng_main_ui.png b/mRemoteNGDocumentation/images/mremoteng_main_ui.png similarity index 100% rename from mRemoteNG/Documentation/images/mremoteng_main_ui.png rename to mRemoteNGDocumentation/images/mremoteng_main_ui.png diff --git a/mRemoteNG/Documentation/images/mremoteng_main_ui_connect_win_server.png b/mRemoteNGDocumentation/images/mremoteng_main_ui_connect_win_server.png similarity index 100% rename from mRemoteNG/Documentation/images/mremoteng_main_ui_connect_win_server.png rename to mRemoteNGDocumentation/images/mremoteng_main_ui_connect_win_server.png diff --git a/mRemoteNG/Documentation/images/notifications_panel.png b/mRemoteNGDocumentation/images/notifications_panel.png similarity index 100% rename from mRemoteNG/Documentation/images/notifications_panel.png rename to mRemoteNGDocumentation/images/notifications_panel.png diff --git a/mRemoteNG/Documentation/images/notifications_popup.png b/mRemoteNGDocumentation/images/notifications_popup.png similarity index 100% rename from mRemoteNG/Documentation/images/notifications_popup.png rename to mRemoteNGDocumentation/images/notifications_popup.png diff --git a/mRemoteNG/Documentation/images/oracle_remediation_setting.png b/mRemoteNGDocumentation/images/oracle_remediation_setting.png similarity index 100% rename from mRemoteNG/Documentation/images/oracle_remediation_setting.png rename to mRemoteNGDocumentation/images/oracle_remediation_setting.png diff --git a/mRemoteNG/Documentation/images/putty.png b/mRemoteNGDocumentation/images/putty.png similarity index 100% rename from mRemoteNG/Documentation/images/putty.png rename to mRemoteNGDocumentation/images/putty.png diff --git a/mRemoteNG/Documentation/images/quick_connect_01.png b/mRemoteNGDocumentation/images/quick_connect_01.png similarity index 100% rename from mRemoteNG/Documentation/images/quick_connect_01.png rename to mRemoteNGDocumentation/images/quick_connect_01.png diff --git a/mRemoteNG/Documentation/images/quick_connect_02.png b/mRemoteNGDocumentation/images/quick_connect_02.png similarity index 100% rename from mRemoteNG/Documentation/images/quick_connect_02.png rename to mRemoteNGDocumentation/images/quick_connect_02.png diff --git a/mRemoteNG/Documentation/images/quick_connect_03.png b/mRemoteNGDocumentation/images/quick_connect_03.png similarity index 100% rename from mRemoteNG/Documentation/images/quick_connect_03.png rename to mRemoteNGDocumentation/images/quick_connect_03.png diff --git a/mRemoteNG/Documentation/images/screenshot_manager_overview.png b/mRemoteNGDocumentation/images/screenshot_manager_overview.png similarity index 100% rename from mRemoteNG/Documentation/images/screenshot_manager_overview.png rename to mRemoteNGDocumentation/images/screenshot_manager_overview.png diff --git a/mRemoteNG/Documentation/images/screenshot_manager_rightclick_menu.png b/mRemoteNGDocumentation/images/screenshot_manager_rightclick_menu.png similarity index 100% rename from mRemoteNG/Documentation/images/screenshot_manager_rightclick_menu.png rename to mRemoteNGDocumentation/images/screenshot_manager_rightclick_menu.png diff --git a/mRemoteNG/Documentation/images/ssh_file_transfer_01.png b/mRemoteNGDocumentation/images/ssh_file_transfer_01.png similarity index 100% rename from mRemoteNG/Documentation/images/ssh_file_transfer_01.png rename to mRemoteNGDocumentation/images/ssh_file_transfer_01.png diff --git a/mRemoteNG/Documentation/images/ssh_tunnel.png b/mRemoteNGDocumentation/images/ssh_tunnel.png similarity index 100% rename from mRemoteNG/Documentation/images/ssh_tunnel.png rename to mRemoteNGDocumentation/images/ssh_tunnel.png diff --git a/mRemoteNG/Documentation/images/user_interface_overview.png b/mRemoteNGDocumentation/images/user_interface_overview.png similarity index 100% rename from mRemoteNG/Documentation/images/user_interface_overview.png rename to mRemoteNGDocumentation/images/user_interface_overview.png diff --git a/mRemoteNG/Documentation/images/user_interface_panels_01.png b/mRemoteNGDocumentation/images/user_interface_panels_01.png similarity index 100% rename from mRemoteNG/Documentation/images/user_interface_panels_01.png rename to mRemoteNGDocumentation/images/user_interface_panels_01.png diff --git a/mRemoteNG/Documentation/images/user_interface_panels_02.png b/mRemoteNGDocumentation/images/user_interface_panels_02.png similarity index 100% rename from mRemoteNG/Documentation/images/user_interface_panels_02.png rename to mRemoteNGDocumentation/images/user_interface_panels_02.png diff --git a/mRemoteNG/Documentation/images/user_interface_panels_03.png b/mRemoteNGDocumentation/images/user_interface_panels_03.png similarity index 100% rename from mRemoteNG/Documentation/images/user_interface_panels_03.png rename to mRemoteNGDocumentation/images/user_interface_panels_03.png diff --git a/mRemoteNG/Documentation/index.rst b/mRemoteNGDocumentation/index.rst similarity index 100% rename from mRemoteNG/Documentation/index.rst rename to mRemoteNGDocumentation/index.rst diff --git a/mRemoteNG/Documentation/keyboard_shortcuts.rst b/mRemoteNGDocumentation/keyboard_shortcuts.rst similarity index 100% rename from mRemoteNG/Documentation/keyboard_shortcuts.rst rename to mRemoteNGDocumentation/keyboard_shortcuts.rst diff --git a/mRemoteNG/Documentation/known_issues.rst b/mRemoteNGDocumentation/known_issues.rst similarity index 100% rename from mRemoteNG/Documentation/known_issues.rst rename to mRemoteNGDocumentation/known_issues.rst diff --git a/mRemoteNGDocumentation/logo.png b/mRemoteNGDocumentation/logo.png new file mode 100644 index 000000000..ed53ce97a Binary files /dev/null and b/mRemoteNGDocumentation/logo.png differ diff --git a/mRemoteNG/Documentation/migrate.rst b/mRemoteNGDocumentation/migrate.rst similarity index 100% rename from mRemoteNG/Documentation/migrate.rst rename to mRemoteNGDocumentation/migrate.rst diff --git a/mRemoteNG/Documentation/mssql_db_setup.sql b/mRemoteNGDocumentation/mssql_db_setup.sql similarity index 100% rename from mRemoteNG/Documentation/mssql_db_setup.sql rename to mRemoteNGDocumentation/mssql_db_setup.sql diff --git a/mRemoteNG/Documentation/mysql_db_setup.sql b/mRemoteNGDocumentation/mysql_db_setup.sql similarity index 100% rename from mRemoteNG/Documentation/mysql_db_setup.sql rename to mRemoteNGDocumentation/mysql_db_setup.sql diff --git a/mRemoteNG/Documentation/protocols.rst b/mRemoteNGDocumentation/protocols.rst similarity index 100% rename from mRemoteNG/Documentation/protocols.rst rename to mRemoteNGDocumentation/protocols.rst diff --git a/mRemoteNG/Documentation/protocols/rdp.rst b/mRemoteNGDocumentation/protocols/rdp.rst similarity index 100% rename from mRemoteNG/Documentation/protocols/rdp.rst rename to mRemoteNGDocumentation/protocols/rdp.rst diff --git a/mRemoteNGDocumentation/requirements.txt b/mRemoteNGDocumentation/requirements.txt new file mode 100644 index 000000000..e69de29bb diff --git a/mRemoteNG/Documentation/sql_configuration.rst b/mRemoteNGDocumentation/sql_configuration.rst similarity index 100% rename from mRemoteNG/Documentation/sql_configuration.rst rename to mRemoteNGDocumentation/sql_configuration.rst diff --git a/mRemoteNG/Documentation/troubleshooting.rst b/mRemoteNGDocumentation/troubleshooting.rst similarity index 100% rename from mRemoteNG/Documentation/troubleshooting.rst rename to mRemoteNGDocumentation/troubleshooting.rst diff --git a/mRemoteNG/Documentation/user_interface.rst b/mRemoteNGDocumentation/user_interface.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface.rst rename to mRemoteNGDocumentation/user_interface.rst diff --git a/mRemoteNG/Documentation/user_interface/connections.rst b/mRemoteNGDocumentation/user_interface/connections.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/connections.rst rename to mRemoteNGDocumentation/user_interface/connections.rst diff --git a/mRemoteNG/Documentation/user_interface/default_connection_properties.rst b/mRemoteNGDocumentation/user_interface/default_connection_properties.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/default_connection_properties.rst rename to mRemoteNGDocumentation/user_interface/default_connection_properties.rst diff --git a/mRemoteNG/Documentation/user_interface/external_tools.rst b/mRemoteNGDocumentation/user_interface/external_tools.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/external_tools.rst rename to mRemoteNGDocumentation/user_interface/external_tools.rst diff --git a/mRemoteNG/Documentation/user_interface/import_export.rst b/mRemoteNGDocumentation/user_interface/import_export.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/import_export.rst rename to mRemoteNGDocumentation/user_interface/import_export.rst diff --git a/mRemoteNG/Documentation/user_interface/main_window.rst b/mRemoteNGDocumentation/user_interface/main_window.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/main_window.rst rename to mRemoteNGDocumentation/user_interface/main_window.rst diff --git a/mRemoteNG/Documentation/user_interface/menu_container.rst b/mRemoteNGDocumentation/user_interface/menu_container.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/menu_container.rst rename to mRemoteNGDocumentation/user_interface/menu_container.rst diff --git a/mRemoteNG/Documentation/user_interface/notifications.rst b/mRemoteNGDocumentation/user_interface/notifications.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/notifications.rst rename to mRemoteNGDocumentation/user_interface/notifications.rst diff --git a/mRemoteNG/Documentation/user_interface/options.rst b/mRemoteNGDocumentation/user_interface/options.rst similarity index 88% rename from mRemoteNG/Documentation/user_interface/options.rst rename to mRemoteNGDocumentation/user_interface/options.rst index 89c28ba86..d1861eb78 100644 --- a/mRemoteNG/Documentation/user_interface/options.rst +++ b/mRemoteNGDocumentation/user_interface/options.rst @@ -18,9 +18,6 @@ Options below are for the various settings for Startup/Exit of mRemoteNG. * - Option - Default - Description - * - Save connection on exit - - On - - Save to connection file/database on exit of mRemoteNG * - Reconnect to previously opened sessions on startup - Off - This option will allow you to open the connection from which you where connected to after last exit of application @@ -109,32 +106,46 @@ Connections * - Set hostname like display name when creating or renaming connections - Off - Will make mRemoteNG try to use the remote host hostname to set the title of the tab in mRemoteNG. - * - Save connections after every exit - - On - - When active mRemoteNG will save the connection tree to the active config after every exit. If inactive then you have to save using **File > Save Connection File** or keyboard shortcut Ctrl+S * - Filter search matches in connection tree - Off - Allows you to filter out the connections to which does not match your filter search in the connection tree. If not active the search will only select the filter to which you do search. * - RDP Reconnect count - 5 - - Value in seconds + - Value in seconds * - RDP Connection Timeout - 20 - - Value in seconds + - Value in seconds * - Auto save time in minutes (0 means disabled) - 0 - Value in minutes - * - When closing connections - - Warn me when closing connections + * - When closing connections Warn me... + - ... when any connection closes - Various options of how mRemoteNG should act when you close connections. The different options are listed below: :: - - Warn me when closing connections - - Warn me only when closing multiple connections - - Warn me only when exiting mRemoteNG - - Do not warn me when closing connections + - ... when any connection closes + - ... when closing multiple connections + - ... only when exiting mRemoteNG + - ... never By default a warning will come up on closing a connection. Change this value based on your prefered settings. + * - Connection Backup Frequency + - On Edit + - Various options of when mRemoteNG should create a backup of the connections file. The different options are listed below: + :: + - Never backup connections + - On Edit + - On Exit + - Daily + - Weekly + By default a backup will be saved every time the connections are edited. Change this value based on your prefered settings. + * - Maximum number of backups + - 10 + - Number of backup copies of the connection file to keep. + * - Location of backup files + - (blank) + - Full path of backup copies of the connection files. + Credentials =========== Options for credentials in mRemoteNG. The main purpose here is that when you have empty username, password or domain field then use below information. diff --git a/mRemoteNG/Documentation/user_interface/panels.rst b/mRemoteNGDocumentation/user_interface/panels.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/panels.rst rename to mRemoteNGDocumentation/user_interface/panels.rst diff --git a/mRemoteNG/Documentation/user_interface/port_scan.rst b/mRemoteNGDocumentation/user_interface/port_scan.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/port_scan.rst rename to mRemoteNGDocumentation/user_interface/port_scan.rst diff --git a/mRemoteNG/Documentation/user_interface/quick_connect.rst b/mRemoteNGDocumentation/user_interface/quick_connect.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/quick_connect.rst rename to mRemoteNGDocumentation/user_interface/quick_connect.rst diff --git a/mRemoteNG/Documentation/user_interface/screenshot_manager.rst b/mRemoteNGDocumentation/user_interface/screenshot_manager.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/screenshot_manager.rst rename to mRemoteNGDocumentation/user_interface/screenshot_manager.rst diff --git a/mRemoteNG/Documentation/user_interface/ssh_file_transfer.rst b/mRemoteNGDocumentation/user_interface/ssh_file_transfer.rst similarity index 100% rename from mRemoteNG/Documentation/user_interface/ssh_file_transfer.rst rename to mRemoteNGDocumentation/user_interface/ssh_file_transfer.rst diff --git a/mRemoteNGInstaller/CustomActions/CustomActions.csproj b/mRemoteNGInstaller/CustomActions/CustomActions.csproj index 929e60713..9bd8f6f4f 100644 --- a/mRemoteNGInstaller/CustomActions/CustomActions.csproj +++ b/mRemoteNGInstaller/CustomActions/CustomActions.csproj @@ -38,6 +38,78 @@ + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + + true + bin\x86\Debug Portable\ + DEBUG;TRACE + full + AnyCPU + 7.3 + prompt + + + true + bin\x64\Debug Portable\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + + + bin\x86\Release Portable\ + TRACE + true + pdbonly + AnyCPU + 7.3 + prompt + + + bin\x64\Release Portable\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + + bin\x86\Release Installer\ + TRACE + true + pdbonly + AnyCPU + 7.3 + prompt + + + bin\x64\Release Installer\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs index 8f0cd7340..f4af9e962 100644 --- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs +++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs @@ -2,7 +2,6 @@ - @@ -10,23 +9,21 @@ - - - + + - @@ -39,106 +36,45 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - - - - - - - - - @@ -148,18 +84,30 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -170,19 +118,28 @@ - - + + + + + - - + + + + + + + + @@ -197,24 +154,36 @@ - - + + + + + - - + + + + + + + + + + + @@ -227,12 +196,15 @@ + + + + + + - - - @@ -242,12 +214,18 @@ + + + + + + @@ -257,15 +235,12 @@ + + + - - - - - - @@ -287,705 +262,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -998,6 +280,9 @@ + + + @@ -1046,6 +331,9 @@ + + + @@ -1100,165 +388,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1277,28 +406,513 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1314,12 +928,6 @@ - - - - - - @@ -1347,133 +955,118 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/mRemoteNGInstaller/Installer/Fragments/MiscTextFilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/MiscTextFilesFragment.wxs index eaebb0547..a79c928f3 100644 --- a/mRemoteNGInstaller/Installer/Fragments/MiscTextFilesFragment.wxs +++ b/mRemoteNGInstaller/Installer/Fragments/MiscTextFilesFragment.wxs @@ -14,9 +14,6 @@ - - - \ No newline at end of file diff --git a/mRemoteNGInstaller/Installer/Installer.wixproj b/mRemoteNGInstaller/Installer/Installer.wixproj index f9203e6a1..b8ba58ac5 100644 --- a/mRemoteNGInstaller/Installer/Installer.wixproj +++ b/mRemoteNGInstaller/Installer/Installer.wixproj @@ -72,16 +72,6 @@ WixNetFxExtension - - - mRemoteNG - {4934a491-40bc-4e5b-9166-ea1169a220f6} - True - True - Binaries;Content;Satellites - INSTALLFOLDER - - + \ No newline at end of file diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs index 39ad1cc14..3258164c4 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs @@ -78,6 +78,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv Hostname = "SomeHostname", PuttySession = "SomePuttySession", LoadBalanceInfo = "SomeLoadBalanceInfo", + OpeningCommand = "SomeOpeningCommand", PreExtApp = "SomePreExtApp", PostExtApp = "SomePostExtApp", MacAddress = "SomeMacAddress", @@ -98,7 +99,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Csv UseCredSsp = true, UseVmId = false, UseEnhancedMode = false, - RenderingEngine = HTTPBase.RenderingEngine.CEF, + RenderingEngine = HTTPBase.RenderingEngine.EdgeChromium, RDPAuthenticationLevel = AuthenticationLevel.WarnOnFailedAuth, Colors = RDPColors.Colors16Bit, Resolution = RDPResolutions.Res1366x768, diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs index ce6c6d787..79464a1ea 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs @@ -83,7 +83,8 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml ""; #endif var path = Path.GetDirectoryName(sourceFilePath); - var filePath = $@"{path}\..\..\..\..\bin\{debugOrRelease}{normalOrPortable}\Schemas\{fileName}"; + var filePath = $@"{path}\..\..\..\..\..\mRemoteNG\bin\{debugOrRelease}{normalOrPortable}\Schemas\{fileName}"; + return filePath; } diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs index 471d74151..7f4934526 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs @@ -55,7 +55,7 @@ namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml [TestCase("Username", "")] [TestCase("Domain", "")] [TestCase("Password", "")] - [TestCase("InheritAutomaticResize", "false")] + [TestCase("InheritAutomaticResize", null)] public void SerializerRespectsSaveFilterSettings(string attributeName, string expectedValue) { var connectionNodeSerializer = new XmlConnectionNodeSerializer27( diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs index c2cdd2767..dd6ce29e2 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs @@ -1,5 +1,4 @@ using System.Linq; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs index fa633a517..08b8af72c 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs @@ -1,5 +1,4 @@ using System.Linq; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs index b5d6726d3..d095ce914 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Tree; using mRemoteNGTests.Properties; @@ -32,7 +31,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers private const bool ExpectedPortRedirection = true; private const bool ExpectedPrinterRedirection = true; private const RDPSounds ExpectedSoundRedirection = RDPSounds.BringToThisComputer; - + private const string ExpectedStartProgram = "alternate shell"; [OneTimeSetUp] public void OnetimeSetup() @@ -175,6 +174,13 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers Assert.That(connectionInfo.LoadBalanceInfo, Is.EqualTo(ExpectedLoadBalanceInfo)); } + [Test] + public void StartProgramImportedCorrectly() + { + var connectionInfo = _connectionTreeModel.RootNodes.First().Children.First(); + Assert.That(connectionInfo.StartProgram, Is.EqualTo(ExpectedStartProgram)); + } + //[Test] //public void GatewayHostnameImportedCorrectly() //{ diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs index 7486e1ec6..8e88ad5d5 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; @@ -39,7 +38,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers private const bool ExpectedPortRedirection = true; private const bool ExpectedPrinterRedirection = true; private const AuthenticationLevel ExpectedAuthLevel = AuthenticationLevel.WarnOnFailedAuth; - + private const string ExpectedStartProgram = "alternate shell"; [OneTimeSetUp] public void OnetimeSetup() @@ -165,6 +164,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers new TestCaseData((Func)(con => con.RedirectPrinters), ExpectedPrinterRedirection).SetName(nameof(ConnectionInfo.RedirectPrinters)), new TestCaseData((Func)(con => con.RedirectPorts), ExpectedPortRedirection).SetName(nameof(ConnectionInfo.RedirectPorts)), new TestCaseData((Func)(con => con.RedirectDiskDrives), ExpectedDriveRedirection).SetName(nameof(ConnectionInfo.RedirectDiskDrives)), + new TestCaseData((Func)(con => con.StartProgram), ExpectedStartProgram).SetName(nameof(ConnectionInfo.StartProgram)), }; } diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs index 41ea17fd1..3ce220204 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs @@ -1,6 +1,5 @@ using System.IO; using System.Linq; -using mRemoteNG.Config.Serializers; using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; @@ -38,7 +37,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers private const bool ExpectedPortRedirection = true; private const bool ExpectedPrinterRedirection = true; private const AuthenticationLevel ExpectedAuthLevel = AuthenticationLevel.AuthRequired; - + private const string ExpectedStartProgram = "alternate shell"; [OneTimeSetUp] public void OnetimeSetup() @@ -323,5 +322,15 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers var badFileContents = Resources.test_rdcman_noversion; Assert.That(() => _deserializer.Deserialize(badFileContents), Throws.TypeOf()); } + + [Test] + public void StartProgramImported() + { + var rootNode = _connectionTreeModel.RootNodes.First(); + var importedRdcmanRootNode = rootNode.Children.OfType().First(); + var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); + var connection = group1.Children.First(); + Assert.That(connection.StartProgram, Is.EqualTo(ExpectedStartProgram)); + } } } \ No newline at end of file diff --git a/mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs b/mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs index cca547e07..577d4d1a6 100644 --- a/mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs +++ b/mRemoteNGTests/Connection/AbstractConnectionInfoDataTests.cs @@ -173,7 +173,7 @@ namespace mRemoteNGTests.Connection { var wasCalled = false; _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true; - _testAbstractConnectionInfoData.RenderingEngine = HTTPBase.RenderingEngine.CEF; + _testAbstractConnectionInfoData.RenderingEngine = HTTPBase.RenderingEngine.EdgeChromium; Assert.That(wasCalled, Is.True); } @@ -366,6 +366,15 @@ namespace mRemoteNGTests.Connection Assert.That(wasCalled, Is.True); } + [Test] + public void OpeningCommandNotifiesOnValueChange() + { + var wasCalled = false; + _testAbstractConnectionInfoData.PropertyChanged += (sender, args) => wasCalled = true; + _testAbstractConnectionInfoData.OpeningCommand = "a"; + Assert.That(wasCalled, Is.True); + } + [Test] public void PreExtAppNotifiesOnValueChange() { diff --git a/mRemoteNGTests/ListViewTester.cs b/mRemoteNGTests/ListViewTester.cs index 5160fa97e..e82265a80 100644 --- a/mRemoteNGTests/ListViewTester.cs +++ b/mRemoteNGTests/ListViewTester.cs @@ -32,9 +32,12 @@ //Contributed by: Ian Cooper +using System; using System.Collections; +using System.Linq; +using System.Reflection; using System.Windows.Forms; -using NUnit.Extensions.Forms; +using mRemoteNGTests.TestHelpers; namespace mRemoteNGTests { @@ -44,8 +47,11 @@ namespace mRemoteNGTests /// /// It includes helper methods for selecting items from the list /// and for clearing those selections. - public class ListViewTester : ControlTester + public class ListViewTester { + private readonly string _name; + private readonly Form _form; + /// /// Creates a ControlTester from the control name and the form instance. /// @@ -56,66 +62,9 @@ namespace mRemoteNGTests /// The Control name. /// The Form instance. public ListViewTester(string name, Form form) - : base(name, form) { - } - - /// - /// Creates a ControlTester from the control name and the form name. - /// - /// - /// It is best to use the overloaded Constructor that requires just the name - /// parameter if possible. - /// - /// The Control name. - /// The Form name.. - public ListViewTester(string name, string formName) - : base(name, formName) - { - } - - /// - /// Creates a ControlTester from the control name. - /// - /// - /// This is the best constructor. - /// The Control name. - public ListViewTester(string name) - : base(name) - { - } - - /// - /// Creates a ControlTester from a ControlTester and an index where the - /// original tester's name is not unique. - /// - /// - /// It is best to use the overloaded Constructor that requires just the name - /// parameter if possible. - /// - /// The ControlTester. - /// The index to test. - public ListViewTester(ControlTester tester, int index) - : base(tester, index) - { - } - - /// - /// Allows you to find a ListViewTester by index where the name is not unique. - /// - /// - /// This was added to support the ability to find controls where their name is - /// not unique. If all of your controls are uniquely named (I recommend this) then - /// you will not need this. - /// - /// The ControlTester at the specified index. - /// The index of the ListViewTester. - public new ListViewTester this[int index] - { - get - { - return new ListViewTester(this, index); - } + _name = name; + _form = form; } /// @@ -125,35 +74,17 @@ namespace mRemoteNGTests /// Allows typed access to all of the properties of the underlying control. /// /// The underlying control. - public ListView Properties - { - get - { - return (ListView)Control; - } - } + public ListView Properties => _form.FindControl(_name); /// /// Helper method to return the List View's Items property /// - public ListView.ListViewItemCollection Items - { - get - { - return Properties.Items; - } - } + public ListView.ListViewItemCollection Items => Properties.Items; /// /// Helper method to return the columns of the list view /// - public ListView.ColumnHeaderCollection Columns - { - get - { - return Properties.Columns; - } - } + public ListView.ColumnHeaderCollection Columns => Properties.Columns; /// /// Clears the selections from the list box. @@ -173,9 +104,17 @@ namespace mRemoteNGTests public void Select(int i) { Properties.Items[i].Selected = true; + FireEvent("ItemActivate"); } + private void FireEvent(string eventName) + { + var ctrl = Properties; + MethodInfo method = typeof(ListView).GetMethod("On" + eventName, BindingFlags.Instance | BindingFlags.NonPublic); + method.Invoke(ctrl, new object[] { EventArgs.Empty }); + } + /// /// Selects an item in the list according to its string value. /// diff --git a/mRemoteNGTests/NUnitExtensions/SecureTextBoxTester.cs b/mRemoteNGTests/NUnitExtensions/SecureTextBoxTester.cs deleted file mode 100644 index 93e6cf9cb..000000000 --- a/mRemoteNGTests/NUnitExtensions/SecureTextBoxTester.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Windows.Forms; -using mRemoteNG.UI.Controls; -using NUnit.Extensions.Forms; - - -namespace mRemoteNGTests.NUnitExtensions -{ - public class SecureTextBoxTester : ControlTester - { - public SecureTextBoxTester(string name, string formName) : base(name, formName) - { - } - - public SecureTextBoxTester(string name, Form form) : base(name, form) - { - } - - public SecureTextBoxTester(string name) : base(name) - { - } - - public SecureTextBoxTester(ControlTester tester, int index) : base(tester, index) - { - } - - public SecureTextBox Properties => (SecureTextBox) Control; - } -} \ No newline at end of file diff --git a/mRemoteNGTests/Properties/AssemblyInfo.cs b/mRemoteNGTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 40f8c4570..000000000 --- a/mRemoteNGTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("mRemoteNGTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("mRemoteNGTests")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4e9583d3-2b1b-419d-bda5-f06e70e03b50")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/mRemoteNGTests/Properties/Resources.Designer.cs b/mRemoteNGTests/Properties/Resources.Designer.cs index 78299efd7..b932e291d 100644 --- a/mRemoteNGTests/Properties/Resources.Designer.cs +++ b/mRemoteNGTests/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace mRemoteNGTests.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/mRemoteNGTests/Properties/Resources.resx b/mRemoteNGTests/Properties/Resources.resx index af1fa4ec5..e35a04652 100644 --- a/mRemoteNGTests/Properties/Resources.resx +++ b/mRemoteNGTests/Properties/Resources.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ..\Resources\beta-update.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 @@ -155,7 +155,7 @@ ..\Resources\dev-update-portable.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\Resources\TestImage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\resources\testimage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\test_puttyConnectionManager_database.dat;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16 diff --git a/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg b/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg index 74986a401..b3ea94b17 100644 --- a/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg +++ b/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg @@ -38,7 +38,7 @@ True - + alternate shell 9933 diff --git a/mRemoteNGTests/Resources/test_rdcman_v2_7_schema3.rdg b/mRemoteNGTests/Resources/test_rdcman_v2_7_schema3.rdg index 3c66d7c5b..04de05ef3 100644 --- a/mRemoteNGTests/Resources/test_rdcman_v2_7_schema3.rdg +++ b/mRemoteNGTests/Resources/test_rdcman_v2_7_schema3.rdg @@ -38,7 +38,7 @@ True - + alternate shell 9933 diff --git a/mRemoteNGTests/Resources/test_remotedesktopconnection.rdp b/mRemoteNGTests/Resources/test_remotedesktopconnection.rdp index 237a6ba8d..87e082692 100644 Binary files a/mRemoteNGTests/Resources/test_remotedesktopconnection.rdp and b/mRemoteNGTests/Resources/test_remotedesktopconnection.rdp differ diff --git a/mRemoteNGTests/TestHelpers/FormExtensions.cs b/mRemoteNGTests/TestHelpers/FormExtensions.cs new file mode 100644 index 000000000..b07e5470e --- /dev/null +++ b/mRemoteNGTests/TestHelpers/FormExtensions.cs @@ -0,0 +1,20 @@ +using System.Linq; +using System.Windows.Forms; + +namespace mRemoteNGTests.TestHelpers +{ + public static class FormExtensions + { + /// + /// Finds a control with the specified name on a form. + /// + /// The type of control to find. + /// The form. + /// The name of the control to find. + /// The control or null if not found or the wrong type. + public static T FindControl(this Form form, string name) where T : Control + { + return form.Controls.Find(name, true).SingleOrDefault() as T; + } + } +} \ No newline at end of file diff --git a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs index 9923f5d91..9d8b94788 100644 --- a/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs +++ b/mRemoteNGTests/TestHelpers/SerializableConnectionInfoAllPropertiesOfType.cs @@ -72,5 +72,7 @@ public TType UseEnhancedMode { get; set; } public TType SSHOptions { get; set; } public TType SSHTunnelConnectionName { get; set; } - } + public TType StartProgram { get; set; } + public TType OpeningCommand { get; set; } + } } diff --git a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs index d7e53e9f6..0ef112c19 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs @@ -1,9 +1,7 @@ using System; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs index c9bec4ff1..846911a58 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs @@ -1,7 +1,6 @@ using System; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs index abc5a9fcc..df105fb17 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs @@ -1,7 +1,6 @@ using System; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs index c9036462c..7937908c0 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs @@ -1,6 +1,5 @@ using System; using mRemoteNG.Connection; -using mRemoteNG.Tree; using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ConnectionTreeTests.cs b/mRemoteNGTests/Tree/ConnectionTreeTests.cs index 12815b774..f2ac8a7c0 100644 --- a/mRemoteNGTests/Tree/ConnectionTreeTests.cs +++ b/mRemoteNGTests/Tree/ConnectionTreeTests.cs @@ -2,7 +2,6 @@ using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs b/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs index 3b4f9622e..8bc71aee4 100644 --- a/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs +++ b/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs @@ -2,7 +2,6 @@ using mRemoteNG.Connection; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs b/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs index eada0ed76..a096df5a0 100644 --- a/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs +++ b/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs @@ -3,7 +3,6 @@ using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs b/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs index e071bf794..b91194d5c 100644 --- a/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs +++ b/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs @@ -5,7 +5,6 @@ using mRemoteNG.Container; using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using mRemoteNG.UI.Controls; using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/UI/Controls/SecureTextBoxTests.cs b/mRemoteNGTests/UI/Controls/SecureTextBoxTests.cs index b3d5da7da..3a04c7df2 100644 --- a/mRemoteNGTests/UI/Controls/SecureTextBoxTests.cs +++ b/mRemoteNGTests/UI/Controls/SecureTextBoxTests.cs @@ -1,9 +1,10 @@ -using mRemoteNG.Security; -using mRemoteNGTests.NUnitExtensions; +using System.Threading; +using mRemoteNG.Security; using NUnit.Framework; namespace mRemoteNGTests.UI.Controls { + [Apartment(ApartmentState.STA)] public class SecureTextBoxTests { private SecureTextBoxTestForm _testForm; @@ -26,10 +27,10 @@ namespace mRemoteNGTests.UI.Controls [Test] public void TextboxInputGetsAddedToSecureString() { - var textBox = new SecureTextBoxTester(_testForm.secureTextBox1.Name); + var textBox = _testForm.secureTextBox1; const string textToSend = "abc123"; - textBox.Properties.Text = textToSend; - Assert.That(textBox.Properties.SecString.ConvertToUnsecureString(), Is.EqualTo(textToSend)); + textBox.Text = textToSend; + Assert.That(textBox.SecString.ConvertToUnsecureString(), Is.EqualTo(textToSend)); } } } \ No newline at end of file diff --git a/mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs b/mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs index 61ee3a26d..96ca6fa02 100644 --- a/mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs +++ b/mRemoteNGTests/UI/Controls/TextBoxExtensionsTests.cs @@ -1,11 +1,11 @@ -using mRemoteNG.UI; -using mRemoteNG.UI.Controls; -using NUnit.Extensions.Forms; +using System.Threading; +using mRemoteNG.UI; using NUnit.Framework; namespace mRemoteNGTests.UI.Controls { [TestFixture] + [Apartment(ApartmentState.STA)] public class TextBoxExtensionsTests { private TextBoxExtensionsTestForm _textBoxExtensionsTestForm; @@ -30,17 +30,17 @@ namespace mRemoteNGTests.UI.Controls public void SetCueBannerSetsTheBannerText() { const string text = "Type Here"; - var textBox = new TextBoxTester(_textBoxExtensionsTestForm.textBox1.Name); - Assert.That(textBox.Properties.SetCueBannerText(text), Is.True); + var textBox = _textBoxExtensionsTestForm.textBox1; + Assert.That(textBox.SetCueBannerText(text), Is.True); } [Test] public void GetCueBannerReturnsCorrectValue() { const string text = "Type Here"; - var textBox = new TextBoxTester(_textBoxExtensionsTestForm.textBox1.Name); - textBox.Properties.SetCueBannerText(text); - Assert.That(textBox.Properties.GetCueBannerText(), Is.EqualTo(text)); + var textBox = _textBoxExtensionsTestForm.textBox1; + textBox.SetCueBannerText(text); + Assert.That(textBox.GetCueBannerText(), Is.EqualTo(text)); } } } \ No newline at end of file diff --git a/mRemoteNGTests/UI/Forms/OptionsFormTests.cs b/mRemoteNGTests/UI/Forms/OptionsFormTests.cs index 3dc7a89ea..297503ad8 100644 --- a/mRemoteNGTests/UI/Forms/OptionsFormTests.cs +++ b/mRemoteNGTests/UI/Forms/OptionsFormTests.cs @@ -1,17 +1,12 @@ -using mRemoteNG.App; -using mRemoteNG.Controls; -using mRemoteNG.Forms; -using mRemoteNG.Messages; -using mRemoteNG.UI.Window; -using NUnit.Extensions.Forms; -using NUnit.Framework; -using System; +using NUnit.Framework; using System.Threading; -using WeifenLuo.WinFormsUI.Docking; +using System.Windows.Forms; +using mRemoteNGTests.TestHelpers; namespace mRemoteNGTests.UI.Forms { [TestFixture] + [Apartment(ApartmentState.STA)] public class OptionsFormTests : OptionsFormSetupAndTeardown { [Test] @@ -19,26 +14,24 @@ namespace mRemoteNGTests.UI.Forms { bool eventFired = false; _optionsForm.FormClosed += (o, e) => eventFired = true; - ButtonTester cancelButton = new ButtonTester("CancelButtonControl", _optionsForm); - cancelButton.Click(); + Button cancelButton = _optionsForm.FindControl