diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-10-20 20:54:21 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-10-20 21:24:08 +0000 |
| commit | 0ec8457e3dfde14a9f1be1e65ddd0aa35f9dcd7c (patch) | |
| tree | bcbd0114609ec386dce5f05d4c5294901cca53e8 /src | |
| parent | FontFactory: Add function to add additional font directories (diff) | |
| download | inkscape-0ec8457e3dfde14a9f1be1e65ddd0aa35f9dcd7c.tar.gz inkscape-0ec8457e3dfde14a9f1be1e65ddd0aa35f9dcd7c.zip | |
Define INKSCAPE_FONTSDIR and add USER/SYSTEM resource paths for fonts
(Note we always had an empty /share/fonts directory
that didn't seem to have any purpose yet)
Diffstat (limited to 'src')
| -rw-r--r-- | src/io/resource.cpp | 2 | ||||
| -rw-r--r-- | src/io/resource.h | 1 | ||||
| -rw-r--r-- | src/path-prefix.h | 4 | ||||
| -rw-r--r-- | src/preferences.cpp | 2 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/io/resource.cpp b/src/io/resource.cpp index c3cd9e403..3f970dfa1 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -52,6 +52,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) case APPICONS: temp = INKSCAPE_APPICONDIR; break; case EXTENSIONS: temp = INKSCAPE_EXTENSIONDIR; break; case FILTERS: temp = INKSCAPE_FILTERDIR; break; + case FONTS: temp = INKSCAPE_FONTSDIR; break; case GRADIENTS: temp = INKSCAPE_GRADIENTSDIR; break; case ICONS: temp = INKSCAPE_PIXMAPDIR; break; case KEYS: temp = INKSCAPE_KEYSDIR; break; @@ -87,6 +88,7 @@ gchar *_get_path(Domain domain, Type type, char const *filename) switch (type) { case EXTENSIONS: name = "extensions"; break; case FILTERS: name = "filters"; break; + case FONTS: name = "fonts"; break; case GRADIENTS: name = "gradients"; break; case ICONS: name = "icons"; break; case KEYS: name = "keys"; break; diff --git a/src/io/resource.h b/src/io/resource.h index d7dd506ad..6ec08a28c 100644 --- a/src/io/resource.h +++ b/src/io/resource.h @@ -33,6 +33,7 @@ namespace Resource { enum Type { APPICONS, EXTENSIONS, + FONTS, GRADIENTS, ICONS, KEYS, diff --git a/src/path-prefix.h b/src/path-prefix.h index 1c17ce2d8..d6514d832 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -34,6 +34,7 @@ # define INKSCAPE_EXAMPLESDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/examples" ) # define INKSCAPE_EXTENSIONDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/extensions" ) # define INKSCAPE_FILTERDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/filters" ) +# define INKSCAPE_FONTSDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/fonts" ) # define INKSCAPE_GRADIENTSDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/gradients" ) # define INKSCAPE_KEYSDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/keys" ) # define INKSCAPE_PIXMAPDIR BR_DATADIR( INKSCAPE_LIBPREFIX "/share/inkscape/icons" ) @@ -58,6 +59,7 @@ # define INKSCAPE_EXAMPLESDIR WIN32_DATADIR("examples") # define INKSCAPE_EXTENSIONDIR WIN32_DATADIR("extensions") # define INKSCAPE_FILTERDIR WIN32_DATADIR("filters") +# define INKSCAPE_FONTSDIR WIN32_DATADIR("fonts") # define INKSCAPE_GRADIENTSDIR WIN32_DATADIR("gradients") # define INKSCAPE_KEYSDIR WIN32_DATADIR("keys") # define INKSCAPE_PIXMAPDIR WIN32_DATADIR("icons") @@ -81,6 +83,7 @@ # define INKSCAPE_EXAMPLESDIR "Contents/Resources/share/inkscape/examples" # define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions" # define INKSCAPE_FILTERDIR "Contents/Resources/share/inkscape/filters" +# define INKSCAPE_FONTSDIR "Contents/Resources/share/inkscape/fonts" # define INKSCAPE_GRADIENTSDIR "Contents/Resources/share/inkscape/gradients" # define INKSCAPE_KEYSDIR "Contents/Resources/share/inkscape/keys" # define INKSCAPE_PIXMAPDIR "Contents/Resources/share/inkscape/icons" @@ -104,6 +107,7 @@ # define INKSCAPE_EXAMPLESDIR INKSCAPE_DATADIR "/inkscape/examples" # define INKSCAPE_EXTENSIONDIR INKSCAPE_DATADIR "/inkscape/extensions" # define INKSCAPE_FILTERDIR INKSCAPE_DATADIR "/inkscape/filters" +# define INKSCAPE_FONTSDIR INKSCAPE_DATADIR "/inkscape/fonts" # define INKSCAPE_GRADIENTSDIR INKSCAPE_DATADIR "/inkscape/gradients" # define INKSCAPE_KEYSDIR INKSCAPE_DATADIR "/inkscape/keys" # define INKSCAPE_PIXMAPDIR INKSCAPE_DATADIR "/inkscape/icons" diff --git a/src/preferences.cpp b/src/preferences.cpp index 9d5fb0639..7ebf55a79 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -147,7 +147,7 @@ void Preferences::_load() return; } // create some subdirectories for user stuff - char const *user_dirs[] = {"keys", "templates", "icons", "extensions", "palettes", NULL}; + char const *user_dirs[] = {"extensions", "fonts", "icons", "keys", "palettes", "templates", NULL}; for (int i=0; user_dirs[i]; ++i) { // XXX Why are we doing this here? shouldn't this be an IO load item? char *dir = Inkscape::IO::Resource::profile_path(user_dirs[i]); |