Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[LocationBar] Cleanup code + fixed showing rss icon

Browse Source
This commit is contained in:
nowrep 2014-03-16 12:11:24 +01:00
parent 6e53add7d7
commit a701079d27
3 changed files with 60 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/lib/navigation/locationbar.cpp
View File

@ -54,7 +54,6 @@ LocationBar::LocationBar(BrowserWindow* window)
, m_webView(0) , m_webView(0)
, m_pasteAndGoAction(0) , m_pasteAndGoAction(0)
, m_clearAction(0) , m_clearAction(0)
, m_rssIconVisible(false)
, m_holdingAlt(false) , m_holdingAlt(false)
, m_loadProgress(0) , m_loadProgress(0)
, m_progressVisible(false) , m_progressVisible(false)
@ -84,7 +83,7 @@ LocationBar::LocationBar(BrowserWindow* window)
m_completer->setLocationBar(this); m_completer->setLocationBar(this);
connect(m_completer, SIGNAL(showCompletion(QString)), this, SLOT(showCompletion(QString))); connect(m_completer, SIGNAL(showCompletion(QString)), this, SLOT(showCompletion(QString)));
connect(m_completer, SIGNAL(showDomainCompletion(QString)), this, SLOT(showDomainCompletion(QString))); connect(m_completer, SIGNAL(showDomainCompletion(QString)), this, SLOT(showDomainCompletion(QString)));
connect(m_completer, SIGNAL(loadCompletion()), this, SLOT(urlEnter())); connect(m_completer, SIGNAL(loadCompletion()), this, SLOT(requestLoadUrl()));
connect(m_completer, SIGNAL(clearCompletion()), this, SLOT(clearCompletion())); connect(m_completer, SIGNAL(clearCompletion()), this, SLOT(clearCompletion()));
m_domainCompleterModel = new QStringListModel(this); m_domainCompleterModel = new QStringListModel(this);
@ -93,18 +92,19 @@ LocationBar::LocationBar(BrowserWindow* window)
domainCompleter->setModel(m_domainCompleterModel); domainCompleter->setModel(m_domainCompleterModel);
setCompleter(domainCompleter); setCompleter(domainCompleter);
connect(this, SIGNAL(textEdited(QString)), this, SLOT(textEdit())); connect(this, SIGNAL(textEdited(QString)), this, SLOT(textEditted()));
connect(m_goIcon, SIGNAL(clicked(QPoint)), this, SLOT(urlEnter())); connect(m_goIcon, SIGNAL(clicked(QPoint)), this, SLOT(requestLoadUrl()));
connect(down, SIGNAL(clicked(QPoint)), m_completer, SLOT(showMostVisited())); connect(down, SIGNAL(clicked(QPoint)), m_completer, SLOT(showMostVisited()));
connect(mApp->searchEnginesManager(), SIGNAL(activeEngineChanged()), this, SLOT(updatePlaceHolderText())); connect(mApp->searchEnginesManager(), SIGNAL(activeEngineChanged()), this, SLOT(updatePlaceHolderText()));
connect(mApp->searchEnginesManager(), SIGNAL(defaultEngineChanged()), this, SLOT(updatePlaceHolderText())); connect(mApp->searchEnginesManager(), SIGNAL(defaultEngineChanged()), this, SLOT(updatePlaceHolderText()));
connect(mApp, SIGNAL(settingsReloaded()), SLOT(loadSettings())); connect(mApp, SIGNAL(settingsReloaded()), SLOT(loadSettings()));
loadSettings(); loadSettings();
clearIcon();
updateSiteIcon();
// Hide icons by default // Hide icons by default
hideGoButton(); m_goIcon->setVisible(qzSettings->alwaysShowGoIcon);
m_rssIcon->hide(); m_rssIcon->hide();
m_autofillIcon->hide(); m_autofillIcon->hide();
@ -125,9 +125,15 @@ void LocationBar::setWebView(TabbedWebView* view)
m_siteIcon->setWebView(m_webView); m_siteIcon->setWebView(m_webView);
m_autofillIcon->setWebView(m_webView); m_autofillIcon->setWebView(m_webView);
connect(m_webView, SIGNAL(loadStarted()), SLOT(onLoadStarted())); connect(m_webView, SIGNAL(loadStarted()), SLOT(loadStarted()));
connect(m_webView, SIGNAL(loadProgress(int)), SLOT(onLoadProgress(int))); connect(m_webView, SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(onLoadFinished())); connect(m_webView, SIGNAL(loadFinished(bool)), SLOT(loadFinished()));
connect(m_webView, SIGNAL(iconChanged()), this, SLOT(updateSiteIcon()));
connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(showUrl(QUrl)));
connect(m_webView, SIGNAL(rssChanged(bool)), this, SLOT(setRssIconVisible(bool)));
connect(m_webView, SIGNAL(privacyChanged(bool)), this, SLOT(setPrivacyState(bool)));
connect(this, SIGNAL(loadUrl(QUrl)), m_webView, SLOT(userLoadAction(QUrl)));
} }
void LocationBar::setText(const QString &text) void LocationBar::setText(const QString &text)
@ -248,7 +254,7 @@ void LocationBar::refreshTextFormat()
setTextFormat(textFormat); setTextFormat(textFormat);
} }
void LocationBar::urlEnter() void LocationBar::requestLoadUrl()
{ {
const QUrl url = createUrl(); const QUrl url = createUrl();
const QString urlString = convertUrlToText(url); const QString urlString = convertUrlToText(url);
@ -257,13 +263,13 @@ void LocationBar::urlEnter()
m_webView->setFocus(); m_webView->setFocus();
if (urlString != text()) { if (urlString != text()) {
setText(convertUrlToText(url)); setText(urlString);
} }
emit loadUrl(url); emit loadUrl(url);
} }
void LocationBar::textEdit() void LocationBar::textEditted()
{ {
if (!text().isEmpty()) { if (!text().isEmpty()) {
m_completer->complete(text()); m_completer->complete(text());
@ -272,33 +278,29 @@ void LocationBar::textEdit()
m_completer->closePopup(); m_completer->closePopup();
} }
showGoButton(); setGoIconVisible(true);
} }
void LocationBar::showGoButton() void LocationBar::setGoIconVisible(bool state)
{ {
m_rssIconVisible = m_rssIcon->isVisible(); if (state) {
m_bookmarkIcon->hide();
m_rssIcon->hide();
m_goIcon->show();
}
else {
m_rssIcon->setVisible(m_webView->hasRss());
m_bookmarkIcon->show();
m_bookmarkIcon->hide(); if (!qzSettings->alwaysShowGoIcon) {
m_rssIcon->hide(); m_goIcon->hide();
m_goIcon->show(); }
updateTextMargins();
}
void LocationBar::hideGoButton()
{
m_rssIcon->setVisible(m_rssIconVisible);
m_bookmarkIcon->show();
if (!qzSettings->alwaysShowGoIcon) {
m_goIcon->hide();
} }
updateTextMargins(); updateTextMargins();
} }
void LocationBar::showRSSIcon(bool state) void LocationBar::setRssIconVisible(bool state)
{ {
m_rssIcon->setVisible(state); m_rssIcon->setVisible(state);
@ -324,28 +326,22 @@ void LocationBar::showUrl(const QUrl &url)
// Move cursor to the start // Move cursor to the start
home(false); home(false);
hideGoButton();
m_bookmarkIcon->checkBookmark(url); m_bookmarkIcon->checkBookmark(url);
} }
void LocationBar::siteIconChanged() void LocationBar::updateSiteIcon()
{ {
QIcon icon_ = m_webView->icon(); const QIcon icn = m_webView ? m_webView->icon() : QIcon();
if (icon_.isNull()) { if (icn.isNull()) {
clearIcon(); m_siteIcon->setIcon(IconProvider::emptyWebIcon());
} }
else { else {
m_siteIcon->setIcon(QIcon(icon_.pixmap(16, 16))); m_siteIcon->setIcon(QIcon(icn.pixmap(16, 16)));
} }
} }
void LocationBar::clearIcon() void LocationBar::setPrivacyState(bool state)
{
m_siteIcon->setIcon(IconProvider::emptyWebIcon());
}
void LocationBar::setPrivacy(bool state)
{ {
m_siteIcon->setProperty("secured", QVariant(state)); m_siteIcon->setProperty("secured", QVariant(state));
m_siteIcon->style()->unpolish(m_siteIcon); m_siteIcon->style()->unpolish(m_siteIcon);
@ -360,7 +356,7 @@ void LocationBar::pasteAndGo()
{ {
clear(); clear();
paste(); paste();
urlEnter(); requestLoadUrl();
} }
void LocationBar::contextMenuEvent(QContextMenuEvent* event) void LocationBar::contextMenuEvent(QContextMenuEvent* event)
@ -437,7 +433,7 @@ void LocationBar::focusInEvent(QFocusEvent* event)
// Text has been edited, let's show go button // Text has been edited, let's show go button
if (stringUrl != text()) { if (stringUrl != text()) {
showGoButton(); setGoIconVisible(true);
} }
} }
@ -455,7 +451,7 @@ void LocationBar::focusOutEvent(QFocusEvent* event)
LineEdit::focusOutEvent(event); LineEdit::focusOutEvent(event);
hideGoButton(); setGoIconVisible(false);
if (text().trimmed().isEmpty()) { if (text().trimmed().isEmpty()) {
clear(); clear();
@ -531,7 +527,7 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
switch (event->modifiers()) { switch (event->modifiers()) {
case Qt::ControlModifier: case Qt::ControlModifier:
setText(text().append(QLatin1String(".com"))); setText(text().append(QLatin1String(".com")));
urlEnter(); requestLoadUrl();
m_holdingAlt = false; m_holdingAlt = false;
break; break;
@ -542,7 +538,7 @@ void LocationBar::keyPressEvent(QKeyEvent* event)
break; break;
default: default:
urlEnter(); requestLoadUrl();
m_holdingAlt = false; m_holdingAlt = false;
} }
@ -584,13 +580,14 @@ void LocationBar::keyReleaseEvent(QKeyEvent* event)
LineEdit::keyReleaseEvent(event); LineEdit::keyReleaseEvent(event);
} }
void LocationBar::onLoadStarted() void LocationBar::loadStarted()
{ {
m_progressVisible = true; m_progressVisible = true;
m_autofillIcon->hide(); m_autofillIcon->hide();
m_siteIcon->setIcon(IconProvider::emptyWebIcon());
} }
void LocationBar::onLoadProgress(int progress) void LocationBar::loadProgress(int progress)
{ {
if (qzSettings->showLoadingProgress) { if (qzSettings->showLoadingProgress) {
m_loadProgress = progress; m_loadProgress = progress;
@ -598,7 +595,7 @@ void LocationBar::onLoadProgress(int progress)
} }
} }
void LocationBar::onLoadFinished() void LocationBar::loadFinished()
{ {
if (qzSettings->showLoadingProgress) { if (qzSettings->showLoadingProgress) {
QTimer::singleShot(700, this, SLOT(hideProgress())); QTimer::singleShot(700, this, SLOT(hideProgress()));
@ -610,6 +607,8 @@ void LocationBar::onLoadFinished()
m_autofillIcon->setFormData(page->autoFillData()); m_autofillIcon->setFormData(page->autoFillData());
m_autofillIcon->show(); m_autofillIcon->show();
} }
updateSiteIcon();
} }
void LocationBar::loadSettings() void LocationBar::loadSettings()

24
src/lib/navigation/locationbar.h
View File

@ -57,23 +57,24 @@ signals:
void loadUrl(const QUrl &url); void loadUrl(const QUrl &url);
private slots: private slots:
void textEdit(); void textEditted();
void urlEnter(); void requestLoadUrl();
void pasteAndGo(); void pasteAndGo();
void clearIcon(); void updateSiteIcon();
void siteIconChanged();
void setPrivacy(bool state);
void showRSSIcon(bool state);
void updatePlaceHolderText(); void updatePlaceHolderText();
void setPrivacyState(bool state);
void setRssIconVisible(bool state);
void setGoIconVisible(bool state);
void showCompletion(const QString &completion); void showCompletion(const QString &completion);
void showDomainCompletion(const QString &completion); void showDomainCompletion(const QString &completion);
void clearCompletion(); void clearCompletion();
void onLoadStarted(); void loadStarted();
void onLoadProgress(int progress); void loadProgress(int progress);
void onLoadFinished(); void loadFinished();
void hideProgress(); void hideProgress();
void loadSettings(); void loadSettings();
@ -97,8 +98,6 @@ private:
QString convertUrlToText(const QUrl &url) const; QString convertUrlToText(const QUrl &url) const;
void refreshTextFormat(); void refreshTextFormat();
void showGoButton();
void hideGoButton();
LocationCompleter* m_completer; LocationCompleter* m_completer;
QStringListModel* m_domainCompleterModel; QStringListModel* m_domainCompleterModel;
@ -115,7 +114,6 @@ private:
QAction* m_pasteAndGoAction; QAction* m_pasteAndGoAction;
QAction* m_clearAction; QAction* m_clearAction;
bool m_rssIconVisible;
bool m_holdingAlt; bool m_holdingAlt;
int m_loadProgress; int m_loadProgress;

7
src/lib/webview/webtab.cpp
View File

@ -114,13 +114,6 @@ WebTab::WebTab(BrowserWindow* window, LocationBar* locationBar)
setLayout(m_layout); setLayout(m_layout);
connect(m_view, SIGNAL(showNotification(QWidget*)), this, SLOT(showNotification(QWidget*))); connect(m_view, SIGNAL(showNotification(QWidget*)), this, SLOT(showNotification(QWidget*)));
connect(m_view, SIGNAL(iconChanged()), m_locationBar.data(), SLOT(siteIconChanged()));
connect(m_view, SIGNAL(loadStarted()), m_locationBar.data(), SLOT(clearIcon()));
connect(m_view, SIGNAL(loadFinished(bool)), m_locationBar.data(), SLOT(siteIconChanged()));
connect(m_view, SIGNAL(urlChanged(QUrl)), m_locationBar.data(), SLOT(showUrl(QUrl)));
connect(m_view, SIGNAL(rssChanged(bool)), m_locationBar.data(), SLOT(showRSSIcon(bool)));
connect(m_view, SIGNAL(privacyChanged(bool)), m_locationBar.data(), SLOT(setPrivacy(bool)));
connect(m_locationBar.data(), SIGNAL(loadUrl(QUrl)), m_view, SLOT(userLoadAction(QUrl)));
} }
TabbedWebView* WebTab::view() const TabbedWebView* WebTab::view() const