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

Merge pull request #3012 from adamreichold/simplify-refresh-profile-list

Browse Source 
Profile list builder code cleanup
This commit is contained in:
Jean-Christophe 2015-12-06 14:34:39 +01:00
commit 9807cbf6ea
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/profilestore.cc
View File

@ -542,7 +542,7 @@ 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, const std::vector<const ProfileStoreEntry*> *entryList)
{ {
for (std::vector<const ProfileStoreEntry*>::const_iterator i = entryList->begin(); i != entryList->end(); i++) { for (std::vector<const ProfileStoreEntry*>::const_iterator i = entryList->begin(); i != entryList->end(); i++) {
if ((*i)->parentFolderId == parentFolderId) { // filtering the entry of the same folder if ((*i)->parentFolderId == parentFolderId) { // filtering the entry of the same folder
@ -553,28 +553,28 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
// creating the new submenu // creating the new submenu
Gtk::TreeModel::Row newSubMenu; Gtk::TreeModel::Row newSubMenu;
if (initial) { if (parentRow) {
newSubMenu = *(refTreeModel->append());
} else {
newSubMenu = *(refTreeModel->append(parentRow->children())); newSubMenu = *(refTreeModel->append(parentRow->children()));
} else {
newSubMenu = *(refTreeModel->append());
} }
// creating and assigning the custom Label object // creating and assigning the custom Label object
newSubMenu[methodColumns.label] = (*i)->label; newSubMenu[methodColumns.label] = (*i)->label;
newSubMenu[methodColumns.profileStoreEntry] = *i; newSubMenu[methodColumns.profileStoreEntry] = *i;
refreshProfileList_ (&newSubMenu, (*i)->folderId, false, entryList); refreshProfileList_ (&newSubMenu, (*i)->folderId, entryList);
} else { } else {
refreshProfileList_ (parentRow, (*i)->folderId, true, entryList); refreshProfileList_ (parentRow, (*i)->folderId, entryList);
} }
} else { } else {
Gtk::TreeModel::Row newItem; Gtk::TreeModel::Row newItem;
// creating a menu entry // creating a menu entry
if (initial) { if (parentRow) {
newItem = *(refTreeModel->append());
} else {
newItem = *(refTreeModel->append(parentRow->children())); newItem = *(refTreeModel->append(parentRow->children()));
} else {
newItem = *(refTreeModel->append());
} }
newItem[methodColumns.label] = (*i)->label; newItem[methodColumns.label] = (*i)->label;
@ -604,9 +604,8 @@ void ProfileStoreComboBox::updateProfileList ()
// this will lock the profilestore's entry list too // this will lock the profilestore's entry list too
const std::vector<const ProfileStoreEntry*> *entryList = profileStore.getFileList(); const std::vector<const ProfileStoreEntry*> *entryList = profileStore.getFileList();
Gtk::TreeModel::Row root;
//profileStore.dumpFolderList(); //profileStore.dumpFolderList();
refreshProfileList_ (&root, entryList->at(0)->parentFolderId, true, entryList); refreshProfileList_ (NULL, entryList->at(0)->parentFolderId, entryList);
if (entryList->at(0)->parentFolderId != 0) { if (entryList->at(0)->parentFolderId != 0) {
// special case for the Internal default entry // special case for the Internal default entry

2
rtgui/profilestore.h
View File

@ -218,7 +218,7 @@ protected:
Glib::RefPtr<Gtk::TreeStore> refTreeModel; Glib::RefPtr<Gtk::TreeStore> refTreeModel;
MethodColumns methodColumns; MethodColumns methodColumns;
void refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, bool initial, const std::vector<const ProfileStoreEntry*> *entryList); void refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, const std::vector<const ProfileStoreEntry*> *entryList);
Gtk::TreeIter findRowFromEntry_ (Gtk::TreeModel::Children childs, const ProfileStoreEntry *pse); Gtk::TreeIter findRowFromEntry_ (Gtk::TreeModel::Children childs, const ProfileStoreEntry *pse);
Gtk::TreeIter findRowFromFullPath_(Gtk::TreeModel::Children childs, int parentFolderId, Glib::ustring &name); Gtk::TreeIter findRowFromFullPath_(Gtk::TreeModel::Children childs, int parentFolderId, Glib::ustring &name);