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

merge with dev

Browse Source
This commit is contained in:
Desmis
2017-10-14 08:34:38 +02:00
parent b19e12732a dfe40677e2
commit 74cc88ff2f
109 changed files with 3299 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/batchtoolpanelcoord.cc
View File

@@ -25,31 +25,14 @@
using namespace rtengine::procparams;
BatchToolPanelCoordinator::BatchToolPanelCoordinator (FilePanel* parent) : ToolPanelCoordinator(), somethingChanged (false), parent (parent)
BatchToolPanelCoordinator::BatchToolPanelCoordinator (FilePanel* parent) : ToolPanelCoordinator(true), somethingChanged(false), parent(parent)
{
blockedUpdate = false;
// remove exif panel and iptc panel
std::vector<ToolPanel*>::iterator epi = std::find (toolPanels.begin(), toolPanels.end(), exifpanel);
if (epi != toolPanels.end()) {
toolPanels.erase (epi);
}
std::vector<ToolPanel*>::iterator ipi = std::find (toolPanels.begin(), toolPanels.end(), iptcpanel);
if (ipi != toolPanels.end()) {
toolPanels.erase (ipi);
}
if (toolBar) {
toolBar->setBatchMode ();
}
toolPanelNotebook->remove_page (*metadataPanel);
metadataPanel = nullptr;
toiM = nullptr;
for (size_t i = 0; i < toolPanels.size(); i++) {
toolPanels[i]->setBatchMode (true);
}