diff options
| -rw-r--r-- | src/data/rekonq.desktop | 2 | ||||
| -rw-r--r-- | src/networkaccessmanager.cpp | 2 | ||||
| -rw-r--r-- | src/settings/adblockwidget.cpp | 6 | ||||
| -rw-r--r-- | src/urlbar/completionwidget.cpp | 9 | ||||
| -rw-r--r-- | src/urlbar/urlbar.cpp | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop index 109b5505..19ea9dd2 100644 --- a/src/data/rekonq.desktop +++ b/src/data/rekonq.desktop @@ -2,6 +2,7 @@ Name=rekonq Name[cs]=rekonq Name[da]=rekonq +Name[it]=rekonq Name[nds]=Rekonq Name[pt]=rekonq Name[pt_BR]=rekonq @@ -11,6 +12,7 @@ Name[x-test]=xxrekonqxx GenericName=Webkit KDE Browser GenericName[cs]=Prohlížeč pro KDE založený na Webkitu GenericName[da]=KDE-browser baseret på Webkit +GenericName[it]=Browser per KDE basato su Webkit GenericName[nds]=Webkit-KDE-Kieker GenericName[pt]=Navegador do KDE usando o WebKit GenericName[pt_BR]=Navegador Webkit do KDE diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index e1d2e6eb..4aa2488a 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -97,7 +97,7 @@ QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operat if(!reply) reply = AccessManager::createRequest(op, req, outgoingData); - if(parentPage->hasNetworkAnalyzerEnabled()) + if(parentPage && parentPage->hasNetworkAnalyzerEnabled()) emit networkData( op, req, reply ); return reply; diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp index 412f03d9..a703fe09 100644 --- a/src/settings/adblockwidget.cpp +++ b/src/settings/adblockwidget.cpp @@ -108,6 +108,9 @@ void AdBlockWidget::load() { bool isAdBlockEnabled = ReKonfig::adBlockEnabled(); checkEnableAdblock->setChecked(isAdBlockEnabled); + // update enabled status + checkHideAds->setEnabled(checkEnableAdblock->isChecked()); + tabWidget->setEnabled(checkEnableAdblock->isChecked()); bool areImageFiltered = ReKonfig::hideAdsEnabled(); checkHideAds->setChecked(areImageFiltered); @@ -181,6 +184,9 @@ void AdBlockWidget::save() void AdBlockWidget::hasChanged() { + // update enabled status + checkHideAds->setEnabled(checkEnableAdblock->isChecked()); + tabWidget->setEnabled(checkEnableAdblock->isChecked()); _changed = true; emit changed(true); } diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index b19b163e..9a5c9432 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -85,7 +85,14 @@ void CompletionWidget::insertSearchList(const UrlSearchList &list, const QString void CompletionWidget::sizeAndPosition() { setFixedWidth(_parent->width()); - adjustSize(); + + int h=0; + for (int i = 0; i < layout()->count(); i++) + { + QWidget *widget = layout()->itemAt(i)->widget(); + h += widget->sizeHint().height(); + } + setFixedSize(_parent->width(),h+5); // position QPoint p = _parent->mapToGlobal(QPoint(0, 0)); diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index d2992c4d..06d281e1 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -402,7 +402,7 @@ void UrlBar::detectTypedString(const QString &typed) if(_suggestionTimer->isActive()) _suggestionTimer->stop(); - _suggestionTimer->start(150); + _suggestionTimer->start(50); } |