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

Added UTF8 international character support for file operations; see issue #413

Browse Source
This commit is contained in:
Oliver Duis
2010-12-18 17:41:03 +01:00
parent 1f2f3b1209
commit 94449dc9e4
29 changed files with 166 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtgui/thumbnail.cc
View File

@@ -29,6 +29,7 @@
#include <guiutils.h>
#include <profilestore.h>
#include <batchqueue.h>
#include <safegtk.h>
using namespace rtengine::procparams;
@@ -180,16 +181,16 @@ void Thumbnail::clearProcParams (int whoClearedIt) {
needsReProcessing = true;
// remove param file from cache
Glib::ustring fname_ = getCacheFileName ("profiles")+paramFileExtension;
if (Glib::file_test (fname_, Glib::FILE_TEST_EXISTS))
::g_remove (fname_.c_str());
if (safe_file_test (fname_, Glib::FILE_TEST_EXISTS))
safe_g_remove (fname_);
// remove param file located next to the file
// fname_ = removeExtension(fname) + paramFileExtension;
fname_ = fname + paramFileExtension;
if (Glib::file_test (fname_, Glib::FILE_TEST_EXISTS))
::g_remove (fname_.c_str());
if (safe_file_test(fname_, Glib::FILE_TEST_EXISTS))
safe_g_remove (fname_);
fname_ = removeExtension(fname) + paramFileExtension;
if (Glib::file_test (fname_, Glib::FILE_TEST_EXISTS))
::g_remove (fname_.c_str());
if (safe_file_test (fname_, Glib::FILE_TEST_EXISTS))
safe_g_remove (fname_);
for (int i=0; i<listeners.size(); i++)
listeners[i]->procParamsChanged (this, whoClearedIt);
@@ -437,9 +438,9 @@ void Thumbnail::_saveThumbnail () {
if (!tpp)
return;
::g_remove ((getCacheFileName ("images")+".cust").c_str());
::g_remove ((getCacheFileName ("images")+".cust16").c_str());
::g_remove ((getCacheFileName ("images")+".jpg").c_str());
safe_g_remove (getCacheFileName ("images")+".cust");
safe_g_remove (getCacheFileName ("images")+".cust16");
safe_g_remove (getCacheFileName ("images")+".jpg");
// save thumbnail image
if (options.thumbnailFormat == FT_Custom)
@@ -520,7 +521,7 @@ bool Thumbnail::openDefaultViewer(int destination) {
if (destination==1) {
openFName = Glib::ustring::compose ("%1.%2", BatchQueue::calcAutoFileNameBase(fname), options.saveFormat.format);
if (Glib::file_test (openFName, Glib::FILE_TEST_EXISTS)) {
if (safe_file_test (openFName, Glib::FILE_TEST_EXISTS)) {
ShellExecute(NULL, "open", openFName.c_str(), NULL, NULL, SW_SHOWMAXIMIZED );
} else {
printf("File not found\n");
@@ -532,7 +533,7 @@ bool Thumbnail::openDefaultViewer(int destination) {
printf("Opening %s\n", openFName.c_str());
if (Glib::file_test (openFName, Glib::FILE_TEST_EXISTS)) {
if (safe_file_test (openFName, Glib::FILE_TEST_EXISTS)) {
// Output file exists, so open explorer and select output file
const char* org=Glib::ustring::compose("/select,\"%1\"", openFName).c_str();
char* par=new char[strlen(org)+1];
@@ -548,7 +549,7 @@ bool Thumbnail::openDefaultViewer(int destination) {
ShellExecute(NULL, "open", "explorer.exe", par, NULL, SW_SHOWNORMAL );
delete[] par;
} else if (Glib::file_test (Glib::path_get_dirname(openFName), Glib::FILE_TEST_EXISTS)) {
} else if (safe_file_test (Glib::path_get_dirname(openFName), Glib::FILE_TEST_EXISTS)) {
// Out file does not exist, but directory
ShellExecute(NULL, "explore", Glib::path_get_dirname(openFName).c_str(), NULL, NULL, SW_SHOWNORMAL );
} else {