Merge branch 'master' into tatsu_develop

Tatsu-syo · Feb 23, 2024 · 004b860 · 004b860
2 parents 383b099 + 1271abe
commit 004b860
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 3 deletions.
diff --git a/lang/pt-BR.lng b/lang/pt-BR.lng
@@ -1,4 +1,4 @@
-; noMeiryoUI (C) 2005,2012-2024 Tatsuhiko Shoji
+; noMeiryoUI (C) 2005,2012-2024 Tatsuhiko Shoji,Claudio Mantovani Vieira
 ; The sources for noMeiryoUI are distributed under the MIT open source license
 
 ;In RESOURCE section,
@@ -16,10 +16,10 @@ MENU_PRESET=&Pré-Definição
 MENU_PRESET_8=Windows 8/8.1
 MENU_PRESET_10=Windows 10
 MENU_TOOLS=&Ferramentas
-MENU_TOOLS_CHOICE_APP_FONT=Choice No!! Meiryo UI application &font
+MENU_TOOLS_CHOICE_APP_FONT=Escolha &fonte do aplicativo da UI No!! Meiryo
 MENU_TOOLS_THREAD=Definir as fontes do sistema em encadeamentos separados
 MENU_TOOLS_SEVEN=Calcular o tamanho das fontes igual ao Windows 7
-MENU_TOOLS_NO_MULTI_RUN=&Don't run multiply
+MENU_TOOLS_NO_MULTI_RUN=&Não executar multiplicar
 MENU_HELP=Aju&da
 MENU_HELP_HELP=Aju&da
 MENU_HELP_ABOUT=&Sobre o No!! Meiryo UI

diff --git a/program/noMeiryoUI_2008.vcproj b/program/noMeiryoUI_2008.vcproj
@@ -187,6 +187,10 @@
 				RelativePath=".\iniReader.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\langresource.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\noMeiryoUI.cpp"
 				>
@@ -255,6 +259,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="country"
+				>
+				<File
+					RelativePath=".\country\default.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\country\japan.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\country\korea.cpp"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="ヘッダー ファイル"
@@ -269,6 +289,10 @@
 				RelativePath=".\iniReader.h"
 				>
 			</File>
+			<File
+				RelativePath=".\langresource.h"
+				>
+			</File>
 			<File
 				RelativePath=".\noMeiryoUI.h"
 				>
@@ -341,6 +365,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="country"
+				>
+				<File
+					RelativePath=".\country\default.h"
+					>
+				</File>
+				<File
+					RelativePath=".\country\japan.h"
+					>
+				</File>
+				<File
+					RelativePath=".\country\korea.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="リソース ファイル"

diff --git a/program/util.cpp b/program/util.cpp
@@ -74,6 +74,18 @@ double Win11PresetWindowsMetric[] = {
 	19,
 	4 };
 
+#if _MSC_VER < 1600
+
+double round(double x)
+{
+	if (x > 0.0){
+		return floor(x + 0.5);
+	} else {
+		return ceil(x - 0.5);
+	}
+}
+#endif
+
 /**
  * フォントのピクセル数に対応するポイント数を整数で算出する。(Windows 8)
  *

diff --git a/program/util.h b/program/util.h
@@ -97,6 +97,12 @@ size_t utf8toUtf16(tstring& dst, const char* src);
 int getSystemDPI(void);
 double getFontPointDouble(LOGFONT* font, HWND hWnd);
 
+#if _MSC_VER < 1600
+
+double round(double x);
+
+#endif
+
 /**
  * プリセット設定
  *