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

thumbnail: rename get/setStage to get/setTrashed

Browse Source 
Also return a bool in getTrashed since it's already used as a bool in
setTrash and in all the checks.
This commit is contained in:
Simone Gotti
2024-03-12 08:50:44 +01:00
parent 11240bc97d
commit dcc983331d
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/filebrowser.cc
View File

@@ -547,13 +547,13 @@ void FileBrowser::rightClicked ()
untrash->set_sensitive (false);
for (size_t i = 0; i < selected.size(); i++)
if ((static_cast<FileBrowserEntry*>(selected[i]))->thumbnail->getStage()) {
if ((static_cast<FileBrowserEntry*>(selected[i]))->thumbnail->getTrashed()) {
untrash->set_sensitive (true);
break;
}
for (size_t i = 0; i < selected.size(); i++)
if (!(static_cast<FileBrowserEntry*>(selected[i]))->thumbnail->getStage()) {
if (!(static_cast<FileBrowserEntry*>(selected[i]))->thumbnail->getTrashed()) {
trash->set_sensitive (true);
break;
}
@@ -649,7 +649,7 @@ void FileBrowser::addEntry_ (FileBrowserEntry* entry)
entry->addButtonSet(new FileThumbnailButtonSet(entry));
entry->getThumbButtonSet()->setRank(entry->thumbnail->getRank());
entry->getThumbButtonSet()->setColorLabel(entry->thumbnail->getColorLabel());
entry->getThumbButtonSet()->setInTrash(entry->thumbnail->getStage());
entry->getThumbButtonSet()->setInTrash(entry->thumbnail->getTrashed());
entry->getThumbButtonSet()->setButtonListener(this);
entry->resize(getThumbnailHeight());
entry->filtered = !checkFilter(entry);
@@ -1023,12 +1023,12 @@ void FileBrowser::menuItemActivated (Gtk::MenuItem* m)
const auto thumbnail = mselected[i]->thumbnail;
const auto rank = thumbnail->getRank();
const auto colorLabel = thumbnail->getColorLabel();
const auto stage = thumbnail->getStage();
const auto stage = thumbnail->getTrashed();
thumbnail->createProcParamsForUpdate (false, true);
thumbnail->setRank(rank);
thumbnail->setColorLabel(colorLabel);
thumbnail->setStage(stage);
thumbnail->setTrashed(stage);
// Empty run to update the thumb
rtengine::procparams::ProcParams params = thumbnail->getProcParams ();
@@ -1558,8 +1558,8 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) const // true ->
((entry->thumbnail->isRecentlySaved() && filter.showRecentlySaved[0]) && !filter.showRecentlySaved[1]) ||
((!entry->thumbnail->isRecentlySaved() && filter.showRecentlySaved[1]) && !filter.showRecentlySaved[0]) ||
(entry->thumbnail->getStage() && !filter.showTrash) ||
(!entry->thumbnail->getStage() && !filter.showNotTrash)) {
(entry->thumbnail->getTrashed() && !filter.showTrash) ||
(!entry->thumbnail->getTrashed() && !filter.showNotTrash)) {
return false;
}
@@ -1625,11 +1625,11 @@ void FileBrowser::toTrashRequested (std::vector<FileBrowserEntry*> tbe)
// no need to notify listeners as item goes to trash, likely to be deleted
if (tbe[i]->thumbnail->getStage()) {
if (tbe[i]->thumbnail->getTrashed()) {
continue;
}
tbe[i]->thumbnail->setStage (true);
tbe[i]->thumbnail->setTrashed (true);
if (tbe[i]->getThumbButtonSet()) {
tbe[i]->getThumbButtonSet()->setRank (tbe[i]->thumbnail->getRank());
@@ -1649,11 +1649,11 @@ void FileBrowser::fromTrashRequested (std::vector<FileBrowserEntry*> tbe)
for (size_t i = 0; i < tbe.size(); i++) {
// if thumbnail was marked inTrash=true then param file must be there, no need to run customprofilebuilder
if (!tbe[i]->thumbnail->getStage()) {
if (!tbe[i]->thumbnail->getTrashed()) {
continue;
}
tbe[i]->thumbnail->setStage (false);
tbe[i]->thumbnail->setTrashed (false);
if (tbe[i]->getThumbButtonSet()) {
tbe[i]->getThumbButtonSet()->setRank (tbe[i]->thumbnail->getRank());
@@ -1784,7 +1784,7 @@ void FileBrowser::buttonPressed (LWButton* button, int actionCode, void* actionD
FileBrowserEntry* entry = static_cast<FileBrowserEntry*>(actionData);
tbe.push_back (entry);
if (!entry->thumbnail->getStage()) {
if (!entry->thumbnail->getTrashed()) {
toTrashRequested (tbe);
} else {
fromTrashRequested (tbe);

4
rtgui/filecatalog.cc
View File

@@ -1910,7 +1910,7 @@ void FileCatalog::emptyTrash ()
std::vector<FileBrowserEntry*> toDel;
for (const auto entry : t) {
if ((static_cast<FileBrowserEntry*>(entry))->thumbnail->getStage() == 1) {
if ((static_cast<FileBrowserEntry*>(entry))->thumbnail->getTrashed()) {
toDel.push_back(static_cast<FileBrowserEntry*>(entry));
}
}
@@ -1926,7 +1926,7 @@ bool FileCatalog::trashIsEmpty ()
const auto& t = fileBrowser->getEntries();
for (const auto entry : t) {
if ((static_cast<FileBrowserEntry*>(entry))->thumbnail->getStage() == 1) {
if ((static_cast<FileBrowserEntry*>(entry))->thumbnail->getTrashed()) {
return false;
}
}

18
rtgui/thumbnail.cc
View File

@@ -141,7 +141,7 @@ Thumbnail::Thumbnail(CacheManager* cm, const Glib::ustring& fname, CacheImageDat
// TODO? should we call notifylisterners_procParamsChanged here?
setRank(cfs.rankOld);
setStage(cfs.inTrashOld);
setTrashed(cfs.inTrashOld);
}
delete tpp;
@@ -444,7 +444,7 @@ void Thumbnail::clearProcParams (int whoClearedIt)
// preserve rank, colorlabel and inTrash across clear
int rank = getRank();
int colorlabel = getColorLabel();
int inTrash = getStage();
int inTrash = getTrashed();
cfs.recentlySaved = false;
@@ -460,7 +460,7 @@ void Thumbnail::clearProcParams (int whoClearedIt)
setRank(rank);
pparamsValid = cfs.rating != rank;
setColorLabel(colorlabel);
setStage(inTrash);
setTrashed(inTrash);
// params could get validated by rank/inTrash values restored above
if (pparamsValid) {
@@ -563,7 +563,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
// do not update rank, colorlabel and inTrash
const int rank = getRank();
const int colorlabel = getColorLabel();
const int inTrash = getStage();
const int inTrash = getTrashed();
if (pe) {
pe->combine(*pparams, pp, true);
@@ -575,7 +575,7 @@ void Thumbnail::setProcParams (const ProcParams& pp, ParamsEdited* pe, int whoCh
setRank(rank);
setColorLabel(colorlabel);
setStage(inTrash);
setTrashed(inTrash);
if (updateCacheNow) {
updateCache();
@@ -1115,15 +1115,15 @@ void Thumbnail::setColorLabel (int colorlabel)
}
}
int Thumbnail::getStage () const
bool Thumbnail::getTrashed () const
{
return pparams->inTrash;
}
void Thumbnail::setStage (bool stage)
void Thumbnail::setTrashed (bool trashed)
{
if (pparams->inTrash != stage) {
pparams->inTrash = stage;
if (pparams->inTrash != trashed) {
pparams->inTrash = trashed;
pparamsValid = true;
}
}

4
rtgui/thumbnail.h
View File

@@ -155,8 +155,8 @@ public:
int getColorLabel () const;
void setColorLabel (int colorlabel);
int getStage () const;
void setStage (bool stage);
bool getTrashed () const;
void setTrashed (bool trashed);
void addThumbnailListener (ThumbnailListener* tnl);
void removeThumbnailListener (ThumbnailListener* tnl);