From 255db3272090ebe3f628d3b0d0124e68c07c1a3c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 17 Sep 2016 19:16:15 +0300 Subject: [PATCH] Improve tooltip for tools Rotation, Flipping by line and Flipping by axis. The app will show updated tooltip message in case a user selected point that is already a part of the list of operated objects. --HG-- branch : develop --- .../dialogs/tools/dialogflippingbyaxis.cpp | 1 + .../dialogs/tools/dialogflippingbyline.cpp | 17 ++++++++++++----- .../vtools/dialogs/tools/dialogrotation.cpp | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index a49fd2e82..195f9efba 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -192,6 +192,7 @@ void DialogFlippingByAxis::ChosenObject(quint32 id, const SceneObject &type) { if (objects.contains(id)) { + emit ToolTip("Select origin point that is not part of the list of objects"); return; } diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index 78ca2ae88..5b94b5501 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -189,14 +189,15 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - if (objects.contains(id)) - { - return; - } - switch (number) { case 0: + if (objects.contains(id)) + { + emit ToolTip("Select first line point that is not part of the list of objects"); + return; + } + if (SetObject(id, ui->comboBoxFirstLinePoint, tr("Select second line point"))) { number++; @@ -207,6 +208,12 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: + if (objects.contains(id)) + { + emit ToolTip("Select second line point that is not part of the list of objects"); + return; + } + if (getCurrentObjectId(ui->comboBoxFirstLinePoint) != id) { if (SetObject(id, ui->comboBoxSecondLinePoint, "")) diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 3a9babe2e..cf849321a 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -234,6 +234,7 @@ void DialogRotation::ChosenObject(quint32 id, const SceneObject &type) { if (objects.contains(id)) { + emit ToolTip("Select origin point that is not part of the list of objects"); return; }