diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-26 14:51:10 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-07-26 14:51:10 +0000 |
| commit | f2a0226cb35bb6e9682c661daccff1826f86d13a (patch) | |
| tree | fa41512daf0b947246b89d8f4ba09dbabd01b34c /src/ui | |
| parent | Fix symbolic icon color width (diff) | |
| download | inkscape-f2a0226cb35bb6e9682c661daccff1826f86d13a.tar.gz inkscape-f2a0226cb35bb6e9682c661daccff1826f86d13a.zip | |
Fixing paths to allow themes and icons inside main inkscape instalation not only at home
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 7 | ||||
| -rw-r--r-- | src/ui/dialog/ocaldialogs.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 100590eab..2a012ad98 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -782,6 +782,7 @@ void InkscapePreferences::initPageUI() symbolicThemeCheck(); _page_theme.add_group_header(_("Theme changes")); { + using namespace Inkscape::IO::Resource; GHashTable *t; GHashTableIter iter; gchar *theme, *path; @@ -799,7 +800,11 @@ void InkscapePreferences::initPageUI() } g_strfreev(builtin_themes); - path = _inkscape_get_theme_dir(); + path = g_strdup((char const *)Inkscape::IO::Resource::get_path(USER, DATADIR, "")); + _inkscape_fill_gtk(path, t); + g_free(path); + + path = g_strdup((char const *)Inkscape::IO::Resource::get_path(SYSTEM, DATADIR, "")); _inkscape_fill_gtk(path, t); g_free(path); diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index ffa535b78..42daddff2 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -547,7 +547,7 @@ LogoArea::LogoArea() : Gtk::EventBox() { // Try to load the OCAL logo, but if the file is not found, degrade gracefully try { - std::string logo_path = Glib::build_filename(INKSCAPE_PIXMAPDIR, "OCAL.png"); + std::string logo_path = Glib::build_filename(INKSCAPE_PIXMAPSDIR, "OCAL.png"); logo_mask = Cairo::ImageSurface::create_from_png(logo_path); draw_logo = true; } catch(Cairo::logic_error) { |