summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/listitem.cpp11
-rw-r--r--src/urlbar/listitem.h2
-rw-r--r--src/urlbar/sslwidget.cpp4
-rw-r--r--src/urlbar/sslwidget.h2
4 files changed, 11 insertions, 8 deletions
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index d285e395..d3e95ef3 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -309,7 +309,7 @@ DescriptionLabel::DescriptionLabel(const QString &text, QWidget *parent)
if (wasItalic)
t = QL1S("<i>") + t + QL1S("</i>");
- setWordWrap(false); //TODO: why setWordWrap(true) make items have a strange behavior ?
+ setWordWrap(false); //NOTE: why setWordWrap(true) make items have a strange behavior ?
setText(t);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
}
@@ -451,8 +451,11 @@ QString SearchListItem::text()
void SearchListItem::changeSearchEngine(KService::Ptr engine)
{
- UrlResolver::setSearchEngine(engine);
- emit updateList();
+ // NOTE: This to let rekonq loading text typed in the requested engine on click.
+ // There probably is a better way to do it. I just cannot see it now...
+ UrlSearchItem item = UrlSearchItem(UrlSearchItem::Search, SearchEngine::buildQuery(engine, m_text), m_text);
+ SearchListItem sItem(item, m_text, this);
+ emit itemClicked(&sItem, Qt::LeftButton, Qt::NoModifier);
}
diff --git a/src/urlbar/listitem.h b/src/urlbar/listitem.h
index 1768438a..c2f79c93 100644
--- a/src/urlbar/listitem.h
+++ b/src/urlbar/listitem.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 4dd5a4bf..127dae86 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -112,7 +112,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
label = new QLabel(this);
label->setWordWrap(true);
- label->setText(QL1S("\"<a href=\"moresslinfos\">") + i18n("Certificate Information") + QL1S("</a>"));
+ label->setText(QL1S("<a href=\"moresslinfos\">") + i18n("Certificate Information") + QL1S("</a>"));
connect(label, SIGNAL(linkActivated(QString)), this, SLOT(showMoreSslInfos(QString)));
layout->addWidget(label, rows++, 1);
}
diff --git a/src/urlbar/sslwidget.h b/src/urlbar/sslwidget.h
index 94f0494a..bc1e2291 100644
--- a/src/urlbar/sslwidget.h
+++ b/src/urlbar/sslwidget.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or