summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:30:26 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-08-20 19:30:26 +0200
commitaa05bd3973a2f39f50c14314840f0fe078f16444 (patch)
treedd21ae094321ca9f0b803379ad7e93a6b065ec10 /src/data
parentbk toolbar by default for the next rekonq. (diff)
parentChange from QByteArray to QString in the right way (diff)
downloadrekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz
Merge branch 'opensearch'
Conflicts: src/CMakeLists.txt src/urlbar/urlresolver.cpp
Diffstat (limited to 'src/data')
-rw-r--r--src/data/CMakeLists.txt11
-rw-r--r--src/data/google.xml9
2 files changed, 20 insertions, 0 deletions
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index 5f0ac164..ed1ada34 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,3 +1,4 @@
+# image files
INSTALL(
FILES
bg2.png bg.png tile.gif category.png button.png
@@ -6,20 +7,30 @@ INSTALL(
DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics
)
+# default bookmarks
INSTALL(
FILES
defaultbookmarks.xbel
DESTINATION ${DATA_INSTALL_DIR}/rekonq
)
+# .desktop file
INSTALL(
FILES rekonq.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
+# htmls
INSTALL(
FILES
rekonqinfo.html
home.html
DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
)
+
+# opensearch engines
+INSTALL(
+ FILES
+ google.xml
+ DESTINATION ${DATA_INSTALL_DIR}/rekonq/opensearch
+)
diff --git a/src/data/google.xml b/src/data/google.xml
new file mode 100644
index 00000000..622a0737
--- /dev/null
+++ b/src/data/google.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+ <ShortName>Google</ShortName>
+ <Description>Google Web Search</Description>
+ <Url method="get" type="text/html" template="http://www.google.com/search?hl={language}&amp;lr=lang_{language}&amp;q={searchTerms}"/>
+ <Url method="get" type="application/x-suggestions+json" template="http://suggestqueries.google.com/complete/search?json=t&amp;hl={language}&amp;q={searchTerms}&amp;nolabels=t"/>
+ <Image width="16" height="16">http://www.google.com/favicon.ico</Image>
+</OpenSearchDescription>
+