From 8d71fae08078afbf4aa2de7429302f46d46fb43f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 31 Oct 2016 11:09:00 +0100
Subject: Polish the XML bookmarks examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use Qt 5 connect syntax.
- Streamline code, remove unused members.
- Add a context menu for copying and opening the URLs.
- Add const to XML code.
- In the XML code, show the use of QStringLiteral in static inline
  functions to create strings versus QLatin1String in comparison
  overloads to avoid allocating strings from const char * literals.

Change-Id: Ib5e62ca188e271ffe01996dff3c9ea8e0b60739a
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 examples/xml/streambookmarks/mainwindow.cpp | 75 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 35 deletions(-)

(limited to 'examples/xml/streambookmarks/mainwindow.cpp')

diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp
index 7c0fd8720d..c9a18fa3c4 100644
--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@@ -63,18 +63,41 @@ MainWindow::MainWindow()
     treeWidget = new QTreeWidget;
     treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
     treeWidget->setHeaderLabels(labels);
+#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
+    treeWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(treeWidget, &QWidget::customContextMenuRequested,
+            this, &MainWindow::onCustomContextMenuRequested);
+#endif
     setCentralWidget(treeWidget);
 
-    createActions();
     createMenus();
 
     statusBar()->showMessage(tr("Ready"));
 
     setWindowTitle(tr("QXmlStream Bookmarks"));
-    resize(480, 320);
+    const QSize availableSize = QApplication::desktop()->availableGeometry(this).size();
+    resize(availableSize.width() / 2, availableSize.height() / 3);
 }
 //! [0]
 
+#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
+void MainWindow::onCustomContextMenuRequested(const QPoint &pos)
+{
+    const QTreeWidgetItem *item = treeWidget->itemAt(pos);
+    if (!item)
+        return;
+    const QString url = item->text(1);
+    QMenu contextMenu;
+    QAction *copyAction = contextMenu.addAction(tr("Copy Link to Clipboard"));
+    QAction *openAction = contextMenu.addAction(tr("Open"));
+    QAction *action = contextMenu.exec(treeWidget->viewport()->mapToGlobal(pos));
+    if (action == copyAction)
+        QGuiApplication::clipboard()->setText(url);
+    else if (action == openAction)
+        QDesktopServices::openUrl(QUrl(url));
+}
+#endif // !QT_NO_CONTEXTMENU && !QT_NO_CLIPBOARD
+
 //! [1]
 void MainWindow::open()
 {
@@ -92,8 +115,8 @@ void MainWindow::open()
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
                              tr("Cannot read file %1:\n%2.")
-                             .arg(fileName)
-                             .arg(file.errorString()));
+                             .arg(QDir::toNativeSeparators(fileName),
+                                  file.errorString()));
         return;
     }
 
@@ -101,8 +124,8 @@ void MainWindow::open()
     if (!reader.read(&file)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
                              tr("Parse error in file %1:\n\n%2")
-                             .arg(fileName)
-                             .arg(reader.errorString()));
+                             .arg(QDir::toNativeSeparators(fileName),
+                                  reader.errorString()));
     } else {
         statusBar()->showMessage(tr("File loaded"), 2000);
     }
@@ -124,8 +147,8 @@ void MainWindow::saveAs()
     if (!file.open(QFile::WriteOnly | QFile::Text)) {
         QMessageBox::warning(this, tr("QXmlStream Bookmarks"),
                              tr("Cannot write file %1:\n%2.")
-                             .arg(fileName)
-                             .arg(file.errorString()));
+                             .arg(QDir::toNativeSeparators(fileName),
+                                  file.errorString()));
         return;
     }
 
@@ -144,41 +167,23 @@ void MainWindow::about()
 }
 //! [3]
 
-//! [4]
-void MainWindow::createActions()
+//! [5]
+void MainWindow::createMenus()
 {
-    openAct = new QAction(tr("&Open..."), this);
+    QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
+    QAction *openAct = fileMenu->addAction(tr("&Open..."), this, &MainWindow::open);
     openAct->setShortcuts(QKeySequence::Open);
-    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
 
-    saveAsAct = new QAction(tr("&Save As..."), this);
+    QAction *saveAsAct = fileMenu->addAction(tr("&Save As..."), this, &MainWindow::saveAs);
     saveAsAct->setShortcuts(QKeySequence::SaveAs);
-    connect(saveAsAct, SIGNAL(triggered()), this, SLOT(saveAs()));
 
-    exitAct = new QAction(tr("E&xit"), this);
+    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
     exitAct->setShortcuts(QKeySequence::Quit);
-    connect(exitAct, SIGNAL(triggered()), this, SLOT(close()));
-
-    aboutAct = new QAction(tr("&About"), this);
-    connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
-
-    aboutQtAct = new QAction(tr("About &Qt"), this);
-    connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
-}
-//! [4]
-
-//! [5]
-void MainWindow::createMenus()
-{
-    fileMenu = menuBar()->addMenu(tr("&File"));
-    fileMenu->addAction(openAct);
-    fileMenu->addAction(saveAsAct);
-    fileMenu->addAction(exitAct);
 
     menuBar()->addSeparator();
 
-    helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(aboutAct);
-    helpMenu->addAction(aboutQtAct);
+    QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
+    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
+    helpMenu->addAction(tr("About &Qt"), qApp, &QCoreApplication::quit);
 }
 //! [5]
-- 
cgit v1.2.3