From 0f61cde4d98db227167d351402f2d05a4972c508 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Wed, 10 Aug 2016 17:24:04 -0700 Subject: Cocoa Menus: Introducing Menurama manual test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This manual test pretends to be a modest safeguard against QMenu related regressions on macOS. It takes a slightly different approach than the existing menus manual test, tracking observed regressions instead of providing extensive coverage (though this may change in the future). These regressions are listed as task numbers below, most of them arising from the now infamous change, 09acf326dbc6b7b6 QCocoaMenu: Decouple NSMenuItem from NSMenu So, from now on, please run this and the menus manual tests and look for regressions every time you make a change regarding QCocoaMenu and related. And, if you're fixing a regression, add the regression example to the Menurama manual test. Task-number: QTBUG-52931 Task-number: QTBUG-53085 Task-number: QTBUG-53251 Task-number: QTBUG-54633 Task-number: QTBUG-54637 Task-number: QTBUG-54698 Task-number: QTBUG-55121 Change-Id: I276e916dcdf00f1a44faf64d87050bc3a037a3b5 Reviewed-by: Morten Johan Sørvig --- tests/manual/cocoa/menurama/main.cpp | 51 ++++ tests/manual/cocoa/menurama/mainwindow.cpp | 86 ++++++ tests/manual/cocoa/menurama/mainwindow.h | 71 +++++ tests/manual/cocoa/menurama/mainwindow.ui | 289 +++++++++++++++++++++ tests/manual/cocoa/menurama/menurama.pro | 22 ++ .../manual/cocoa/menurama/menuramaapplication.cpp | 81 ++++++ tests/manual/cocoa/menurama/menuramaapplication.h | 58 +++++ 7 files changed, 658 insertions(+) create mode 100644 tests/manual/cocoa/menurama/main.cpp create mode 100644 tests/manual/cocoa/menurama/mainwindow.cpp create mode 100644 tests/manual/cocoa/menurama/mainwindow.h create mode 100644 tests/manual/cocoa/menurama/mainwindow.ui create mode 100644 tests/manual/cocoa/menurama/menurama.pro create mode 100644 tests/manual/cocoa/menurama/menuramaapplication.cpp create mode 100644 tests/manual/cocoa/menurama/menuramaapplication.h diff --git a/tests/manual/cocoa/menurama/main.cpp b/tests/manual/cocoa/menurama/main.cpp new file mode 100644 index 0000000000..98d96b1491 --- /dev/null +++ b/tests/manual/cocoa/menurama/main.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qtbase module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainwindow.h" +#include "menuramaapplication.h" + +int main(int argc, char *argv[]) +{ + MenuramaApplication a(argc, argv); + MainWindow w; + w.show(); + + return a.exec(); +} diff --git a/tests/manual/cocoa/menurama/mainwindow.cpp b/tests/manual/cocoa/menurama/mainwindow.cpp new file mode 100644 index 0000000000..db8fdafc21 --- /dev/null +++ b/tests/manual/cocoa/menurama/mainwindow.cpp @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qtbase module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainwindow.h" +#include "ui_mainwindow.h" +#include "menuramaapplication.h" +#include + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); + + startTimer(1000); + + connect(ui->menuAfter_aboutToShow, &QMenu::aboutToShow, [=] { + menuApp->populateMenu(ui->menuAfter_aboutToShow, true /*clear*/); + }); + + connect(ui->menuDynamic_Stuff, &QMenu::aboutToShow, [=] { + menuApp->addDynMenu(QLatin1String("Added After aboutToShow()"), ui->menuDynamic_Stuff); + }); + + connect(ui->pushButton, &QPushButton::clicked, [=] { + menuApp->populateMenu(ui->menuOn_Click, true /*clear*/); + }); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + +void MainWindow::timerEvent(QTimerEvent *) +{ + menuApp->populateMenu(ui->menuPopulated_by_Timer, true /*clear*/); + menuApp->addDynMenu(QLatin1String("Added by Timer"), ui->menuDynamic_Stuff); +} + +void MainWindow::enableStuffMenu(bool enable) +{ + ui->menuStuff->setEnabled(enable); +} + +void MainWindow::on_actionQuit_triggered() +{ + menuApp->exit(); +} diff --git a/tests/manual/cocoa/menurama/mainwindow.h b/tests/manual/cocoa/menurama/mainwindow.h new file mode 100644 index 0000000000..b9cb52d908 --- /dev/null +++ b/tests/manual/cocoa/menurama/mainwindow.h @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qtbase module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +namespace Ui { +class MainWindow; +} + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); + +protected: + void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + +public slots: + void enableStuffMenu(bool enable); + +private slots: + void on_actionQuit_triggered(); + +private: + Ui::MainWindow *ui; +}; + +#endif // MAINWINDOW_H diff --git a/tests/manual/cocoa/menurama/mainwindow.ui b/tests/manual/cocoa/menurama/mainwindow.ui new file mode 100644 index 0000000000..f73b41b861 --- /dev/null +++ b/tests/manual/cocoa/menurama/mainwindow.ui @@ -0,0 +1,289 @@ + + + MainWindow + + + + 0 + 0 + 566 + 300 + + + + MainWindow + + + + + + 10 + 40 + 151 + 20 + + + + Enable "Stuff" Menu + + + true + + + + + + 10 + 10 + 321 + 16 + + + + The "Help" menu should NOT be visible. + + + + + + 10 + 80 + 211 + 32 + + + + Populate Dynamic Submenu + + + + + + + 0 + 0 + 566 + 22 + + + + + Stuff + + + + Submenu + + + + More Submenu + + + + + + + + + false + + + Disabled Submenu + + + + More Submenu + + + + + + + + + + + + + + false + + + Disabled Stuff + + + + Disabled Submenu + + + + Disabled Subsubmenu + + + + + + + + + + + + Should NOT Be Visible + + + + + + Help + + + + + + Dynamic Stuff + + + + Populated After aboutToShow() + + + + + Click Button to Populate + + + + + Populated by Timer + + + + + + + + + File + + + + + + + + + + + + + + + TopToolBarArea + + + false + + + + + + With More Stuff + + + + + false + + + Disabled Item + + + + + Item + + + + + Should be Disabled + + + + + Should be Disabled Too + + + + + MOAR!! + + + + + true + + + Disabled Item + + + + + More Disabled Stuff + + + + + With its own Disabled Stuff + + + + + About + + + + + About Qt + + + + + Exit + + + + + New... + + + + + No Empty Spaces Below + + + + + + + + checkBox + toggled(bool) + MainWindow + enableStuffMenu(bool) + + + 62 + 94 + + + 72 + 73 + + + + + + enableStuffMenu(bool) + + diff --git a/tests/manual/cocoa/menurama/menurama.pro b/tests/manual/cocoa/menurama/menurama.pro new file mode 100644 index 0000000000..da6f224e0d --- /dev/null +++ b/tests/manual/cocoa/menurama/menurama.pro @@ -0,0 +1,22 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2016-08-10T14:21:46 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = Menurama +TEMPLATE = app + + +SOURCES += main.cpp\ + mainwindow.cpp \ + menuramaapplication.cpp + +HEADERS += mainwindow.h \ + menuramaapplication.h + +FORMS += mainwindow.ui diff --git a/tests/manual/cocoa/menurama/menuramaapplication.cpp b/tests/manual/cocoa/menurama/menuramaapplication.cpp new file mode 100644 index 0000000000..534d5fa371 --- /dev/null +++ b/tests/manual/cocoa/menurama/menuramaapplication.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qtbase module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "menuramaapplication.h" + +MenuramaApplication::MenuramaApplication(int argc, char **argv) + : QApplication (argc, argv) +{ +#if 0 + QMenuBar *mb = new QMenuBar(); + QMenu *menu = mb->addMenu("App Dynamic"); + QMenu *dynMenu = menu->addMenu("After aboutToShow()"); + connect(dynMenu, &QMenu::aboutToShow, [=] { + qDebug() << "aboutToShow(), populating" << dynMenu; + menuApp->populateMenu(dynMenu, true /*clear*/); + }); +#endif +} + +void MenuramaApplication::populateMenu(QMenu *menu, bool clear) +{ + if (clear) + menu->clear(); + + static const char *sym[] = { "Foo", "Bar", "Baz", "Huux" }; + static int id = 0; + for (unsigned i = 0; i < sizeof(sym) / sizeof(sym[0]); i++) + menu->addAction(QStringLiteral("%1 — %2 %3 ") + .arg(menu->title()).arg(sym[i]).arg(id)); + ++id; +} + +void MenuramaApplication::addDynMenu(QLatin1String title, QMenu *parentMenu) +{ + foreach (QAction *a, parentMenu->actions()) + if (a->text() == title) { + parentMenu->removeAction(a); + break; + } + + QMenu *subMenu = new QMenu(title, parentMenu); + populateMenu(subMenu, false /*clear*/); + parentMenu->addMenu(subMenu); +} diff --git a/tests/manual/cocoa/menurama/menuramaapplication.h b/tests/manual/cocoa/menurama/menuramaapplication.h new file mode 100644 index 0000000000..07c8da27a1 --- /dev/null +++ b/tests/manual/cocoa/menurama/menuramaapplication.h @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qtbase module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MENURAMAAPPLICATION_H +#define MENURAMAAPPLICATION_H + +#include + +#define menuApp (static_cast(QCoreApplication::instance())) + +class MenuramaApplication : public QApplication +{ +public: + MenuramaApplication(int argc, char **argv); + void addDynMenu(QLatin1String title, QMenu *parentMenu); + +public slots: + void populateMenu(QMenu *menu, bool clear); +}; + +#endif // MENURAMAAPPLICATION_H -- cgit v1.2.3