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

Fixed Gimp button in OS X, issue 1876

Browse Source
This commit is contained in:
DrSlony
2013-05-24 00:32:34 +01:00
parent 2f79c54eab
commit 3c0254987c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtgui/editorpanel.cc
View File

@@ -27,6 +27,7 @@
#include "../rtengine/imagesource.h" #include "../rtengine/imagesource.h"
#include "soundman.h" #include "soundman.h"
#include "rtimage.h" #include "rtimage.h"
#include <iostream>
using namespace rtengine::procparams; using namespace rtengine::procparams;
@@ -1310,9 +1311,14 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector<int> *pc,rtengine::IImage16*
if ( safe_file_test(executable, (Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) ) { if ( safe_file_test(executable, (Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) ) {
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
} }
#else #elif defined __APPLE__
cmdLine = Glib::ustring("gimp-remote ") + Glib::ustring(" \"") + filename + Glib::ustring("\""); cmdLine = Glib::ustring("open -a /Applications/GIMP.app \'") + filename + Glib::ustring("\'");
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#else
cmdLine = Glib::ustring("gimp \"") + filename + Glib::ustring("\"");
success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#endif #endif
if (!success){ if (!success){
#ifdef WIN32 #ifdef WIN32
@@ -1326,11 +1332,13 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector<int> *pc,rtengine::IImage16*
ver--; ver--;
} }
#elif defined __APPLE__ #elif defined __APPLE__
cmdLine = Glib::ustring("gimp \"") + filename + Glib::ustring("\""); cmdLine = Glib::ustring("open -a /Applications/Gimp.app/Contents/Resources/start \'") + filename + Glib::ustring("\'");
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#else #else
cmdLine = Glib::ustring("gimp \"") + filename + Glib::ustring("\""); cmdLine = Glib::ustring("gimp-remote \"") + filename + Glib::ustring("\"");
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#endif #endif
} }
} }
@@ -1348,6 +1356,7 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector<int> *pc,rtengine::IImage16*
cmdLine = Glib::ustring("\"") + Glib::build_filename(options.psDir,"Photoshop.exe") + Glib::ustring("\" \"") + filename + Glib::ustring("\""); cmdLine = Glib::ustring("\"") + Glib::build_filename(options.psDir,"Photoshop.exe") + Glib::ustring("\" \"") + filename + Glib::ustring("\"");
#endif #endif
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#endif #endif
} }
else if (options.editorToSendTo==3) { else if (options.editorToSendTo==3) {
@@ -1358,11 +1367,12 @@ bool EditorPanel::idle_sentToGimp(ProgressConnector<int> *pc,rtengine::IImage16*
} }
#else #else
#ifdef __APPLE__ #ifdef __APPLE__
cmdLine = options.customEditorProg + filename; cmdLine = options.customEditorProg + Glib::ustring(" \"") + filename + Glib::ustring("\"");
#else #else
cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\" \"") + filename + Glib::ustring("\""); cmdLine = Glib::ustring("\"") + options.customEditorProg + Glib::ustring("\" \"") + filename + Glib::ustring("\"");
#endif #endif
success = safe_spawn_command_line_async (cmdLine); success = safe_spawn_command_line_async (cmdLine);
std::cout << cmdLine << std::endl;
#endif #endif
} }