Merge remote-tracking branch 'upstream/develop' into help-updates

This commit is contained in:
nmat
2018-12-25 10:27:35 +01:00
25 changed files with 409 additions and 414 deletions

View File

@@ -2,6 +2,7 @@
Features/Enhancements:
----------------------
#1223: Open External Links in Default Web Browser
#1186: Fixed several dialog boxes to use localized button text
#1170: Prevent Options window from showing up in taskbar
#1141: 'Copy Hostname' option added to connection tree context menu

View File

@@ -16,7 +16,7 @@ github.com/peterchenadded
Brandon Wulf (github.com/mrwulf)
Pedro Rodrigues (github.com/pedro2555)
github.com/dekelMP
github.com/farosch
Faryan Rezagholi (github.com/farosch)
Bruce (github.com/brucetp)
Camilo Alvarez (github.com/jotatsu)
github.com/DamianBis

View File

@@ -11,10 +11,10 @@ namespace mRemoteNG.App.Info
{
public static class GeneralAppInfo
{
public const string UrlHome = "http://www.mremoteng.org/";
public const string UrlDonate = "http://donate.mremoteng.org/";
public const string UrlHome = "https://www.mremoteng.org/";
public const string UrlDonate = "https://mremoteng.org/contribute/";
public const string UrlForum = "https://www.reddit.com/r/mRemoteNG/";
public const string UrlBugs = "http://bugs.mremoteng.org/";
public const string UrlBugs = "https://bugs.mremoteng.org/";
public static string ApplicationVersion = Application.ProductVersion;
public static readonly string ProductName = Application.ProductName;
public static readonly string Copyright = ((AssemblyCopyrightAttribute)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyCopyrightAttribute), false)).Copyright;

View File

@@ -27,6 +27,8 @@ namespace mRemoteNG.App
CatchAllUnhandledExceptions();
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
FrmSplashScreen frmSplashScreen = FrmSplashScreen.getInstance();
frmSplashScreen.Show();
Application.Run(FrmMain.Default);
}

BIN
mRemoteV1/Icons/Apple.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -2642,19 +2642,37 @@ namespace mRemoteNG {
this["SaveConnectionsAfterEveryEdit"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UseFilterSearch {
get {
public bool UseFilterSearch
{
get
{
return ((bool)(this["UseFilterSearch"]));
}
set {
set
{
this["UseFilterSearch"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool PlaceSearchBarAboveConnectionTree
{
get
{
return ((bool)(this["PlaceSearchBarAboveConnectionTree"]));
}
set
{
this["PlaceSearchBarAboveConnectionTree"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]

View File

@@ -222,6 +222,15 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized string similar to Place search bar above connection tree.
/// </summary>
internal static string PlaceSearchBarAboveConnectionTree {
get {
return ResourceManager.GetString("PlaceSearchBarAboveConnectionTree", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Prompt to unlock credential repositories on startup.
/// </summary>

View File

@@ -2183,31 +2183,31 @@ mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
<value>Ohne Anmeldedaten verbinden</value>
</data>
<data name="strDontConnectToConsoleSessionMenuItem" xml:space="preserve">
<value>Nicht zu Konsolensitzung verbinden</value>
<value>Keine Verbindung zur Konsolensitzung herstellen</value>
</data>
<data name="strErrorCouldNotLaunchPutty" xml:space="preserve">
<value>PuTTY konnte nicht gestartet werden</value>
<value>PuTTY konnte nicht gestartet werden.</value>
</data>
<data name="strExportEverything" xml:space="preserve">
<value>Export alles</value>
<value>Alles exportieren</value>
</data>
<data name="strExportFile" xml:space="preserve">
<value>Export Datei</value>
<value>Datei exportieren</value>
</data>
<data name="strExportProperties" xml:space="preserve">
<value>Export Eigeschaften</value>
<value>Eigenschaften exportieren</value>
</data>
<data name="strFilterAllImportable" xml:space="preserve">
<value>Alle importierbaren Dateien</value>
<value>Alle wichtigen Dateien</value>
</data>
<data name="strImportFileFailedMainInstruction" xml:space="preserve">
<value>Import fehlgeschlagen</value>
<value>Import-Vorgang fehlgeschlagen</value>
</data>
<data name="strImportFromFileMenuItem" xml:space="preserve">
<value>Von &amp;Datei importieren</value>
</data>
<data name="strImportLocationContent" xml:space="preserve">
<value>Wo sollen die importierten Objekte platziert werden?</value>
<value>Wo sollen die importierten Elemente abgelegt werden?</value>
</data>
<data name="strImportLocationMainInstruction" xml:space="preserve">
<value>Import Ziel</value>
@@ -2225,19 +2225,19 @@ mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
<value>Nächster Tab</value>
</data>
<data name="strOptionsKeyboardGroupModifyShortcut" xml:space="preserve">
<value>Vorheriger Tab</value>
<value>Hotkeys ändern</value>
</data>
<data name="strOptionsProxyTesting" xml:space="preserve">
<value>Teste...</value>
<value>Testen...</value>
</data>
<data name="strOptionsTabKeyboard" xml:space="preserve">
<value>Tastatur</value>
</data>
<data name="strUpdateCheckFailedLabel" xml:space="preserve">
<value>Überprüfung fehlgeschlagen</value>
<value>Prüfung fehlgeschlagen</value>
</data>
<data name="strUpdateCheckingLabel" xml:space="preserve">
<value>Prüfe auf Updates...</value>
<value>Nach Updates suchen...</value>
</data>
<data name="strEncryptionEngine" xml:space="preserve">
<value>Verschlüsselungs-Engine</value>
@@ -2255,7 +2255,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
<value>Mittel</value>
</data>
<data name="strPropertyNameSoundQuality" xml:space="preserve">
<value>Ton Qualität</value>
<value>Klangqualität</value>
</data>
<data name="strUpdatePortableDownloadComplete" xml:space="preserve">
<value>Download abgeschlossen!</value>
@@ -2270,19 +2270,19 @@ mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
<value>Datei öffnen</value>
</data>
<data name="strHttpsInsecureAllowAlways" xml:space="preserve">
<value>Immer erlauben</value>
<value>Immer zulassen</value>
</data>
<data name="strHttpsInsecureAllowOnce" xml:space="preserve">
<value>Ein Mal erlauben</value>
<value>Einmal zulassen</value>
</data>
<data name="strHttpsInsecureDontAllow" xml:space="preserve">
<value>Nie erlauben</value>
<value>Nicht erlauben</value>
</data>
<data name="IncorrectPassword" xml:space="preserve">
<value>Falsches Passwort</value>
</data>
<data name="Source" xml:space="preserve">
<value>Qualle</value>
<value>Quelle</value>
</data>
<data name="strBack" xml:space="preserve">
<value>Zurück</value>
@@ -2308,7 +2308,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>&amp;Nochmal versuchen</value>
</data>
<data name="strExternalToolDefaultName" xml:space="preserve">
<value>Neues externes Programm</value>
<value>Neues externes Werkzeug</value>
</data>
<data name="strLoadFromSqlFailedContent" xml:space="preserve">
<value>Die Verbindungsinformationen konnten nicht vom SQL-Server geladen werden.</value>
@@ -2317,10 +2317,10 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>Vorheriger Tab</value>
</data>
<data name="strOptionsKeyboardLabelKeyboardShortcuts" xml:space="preserve">
<value>Tataturkürzel</value>
<value>Tastenkombinationen</value>
</data>
<data name="strPasswordStatusMustMatch" xml:space="preserve">
<value>Beide Passwörter müssen übereinstimmen</value>
<value>Die beide Passwörter müssen übereinstimmen.</value>
</data>
<data name="strPasswordStatusTooShort" xml:space="preserve">
<value>Das Passwort muss mindestens 3 Zeichen lang sein.</value>
@@ -2341,19 +2341,19 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>Passwort für {0}</value>
</data>
<data name="strRDPOverallConnectionTimeout" xml:space="preserve">
<value>RDP-Verbindungs-Timeout:</value>
<value>RDP-Verbindungs-Timeout</value>
</data>
<data name="strNodeAlreadyInFolder" xml:space="preserve">
<value>Dieser Knoten ist bereits im Verzeichnis</value>
<value>Dieser Knoten befindet sich bereits in diesem Ordner.</value>
</data>
<data name="strNodeCannotDragOnSelf" xml:space="preserve">
<value>Knoten kann nicht auf sich selbst gezogen werden.</value>
<value>Der Knoten kann nicht auf sich selbst gezogen werden.</value>
</data>
<data name="strNodeCannotDragParentOnChild" xml:space="preserve">
<value>Elternknoten kann nicht auf Kindknoten gezogen werden.</value>
<value>Der übergeordnete Knoten kann nicht auf den untergeordneten Knoten gezogen werden.</value>
</data>
<data name="strNodeNotDraggable" xml:space="preserve">
<value>Dieser Knoten ist nicht ziehbar.</value>
<value>Dieser Knoten ist nicht verschiebbar.</value>
</data>
<data name="strEncryptionBlockCipherMode" xml:space="preserve">
<value>Block Cipher-Modus</value>
@@ -2371,16 +2371,16 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>Verbindung erfolgreich</value>
</data>
<data name="DatabaseNotAvailable" xml:space="preserve">
<value>Datenbank '{0}' nicht verfügbar.</value>
<value>Datenbank '{0}' ist nicht verfügbar.</value>
</data>
<data name="SaveConnectionsAfterEveryEdit" xml:space="preserve">
<value>Verbindungen nach jeder Änderung speichern</value>
<value>Verbindungen nach jeder Bearbeitung speichern</value>
</data>
<data name="FilterSearchMatchesInConnectionTree" xml:space="preserve">
<value>Suchergebnisse in Verbindungen filtern</value>
</data>
<data name="TestConnection" xml:space="preserve">
<value>Teste Verbindung</value>
<value>Verbindung testen</value>
</data>
<data name="strTimeoutInSeconds" xml:space="preserve">
<value>Time-Out (Sekunden)</value>
@@ -2389,28 +2389,28 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>&amp;Alles zurücksetzen</value>
</data>
<data name="strPropertyNameAutomaticResize" xml:space="preserve">
<value>Automatische Größenanpassung</value>
<value>Automatische Größenänderung</value>
</data>
<data name="strPuttySessionSettings" xml:space="preserve">
<value>PuTTY Sitzungseinstellungen</value>
</data>
<data name="strShowOnToolbar" xml:space="preserve">
<value>Auf der Toolbar anzeigen</value>
<value>In der Symbolleiste anzeigen</value>
</data>
<data name="strAccept" xml:space="preserve">
<value>Akzeptieren</value>
</data>
<data name="strCredentialEditor" xml:space="preserve">
<value>Hinzufügen</value>
<value>Anmeldeinformationen Editor</value>
</data>
<data name="strAssignedCredential" xml:space="preserve">
<value>Zugewiesene Anmeldedaten</value>
</data>
<data name="strHttpsInsecurePromptTitle" xml:space="preserve">
<value>Unsichere Zertifikate erlauben?</value>
<value>Unsicheres Zertifikat zulassen?</value>
</data>
<data name="Unlock" xml:space="preserve">
<value>Entsperren</value>
<value>Freischalten</value>
</data>
<data name="strOptionsThemeEnableTheming" xml:space="preserve">
<value>Themes aktivieren</value>
@@ -2419,13 +2419,13 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat
<value>Neuer Thema Name</value>
</data>
<data name="TestingConnection" xml:space="preserve">
<value>Teste Verbindung</value>
<value>Verbindung testen</value>
</data>
<data name="strExportToFileMenuItem" xml:space="preserve">
<value>In Datei &amp;exportieren...</value>
</data>
<data name="strImportFileFailedContent" xml:space="preserve">
<value>Ein Fehler ist während des Imports der Datei {0} aufgetreten.</value>
<value>Beim Importieren der Datei ist ein Fehler aufgetreten ("{0}").</value>
</data>
<data name="strMenuLockToolbars" xml:space="preserve">
<value>Symbolleisten sperren</value>
@@ -2462,7 +2462,7 @@ Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremote
<value>Abrufen</value>
</data>
<data name="strUpdateGetChangeLogFailed" xml:space="preserve">
<value>Das Change-Log konnte nicht herunter geladen werden.</value>
<value>Der Changelog konnte nicht heruntergeladen werden.</value>
</data>
<data name="strPropertyDescriptionSoundQuality" xml:space="preserve">
<value>Wählen Sie die vom Protokoll bereitgestellte Klangqualität: Dynamisch, Mittel, Hoch</value>
@@ -2477,7 +2477,7 @@ Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremote
<value>Hinzufügen</value>
</data>
<data name="strPropertyDescriptionCredential" xml:space="preserve">
<value>Auswählen welche Anmeldeinformationen für diese Verbindung verwendet werden sollen.</value>
<value>Wählen Sie aus, welche Anmeldeinformationen für diese Verbindung verwendet werden sollen.</value>
</data>
<data name="strConfirmDeleteCredentialRecord" xml:space="preserve">
<value>Möchten Sie die Anmeldeinformationen {0} wirklich löschen?</value>
@@ -2513,10 +2513,10 @@ Die Passwortlänge muss zwischen {0} und {1} liegen</value>
Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei</value>
</data>
<data name="strLogFilePath" xml:space="preserve">
<value>Protokollierungspfad</value>
<value>Pfad der Protokolldatei</value>
</data>
<data name="strChoosePath" xml:space="preserve">
<value>Pfad wählen</value>
<value>Pfad auswählen</value>
</data>
<data name="strUseDefault" xml:space="preserve">
<value>Standard verwenden</value>
@@ -2534,7 +2534,7 @@ Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei</value>
<value>Das ausgewählte Repository ist entsperrt</value>
</data>
<data name="Unlocking" xml:space="preserve">
<value>Entsperren</value>
<value>Freischalten</value>
</data>
<data name="UnlockCredentialRepository" xml:space="preserve">
<value>Entsperre Credential Repository</value>
@@ -2569,177 +2569,24 @@ Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei</value>
<data name="LoadBalanceInfoUseUtf8" xml:space="preserve">
<value>Verwenden Sie die UTF8-Codierung für die RDP-Eigenschaft "Load Balance Info"</value>
</data>
<data name="strConnectNoCredentials" xml:space="preserve">
<value>Ohne Anmeldedaten verbinden</value>
</data>
<data name="strExportEverything" xml:space="preserve">
<value>Alles exportieren</value>
</data>
<data name="strExportFile" xml:space="preserve">
<value>Datei exportieren</value>
</data>
<data name="strExportProperties" xml:space="preserve">
<value>Eigenschaften exportieren</value>
</data>
<data name="strExportSelectedConnection" xml:space="preserve">
<value>Die Aktuell gewählte Verbindung exportieren</value>
</data>
<data name="strExportSelectedFolder" xml:space="preserve">
<value>Den Aktuell gewählten Ordner exportieren</value>
</data>
<data name="strFilterAllImportable" xml:space="preserve">
<value>Alle wichtigen Dateien</value>
</data>
<data name="strImportFileFailedMainInstruction" xml:space="preserve">
<value>Import-Vorgang fehlgeschlagen</value>
</data>
<data name="strImportLocationContent" xml:space="preserve">
<value>Wo sollen die importierten Elemente abgelegt werden?</value>
</data>
<data name="strLoadFromSqlFailedContent" xml:space="preserve">
<value>Die Verbindungsinformationen konnten nicht vom SQL-Server geladen werden.</value>
</data>
<data name="strOptionsProxyTesting" xml:space="preserve">
<value>Testen...</value>
</data>
<data name="strOptionsTabKeyboard" xml:space="preserve">
<value>Tastatur</value>
</data>
<data name="strOptionsKeyboardLabelKeyboardShortcuts" xml:space="preserve">
<value>Tastenkombinationen</value>
</data>
<data name="strOptionsKeyboardGroupModifyShortcut" xml:space="preserve">
<value>Hotkeys ändern</value>
</data>
<data name="strOptionsKeyboardCommandsPreviousTab" xml:space="preserve">
<value>Vorheriger Tab</value>
</data>
<data name="strOptionsKeyboardCommandsNextTab" xml:space="preserve">
<value>Nächster Tab</value>
</data>
<data name="strUpdateCheckFailedLabel" xml:space="preserve">
<value>Prüfung fehlgeschlagen</value>
</data>
<data name="strUpdateCheckingLabel" xml:space="preserve">
<value>Nach Updates suchen...</value>
</data>
<data name="strPasswordStatusTooShort" xml:space="preserve">
<value>Das Passwort muss mindestens 3 Zeichen lang sein.</value>
</data>
<data name="strPasswordStatusMustMatch" xml:space="preserve">
<value>Die beide Passwörter müssen übereinstimmen.</value>
</data>
<data name="strPortScanComplete" xml:space="preserve">
<value>Port-Scan abgeschlossen.</value>
</data>
<data name="strTitlePasswordWithName" xml:space="preserve">
<value>Passwort für {0}</value>
</data>
<data name="strShowOnToolbar" xml:space="preserve">
<value>In der Symbolleiste anzeigen</value>
</data>
<data name="strTabSecurity" xml:space="preserve">
<value>Sicherheit</value>
</data>
<data name="strBack" xml:space="preserve">
<value>Zurück</value>
</data>
<data name="strDontConnectToConsoleSessionMenuItem" xml:space="preserve">
<value>Keine Verbindung zur Konsolensitzung herstellen</value>
</data>
<data name="strPuttySessionSettings" xml:space="preserve">
<value>PuTTY Sitzungseinstellungen</value>
</data>
<data name="strPropertyNameLoadBalanceInfo" xml:space="preserve">
<value>Lastausgleichsinfo</value>
</data>
<data name="strUpdateGetChangeLogFailed" xml:space="preserve">
<value>Der Changelog konnte nicht heruntergeladen werden.</value>
</data>
<data name="strRDPSoundQualityHigh" xml:space="preserve">
<value>Hoch</value>
</data>
<data name="strRDPSoundQualityMedium" xml:space="preserve">
<value>Mittel</value>
</data>
<data name="strAccept" xml:space="preserve">
<value>Akzeptieren</value>
</data>
<data name="strAdd" xml:space="preserve">
<value>Hinzufügen</value>
</data>
<data name="strCredentialEditor" xml:space="preserve">
<value>Anmeldeinformationen Editor</value>
</data>
<data name="strCredentialManager" xml:space="preserve">
<value>Anmeldeinformationen Manager</value>
</data>
<data name="strRemove" xml:space="preserve">
<value>Entfernen</value>
</data>
<data name="strTitle" xml:space="preserve">
<value>Titel</value>
</data>
<data name="strPropertyDescriptionCredential" xml:space="preserve">
<value>Wählen Sie aus, welche Anmeldeinformationen für diese Verbindung verwendet werden sollen.</value>
</data>
<data name="strLogFilePath" xml:space="preserve">
<value>Pfad der Protokolldatei</value>
</data>
<data name="strChoosePath" xml:space="preserve">
<value>Pfad auswählen</value>
</data>
<data name="strOpenFile" xml:space="preserve">
<value>Datei öffnen</value>
</data>
<data name="strUseDefault" xml:space="preserve">
<value>Standard verwenden</value>
</data>
<data name="strLogging" xml:space="preserve">
<value>Protokollierung</value>
</data>
<data name="strPopups" xml:space="preserve">
<value>Pop-ups</value>
</data>
<data name="strHttpsInsecureAllowAlways" xml:space="preserve">
<value>Immer zulassen</value>
</data>
<data name="strHttpsInsecureAllowOnce" xml:space="preserve">
<value>Einmal zulassen</value>
</data>
<data name="strHttpsInsecureDontAllow" xml:space="preserve">
<value>Nicht erlauben</value>
</data>
<data name="strHttpsInsecurePromptTitle" xml:space="preserve">
<value>Unsicheres Zertifikat zulassen?</value>
</data>
<data name="TestingConnection" xml:space="preserve">
<value>Verbindung testen</value>
</data>
<data name="IncorrectPassword" xml:space="preserve">
<value>Falsches Passwort</value>
</data>
<data name="Source" xml:space="preserve">
<value>Quelle</value>
</data>
<data name="Unlocking" xml:space="preserve">
<value>Freischalten</value>
</data>
<data name="Unlock" xml:space="preserve">
<value>Freischalten</value>
</data>
<data name="strFAMFAMFAMAttributionURL" xml:space="preserve">
<value>http://www.famfamfam.com/</value>
</data>
<data name="strExportItems" xml:space="preserve">
<value>Element exportieren</value>
</data>
<data name="strErrorCouldNotLaunchPutty" xml:space="preserve">
<value>PuTTY konnte nicht gestartet werden.</value>
</data>
<data name="strExternalToolDefaultName" xml:space="preserve">
<value>Neues externes Werkzeug</value>
</data>
<data name="strHttp" xml:space="preserve">
<value>HTTP</value>
</data>
@@ -2755,55 +2602,22 @@ Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei</value>
<data name="strICA" xml:space="preserve">
<value>ICA</value>
</data>
<data name="strImportFileFailedContent" xml:space="preserve">
<value>Beim Importieren der Datei ist ein Fehler aufgetreten ("{0}").</value>
</data>
<data name="strOptionsKeyboardCommandsGroupTabs" xml:space="preserve">
<value>Tabs</value>
</data>
<data name="strPropertyNameAutomaticResize" xml:space="preserve">
<value>Automatische Größenänderung</value>
</data>
<data name="strWeifenLuoAttributionURL" xml:space="preserve">
<value>http://sourceforge.net/projects/dockpanelsuite/</value>
</data>
<data name="strRDPOverallConnectionTimeout" xml:space="preserve">
<value>RDP-Verbindungs-Timeout</value>
</data>
<data name="strNodeAlreadyInFolder" xml:space="preserve">
<value>Dieser Knoten befindet sich bereits in diesem Ordner.</value>
</data>
<data name="strNodeCannotDragOnSelf" xml:space="preserve">
<value>Der Knoten kann nicht auf sich selbst gezogen werden.</value>
</data>
<data name="strNodeCannotDragParentOnChild" xml:space="preserve">
<value>Der übergeordnete Knoten kann nicht auf den untergeordneten Knoten gezogen werden.</value>
</data>
<data name="strNodeNotDraggable" xml:space="preserve">
<value>Dieser Knoten ist nicht verschiebbar.</value>
</data>
<data name="strUpdatePortableDownloadComplete" xml:space="preserve">
<value>Download abgeschlossen!</value>
</data>
<data name="strDownloadPortable" xml:space="preserve">
<value>Download</value>
</data>
<data name="strID" xml:space="preserve">
<value>ID</value>
</data>
<data name="strPropertyNameSoundQuality" xml:space="preserve">
<value>Klangqualität</value>
</data>
<data name="TestConnection" xml:space="preserve">
<value>Verbindung testen</value>
</data>
<data name="ConfigurationFileNotFound" xml:space="preserve">
<value>Die Konfigurationsdatei fehlt.</value>
</data>
<data name="DatabaseNotAvailable" xml:space="preserve">
<value>Datenbank '{0}' ist nicht verfügbar.</value>
</data>
<data name="SaveConnectionsAfterEveryEdit" xml:space="preserve">
<value>Verbindungen nach jeder Bearbeitung speichern</value>
<data name="PlaceSearchBarAboveConnectionTree" xml:space="preserve">
<value>Suchleiste über den Verbindungen anzeigen</value>
</data>
</root>

View File

@@ -59,7 +59,7 @@
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
@@ -105,18 +105,21 @@
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="PlaceSearchBarAboveConnectionTree" xml:space="preserve">
<value>Place search bar above connection tree</value>
</data>
<data name="strPropertyDescriptionColors" xml:space="preserve">
<value>Select the color quality to be used.</value>
</data>

View File

@@ -2734,4 +2734,7 @@ This page will walk you through the process of upgrading your connections file o
<data name="strMenuCopyHostname" xml:space="preserve">
<value>Copy Hostname</value>
</data>
<data name="PlaceSearchBarAboveConnectionTree" xml:space="preserve">
<value>Place search bar above connection tree</value>
</data>
</root>

View File

@@ -20,7 +20,7 @@ namespace mRemoteNG
// this.SettingsSaving += this.SettingsSavingEventHandler;
//
}
private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
// Add code to handle the SettingChangingEvent event here.
}

View File

@@ -0,0 +1,59 @@
namespace mRemoteNG.UI.Forms
{
partial class FrmSplashScreen
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// FrmSplashScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackgroundImage = global::mRemoteNG.Resources.Logo;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(492, 128);
this.ControlBox = false;
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(180, 60);
this.Name = "FrmSplashScreen";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "frmSplashScreen";
this.TopMost = true;
this.ResumeLayout(false);
}
#endregion
}
}

View File

@@ -0,0 +1,29 @@
using System.Windows.Forms;
namespace mRemoteNG.UI.Forms
{
public partial class FrmSplashScreen : Form
{
static FrmSplashScreen instance = null;
private FrmSplashScreen() => InitializeComponent();
public static FrmSplashScreen getInstance()
{
if (instance == null)
instance = new FrmSplashScreen();
return instance;
}
protected override CreateParams CreateParams
{
get
{
CreateParams cp = base.CreateParams;
// turn on WS_EX_TOOLWINDOW style bit
cp.ExStyle |= 0x80;
return cp;
}
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
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
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -30,7 +30,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
//Do not modify it using the code editor.
[System.Diagnostics.DebuggerStepThrough()]private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ConnectionsPage));
this.numRDPConTimeout = new mRemoteNG.UI.Controls.Base.NGNumericUpDown();
this.lblRDPConTimeout = new mRemoteNG.UI.Controls.Base.NGLabel();
this.lblRdpReconnectionCount = new mRemoteNG.UI.Controls.Base.NGLabel();
@@ -46,24 +45,21 @@ namespace mRemoteNG.UI.Forms.OptionsPages
this.radCloseWarnMultiple = new mRemoteNG.UI.Controls.Base.NGRadioButton();
this.radCloseWarnExit = new mRemoteNG.UI.Controls.Base.NGRadioButton();
this.radCloseWarnNever = new mRemoteNG.UI.Controls.Base.NGRadioButton();
this.pnlRdpReconnectionCount = new System.Windows.Forms.TableLayoutPanel();
this.pnlRdpConnectionTimeout = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.chkSaveConnectionsAfterEveryEdit = new mRemoteNG.UI.Controls.Base.NGCheckBox();
this.chkUseFilterSearch = new mRemoteNG.UI.Controls.Base.NGCheckBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.chkPlaceSearchBarAboveConnectionTree = new mRemoteNG.UI.Controls.Base.NGCheckBox();
((System.ComponentModel.ISupportInitialize)(this.numRDPConTimeout)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numRdpReconnectionCount)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numAutoSave)).BeginInit();
this.pnlConfirmCloseConnection.SuspendLayout();
this.pnlRdpReconnectionCount.SuspendLayout();
this.pnlRdpConnectionTimeout.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.SuspendLayout();
//
// numRDPConTimeout
//
this.numRDPConTimeout.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.numRDPConTimeout.Location = new System.Drawing.Point(270, 3);
this.numRDPConTimeout.Location = new System.Drawing.Point(274, 29);
this.numRDPConTimeout.Maximum = new decimal(new int[] {
600,
0,
@@ -85,20 +81,20 @@ namespace mRemoteNG.UI.Forms.OptionsPages
//
// lblRDPConTimeout
//
this.lblRDPConTimeout.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblRDPConTimeout.Location = new System.Drawing.Point(3, 0);
this.lblRDPConTimeout.Dock = System.Windows.Forms.DockStyle.Top;
this.lblRDPConTimeout.Location = new System.Drawing.Point(3, 26);
this.lblRDPConTimeout.Name = "lblRDPConTimeout";
this.lblRDPConTimeout.Size = new System.Drawing.Size(261, 26);
this.lblRDPConTimeout.Size = new System.Drawing.Size(265, 26);
this.lblRDPConTimeout.TabIndex = 0;
this.lblRDPConTimeout.Text = "RDP Connection Timeout";
this.lblRDPConTimeout.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblRdpReconnectionCount
//
this.lblRdpReconnectionCount.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblRdpReconnectionCount.Dock = System.Windows.Forms.DockStyle.Top;
this.lblRdpReconnectionCount.Location = new System.Drawing.Point(3, 0);
this.lblRdpReconnectionCount.Name = "lblRdpReconnectionCount";
this.lblRdpReconnectionCount.Size = new System.Drawing.Size(261, 26);
this.lblRdpReconnectionCount.Size = new System.Drawing.Size(265, 26);
this.lblRdpReconnectionCount.TabIndex = 0;
this.lblRdpReconnectionCount.Text = "RDP Reconnection Count";
this.lblRdpReconnectionCount.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -106,7 +102,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
// numRdpReconnectionCount
//
this.numRdpReconnectionCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.numRdpReconnectionCount.Location = new System.Drawing.Point(270, 3);
this.numRdpReconnectionCount.Location = new System.Drawing.Point(274, 3);
this.numRdpReconnectionCount.Maximum = new decimal(new int[] {
20,
0,
@@ -156,10 +152,10 @@ namespace mRemoteNG.UI.Forms.OptionsPages
//
// lblAutoSave1
//
this.lblAutoSave1.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblAutoSave1.Location = new System.Drawing.Point(3, 0);
this.lblAutoSave1.Dock = System.Windows.Forms.DockStyle.Top;
this.lblAutoSave1.Location = new System.Drawing.Point(3, 52);
this.lblAutoSave1.Name = "lblAutoSave1";
this.lblAutoSave1.Size = new System.Drawing.Size(261, 26);
this.lblAutoSave1.Size = new System.Drawing.Size(265, 26);
this.lblAutoSave1.TabIndex = 0;
this.lblAutoSave1.Text = "Auto Save in Minutes (0 means disabled)";
this.lblAutoSave1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -167,7 +163,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
// numAutoSave
//
this.numAutoSave.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.numAutoSave.Location = new System.Drawing.Point(270, 3);
this.numAutoSave.Location = new System.Drawing.Point(274, 55);
this.numAutoSave.Maximum = new decimal(new int[] {
9999,
0,
@@ -184,9 +180,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages
this.pnlConfirmCloseConnection.Controls.Add(this.radCloseWarnMultiple);
this.pnlConfirmCloseConnection.Controls.Add(this.radCloseWarnExit);
this.pnlConfirmCloseConnection.Controls.Add(this.radCloseWarnNever);
this.pnlConfirmCloseConnection.Location = new System.Drawing.Point(3, 214);
this.pnlConfirmCloseConnection.Location = new System.Drawing.Point(3, 226);
this.pnlConfirmCloseConnection.Name = "pnlConfirmCloseConnection";
this.pnlConfirmCloseConnection.Size = new System.Drawing.Size(595, 137);
this.pnlConfirmCloseConnection.Size = new System.Drawing.Size(604, 137);
this.pnlConfirmCloseConnection.TabIndex = 6;
//
// lblClosingConnections
@@ -242,51 +238,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
this.radCloseWarnNever.Text = "Do not warn me when closing connections";
this.radCloseWarnNever.UseVisualStyleBackColor = true;
//
// pnlRdpReconnectionCount
//
this.pnlRdpReconnectionCount.ColumnCount = 2;
this.pnlRdpReconnectionCount.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 45F));
this.pnlRdpReconnectionCount.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55F));
this.pnlRdpReconnectionCount.Controls.Add(this.lblRdpReconnectionCount, 0, 0);
this.pnlRdpReconnectionCount.Controls.Add(this.numRdpReconnectionCount, 1, 0);
this.pnlRdpReconnectionCount.Location = new System.Drawing.Point(4, 118);
this.pnlRdpReconnectionCount.Name = "pnlRdpReconnectionCount";
this.pnlRdpReconnectionCount.RowCount = 1;
this.pnlRdpReconnectionCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.pnlRdpReconnectionCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.pnlRdpReconnectionCount.Size = new System.Drawing.Size(595, 26);
this.pnlRdpReconnectionCount.TabIndex = 3;
//
// pnlRdpConnectionTimeout
//
this.pnlRdpConnectionTimeout.ColumnCount = 2;
this.pnlRdpConnectionTimeout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 45F));
this.pnlRdpConnectionTimeout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55F));
this.pnlRdpConnectionTimeout.Controls.Add(this.numRDPConTimeout, 1, 0);
this.pnlRdpConnectionTimeout.Controls.Add(this.lblRDPConTimeout, 0, 0);
this.pnlRdpConnectionTimeout.Location = new System.Drawing.Point(4, 150);
this.pnlRdpConnectionTimeout.Name = "pnlRdpConnectionTimeout";
this.pnlRdpConnectionTimeout.RowCount = 1;
this.pnlRdpConnectionTimeout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.pnlRdpConnectionTimeout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.pnlRdpConnectionTimeout.Size = new System.Drawing.Size(595, 26);
this.pnlRdpConnectionTimeout.TabIndex = 4;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 45F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55F));
this.tableLayoutPanel1.Controls.Add(this.numAutoSave, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.lblAutoSave1, 0, 0);
this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 182);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(595, 26);
this.tableLayoutPanel1.TabIndex = 5;
//
// chkSaveConnectionsAfterEveryEdit
//
this.chkSaveConnectionsAfterEveryEdit._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER;
@@ -302,37 +253,64 @@ namespace mRemoteNG.UI.Forms.OptionsPages
//
this.chkUseFilterSearch._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER;
this.chkUseFilterSearch.AutoSize = true;
this.chkUseFilterSearch.Location = new System.Drawing.Point(4, 95);
this.chkUseFilterSearch.Location = new System.Drawing.Point(3, 95);
this.chkUseFilterSearch.Name = "chkUseFilterSearch";
this.chkUseFilterSearch.Size = new System.Drawing.Size(214, 17);
this.chkUseFilterSearch.TabIndex = 8;
this.chkUseFilterSearch.Text = "Filter search matches in connection tree";
this.chkUseFilterSearch.UseVisualStyleBackColor = true;
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.ColumnCount = 2;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 45F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55F));
this.tableLayoutPanel2.Controls.Add(this.numRdpReconnectionCount, 1, 0);
this.tableLayoutPanel2.Controls.Add(this.numAutoSave, 1, 2);
this.tableLayoutPanel2.Controls.Add(this.lblRdpReconnectionCount, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.lblAutoSave1, 0, 2);
this.tableLayoutPanel2.Controls.Add(this.lblRDPConTimeout, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.numRDPConTimeout, 1, 1);
this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 141);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 3;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(604, 79);
this.tableLayoutPanel2.TabIndex = 9;
//
// chkPlaceSearchBarAboveConnectionTree
//
this.chkPlaceSearchBarAboveConnectionTree._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER;
this.chkPlaceSearchBarAboveConnectionTree.AutoSize = true;
this.chkPlaceSearchBarAboveConnectionTree.Location = new System.Drawing.Point(3, 118);
this.chkPlaceSearchBarAboveConnectionTree.Name = "chkPlaceSearchBarAboveConnectionTree";
this.chkPlaceSearchBarAboveConnectionTree.Size = new System.Drawing.Size(216, 17);
this.chkPlaceSearchBarAboveConnectionTree.TabIndex = 8;
this.chkPlaceSearchBarAboveConnectionTree.Text = "Place search bar above connection tree";
this.chkPlaceSearchBarAboveConnectionTree.UseVisualStyleBackColor = true;
//
// ConnectionsPage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel2);
this.Controls.Add(this.chkPlaceSearchBarAboveConnectionTree);
this.Controls.Add(this.chkUseFilterSearch);
this.Controls.Add(this.chkSaveConnectionsAfterEveryEdit);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.pnlRdpConnectionTimeout);
this.Controls.Add(this.pnlRdpReconnectionCount);
this.Controls.Add(this.chkSingleClickOnConnectionOpensIt);
this.Controls.Add(this.chkHostnameLikeDisplayName);
this.Controls.Add(this.chkSingleClickOnOpenedConnectionSwitchesToIt);
this.Controls.Add(this.pnlConfirmCloseConnection);
this.Name = "ConnectionsPage";
this.PageIcon = ((System.Drawing.Icon)(resources.GetObject("$this.PageIcon")));
this.Size = new System.Drawing.Size(610, 489);
((System.ComponentModel.ISupportInitialize)(this.numRDPConTimeout)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numRdpReconnectionCount)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numAutoSave)).EndInit();
this.pnlConfirmCloseConnection.ResumeLayout(false);
this.pnlConfirmCloseConnection.PerformLayout();
this.pnlRdpReconnectionCount.ResumeLayout(false);
this.pnlRdpConnectionTimeout.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -352,10 +330,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages
internal Controls.Base.NGNumericUpDown numRDPConTimeout;
internal Controls.Base.NGLabel lblRDPConTimeout;
internal Controls.Base.NGNumericUpDown numRdpReconnectionCount;
private System.Windows.Forms.TableLayoutPanel pnlRdpReconnectionCount;
private System.Windows.Forms.TableLayoutPanel pnlRdpConnectionTimeout;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
internal Controls.Base.NGCheckBox chkSaveConnectionsAfterEveryEdit;
private Controls.Base.NGCheckBox chkUseFilterSearch;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private Controls.Base.NGCheckBox chkPlaceSearchBarAboveConnectionTree;
}
}

View File

@@ -11,6 +11,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
InitializeComponent();
ApplyTheme();
PageIcon = Resources.Root_Icon;
}
public override string PageName
@@ -28,6 +29,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
chkHostnameLikeDisplayName.Text = Language.strSetHostnameLikeDisplayName;
chkSaveConnectionsAfterEveryEdit.Text = Language.SaveConnectionsAfterEveryEdit;
chkUseFilterSearch.Text = Language.FilterSearchMatchesInConnectionTree;
chkPlaceSearchBarAboveConnectionTree.Text = Language.PlaceSearchBarAboveConnectionTree;
lblRdpReconnectionCount.Text = Language.strRdpReconnectCount;
lblRDPConTimeout.Text = Language.strRDPOverallConnectionTimeout;
@@ -49,6 +51,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
chkHostnameLikeDisplayName.Checked = Settings.Default.SetHostnameLikeDisplayName;
chkSaveConnectionsAfterEveryEdit.Checked = Settings.Default.SaveConnectionsAfterEveryEdit;
chkUseFilterSearch.Checked = Settings.Default.UseFilterSearch;
chkPlaceSearchBarAboveConnectionTree.Checked = Settings.Default.PlaceSearchBarAboveConnectionTree;
numRdpReconnectionCount.Value = Convert.ToDecimal(Settings.Default.RdpReconnectionCount);
numRDPConTimeout.Value = Convert.ToDecimal(Settings.Default.ConRDPOverallConnectionTimeout);
@@ -78,6 +81,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked;
Settings.Default.SaveConnectionsAfterEveryEdit = chkSaveConnectionsAfterEveryEdit.Checked;
Settings.Default.UseFilterSearch = chkUseFilterSearch.Checked;
Settings.Default.PlaceSearchBarAboveConnectionTree = chkPlaceSearchBarAboveConnectionTree.Checked;
Settings.Default.RdpReconnectionCount = (int) numRdpReconnectionCount.Value;
Settings.Default.ConRDPOverallConnectionTimeout = (int) numRDPConTimeout.Value;

View File

@@ -117,29 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.PageIcon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
AAAAAAAAAAAAAAAAAADVYQEFyk4AFcdXAC3JWAA/xVIAScNPAUi+TAA9v0sAK75KABTQTwAEAAAAAAAA
AAAAAAAAAAAAAAAAAADGXQAHv1YALMhbAGrAVgCjrUsAxKRHBNOoRgjTqUcEw7RKAKHBUgBmwV4AKM9X
AAYAAAAAAAAAAAAAAADCWgABuEcAGLFEAGuCOQHXejoP/KxNJP/hbUH/5H9V/9NrOf+jSxb9o00H2r9X
AGrKZAAUAAAAAAAAAAAAAAAAAAAAAKc/BSZPIwHSPScX/4pcRP/Khmb/9ryc//nMt//joHj/sXdd/3lT
NP+GRQjdv1sAKAAAAAAAAAAAAAAAAAAAAABvRSSlVDkh/3lkT/+PdmH/rIhr/8KjiP/BpY7/s5iB/5F2
YP90W0b/YzwZ/4U+ALEAAAAAAAAAAAAAAACqZztfdVU6/8Oxov+2nIP/pnlM/6h3Sf/DpIf/2Maw/72p
i/9/Xz//XDwd/1IuDP9ZMgr/eTYAUwAAAACuXisxYjYYsWc7Fv+qhV//snIw/61PAP+6bCT/6tW///38
+v/Wvqb/kF8s/2IwAP9jQB//XDwe/1QsBMVUKAAnYiQAR1YhAexiMAb/mU8G/7hnE//CYwL/yXUj/+a/
lP/s1Lb/zZxi/6hsLP+ZbUH/o4xy/39mT/9aNhT3UigCVX0vAV9qLgP9dDsG/65ZBf/AYQX/55ZG/+iy
ev/ksXr/0ok5/71mBv+oVAD/uI1d/9TDsv+YhG7/Wz0f/0olBmqWQARafTwH+oNGDP/LcBv/5Ys9//62
cv//48L/9LyF/9Z3Kf/FbhL/umMH/693Of+uiF3/lHZd/1w+Iv9CIwVms1oVOZFJEN6OThn/7J5T//6/
hf//zKH//9+7//7Cf//ijkn/04Q6/8p5LP+1cCr/l2En/4FeOf9YOx/sPyEESMlsHwypUxSOwG4t//+8
f//6zqf/+Nu+///ixv//vob/9Kx1/+zCmv/itYv/uHUz/51kLP+IZED/QSMHpTcZABUAAAAAx1wUGu5v
JPHYnnL/59PA//z17v//+Ov//+XC//a5gv/y0rj/7tK2/8KGTv+ndkf/bUYj+jcaACkAAAAAAAAAAAAA
AADrZRdXqWI0/8q4qP////////78///24v/7xaD/5LmV/9usff/Djlz/k2Q4/0wkAWoAAAAAAAAAAAAA
AAAAAAAAAAAAAOqsdVG0e1Hs0LKV/+zg2f/m1cT/07CU/9Omd//Lj1X/omUt8mUwBGAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAA/u/cF8aBSHqyayrFp2815aBnLeahXhvJpVkKg4A8Ah0AAAAAAAAAAAAA
AAAAAAAA4AcAAMADAACAAwAAwAMAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAMAD
AADgBwAA8A8AAA==
</value>
</data>
</root>

View File

@@ -193,7 +193,7 @@ namespace mRemoteNG.UI.Forms
this.MinimumSize = new System.Drawing.Size(400, 400);
this.Name = "FrmMain";
this.Opacity = 0D;
this.Text = "mRemoteNG";
this.Text = " ";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
this.Load += new System.EventHandler(this.frmMain_Load);
this.Shown += new System.EventHandler(this.frmMain_Shown);

View File

@@ -189,6 +189,9 @@ namespace mRemoteNG.UI.Forms
if (!panelAdder.DoesPanelExist(panelName))
panelAdder.AddPanel(panelName);
}
FrmSplashScreen frmSplashScreen = FrmSplashScreen.getInstance();
frmSplashScreen.Close();
}
private void ApplyLanguage()

View File

@@ -1,4 +1,5 @@
using System;
using System.Diagnostics;
using System.Windows.Forms;
using mRemoteNG.App;
using mRemoteNG.App.Info;
@@ -142,39 +143,19 @@ namespace mRemoteNG.UI.Menu
}
#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 mMenToolsUpdate_Click(object sender, EventArgs e) => Windows.Show(WindowType.Update);
private void mMenInfoForum_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlForum);
}
private void mMenInfoHelp_Click(object sender, EventArgs e) => Windows.Show(WindowType.Help);
private void mMenInfoBugReport_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlBugs);
}
private void mMenInfoForum_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlForum);
private void mMenInfoWebsite_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlHome);
}
private void mMenInfoBugReport_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlBugs);
private void mMenInfoDonate_Click(object sender, EventArgs e)
{
WebHelper.GoToUrl(GeneralAppInfo.UrlDonate);
}
private void mMenInfoWebsite_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlHome);
private void mMenInfoAbout_Click(object sender, EventArgs e)
{
Windows.Show(WindowType.About);
}
private void mMenInfoDonate_Click(object sender, EventArgs e) => Process.Start(GeneralAppInfo.UrlDonate);
private void mMenInfoAbout_Click(object sender, EventArgs e) => Windows.Show(WindowType.About);
#endregion
}
}

View File

@@ -58,7 +58,7 @@ namespace mRemoteNG.UI.Window
this.olvConnections.IsSimpleDragSource = true;
this.olvConnections.IsSimpleDropSink = true;
this.olvConnections.LabelEdit = true;
this.olvConnections.Location = new System.Drawing.Point(0, 41);
this.olvConnections.Location = new System.Drawing.Point(0, 24);
this.olvConnections.MultiSelect = false;
this.olvConnections.Name = "olvConnections";
this.olvConnections.NodeDeletionConfirmer = alwaysConfirmYes1;
@@ -68,7 +68,7 @@ namespace mRemoteNG.UI.Window
this.olvConnections.ShowGroups = false;
treeNodeCompositeClickHandler2.ClickHandlers = new mRemoteNG.Tree.ITreeNodeClickHandler<mRemoteNG.Connection.ConnectionInfo>[0];
this.olvConnections.SingleClickHandler = treeNodeCompositeClickHandler2;
this.olvConnections.Size = new System.Drawing.Size(204, 370);
this.olvConnections.Size = new System.Drawing.Size(204, 366);
this.olvConnections.TabIndex = 20;
this.olvConnections.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.olvConnections.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
@@ -153,20 +153,20 @@ namespace mRemoteNG.UI.Window
this.PictureBoxSearch.Location = new System.Drawing.Point(0, 0);
this.PictureBoxSearch.Margin = new System.Windows.Forms.Padding(0);
this.PictureBoxSearch.Name = "PictureBoxSearch";
this.PictureBoxSearch.Size = new System.Drawing.Size(24, 17);
this.PictureBoxSearch.Size = new System.Drawing.Size(26, 21);
this.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.PictureBoxSearch.TabIndex = 1;
this.PictureBoxSearch.TabStop = false;
//
// txtSearch
//
this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.txtSearch.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtSearch.ForeColor = System.Drawing.SystemColors.GrayText;
this.txtSearch.Location = new System.Drawing.Point(24, 0);
this.txtSearch.Location = new System.Drawing.Point(26, 3);
this.txtSearch.Margin = new System.Windows.Forms.Padding(0);
this.txtSearch.Name = "txtSearch";
this.txtSearch.Size = new System.Drawing.Size(180, 15);
this.txtSearch.Size = new System.Drawing.Size(178, 15);
this.txtSearch.TabIndex = 30;
this.txtSearch.TabStop = false;
this.txtSearch.Text = "Search";
@@ -179,16 +179,16 @@ namespace mRemoteNG.UI.Window
//
this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.Control;
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 24F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 26F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.PictureBoxSearch, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.txtSearch, 1, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 24);
this.tableLayoutPanel1.Controls.Add(this.txtSearch);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 390);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(204, 17);
this.tableLayoutPanel1.Size = new System.Drawing.Size(204, 21);
this.tableLayoutPanel1.TabIndex = 32;
//
// PictureBox1
@@ -236,7 +236,7 @@ namespace mRemoteNG.UI.Window
private WeifenLuo.WinFormsUI.Docking.VisualStudioToolStripExtender vsToolStripExtender;
internal System.Windows.Forms.PictureBox PictureBoxSearch;
internal Controls.Base.NGTextBox txtSearch;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
internal System.Windows.Forms.PictureBox PictureBox1;
public System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
}
}

View File

@@ -51,7 +51,18 @@ namespace mRemoteNG.UI.Window
ConnectionTree.UseFiltering = Settings.Default.UseFilterSearch;
ApplyFiltering();
}
}
PlaceSearchBar(Settings.Default.PlaceSearchBarAboveConnectionTree);
}
private void PlaceSearchBar(bool placeSearchBarAboveConnectionTree)
{
if (placeSearchBarAboveConnectionTree)
tableLayoutPanel1.Dock = DockStyle.Top;
else
tableLayoutPanel1.Dock = DockStyle.Bottom;
}
#region Form Stuff

View File

@@ -485,6 +485,12 @@
<Compile Include="UI\Forms\frmOptions.Designer.cs">
<DependentUpon>frmOptions.cs</DependentUpon>
</Compile>
<Compile Include="UI\Forms\FrmSplashScreen.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\Forms\FrmSplashScreen.Designer.cs">
<DependentUpon>FrmSplashScreen.cs</DependentUpon>
</Compile>
<Compile Include="UI\Forms\FullscreenHandler.cs" />
<Compile Include="UI\Forms\Input\InputBox.cs">
<SubType>Form</SubType>
@@ -795,6 +801,9 @@
<EmbeddedResource Include="UI\Forms\frmOptions.resx">
<DependentUpon>frmOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\FrmSplashScreen.resx">
<DependentUpon>FrmSplashScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\Forms\Input\InputBox.resx">
<DependentUpon>InputBox.cs</DependentUpon>
</EmbeddedResource>
@@ -996,6 +1005,7 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<<<<<<< HEAD
<Content Include="Resources\Help\Screenshots\CommonProblemsRDP\credssp-error.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -1090,6 +1100,9 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Help\ui_navigation.htm">
=======
<Content Include="Icons\Apple.ico">
>>>>>>> upstream/develop
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Schemas\mremoteng_confcons_v2_6.xsd">

View File

@@ -1,9 +0,0 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cconnectionserializers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Ccredentialserializer/@EntryIndexedValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cexportserializers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cexternalserializers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=config_005Cserializers_005Cmiscserializers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=messages_005Cmessagefilteringoptions/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=tree_005Cclickhandlers/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ui_005Ccontrols_005Cconnectiontree/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ReferencePath>
</ReferencePath>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
<UpdateUrlHistory />
<BootstrapperUrlHistory />
<ErrorReportUrlHistory />
<FallbackCulture>en-US</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
</PropertyGroup>
<PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging>
</PropertyGroup>
</Project>