1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
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;}
<img src="%ABOUT-IMG%">
%PRIVATE-BROWSING%
-<form action="https://duckduckgo.com/" method="GET">
+<form action="https://duckduckgo.com/html" method="GET">
<input type="hidden" name="t" value="qupzilla" />
<input class="line" id="inp" class="question" name="q"/> <br/>
<input class="submit" type="submit" value="%BUTTON-LABEL%">
|
