diff options
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 65ef01b0d..6871cf467 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -365,8 +365,7 @@ void Application::autosave_init() } } -void -Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwarning, *&gchar colornamederror) +void Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwarning, *&gchar colornamederror) { int colorsetsuccess = 0x4AD589ff; int colorsetwarning = 0xF57900ff; @@ -376,8 +375,7 @@ Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwar Glib::ustring higlight = get_filename(ICONS, Glib::ustring(themeiconname + "/higlights.css").c_str(), false, false); if (!higlight.empty()) { std::ifstream ifs(higlight); - std::string content( (std::istreambuf_iterator<char>(ifs) ), - (std::istreambuf_iterator<char>() ) ); + std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>())); Glib::ustring result; size_t startpos = content.find(".success"); size_t endpos = content.find("}"); @@ -387,9 +385,7 @@ Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwar endpos = content.find(";"); result = content.substr(startpos + 4, endpos - 1 - startpos + 4); Gdk::RGBA success_color = Gdk::RGBA(result); - SPColor success_color_sp(success_color.get_red(), - success_color.get_green(), - success_color.get_blue()); + SPColor success_color_sp(success_color.get_red(), success_color.get_green(), success_color.get_blue()); colorsetsuccess = success_color_sp.toRGBA32(1); } startpos = content.find(".warning"); @@ -400,9 +396,7 @@ Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwar endpos = content.find(";"); result = content.substr(startpos + 4, endpos - 1 - startpos + 4); Gdk::RGBA warning_color = Gdk::RGBA(result); - SPColor warning_color_sp(warning_color.get_red(), - warning_color.get_green(), - warning_color.get_blue()); + SPColor warning_color_sp(warning_color.get_red(), warning_color.get_green(), warning_color.get_blue()); colorsetwarning = warning_color_sp.toRGBA32(1); } startpos = content.find(".error"); @@ -413,9 +407,7 @@ Application::set_higlightcolors(gchar *&colornamedsuccess, gchar *&colornamedwar endpos = content.find(";"); result = content.substr(startpos + 4, endpos - 1 - startpos + 4); Gdk::RGBA error_color = Gdk::RGBA(result); - SPColor error_color_sp(error_color.get_red(), - error_color.get_green(), - error_color.get_blue()); + SPColor error_color_sp(error_color.get_red(), error_color.get_green(), error_color.get_blue()); colorseterror = error_color_sp.toRGBA32(1); } } @@ -467,18 +459,17 @@ Application::add_gtk_css() g_object_get(settings, "gtk-font-name", >k_font_name, NULL); } - + Glib::ustring style = get_filename(UIS, "style.css"); if (!style.empty()) { auto provider = Gtk::CssProvider::create(); try { - provider->load_from_path (style); - } catch (const Gtk::CssProviderError& ex) - { - g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", - style.c_str(), ex.what().c_str()); + provider->load_from_path(style); + } catch (const Gtk::CssProviderError &ex) { + g_critical("CSSProviderError::load_from_path(): failed to load '%s'\n(%s)", style.c_str(), + ex.what().c_str()); } - Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + Gtk::StyleContext::add_provider_for_screen(screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } if (!colorizeprovider) { colorizeprovider = Gtk::CssProvider::create(); @@ -514,7 +505,7 @@ Application::add_gtk_css() g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), ex.what().c_str()); } Gtk::StyleContext::add_provider_for_screen(screen, colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - + if (!strncmp(gtk_font_name, "Cantarell", 9)) { auto provider = Gtk::CssProvider::create(); css_str = "#monoStrokeWidth,"; |