diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 8ce92fd..37d3eab 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -1935,11 +1935,11 @@ Public Class frmMain Dim sWinePrefix As String = mgrPath.GetWinePrefix(oProcess.FoundProcess) Dim sWineSavePath As String If Not sWinePrefix = String.Empty Then - UpdateLog(oProcess.GameInfo.Name & " Wine Prefix: " & sWinePrefix, False) + UpdateLog(mgrCommon.FormatString(frmMain_WinePrefix, New String() {oProcess.GameInfo.Name, sWinePrefix}), False) sWineSavePath = mgrPath.GetWineSavePath(sWinePrefix, oProcess.GameInfo.TruePath) If Not sWineSavePath = oProcess.GameInfo.TruePath Then oProcess.GameInfo.TruePath = sWineSavePath - UpdateLog(oProcess.GameInfo.Name & " Converted Save Path: " & sWineSavePath, False) + UpdateLog(mgrCommon.FormatString(frmMain_WineSavePath, New String() {oProcess.GameInfo.Name, sWineSavePath}), False) End If End If End If diff --git a/GBM/Managers/mgrPath.vb b/GBM/Managers/mgrPath.vb index 29d8fb5..9cfe373 100644 --- a/GBM/Managers/mgrPath.vb +++ b/GBM/Managers/mgrPath.vb @@ -225,7 +225,7 @@ Public Class mgrPath Return sWinePrefix & Path.DirectorySeparatorChar & sRealPath Catch ex As Exception - MsgBox(ex.Message) + mgrCommon.ShowMessage(mgrPath_ErrorBuildingWinePath, ex.Message, MsgBoxStyle.Exclamation) Return String.Empty End Try End Function @@ -271,7 +271,7 @@ Public Class mgrPath Return sPath Catch ex As Exception - MsgBox(ex.Message) + mgrCommon.ShowMessage(mgrPath_ErrorConvertWineSavePath, ex.Message, MsgBoxStyle.Exclamation) Return sPath End Try End Function @@ -298,7 +298,7 @@ Public Class mgrPath Return String.Empty End If Catch ex As Exception - MsgBox(ex.Message) + mgrCommon.ShowMessage(mgrPath_ErrorWinePrefix, ex.Message, MsgBoxStyle.Exclamation) Return String.Empty End Try End Function diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index def094c..504fcd7 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -3876,6 +3876,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to [PARAM] Wine Prefix: [PARAM]. + ''' + Friend ReadOnly Property frmMain_WinePrefix() As String + Get + Return ResourceManager.GetString("frmMain_WinePrefix", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to [PARAM] Converted Save Path: [PARAM]. + ''' + Friend ReadOnly Property frmMain_WineSavePath() As String + Get + Return ResourceManager.GetString("frmMain_WineSavePath", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to +. ''' @@ -6087,6 +6105,33 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to An error occured when building a Wine path.[BR][BR][PARAM]. + ''' + Friend ReadOnly Property mgrPath_ErrorBuildingWinePath() As String + Get + Return ResourceManager.GetString("mgrPath_ErrorBuildingWinePath", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to An error occured when converting to a Wine save path.[BR][BR][PARAM]. + ''' + Friend ReadOnly Property mgrPath_ErrorConvertWineSavePath() As String + Get + Return ResourceManager.GetString("mgrPath_ErrorConvertWineSavePath", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to An error occured when determining a Wine prefix.[BR][BR][PARAM]. + ''' + Friend ReadOnly Property mgrPath_ErrorWinePrefix() As String + Get + Return ResourceManager.GetString("mgrPath_ErrorWinePrefix", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to An error occured while determining a required system path. [BR][BR]The environment value for [PARAM] is empty.[BR][BR]The application will now exit.. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 8f16cb6..056b5e8 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2203,4 +2203,19 @@ The backup folder [PARAM] cannot be renamed to [PARAM] because a folder with that name already exists.[BR][BR]Do you want to continue and remove the existing folder? + + [PARAM] Wine Prefix: [PARAM] + + + [PARAM] Converted Save Path: [PARAM] + + + An error occured when building a Wine path.[BR][BR][PARAM] + + + An error occured when converting to a Wine save path.[BR][BR][PARAM] + + + An error occured when determining a Wine prefix.[BR][BR][PARAM] + \ No newline at end of file