liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac: add some comments

Browse Source
This commit is contained in:
Richard Barber 2020-02-16 23:47:44 -08:00
parent 910ce572b0
commit 4905b03372
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtdata/options/options.osx
View File

@ -39,5 +39,6 @@ CustomProfileBuilder=
#ImgDefault=Neutral #ImgDefault=Neutral
[GUI] [GUI]
# Set the included font as default
FontFamily=DroidSansMonoSlashed Regular FontFamily=DroidSansMonoSlashed Regular
CPFontFamily=DroidSansMonoSlashed Regular CPFontFamily=DroidSansMonoSlashed Regular

6
rtgui/options.cc
View File

@ -2274,9 +2274,9 @@ void Options::load(bool lightweight)
// Build Application Support directory path for macOS. // Build Application Support directory path for macOS.
const gchar* homedir; const gchar* homedir;
const gchar* configdir; const gchar* configdir;
homedir = g_getenv("HOME"); // This returns the current container homedir = g_getenv("HOME"); // This returns the current container data dir in ~/Library
std::cout << "homedir=" << homedir << "\n"; std::cout << "homedir=" << homedir << "\n";
configdir = "/../../../Application Support/RawTherapee/config"; configdir = "/../../../Application Support/RawTherapee/config"; // Back out of containers and into App. Support
int bufferSize = strlen(homedir) + strlen(configdir) + 1; int bufferSize = strlen(homedir) + strlen(configdir) + 1;
gchar* concatString = new gchar[ bufferSize ]; gchar* concatString = new gchar[ bufferSize ];
strcpy( concatString, homedir ); strcpy( concatString, homedir );
@ -2331,7 +2331,7 @@ void Options::load(bool lightweight)
// Modify the path of the cache folder to the one provided in RT_CACHE environment variable. Build the cache folder name in macOS. // Modify the path of the cache folder to the one provided in RT_CACHE environment variable. Build the cache folder name in macOS.
#ifdef __APPLE__ #ifdef __APPLE__
const gchar* cachedir; const gchar* cachedir;
cachedir = "/../../../Application Support/RawTherapee/cache"; cachedir = "/../../../Application Support/RawTherapee/cache"; // Back out of containers and into App. Support
int bufferSize2 = strlen(homedir) + strlen(cachedir) + 1; //reuse homedir from above. int bufferSize2 = strlen(homedir) + strlen(cachedir) + 1; //reuse homedir from above.
gchar* concatString2 = new gchar[ bufferSize2 ]; gchar* concatString2 = new gchar[ bufferSize2 ];
strcpy( concatString2, homedir ); strcpy( concatString2, homedir );

4
tools/osx/Info.plist.in
View File

@ -12,6 +12,8 @@
<string>/Applications/RawTherapee.app/Contents/Frameworks</string> <string>/Applications/RawTherapee.app/Contents/Frameworks</string>
<key>GTK_IM_MODULE_FILE</key> <key>GTK_IM_MODULE_FILE</key>
<string>/Applications/RawTherapee.app/Contents/Resources/etc/gtk-3.0/gtk.immodules</string> <string>/Applications/RawTherapee.app/Contents/Resources/etc/gtk-3.0/gtk.immodules</string>
<key>GTK_MODULES</key>
<string>/Applications/RawTherapee.app/Contents/Frameworks/im-quartz.so</string>
<key>XDG_DATA_HOME</key> <key>XDG_DATA_HOME</key>
<string>/Applications/RawTherapee.app/Contents/Resources/share</string> <string>/Applications/RawTherapee.app/Contents/Resources/share</string>
<key>GSETTINGS_SCHEMA_DIR</key> <key>GSETTINGS_SCHEMA_DIR</key>
@ -30,6 +32,8 @@
<string>similar</string> <string>similar</string>
<key>GTK_OVERLAY_SCROLLING</key> <key>GTK_OVERLAY_SCROLLING</key>
<string>0</string> <string>0</string>
<key>GDK_NATIVE_WINDOWS</key>
<string>1</string>
</dict> </dict>
<key>ATSApplicationFontsPath</key> <key>ATSApplicationFontsPath</key>
<string>etc/fonts</string> <string>etc/fonts</string>