Show Update Options page on first startup. Fixed persistence configuration for some settings. Code to load and save new update settings.

2026-02-17 14:07:46 +08:00 · 2010-01-17 16:20:15 -06:00
parent f80eadaa0d
commit 149f5785ad
8 changed files with 104 additions and 27 deletions
--- a/mRemoteV1/Config/Config.Settings.Load.vb
+++ b/mRemoteV1/Config/Config.Settings.Load.vb
@@ -79,9 +79,9 @@ Namespace Config
                        Me.LoadExternalAppsFromXML()

                        If My.Settings.ResetToolbars = False Then
-                            Me.LoadToolbarsFromSettings()
+                            LoadToolbarsFromSettings()
                        Else
-                            Me.SetToolbarsDefault()
+                            SetToolbarsDefault()
                        End If
                    End With
                Catch ex As Exception
--- a/mRemoteV1/Forms/frmMain.vb
+++ b/mRemoteV1/Forms/frmMain.vb
@@ -44,16 +44,14 @@ Public Class frmMain
        'LoadCredentials()
        LoadConnections()

-        'If My.Settings.FirstStart Then
-        '   Windows.Show(UI.Window.Type.About)
-        'End If
-
        If My.Settings.StartupComponentsCheck Then
            Windows.Show(UI.Window.Type.ComponentsCheck)
        End If

        If Not My.Settings.CheckForUpdatesAsked Then
-            ' TODO: Show updates options
+            Windows.Show(UI.Window.Type.Options)
+            Windows.optionsForm.ShowUpdatesTab()
+
        End If

        Startup.UpdateCheck()
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -760,6 +760,42 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Every {0} days.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyCustom() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyCustom", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Daily.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyDaily() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyDaily", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Monthly.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyMonthly() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyMonthly", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Weekly.
+        '''</summary>
+        Friend ReadOnly Property strUpdateFrequencyWeekly() As String
+            Get
+                Return ResourceManager.GetString("strUpdateFrequencyWeekly", resourceCulture)
+            End Get
+        End Property
+        
        Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
            Get
                Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -448,4 +448,16 @@
  <data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="strUpdateFrequencyCustom" xml:space="preserve">
+    <value>Every {0} days</value>
+  </data>
+  <data name="strUpdateFrequencyDaily" xml:space="preserve">
+    <value>Daily</value>
+  </data>
+  <data name="strUpdateFrequencyMonthly" xml:space="preserve">
+    <value>Monthly</value>
+  </data>
+  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
+    <value>Weekly</value>
+  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -252,7 +252,7 @@ Namespace My
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
        Public Property CheckForUpdatesOnStartup() As Boolean
            Get
                Return CType(Me("CheckForUpdatesOnStartup"),Boolean)
@@ -445,7 +445,6 @@ Namespace My
        End Property
        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
        Public Property ResetPanels() As Boolean
@@ -952,10 +951,8 @@ Namespace My
        End Property
        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
-         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
        Public Property ResetToolbars() As Boolean
            Get
                Return CType(Me("ResetToolbars"),Boolean)
@@ -1928,6 +1925,7 @@ Namespace My
        End Property
        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
        Public Property CheckForUpdatesAsked() As Boolean
@@ -1940,6 +1938,7 @@ Namespace My
        End Property
        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemote.Config.Settings.Providers.ChooseProvider)),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("7")>  _
        Public Property CheckForUpdatesFrequencyDays() As Integer
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -48,7 +48,7 @@
      <Value Profile="(Default)">False</Value>
    </Setting>
    <Setting Name="CheckForUpdatesOnStartup" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
+      <Value Profile="(Default)">True</Value>
    </Setting>
    <Setting Name="ShowDescriptionTooltipsInTree" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
@@ -92,7 +92,7 @@
    <Setting Name="ShowProtocolOnTabs" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
    </Setting>
-    <Setting Name="ResetPanels" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ResetPanels" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
    </Setting>
    <Setting Name="UpdateUseProxy" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
@@ -209,7 +209,7 @@
    <Setting Name="QuickyTBParentDock" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
      <Value Profile="(Default)">Top</Value>
    </Setting>
-    <Setting Name="ResetToolbars" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Roaming="true" Type="System.Boolean" Scope="User">
+    <Setting Name="ResetToolbars" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
    </Setting>
    <Setting Name="UseSQLServer" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
@@ -434,10 +434,10 @@
    <Setting Name="LastAnnouncement" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
    </Setting>
-    <Setting Name="CheckForUpdatesAsked" Type="System.Boolean" Scope="User">
+    <Setting Name="CheckForUpdatesAsked" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
    </Setting>
-    <Setting Name="CheckForUpdatesFrequencyDays" Type="System.Int32" Scope="User">
+    <Setting Name="CheckForUpdatesFrequencyDays" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
      <Value Profile="(Default)">7</Value>
    </Setting>
  </Settings>
--- a/mRemoteV1/UI/UI.Window.Options.vb
+++ b/mRemoteV1/UI/UI.Window.Options.vb
@@ -299,7 +299,6 @@ Namespace UI
                '
                Me.cboUpdateCheckFrequency.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
                Me.cboUpdateCheckFrequency.FormattingEnabled = True
-                Me.cboUpdateCheckFrequency.Items.AddRange(New Object() {"Daily", "Weekly", "Monthly"})
                Me.cboUpdateCheckFrequency.Location = New System.Drawing.Point(48, 40)
                Me.cboUpdateCheckFrequency.Name = "cboUpdateCheckFrequency"
                Me.cboUpdateCheckFrequency.Size = New System.Drawing.Size(128, 23)
@@ -1351,7 +1350,6 @@ Namespace UI
                Try
                    Me.chkSaveConsOnExit.Checked = My.Settings.SaveConsOnExit
                    Me.chkConfirmExit.Checked = My.Settings.ConfirmExit
-                    Me.chkCheckForUpdatesOnStartup.Checked = My.Settings.CheckForUpdatesOnStartup
                    Me.chkReconnectOnStart.Checked = My.Settings.OpenConsFromLastSession
                    Me.chkProperInstallationOfComponentsAtStartup.Checked = My.Settings.StartupComponentsCheck

@@ -1394,6 +1392,27 @@ Namespace UI
                    Me.chkMCWarnings.Checked = My.Settings.SwitchToMCOnWarning
                    Me.chkMCErrors.Checked = My.Settings.SwitchToMCOnError

+                    chkCheckForUpdatesOnStartup.Checked = My.Settings.CheckForUpdatesOnStartup
+                    cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked
+                    cboUpdateCheckFrequency.Items.Clear()
+                    Dim nDaily As Integer = cboUpdateCheckFrequency.Items.Add(My.Resources.strUpdateFrequencyDaily)
+                    Dim nWeekly As Integer = cboUpdateCheckFrequency.Items.Add(My.Resources.strUpdateFrequencyWeekly)
+                    Dim nMonthly As Integer = cboUpdateCheckFrequency.Items.Add(My.Resources.strUpdateFrequencyMonthly)
+                    Select Case My.Settings.CheckForUpdatesFrequencyDays
+                        Case Is < 1
+                            chkCheckForUpdatesOnStartup.Checked = False
+                            cboUpdateCheckFrequency.SelectedIndex = nDaily
+                        Case 1 ' Daily
+                            cboUpdateCheckFrequency.SelectedIndex = nDaily
+                        Case 7 ' Weekly
+                            cboUpdateCheckFrequency.SelectedIndex = nWeekly
+                        Case 31 ' Monthly
+                            cboUpdateCheckFrequency.SelectedIndex = nMonthly
+                        Case Else
+                            Dim nCustom As Integer = cboUpdateCheckFrequency.Items.Add(String.Format(My.Resources.strUpdateFrequencyCustom, My.Settings.CheckForUpdatesFrequencyDays))
+                            cboUpdateCheckFrequency.SelectedIndex = nCustom
+                    End Select
+
                    Me.chkWriteLogFile.Checked = My.Settings.WriteLogFile
                    Me.chkEncryptCompleteFile.Checked = My.Settings.EncryptCompleteConnectionsFile
                    Me.chkAutomaticallyGetSessionInfo.Checked = My.Settings.AutomaticallyGetSessionInfo
@@ -1428,7 +1447,6 @@ Namespace UI
                Try
                    My.Settings.SaveConsOnExit = Me.chkSaveConsOnExit.Checked
                    My.Settings.ConfirmExit = Me.chkConfirmExit.Checked
-                    My.Settings.CheckForUpdatesOnStartup = Me.chkCheckForUpdatesOnStartup.Checked
                    My.Settings.OpenConsFromLastSession = Me.chkReconnectOnStart.Checked
                    My.Settings.StartupComponentsCheck = Me.chkProperInstallationOfComponentsAtStartup.Checked

@@ -1489,6 +1507,18 @@ Namespace UI
                    My.Settings.SwitchToMCOnWarning = Me.chkMCWarnings.Checked
                    My.Settings.SwitchToMCOnError = Me.chkMCErrors.Checked

+                    My.Settings.CheckForUpdatesOnStartup = chkCheckForUpdatesOnStartup.Checked
+                    Select Case cboUpdateCheckFrequency.SelectedItem.ToString()
+                        Case My.Resources.strUpdateFrequencyDaily
+                            My.Settings.CheckForUpdatesFrequencyDays = 1
+                        Case My.Resources.strUpdateFrequencyWeekly
+                            My.Settings.CheckForUpdatesFrequencyDays = 7
+                        Case My.Resources.strUpdateFrequencyMonthly
+                            My.Settings.CheckForUpdatesFrequencyDays = 31
+                        Case Else
+                            ' Custom so do not change
+                    End Select
+
                    My.Settings.WriteLogFile = Me.chkWriteLogFile.Checked
                    My.Settings.EncryptCompleteConnectionsFile = Me.chkEncryptCompleteFile.Checked
                    My.Settings.AutomaticallyGetSessionInfo = Me.chkAutomaticallyGetSessionInfo.Checked
@@ -1544,6 +1574,10 @@ Namespace UI
                Me.DockPnl = Panel
                Me.InitializeComponent()
            End Sub
+
+            Public Sub ShowUpdatesTab()
+                TabController.SelectedTab = tabUpdates
+            End Sub
 #End Region

 #Region "Form Stuff"
@@ -1720,6 +1754,10 @@ Namespace UI
                oDlg = Nothing
            End Sub

+            Private Sub chkCheckForUpdatesOnStartup_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkCheckForUpdatesOnStartup.CheckedChanged
+                cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked
+            End Sub
+
            Private Sub chkUseProxyForAutomaticUpdates_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkUseProxyForAutomaticUpdates.CheckedChanged
                Me.pnlProxyBasic.Enabled = Me.chkUseProxyForAutomaticUpdates.Checked
                Me.btnTestProxy.Enabled = Me.chkUseProxyForAutomaticUpdates.Checked
@@ -1757,8 +1795,6 @@ Namespace UI
                End If
            End Sub

-
-
            Private Sub btnCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCancel.Click
                Me.Close()
            End Sub
@@ -1768,10 +1804,6 @@ Namespace UI
                Me.Close()
            End Sub
 #End Region
-
-            Private Sub TabController_SelectionChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TabController.SelectionChanged
-
-            End Sub
        End Class
    End Namespace
 End Namespace
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -103,7 +103,7 @@
                <value>False</value>
            </setting>
            <setting name="CheckForUpdatesOnStartup" serializeAs="String">
-                <value>False</value>
+                <value>True</value>
            </setting>
            <setting name="ShowDescriptionTooltipsInTree" serializeAs="String">
                <value>False</value>