Weifen Luo should be mentioned on the about page

Default Panel is now translated and no longer set in app.config
2026-02-25 19:38:37 +08:00 · 2011-02-20 14:28:40 +01:00
parent e06d914d0a
commit 6ea439e08b
10 changed files with 72 additions and 28 deletions
--- 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
--- 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
--- 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
        <LocalizedCategory("strCategoryDisplay", 1), _
            Browsable(True), _
            LocalizedDisplayName("strPropertyNamePanel"), _
--- a/mRemoteV1/Language/Resources.de.resx
+++ b/mRemoteV1/Language/Resources.de.resx
@@ -666,7 +666,7 @@
    <value>Aussehen</value>
  </data>
 	<data name="strCategoryGeneral" xml:space="preserve">
-    <value>Generell</value>
+    <value>Allgemein</value>
  </data>
 	<data name="strPropertyDescriptionAuthenticationLevel" xml:space="preserve">
    <value>Wählen Sie, welche Authentifizierungs-Variante verwendet wird.</value>
@@ -1957,4 +1957,10 @@ Fehler Beschreibung: {1}</value>
 	<data name="strRdpReconnectCount" xml:space="preserve">
 		<value>RDP Verbindungsversuche</value>
 	</data>
+	<data name="strWeifenLuoAttribution" xml:space="preserve">
+		<value>Benutzt die DockPanel Suite von [Weifen Luo]</value>
+	</data>
+	<data name="strGeneral" xml:space="preserve">
+		<value>Allgemein</value>
+	</data>
 </root>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     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
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die General ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strGeneral() As String
+            Get
+                Return ResourceManager.GetString("strGeneral", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Get Connection Info From SQL failed ähnelt.
        '''</summary>
@@ -6151,6 +6160,24 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Uses the DockPanel Suite by [Weifen Luo] ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strWeifenLuoAttribution() As String
+            Get
+                Return ResourceManager.GetString("strWeifenLuoAttribution", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die http://sourceforge.net/projects/dockpanelsuite/ ähnelt.
+        '''</summary>
+        Friend ReadOnly Property strWeifenLuoAttributionURL() As String
+            Get
+                Return ResourceManager.GetString("strWeifenLuoAttributionURL", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Windows ähnelt.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -2274,4 +2274,13 @@ Error Description: {1}</value>
  <data name="strRdpReconnectCount" xml:space="preserve">
    <value>RDP Reconnection Count</value>
  </data>
+  <data name="strWeifenLuoAttribution" xml:space="preserve">
+    <value>Uses the DockPanel Suite by [Weifen Luo]</value>
+  </data>
+  <data name="strWeifenLuoAttributionURL" xml:space="preserve">
+    <value>http://sourceforge.net/projects/dockpanelsuite/</value>
+  </data>
+  <data name="strGeneral" xml:space="preserve">
+    <value>General</value>
+  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     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
        
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("General")>  _
-        Public Property ConDefaultPanel() As String
-            Get
-                Return CType(Me("ConDefaultPanel"),String)
-            End Get
-            Set
-                Me("ConDefaultPanel") = value
-            End Set
-        End Property
-        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -116,9 +116,6 @@
    <Setting Name="ConDefaultDescription" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
    </Setting>
-    <Setting Name="ConDefaultPanel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
-      <Value Profile="(Default)">General</Value>
-    </Setting>
    <Setting Name="ConDefaultUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
    </Setting>
--- 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
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -173,9 +173,6 @@
            <setting name="ConDefaultDescription" serializeAs="String">
                <value />
            </setting>
-            <setting name="ConDefaultPanel" serializeAs="String">
-                <value>General</value>
-            </setting>
            <setting name="ConDefaultUsername" serializeAs="String">
                <value />
            </setting>