Changeset 82919 in webkit


Ignore:
Timestamp:
Apr 5, 2011 3:35:20 AM (13 years ago)
Author:
zoltan@webkit.org
Message:

2011-04-05 Zoltan Horvath <​zoltan@webkit.org>

Reviewed by Andreas Kling.

[Qt] Make URL loader accessible from testbrowser's menus
​https://bugs.webkit.org/show_bug.cgi?id=57823

Add "Load URLs from file" to QtTestBrowser's and to MiniBrowser's menu.

  • MiniBrowser/qt/BrowserWindow.cpp: (BrowserWindow::BrowserWindow): (BrowserWindow::loadURLListFromFile): (BrowserWindow::~BrowserWindow):
  • MiniBrowser/qt/BrowserWindow.h:
  • QtTestBrowser/launcherwindow.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::~LauncherWindow): (LauncherWindow::createChrome): (LauncherWindow::loadURLListFromFile):
  • QtTestBrowser/launcherwindow.h:
Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r82906 r82919  
     12011-04-05  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Make URL loader accessible from testbrowser's menus
     6        https://bugs.webkit.org/show_bug.cgi?id=57823
     7
     8        Add "Load URLs from file" to QtTestBrowser's and to MiniBrowser's menu.
     9
     10        * MiniBrowser/qt/BrowserWindow.cpp:
     11        (BrowserWindow::BrowserWindow):
     12        (BrowserWindow::loadURLListFromFile):
     13        (BrowserWindow::~BrowserWindow):
     14        * MiniBrowser/qt/BrowserWindow.h:
     15        * QtTestBrowser/launcherwindow.cpp:
     16        (LauncherWindow::LauncherWindow):
     17        (LauncherWindow::~LauncherWindow):
     18        (LauncherWindow::createChrome):
     19        (LauncherWindow::loadURLListFromFile):
     20        * QtTestBrowser/launcherwindow.h:
     21
    1222011-04-04  Sam Weinig  <sam@webkit.org>
    223

  • trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

    r82244 r82919  
    2929#include "BrowserWindow.h"
    3030
     31#include "UrlLoader.h"
    3132#include "qwkpreferences.h"
    3233
    … …  
    4243    : m_isZoomTextOnly(false)
    4344    , m_currentZoom(1)
     45    , m_urlLoader(0)
    4446    , m_context(context)
    4547{
    … …  
    107109    toolsMenu->addSeparator();
    108110    toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
     111    toolsMenu->addSeparator();
     112    toolsMenu->addAction("Load URLs from file", this, SLOT(loadURLListFromFile()));
    109113
    110114    QMenu* settingsMenu = menuBar()->addMenu("&Settings");
    … …  
    336340}
    337341
     342void BrowserWindow::loadURLListFromFile()
     343{
     344    QString selectedFile = QFileDialog::getOpenFileName(this, tr("Load URL list from file")
     345                                                       , QString(), tr("Text Files (*.txt);;All Files (*)"));
     346    if (selectedFile.isEmpty())
     347       return;
     348
     349    m_urlLoader = new UrlLoader(this, selectedFile, 0, 0);
     350    m_urlLoader->loadNext();
     351}
     352
    338353void BrowserWindow::printURL(const QUrl& url)
    339354{
    … …  
    381396BrowserWindow::~BrowserWindow()
    382397{
     398    delete m_urlLoader;
    383399    delete m_addressBar;
    384400    delete m_browser;

  • trunk/Tools/MiniBrowser/qt/BrowserWindow.h

    r82244 r82919  
    3636#include <QtGui>
    3737
     38class UrlLoader;
     39
    3840class BrowserWindow : public QMainWindow {
    3941    Q_OBJECT
    … …  
    7072    void showUserAgentDialog();
    7173
     74    void loadURLListFromFile();
     75
    7276    void printURL(const QUrl&);
    7377
    … …  
    8488    qreal m_currentZoom;
    8589
     90    UrlLoader* m_urlLoader;
    8691    QWKContext* m_context;
    8792    WindowOptions m_windowOptions;

  • trunk/Tools/QtTestBrowser/launcherwindow.cpp

    r82244 r82919  
    3232
    3333#include "launcherwindow.h"
     34#include "urlloader.h"
    3435
    3536const int gExitClickArea = 80;
    … …  
    3940    : MainWindow()
    4041    , m_currentZoom(100)
     42    , m_urlLoader(0)
    4143    , m_view(0)
    4244    , m_inspector(0)
    … …  
    5759{
    5860    grabZoomKeys(false);
     61    delete m_urlLoader;
    5962}
    6063
    … …  
    288291    showInspectorAction->setCheckable(true);
    289292    showInspectorAction->connect(m_inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
     293    toolsMenu->addSeparator();
     294    toolsMenu->addAction("Load URLs from file", this, SLOT(loadURLListFromFile()));
    290295
    291296    // GraphicsView sub menu.
    … …  
    901906}
    902907
     908void LauncherWindow::loadURLListFromFile()
     909{
     910    QString selectedFile = QFileDialog::getOpenFileName(this, tr("Load URL list from file")
     911                                                       , QString(), tr("Text Files (*.txt);;All Files (*)"));
     912    if (selectedFile.isEmpty())
     913       return;
     914
     915    m_urlLoader = new UrlLoader(this->page()->mainFrame(), selectedFile, 0, 0);
     916    m_urlLoader->loadNext();
     917}
     918
    903919void LauncherWindow::printURL(const QUrl& url)
    904920{

  • trunk/Tools/QtTestBrowser/launcherwindow.h

    r82489 r82919  
    166166    void dumpHtml();
    167167
     168    void loadURLListFromFile();
     169
    168170    void setTouchMocking(bool on);
    169171    void toggleWebView(bool graphicsBased);
    … …  
    218220    int m_currentZoom;
    219221
     222    UrlLoader* m_urlLoader;
     223
    220224    QWidget* m_view;
    221225    WebInspector* m_inspector;
Note: See TracChangeset for help on using the changeset viewer.