From e2ff6834e53e5786b7df0b379f8ef591b0c98063 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 19 Feb 2019 23:13:36 -0700 Subject: [PATCH 1/2] should resolve issue #1 --- TATAddin/AddIn/HelpMenu/WebSiteButton.vb | 2 +- TATAddin/My Project/Resources.Designer.vb | 47 +++++++++-------------- TATAddin/My Project/Resources.resx | 9 ++--- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/TATAddin/AddIn/HelpMenu/WebSiteButton.vb b/TATAddin/AddIn/HelpMenu/WebSiteButton.vb index 5e306cd..1bd2119 100644 --- a/TATAddin/AddIn/HelpMenu/WebSiteButton.vb +++ b/TATAddin/AddIn/HelpMenu/WebSiteButton.vb @@ -4,7 +4,7 @@ Protected Overrides Sub OnClick() Try - Process.Start(My.Resources.GCDWebSiteURL) + Process.Start(My.Resources.WebSiteURL) Catch ex As Exception ExceptionUI.HandleException(ex) End Try diff --git a/TATAddin/My Project/Resources.Designer.vb b/TATAddin/My Project/Resources.Designer.vb index 25e37b7..e23cfe8 100644 --- a/TATAddin/My Project/Resources.Designer.vb +++ b/TATAddin/My Project/Resources.Designer.vb @@ -246,33 +246,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to joe.wheaton@usu.edu. - ''' - Friend ReadOnly Property GCDHelpEmail() As String - Get - Return ResourceManager.GetString("GCDHelpEmail", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to http://tat.riverscapes.xyz. - ''' - Friend ReadOnly Property GCDHelpWebSiteURL() As String - Get - Return ResourceManager.GetString("GCDHelpWebSiteURL", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to http://tat.riverscapes.xyz. - ''' - Friend ReadOnly Property GCDWebSiteURL() As String - Get - Return ResourceManager.GetString("GCDWebSiteURL", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -284,7 +257,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to http://tat.riverscapes.xyz. + ''' Looks up a localized string similar to http://tat.riverscapes.xyz/Help. ''' Friend ReadOnly Property HelpBaseURL() As String Get @@ -292,6 +265,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to joe.wheaton@usu.edu. + ''' + Friend ReadOnly Property HelpEmail() As String + Get + Return ResourceManager.GetString("HelpEmail", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to tutorials--how-to/i-setup-installation. ''' @@ -571,5 +553,14 @@ Namespace My.Resources Return ResourceManager.GetString("ttpHelp", resourceCulture) End Get End Property + + ''' + ''' Looks up a localized string similar to http://tat.riverscapes.xyz. + ''' + Friend ReadOnly Property WebSiteURL() As String + Get + Return ResourceManager.GetString("WebSiteURL", resourceCulture) + End Get + End Property End Module End Namespace diff --git a/TATAddin/My Project/Resources.resx b/TATAddin/My Project/Resources.resx index 0243d60..581164f 100644 --- a/TATAddin/My Project/Resources.resx +++ b/TATAddin/My Project/Resources.resx @@ -175,20 +175,17 @@ ..\Resources\GCD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + joe.wheaton@usu.edu - - http://tat.riverscapes.xyz - - + http://tat.riverscapes.xyz ..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - http://tat.riverscapes.xyz + http://tat.riverscapes.xyz/Help tutorials--how-to/i-setup-installation From 2983ef7e34fbc006792e555c93438ba12fd242c6 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 19 Feb 2019 23:44:01 -0700 Subject: [PATCH 2/2] should resolve issue #4, fixed name of class in Config.esriaddinx --- .../RoughnessAnalysis/SimpleToPCAT_RoughnessButton.vb | 3 +-- TATAddin/Config.esriaddinx | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TATAddin/AddIn/GCDAnalysisMenu/RoughnessAnalysis/SimpleToPCAT_RoughnessButton.vb b/TATAddin/AddIn/GCDAnalysisMenu/RoughnessAnalysis/SimpleToPCAT_RoughnessButton.vb index 6b21696..3fcb570 100644 --- a/TATAddin/AddIn/GCDAnalysisMenu/RoughnessAnalysis/SimpleToPCAT_RoughnessButton.vb +++ b/TATAddin/AddIn/GCDAnalysisMenu/RoughnessAnalysis/SimpleToPCAT_RoughnessButton.vb @@ -5,8 +5,7 @@ Dim frm As New frm_SimpleToPCAT_RoughnessRaster(My.ThisApplication) Try - If frm.ShowDialog() = System.Windows.Forms.DialogResult.OK Then - End If + frm.ShowDialog() Catch ex As Exception ExceptionUI.HandleException(ex) End Try diff --git a/TATAddin/Config.esriaddinx b/TATAddin/Config.esriaddinx index 6f0b9cf..039460d 100644 --- a/TATAddin/Config.esriaddinx +++ b/TATAddin/Config.esriaddinx @@ -29,7 +29,7 @@