summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/protocolhandler.cpp12
-rw-r--r--src/settings/settings_webkit.ui2
-rw-r--r--src/settings/settingsdialog.cpp2
-rw-r--r--src/urlbar/rsswidget.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index c97bc475..b88f23fa 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -213,20 +213,20 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
}
KFileItem mainItem = _lister->rootItem();
- KUrl rootUrl = mainItem.url();
-
if (mainItem.isNull())
{
- QString errStr = i18nc("%1=an URL", "Error opening '%1': No such file or directory.", rootUrl.prettyUrl() );
+ QString errStr = i18nc("%1=an URL", "Error opening '%1': No such file or directory.", _url.prettyUrl() );
return errStr;
}
-
+
if (!mainItem.isReadable())
{
- QString errStr = i18nc("%1=an URL", "Unable to read %1", rootUrl.prettyUrl() );
+ QString errStr = i18nc("%1=an URL", "Unable to read %1", _url.prettyUrl() );
return errStr;
}
+ KUrl rootUrl = mainItem.url();
+
// display "rekonq info" page
QString infoFilePath = KStandardDirs::locate("data", "rekonq/htmls/rekonqinfo.html");
QFile file(infoFilePath);
@@ -292,7 +292,7 @@ QString ProtocolHandler::dirHandling(const KFileItemList &list)
void ProtocolHandler::showResults(const KFileItemList &list)
{
- if(_lister->rootItem().isFile())
+ if(!_lister->rootItem().isNull() && _lister->rootItem().isReadable() && _lister->rootItem().isFile())
{
WebPage *page = qobject_cast<WebPage *>( _frame->page() );
page->downloadUrl( _lister->rootItem().url() );
diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui
index f2e616c8..55f34ab3 100644
--- a/src/settings/settings_webkit.ui
+++ b/src/settings/settings_webkit.ui
@@ -47,7 +47,7 @@
<item row="1" column="0">
<widget class="QCheckBox" name="kcfg_dnsPrefetch">
<property name="text">
- <string>prefetch DNS entries</string>
+ <string>Prefetch DNS entries</string>
</property>
</widget>
</item>
diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 2f52a8c2..d01b5809 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -175,7 +175,7 @@ SettingsDialog::~SettingsDialog()
void SettingsDialog::setWebSettingsToolTips()
{
d->webkitUi.kcfg_autoLoadImages->setToolTip(i18n("Specifies whether images are automatically loaded in web pages."));
- d->webkitUi.kcfg_dnsPrefetch->setToolTip( i18n("Specifies whether WebKit will try to pre-fetch DNS entries to speed up browsing.") );
+ d->webkitUi.kcfg_dnsPrefetch->setToolTip( i18n("Specifies whether WebKit will try to prefetch DNS entries to speed up browsing.") );
d->webkitUi.kcfg_javascriptEnabled->setToolTip(i18n("Enables the execution of JavaScript programs."));
d->webkitUi.kcfg_javaEnabled->setToolTip(i18n("Enables support for Java applets."));
d->webkitUi.kcfg_pluginsEnabled->setToolTip(i18n("Enables support for plugins in web pages."));
diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp
index 16e52ccf..62275a84 100644
--- a/src/urlbar/rsswidget.cpp
+++ b/src/urlbar/rsswidget.cpp
@@ -55,7 +55,7 @@ RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
QLabel *agregator = new QLabel(this);
- agregator->setText(i18n("Agregator"));
+ agregator->setText(i18n("Aggregator:"));
m_agregators = new KComboBox(this);
m_agregators->addItem(KIcon("application-rss+xml"), QString("Akregator"));
@@ -65,7 +65,7 @@ RSSWidget::RSSWidget(QMap< KUrl, QString > map, QWidget *parent)
QLabel *feed = new QLabel(this);
- feed->setText(i18n("Feed"));
+ feed->setText(i18n("Feed:"));
m_feeds = new KComboBox(this);
foreach(QString title, m_map)