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

Manually edited rtgui/profilestore.* to use changes from master so it compiles

Browse Source
This commit is contained in:
Beep6581
2016-01-24 19:08:08 +01:00
parent 8c67765341
commit 723b6d5580
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/profilestore.cc
View File

@@ -544,7 +544,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, const std::vector<const ProfileStoreEntry*> *entryList) void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, bool initial, const std::vector<const ProfileStoreEntry*> *entryList)
{ {
for (auto entry : *entryList) { for (auto entry : *entryList) {
if (entry->parentFolderId == parentFolderId) { // filtering the entry of the same folder if (entry->parentFolderId == parentFolderId) { // filtering the entry of the same folder
@@ -555,23 +555,22 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
// creating the new submenu // creating the new submenu
Gtk::TreeModel::Row newSubMenu; Gtk::TreeModel::Row newSubMenu;
if (parentRow) { if (initial) {
newSubMenu = *(refTreeModel->append(parentRow->children()));
} else {
newSubMenu = *(refTreeModel->append()); newSubMenu = *(refTreeModel->append());
} else {
newSubMenu = *(refTreeModel->append(parentRow->children()));
} }
// creating and assigning the custom Label object // creating and assigning the custom Label object
newSubMenu[methodColumns.label] = entry->label; newSubMenu[methodColumns.label] = entry->label;
newSubMenu[methodColumns.profileStoreEntry] = entry; newSubMenu[methodColumns.profileStoreEntry] = entry;
//refreshProfileList_ (&newSubMenu, entry->folderId, false, entryList);
// HACK: Workaround for bug in Gtk+ 3.18... // HACK: Workaround for bug in Gtk+ 3.18...
Gtk::TreeModel::Row menuHeader = *(refTreeModel->append(newSubMenu->children())); Gtk::TreeModel::Row menuHeader = *(refTreeModel->append(newSubMenu->children()));
menuHeader[methodColumns.label] = (*i)->label; menuHeader[methodColumns.label] = entry->label;
menuHeader[methodColumns.profileStoreEntry] = *i; menuHeader[methodColumns.profileStoreEntry] = entry;
refreshProfileList_ (&newSubMenu, (*i)->folderId, entryList); refreshProfileList_ (&newSubMenu, entry->folderId, false, entryList);
} else { } else {
refreshProfileList_ (parentRow, entry->folderId, true, entryList); refreshProfileList_ (parentRow, entry->folderId, true, entryList);
} }
@@ -579,10 +578,10 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
Gtk::TreeModel::Row newItem; Gtk::TreeModel::Row newItem;
// creating a menu entry // creating a menu entry
if (parentRow) { if (initial) {
newItem = *(refTreeModel->append(parentRow->children()));
} else {
newItem = *(refTreeModel->append()); newItem = *(refTreeModel->append());
} else {
newItem = *(refTreeModel->append(parentRow->children()));
} }
newItem[methodColumns.label] = entry->label; newItem[methodColumns.label] = entry->label;
@@ -591,7 +590,6 @@ void ProfileStoreComboBox::refreshProfileList_ (Gtk::TreeModel::Row *parentRow,
} }
} }
} }
/** @brief Get the ProfileStore's entry list and recreate the combobox entries. /** @brief Get the ProfileStore's entry list and recreate the combobox entries.
* If you want to update the ProfileStore list itself (rescan the dir tree), use the "ProfileStore::parseProfiles" method instead * If you want to update the ProfileStore list itself (rescan the dir tree), use the "ProfileStore::parseProfiles" method instead
* *
@@ -613,7 +611,7 @@ void ProfileStoreComboBox::updateProfileList ()
const std::vector<const ProfileStoreEntry*> *entryList = profileStore.getFileList(); const std::vector<const ProfileStoreEntry*> *entryList = profileStore.getFileList();
//profileStore.dumpFolderList(); //profileStore.dumpFolderList();
refreshProfileList_ (NULL, entryList->at(0)->parentFolderId, entryList); refreshProfileList_ (NULL, entryList->at(0)->parentFolderId, true, 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, const std::vector<const ProfileStoreEntry*> *entryList); void refreshProfileList_ (Gtk::TreeModel::Row *parentRow, int parentFolderId, bool initial, 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);