diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-06-15 18:50:25 +0200 | 
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-06-15 18:50:25 +0200 | 
| commit | 3b83eb0769ccb926976c0f4c2514d4de3917f054 (patch) | |
| tree | f8dc01ef57b2909075de766d492f19448a9ef55d | |
| parent | no more currenttab & digit closed tabs (diff) | |
| download | rekonq-3b83eb0769ccb926976c0f4c2514d4de3917f054.tar.xz | |
This dangerous commit, 15 days to the release, removes the use of a default.css
file in rekonq and does an hack to choose the right palette for the WebView.
- Why this doesn't work in QWebPage::setPalette()??
- Why using a KStyle things don't work as expected??
- so, where is really the bug, here? I have some ideas about but I currently have no time to work on..
Anyway, with this nice hack :) things seem work well for dark themes and for pages
without a "proper" style (See bug 232552 about..)
Many thanks to Tomas Fryda for let me noticing this.
| -rw-r--r-- | src/application.cpp | 4 | ||||
| -rw-r--r-- | src/data/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/data/default.css | 10 | ||||
| -rw-r--r-- | src/webview.cpp | 17 | 
4 files changed, 17 insertions, 15 deletions
| diff --git a/src/application.cpp b/src/application.cpp index 94a89c90..366191f4 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -525,9 +525,7 @@ void Application::updateConfiguration()      // Applies user defined CSS to all open webpages. If there no longer is a      // user defined CSS removes it from all open webpages. -    if (ReKonfig::userCSS().isEmpty()) -        defaultSettings->setUserStyleSheetUrl(KUrl(KStandardDirs::locate("appdata" , "default.css"))); -    else +    if (!ReKonfig::userCSS().isEmpty())          defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS());      // ====== load Settings on main classes diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt index ef777c9c..5f0ac164 100644 --- a/src/data/CMakeLists.txt +++ b/src/data/CMakeLists.txt @@ -9,7 +9,6 @@ INSTALL(  INSTALL(       FILES       defaultbookmarks.xbel -    default.css      DESTINATION ${DATA_INSTALL_DIR}/rekonq  ) diff --git a/src/data/default.css b/src/data/default.css deleted file mode 100644 index 3ddd3026..00000000 --- a/src/data/default.css +++ /dev/null @@ -1,10 +0,0 @@ -/* -rekonq default css properties -this file will not be considered -setting a local stylesheet in rekonq config -*/ - -/* Set background color to white for sites forgetting this */ -body{ -background-color:#FFFFFF; -}
\ No newline at end of file diff --git a/src/webview.cpp b/src/webview.cpp index 0633bc9b..7fc1b4b8 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -57,6 +57,7 @@  #include <QtGui/QClipboard>  #include <QtGui/QKeyEvent>  #include <QtGui/QLayout> +#include <QtGui/QWindowsStyle>  #include <QtDBus/QDBusConnectionInterface>  #include <QtDBus/QDBusInterface> @@ -74,7 +75,21 @@ WebView::WebView(QWidget* parent)  {      WebPage *page = new WebPage(this);      setPage(page); - +     +    // // NOTE This is a lot hackish. We copied it from Arora, but using a "Windows Style"  +    // // seems really a pity to me. The problem is that using a KStyle everything seems "broken" +    // // (at least with dark colors). So I think the code should be somthing like: +    // KStyle s; +    // setPalette( s.standardPalette() ); +    // // But it doesn't work :( +    // // We'll see in next KDE releases... +    QPalette p; +    if (p.color(QPalette::Window) != Qt::white) { +        QWindowsStyle s; +        p = s.standardPalette(); +        setPalette(p); +    } +          // download system      connect(this, SIGNAL(linkShiftClicked(const KUrl &)), page, SLOT(downloadUrl(const KUrl &)));      connect(page, SIGNAL(downloadRequested(const QNetworkRequest &)), page, SLOT(downloadRequest(const QNetworkRequest &))); | 
