diff options
Diffstat (limited to 'examples/widgets/desktop/systray/doc')
-rw-r--r-- | examples/widgets/desktop/systray/doc/images/systemtray-editor.png | bin | 25407 -> 16137 bytes | |||
-rw-r--r-- | examples/widgets/desktop/systray/doc/images/systemtray-example.png | bin | 47588 -> 49858 bytes | |||
-rw-r--r-- | examples/widgets/desktop/systray/doc/src/systray.qdoc | 37 |
3 files changed, 7 insertions, 30 deletions
diff --git a/examples/widgets/desktop/systray/doc/images/systemtray-editor.png b/examples/widgets/desktop/systray/doc/images/systemtray-editor.png Binary files differindex f7c23db28a..5537c09fde 100644 --- a/examples/widgets/desktop/systray/doc/images/systemtray-editor.png +++ b/examples/widgets/desktop/systray/doc/images/systemtray-editor.png diff --git a/examples/widgets/desktop/systray/doc/images/systemtray-example.png b/examples/widgets/desktop/systray/doc/images/systemtray-example.png Binary files differindex 98b5c8133e..f2f9f73031 100644 --- a/examples/widgets/desktop/systray/doc/images/systemtray-example.png +++ b/examples/widgets/desktop/systray/doc/images/systemtray-example.png diff --git a/examples/widgets/desktop/systray/doc/src/systray.qdoc b/examples/widgets/desktop/systray/doc/src/systray.qdoc index ae7e925bd8..b0dff58e31 100644 --- a/examples/widgets/desktop/systray/doc/src/systray.qdoc +++ b/examples/widgets/desktop/systray/doc/src/systray.qdoc @@ -1,33 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \example desktop/systray \title System Tray Icon Example + \examplecategory {Desktop} \ingroup examples-widgets \brief The System Tray Icon example shows how to add an icon with a menu and popup messages to a desktop environment's system tray. @@ -173,11 +150,11 @@ We have reimplemented the QWidget::closeEvent() event handler to receive widget close events, showing the above message to the - users when they are closing the editor window. On \macos we need to + users when they are closing the editor window. We need to avoid showing the message and accepting the close event when the - user really intends to quit the application, that is, when the - user has triggered "Quit" in the menu bar or pressed the Command+Q - shortcut. + user really intends to quit the application: that is, when the + user has triggered "Quit" in the menu bar, or in the tray icon's + context menu, or pressed Command+Q shortcut on \macOS. In addition to the functions and slots discussed above, we have also implemented several convenience functions to simplify the |