From 4a8dd8c493a590ccebb802f522528a0039d8c468 Mon Sep 17 00:00:00 2001
From: Lionel Chauvin <megabigbug@yahoo.fr>
Date: Mon, 14 Feb 2011 22:34:34 +0100
Subject: Replace webshorcuts icons and text.

Text: webshortcuts ---> search engines
Icon: web-browser-shorctus ---> edit-web-search

Reviewed by adjam
---
 src/settings/settingsdialog.cpp  | 9 +++++++--
 src/urlbar/urlbar.cpp            | 9 ++++++++-
 src/urlbar/webshortcutwidget.cpp | 8 +++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp
index 4a8776ad..84c6da12 100644
--- a/src/settings/settingsdialog.cpp
+++ b/src/settings/settingsdialog.cpp
@@ -130,8 +130,13 @@ Private::Private(SettingsDialog *parent)
     // -- 8
     KCModuleInfo ebrowsingInfo("ebrowsing.desktop");
     ebrowsingModule = new KCModuleProxy(ebrowsingInfo, parent);
-    pageItem = parent->addPage(ebrowsingModule, i18n(ebrowsingInfo.moduleName().toUtf8()));
-    pageItem->setIcon(KIcon(ebrowsingInfo.icon()));
+    pageItem = parent->addPage(ebrowsingModule, i18n("Search engines"));
+    KIcon wsIcon("edit-web-search");
+    if (wsIcon.isNull())
+    {
+        wsIcon = KIcon("preferences-web-browser-shortcuts");
+    }
+    pageItem->setIcon(wsIcon);
 
     // WARNING 
     // remember wheh changing here that the smallest netbooks
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index f963be07..c0edc9df 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -453,9 +453,16 @@ IconButton *UrlBar::addRightIcon(UrlBar::icon ic)
         }
         break;
     case UrlBar::SearchEngine:
-        rightIcon->setIcon(KIcon("preferences-web-browser-shortcuts"));
+    {
+        KIcon wsIcon("edit-web-search");
+        if (wsIcon.isNull())
+        {
+            wsIcon = KIcon("preferences-web-browser-shortcuts");
+        }
+        rightIcon->setIcon(wsIcon);
         rightIcon->setToolTip(i18n("Add search engine"));
         break;
+    }
     default:
         kDebug() << "ERROR.. default non extant case!!";
         break;
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index 629e7fb2..2637efc7 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -42,7 +42,13 @@ WebShortcutWidget::WebShortcutWidget(QWidget *parent)
     QHBoxLayout *titleLayout = new QHBoxLayout();
     mainLayout->addLayout(titleLayout);
     QLabel *iconLabel = new QLabel(this);
-    KIcon wsIcon("preferences-web-browser-shortcuts");
+
+    KIcon wsIcon("edit-web-search");
+    if (wsIcon.isNull())
+    {
+        wsIcon = KIcon("preferences-web-browser-shortcuts");
+    }
+
     iconLabel->setPixmap(wsIcon.pixmap(22, 22));
     titleLayout->addWidget(iconLabel);
     m_searchTitleLabel = new QLabel(i18n("Add Search Engine"), this);
-- 
cgit v1.2.1