[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
hausmann at webkit.org
hausmann at webkit.org
Fri Feb 26 22:18:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 6788d78b81dd1e885ac2443850c6f04da3f9e9f4
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 12 13:33:53 2010 +0000
Make QtLauncher somewhat useable on S60.
Reviewed by Antti Koivisto.
Show the window fullscreen to make scrollbars appear, resize
the toolbar buttons to 16x16 to give more screen space to
web content and moved the location lineedit into a separate
line.
* QtLauncher/main.cpp:
(LauncherWindow::LauncherWindow):
* QtLauncher/mainwindow.cpp:
(MainWindow::buildUI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54721 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 14bf83b..1e3ea5b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-12 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Antti Koivisto.
+
+ Make QtLauncher somewhat useable on S60.
+
+ Show the window fullscreen to make scrollbars appear, resize
+ the toolbar buttons to 16x16 to give more screen space to
+ web content and moved the location lineedit into a separate
+ line.
+
+ * QtLauncher/main.cpp:
+ (LauncherWindow::LauncherWindow):
+ * QtLauncher/mainwindow.cpp:
+ (MainWindow::buildUI):
+
2010-02-12 Jesus Sanchez-Palencia <jesus.palencia at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index 5053468..c725c2f 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -148,7 +148,11 @@ LauncherWindow::LauncherWindow(QString url)
QSplitter* splitter = new QSplitter(Qt::Vertical, this);
setCentralWidget(splitter);
+#if defined(Q_WS_S60)
+ showMaximized();
+#else
resize(800, 600);
+#endif
m_view = 0;
initializeView();
diff --git a/WebKitTools/QtLauncher/mainwindow.cpp b/WebKitTools/QtLauncher/mainwindow.cpp
index 2662f5e..47755ec 100644
--- a/WebKitTools/QtLauncher/mainwindow.cpp
+++ b/WebKitTools/QtLauncher/mainwindow.cpp
@@ -50,6 +50,9 @@ MainWindow::MainWindow(const QString& url)
void MainWindow::buildUI()
{
QToolBar* bar = addToolBar("Navigation");
+#if defined(Q_WS_S60)
+ bar->setIconSize(QSize(16, 16));
+#endif
bar->addAction(page()->action(QWebPage::Back));
bar->addAction(page()->action(QWebPage::Forward));
bar->addAction(page()->action(QWebPage::Reload));
@@ -61,7 +64,12 @@ void MainWindow::buildUI()
QCompleter* completer = new QCompleter(this);
urlEdit->setCompleter(completer);
completer->setModel(&urlModel);
+#if defined(Q_WS_S60)
+ addToolBarBreak();
+ addToolBar("Location")->addWidget(urlEdit);
+#else
bar->addWidget(urlEdit);
+#endif
connect(page()->mainFrame(), SIGNAL(titleChanged(const QString&)),
this, SLOT(setWindowTitle(const QString&)));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list