diff --git a/src/GLideNUI-wtl/About.cpp b/src/GLideNUI-wtl/About.cpp index 20630522..378852c0 100644 --- a/src/GLideNUI-wtl/About.cpp +++ b/src/GLideNUI-wtl/About.cpp @@ -1,5 +1,6 @@ #include "About.h" #include "resource.h" +#include "Language.h" extern HINSTANCE hInstance; @@ -92,7 +93,7 @@ public: L"Paul Lamb\r\n" L"zilmar\r\n" }; - const TCHAR FundersList[] = + std::wstring FundersList = { L"Ryan Rosser\r\n" L"Amadeus Sterl\r\n" @@ -218,13 +219,12 @@ public: L"Keith_at_UMR\r\n" L"sweatypickle\r\n" L"jeremydmiller\r\n\r\n" - L"... and more" }; + FundersList += wGS(ABOUT_AND_MORE); CWindow Funders = GetDlgItem(IDC_FUNDERS); Funders.SetWindowText(Funders1); m_SubtitleFont.Apply(m_hWnd, CWindowFont::typeBold | CWindowFont::typeSubheading, IDC_FUNDERS); - GetDlgItem(IDC_FUNDERS_LIST).SetWindowText(FundersList); - + GetDlgItem(IDC_FUNDERS_LIST).SetWindowText(FundersList.c_str()); return true; }; LRESULT OnColorStatic(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) @@ -254,6 +254,11 @@ public: } BOOL OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/) { + SetDlgItemTextW(IDC_TXT_AUTHOR_GLN64, wGS(ABOUT_AUTHOR_GLN64).c_str()); + SetDlgItemTextW(IDC_TXT_AUTHOR_GLES2N64, wGS(ABOUT_AUTHOR_GLES2N64).c_str()); + SetDlgItemTextW(IDC_TXT_AUTHOR_GLIDEHQ, wGS(ABOUT_AUTHOR_GLIDEHQ).c_str()); + SetDlgItemTextW(IDC_TXT_AUTHOR_Z64, wGS(ABOUT_AUTHOR_Z64).c_str()); + const UINT Creditors[] = { IDC_ORKIN, @@ -279,6 +284,12 @@ CAboutTab::~CAboutTab() BOOL CAboutTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/) { + SetDlgItemTextW(IDC_TXT_NEW_GEN, wGS(ABOUT_NEXT_GENERATION).c_str()); + SetDlgItemTextW(IDC_TXT_AUTHORS, wGS(ABOUT_AUTHORS).c_str()); + SetDlgItemTextW(IDC_TXT_DEVELOPER, wGS(ABOUT_DEVELOPER).c_str()); + SetDlgItemTextW(IDC_TXT_BETA_TESTER, wGS(ABOUT_BETA_TESTER).c_str()); + SetDlgItemTextW(IDC_TXT_GUI_DESIGNER, wGS(ABOUT_GUI_DESIGNER).c_str()); + const UINT Authors[] = { IDC_SERGEY, @@ -307,6 +318,8 @@ CAboutDlg::~CAboutDlg() LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/ , LPARAM /*lParam*/, BOOL& /*bHandled*/) { + SetWindowText(wGS(ABOUT_ABOUT_TITLE).c_str()); + HICON hIcon = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)); SetIcon(hIcon, TRUE); HICON hIconSmall = AtlLoadIconImage(IDI_APPICON, LR_DEFAULTCOLOR, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON)); @@ -325,10 +338,10 @@ LRESULT CAboutDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/ , LPARAM /*lPar m_AboutIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER); m_Tabs.Attach(GetDlgItem(IDC_TABS)); - AddTab(L"About", new CAboutTab(IDD_TAB_ABOUT)); - AddTab(L"Contributors", new CAboutContributersTab); - AddTab(L"Funders", new CAboutFundersTab); - AddTab(L"Credits", new CAboutCreditsTab); + AddTab(wGS(ABOUT_TAB_ABOUT).c_str(), new CAboutTab(IDD_TAB_ABOUT)); + AddTab(wGS(ABOUT_TAB_CONTRIBUTORS).c_str(), new CAboutContributersTab); + AddTab(wGS(ABOUT_TAB_FUNDERS).c_str(), new CAboutFundersTab); + AddTab(wGS(ABOUT_TAB_CREDITS).c_str(), new CAboutCreditsTab); return 0; } diff --git a/src/GLideNUI-wtl/GLideNUI.cpp b/src/GLideNUI-wtl/GLideNUI.cpp index 81c33736..c39720e7 100644 --- a/src/GLideNUI-wtl/GLideNUI.cpp +++ b/src/GLideNUI-wtl/GLideNUI.cpp @@ -55,8 +55,16 @@ EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName) return runConfigThread(_strFileName, _romName); } -EXPORT int CALL RunAbout(const wchar_t * /*_strFileName*/) +EXPORT int CALL RunAbout(const wchar_t * _strFileName) { + std::string IniFolder; + uint32_t slength = WideCharToMultiByte(CP_ACP, 0, _strFileName, -1, NULL, 0, NULL, NULL); + IniFolder.resize(slength); + slength = WideCharToMultiByte(CP_ACP, 0, _strFileName, -1, (LPSTR)IniFolder.c_str(), slength, NULL, NULL); + IniFolder.resize(slength - 1); //Remove null end char + + LoadCurrentStrings(IniFolder.c_str(), config.translationFile); + CAboutDlg Dlg; Dlg.DoModal(); return 0; diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc index 164a8d8e..4c5afeff 100644 Binary files a/src/GLideNUI-wtl/GLideNUI.rc and b/src/GLideNUI-wtl/GLideNUI.rc differ diff --git a/src/GLideNUI-wtl/Language.cpp b/src/GLideNUI-wtl/Language.cpp index 37e2bca5..a574c67a 100644 --- a/src/GLideNUI-wtl/Language.cpp +++ b/src/GLideNUI-wtl/Language.cpp @@ -212,6 +212,23 @@ void loadDefaultStrings(void) g_defaultStrings.insert(LANG_STRINGS::value_type(DEBUG_DUMP_LOWLEVEL_INFO, "Dump low-level info")); g_defaultStrings.insert(LANG_STRINGS::value_type(DEBUG_DUMP_DISPLAY_LIST, "Dump display list commands")); g_defaultStrings.insert(LANG_STRINGS::value_type(DEBUG_DUMP_DETAILED_INFO, "Dump detailed info (matrices, vertices, etc.)")); + + //About + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_ABOUT_TITLE, "About GLideN64")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_TAB_ABOUT, "About")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_TAB_CONTRIBUTORS, "Contributors")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_TAB_FUNDERS, "Funders")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_TAB_CREDITS, "Credits")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_NEXT_GENERATION, "The next generation open source graphics plugin for N64 emulators.")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AUTHORS, "Authors")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_DEVELOPER, "Developer")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_BETA_TESTER, "Beta tester")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_GUI_DESIGNER, "GUI designer")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AND_MORE, ".. and more")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AUTHOR_GLN64, "Author of the original glN64 graphics plugin")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AUTHOR_GLES2N64, "Author of gles2n64, a port of glN64 to GL ES 2.0")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AUTHOR_GLIDEHQ, "Author of the GlideHQ texture library")); + g_defaultStrings.insert(LANG_STRINGS::value_type(ABOUT_AUTHOR_Z64, "Author of z64, an OpenGL LLE plugin")); } LANG_STR GetNextLangString(FILE * file) diff --git a/src/GLideNUI-wtl/Language.h b/src/GLideNUI-wtl/Language.h index 1b9a842f..8c157d86 100644 --- a/src/GLideNUI-wtl/Language.h +++ b/src/GLideNUI-wtl/Language.h @@ -222,6 +222,25 @@ enum languageStringID DEBUG_DUMP_LOWLEVEL_INFO = 7000, DEBUG_DUMP_DISPLAY_LIST = 7001, DEBUG_DUMP_DETAILED_INFO = 7002, + + /********************************************************************************* + * About * + *********************************************************************************/ + ABOUT_ABOUT_TITLE = 9000, + ABOUT_TAB_ABOUT = 9001, + ABOUT_TAB_CONTRIBUTORS = 9002, + ABOUT_TAB_FUNDERS = 9003, + ABOUT_TAB_CREDITS = 9004, + ABOUT_NEXT_GENERATION = 9005, + ABOUT_AUTHORS = 9006, + ABOUT_DEVELOPER = 9007, + ABOUT_BETA_TESTER = 9008, + ABOUT_GUI_DESIGNER = 9009, + ABOUT_AND_MORE = 9010, + ABOUT_AUTHOR_GLN64 = 9011, + ABOUT_AUTHOR_GLES2N64 = 9012, + ABOUT_AUTHOR_GLIDEHQ = 9013, + ABOUT_AUTHOR_Z64 = 9014, }; struct LanguageFile diff --git a/src/GLideNUI-wtl/resource.h b/src/GLideNUI-wtl/resource.h index 3f537263..c4af4f6c 100644 Binary files a/src/GLideNUI-wtl/resource.h and b/src/GLideNUI-wtl/resource.h differ diff --git a/translations/wtl/gliden64_de.Lang b/translations/wtl/gliden64_de.Lang index 692bf139..ac62bb2e 100644 --- a/translations/wtl/gliden64_de.Lang +++ b/translations/wtl/gliden64_de.Lang @@ -196,4 +196,22 @@ *********************************************************************************/ #7000# "Low-Level-Info ausgeben" #7001# "Display-Listen-Befehle ausgeben" -#7002# "Detaillierte Informationen ausgeben (Matrizen, Eckpunkte, etc.)" \ No newline at end of file +#7002# "Detaillierte Informationen ausgeben (Matrizen, Eckpunkte, etc.)" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "Über GLideN64" +#9001# "Über" +#9002# "Beiträger" +#9003# "Finanzierer" +#9004# "Danksagung" +#9005# "Das N64 Open-Source Grafik-Plugin der nächsten Generation." +#9006# "Autoren" +#9007# "Entwickler" +#9008# "Betatester" +#9009# "Oberflächendesigner" +#9011# "Autor des originalen glN64 Grafikplugins" +#9012# "Autor des glesn64 Grafikplugins, einem GLES 2.0 Port von glN64" +#9013# "Autor der GlideHQ Texturbibliothek" +#9014# "Autor von z64, einem OpenGL LLE Grafikplugin" diff --git a/translations/wtl/gliden64_en.Lang b/translations/wtl/gliden64_en.Lang index aa886418..896be5fd 100644 --- a/translations/wtl/gliden64_en.Lang +++ b/translations/wtl/gliden64_en.Lang @@ -214,4 +214,23 @@ *********************************************************************************/ #7000# "Dump low-level info" #7001# "Dump display list commands" -#7002# "Dump detailed info (matrices, vertices, etc.)" \ No newline at end of file +#7002# "Dump detailed info (matrices, vertices, etc.)" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "About GLideN64" +#9001# "About" +#9002# "Contributors" +#9003# "Funders" +#9004# "Credits" +#9005# "The next generation open source graphics plugin for N64 emulators." +#9006# "Authors" +#9007# "Developer" +#9008# "Beta tester" +#9009# "GUI designer" +#9010# ".. and more" +#9011# "Author of the original glN64 graphics plugin" +#9012# "Author of gles2n64, a port of glN64 to GL ES 2.0" +#9013# "Author of the GlideHQ texture library" +#9014# "Author of z64, an OpenGL LLE plugin" \ No newline at end of file diff --git a/translations/wtl/gliden64_es.Lang b/translations/wtl/gliden64_es.Lang index 46458a59..8bd472c3 100644 --- a/translations/wtl/gliden64_es.Lang +++ b/translations/wtl/gliden64_es.Lang @@ -139,4 +139,22 @@ #6000# "Posición" #6003# "Mostrar porcentaje" #6009# "Color:" -#6010# "Demostración" \ No newline at end of file +#6010# "Demostración" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "Acerca de GLideN64" +#9001# "Acerca de" +#9002# "Contribuyentes" +#9003# "Financiadores" +#9004# "Créditos" +#9005# "La nueva generación de los plugins gráficos de código abierto para emuladores de N64." +#9006# "Autores" +#9007# "Desarrollo" +#9008# "Testeo de las betas" +#9009# "Diseñador de la interfaz" +#9011# "Autor del plugin gráfico original glN64" +#9012# "Autor de gles2n64, una conversión de glN64 a GL ES 2.0" +#9013# "Autor de la librería de texturas GlideHQ" +#9014# "Autor de z64, un plugin LLE para OpenGL" \ No newline at end of file diff --git a/translations/wtl/gliden64_fr.Lang b/translations/wtl/gliden64_fr.Lang index af9b9a22..550db094 100644 --- a/translations/wtl/gliden64_fr.Lang +++ b/translations/wtl/gliden64_fr.Lang @@ -139,4 +139,22 @@ #6000# "Position" #6003# "Afficher le pourcentage" #6009# "Couleur :" -#6010# "Prévisualisation" \ No newline at end of file +#6010# "Prévisualisation" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "A Propos De GLideN64" +#9001# "A Propos De" +#9002# "Contributeurs" +#9003# "Donateurs" +#9004# "Crédits" +#9005# "La nouvelle génération de plugin graphique open source pour les émulateurs N64." +#9006# "Auteurs" +#9007# "Développeur" +#9008# "Bêta testeur" +#9009# "Concepteur de l'interface graphique" +#9011# "Auteur du plugin graphique original glN64" +#9012# "Auteur de gles2n64, un portage de glN64 vers GL ES 2.0" +#9013# "Auteur de la librairie de texture GlideHQ" +#9014# "Auteur de z64, un plugin OpenGL LLE" \ No newline at end of file diff --git a/translations/wtl/gliden64_it.Lang b/translations/wtl/gliden64_it.Lang index bee13a8e..32e84289 100644 --- a/translations/wtl/gliden64_it.Lang +++ b/translations/wtl/gliden64_it.Lang @@ -32,3 +32,11 @@ #5019# "Utilizza un pacchetto texture modificate" #5020# "Percorso cartella pacchetti texture:" #5035# "Comprimi cache texture" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "Riguardo a GlideN64" +#9003# "Finanziatori" +#9004# "Crediti" +#9006# "Autori" diff --git a/translations/wtl/gliden64_ja.Lang b/translations/wtl/gliden64_ja.Lang index 35bdd758..5213b3b3 100644 --- a/translations/wtl/gliden64_ja.Lang +++ b/translations/wtl/gliden64_ja.Lang @@ -35,3 +35,11 @@ #5019# "テクスチャパックを使用する" #5020# "テクスチャパックのパス:" #5035# "テクスチャキャッシュを圧縮" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "GLideN64について" +#9003# "寄付" +#9004# "クレジット" +#9006# "作者" diff --git a/translations/wtl/gliden64_pl.Lang b/translations/wtl/gliden64_pl.Lang index 286e4d72..bbf81d05 100644 --- a/translations/wtl/gliden64_pl.Lang +++ b/translations/wtl/gliden64_pl.Lang @@ -35,3 +35,11 @@ #5019# "Użyj paczki tekstur" #5020# "Ścieżka paczek tekstur:" #5035# "Kompresuj pamięć podręczną tekstur" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "O GLideN64" +#9003# "Darczyńcy" +#9004# "Inni twórcy" +#9006# "Autorzy" \ No newline at end of file diff --git a/translations/wtl/gliden64_pt_BR.Lang b/translations/wtl/gliden64_pt_BR.Lang index 5f63540a..b75295c5 100644 --- a/translations/wtl/gliden64_pt_BR.Lang +++ b/translations/wtl/gliden64_pt_BR.Lang @@ -34,4 +34,12 @@ #5010# "Melhoramento:" #5019# "Usa pacote de textura" #5020# "Local dos pacotes de textura:" -#5035# "Compacta cache de textura" \ No newline at end of file +#5035# "Compacta cache de textura" + +/********************************************************************************* +* About * +*********************************************************************************/ +#9000# "Sobre GLideN64" +#9003# "Financiadores" +#9004# "Créditos" +#9006# "Autores" \ No newline at end of file