diff --git a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp --- a/src/Gui/SettingsDialog/GeneralOptionsPage.cpp +++ b/src/Gui/SettingsDialog/GeneralOptionsPage.cpp @@ -60,7 +60,6 @@ // show magnifier mShowMagnifier = new QCheckBox(i18n("Show magnifier"), this); - mShowMagnifier->setToolTip(i18n("Hold the Shift key to temporarily toggle the magnifier when adjusting the selection rectangle.")); connect(mShowMagnifier, &QCheckBox::toggled, this, &GeneralOptionsPage::markDirty); QVBoxLayout *rrCLayout = new QVBoxLayout; diff --git a/src/QuickEditor/EditorRoot.qml b/src/QuickEditor/EditorRoot.qml --- a/src/QuickEditor/EditorRoot.qml +++ b/src/QuickEditor/EditorRoot.qml @@ -19,6 +19,7 @@ import QtQuick 2.5 import QtQuick.Window 2.2 +import QtQuick.Layouts 1.3 Item { id: editorRoot; @@ -251,43 +252,64 @@ id: midHelpText; objectName: "midHelpText"; - height: midHelpTextElement.height + 40; - width: midHelpTextElement.width + 40; - radius: 10; - border.width: 2; + height: midHelpTextElement.height + 20; + width: midHelpTextElement.width + 20; border.color: Qt.rgba(0, 0, 0, 1); color: Qt.rgba(1, 1, 1, 0.85); + visible: false; anchors.centerIn: parent; Text { id: midHelpTextElement; - text: i18n("Click anywhere on the screen (including here) to start drawing a selection rectangle, or press Esc to quit"); - font.pointSize: 12; - + text: i18n("Click anywhere to start drawing a selection rectangle,\n" + + "or press Esc to cancel."); anchors.centerIn: parent; } } + Rectangle { id: bottomHelpText; objectName: "bottomHelpText"; - height: bottomHelpTextElement.height + 16; - width: bottomHelpTextElement.width + 24; - border.width: 1; + height: bottomHelpTextElement.height + 20; + width: bottomHelpTextElement.width + 20; border.color: Qt.rgba(0, 0, 0, 1); color: Qt.rgba(1, 1, 1, 0.85); + visible: false; anchors.bottom: parent.bottom; anchors.horizontalCenter: parent.horizontalCenter; - Text { + GridLayout { id: bottomHelpTextElement; - text: i18n("To take the screenshot, double-click or press Enter. Right-click to reset the selection, or press Esc to quit"); - font.pointSize: 9; - + columns: 2 anchors.centerIn: parent; + + Text { + text: i18n("Enter, double-click:"); + Layout.alignment: Qt.AlignRight; + } + Text { text: i18n("Take screenshot"); } + + Text { + text: i18n("Shift:"); + Layout.alignment: Qt.AlignRight; + } + Text { text: i18n("Hold to toggle magnifier"); } + + Text { + text: i18n("Right-click:"); + Layout.alignment: Qt.AlignRight; + } + Text { text: i18n("Reset selection"); } + + Text { + text: i18n("Esc:"); + Layout.alignment: Qt.AlignRight; + } + Text { text: i18n("Cancel"); } } }