diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2023-04-03 09:45:20 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-06 08:50:38 +0000 |
commit | cd3abbe358c2f826b81f4a3a36b7b55a74b86d2e (patch) | |
tree | 0899d174a62b79f603a295148426b4ff76fd4301 /examples | |
parent | b02f5b4aaff5147c177cacfc8324cf7a1c5c7381 (diff) |
examples: Remove menus example
Showing the usage of QMenuBar and QStatusBar in a QMainWindow can be
merged into another if needed.
In order to keep the use case's code in source, the example was moved to
tests/manual.
Change-Id: I76ec12e9c83a42028f2de95ab17ca07544b53425
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 73f52eb39f80ce2ba9602c3faf8939b752aa9098)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/activeqt/CMakeLists.txt | 1 | ||||
-rw-r--r-- | examples/activeqt/activeqt.pro | 1 | ||||
-rw-r--r-- | examples/activeqt/menus/CMakeLists.txt | 34 | ||||
-rw-r--r-- | examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc | 9 | ||||
-rw-r--r-- | examples/activeqt/menus/doc/src/menus.qdoc | 36 | ||||
-rw-r--r-- | examples/activeqt/menus/fileopen.xpm | 22 | ||||
-rw-r--r-- | examples/activeqt/menus/filesave.xpm | 22 | ||||
-rw-r--r-- | examples/activeqt/menus/main.cpp | 26 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.cpp | 140 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.def | 6 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.h | 41 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.ico | bin | 766 -> 0 bytes | |||
-rw-r--r-- | examples/activeqt/menus/menus.inf | 9 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.pro | 16 | ||||
-rw-r--r-- | examples/activeqt/menus/menus.rc | 2 |
15 files changed, 0 insertions, 365 deletions
diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt index 76a9808..de6c321 100644 --- a/examples/activeqt/CMakeLists.txt +++ b/examples/activeqt/CMakeLists.txt @@ -3,7 +3,6 @@ if(MSVC) qt_internal_add_example(comapp) - qt_internal_add_example(menus) qt_internal_add_example(multiple) qt_internal_add_example(simple) qt_internal_add_example(wrapper) diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 251808c..90b126a 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS += comapp \ - menus \ multiple \ simple \ wrapper diff --git a/examples/activeqt/menus/CMakeLists.txt b/examples/activeqt/menus/CMakeLists.txt deleted file mode 100644 index bb06f93..0000000 --- a/examples/activeqt/menus/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(menusax LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/menus") - -find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui Widgets) - -qt6_add_axserver_executable(menusax - main.cpp - menus.cpp menus.h - menus.def - menus.rc -) - -target_link_libraries(menusax PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets -) - -install(TARGETS menusax - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc b/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc deleted file mode 100644 index a889f0f..0000000 --- a/examples/activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//! [0] -<object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd" -CODEBASE="http://www.qt-project.org/demos/menusax.cab"> -[Object not available! Did you forget to build and register the server?] -</object> -//! [0] diff --git a/examples/activeqt/menus/doc/src/menus.qdoc b/examples/activeqt/menus/doc/src/menus.qdoc deleted file mode 100644 index fdbe4ce..0000000 --- a/examples/activeqt/menus/doc/src/menus.qdoc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \page qaxserver-demo-menus.html - \preliminary - - \title Menubar Merging - - This example is not fully functional at the moment. - - \raw HTML - <object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd" - CODEBASE="http://www.qt-project.org/demos/menusax.cab"> - [Object not available! Did you forget to build and register the server?] - </object> - \endraw -*/ - -/*! - \example activeqt/menus - \title Menus Example (ActiveQt) - - \brief The Menus example demonstrates the use of QMenuBar and QStatusBar - in a QMainWindow to implement an in-place active control. - - To build the example you must first build the QAxServer library. - Then run \c qmake and your make tool in \c - examples/activeqt/menus. - - The \l{qaxserver-demo-menus.html}{demonstration} requires your - WebBrowser to support ActiveX controls, and scripting to be - enabled. - - \snippet activeqt/menus/doc/snippets/doc_src_examples_activeqt_menus.qdoc 0 -*/ diff --git a/examples/activeqt/menus/fileopen.xpm b/examples/activeqt/menus/fileopen.xpm deleted file mode 100644 index 880417e..0000000 --- a/examples/activeqt/menus/fileopen.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *fileopen[] = { -" 16 13 5 1", -". c #040404", -"# c #808304", -"a c None", -"b c #f3f704", -"c c #f3f7f3", -"aaaaaaaaa...aaaa", -"aaaaaaaa.aaa.a.a", -"aaaaaaaaaaaaa..a", -"a...aaaaaaaa...a", -".bcb.......aaaaa", -".cbcbcbcbc.aaaaa", -".bcbcbcbcb.aaaaa", -".cbcb...........", -".bcb.#########.a", -".cb.#########.aa", -".b.#########.aaa", -"..#########.aaaa", -"...........aaaaa" -}; diff --git a/examples/activeqt/menus/filesave.xpm b/examples/activeqt/menus/filesave.xpm deleted file mode 100644 index bd6870f..0000000 --- a/examples/activeqt/menus/filesave.xpm +++ /dev/null @@ -1,22 +0,0 @@ -/* XPM */ -static const char *filesave[] = { -" 14 14 4 1", -". c #040404", -"# c #808304", -"a c #bfc2bf", -"b c None", -"..............", -".#.aaaaaaaa.a.", -".#.aaaaaaaa...", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".#.aaaaaaaa.#.", -".##........##.", -".############.", -".##.........#.", -".##......aa.#.", -".##......aa.#.", -".##......aa.#.", -"b............." -}; diff --git a/examples/activeqt/menus/main.cpp b/examples/activeqt/menus/main.cpp deleted file mode 100644 index 70e84eb..0000000 --- a/examples/activeqt/menus/main.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "menus.h" -#include <QApplication> -#include <QAxFactory> -#include <QScopedPointer> - -QAXFACTORY_BEGIN( - "{ce947ee3-0403-4fdc-895a-4fe779394b46}", // type library ID - "{8de435ce-8d2a-46ac-b3b3-cb800d0847c7}") // application ID - QAXCLASS(QMenus) -QAXFACTORY_END() - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - QScopedPointer<QWidget> window; - - if (!QAxFactory::isServer()) { - window.reset(new QMenus()); - window->show(); - } - - return a.exec(); -} diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp deleted file mode 100644 index 3093862..0000000 --- a/examples/activeqt/menus/menus.cpp +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "menus.h" -#include <QAction> -#include <QAxFactory> -#include <QMenuBar> -#include <QMessageBox> -#include <QTextEdit> -#include <QPixmap> - -#include "fileopen.xpm" -#include "filesave.xpm" - -QMenus::QMenus(QWidget *parent) - : QMainWindow(parent, {}) // QMainWindow's default flag is WType_TopLevel -{ - QAction *action; - - QMenu *file = new QMenu(this); - - action = new QAction(QPixmap((const char**)fileopen), tr("&Open"), this); - action->setShortcut(tr("CTRL+O")); - connect(action, &QAction::triggered, this, &QMenus::fileOpen); - file->addAction(action); - - action = new QAction(QPixmap((const char**)filesave), tr("&Save"), this); - action->setShortcut(tr("CTRL+S")); - connect(action, &QAction::triggered, this, &QMenus::fileSave); - file->addAction(action); - - QMenu *edit = new QMenu(this); - - action = new QAction(tr("&Normal"), this); - action->setShortcut(tr("CTRL+N")); - action->setToolTip(tr("Normal")); - action->setStatusTip(tr("Toggles Normal")); - action->setCheckable(true); - connect(action, &QAction::triggered, this, &QMenus::editNormal); - edit->addAction(action); - - action = new QAction(tr("&Bold"), this); - action->setShortcut(tr("CTRL+B")); - action->setCheckable(true); - connect(action, &QAction::triggered, this, &QMenus::editBold); - edit->addAction(action); - - action = new QAction(tr("&Underline"), this); - action->setShortcut(tr("CTRL+U")); - action->setCheckable(true); - connect(action, &QAction::triggered, this, &QMenus::editUnderline); - edit->addAction(action); - - QMenu *advanced = new QMenu(this); - action = new QAction(tr("&Font..."), this); - connect(action, &QAction::triggered, this, &QMenus::editAdvancedFont); - advanced->addAction(action); - - action = new QAction(tr("&Style..."), this); - connect(action, &QAction::triggered, this, &QMenus::editAdvancedStyle); - advanced->addAction(action); - - edit->addMenu(advanced)->setText(tr("&Advanced")); - - edit->addSeparator(); - - action = new QAction(tr("Una&vailable"), this); - action->setShortcut(tr("CTRL+V")); - action->setCheckable(true); - action->setEnabled(false); - connect(action, &QAction::triggered, this, &QMenus::editUnderline); - edit->addAction(action); - - QMenu *help = new QMenu(this); - - action = new QAction(tr("&About..."), this); - action->setShortcut(tr("F1")); - connect(action, &QAction::triggered, this, &QMenus::helpAbout); - help->addAction(action); - - action = new QAction(tr("&About Qt..."), this); - connect(action, &QAction::triggered, this, &QMenus::helpAboutQt); - help->addAction(action); - - if (!QAxFactory::isServer()) - menuBar()->addMenu(file)->setText(tr("&File")); - menuBar()->addMenu(edit)->setText(tr("&Edit")); - menuBar()->addMenu(help)->setText(tr("&Help")); - - m_editor = new QTextEdit(this); - setCentralWidget(m_editor); - - statusBar(); -} - -void QMenus::fileOpen() -{ - m_editor->append(tr("File Open selected.")); -} - -void QMenus::fileSave() -{ - m_editor->append(tr("File Save selected.")); -} - -void QMenus::editNormal() -{ - m_editor->append(tr("Edit Normal selected.")); -} - -void QMenus::editBold() -{ - m_editor->append(tr("Edit Bold selected.")); -} - -void QMenus::editUnderline() -{ - m_editor->append(tr("Edit Underline selected.")); -} - -void QMenus::editAdvancedFont() -{ - m_editor->append(tr("Edit Advanced Font selected.")); -} - -void QMenus::editAdvancedStyle() -{ - m_editor->append(tr("Edit Advanced Style selected.")); -} - -void QMenus::helpAbout() -{ - QMessageBox::about(this, tr("About QMenus"), - tr("This example implements an in-place ActiveX control with menus and status messages.")); -} - -void QMenus::helpAboutQt() -{ - QMessageBox::aboutQt(this); -} diff --git a/examples/activeqt/menus/menus.def b/examples/activeqt/menus/menus.def deleted file mode 100644 index bc82a03..0000000 --- a/examples/activeqt/menus/menus.def +++ /dev/null @@ -1,6 +0,0 @@ -EXPORTS - DllCanUnloadNow PRIVATE - DllGetClassObject PRIVATE - DllRegisterServer PRIVATE - DllUnregisterServer PRIVATE - DumpIDL PRIVATE diff --git a/examples/activeqt/menus/menus.h b/examples/activeqt/menus/menus.h deleted file mode 100644 index b21a9c3..0000000 --- a/examples/activeqt/menus/menus.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2015 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef MENUS_H -#define MENUS_H - -#include <QMainWindow> - -QT_BEGIN_NAMESPACE -class QTextEdit; -QT_END_NAMESPACE - -class QMenus : public QMainWindow -{ - Q_OBJECT - Q_CLASSINFO("ClassID", "{4dc3f340-a6f7-44e4-a79b-3e9217695fbd}") - Q_CLASSINFO("InterfaceID", "{9ee49617-7d5c-441a-b833-4b068d40d751}") - Q_CLASSINFO("EventsID", "{13eca64b-ee2a-4f3c-aa04-5d9d975979a7}") - -public: - explicit QMenus(QWidget *parent = nullptr); - -public slots: - void fileOpen(); - void fileSave(); - - void editNormal(); - void editBold(); - void editUnderline(); - - void editAdvancedFont(); - void editAdvancedStyle(); - - void helpAbout(); - void helpAboutQt(); - -private: - QTextEdit *m_editor; -}; - -#endif // MENUS_H diff --git a/examples/activeqt/menus/menus.ico b/examples/activeqt/menus/menus.ico Binary files differdeleted file mode 100644 index c80d36a..0000000 --- a/examples/activeqt/menus/menus.ico +++ /dev/null diff --git a/examples/activeqt/menus/menus.inf b/examples/activeqt/menus/menus.inf deleted file mode 100644 index f97efe8..0000000 --- a/examples/activeqt/menus/menus.inf +++ /dev/null @@ -1,9 +0,0 @@ -[version] - signature="$CHICAGO$" - AdvancedINF=2.0 - [Add.Code] - menusax.exe=menusax.exe - [menusax.exe] - file-win32-x86=thiscab - clsid={4dc3f340-a6f7-44e4-a79b-3e9217695fbd} - RegisterServer=yes diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro deleted file mode 100644 index f5a7890..0000000 --- a/examples/activeqt/menus/menus.pro +++ /dev/null @@ -1,16 +0,0 @@ -include(../shared.pri) - -TEMPLATE = app -TARGET = menusax - -CONFIG += warn_off -QT += widgets axserver - -SOURCES = main.cpp menus.cpp -HEADERS = menus.h -RC_FILE = menus.rc -DEF_FILE = menus.def - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/activeqt/menus -INSTALLS += target diff --git a/examples/activeqt/menus/menus.rc b/examples/activeqt/menus/menus.rc deleted file mode 100644 index d466b35..0000000 --- a/examples/activeqt/menus/menus.rc +++ /dev/null @@ -1,2 +0,0 @@ -1 TYPELIB "menus.rc" -1 ICON "menus.ico" |