Skip to content
This repository has been archived by the owner on Oct 4, 2020. It is now read-only.

Commit

Permalink
Version Update: 0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@SourMesen
SourMesen committed Dec 25, 2016
1 parent 8881559 commit 1fd3ef5
Show file tree
Hide file tree
Showing 21 changed files with 296 additions and 51 deletions.
4 changes: 2 additions & 2 deletions Core/EmulationSettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#include "EmulationSettings.h"
#include "VsControlManager.h"

//Version 0.6.0
//Version 0.6.1
uint16_t EmulationSettings::_versionMajor = 0;
uint8_t EmulationSettings::_versionMinor = 6;
uint8_t EmulationSettings::_versionRevision = 0;
uint8_t EmulationSettings::_versionRevision = 1;

Language EmulationSettings::_displayLanguage = Language::English;

Expand Down
2 changes: 1 addition & 1 deletion GUI.NET/Config/Configuration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class Configuration
private const int MaxRecentFiles = 10;
private bool _needToSave = false;

public string MesenVersion = "0.6.0";
public string MesenVersion = "0.6.1";
public PreferenceInfo PreferenceInfo;
public AudioInfo AudioInfo;
public VideoInfo VideoInfo;
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.es.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Sitio web:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Version: 0.6.0 (Beta)</Control>
<Control ID="labelVersion">Version: 0.6.1 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmVsGameConfig" Title="Configuración de juego VS">
Expand All @@ -454,6 +455,7 @@
<Control ID="lblLatestVersion">Última versión: </Control>
<Control ID="lblCurrentVersion">Versión actual: </Control>
<Control ID="lblChangeLog">Changelog</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating. Thank you!</Control>
<Control ID="btnUpdate">Actualizar</Control>
<Control ID="btnCancel">Cancelar</Control>
</Form>
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.fr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,8 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Site web:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Version: 0.6.0 (Beta)</Control>
<Control ID="labelVersion">Version: 0.6.1 (Beta)</Control>
<Control ID="lblDonate">Si vous voulez supporter le développement de Mesen, vous pouvez faire une donation. Merci de votre support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmVsGameConfig" Title="Configuration du jeu VS">
Expand All @@ -467,6 +468,7 @@
<Control ID="lblLatestVersion">Dernière version : </Control>
<Control ID="lblCurrentVersion">Version courante : </Control>
<Control ID="lblChangeLog">Changelog</Control>
<Control ID="lblDonate">Si vous voulez supporter Mesen, vous pouvez faire une donation. Merci!</Control>
<Control ID="btnUpdate">Mettre à jour</Control>
<Control ID="btnCancel">Annuler</Control>
</Form>
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.ja.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,13 +442,15 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">サイト:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">バージョン: 0.6.0 (ベータ版)</Control>
<Control ID="labelVersion">バージョン: 0.6.1 (ベータ版)</Control>
<Control ID="lblDonate">応援ありがとうございます！</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmUpdatePrompt" Title="Mesen ー アップデート可能">
<Control ID="lblLatestVersion">最新バージョン： </Control>
<Control ID="lblCurrentVersion">現在のバージョン： </Control>
<Control ID="lblChangeLog">更新歴</Control>
<Control ID="lblDonate">応援ありがとうございます！</Control>
<Control ID="btnUpdate">更新</Control>
<Control ID="btnCancel">キャンセル</Control>
</Form>
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.pt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,8 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Sitio web:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Version: 0.6.0 (Beta)</Control>
<Control ID="labelVersion">Version: 0.6.1 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmVsGameConfig" Title="Configuração de jogo VS">
Expand All @@ -454,6 +455,7 @@
<Control ID="lblLatestVersion">Última versão: </Control>
<Control ID="lblCurrentVersion">Versão atual: </Control>
<Control ID="lblChangeLog">Changelog</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating. Thank you!</Control>
<Control ID="btnUpdate">Atualizar</Control>
<Control ID="btnCancel">Cancelar</Control>
</Form>
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.ru.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,8 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Сайт:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Версия: 0.6.0 (Beta)</Control>
<Control ID="labelVersion">Версия: 0.6.1 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmVsGameConfig" Title="Конфигурация VS">
Expand All @@ -458,6 +459,7 @@
<Control ID="lblLatestVersion">Последняя версия : </Control>
<Control ID="lblCurrentVersion">Текущая версия : </Control>
<Control ID="lblChangeLog">Changelog</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating. Thank you!</Control>
<Control ID="btnUpdate">Обновить</Control>
<Control ID="btnCancel">Отмена</Control>
</Form>
Expand Down
4 changes: 3 additions & 1 deletion GUI.NET/Dependencies/resources.uk.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@
<Control ID="labelCopyright">© 2016 M. Bibaud (aka Sour)</Control>
<Control ID="lblWebsite">Сайт:</Control>
<Control ID="lblLink">www.mesen.ca</Control>
<Control ID="labelVersion">Версiя: 0.6.0 (Beta)</Control>
<Control ID="labelVersion">Версiя: 0.6.1 (Beta)</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating.&#xA;Thank you for your support!</Control>
<Control ID="okButton">&amp;OK</Control>
</Form>
<Form ID="frmVsGameConfig" Title="Конфігурація VS">
Expand All @@ -457,6 +458,7 @@
<Control ID="lblLatestVersion">Остання версія : </Control>
<Control ID="lblCurrentVersion">Поточна версія : </Control>
<Control ID="lblChangeLog">Changelog</Control>
<Control ID="lblDonate">If you want to support Mesen, please consider donating. Thank you!</Control>
<Control ID="btnUpdate">Оновити</Control>
<Control ID="btnCancel">Вiдмiна</Control>
</Form>
Expand Down
15 changes: 15 additions & 0 deletions GUI.NET/Forms/ResourceHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,21 @@ public static Language GetCurrentLanguage()
return _language;
}

public static string GetLanguageCode()
{
switch(ResourceHelper.GetCurrentLanguage()) {
case Language.English: return "en";
case Language.French: return "fr";
case Language.Japanese: return "ja";
case Language.Russian: return "ru";
case Language.Spanish: return "es";
case Language.Ukrainian: return "uk";
case Language.Portuguese: return "pt";
}

return "";
}

public static void UpdateEmuLanguage()
{
InteropEmu.SetDisplayLanguage(_language);
Expand Down
69 changes: 53 additions & 16 deletions GUI.NET/Forms/frmAbout.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion GUI.NET/Forms/frmAbout.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Reflection;
Expand All @@ -18,7 +19,12 @@ public frmAbout()

private void lblLink_Click(object sender, EventArgs e)
{
System.Diagnostics.Process.Start("http://www.mesen.ca");
Process.Start("http://www.mesen.ca");
}

private void picDonate_Click(object sender, EventArgs e)
{
Process.Start("http://www.mesen.ca/Donate.php?l=" + ResourceHelper.GetLanguageCode());
}
}
}
Loading

0 comments on commit 1fd3ef5

Please sign in to comment.