Changeset 55163 in webkit

Timestamp:

Feb 23, 2010, 12:39:30 PM (16 years ago)

Author:

eric@webkit.org

Message:

2010-02-23 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Need a final integration between QtLauncher and QGVLauncher
​https://bugs.webkit.org/show_bug.cgi?id=35292

Add cloneWindow feature to QtLauncher, when running on QGraphicsView mode.

• QtLauncher/main.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::~LauncherWindow): (LauncherWindow::init): (LauncherWindow::cloneWindow): (LauncherWindow::setupUI):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (8 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-23  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Need a final integration between QtLauncher and QGVLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35292
+
+        Add cloneWindow feature to QtLauncher, when running on QGraphicsView mode.
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::~LauncherWindow):
+        (LauncherWindow::init):
+        (LauncherWindow::cloneWindow):
+        (LauncherWindow::setupUI):
+
 2010-02-23  Dirk Pranke  <dpranke@chromium.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -84 +84 @@
 public:
     LauncherWindow(QString url = QString());
+    LauncherWindow(QGraphicsScene* scene);
     virtual ~LauncherWindow();
 
@@ -121 +122 @@
 public slots:
     void newWindow(const QString& url = QString());
+    void cloneWindow();
 
 private:
@@ -141 +143 @@
     bool touchMocking;
 #endif
+
+    void init(bool useGraphicsView = false);
 };
 
@@ -147 +151 @@
     : MainWindow(url)
     , currentZoom(100)
+{
+    init();
+    load(url);
+}
+
+LauncherWindow::LauncherWindow(QGraphicsScene* scene)
+    : MainWindow()
+    , currentZoom(100)
+{
+    init(true); // use QGraphicsView
+    QGraphicsView* view = static_cast<QGraphicsView*>(m_view);
+    view->setScene(scene);
+}
+
+LauncherWindow::~LauncherWindow()
+{
+    grabZoomKeys(false);
+}
+
+void LauncherWindow::init(bool useGraphicsView)
 {
     QSplitter* splitter = new QSplitter(Qt::Vertical, this);
@@ -158 +182 @@
 
     m_view = 0;
-    initializeView();
+
+    initializeView(useGraphicsView);
 
     connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted()));
@@ -178 +203 @@
 
     grabZoomKeys(true);
-
-    load(url);
-}
-
-LauncherWindow::~LauncherWindow()
-{
-    grabZoomKeys(false);
 }
 
@@ -486 +504 @@
 }
 
+void LauncherWindow::cloneWindow()
+{
+    QGraphicsView* view = static_cast<QGraphicsView*>(m_view);
+
+    LauncherWindow* mw = new LauncherWindow(view->scene());
+    mw->show();
+}
+
 void LauncherWindow::setupUI()
 {
@@ -570 +596 @@
     flipYAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
     flipYAnimated->setEnabled(false);
+
+    graphicsViewMenu->addSeparator();
+
+    QAction* cloneWindow = graphicsViewMenu->addAction("Clone Window", this, SLOT(cloneWindow()));
+    cloneWindow->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    cloneWindow->setEnabled(false);
 }