empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Google Drive: Localized messages. Fixed bug when trying to change preferences after syncing or enabling sync.

Browse source
This commit is contained in:
Souryo 2016-05-22 20:02:02 -04:00
parent e2300d9a8b
commit 7d9c6dee73
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Core/MessageManager.cpp
View file

@ -16,7 +16,7 @@ std::unordered_map<string, string> MessageManager::_enResources = {
{ "SaveStates", u8"Save States" },
{ "ScreenshotSaved", u8"Screenshot Saved" },
{ "Test", u8"Test" },
{ "CheatApplied", u8"1 cheat applied." },
{ "CheatsApplied", u8"%1 cheats applied." },
{ "ConnectedToServer", u8"Connected to server." },
@ -51,6 +51,11 @@ std::unordered_map<string, string> MessageManager::_enResources = {
{ "ServerStopped", u8"Server stopped" },
{ "TestFileSavedTo", u8"Test file saved to: %1" },
{ "UnsupportedMapper", u8"Unsupported mapper, cannot load game." },
{ "GoogleDrive", u8"Google Drive" },
{ "SynchronizationStarted", u8"Synchronization started." },
{ "SynchronizationFailed", u8"Synchronization failed." },
{ "SynchronizationCompleted", u8"Synchronization completed." },
};
std::unordered_map<string, string> MessageManager::_frResources = {
@ -100,6 +105,11 @@ std::unordered_map<string, string> MessageManager::_frResources = {
{ "ServerStopped", u8"Le serveur a été arrêté" },
{ "TestFileSavedTo", u8"Test sauvegardé: %1" },
{ "UnsupportedMapper", u8"Ce mapper n'est pas encore supporté - le jeu ne peut pas être démarré." },
{ "GoogleDrive", u8"Google Drive" },
{ "SynchronizationStarted", u8"Synchronisation en cours." },
{ "SynchronizationFailed", u8"La synchronisation a échoué." },
{ "SynchronizationCompleted", u8"Synchronisation terminée." },
};
std::unordered_map<string, string> MessageManager::_jaResources = {
@ -149,6 +159,11 @@ std::unordered_map<string, string> MessageManager::_jaResources = {
{ "ServerStopped", u8"サーバは停止しました。" },
{ "TestFileSavedTo", u8"Test file saved to: %1" },
{ "UnsupportedMapper", u8"このMapperを使うゲームはロードできません。" },
{ "GoogleDrive", u8"Google Drive" },
{ "SynchronizationStarted", u8"同期しています。" },
{ "SynchronizationFailed", u8"同期は失敗しました。" },
{ "SynchronizationCompleted", u8"同期完了。" },
};
IMessageManager* MessageManager::_messageManager = nullptr;

BIN
GUI.NET/Dependencies/Font.24.spritefont
View file

Binary file not shown.

10
GUI.NET/GoogleDriveIntegration/CloudSyncHelper.cs
View file

@ -36,17 +36,15 @@ namespace Mesen.GUI.GoogleDriveIntegration
}
} else {
try {
InteropEmu.DisplayMessage("Google Drive", "Synchronization started.");
InteropEmu.DisplayMessage("GoogleDrive", "SynchronizationStarted");
using(_accessor = new GoogleDriveAccessor()) {
if(!CloudSyncHelper.DownloadData()) {
InteropEmu.DisplayMessage("Google Drive", "Synchronization failed.");
ConfigManager.Config.PreferenceInfo.CloudLastSync = DateTime.Now;
ConfigManager.ApplyChanges();
InteropEmu.DisplayMessage("GoogleDrive", "SynchronizationFailed");
return false;
}
CloudSyncHelper.UploadData();
InteropEmu.DisplayMessage("Google Drive", "Synchronization completed.");
InteropEmu.DisplayMessage("GoogleDrive", "SynchronizationCompleted");
ConfigManager.Config.PreferenceInfo.CloudLastSync = DateTime.Now;
ConfigManager.ApplyChanges();
@ -63,7 +61,6 @@ namespace Mesen.GUI.GoogleDriveIntegration
using(_accessor = new GoogleDriveAccessor()) {
bool result = _accessor.AcquireToken();
if(result) {
ConfigManager.RejectChanges();
ConfigManager.Config.PreferenceInfo.CloudSaveIntegration = true;
ConfigManager.ApplyChanges();
}
@ -77,7 +74,6 @@ namespace Mesen.GUI.GoogleDriveIntegration
_accessor.RevokeToken();
}
ConfigManager.RejectChanges();
ConfigManager.Config.PreferenceInfo.CloudSaveIntegration = false;
ConfigManager.ApplyChanges();
}

4
GUI.NET/GoogleDriveIntegration/GoogleDriveAccessor.cs
View file

@ -32,7 +32,7 @@ namespace Mesen.GUI.GoogleDriveIntegration
if(_connected) {
this.UploadFileAsync(fileStream, filename).GetAwaiter().GetResult();
}
} catch(TokenResponseException ex) {
} catch(TokenResponseException) {
_revoked = true;
_connected = false;
_credentials = null;
@ -54,7 +54,7 @@ namespace Mesen.GUI.GoogleDriveIntegration
if(_connected) {
this.DownloadFileAsync(fileStream, filename).GetAwaiter().GetResult();
}
} catch(TokenResponseException ex) {
} catch(TokenResponseException) {
_revoked = true;
_connected = false;
_credentials = null;