From d2e9c6ff38c1c54245d28675d05abb468fd1b7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ke=C3=9Fler?= Date: Tue, 12 Jan 2021 13:35:02 +0100 Subject: [PATCH] Changing the console encoding to utf-8 on windows (#2407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced `«` and `»` with `"` --- src/enums/generated/ActionGroup.generated.cpp | 2 +- src/enums/generated/ActionType.generated.cpp | 2 +- .../inputdevices/touchdisable/TouchDisableX11.cpp | 4 ++-- src/gui/toolbarMenubar/ToolMenuHandler.cpp | 4 ++-- src/gui/toolbarMenubar/model/ToolbarColorNames.cpp | 2 +- src/model/TexImage.cpp | 2 +- src/plugin/Plugin.cpp | 14 +++++++------- src/plugin/PluginController.cpp | 4 ++-- src/util/PlaceholderString.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/enums/generated/ActionGroup.generated.cpp b/src/enums/generated/ActionGroup.generated.cpp index b0b13e80..87b5c4d8 100644 --- a/src/enums/generated/ActionGroup.generated.cpp +++ b/src/enums/generated/ActionGroup.generated.cpp @@ -116,7 +116,7 @@ auto ActionGroup_fromString(const string& value) -> ActionGroup { return GROUP_ZOOM_FIT; } - g_error("Invalid enum value for ActionGroup: «%s»", value.c_str()); + g_error("Invalid enum value for ActionGroup: \"%s\"", value.c_str()); return GROUP_NOGROUP; } diff --git a/src/enums/generated/ActionType.generated.cpp b/src/enums/generated/ActionType.generated.cpp index ff8f302e..377f2cab 100644 --- a/src/enums/generated/ActionType.generated.cpp +++ b/src/enums/generated/ActionType.generated.cpp @@ -592,7 +592,7 @@ auto ActionType_fromString(const string& value) -> ActionType { return ACTION_NOT_SELECTED; } - g_error("Invalid enum value for ActionType: «%s»", value.c_str()); + g_error("Invalid enum value for ActionType: \"%s\"", value.c_str()); return ACTION_NONE; } diff --git a/src/gui/inputdevices/touchdisable/TouchDisableX11.cpp b/src/gui/inputdevices/touchdisable/TouchDisableX11.cpp index 044b1fa5..8aaeb6ad 100644 --- a/src/gui/inputdevices/touchdisable/TouchDisableX11.cpp +++ b/src/gui/inputdevices/touchdisable/TouchDisableX11.cpp @@ -49,11 +49,11 @@ void TouchDisableX11::init() { touchdev = XOpenDevice(display, touch->id); if (!touchdev) { - g_warning("Failed to open touch device «%s»", touch->name); + g_warning("Failed to open touch device \"%s\"", touch->name); return; } - g_message("X11 Touch disabler active for device «%s»", touch->name); + g_message("X11 Touch disabler active for device \"%s\"", touch->name); enabledAtom = XInternAtom(display, "Device Enabled", false); } diff --git a/src/gui/toolbarMenubar/ToolMenuHandler.cpp b/src/gui/toolbarMenubar/ToolMenuHandler.cpp index cb6c6ce9..effda94a 100644 --- a/src/gui/toolbarMenubar/ToolMenuHandler.cpp +++ b/src/gui/toolbarMenubar/ToolMenuHandler.cpp @@ -273,7 +273,7 @@ void ToolMenuHandler::signalConnectCallback(GtkBuilder* builder, GObject* object ActionType action = ActionType_fromString(actionName); if (action == ACTION_NONE) { - g_error("Unknown action name from glade file: «%s» / «%s»", signalName, handlerName); + g_error("Unknown action name from glade file: \"%s\" / \"%s\"", signalName, handlerName); return; } @@ -293,7 +293,7 @@ void ToolMenuHandler::signalConnectCallback(GtkBuilder* builder, GObject* object // There is no toolbar item -> register the menu only self->registerMenupoint(GTK_WIDGET(object), action, group); } else { - g_error("Unsupported signal handler from glade file: «%s» / «%s»", signalName, handlerName); + g_error("Unsupported signal handler from glade file: \"%s\" / \"%s\"", signalName, handlerName); } } diff --git a/src/gui/toolbarMenubar/model/ToolbarColorNames.cpp b/src/gui/toolbarMenubar/model/ToolbarColorNames.cpp index a5eac373..69241d5e 100644 --- a/src/gui/toolbarMenubar/model/ToolbarColorNames.cpp +++ b/src/gui/toolbarMenubar/model/ToolbarColorNames.cpp @@ -30,7 +30,7 @@ void save(fs::path const& file, GKeyFile* config) noexcept { ofs.exceptions(std::ios::badbit | std::ios::failbit); ofs.write(data, len); } catch (std::ios_base::failure const& e) { - g_warning("Could not save color file «%s».\n%s with error code %d", file.u8string().c_str(), e.what(), + g_warning("Could not save color file \"%s\".\n%s with error code %d", file.u8string().c_str(), e.what(), e.code().value()); } g_free(data); diff --git a/src/model/TexImage.cpp b/src/model/TexImage.cpp index e1810e66..36fde583 100644 --- a/src/model/TexImage.cpp +++ b/src/model/TexImage.cpp @@ -87,7 +87,7 @@ auto TexImage::loadData(std::string&& bytes, GError** err) -> bool { this->image = cairo_image_surface_create_from_png_stream( reinterpret_cast(&cairoReadFunction), this); } else { - g_warning("Unknown Latex image type: «%s»", type.c_str()); + g_warning("Unknown Latex image type: \"%s\"", type.c_str()); } return true; diff --git a/src/plugin/Plugin.cpp b/src/plugin/Plugin.cpp index 23879fac..c636c7d2 100644 --- a/src/plugin/Plugin.cpp +++ b/src/plugin/Plugin.cpp @@ -47,12 +47,12 @@ void Plugin::registerToolbar() { lua_getglobal(lua.get(), "initUi"); if (lua_isfunction(lua.get(), -1) == 1) { if (callFunction("initUi")) { - g_message("Plugin «%s» UI initialized", name.c_str()); + g_message("Plugin \"%s\" UI initialized", name.c_str()); } else { - g_warning("Plugin «%s» init failed!", name.c_str()); + g_warning("Plugin \"%s\" init failed!", name.c_str()); } } else { - g_message("Plugin «%s» has no UI init", name.c_str()); + g_message("Plugin \"%s\" has no UI init", name.c_str()); } inInitUi = false; @@ -192,7 +192,7 @@ void Plugin::loadScript() { } if (mainfile.find("..") != std::string::npos) { - g_warning("Plugin «%s» contains unsupported path «%s»", name.c_str(), mainfile.c_str()); + g_warning("Plugin \"%s\" contains unsupported path \"%s\"", name.c_str(), mainfile.c_str()); this->valid = false; return; } @@ -212,7 +212,7 @@ void Plugin::loadScript() { auto luafile = path / mainfile; if (luaL_loadfile(lua.get(), luafile.string().c_str())) { // Error out if file can't be read - g_warning("Could not run plugin Lua file: «%s»", luafile.string().c_str()); + g_warning("Could not run plugin Lua file: \"%s\"", luafile.string().c_str()); this->valid = false; return; } @@ -232,7 +232,7 @@ void Plugin::loadScript() { button.insert(std::pair(0, _("OK"))); XojMsgBox::showPluginMessage(name, errMsg, button, true); - g_warning("Could not run plugin Lua file: «%s», error: «%s»", luafile.string().c_str(), errMsg); + g_warning("Could not run plugin Lua file: \"%s\", error: \"%s\"", luafile.string().c_str(), errMsg); this->valid = false; return; } @@ -248,7 +248,7 @@ auto Plugin::callFunction(const std::string& fnc) -> bool { button.insert(std::pair(0, _("OK"))); XojMsgBox::showPluginMessage(name, errMsg, button, true); - g_warning("Error in Plugin: «%s», error: «%s»", name.c_str(), errMsg); + g_warning("Error in Plugin: \"%s\", error: \"%s\"", name.c_str(), errMsg); return false; } diff --git a/src/plugin/PluginController.cpp b/src/plugin/PluginController.cpp index 578fdc09..a1484637 100644 --- a/src/plugin/PluginController.cpp +++ b/src/plugin/PluginController.cpp @@ -30,7 +30,7 @@ void PluginController::loadPluginsFrom(fs::path const& path) { const auto& pluginPath = f.path(); auto plugin = std::make_unique(control, pluginPath.filename().string(), pluginPath); if (!plugin->isValid()) { - g_warning("Error loading plugin «%s»", f.path().string().c_str()); + g_warning("Error loading plugin \"%s\"", f.path().string().c_str()); continue; } @@ -47,7 +47,7 @@ void PluginController::loadPluginsFrom(fs::path const& path) { this->plugins.emplace_back(std::move(plugin)); } } catch (fs::filesystem_error const& e) { - g_warning("Could not open plugin dir: «%s»", path.string().c_str()); + g_warning("Could not open plugin dir: \"%s\"", path.string().c_str()); return; } #endif diff --git a/src/util/PlaceholderString.cpp b/src/util/PlaceholderString.cpp index 69249608..ba892bb6 100644 --- a/src/util/PlaceholderString.cpp +++ b/src/util/PlaceholderString.cpp @@ -57,7 +57,7 @@ auto PlaceholderString::formatPart(std::string format) const -> std::string { try { index = std::stoi(format); } catch (const std::exception& e) { - g_error("Could not parse «%s» as int, error: %s", format.c_str(), e.what()); + g_error("Could not parse \"%s\" as int, error: %s", format.c_str(), e.what()); } // Placeholder index starting at 1, vector at 0