Rubberstamped by Simon Hausmann.

[Qt] QtLauncher refactoring:

Move out code from the MainWindow (renamed to LauncherWindow)
that is not depending on the view, and add it to a new class
called MainWindow.

* QtLauncher/QtLauncher.pro:
* QtLauncher/main.cpp:
(LauncherWindow::LauncherWindow):
(LauncherWindow::eventFilter):
(LauncherWindow::loadStarted):
(LauncherWindow::loadFinished):
(LauncherWindow::newWindow):
(LauncherWindow::setupUI):
(WebPage::createWindow):
(main):
* QtLauncher/mainwindow.cpp: Added.
(MainWindow::MainWindow):
(MainWindow::buildUI):
(MainWindow::page):
(MainWindow::setAddressUrl):
(MainWindow::addCompleterEntry):
(MainWindow::load):
(MainWindow::changeLocation):
(MainWindow::openFile):
* QtLauncher/mainwindow.h: Added.

git-svn-id: svn://svn.chromium.org/blink/trunk@53948 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKitTools/ChangeLog

@@ -11,6 +11,37 @@
         * DumpRenderTree/gtk/EventSender.cpp:
         (keyDownCallback):
 
+2010-01-27  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Rubberstamped by Simon Hausmann.
+
+        [Qt] QtLauncher refactoring:
+
+        Move out code from the MainWindow (renamed to LauncherWindow)
+        that is not depending on the view, and add it to a new class
+        called MainWindow.
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::eventFilter):
+        (LauncherWindow::loadStarted):
+        (LauncherWindow::loadFinished):
+        (LauncherWindow::newWindow):
+        (LauncherWindow::setupUI):
+        (WebPage::createWindow):
+        (main):
+        * QtLauncher/mainwindow.cpp: Added.
+        (MainWindow::MainWindow):
+        (MainWindow::buildUI):
+        (MainWindow::page):
+        (MainWindow::setAddressUrl):
+        (MainWindow::addCompleterEntry):
+        (MainWindow::load):
+        (MainWindow::changeLocation):
+        (MainWindow::openFile):
+        * QtLauncher/mainwindow.h: Added.
+
 2010-01-27  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         Rubberstamped by Simon Hausmann.

third_party/WebKit/WebKitTools/QtLauncher/QtLauncher.pro

@@ -2,12 +2,14 @@ TEMPLATE = app
 
 SOURCES += \
     main.cpp \
+    mainwindow.cpp \
     urlloader.cpp \
     utils.cpp \
     webpage.cpp \
     webview.cpp \
 
 HEADERS += \
+    mainwindow.h \
     urlloader.h \
     utils.h \
     webinspector.h \

third_party/WebKit/WebKitTools/QtLauncher/mainwindow.cpp

+/*
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in>
+ * Copyright (C) 2006 George Staikos <staikos@kde.org>
+ * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
+ * Copyright (C) 2006 Zack Rusin <zack@kde.org>
+ * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
+ */
+
+#include "mainwindow.h"
+
+#include "utils.h"
+
+MainWindow::MainWindow(const QString& url)
+    : m_page(new WebPage(this))
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 5, 0)
+    if (qgetenv("QTLAUNCHER_USE_ARGB_VISUALS").toInt() == 1)
+        setAttribute(Qt::WA_TranslucentBackground);
+#endif
+
+    buildUI();
+}
+
+void MainWindow::buildUI()
+{
+    QToolBar* bar = addToolBar("Navigation");
+    bar->addAction(page()->action(QWebPage::Back));
+    bar->addAction(page()->action(QWebPage::Forward));
+    bar->addAction(page()->action(QWebPage::Reload));
+    bar->addAction(page()->action(QWebPage::Stop));
+
+    urlEdit = new QLineEdit(this);
+    urlEdit->setSizePolicy(QSizePolicy::Expanding, urlEdit->sizePolicy().verticalPolicy());
+    connect(urlEdit, SIGNAL(returnPressed()), SLOT(changeLocation()));
+    QCompleter* completer = new QCompleter(this);
+    urlEdit->setCompleter(completer);
+    completer->setModel(&urlModel);
+    bar->addWidget(urlEdit);
+
+    progress = new QProgressBar(this);
+    progress->setRange(0, 100);
+    progress->setMinimumSize(100, 20);
+    progress->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    progress->hide();
+    statusBar()->addPermanentWidget(progress);
+
+    connect(page()->mainFrame(), SIGNAL(titleChanged(const QString&)),
+            this, SLOT(setWindowTitle(const QString&)));
+    connect(page(), SIGNAL(loadProgress(int)), progress, SLOT(show()));
+    connect(page(), SIGNAL(loadProgress(int)), progress, SLOT(setValue(int)));
+    connect(page(), SIGNAL(loadFinished(bool)), progress, SLOT(hide()));
+    connect(page(), SIGNAL(windowCloseRequested()), this, SLOT(close()));
+
+    // short-cuts
+    page()->action(QWebPage::Back)->setShortcut(QKeySequence::Back);
+    page()->action(QWebPage::Stop)->setShortcut(Qt::Key_Escape);
+    page()->action(QWebPage::Forward)->setShortcut(QKeySequence::Forward);
+    page()->action(QWebPage::Reload)->setShortcut(QKeySequence::Refresh);
+    page()->action(QWebPage::Undo)->setShortcut(QKeySequence::Undo);
+    page()->action(QWebPage::Redo)->setShortcut(QKeySequence::Redo);
+    page()->action(QWebPage::Cut)->setShortcut(QKeySequence::Cut);
+    page()->action(QWebPage::Copy)->setShortcut(QKeySequence::Copy);
+    page()->action(QWebPage::Paste)->setShortcut(QKeySequence::Paste);
+
+    page()->action(QWebPage::ToggleBold)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_B));
+    page()->action(QWebPage::ToggleItalic)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I));
+    page()->action(QWebPage::ToggleUnderline)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_U));
+}
+
+WebPage* MainWindow::page()
+{
+    return m_page;
+}
+
+void MainWindow::setAddressUrl(const QString& url)
+{
+    urlEdit->setText(url);
+}
+
+void MainWindow::addCompleterEntry(const QUrl& url)
+{
+    QUrl::FormattingOptions opts;
+    opts |= QUrl::RemoveScheme;
+    opts |= QUrl::RemoveUserInfo;
+    opts |= QUrl::StripTrailingSlash;
+    QString s = url.toString(opts);
+    s = s.mid(2);
+    if (s.isEmpty())
+        return;
+
+    if (!urlList.contains(s))
+        urlList += s;
+    urlModel.setStringList(urlList);
+}
+
+void MainWindow::load(const QString& url)
+{
+    QUrl qurl = urlFromUserInput(url);
+    if (qurl.scheme().isEmpty())
+        qurl = QUrl("http://" + url + "/");
+    load(qurl);
+}
+
+void MainWindow::load(const QUrl& url)
+{
+    if (!url.isValid())
+        return;
+
+    setAddressUrl(url.toString());
+    page()->mainFrame()->load(url);
+}
+
+void MainWindow::changeLocation()
+{
+    QString string = urlEdit->text();
+    load(string);
+}
+
+void MainWindow::openFile()
+{
+    static const QString filter("HTML Files (*.htm *.html);;Text Files (*.txt);;Image Files (*.gif *.jpg *.png);;All Files (*)");
+
+    QFileDialog fileDialog(this, tr("Open"), QString(), filter);
+    fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+    fileDialog.setFileMode(QFileDialog::ExistingFile);
+    fileDialog.setOptions(QFileDialog::ReadOnly);
+
+    if (fileDialog.exec()) {
+        QString selectedFile = fileDialog.selectedFiles()[0];
+        if (!selectedFile.isEmpty())
+            load(QUrl::fromLocalFile(selectedFile));
+    }
+}
+

third_party/WebKit/WebKitTools/QtLauncher/mainwindow.h

+/*
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in>
+ * Copyright (C) 2006 George Staikos <staikos@kde.org>
+ * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
+ * Copyright (C) 2006 Zack Rusin <zack@kde.org>
+ * Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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.
+ */
+
+#ifndef mainwindow_h
+#define mainwindow_h
+
+#include <QtGui>
+#include "webpage.h"
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+
+public:
+    MainWindow(const QString& url = QString());
+
+    void setAddressUrl(const QString& url);
+    void addCompleterEntry(const QUrl& url);
+
+    void load(const QString& url);
+    void load(const QUrl& url);
+
+    WebPage* page();
+
+protected slots:
+    void openFile();
+    void changeLocation();
+
+private:
+    void buildUI();
+
+    QStringListModel urlModel;
+    QStringList urlList;
+    QLineEdit* urlEdit;
+
+    QProgressBar* progress;
+
+    WebPage* m_page;
+};
+
+#endif