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
2019-12-01 06:31:33 +01:00
parent d68e98fff8 3748133cd2
commit 93c97a0470
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rtgui/toolpanelcoord.cc
View File

@@ -348,13 +348,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
{ {
rawPanelSW->set_sensitive(true); rawPanelSW->set_sensitive(true);
sensorxtrans->FoldableToolPanel::hide(); sensorxtrans->FoldableToolPanel::hide();
xtransprocess->FoldableToolPanel::hide();
xtransrawexposure->FoldableToolPanel::hide();
sensorbayer->FoldableToolPanel::show(); sensorbayer->FoldableToolPanel::show();
bayerprocess->FoldableToolPanel::show();
bayerpreprocess->FoldableToolPanel::show();
rawcacorrection->FoldableToolPanel::show();
preprocess->FoldableToolPanel::show(); preprocess->FoldableToolPanel::show();
flatfield->FoldableToolPanel::show(); flatfield->FoldableToolPanel::show();
filmNegative->FoldableToolPanel::show(); filmNegative->FoldableToolPanel::show();
pdSharpening->FoldableToolPanel::show(); pdSharpening->FoldableToolPanel::show();
retinex->FoldableToolPanel::setGrayedOut(false); retinex->FoldableToolPanel::setGrayedOut(false);
return false; return false;
} }
); );
@@ -364,13 +368,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
{ {
rawPanelSW->set_sensitive(true); rawPanelSW->set_sensitive(true);
sensorxtrans->FoldableToolPanel::show(); sensorxtrans->FoldableToolPanel::show();
xtransprocess->FoldableToolPanel::show();
xtransrawexposure->FoldableToolPanel::show();
sensorbayer->FoldableToolPanel::hide(); sensorbayer->FoldableToolPanel::hide();
bayerprocess->FoldableToolPanel::hide();
bayerpreprocess->FoldableToolPanel::hide();
rawcacorrection->FoldableToolPanel::hide();
preprocess->FoldableToolPanel::show(); preprocess->FoldableToolPanel::show();
flatfield->FoldableToolPanel::show(); flatfield->FoldableToolPanel::show();
filmNegative->FoldableToolPanel::show(); filmNegative->FoldableToolPanel::show();
pdSharpening->FoldableToolPanel::show(); pdSharpening->FoldableToolPanel::show();
retinex->FoldableToolPanel::setGrayedOut(false); retinex->FoldableToolPanel::setGrayedOut(false);
return false; return false;
} }
); );
@@ -380,13 +388,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
{ {
rawPanelSW->set_sensitive(true); rawPanelSW->set_sensitive(true);
sensorbayer->FoldableToolPanel::hide(); sensorbayer->FoldableToolPanel::hide();
bayerprocess->FoldableToolPanel::hide();
bayerpreprocess->FoldableToolPanel::hide();
rawcacorrection->FoldableToolPanel::hide();
sensorxtrans->FoldableToolPanel::hide(); sensorxtrans->FoldableToolPanel::hide();
xtransprocess->FoldableToolPanel::hide();
xtransrawexposure->FoldableToolPanel::hide();
preprocess->FoldableToolPanel::hide(); preprocess->FoldableToolPanel::hide();
flatfield->FoldableToolPanel::show(); flatfield->FoldableToolPanel::show();
filmNegative->FoldableToolPanel::hide(); filmNegative->FoldableToolPanel::hide();
pdSharpening->FoldableToolPanel::show(); pdSharpening->FoldableToolPanel::show();
retinex->FoldableToolPanel::setGrayedOut(false); retinex->FoldableToolPanel::setGrayedOut(false);
return false; return false;
} }
); );
@@ -396,13 +408,17 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
{ {
rawPanelSW->set_sensitive(true); rawPanelSW->set_sensitive(true);
sensorbayer->FoldableToolPanel::hide(); sensorbayer->FoldableToolPanel::hide();
bayerprocess->FoldableToolPanel::hide();
bayerpreprocess->FoldableToolPanel::hide();
rawcacorrection->FoldableToolPanel::hide();
sensorxtrans->FoldableToolPanel::hide(); sensorxtrans->FoldableToolPanel::hide();
xtransprocess->FoldableToolPanel::hide();
xtransrawexposure->FoldableToolPanel::hide();
preprocess->FoldableToolPanel::hide(); preprocess->FoldableToolPanel::hide();
flatfield->FoldableToolPanel::hide(); flatfield->FoldableToolPanel::hide();
filmNegative->FoldableToolPanel::hide(); filmNegative->FoldableToolPanel::hide();
pdSharpening->FoldableToolPanel::hide(); pdSharpening->FoldableToolPanel::hide();
retinex->FoldableToolPanel::setGrayedOut(false); retinex->FoldableToolPanel::setGrayedOut(false);
return false; return false;
} }
); );
@@ -412,10 +428,18 @@ void ToolPanelCoordinator::imageTypeChanged(bool isRaw, bool isBayer, bool isXtr
[this]() -> bool [this]() -> bool
{ {
rawPanelSW->set_sensitive(false); rawPanelSW->set_sensitive(false);
sensorbayer->FoldableToolPanel::hide();
bayerprocess->FoldableToolPanel::hide();
bayerpreprocess->FoldableToolPanel::hide();
rawcacorrection->FoldableToolPanel::hide();
sensorxtrans->FoldableToolPanel::hide();
xtransprocess->FoldableToolPanel::hide();
xtransrawexposure->FoldableToolPanel::hide();
preprocess->FoldableToolPanel::hide();
flatfield->FoldableToolPanel::hide();
filmNegative->FoldableToolPanel::hide(); filmNegative->FoldableToolPanel::hide();
pdSharpening->FoldableToolPanel::hide(); pdSharpening->FoldableToolPanel::hide();
retinex->FoldableToolPanel::setGrayedOut(true); retinex->FoldableToolPanel::setGrayedOut(true);
return false; return false;
} }
); );