From 28738d2d8d6db6b0a771c3c6676450e7269e4f37 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 22 May 2018 12:23:54 +0200 Subject: [PATCH] Doc: Add formatting features to Notepad example - bold, italic, underline - About button Change-Id: I8ece7d2bfca0b148b681a2fccb4a439ce179848a Reviewed-by: Venugopal Shivashankar --- .../widgets/tutorials/notepad/images/bold.png | Bin 0 -> 724 bytes .../tutorials/notepad/images/italic.png | Bin 0 -> 471 bytes .../tutorials/notepad/images/underline.png | Bin 0 -> 520 bytes .../widgets/tutorials/notepad/notepad.cpp | 24 +++ examples/widgets/tutorials/notepad/notepad.h | 10 +- .../widgets/tutorials/notepad/notepad.qrc | 17 +- examples/widgets/tutorials/notepad/notepad.ui | 153 ++++++++++++++++-- 7 files changed, 182 insertions(+), 22 deletions(-) create mode 100644 examples/widgets/tutorials/notepad/images/bold.png create mode 100644 examples/widgets/tutorials/notepad/images/italic.png create mode 100644 examples/widgets/tutorials/notepad/images/underline.png diff --git a/examples/widgets/tutorials/notepad/images/bold.png b/examples/widgets/tutorials/notepad/images/bold.png new file mode 100644 index 0000000000000000000000000000000000000000..fe737cdb764fba114ff11d6b05a8b8037f66d64f GIT binary patch literal 724 zcmV;_0xSKAP)6Ot4~S*dAQja-&C zwpLP;5wcaq?wuq zeimGQ;2KutZB%F8#DeL>F+9PJyaH8X4en!I*2JnAfn~UyH7UHYYUpmRP;qsr=9gE*b=%$_WQWsZ?6Xhz~aS;WdT(!_8i z-kn9P>{)9(68oG*s7xarSRaWGWf3dWNIzCa;`iF!fQGqGzXye#@ZU5(VtJNEwPQit z;P(X)7GbrpARduCwVn`+rluW6M&^+F4JUCkYhu~6Rx7u$2^aGuSH;M<@HKW}@qAU< zQ2fEFwY^mG(z)r9%-dZ*yRr3 zkoe2|fX8Vnt=f5HCZ~j5aUx}Rtr(ARBkjXgHS$onoR~oW*|OZa6jV7$bQY z7PjqI@ivb@9wRUDAWvnJO#KvngBQZT!`RhnO-)VBf5QQDYaC3nthH-Gv33$O|tA;z5MUAGRXp&<2Ti^y3Sj%vQ0d{gH`U@%pJm#Hr@wa z)Y`7?5`I1L;M9YztK7_#W_AA+-7!=8HA8q~_5Ft32YyUWvR(D1vGBpJ>wKH?)^0QS zw@5Zcw@9OBb$7%j?mt3#Yfrb7PJPy~;fRFA1-{KWx+~YZ9hhD=W9f-wVpdBkmGw4t z?zd2~t1+A)9Xw+fyAh95!VL?K}f`o167D|DQx0IxutQAY}$EkWbPr`cYd3MRV1LV@uUz_p-}wP#iun}UfLXah4jV<&-g zVeALRE`(QFf|;0Pvu+Pq1*Xzk19p*@Wen{9Yl4(H;5NsUwk}APTwkaIogM~@)ERvY z@k<0817GL^bb%e*Hq%RE7C5BXa_ayMk{jO(WnGDBl3n&%S~2hpJOY>L(J%%9mwRLh zSoCe=4{efHm{Mut?;$8vQ)_CdzYv4O<*)7?aOK-b#vF!Wc;p9zv8J||oLM9Q0000< KMNUMnLSTZ_{mmu- literal 0 HcmV?d00001 diff --git a/examples/widgets/tutorials/notepad/notepad.cpp b/examples/widgets/tutorials/notepad/notepad.cpp index 44d8597cb7..99a1a52c2b 100644 --- a/examples/widgets/tutorials/notepad/notepad.cpp +++ b/examples/widgets/tutorials/notepad/notepad.cpp @@ -191,3 +191,27 @@ void Notepad::on_actionFont_triggered() if (fontSelected) ui->textEdit->setFont(font); } + +void Notepad::on_actionUnderline_triggered() +{ + ui->textEdit->setFontUnderline(ui->actionUnderline->isChecked()); +} + +void Notepad::on_actionItalic_triggered() +{ + ui->textEdit->setFontItalic(ui->actionItalic->isChecked()); +} + +void Notepad::on_actionBold_triggered() +{ + ui->actionBold->isChecked() ? ui->textEdit->setFontWeight(QFont::Bold) : + ui->textEdit->setFontWeight(QFont::Normal); +} + +void Notepad::on_actionAbout_triggered() +{ + QMessageBox::about(this, tr("About MDI"), + tr("The Notepad example demonstrates how to code a basic " + "text editor using QtWidgets")); + +} diff --git a/examples/widgets/tutorials/notepad/notepad.h b/examples/widgets/tutorials/notepad/notepad.h index f688df45ac..288ab4e373 100644 --- a/examples/widgets/tutorials/notepad/notepad.h +++ b/examples/widgets/tutorials/notepad/notepad.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -103,6 +103,14 @@ private slots: void on_actionFont_triggered(); + void on_actionBold_triggered(); + + void on_actionUnderline_triggered(); + + void on_actionItalic_triggered(); + + void on_actionAbout_triggered(); + //! [6] private: Ui::Notepad *ui; diff --git a/examples/widgets/tutorials/notepad/notepad.qrc b/examples/widgets/tutorials/notepad/notepad.qrc index ec11679f13..8c0486bc39 100644 --- a/examples/widgets/tutorials/notepad/notepad.qrc +++ b/examples/widgets/tutorials/notepad/notepad.qrc @@ -1,12 +1,5 @@ - images/copy.png - images/create.png - images/cut.png - images/edit_redo.png - images/edit_undo.png - images/exit.png - images/font.png images/info.png images/new.png images/open.png @@ -15,5 +8,15 @@ images/print.png images/save.png images/save_as.png + images/exit.png + images/font.png + images/copy.png + images/create.png + images/cut.png + images/edit_redo.png + images/edit_undo.png + images/bold.png + images/italic.png + images/underline.png diff --git a/examples/widgets/tutorials/notepad/notepad.ui b/examples/widgets/tutorials/notepad/notepad.ui index d197a95fe7..4b2a6a0675 100644 --- a/examples/widgets/tutorials/notepad/notepad.ui +++ b/examples/widgets/tutorials/notepad/notepad.ui @@ -6,8 +6,8 @@ 0 0 - 524 - 300 + 800 + 400 @@ -25,7 +25,7 @@ 0 0 - 524 + 800 25 @@ -74,7 +74,13 @@ + + + + + + @@ -87,105 +93,224 @@ New + + New text document + + + Ctrl+N + - + :/images/open.png:/images/open.png Open + + Open file + + + Ctrl+O + - + :/images/save.png:/images/save.png Save + + Save file + + + Ctrl+S + - + :/images/save_as.png:/images/save_as.png Save as + + Save file as + + + Alt+S + - + :/images/print.png:/images/print.png Print + + Print file + + + Ctrl+P + - + :/images/exit.png:/images/exit.png Exit + + Exit notepad + + + - + :/images/copy.png:/images/copy.png Copy + + Ctrl+C + - + :/images/cut.png:/images/cut.png Cut + + Ctrl+X + - + :/images/paste.png:/images/paste.png Paste + + Ctrl+V + - + :/images/edit_undo.png:/images/edit_undo.png Undo + + Ctrl+Z + - + :/images/edit_redo.png:/images/edit_redo.png Redo + + Ctrl+Y + - + :/images/font.png:/images/font.png Font + + Ctrl+F + + + + + true + + + + :/images/italic.png:/images/italic.png + + + Italic + + + Italic font + + + Ctrl+I + + + + + true + + + + :/images/bold.png:/images/bold.png + + + actionBold + + + Bold + + + Ctrl+B + + + + + true + + + + :/images/underline.png:/images/underline.png + + + Underline + + + Underline + + + Ctrl+U + + + + + + :/images/info.png:/images/info.png + + + About + + + About Notepad +