diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 5b50cb8e6..c391cac2c 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -479,7 +479,6 @@ Namespace App With DefaultConnection My.Settings.ConDefaultDescription = .Description My.Settings.ConDefaultIcon = .Icon - My.Settings.ConDefaultPanel = .Panel My.Settings.ConDefaultUsername = .Username My.Settings.ConDefaultPassword = .Password My.Settings.ConDefaultDomain = .Domain diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index f5c25dbe3..82a4945a1 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -914,7 +914,7 @@ Namespace Config conI.Inherit = New Connection.Info.Inheritance(conI, .Attributes("Inherit").Value) conI.Icon = .Attributes("Icon").Value.Replace(".ico", "") - conI.Panel = "General" + conI.Panel = My.Resources.strGeneral End If If Me.confVersion > 1.4 Then '1.5 diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index e7fcbf796..ebb3e9ee1 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/mRemoteV1/Connection/Connection.Info.vb @@ -75,7 +75,7 @@ Namespace Connection End Set End Property - Private _Panel As String = My.Settings.ConDefaultPanel + Private _Panel As String = My.Resources.strGeneral Aussehen - Generell + Allgemein Wählen Sie, welche Authentifizierungs-Variante verwendet wird. @@ -1957,4 +1957,10 @@ Fehler Beschreibung: {1} RDP Verbindungsversuche + + Benutzt die DockPanel Suite von [Weifen Luo] + + + Allgemein + \ No newline at end of file diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 07a53e61b..f0686c28b 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:2.0.50727.4927 +' Laufzeitversion:2.0.50727.4952 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -2249,6 +2249,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die General ähnelt. + ''' + Friend ReadOnly Property strGeneral() As String + Get + Return ResourceManager.GetString("strGeneral", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Get Connection Info From SQL failed ähnelt. ''' @@ -6151,6 +6160,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Uses the DockPanel Suite by [Weifen Luo] ähnelt. + ''' + Friend ReadOnly Property strWeifenLuoAttribution() As String + Get + Return ResourceManager.GetString("strWeifenLuoAttribution", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die http://sourceforge.net/projects/dockpanelsuite/ ähnelt. + ''' + Friend ReadOnly Property strWeifenLuoAttributionURL() As String + Get + Return ResourceManager.GetString("strWeifenLuoAttributionURL", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Windows ähnelt. ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index 3a9cf508e..1c7da4859 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -2274,4 +2274,13 @@ Error Description: {1} RDP Reconnection Count + + Uses the DockPanel Suite by [Weifen Luo] + + + http://sourceforge.net/projects/dockpanelsuite/ + + + General + \ No newline at end of file diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb index bce182a25..ee7231c36 100644 --- a/mRemoteV1/My Project/Settings.Designer.vb +++ b/mRemoteV1/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:2.0.50727.4927 +' Laufzeitversion:2.0.50727.4952 ' ' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' der Code erneut generiert wird. @@ -547,19 +547,6 @@ Namespace My End Set End Property - _ - Public Property ConDefaultPanel() As String - Get - Return CType(Me("ConDefaultPanel"),String) - End Get - Set - Me("ConDefaultPanel") = value - End Set - End Property - - - General - diff --git a/mRemoteV1/UI/UI.Window.About.vb b/mRemoteV1/UI/UI.Window.About.vb index 2a5dc097d..f3ed1b46a 100644 --- a/mRemoteV1/UI/UI.Window.About.vb +++ b/mRemoteV1/UI/UI.Window.About.vb @@ -19,6 +19,7 @@ Namespace UI Friend WithEvents lblEdition As System.Windows.Forms.Label Friend WithEvents llblFAMFAMFAM As System.Windows.Forms.LinkLabel Friend WithEvents llblMagicLibrary As System.Windows.Forms.LinkLabel + Friend WithEvents llblWeifenLuo As System.Windows.Forms.LinkLabel Friend WithEvents pnlTop As System.Windows.Forms.Panel Private Sub InitializeComponent() @@ -26,6 +27,7 @@ Namespace UI Me.lblEdition = New System.Windows.Forms.Label Me.pbLogo = New System.Windows.Forms.PictureBox Me.pnlBottom = New System.Windows.Forms.Panel + Me.llblWeifenLuo = New System.Windows.Forms.LinkLabel Me.llblMagicLibrary = New System.Windows.Forms.LinkLabel Me.llblFAMFAMFAM = New System.Windows.Forms.LinkLabel Me.txtChangeLog = New System.Windows.Forms.TextBox @@ -82,6 +84,7 @@ Namespace UI Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pnlBottom.BackColor = System.Drawing.SystemColors.Control + Me.pnlBottom.Controls.Add(Me.llblWeifenLuo) Me.pnlBottom.Controls.Add(Me.llblMagicLibrary) Me.pnlBottom.Controls.Add(Me.llblFAMFAMFAM) Me.pnlBottom.Controls.Add(Me.txtChangeLog) @@ -96,6 +99,20 @@ Namespace UI Me.pnlBottom.Size = New System.Drawing.Size(788, 418) Me.pnlBottom.TabIndex = 1 ' + 'llblWeifenLuo + ' + Me.llblWeifenLuo.AutoSize = True + Me.llblWeifenLuo.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.llblWeifenLuo.ForeColor = System.Drawing.SystemColors.ControlText + Me.llblWeifenLuo.LinkColor = System.Drawing.Color.Blue + Me.llblWeifenLuo.Location = New System.Drawing.Point(16, 158) + Me.llblWeifenLuo.Name = "llblWeifenLuo" + Me.llblWeifenLuo.Size = New System.Drawing.Size(78, 22) + Me.llblWeifenLuo.TabIndex = 9 + Me.llblWeifenLuo.TabStop = True + Me.llblWeifenLuo.Text = "WeifenLuo" + Me.llblWeifenLuo.UseCompatibleTextRendering = True + ' 'llblMagicLibrary ' Me.llblMagicLibrary.AutoSize = True @@ -134,12 +151,12 @@ Namespace UI Me.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Default Me.txtChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtChangeLog.ForeColor = System.Drawing.SystemColors.ControlText - Me.txtChangeLog.Location = New System.Drawing.Point(24, 200) + Me.txtChangeLog.Location = New System.Drawing.Point(24, 224) Me.txtChangeLog.Multiline = True Me.txtChangeLog.Name = "txtChangeLog" Me.txtChangeLog.ReadOnly = True Me.txtChangeLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtChangeLog.Size = New System.Drawing.Size(760, 216) + Me.txtChangeLog.Size = New System.Drawing.Size(760, 192) Me.txtChangeLog.TabIndex = 7 Me.txtChangeLog.TabStop = False ' @@ -172,7 +189,7 @@ Namespace UI Me.lblChangeLog.AutoSize = True Me.lblChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblChangeLog.ForeColor = System.Drawing.SystemColors.ControlText - Me.lblChangeLog.Location = New System.Drawing.Point(16, 176) + Me.lblChangeLog.Location = New System.Drawing.Point(16, 199) Me.lblChangeLog.Name = "lblChangeLog" Me.lblChangeLog.Size = New System.Drawing.Size(92, 22) Me.lblChangeLog.TabIndex = 6 @@ -285,6 +302,7 @@ Namespace UI FillLinkLabel(llblFAMFAMFAM, My.Resources.strFAMFAMFAMAttribution, My.Resources.strFAMFAMFAMAttributionURL) FillLinkLabel(llblMagicLibrary, My.Resources.strMagicLibraryAttribution, My.Resources.strMagicLibraryAttributionURL) + FillLinkLabel(llblWeifenLuo, My.Resources.strWeifenLuoAttribution, My.Resources.strWeifenLuoAttributionURL) If File.Exists(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT") Then Dim sR As New StreamReader(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT") @@ -303,6 +321,10 @@ Namespace UI Private Sub llblMagicLibrary_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblMagicLibrary.LinkClicked App.Runtime.GoToURL(My.Resources.strMagicLibraryAttributionURL) End Sub + + Private Sub llblWeifenLuo_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblMagicLibrary.LinkClicked, llblWeifenLuo.LinkClicked + App.Runtime.GoToURL(My.Resources.strWeifenLuoAttributionURL) + End Sub #End Region End Class End Namespace diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 65951aa69..542ed8989 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -173,9 +173,6 @@ - - General -