diff options
Diffstat (limited to 'examples/widgets')
-rw-r--r-- | examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 13 | ||||
-rw-r--r-- | examples/widgets/richtext/textedit/textedit.cpp | 4 | ||||
-rw-r--r-- | examples/widgets/widgets/wiggly/dialog.cpp | 22 | ||||
-rw-r--r-- | examples/widgets/widgets/wiggly/dialog.h | 4 | ||||
-rw-r--r-- | examples/widgets/widgets/wiggly/main.cpp | 11 |
5 files changed, 30 insertions, 24 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp index fe54f4569a..0a29edee74 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp @@ -109,6 +109,10 @@ void MainWindow::actionTriggered(QAction *action) void MainWindow::setupToolBar() { +#ifdef Q_OS_OSX + setUnifiedTitleAndToolBarOnMac(true); +#endif + for (int i = 0; i < 3; ++i) { ToolBar *tb = new ToolBar(QString::fromLatin1("Tool Bar %1").arg(i + 1), this); toolBars.append(tb); @@ -164,6 +168,15 @@ void MainWindow::setupMenuBar() for (int i = 0; i < toolBars.count(); ++i) toolBarMenu->addMenu(toolBars.at(i)->menu); +#ifdef Q_OS_OSX + toolBarMenu->addSeparator(); + + action = toolBarMenu->addAction(tr("Unified")); + action->setCheckable(true); + action->setChecked(unifiedTitleAndToolBarOnMac()); + connect(action, SIGNAL(toggled(bool)), this, SLOT(setUnifiedTitleAndToolBarOnMac(bool))); +#endif + dockWidgetMenu = menuBar()->addMenu(tr("&Dock Widgets")); } diff --git a/examples/widgets/richtext/textedit/textedit.cpp b/examples/widgets/richtext/textedit/textedit.cpp index 128924ef4e..2ff7a09969 100644 --- a/examples/widgets/richtext/textedit/textedit.cpp +++ b/examples/widgets/richtext/textedit/textedit.cpp @@ -78,6 +78,10 @@ const QString rsrcPath = ":/images/win"; TextEdit::TextEdit(QWidget *parent) : QMainWindow(parent) { +#ifdef Q_OS_OSX + setUnifiedTitleAndToolBarOnMac(true); +#endif + setToolButtonStyle(Qt::ToolButtonFollowStyle); setupFileActions(); setupEditActions(); diff --git a/examples/widgets/widgets/wiggly/dialog.cpp b/examples/widgets/widgets/wiggly/dialog.cpp index 1279d9d05b..3bb4f60d76 100644 --- a/examples/widgets/widgets/wiggly/dialog.cpp +++ b/examples/widgets/widgets/wiggly/dialog.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -38,32 +38,26 @@ ** ****************************************************************************/ -#include <QtWidgets> -#include <QtWidgets> +#include <QLineEdit> +#include <QVBoxLayout> #include "dialog.h" #include "wigglywidget.h" //! [0] -Dialog::Dialog(QWidget *parent, bool smallScreen) +Dialog::Dialog(QWidget *parent) : QDialog(parent) { WigglyWidget *wigglyWidget = new WigglyWidget; QLineEdit *lineEdit = new QLineEdit; - QVBoxLayout *layout = new QVBoxLayout; + QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(wigglyWidget); layout->addWidget(lineEdit); - setLayout(layout); - connect(lineEdit, SIGNAL(textChanged(QString)), - wigglyWidget, SLOT(setText(QString))); - if (!smallScreen){ - lineEdit->setText(tr("Hello world!")); - } - else{ - lineEdit->setText(tr("Hello!")); - } + connect(lineEdit, &QLineEdit::textChanged, wigglyWidget, &WigglyWidget::setText); + lineEdit->setText(tr("Hello world!")); + setWindowTitle(tr("Wiggly")); resize(360, 145); } diff --git a/examples/widgets/widgets/wiggly/dialog.h b/examples/widgets/widgets/wiggly/dialog.h index 7355a56887..885671c69e 100644 --- a/examples/widgets/widgets/wiggly/dialog.h +++ b/examples/widgets/widgets/wiggly/dialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -49,7 +49,7 @@ class Dialog : public QDialog Q_OBJECT public: - explicit Dialog(QWidget *parent = 0, bool smallScreen = false); + explicit Dialog(QWidget *parent = 0); }; //! [0] diff --git a/examples/widgets/widgets/wiggly/main.cpp b/examples/widgets/widgets/wiggly/main.cpp index df5d5487bc..caf00eb748 100644 --- a/examples/widgets/widgets/wiggly/main.cpp +++ b/examples/widgets/widgets/wiggly/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 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. @@ -45,14 +45,9 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - bool smallScreen = QApplication::arguments().contains("-small-screen"); + Dialog dialog; + dialog.show(); - Dialog dialog(0, smallScreen); - - if (!smallScreen) - dialog.show(); - else - dialog.showFullScreen(); return app.exec(); } |