[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[zoltan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit aeb29570fecf50258c9b61692efe1c39bf741aff
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 14:10:47 2010 +0000

    [Qt] Add new window menu to MiniBrowser
    
    Reviewed by Kenneth Rohde Christiansen.
    
    Implement newWindow function and add a menu item for opening new window in MiniBrowser.
    
    * MiniBrowser/qt/BrowserWindow.cpp:
    (BrowserWindow::BrowserWindow):
    (BrowserWindow::newWindow):
    * MiniBrowser/qt/BrowserWindow.h:
    * MiniBrowser/qt/main.cpp:
    (main):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f0dc687..97cdb9f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-30  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add new window menu to MiniBrowser
+
+        Implement newWindow function and add a menu item for opening new window in MiniBrowser.
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::newWindow):
+        * MiniBrowser/qt/BrowserWindow.h:
+        * MiniBrowser/qt/main.cpp:
+        (main):
+
 2010-08-29  James Robinson  <jamesr at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 9efe64f..2e0dccd 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -79,10 +79,13 @@ QGraphicsWKView* BrowserView::view() const
 
 BrowserWindow::BrowserWindow()
 {
+    setAttribute(Qt::WA_DeleteOnClose);
+
     m_menu = new QMenuBar();
     m_browser = new BrowserView();
     m_addressBar = new QLineEdit();
 
+    m_menu->addAction("New Window", this, SLOT(newWindow()));
     m_menu->addAction("Quit", this, SLOT(close()));
 
     m_browser->setFocus(Qt::OtherFocusReason);
@@ -111,6 +114,15 @@ void BrowserWindow::load(const QString& url)
     m_browser->load(QUrl(url));
 }
 
+BrowserWindow* BrowserWindow::newWindow(const QString& url)
+{
+    BrowserWindow* window = new BrowserWindow();
+    window->resize(960, 640);
+    window->show();
+    window->load(url);
+    return window;
+}
+
 void BrowserWindow::changeLocation()
 {
     QString string = m_addressBar->text();
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.h b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
index fa11390..3ff7e72 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
@@ -62,6 +62,9 @@ public:
     ~BrowserWindow();
     void load(const QString& url);
 
+public slots:
+    BrowserWindow* newWindow(const QString& url = "about:blank");
+
 protected slots:
     void changeLocation();
     void loadProgress(int progress);
diff --git a/WebKitTools/MiniBrowser/qt/main.cpp b/WebKitTools/MiniBrowser/qt/main.cpp
index b261397..8130cd2 100644
--- a/WebKitTools/MiniBrowser/qt/main.cpp
+++ b/WebKitTools/MiniBrowser/qt/main.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2010 University of Szeged
  *
  * All rights reserved.
  *
@@ -31,10 +32,8 @@
 int main(int argc, char** argv) {
     QApplication app(argc, argv);
 
-    BrowserWindow window;
-    window.resize(960, 640);
-    window.show();
-    window.load(argc > 1 ? argv[1] : "http://www.google.com");
+    BrowserWindow* window = new BrowserWindow();
+    window->newWindow("http://www.google.com");
 
     app.exec();
 

-- 
WebKit Debian packaging