Skip to content

Commit

Permalink
[Ref] About Dialog: Use UV_ instead of U_ where UL_ is not possible.
Browse files Browse the repository at this point in the history
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22065 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
manxorist committed Nov 2, 2024
1 parent 1132d95 commit 5702111
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions mptrack/AboutDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,9 @@ mpt::ustring CAboutDlg::GetTabText(int tab)
text += MPT_UFORMAT("Available CPU features: {}\n")(CPUFeaturesToString(CPUInfo.get_features()));
#endif // MPT_ENABLE_ARCH_INTRINSICS
text += MPT_UFORMAT("Operating System: {}\n\n")(mpt::OS::Windows::Version::GetCurrentName());
text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_(""));
text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? U_(" (portable)") : U_(""));
text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? U_(" (portable)") : U_(""));
text += MPT_UFORMAT("OpenMPT Install Path{1}: {0}\n")(theApp.GetInstallPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_(""));
text += MPT_UFORMAT("OpenMPT Executable Path{1}: {0}\n")(theApp.GetInstallBinArchPath(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_(""));
text += MPT_UFORMAT("Settings{1}: {0}\n")(theApp.GetConfigFileName(), theApp.IsPortableMode() ? UV_(" (portable)") : UV_(""));
break;
case 1:
{
Expand Down Expand Up @@ -440,22 +440,22 @@ mpt::ustring CAboutDlg::GetTabText(int tab)
}
text += MPT_UFORMAT("{}: {}")
( name
, info.state == ComponentStateAvailable ? U_("ok") :
info.state == ComponentStateUnavailable? U_("missing") :
info.state == ComponentStateUnintialized ? U_("not loaded") :
info.state == ComponentStateBlocked ? U_("blocked") :
info.state == ComponentStateUnregistered ? U_("unregistered") :
U_("unknown")
, info.state == ComponentStateAvailable ? UV_("ok") :
info.state == ComponentStateUnavailable? UV_("missing") :
info.state == ComponentStateUnintialized ? UV_("not loaded") :
info.state == ComponentStateBlocked ? UV_("blocked") :
info.state == ComponentStateUnregistered ? UV_("unregistered") :
UV_("unknown")
);
if(info.type != ComponentTypeUnknown)
{
text += MPT_UFORMAT(" ({})")
( info.type == ComponentTypeBuiltin ? U_("builtin") :
info.type == ComponentTypeSystem ? U_("system") :
info.type == ComponentTypeSystemInstallable ? U_("system, optional") :
info.type == ComponentTypeBundled ? U_("bundled") :
info.type == ComponentTypeForeign ? U_("foreign") :
U_("unknown")
( info.type == ComponentTypeBuiltin ? UV_("builtin") :
info.type == ComponentTypeSystem ? UV_("system") :
info.type == ComponentTypeSystemInstallable ? UV_("system, optional") :
info.type == ComponentTypeBundled ? UV_("bundled") :
info.type == ComponentTypeForeign ? UV_("foreign") :
UV_("unknown")
);
}
text += lf;
Expand Down Expand Up @@ -492,14 +492,14 @@ mpt::ustring CAboutDlg::GetTabText(int tab)
);
text += MPT_UFORMAT("Windows version: {}\n")
(
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? U_("Windows 8.1") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? U_("Windows 8") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? U_("Windows 7") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? U_("Windows Vista") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? U_("Windows XP") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? U_("Windows 2000") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? U_("Windows NT4") :
U_("unknown")
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win81) ? UV_("Windows 8.1") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win8) ? UV_("Windows 8") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win7) ? UV_("Windows 7") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinVista) ? UV_("Windows Vista") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinXP) ? UV_("Windows XP") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::Win2000) ? UV_("Windows 2000") :
mpt::osinfo::windows::Version::Current().IsAtLeast(mpt::osinfo::windows::Version::WinNT4) ? UV_("Windows NT4") :
UV_("unknown")
);
text += MPT_UFORMAT("Windows original: {}\n")
( mpt::OS::Windows::IsOriginal() ? yes : no
Expand Down

0 comments on commit 5702111

Please sign in to comment.