Merge pull request #4796 from Beep6581/grayout
Gray-out Retinex tool when editing non-raw image
This commit is contained in:
@@ -146,5 +146,14 @@ void FoldableToolPanel::setEnabledTooltipText(Glib::ustring tooltipText)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FoldableToolPanel::setGrayedOut(bool doGrayOut)
|
||||||
|
{
|
||||||
|
if (doGrayOut) {
|
||||||
|
exp->setEnabled(false);
|
||||||
|
exp->set_expanded(false);
|
||||||
|
exp->set_sensitive(false);
|
||||||
|
} else {
|
||||||
|
exp->set_sensitive(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -205,6 +205,7 @@ public:
|
|||||||
void setEnabledTooltipText(Glib::ustring tooltipText);
|
void setEnabledTooltipText(Glib::ustring tooltipText);
|
||||||
bool get_inconsistent(); // related to the enabled/disabled state
|
bool get_inconsistent(); // related to the enabled/disabled state
|
||||||
void set_inconsistent(bool isInconsistent); // related to the enabled/disabled state
|
void set_inconsistent(bool isInconsistent); // related to the enabled/disabled state
|
||||||
|
void setGrayedOut(bool doGrayOut); // Set whether the tool should be disabled, collapsed and grayed-out.
|
||||||
|
|
||||||
void setLevel (int level);
|
void setLevel (int level);
|
||||||
|
|
||||||
|
@@ -275,6 +275,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
|||||||
self->sensorbayer->FoldableToolPanel::show();
|
self->sensorbayer->FoldableToolPanel::show();
|
||||||
self->preprocess->FoldableToolPanel::show();
|
self->preprocess->FoldableToolPanel::show();
|
||||||
self->flatfield->FoldableToolPanel::show();
|
self->flatfield->FoldableToolPanel::show();
|
||||||
|
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
@@ -289,6 +290,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
|||||||
self->sensorbayer->FoldableToolPanel::hide();
|
self->sensorbayer->FoldableToolPanel::hide();
|
||||||
self->preprocess->FoldableToolPanel::show();
|
self->preprocess->FoldableToolPanel::show();
|
||||||
self->flatfield->FoldableToolPanel::show();
|
self->flatfield->FoldableToolPanel::show();
|
||||||
|
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
@@ -303,6 +305,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
|||||||
self->sensorxtrans->FoldableToolPanel::hide();
|
self->sensorxtrans->FoldableToolPanel::hide();
|
||||||
self->preprocess->FoldableToolPanel::hide();
|
self->preprocess->FoldableToolPanel::hide();
|
||||||
self->flatfield->FoldableToolPanel::show();
|
self->flatfield->FoldableToolPanel::show();
|
||||||
|
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
@@ -316,6 +319,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
|||||||
self->sensorxtrans->FoldableToolPanel::hide();
|
self->sensorxtrans->FoldableToolPanel::hide();
|
||||||
self->preprocess->FoldableToolPanel::hide();
|
self->preprocess->FoldableToolPanel::hide();
|
||||||
self->flatfield->FoldableToolPanel::hide();
|
self->flatfield->FoldableToolPanel::hide();
|
||||||
|
self->retinex->FoldableToolPanel::setGrayedOut(false);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
@@ -326,6 +330,7 @@ void ToolPanelCoordinator::imageTypeChanged (bool isRaw, bool isBayer, bool isXt
|
|||||||
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data);
|
ToolPanelCoordinator* const self = static_cast<ToolPanelCoordinator*>(data);
|
||||||
|
|
||||||
self->rawPanelSW->set_sensitive (false);
|
self->rawPanelSW->set_sensitive (false);
|
||||||
|
self->retinex->FoldableToolPanel::setGrayedOut(true);
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user