From c360fbcd6c9276b8a3fa8a200fa489b7b69e3aaa Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Mon, 22 Oct 2012 13:48:59 +0200 Subject: Do the actual removal of the Soft Keys API and related code In addition to the actual removal of the softkeys API in QAction, this commit removes some enums related to the softkeys feature: Qt::WA_MergeSoftkeys Qt::WA_MergeSoftkeysRecursively It also removes some "zombie" enums: Qt::WindowSoftkeysVisibleHint = 0x40000000, Qt::WindowSoftkeysRespondHint = 0x80000000, (The only implementation that used these were removed when qapplication_s60.cpp and qwidget_s60.cpp were removed.) Change-Id: Ib6fc6d543def4757383d5f19256199d9d190c614 Reviewed-by: Lars Knoll Reviewed-by: Janne Anttila Reviewed-by: J-P Nurmi --- examples/widgets/widgets/softkeys/main.cpp | 50 ------ examples/widgets/widgets/softkeys/softkeys.cpp | 188 --------------------- examples/widgets/widgets/softkeys/softkeys.desktop | 11 -- examples/widgets/widgets/softkeys/softkeys.h | 88 ---------- examples/widgets/widgets/softkeys/softkeys.pro | 13 -- examples/widgets/widgets/wiggly/dialog.cpp | 11 -- 6 files changed, 361 deletions(-) delete mode 100644 examples/widgets/widgets/softkeys/main.cpp delete mode 100644 examples/widgets/widgets/softkeys/softkeys.cpp delete mode 100644 examples/widgets/widgets/softkeys/softkeys.desktop delete mode 100644 examples/widgets/widgets/softkeys/softkeys.h delete mode 100644 examples/widgets/widgets/softkeys/softkeys.pro (limited to 'examples/widgets') diff --git a/examples/widgets/widgets/softkeys/main.cpp b/examples/widgets/widgets/softkeys/main.cpp deleted file mode 100644 index 566a70ae6f..0000000000 --- a/examples/widgets/widgets/softkeys/main.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples 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 Digia Plc and its Subsidiary(-ies) 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 -#include "softkeys.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - MainWindow mw; - mw.showMaximized(); - return app.exec(); -} diff --git a/examples/widgets/widgets/softkeys/softkeys.cpp b/examples/widgets/widgets/softkeys/softkeys.cpp deleted file mode 100644 index d75fd232b4..0000000000 --- a/examples/widgets/widgets/softkeys/softkeys.cpp +++ /dev/null @@ -1,188 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples 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 Digia Plc and its Subsidiary(-ies) 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 "softkeys.h" - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) -{ - central = new QWidget(this); - central->setContextMenuPolicy(Qt::NoContextMenu); // explicitly forbid usage of context menu so actions item is not shown menu - setCentralWidget(central); - - // Create text editor and set softkeys to it - textEditor= new QTextEdit(tr("Navigate in UI to see context sensitive softkeys in action"), this); - QAction* clear = new QAction(tr("Clear"), this); - clear->setSoftKeyRole(QAction::NegativeSoftKey); - - textEditor->addAction(clear); - - ok = new QAction(tr("Ok"), this); - ok->setSoftKeyRole(QAction::PositiveSoftKey); - connect(ok, SIGNAL(triggered()), this, SLOT(okPressed())); - - cancel = new QAction(tr("Cancel"), this); - cancel->setSoftKeyRole(QAction::NegativeSoftKey); - connect(cancel, SIGNAL(triggered()), this, SLOT(cancelPressed())); - - infoLabel = new QLabel(tr(""), this); - infoLabel->setContextMenuPolicy(Qt::NoContextMenu); - - toggleButton = new QPushButton(tr("Custom"), this); - toggleButton->setContextMenuPolicy(Qt::NoContextMenu); - toggleButton->setCheckable(true); - - modeButton = new QPushButton(tr("Loop SK window type"), this); - modeButton->setContextMenuPolicy(Qt::NoContextMenu); - - modeLabel = new QLabel(tr("Normal maximized"), this); - modeLabel->setContextMenuPolicy(Qt::NoContextMenu); - - pushButton = new QPushButton(tr("File Dialog"), this); - pushButton->setContextMenuPolicy(Qt::NoContextMenu); - - QComboBox* comboBox = new QComboBox(this); - comboBox->setContextMenuPolicy(Qt::NoContextMenu); - comboBox->insertItems(0, QStringList() - << QApplication::translate("MainWindow", "Selection1", 0, QApplication::UnicodeUTF8) - << QApplication::translate("MainWindow", "Selection2", 0, QApplication::UnicodeUTF8) - << QApplication::translate("MainWindow", "Selection3", 0, QApplication::UnicodeUTF8) - ); - - layout = new QGridLayout; - layout->addWidget(textEditor, 0, 0, 1, 2); - layout->addWidget(infoLabel, 1, 0, 1, 2); - layout->addWidget(toggleButton, 2, 0); - layout->addWidget(pushButton, 2, 1); - layout->addWidget(comboBox, 3, 0, 1, 2); - layout->addWidget(modeButton, 4, 0, 1, 2); - layout->addWidget(modeLabel, 5, 0, 1, 2); - central->setLayout(layout); - - fileMenu = menuBar()->addMenu(tr("&File")); - exit = new QAction(tr("&Exit"), this); - fileMenu->addAction(exit); - - connect(clear, SIGNAL(triggered()), this, SLOT(clearTextEditor())); - connect(pushButton, SIGNAL(clicked()), this, SLOT(openDialog())); - connect(exit, SIGNAL(triggered()), this, SLOT(exitApplication())); - connect(toggleButton, SIGNAL(clicked()), this, SLOT(setCustomSoftKeys())); - connect(modeButton, SIGNAL(clicked()), this, SLOT(setMode())); - pushButton->setFocus(); -} - -MainWindow::~MainWindow() -{ -} - -void MainWindow::clearTextEditor() -{ - textEditor->setText(tr("")); -} - -void MainWindow::openDialog() -{ - QFileDialog::getOpenFileName(this); -} - -void MainWindow::addSoftKeys() -{ - addAction(ok); - addAction(cancel); -} - -void MainWindow::setCustomSoftKeys() -{ - if (toggleButton->isChecked()) { - infoLabel->setText(tr("Custom softkeys set")); - addSoftKeys(); - } - else { - infoLabel->setText(tr("Custom softkeys removed")); - removeAction(ok); - removeAction(cancel); - } -} - -void MainWindow::setMode() -{ - if(isMaximized()) { - showFullScreen(); - modeLabel->setText(tr("Normal Fullscreen")); - } else { - Qt::WindowFlags flags = windowFlags(); - if(flags & Qt::WindowSoftkeysRespondHint) { - flags |= Qt::WindowSoftkeysVisibleHint; - flags &= ~Qt::WindowSoftkeysRespondHint; - setWindowFlags(flags); // Hides visible window - showFullScreen(); - modeLabel->setText(tr("Fullscreen with softkeys")); - } else if(flags & Qt::WindowSoftkeysVisibleHint) { - flags &= ~Qt::WindowSoftkeysVisibleHint; - flags &= ~Qt::WindowSoftkeysRespondHint; - setWindowFlags(flags); // Hides visible window - showMaximized(); - modeLabel->setText(tr("Normal Maximized")); - } else { - flags &= ~Qt::WindowSoftkeysVisibleHint; - flags |= Qt::WindowSoftkeysRespondHint; - setWindowFlags(flags); // Hides visible window - showFullScreen(); - modeLabel->setText(tr("Fullscreen with SK respond")); - } - } -} - -void MainWindow::exitApplication() -{ - qApp->exit(); -} - -void MainWindow::okPressed() -{ - infoLabel->setText(tr("OK pressed")); -} - -void MainWindow::cancelPressed() -{ - infoLabel->setText(tr("Cancel pressed")); -} - - diff --git a/examples/widgets/widgets/softkeys/softkeys.desktop b/examples/widgets/widgets/softkeys/softkeys.desktop deleted file mode 100644 index 7f4993a588..0000000000 --- a/examples/widgets/widgets/softkeys/softkeys.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Soft Keys -Exec=/opt/usr/bin/softkeys -Icon=softkeys -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/widgets/widgets/softkeys/softkeys.h b/examples/widgets/widgets/softkeys/softkeys.h deleted file mode 100644 index 35440b9719..0000000000 --- a/examples/widgets/widgets/softkeys/softkeys.h +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples 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 Digia Plc and its Subsidiary(-ies) 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 SOFTKEYS_H -#define SOFTKEYS_H - -#include - -class MainWindow : public QMainWindow -{ - Q_OBJECT -public: - -private slots: - void clearTextEditor(); - void openDialog(); - void addSoftKeys(); - void exitApplication(); - void okPressed(); - void cancelPressed(); - void setCustomSoftKeys(); - void setMode(); -public: - MainWindow(QWidget *parent = 0); - ~MainWindow(); -private: - QGridLayout *layout; - QWidget *central; - QTextEdit *textEditor; - QLabel *infoLabel; - QPushButton *toggleButton; - QPushButton *pushButton; - QPushButton *modeButton; - QLabel *modeLabel; - QMenu *fileMenu; - QAction *addSoftKeysAct; - QAction *exit; - QAction *ok; - QAction *cancel; -}; - -//! [0] -class SoftKey : public QWidget -{ - Q_OBJECT -public: - SoftKey(QWidget *parent = 0); -}; -//! [0] - -#endif diff --git a/examples/widgets/widgets/softkeys/softkeys.pro b/examples/widgets/widgets/softkeys/softkeys.pro deleted file mode 100644 index 5473069bb1..0000000000 --- a/examples/widgets/widgets/softkeys/softkeys.pro +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS = softkeys.h -SOURCES += \ - main.cpp \ - softkeys.cpp - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/softkeys -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS softkeys.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/softkeys -INSTALLS += target sources - -QT += widgets - diff --git a/examples/widgets/widgets/wiggly/dialog.cpp b/examples/widgets/widgets/wiggly/dialog.cpp index fb18997a9a..4389159d1f 100644 --- a/examples/widgets/widgets/wiggly/dialog.cpp +++ b/examples/widgets/widgets/wiggly/dialog.cpp @@ -56,17 +56,6 @@ Dialog::Dialog(QWidget *parent, bool smallScreen) layout->addWidget(lineEdit); setLayout(layout); -#ifdef QT_SOFTKEYS_ENABLED - QAction *exitAction = new QAction(tr("Exit"), this); - exitAction->setSoftKeyRole(QAction::NegativeSoftKey); - connect (exitAction, SIGNAL(triggered()),this, SLOT(close())); - addAction (exitAction); - - Qt::WindowFlags flags = windowFlags(); - flags |= Qt::WindowSoftkeysVisibleHint; - setWindowFlags(flags); -#endif - connect(lineEdit, SIGNAL(textChanged(QString)), wigglyWidget, SLOT(setText(QString))); if (!smallScreen){ -- cgit v1.2.3