Enable UTF-8 in windows app manifest
This commit is contained in:
parent
003a2d3757
commit
e954e55213
4 changed files with 15 additions and 3 deletions
|
|
@ -132,6 +132,7 @@ endif()
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
list(APPEND sources
|
list(APPEND sources
|
||||||
"src/WindowsFontData/CustomFontSetManager.cpp"
|
"src/WindowsFontData/CustomFontSetManager.cpp"
|
||||||
|
"windowsinstall/infinipaint.manifest"
|
||||||
"windowsinstall/app.rc")
|
"windowsinstall/app.rc")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ class DrawingProgram {
|
||||||
bool addToCompCacheOnInsert = true;
|
bool addToCompCacheOnInsert = true;
|
||||||
|
|
||||||
std::atomic<bool> addFileInNextFrame = false;
|
std::atomic<bool> addFileInNextFrame = false;
|
||||||
std::pair<std::string, Vector2f> addFileInfo;
|
std::pair<std::filesystem::path, Vector2f> addFileInfo;
|
||||||
|
|
||||||
void add_file_to_canvas_by_path_execute(const std::filesystem::path& filePath, Vector2f dropPos);
|
void add_file_to_canvas_by_path_execute(const std::filesystem::path& filePath, Vector2f dropPos);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ ServerClientID ResourceManager::add_resource_file(const std::filesystem::path& f
|
||||||
// https://nullptr.org/cpp-read-file-into-string/
|
// https://nullptr.org/cpp-read-file-into-string/
|
||||||
std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
|
std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
|
||||||
if(!file.is_open()) {
|
if(!file.is_open()) {
|
||||||
Logger::get().log("INFO", "[ResourceManager::add_resource_file] Could not open file " + std::string(filePath));
|
Logger::get().log("INFO", "[ResourceManager::add_resource_file] Could not open file " + filePath.string());
|
||||||
return {0, 0};
|
return {0, 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,7 +78,7 @@ ServerClientID ResourceManager::add_resource_file(const std::filesystem::path& f
|
||||||
auto tellgResult = file.tellg();
|
auto tellgResult = file.tellg();
|
||||||
|
|
||||||
if(tellgResult == -1) {
|
if(tellgResult == -1) {
|
||||||
Logger::get().log("INFO", "[ResourceManager::add_resource_file] tellg failed for file " + std::string(filePath));
|
Logger::get().log("INFO", "[ResourceManager::add_resource_file] tellg failed for file " + filePath.string());
|
||||||
return {0, 0};
|
return {0, 0};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
11
windowsinstall/infinipaint.manifest
Normal file
11
windowsinstall/infinipaint.manifest
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||||
|
<assemblyIdentity version="0.3.0.0" processorArchitecture="*" name="com.infinipaint.infinipaint" type="win32" />
|
||||||
|
<!-- Enable UTF-8 -->
|
||||||
|
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||||
|
<windowsSettings>
|
||||||
|
<activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
|
||||||
|
</windowsSettings>
|
||||||
|
</application>
|
||||||
|
<!-- Enable DPI Awareness -->
|
||||||
|
</assembly>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue