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

Solving issue 3092: "Profile file names containing german Umlaute are

Browse Source 
not shown"
This commit is contained in:
Hombre 2016-01-18 00:11:56 +01:00
parent 94725dedae
commit 33ea7156b8
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
rtgui/profilestore.cc
View File

@ -87,8 +87,8 @@ void ProfileStore::parseProfiles ()
return; return;
} }
for (std::list<ProfileStoreListener*>::iterator i = listeners.begin(); i != listeners.end(); ++i) { for (auto listener : listeners) {
(*i)->storeCurrentValue(); listener->storeCurrentValue();
} }
{ {
@ -97,9 +97,9 @@ void ProfileStore::parseProfiles ()
_parseProfiles (); _parseProfiles ();
} }
for (std::list<ProfileStoreListener*>::iterator i = listeners.begin(); i != listeners.end(); ++i) { for (auto listener : listeners) {
(*i)->updateProfileList(); listener->updateProfileList();
(*i)->restoreValue(); listener->restoreValue();
} }
} }
@ -206,7 +206,7 @@ bool ProfileStore::parseDir (Glib::ustring& realPath, Glib::ustring& virtualPath
} else { } else {
size_t lastdot = currDir.find_last_of ('.'); size_t lastdot = currDir.find_last_of ('.');
if (lastdot != Glib::ustring::npos && lastdot <= currDir.size() - 4 && !currDir.casefold().compare (lastdot, 4, paramFileExtension)) { if (lastdot != Glib::ustring::npos && lastdot == currDir.length() - 4 && currDir.substr(lastdot).casefold() == paramFileExtension) {
// file found // file found
if( options.rtSettings.verbose ) { if( options.rtSettings.verbose ) {
printf ("Processing file %s...", fname.c_str()); printf ("Processing file %s...", fname.c_str());
@ -312,9 +312,9 @@ const ProfileStoreEntry* ProfileStore::findEntryFromFullPathU(Glib::ustring path
} }
// 2. find the entry that match the given filename and parentFolderId // 2. find the entry that match the given filename and parentFolderId
for (std::vector<const ProfileStoreEntry*>::iterator i = entries.begin(); i != entries.end(); i++) { for (auto entry : entries) {
if (((*i)->parentFolderId) == parentFolderId && (*i)->label == fName) { if (entry->parentFolderId == parentFolderId && entry->label == fName) {
return *i; return entry;
} }
} }
@ -454,20 +454,22 @@ const Glib::ustring ProfileStore::getPathFromId(int folderId)
void ProfileStore::clearFileList() void ProfileStore::clearFileList()
{ {
for (std::vector<const ProfileStoreEntry*>::iterator i = entries.begin(); i != entries.end(); ++i) for (auto entry : entries) {
if (*i != internalDefaultEntry) { if (entry != internalDefaultEntry) {
delete *i; delete entry;
} }
}
entries.clear(); entries.clear();
} }
void ProfileStore::clearProfileList() void ProfileStore::clearProfileList()
{ {
for (std::map<const ProfileStoreEntry*, rtengine::procparams::AutoPartialProfile*>::iterator i = partProfiles.begin(); i != partProfiles.end(); ++i) for (auto partProfile : partProfiles) {
if (i->second != internalDefaultProfile) { if (partProfile.second != internalDefaultProfile) {
delete i->second; delete partProfile.second;
} }
}
partProfiles.clear(); partProfiles.clear();
} }
@ -544,10 +546,10 @@ const ProfileStoreEntry* ProfileStoreComboBox::getSelectedEntry()
/** @brief Recursive method to update the combobox entries */ /** @brief Recursive method to update the combobox entries */
void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, bool initial, const std::vector<const ProfileStoreEntry*> *entryList) void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, bool initial, const std::vector<const ProfileStoreEntry*> *entryList)
{ {
for (std::vector<const ProfileStoreEntry*>::const_iterator i = entryList->begin(); i != entryList->end(); i++) { for (auto entry : *entryList) {
if ((*i)->parentFolderId == parentFolderId) { // filtering the entry of the same folder if (entry->parentFolderId == parentFolderId) { // filtering the entry of the same folder
if ((*i)->type == PSET_FOLDER) { if (entry->type == PSET_FOLDER) {
Glib::ustring folderPath( profileStore.getPathFromId((*i)->folderId) ); Glib::ustring folderPath( profileStore.getPathFromId(entry->folderId) );
if (options.useBundledProfiles || ((folderPath != "${G}" ) && (folderPath != "${U}" ))) { if (options.useBundledProfiles || ((folderPath != "${G}" ) && (folderPath != "${U}" ))) {
// creating the new submenu // creating the new submenu
@ -560,12 +562,12 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
} }
// creating and assigning the custom Label object // creating and assigning the custom Label object
newSubMenu[methodColumns.label] = (*i)->label; newSubMenu[methodColumns.label] = entry->label;
newSubMenu[methodColumns.profileStoreEntry] = *i; newSubMenu[methodColumns.profileStoreEntry] = entry;
refreshProfileList_ (&newSubMenu, (*i)->folderId, false, entryList); refreshProfileList_ (&newSubMenu, entry->folderId, false, entryList);
} else { } else {
refreshProfileList_ (parentRow, (*i)->folderId, true, entryList); refreshProfileList_ (parentRow, entry->folderId, true, entryList);
} }
} else { } else {
Gtk::TreeModel::Row newItem; Gtk::TreeModel::Row newItem;
@ -577,8 +579,8 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
newItem = *(refTreeModel->append(parentRow->children())); newItem = *(refTreeModel->append(parentRow->children()));
} }
newItem[methodColumns.label] = (*i)->label; newItem[methodColumns.label] = entry->label;
newItem[methodColumns.profileStoreEntry] = *i; newItem[methodColumns.profileStoreEntry] = entry;
} }
} }
} }