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

[diegohcg at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 79c10ef824b942048d16551216a3e47116bcce60
Author: diegohcg at webkit.org <diegohcg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 23:36:29 2010 +0000

    2010-07-19 Diego Gonzalez <diegohcg at webkit.org>
    
        [Qt] MiniBrowser: Progress indication at address bar
        https://bugs.webkit.org/show_bug.cgi?id=42565
    
        Reviewed by Antonio Gomes.
    
        Make possible to see load progress at address bar based on
        QtTestBrowser solution
    
        * MiniBrowser/qt/BrowserWindow.cpp:
        (BrowserWindow::BrowserWindow):
        (BrowserWindow::loadProgress):
        * MiniBrowser/qt/BrowserWindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63698 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cf6803e..1c1b9a4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,21 @@
 
         Reviewed by Antonio Gomes.
 
+        [Qt] MiniBrowser: Progress indication at address bar
+        https://bugs.webkit.org/show_bug.cgi?id=42565
+
+        Make possible to see load progress at address bar based on
+        QtTestBrowser solution
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::loadProgress):
+        * MiniBrowser/qt/BrowserWindow.h:
+
+2010-07-19  Diego Gonzalez  <diegohcg at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
         [Qt] Add MiniBrowser features: urlChanged, titleChanged and from user input load
         https://bugs.webkit.org/show_bug.cgi?id=42564
 
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index c3f7b35..09ac737 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -88,6 +88,7 @@ BrowserWindow::BrowserWindow()
     m_browser->setFocus(Qt::OtherFocusReason);
 
     connect(m_addressBar, SIGNAL(returnPressed()), SLOT(changeLocation()));
+    connect(m_browser->view(), SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
     connect(m_browser->view(), SIGNAL(titleChanged(const QString&)), SLOT(titleChanged(const QString&)));
     connect(m_browser->view(), SIGNAL(urlChanged(const QUrl&)), SLOT(urlChanged(const QUrl&)));
 
@@ -116,6 +117,25 @@ void BrowserWindow::changeLocation()
     m_browser->load(string);
 }
 
+void BrowserWindow::loadProgress(int progress)
+{
+    QColor backgroundColor = QApplication::palette().color(QPalette::Base);
+    QColor progressColor = QColor(120, 180, 240);
+    QPalette pallete = m_addressBar->palette();
+
+    if (progress <= 0 || progress >= 100)
+        pallete.setBrush(QPalette::Base, backgroundColor);
+    else {
+        QLinearGradient gradient(0, 0, width(), 0);
+        gradient.setColorAt(0, progressColor);
+        gradient.setColorAt(((double) progress) / 100, progressColor);
+        if (progress != 100)
+            gradient.setColorAt((double) progress / 100 + 0.001, backgroundColor);
+        pallete.setBrush(QPalette::Base, gradient);
+    }
+    m_addressBar->setPalette(pallete);
+}
+
 void BrowserWindow::titleChanged(const QString& title)
 {
     setWindowTitle(title);
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.h b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
index c11b4fc..fa11390 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
@@ -64,6 +64,7 @@ public:
 
 protected slots:
     void changeLocation();
+    void loadProgress(int progress);
     void titleChanged(const QString&);
     void urlChanged(const QUrl&);
 

-- 
WebKit Debian packaging