diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-04-08 02:53:38 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-04-08 02:53:38 +0200 |
commit | 43dc2695d62fd2e4fc01aff608bb2af3e8335040 (patch) | |
tree | e854bca16452965d5e4d38bc1d36459bf723355f /src/protocolhandler.cpp | |
parent | rekonq 0.4.59 (diff) | |
download | rekonq-43dc2695d62fd2e4fc01aff608bb2af3e8335040.tar.xz |
This is a really big commit, implementing the new urlbar
- removed previous SSL animation, we have now a nice yellow lock :)
- faster and cleaner animations
- reenabled the old stacked widget, to avoid stupid refreshes and fix some regressions
- implemented some "right icons": KGet, SSL, RSS. For now, just SSL is full featured
- clean up the box :) Some old & unuseful files removed, some icons added
- Pano's request: grey text shown everytime in the empty bar
Again and again:
this is not the first, but the second implementation of the new urlbar UI.
About me this is clearly better than the first or the previous.
But it needs love :D
BUG: 230125
BUG: 231015
CCBUG: 228040
BUG: 227272
Diffstat (limited to 'src/protocolhandler.cpp')
-rw-r--r-- | src/protocolhandler.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index f6867e81..1458bdf5 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -85,16 +85,14 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra _url = request.url(); _frame = frame; - kDebug() << "URL PROTOCOL: " << _url; - - // relative urls - if(_url.isRelative()) - return false; - // "http(s)" (fast) handling if( _url.protocol() == QL1S("http") || _url.protocol() == QL1S("https") ) return false; - + + // relative urls + if(_url.isRelative()) + return false; + // javascript handling if( _url.protocol() == QL1S("javascript") ) { @@ -148,7 +146,9 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra break; } } - + + Application::instance()->mainWindow()->mainView()->urlBar()->clearRightIcons(); + NewTabPage p(frame); p.generate(_url); return true; |