Preparing for 0.8.2 version

proconsule · Sep 30, 2023 · 5344fcb · 5344fcb
1 parent 499e7c7
commit 5344fcb
Show file tree

Hide file tree

Showing 40 changed files with 1,916 additions and 228 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # NXMP Changelog
 
 ## [0.8.2]
+
+### Added
+
+- Added initial i18n (partial)
+- Error messages on network share connection failure
+
 ### Changes
 
 - Update ImGui to last release
@@ -10,7 +16,6 @@
 
 - SubFont Color fix
 
-
 ## [0.8.1]
 
 ### Fixed

diff --git a/Makefile b/Makefile
@@ -39,9 +39,9 @@ include $(DEVKITPRO)/libnx/switch_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/imgui libs/imgui/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+SOURCES		:=	source/i18n source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/imgui libs/imgui/misc/freetype source source/updater source/curldownloader source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/UI source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 DATA		:=	data
-INCLUDES	:=	source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/simpleini libs/imgui include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
+INCLUDES	:=	source/i18n source/backends source/backends/glfw3-opengl3 source/iniparser source/imgloader source/networkshareclass source/UI/textscroller source/vout source/mediaprobe libs/imgui_toggle source/fileBrowser source/logger source/stats libs/simpleini libs/imgui include source/curldownloader source/updater source/touchcontrols source/playlist source/shadermania source/eqpreset source/database source/remotefs/UPNP source/remotefs/nfsDir source/remotefs/smb2 source/remotefs/sshDir source/remotefs/Enigma2 source/localfs source/localfs/usb source/remotefs/ftplib source/remotefs/HTTPDir source/themes
 ROMFS		:=	romfs
 
 GITREV:= -D'GITREV="$(shell git rev-parse --short HEAD)"'

diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ Thanks to
 - sashka69 @ GBATemp forum for beta testing
 - bodyXY @ GBATemp forum for banner and icons
 - Godorowski @ GBATemp forum for player UI design and icons
-- nWo @ GBATemp for beta testing
+- Jorge E. García "nWo" for beta testing
 - docgold @ GBATemp forum for Enigma2 samples and support on decoders
 - tataniko @ GBATemp forum for suggestions and bug hunting
 - All guys on GBAtemp
diff --git a/include/gui.h b/include/gui.h
@@ -315,6 +315,8 @@ extern std::string themefontpath;
 extern float themefontsize;
 extern float themefontsmall;
 
+
+
 /*
 extern float swipex;
 extern float swipey;

diff --git a/romfs/DroidSans.ttf b/romfs/DroidSans.ttf
diff --git a/romfs/NotoSansCJKjp-Medium.otf b/romfs/NotoSansCJKjp-Medium.otf
diff --git a/romfs/Pacifico.ttf b/romfs/Pacifico.ttf
diff --git a/romfs/Source Han Sans CN Light.otf b/romfs/Source Han Sans CN Light.otf
diff --git a/romfs/code2000.ttf b/romfs/code2000.ttf
diff --git a/source/UI/UniBrowser.cpp b/source/UI/UniBrowser.cpp
@@ -6,6 +6,7 @@
 #include "localfiles.h"
 #include "Enigma2.h"
 
+#include "nxmp-i18n.h"
 
 namespace Windows {
 
@@ -56,12 +57,20 @@ namespace Windows {
 				ImGui::SetCursorPosY( (ImGui::GetWindowHeight() - ImGui::CalcTextSize(filebrowser->errormsg.c_str()).y) / 2.f);
 				ImGui::Text("%s",filebrowser->errormsg.c_str());
 			}else{
-				if (ImGui::BeginTable("table1", 3,ImGuiTableFlags_RowBg)){
-					ImGui::TableSetupColumn("name", ImGuiTableColumnFlags_WidthFixed, (940.0f*multiplyRes -2 * ImGui::GetStyle().ItemSpacing.x)); // Default to 100.0f
-					ImGui::TableSetupColumn("size", ImGuiTableColumnFlags_WidthFixed, 130.0f*multiplyRes); // Default to 200.0f
-					ImGui::TableSetupColumn("date", ImGuiTableColumnFlags_WidthFixed,210.f*multiplyRes);       // Default to auto
+				if (ImGui::BeginTable("table1", 3,ImGuiTableFlags_RowBg|ImGuiTableFlags_ScrollY)){
+					ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, (940.0f*multiplyRes -2 * ImGui::GetStyle().ItemSpacing.x)); // Default to 100.0f
+					ImGui::TableSetupColumn("Size", ImGuiTableColumnFlags_WidthFixed, 125.0f*multiplyRes); // Default to 200.0f
+					ImGui::TableSetupColumn("Date", ImGuiTableColumnFlags_WidthFixed,215.f*multiplyRes);       // Default to auto
 					ImGui::TableSetupScrollFreeze(0, 1);
-					ImGui::TableHeadersRow();
+					//ImGui::TableHeadersRow();
+					ImGui::TableNextRow(ImGuiTableRowFlags_Headers);
+					ImGui::TableSetColumnIndex(0);
+					ImGui::Text(Common_STR[NXCOMMON_NAME]);
+					ImGui::TableSetColumnIndex(1);
+					ImGui::Text(Common_STR[NXCOMMON_SIZE]);
+					ImGui::TableSetColumnIndex(2);
+					ImGui::Text(Common_STR[NXCOMMON_DATE]);
+
 					ImGuiListClipper clipper;
 					clipper.Begin(thislist.size());
 					while (clipper.Step())
@@ -183,10 +192,11 @@ namespace Windows {
 
 						}
 					}
-					ImGui::EndTable();
 					if(item.popupstate == POPUP_STATE_NONE){
 						ImGui::SetWindowFocus();
 					}
+					ImGui::EndTable();
+
 				}
 			}
 			ImGui::EndChild();
@@ -196,7 +206,7 @@ namespace Windows {
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_D_DOWN.id, ImVec2(30,30));
 			ImGui::SameLine();
 			ImGui::AlignTextToFramePadding();
-			ImGui::Text("Navigation");
+			ImGui::Text(Common_STR[NXCOMMON_NAVIGATION]);
 			ImGui::SameLine();
 			ImGui::SetCursorPosX(ImGui::GetCursorPosX()+50.0f*multiplyRes);
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_D_LEFT.id, ImVec2(30,30));
@@ -208,25 +218,25 @@ namespace Windows {
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_A_BUT.id, ImVec2(30,30));
 			ImGui::SameLine();
 			ImGui::AlignTextToFramePadding();
-			ImGui::Text("Select/Play");
+			ImGui::Text(Common_STR[NXCOMMON_SELECTPLAY]);
 			ImGui::SameLine();
 			ImGui::SetCursorPosX(ImGui::GetCursorPosX()+50.0f*multiplyRes);
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_B_BUT.id, ImVec2(30,30));
 			ImGui::SameLine();
 			ImGui::AlignTextToFramePadding();
-			ImGui::Text("Back");
+			ImGui::Text(Common_STR[NXCOMMON_BACK]);
 			ImGui::SameLine();
 			ImGui::SetCursorPosX(ImGui::GetCursorPosX()+50.0f*multiplyRes);
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_X_BUT.id, ImVec2(30,30));
 			ImGui::SameLine();
 			ImGui::AlignTextToFramePadding();
-			ImGui::Text("Context Menu");
+			ImGui::Text(Common_STR[NXCOMMON_CONTEXTMENU]);
 			ImGui::SameLine();
 			ImGui::SetCursorPosX(ImGui::GetCursorPosX()+50.0f*multiplyRes);
 			GUI::NXMPImage((void*)(intptr_t)imgloader->icons.GUI_Y_BUT.id, ImVec2(30,30));
 			ImGui::SameLine();
 			ImGui::AlignTextToFramePadding();
-			ImGui::Text("NXMP Home");
+			ImGui::Text(Common_STR[NXCOMMON_HOME]);
 
 
 			ImGui::EndChild();