diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index 72ae7d4..cb42795 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -55,8 +55,8 @@ SearchEnginesManager::SearchEnginesManager() { Settings settings; settings.beginGroup("SearchEngines"); - m_startingEngineName = settings.value("activeEngine", "Google").toString(); - m_defaultEngineName = settings.value("DefaultEngine", "Google").toString(); + m_startingEngineName = settings.value("activeEngine", "DuckDuckGo HTML").toString(); + m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo HTML").toString(); settings.endGroup(); connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave())); @@ -126,13 +126,6 @@ QUrl SearchEnginesManager::searchUrl(const QString &string) void SearchEnginesManager::restoreDefaults() { - Engine google; - google.name = "Google"; - google.icon = QIcon(":icons/sites/google.png"); - google.url = "http://www.google.com/search?client=qupzilla&q=%s"; - google.shortcut = "g"; - google.suggestionsUrl = "http://suggestqueries.google.com/complete/search?output=firefox&q=%s"; - Engine wiki; wiki.name = "Wikipedia (en)"; wiki.icon = QIcon(":/icons/sites/wikipedia.png"); @@ -140,25 +133,16 @@ void SearchEnginesManager::restoreDefaults() wiki.shortcut = "w"; wiki.suggestionsUrl = "http://en.wikipedia.org/w/api.php?action=opensearch&search=%s&namespace=0"; - Engine yt; - yt.name = "YouTube"; - yt.icon = QIcon(":/icons/sites/youtube.png"); - yt.url = "http://www.youtube.com/results?search_query=%s&search=Search"; - yt.shortcut = "yt"; - yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s"; - Engine duck; - duck.name = "DuckDuckGo"; + duck.name = "DuckDuckGo HTML"; duck.icon = QIcon(":/icons/sites/duck.png"); - duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; + duck.url = "https://duckduckgo.com/html/?q=%s&t=qupzilla"; duck.shortcut = "d"; - addEngine(google); addEngine(wiki); - addEngine(yt); addEngine(duck); - m_defaultEngine = google; + m_defaultEngine = duck; emit enginesChanged(); } diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp index 2039921..52afa22 100644 --- a/src/lib/plugins/speeddial.cpp +++ b/src/lib/plugins/speeddial.cpp @@ -54,11 +54,10 @@ void SpeedDial::loadSettings() settings.endGroup(); if (allPages.isEmpty()) { - allPages = "url:\"http://www.google.com\"|title:\"Google\";" + allPages = "url:\"https://duckduckgo.com/html\"|title:\"DuckDuckGo HTML\";" "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";" "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";" - "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";" - "url:\"https://facebook.com\"|title:\"Facebook\";"; + "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"; } changed(allPages); diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html index 0e48ed2..eb7d793 100644 --- a/src/lib/data/html/start.html +++ b/src/lib/data/html/start.html @@ -19,7 +19,7 @@ a {color: #1a4ba4;text-decoration: none;font-weight: bold;} %PRIVATE-BROWSING% -
+