diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
commit | a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch) | |
tree | 0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /src/data | |
parent | Merge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff) | |
parent | KIO download system (diff) | |
download | rekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz |
FIxing conflicts
Merge branch 'rekonq04' into dev04try
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/data')
-rw-r--r-- | src/data/CMakeLists.txt | 19 | ||||
-rw-r--r-- | src/data/bg.png | bin | 0 -> 15218 bytes | |||
-rw-r--r-- | src/data/bg2.png | bin | 0 -> 1898 bytes | |||
-rw-r--r-- | src/data/bot.gif | bin | 0 -> 644 bytes | |||
-rw-r--r-- | src/data/busywidget.gif | bin | 0 -> 11611 bytes | |||
-rw-r--r-- | src/data/button.png | bin | 0 -> 740 bytes | |||
-rw-r--r-- | src/data/category.png | bin | 0 -> 334 bytes | |||
-rw-r--r-- | src/data/closed.png | bin | 0 -> 118 bytes | |||
-rw-r--r-- | src/data/defaultbookmarks.xbel | 22 | ||||
-rw-r--r-- | src/data/home.html | 157 | ||||
-rw-r--r-- | src/data/loading.mng | bin | 0 -> 3332 bytes | |||
-rw-r--r-- | src/data/notfound.html | 65 | ||||
-rw-r--r-- | src/data/open.png | bin | 0 -> 120 bytes | |||
-rw-r--r-- | src/data/rekonq.desktop | 24 | ||||
-rw-r--r-- | src/data/tile.gif | bin | 0 -> 304 bytes | |||
-rw-r--r-- | src/data/top.png | bin | 0 -> 786 bytes | |||
-rw-r--r-- | src/data/webkit-icon.png | bin | 0 -> 25694 bytes |
17 files changed, 287 insertions, 0 deletions
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt new file mode 100644 index 00000000..bf01a44d --- /dev/null +++ b/src/data/CMakeLists.txt @@ -0,0 +1,19 @@ +INSTALL( + FILES bg2.png bg.png bot.gif busywidget.gif closed.png loading.mng open.png tile.gif top.png webkit-icon.png category.png button.png + DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics +) + +INSTALL( + FILES defaultbookmarks.xbel + DESTINATION ${DATA_INSTALL_DIR}/rekonq +) + +INSTALL( + FILES rekonq.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +INSTALL( + FILES notfound.html home.html + DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls +) diff --git a/src/data/bg.png b/src/data/bg.png Binary files differnew file mode 100644 index 00000000..5ec669ac --- /dev/null +++ b/src/data/bg.png diff --git a/src/data/bg2.png b/src/data/bg2.png Binary files differnew file mode 100644 index 00000000..1ded2690 --- /dev/null +++ b/src/data/bg2.png diff --git a/src/data/bot.gif b/src/data/bot.gif Binary files differnew file mode 100644 index 00000000..2f9abde4 --- /dev/null +++ b/src/data/bot.gif diff --git a/src/data/busywidget.gif b/src/data/busywidget.gif Binary files differnew file mode 100644 index 00000000..600b9d44 --- /dev/null +++ b/src/data/busywidget.gif diff --git a/src/data/button.png b/src/data/button.png Binary files differnew file mode 100644 index 00000000..22ef7643 --- /dev/null +++ b/src/data/button.png diff --git a/src/data/category.png b/src/data/category.png Binary files differnew file mode 100644 index 00000000..796875d4 --- /dev/null +++ b/src/data/category.png diff --git a/src/data/closed.png b/src/data/closed.png Binary files differnew file mode 100644 index 00000000..2b1bf01e --- /dev/null +++ b/src/data/closed.png diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel new file mode 100644 index 00000000..b4919c5c --- /dev/null +++ b/src/data/defaultbookmarks.xbel @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE xbel> +<xbel version="1.0"> + <bookmark href="http://qtsoftware.com/"> + <title>QtSoftware</title> + </bookmark> + <bookmark href="http://webkit.org/"> + <title>WebKit.org</title> + </bookmark> + <bookmark href="http://rekonq.sourceforge.net/"> + <title>rekonq site</title> + </bookmark> + <bookmark href="http://labs.trolltech.com/"> + <title>Trolltech Labs</title> + </bookmark> + <bookmark href="http://kde-apps.org/"> + <title>KDE-Apps.org</title> + </bookmark> + <bookmark href="http://www.kde.org/"> + <title>KDE site</title> + </bookmark> +</xbel> diff --git a/src/data/home.html b/src/data/home.html new file mode 100644 index 00000000..f99d0df1 --- /dev/null +++ b/src/data/home.html @@ -0,0 +1,157 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + +<head> +<title>%1</title> + +<style type="text/css"> + +/* ------------------------------------------------------- */ +/* generic styles */ + +html, body, div, h1, h2, h3, h4, a, p{ +margin:0; +padding:0; +border:0; +} + +body{ +background: url(%2/tile.gif) repeat-x #fff; +font-family: sans-serif; +font-size: 0.8em; +text-align: center; +} + +h1{ +font: normal bold 2em sans-serif; +text-align:right; +color: #3F7AB7; +margin-right:3%; +margin-top: 0.5%; +float:right; +} + +h2{ +font: normal bold 1.2em sans-serif; +color: #3F7AB7; +margin-top: 2em; +} + +h3{ +border-bottom-width: 1px; +-webkit-border-image: url(%2/category.png) 1 1 1 1 stretch stretch; +padding: 0.2em; +margin-top: 0.5em; +margin-bottom: 0.5em; +font: normal bold 1em sans-serif; +} + +h4{ +font-size: 1em; +margin-top: 0.5em; +} + +a{ +color: #3F7AB7; +text-decoration: none; +} +a:hover{ +color: black; +} + +/* ------------------------------------------------------- */ +/* page sections */ + +#container { +width: 100%; +} + +#navigation { +display: inline-block; +margin-top: 2%; +margin-bottom: 2%; +text-align: center; +border-width: 5px; +-webkit-border-image: url(%2/bg2.png) 12 12 12 12 stretch stretch; +} + +#content { +text-align: left; +margin: 2%; +} + +/* -------------------------------------------------------- */ +/* div navigations styles */ + +.link{ +display: inline-block; +} + +.link img{ +vertical-align: middle; +margin-right: 5px; +} + +.link a{ +color: black; +text-decoration:none; +font: normal 1em sans-serif; +} + +.current{ +border-width: 6px; +-webkit-border-image: url(%2/button.png) 6 stretch stretch; +} + +#navigation .link:not(.current){ +margin-right: 10px; +margin-left: 10px; +} + + +.favorites{ +text-align: center; +margin-top: -5%; +} + +/* -------------------------------------------------------- */ +/* Thumbnail class */ + +.thumbnail { +text-align: center; +display: inline-block; +width:25%; +margin-top: 7%; +min-width:250px; +min-height:192px; +} + +.thumbnail object{ +text-align: center; +width:228px; +height:192px; +} + +/* -------------------------------------------------------- */ +/* Bookmarks page*/ + +.bookfolder{ +margin-left: 2em; +margin-bottom: 0.5em; +} + +/* -------------------------------------------------------- */ +</style> +</head> + +<body> + +<div id="container"> +<div id="navigation"> +%3 +</div> +<div id="content">%4</div> +</div> + +</body> +</html> diff --git a/src/data/loading.mng b/src/data/loading.mng Binary files differnew file mode 100644 index 00000000..0e490c4b --- /dev/null +++ b/src/data/loading.mng diff --git a/src/data/notfound.html b/src/data/notfound.html new file mode 100644 index 00000000..e34bfc6d --- /dev/null +++ b/src/data/notfound.html @@ -0,0 +1,65 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> +<head> +<title>%1</title> + +<style type="text/css"> + +html{ +margin:0; +padding:0; +} + +body{ +background: url(%2/tile.gif) repeat-x #fff; +margin:0; +padding:0; +font-family: sans-serif; +font-size: 100%; +} + +#block { +/* background: url(%2/bot.gif) bottom center #f3f3f3; */ +border: 2px solid #d9d9d9; +padding: 10px; +width: 600px; +margin: 150px auto; +color: #444; + +/*font-weight: bold; +clear: right;*/ +} + +h1{ +font-size: 130%; +font-weight: bold; +border-bottom: 1px solid lightgray; +margin-left: 48px; +} + +h2{ +font-size: 100%; +font-weight: normal; +border-bottom: 1px solid lightgray; +margin-left: 48px; +} + +ul { +padding: 12px 48px; +margin: 0; +} + +#reloadButton { +margin-left: 48px; +margin-bottom: 12px; +} + +</style> + +</head> + +<body> +<div id="block">%3</div> +</body> + +</html> diff --git a/src/data/open.png b/src/data/open.png Binary files differnew file mode 100644 index 00000000..fee6f3fb --- /dev/null +++ b/src/data/open.png diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop new file mode 100644 index 00000000..62998336 --- /dev/null +++ b/src/data/rekonq.desktop @@ -0,0 +1,24 @@ +[Desktop Entry] +Name=rekonq +Name[sv]=Rekonq +Name[tr]=Rekonq +Name[x-test]=xxrekonqxx +GenericName=Webkit KDE Browser +GenericName[de]=Webkit-Browser für KDE +GenericName[et]=KDE Webkiti veebibrauser +GenericName[km]=កម្មវិធីរុករក Webkit KDE +GenericName[pt]=Navegador Web com WebKit +GenericName[pt_BR]=Navegador Webkit do KDE +GenericName[sv]=Webkit webbläsare för KDE +GenericName[tr]=Webkit KDE Tarayıcı +GenericName[uk]=Переглядач мережі на WebKit для KDE +GenericName[x-test]=xxWebkit KDE Browserxx +Icon=rekonq +Type=Application +Exec=rekonq %u +X-DocPath=rekonq/index.html +Categories=Qt;KDE;Network;WebBrowser; +Terminal=false +MimeType=text/html;application/xhtml+xml;application/xml; +X-DBUS-StartupType=Unique +X-DBUS-ServiceName=net.sourceforge.rekonq diff --git a/src/data/tile.gif b/src/data/tile.gif Binary files differnew file mode 100644 index 00000000..32e06fff --- /dev/null +++ b/src/data/tile.gif diff --git a/src/data/top.png b/src/data/top.png Binary files differnew file mode 100644 index 00000000..9ebf0234 --- /dev/null +++ b/src/data/top.png diff --git a/src/data/webkit-icon.png b/src/data/webkit-icon.png Binary files differnew file mode 100644 index 00000000..b3ec677a --- /dev/null +++ b/src/data/webkit-icon.png |