Polish the examples/widgets/dockwidgets example.

- Introduce Qt 5 signals & slot syntax.
- Use QIcon::fromTheme() to obtain system icons and use
  resource icons as fallback.
- Fix minor issues in code, use multi-argument version
  of QString::arg(), QDir::toNativeSeparators() to
  present file paths to the user, static method
  invocations.
- Use QMimeDatabase for file dialog.

Change-Id: Ib7f947aaaa0c8034f0853b1c740ebf195821dae0
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

examples/widgets/mainwindows/dockwidgets/mainwindow.cpp

@@ -49,13 +49,11 @@
 
 //! [1]
 MainWindow::MainWindow()
+    : textEdit(new QTextEdit)
 {
-    textEdit = new QTextEdit;
     setCentralWidget(textEdit);
 
     createActions();
-    createMenus();
-    createToolBars();
     createStatusBar();
     createDockWindows();
 
@@ -135,17 +133,17 @@ void MainWindow::print()
 //! [4]
 void MainWindow::save()
 {
+    QMimeDatabase mimeDatabase;
     QString fileName = QFileDialog::getSaveFileName(this,
                         tr("Choose a file name"), ".",
-                        tr("HTML (*.html *.htm)"));
+                        mimeDatabase.mimeTypeForName("text/html").filterString());
     if (fileName.isEmpty())
         return;
     QFile file(fileName);
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
         QMessageBox::warning(this, tr("Dock Widgets"),
                              tr("Cannot write file %1:\n%2.")
-                             .arg(fileName)
+                             .arg(QDir::toNativeSeparators(fileName), file.errorString()));
-                             .arg(file.errorString()));
         return;
     }
 
@@ -222,71 +220,60 @@ void MainWindow::about()
 
 void MainWindow::createActions()
 {
-    newLetterAct = new QAction(QIcon(":/images/new.png"), tr("&New Letter"),
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
-                               this);
+    QToolBar *fileToolBar = addToolBar(tr("File"));
+
+    const QIcon newIcon = QIcon::fromTheme("document-new", QIcon(":/images/new.png"));
+    QAction *newLetterAct = new QAction(newIcon, tr("&New Letter"), this);
     newLetterAct->setShortcuts(QKeySequence::New);
     newLetterAct->setStatusTip(tr("Create a new form letter"));
-    connect(newLetterAct, SIGNAL(triggered()), this, SLOT(newLetter()));
+    connect(newLetterAct, &QAction::triggered, this, &MainWindow::newLetter);
+    fileMenu->addAction(newLetterAct);
+    fileToolBar->addAction(newLetterAct);
 
-    saveAct = new QAction(QIcon(":/images/save.png"), tr("&Save..."), this);
+    const QIcon saveIcon = QIcon::fromTheme("document-save", QIcon(":/images/save.png"));
+    QAction *saveAct = new QAction(saveIcon, tr("&Save..."), this);
     saveAct->setShortcuts(QKeySequence::Save);
     saveAct->setStatusTip(tr("Save the current form letter"));
-    connect(saveAct, SIGNAL(triggered()), this, SLOT(save()));
+    connect(saveAct, &QAction::triggered, this, &MainWindow::save);
+    fileMenu->addAction(saveAct);
+    fileToolBar->addAction(saveAct);
 
-    printAct = new QAction(QIcon(":/images/print.png"), tr("&Print..."), this);
+    const QIcon printIcon = QIcon::fromTheme("document-print", QIcon(":/images/print.png"));
+    QAction *printAct = new QAction(printIcon, tr("&Print..."), this);
     printAct->setShortcuts(QKeySequence::Print);
     printAct->setStatusTip(tr("Print the current form letter"));
-    connect(printAct, SIGNAL(triggered()), this, SLOT(print()));
+    connect(printAct, &QAction::triggered, this, &MainWindow::print);
+    fileMenu->addAction(printAct);
+    fileToolBar->addAction(printAct);
 
-    undoAct = new QAction(QIcon(":/images/undo.png"), tr("&Undo"), this);
+    fileMenu->addSeparator();
-    undoAct->setShortcuts(QKeySequence::Undo);
-    undoAct->setStatusTip(tr("Undo the last editing action"));
-    connect(undoAct, SIGNAL(triggered()), this, SLOT(undo()));
 
-    quitAct = new QAction(tr("&Quit"), this);
+    QAction *quitAct = fileMenu->addAction(tr("&Quit"), this, &QWidget::close);
     quitAct->setShortcuts(QKeySequence::Quit);
     quitAct->setStatusTip(tr("Quit the application"));
-    connect(quitAct, SIGNAL(triggered()), this, SLOT(close()));
 
-    aboutAct = new QAction(tr("&About"), this);
+    QMenu *editMenu = menuBar()->addMenu(tr("&Edit"));
-    aboutAct->setStatusTip(tr("Show the application's About box"));
+    QToolBar *editToolBar = addToolBar(tr("Edit"));
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+    const QIcon undoIcon = QIcon::fromTheme("edit-undo", QIcon(":/images/undo.png"));
-
+    QAction *undoAct = new QAction(undoIcon, tr("&Undo"), this);
-    aboutQtAct = new QAction(tr("About &Qt"), this);
+    undoAct->setShortcuts(QKeySequence::Undo);
-    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
+    undoAct->setStatusTip(tr("Undo the last editing action"));
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+    connect(undoAct, &QAction::triggered, this, &MainWindow::undo);
-}
-
-void MainWindow::createMenus()
-{
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(newLetterAct);
-    fileMenu->addAction(saveAct);
-    fileMenu->addAction(printAct);
-    fileMenu->addSeparator();
-    fileMenu->addAction(quitAct);
-
-    editMenu = menuBar()->addMenu(tr("&Edit"));
     editMenu->addAction(undoAct);
+    editToolBar->addAction(undoAct);
 
     viewMenu = menuBar()->addMenu(tr("&View"));
 
     menuBar()->addSeparator();
 
-    helpMenu = menuBar()->addMenu(tr("&Help"));
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
-}
 
-void MainWindow::createToolBars()
+    QAction *aboutAct = helpMenu->addAction(tr("&About"), this, &MainWindow::about);
-{
+    aboutAct->setStatusTip(tr("Show the application's About box"));
-    fileToolBar = addToolBar(tr("File"));
-    fileToolBar->addAction(newLetterAct);
-    fileToolBar->addAction(saveAct);
-    fileToolBar->addAction(printAct);
 
-    editToolBar = addToolBar(tr("Edit"));
+    QAction *aboutQtAct = helpMenu->addAction(tr("About &Qt"), qApp, &QApplication::aboutQt);
-    editToolBar->addAction(undoAct);
+    aboutQtAct->setStatusTip(tr("Show the Qt library's About box"));
 }
 
 //! [8]
@@ -337,9 +324,9 @@ void MainWindow::createDockWindows()
     addDockWidget(Qt::RightDockWidgetArea, dock);
     viewMenu->addAction(dock->toggleViewAction());
 
-    connect(customerList, SIGNAL(currentTextChanged(QString)),
+    connect(customerList, &QListWidget::currentTextChanged,
-            this, SLOT(insertCustomer(QString)));
+            this, &MainWindow::insertCustomer);
-    connect(paragraphsList, SIGNAL(currentTextChanged(QString)),
+    connect(paragraphsList, &QListWidget::currentTextChanged,
-            this, SLOT(addParagraph(QString)));
+            this, &MainWindow::addParagraph);
 }
 //! [9]

examples/widgets/mainwindows/dockwidgets/mainwindow.h

@@ -69,8 +69,6 @@ private slots:
 
 private:
     void createActions();
-    void createMenus();
-    void createToolBars();
     void createStatusBar();
     void createDockWindows();
 
@@ -78,19 +76,7 @@ private:
     QListWidget *customerList;
     QListWidget *paragraphsList;
 
-    QMenu *fileMenu;
-    QMenu *editMenu;
     QMenu *viewMenu;
-    QMenu *helpMenu;
-    QToolBar *fileToolBar;
-    QToolBar *editToolBar;
-    QAction *newLetterAct;
-    QAction *saveAct;
-    QAction *printAct;
-    QAction *undoAct;
-    QAction *aboutAct;
-    QAction *aboutQtAct;
-    QAction *quitAct;
 };
 //! [0]