Commit Graph

16 Commits

Author SHA1 Message Date
Mårten Nordheim 3a9f84fb37 Update QStringConverter usage
Following fa8d021fa6fcb040fb702b6ffd2deee52a3b748a

Change-Id: Ifa08b5e1bceecb8657ce528eb315c19fa34a1e1f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-10-09 11:44:18 +02:00
Shawn Rutledge 0672882cab Support Markdown in the TextEditor example, including local paths
The example still loads an HTML file from resources by default, but now
it's possible to give either a relative or absolute file path on the
command line to load an html, markdown or plain text file. Alternatively
you can use the file dialog to load any of these types. We assume that
any resources (such as images) with relative paths are to be loaded from
the directory where the source text file is.

Pick-to: 5.15
Change-Id: I37bc2d6aa2306016453770dc2fd66efa41a16618
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-08-10 16:20:06 +02:00
Karsten Heimrich 602bffd346 Port QtQuickControls2 from QTextCodec to QString{Converter|Decoder}
Task-number: QTBUG-75665
Change-Id: Ib66a260dc3bfc39e2e50c38db56ca72b8186a4ac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-06-17 15:09:27 +02:00
Alexandru Croitor 92dc998f6d Fix build failures as a result of QMetaType changes in qtbase
moc now stores the QMetaType of properties as a result of
46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires
full type information about the property type inside the moc generated
source file.

Many of the property types were forward-declared, and this resulted
in build errors like
  "invalid application of 'sizeof' to an incomplete type 'QQuickTransition'"

Make sure to explicitly include the moc files inside the counterpart
.cpp files, so that full information is available from included headers.

Fixes: QTBUG-82774
Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-03-12 15:48:31 +01:00
Friedemann Kleint 63a4ecea93 TextEditor: Add modified handling
Add a modified property to the document and add
handling in onClosing(). Connect the actions to
call close() instead of Qt.quit() for it to
become active.

Change-Id: I0fec75629db64e91508ed8ba45d4fb60be146b1b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-08-21 10:13:23 +02:00
J-P Nurmi 732c519dc6 Add missing includes
Found while doing a -no-accessibility build.

Change-Id: I9772316eed3d544b21926970371a590ef2c15bef
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-02-24 13:05:07 +00:00
J-P Nurmi 00a062649b Welcome to 2017
Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-01-09 17:29:40 +00:00
Mitch Curtis a80f50ab9b texteditor: add touch UI
Task-number: QTBUG-54952
Change-Id: I14fe95608c4393b928edc80fc93ebaa843ce478f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-08-24 08:09:24 +00:00
J-P Nurmi 9a6bdf52a3 texteditor: replace setFileUrl() with load()
This allows to remove the text property to avoid storing the whole
document's initial content for no real purpose.

Change-Id: Iad59576b5304be9739c1dfb0a7d4c263323b0edb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 10:51:30 +00:00
J-P Nurmi 90842fdc86 texteditor: add fileName & fileType
'document.fileName' reads better than 'document.documentTitle',
and 'document.fileType' can be set as the default suffix for
the file save dialog.

Change-Id: I935586296c91d3efdd5edea03d81c685e7edcab2
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 10:51:27 +00:00
J-P Nurmi bb3453aead texteditor: cosmetic cleanup
Change-Id: Id1d5f0f8c1e7851ea33241fa09af5c0029b74db3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 10:51:21 +00:00
J-P Nurmi b36652f906 texteditor: fix, unify and cleanup the setters
- setCursorPosition() was missing cursorPositionChanged()
- setAlignment() does not need to check for doc, it's done in textCursor()
- remove the unnecessary cursor.isNull() checks to gain shorter code

Change-Id: I4448224ab02fc22f43ef10749200aca80eed537c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 10:51:18 +00:00
J-P Nurmi 14f46dc101 texteditor: remove uninitialized/duplicate pointer member
Use textDocument() similarly than textCursor() is already used,
to access the underlying document and cursors.

Change-Id: I1f90f95420132251792f4f9dda302c0509fbad0c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 07:56:13 +00:00
J-P Nurmi 01eda3fa22 texteditor: re-order the property accessors
There's no reason to register all setters as slots. Properties are fine
for QML usage. Re-order them also in the .cpp file in the same order
than they are in the header. It's a bit easier to follow when logical
pairs are next to each other.

Change-Id: Ib8097ecafe10f2c785b05b045694c338977860ef
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 07:56:08 +00:00
J-P Nurmi 0d8e87d7f6 texteditor: simplify saveAs() - let FileDialog handle the suffix
Change-Id: Id1b415ebcbe12a9eeff9b54dcfa2cec67054a8d6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-08-12 07:56:03 +00:00
Mitch Curtis fcf4a1ed81 Add Text Editor example
A follow up commit will contain the touch UI.

Change-Id: I26275fdd31294506821fa3e3e4a4bb63329665b9
Task-number: QTBUG-54952
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-08-11 16:47:48 +00:00