1 files changed, 29 insertions, 70 deletions

diff --git a/examples/widgets/itemviews/fetchmore/window.cpp b/examples/widgets/itemviews/fetchmore/window.cpp
index fa23bddc73..ffb89ce7df 100644
--- a/examples/widgets/itemviews/fetchmore/window.cpp
+++ b/examples/widgets/itemviews/fetchmore/window.cpp
@@ -1,52 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "window.h"
 #include "filelistmodel.h"
@@ -56,37 +9,43 @@
 Window::Window(QWidget *parent)
     : QWidget(parent)
 {
-    FileListModel *model = new FileListModel(this);
-    model->setDirPath(QLibraryInfo::path(QLibraryInfo::PrefixPath));
+    model = new FileListModel(this);
+    model->setDirPath(QDir::rootPath());
 
-    QLabel *label = new QLabel(tr("&Directory:"));
-    QLineEdit *lineEdit = new QLineEdit;
-    label->setBuddy(lineEdit);
-
-    QListView *view = new QListView;
+    view = new QListView;
     view->setModel(model);
 
-    logViewer = new QTextBrowser(this);
-    logViewer->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
+    logViewer = new QPlainTextEdit(this);
+    logViewer->setReadOnly(true);
+    logViewer->setSizePolicy(QSizePolicy(QSizePolicy::Preferred,
+                                         QSizePolicy::Preferred));
 
-    connect(lineEdit, &QLineEdit::textChanged,
-            model, &FileListModel::setDirPath);
-    connect(lineEdit, &QLineEdit::textChanged,
-            logViewer, &QTextEdit::clear);
     connect(model, &FileListModel::numberPopulated,
             this, &Window::updateLog);
+    connect(view, &QAbstractItemView::activated,
+            this, &Window::activated);
 
-    QGridLayout *layout = new QGridLayout;
-    layout->addWidget(label, 0, 0);
-    layout->addWidget(lineEdit, 0, 1);
-    layout->addWidget(view, 1, 0, 1, 2);
-    layout->addWidget(logViewer, 2, 0, 1, 2);
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(view);
+    layout->addWidget(logViewer);
 
-    setLayout(layout);
     setWindowTitle(tr("Fetch More Example"));
 }
 
-void Window::updateLog(int number)
+void Window::updateLog(const QString &path, int start, int number, int total)
+{
+    const int last = start + number - 1;
+    const QString nativePath = QDir::toNativeSeparators(path);
+    const QString message = tr("%1..%2/%3 items from \"%4\" added.")
+                            .arg(start).arg(last).arg(total).arg(nativePath);
+    logViewer->appendPlainText(message);
+}
+
+void Window::activated(const QModelIndex &index)
 {
-    logViewer->append(tr("%1 items added.").arg(number));
+    const QFileInfo fi = model->fileInfoAt(index);
+    if (fi.isDir()) {
+        logViewer->clear();
+        model->setDirPath(fi.absoluteFilePath());
+    }
 }