Attention une mise à jour du serveur va être effectuée le vendredi 16 avril entre 12h et 12h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 1ef67f35 authored by LE BRETON Come's avatar LE BRETON Come

Merge branch 'release/2.6.1'

parents deddbe97 8bdef922
# Change Log:
# 2.6.1 07-Feb-2019
- fix bottom left and right widget insertion in ViewHybrid
# 2.6.0 07-Feb-2019
- add bottomLeftWidget and bottomRightWidget + protected acces to some widgets in ViewHybrid
- add setVisible in dtkVisualizationViewOverlay
......
......@@ -24,7 +24,7 @@ project(dtkVisualization)
set(${PROJECT_NAME}_VERSION_MAJOR 2)
set(${PROJECT_NAME}_VERSION_MINOR 6)
set(${PROJECT_NAME}_VERSION_PATCH 0)
set(${PROJECT_NAME}_VERSION_PATCH 1)
set(${PROJECT_NAME}_VERSION
${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}.${${PROJECT_NAME}_VERSION_PATCH})
......
......@@ -481,18 +481,18 @@ QWidget *dtkVisualizationViewHybrid::bottomLeftWidget(void)
void dtkVisualizationViewHybrid::setBottomLeftWidget(fa::icon icon, QWidget *widget)
{
if(d->bottom_right_button) delete d->bottom_right_button;
if(d->bottom_left_button) delete d->bottom_left_button;
d->bottom_right_button = new dtkVisualizationViewOverlay(icon, "", this);
d->bottom_left_button = new dtkVisualizationViewOverlay(icon, "", this);
d->bottom_left_widget = widget;
d->bottom_left_widget->setParent(d);
d->bottom_left_widget->hide();
connect(d->bottom_right_button, &dtkVisualizationViewOverlay::iconClicked, [=] () {
if(d->bottom_right_widget) {
d->bottom_right_widget->setVisible(!d->bottom_right_button->isToggled());
d->bottom_right_button->toggle(!d->bottom_right_button->isToggled());
connect(d->bottom_left_button, &dtkVisualizationViewOverlay::iconClicked, [=] () {
if(d->bottom_left_widget) {
d->bottom_left_widget->setVisible(!d->bottom_left_button->isToggled());
d->bottom_left_button->toggle(!d->bottom_left_button->isToggled());
}
});
}
......@@ -504,18 +504,18 @@ QWidget *dtkVisualizationViewHybrid::bottomRightWidget(void)
void dtkVisualizationViewHybrid::setBottomRightWidget(fa::icon icon, QWidget *widget)
{
if(d->bottom_left_button) delete d->bottom_left_button;
if(d->bottom_right_button) delete d->bottom_right_button;
d->bottom_left_button = new dtkVisualizationViewOverlay(icon, "", this);
d->bottom_right_button = new dtkVisualizationViewOverlay(icon, "", this);
d->bottom_right_widget = widget;
d->bottom_right_widget->setParent(d);
d->bottom_right_widget->hide();
connect(d->bottom_left_button, &dtkVisualizationViewOverlay::iconClicked, [=] () {
if(d->bottom_left_widget) {
d->bottom_left_widget->setVisible(!d->bottom_left_button->isToggled());
d->bottom_left_button->toggle(!d->bottom_left_button->isToggled());
connect(d->bottom_right_button, &dtkVisualizationViewOverlay::iconClicked, [=] () {
if(d->bottom_right_widget) {
d->bottom_right_widget->setVisible(!d->bottom_right_button->isToggled());
d->bottom_right_button->toggle(!d->bottom_right_button->isToggled());
}
});
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment