mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 14:07:46 +08:00
Added a task dialog to ask the user about automatic updates on first run instead of just showing the update options page without any explanation.
This commit is contained in:
@@ -61,9 +61,15 @@ Public Class frmMain
|
||||
End If
|
||||
|
||||
If Not My.Settings.CheckForUpdatesAsked Then
|
||||
Windows.Show(UI.Window.Type.Options)
|
||||
Windows.optionsForm.ShowUpdatesTab()
|
||||
My.Settings.CheckForUpdatesAsked = True
|
||||
Dim CommandButtons() As String = {My.Resources.strAskUpdatesCommandRecommended, My.Resources.strAskUpdatesCommandCustom, My.Resources.strAskUpdatesCommandAskLater}
|
||||
Dim Result As DialogResult = cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Resources.strAskUpdatesMainInstruction, String.Format(My.Resources.strAskUpdatesContent, My.Application.Info.ProductName), "", "", "", "", String.Join("|", CommandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question)
|
||||
If cTaskDialog.CommandButtonResult = 0 Or cTaskDialog.CommandButtonResult = 1 Then
|
||||
My.Settings.CheckForUpdatesAsked = True
|
||||
End If
|
||||
If cTaskDialog.CommandButtonResult = 1 Then
|
||||
Windows.Show(UI.Window.Type.Options)
|
||||
Windows.optionsForm.ShowUpdatesTab()
|
||||
End If
|
||||
End If
|
||||
|
||||
Startup.UpdateCheck()
|
||||
@@ -141,7 +147,7 @@ Public Class frmMain
|
||||
|
||||
Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
|
||||
If My.Settings.ConfirmExit And wL.Count > 0 Then
|
||||
Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.AssemblyName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
|
||||
Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
|
||||
If cTaskDialog.VerificationChecked Then
|
||||
My.Settings.ConfirmExit = False
|
||||
End If
|
||||
|
||||
47
mRemoteV1/My Project/Resources.Designer.vb
generated
47
mRemoteV1/My Project/Resources.Designer.vb
generated
@@ -1,7 +1,7 @@
|
||||
'------------------------------------------------------------------------------
|
||||
' <auto-generated>
|
||||
' This code was generated by a tool.
|
||||
' Runtime Version:2.0.50727.5444
|
||||
' Runtime Version:2.0.50727.4959
|
||||
'
|
||||
' Changes to this file may cause incorrect behavior and will be lost if
|
||||
' the code is regenerated.
|
||||
@@ -861,6 +861,51 @@ Namespace My.Resources
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Ask me again later.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property strAskUpdatesCommandAskLater() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("strAskUpdatesCommandAskLater", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Customize the settings now.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property strAskUpdatesCommandCustom() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("strAskUpdatesCommandCustom", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Use the recommended settings.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property strAskUpdatesCommandRecommended() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("strAskUpdatesCommandRecommended", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to {0} can automatically check for updates that may provide new features and bug fixes. It is recommended that you allow {0} to check for updates weekly..
|
||||
'''</summary>
|
||||
Friend ReadOnly Property strAskUpdatesContent() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("strAskUpdatesContent", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Automatic update settings.
|
||||
'''</summary>
|
||||
Friend ReadOnly Property strAskUpdatesMainInstruction() As String
|
||||
Get
|
||||
Return ResourceManager.GetString("strAskUpdatesMainInstruction", resourceCulture)
|
||||
End Get
|
||||
End Property
|
||||
|
||||
'''<summary>
|
||||
''' Looks up a localized string similar to Aspect.
|
||||
'''</summary>
|
||||
|
||||
@@ -2292,4 +2292,19 @@ Error Description: {1}</value>
|
||||
<data name="strLanguageRestartRequired" xml:space="preserve">
|
||||
<value>{0} must be restarted before changes to the language will take effect.</value>
|
||||
</data>
|
||||
<data name="strAskUpdatesCommandAskLater" xml:space="preserve">
|
||||
<value>Ask me again later</value>
|
||||
</data>
|
||||
<data name="strAskUpdatesCommandCustom" xml:space="preserve">
|
||||
<value>Customize the settings now</value>
|
||||
</data>
|
||||
<data name="strAskUpdatesCommandRecommended" xml:space="preserve">
|
||||
<value>Use the recommended settings</value>
|
||||
</data>
|
||||
<data name="strAskUpdatesContent" xml:space="preserve">
|
||||
<value>{0} can automatically check for updates that may provide new features and bug fixes. It is recommended that you allow {0} to check for updates weekly.</value>
|
||||
</data>
|
||||
<data name="strAskUpdatesMainInstruction" xml:space="preserve">
|
||||
<value>Automatic update settings</value>
|
||||
</data>
|
||||
</root>
|
||||
Reference in New Issue
Block a user