Changeset View
Changeset View
Standalone View
Standalone View
src/QuickEditor/EditorRoot.qml
| Show All 13 Lines | |||||
| 14 | * You should have received a copy of the GNU Lesser General Public License | 14 | * You should have received a copy of the GNU Lesser General Public License | ||
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software | ||
| 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 17 | * Boston, MA 02110-1301, USA. | 17 | * Boston, MA 02110-1301, USA. | ||
| 18 | */ | 18 | */ | ||
| 19 | 19 | | |||
| 20 | import QtQuick 2.5 | 20 | import QtQuick 2.5 | ||
| 21 | import QtQuick.Window 2.2 | 21 | import QtQuick.Window 2.2 | ||
| 22 | import QtQuick.Layouts 1.3 | ||||
| 23 | import QtQuick.Controls 1.4 | ||||
| 22 | 24 | | |||
| 23 | Item { | 25 | Item { | ||
| 24 | id: editorRoot; | 26 | id: editorRoot; | ||
| 25 | objectName: "editorRoot"; | 27 | objectName: "editorRoot"; | ||
| 26 | 28 | | |||
| 27 | // properties and setters | 29 | // properties and setters | ||
| 28 | 30 | | |||
| 29 | property var selection: undefined; | 31 | property var selection: undefined; | ||
| ▲ Show 20 Lines • Show All 216 Lines • ▼ Show 20 Line(s) | 110 | Canvas { | |||
| 246 | TextMetrics { | 248 | TextMetrics { | ||
| 247 | id: selectionTextMetrics | 249 | id: selectionTextMetrics | ||
| 248 | } | 250 | } | ||
| 249 | 251 | | |||
| 250 | Rectangle { | 252 | Rectangle { | ||
| 251 | id: midHelpText; | 253 | id: midHelpText; | ||
| 252 | objectName: "midHelpText"; | 254 | objectName: "midHelpText"; | ||
| 253 | 255 | | |||
| 254 | height: midHelpTextElement.height + 40; | 256 | height: midHelpTextElement.height + 20; | ||
| 255 | width: midHelpTextElement.width + 40; | 257 | width: midHelpTextElement.width + 20; | ||
| 256 | radius: 10; | | |||
| 257 | border.width: 2; | | |||
| 258 | border.color: Qt.rgba(0, 0, 0, 1); | 258 | border.color: Qt.rgba(0, 0, 0, 1); | ||
| 259 | color: Qt.rgba(1, 1, 1, 0.85); | 259 | color: Qt.rgba(1, 1, 1, 0.85); | ||
| 260 | 260 | | |||
| 261 | visible: false; | ||||
| 261 | anchors.centerIn: parent; | 262 | anchors.centerIn: parent; | ||
| 262 | 263 | | |||
| 263 | Text { | 264 | Label { | ||
| 264 | id: midHelpTextElement; | 265 | id: midHelpTextElement; | ||
| 265 | text: i18n("Click anywhere on the screen (including here) to start drawing a selection rectangle, or press Esc to quit"); | 266 | text: i18n("Click anywhere to start drawing a selection rectangle,\n" + | ||
| 266 | font.pointSize: 12; | 267 | "or press Esc to cancel."); | ||
| 267 | | ||||
| 268 | anchors.centerIn: parent; | 268 | anchors.centerIn: parent; | ||
| 269 | } | 269 | } | ||
| 270 | } | 270 | } | ||
| 271 | 271 | | |||
| 272 | Rectangle { | 272 | Rectangle { | ||
| 273 | id: bottomHelpText; | 273 | id: bottomHelpText; | ||
| 274 | objectName: "bottomHelpText"; | 274 | objectName: "bottomHelpText"; | ||
| 275 | 275 | | |||
| 276 | height: bottomHelpTextElement.height + 16; | 276 | height: bottomHelpTextElement.height + 20; | ||
| 277 | width: bottomHelpTextElement.width + 24; | 277 | width: bottomHelpTextElement.width + 20; | ||
| 278 | border.width: 1; | | |||
| 279 | border.color: Qt.rgba(0, 0, 0, 1); | 278 | border.color: Qt.rgba(0, 0, 0, 1); | ||
| 280 | color: Qt.rgba(1, 1, 1, 0.85); | 279 | color: Qt.rgba(1, 1, 1, 0.85); | ||
| 281 | 280 | | |||
| 281 | visible: false; | ||||
ngraham: How come? | |||||
See summary:
You should be able to test this by following the test plan before and after the patch. rkflx: See summary:
> Setting the default visibility of the help texts to `false` avoids showing them… | |||||
| 282 | anchors.bottom: parent.bottom; | 282 | anchors.bottom: parent.bottom; | ||
| 283 | anchors.horizontalCenter: parent.horizontalCenter; | 283 | anchors.horizontalCenter: parent.horizontalCenter; | ||
| 284 | 284 | | |||
| 285 | Text { | 285 | GridLayout { | ||
| 286 | id: bottomHelpTextElement; | 286 | id: bottomHelpTextElement; | ||
| 287 | text: i18n("To take the screenshot, double-click or press Enter. Right-click to reset the selection, or press Esc to quit"); | 287 | columns: 2 | ||
| 288 | font.pointSize: 9; | | |||
| 289 | | ||||
| 290 | anchors.centerIn: parent; | 288 | anchors.centerIn: parent; | ||
| 289 | | ||||
| 290 | Label { | ||||
| 291 | text: i18n("Enter, double-click:"); | ||||
| 292 | Layout.alignment: Qt.AlignRight; | ||||
| 293 | } | ||||
| 294 | Label { text: i18n("Take screenshot"); } | ||||
| 295 | | ||||
| 296 | Label { | ||||
| 297 | text: i18n("Shift:"); | ||||
| 298 | Layout.alignment: Qt.AlignRight; | ||||
| 299 | } | ||||
| 300 | Label { text: i18n("Hold to toggle magnifier"); } | ||||
| 301 | | ||||
| 302 | Label { | ||||
| 303 | text: i18n("Right-click:"); | ||||
| 304 | Layout.alignment: Qt.AlignRight; | ||||
| 305 | } | ||||
| 306 | Label { text: i18n("Reset selection"); } | ||||
| 307 | | ||||
| 308 | Label { | ||||
| 309 | text: i18n("Esc:"); | ||||
| 310 | Layout.alignment: Qt.AlignRight; | ||||
| 311 | } | ||||
| 312 | Label { text: i18n("Cancel"); } | ||||
| 291 | } | 313 | } | ||
| 292 | } | 314 | } | ||
| 293 | 315 | | |||
| 294 | // Use Rectangle so that the background is white when cursor nearby edge | 316 | // Use Rectangle so that the background is white when cursor nearby edge | ||
| 295 | Rectangle { | 317 | Rectangle { | ||
| 296 | id: crossMagnifier; | 318 | id: crossMagnifier; | ||
| 297 | 319 | | |||
| 298 | height: (magPixels * 2 + 1) * magZoom; | 320 | height: (magPixels * 2 + 1) * magZoom; | ||
| ▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines | |||||
How come?