From a86522cb83ed2f665161f507531f07dc6437e13f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 31 Oct 2008 17:30:37 +0100 Subject: Various improvements on the street from Qt demo browser to KDE reKonq! - CMakeLists.txt working - data dirs - ... --- data/CMakeLists.txt | 5 + data/browser.svg | 1598 ++++++++++++++++++++++++++++++++++++++++++++ data/defaultbookmarks.xbel | 40 ++ data/loading.gif | Bin 0 -> 847 bytes 4 files changed, 1643 insertions(+) create mode 100644 data/CMakeLists.txt create mode 100644 data/browser.svg create mode 100644 data/defaultbookmarks.xbel create mode 100644 data/loading.gif (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 00000000..2882b681 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( FILES + defaultbookmarks.xbel + loading.gif + DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics +) diff --git a/data/browser.svg b/data/browser.svg new file mode 100644 index 00000000..c42af2bc --- /dev/null +++ b/data/browser.svg @@ -0,0 +1,1598 @@ + + + \ No newline at end of file diff --git a/data/defaultbookmarks.xbel b/data/defaultbookmarks.xbel new file mode 100644 index 00000000..f1c9253d --- /dev/null +++ b/data/defaultbookmarks.xbel @@ -0,0 +1,40 @@ + + + + + Bookmarks Bar + + Trolltech.com + + + WebKit.org + + + Qt Documentation + + + Qt Quarterly + + + Trolltech Labs + + + Qt Centre + + + Qt-Apps.org + + + qtnode + + + xkcd + + + + Bookmarks Menu + + reddit.com: what's new online! + + + diff --git a/data/loading.gif b/data/loading.gif new file mode 100644 index 00000000..c1545eb0 Binary files /dev/null and b/data/loading.gif differ -- cgit v1.2.1 From 16ab5690568b926f226c3144cef207d9ef59fa17 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 20 Dec 2008 23:38:00 +0100 Subject: Added .desktop file --- data/CMakeLists.txt | 5 +++++ data/rekonq.desktop | 8 ++++++++ 2 files changed, 13 insertions(+) create mode 100644 data/rekonq.desktop (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2882b681..41c9995f 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,3 +3,8 @@ INSTALL( FILES loading.gif DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics ) + +INSTALL( FILES + rekonq.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) diff --git a/data/rekonq.desktop b/data/rekonq.desktop new file mode 100644 index 00000000..4d22c75f --- /dev/null +++ b/data/rekonq.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=rekonq +GenericName=Webkit KDE Browser +Icon=rekonq +Type=Application +Exec=rekonq %u +X-DocPath=rekonq/index.html +Categories=Qt;KDE;Network; \ No newline at end of file -- cgit v1.2.1 From 85088c590ef99f9487abf2768f8084653cd4ab16 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 21 Dec 2008 00:07:53 +0100 Subject: - Added kWarning for fixed minimun size - updated TODO - upgraded .desktop file --- data/rekonq.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index 4d22c75f..126cba2a 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -5,4 +5,4 @@ Icon=rekonq Type=Application Exec=rekonq %u X-DocPath=rekonq/index.html -Categories=Qt;KDE;Network; \ No newline at end of file +Categories=Qt;KDE;Network; -- cgit v1.2.1 From 9e7f74269e25062a33af0a2603bf258cd4b228e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 29 Dec 2008 01:52:07 +0100 Subject: Ported from KMainWindow to KXmlGuiWindow. Yeah! .. --- data/rekonq.desktop | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index 126cba2a..5a93f099 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -3,6 +3,8 @@ Name=rekonq GenericName=Webkit KDE Browser Icon=rekonq Type=Application -Exec=rekonq %u -X-DocPath=rekonq/index.html +Exec=rekonq %i +DocPath=rekonq/index.html Categories=Qt;KDE;Network; +Terminal=0 + -- cgit v1.2.1 From 4150695c5fff0504cf19ad74b3f185bd67397497 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 16 Feb 2009 00:06:28 +0100 Subject: new singleton Application class. Try 1.. --- data/rekonq.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index 5a93f099..a2aeca1b 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -7,4 +7,4 @@ Exec=rekonq %i DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 - +X-DBUS-StartupType=Unique -- cgit v1.2.1 From 11f03d149e9aecbe216400b754456372fc80d1bb Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 19 Mar 2009 01:15:07 +0100 Subject: Fixed slackbuild with right slack-desc --- data/slack-desc | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 data/slack-desc (limited to 'data') diff --git a/data/slack-desc b/data/slack-desc new file mode 100644 index 00000000..3136b228 --- /dev/null +++ b/data/slack-desc @@ -0,0 +1,12 @@ + |-------------------------------------------------------------------| +rekonq: rekonq (Webkit KDE Browser) +rekonq: +rekonq: rekonq is a lightweight KDE browser based on webkit +rekonq: +rekonq: +rekonq: +rekonq: +rekonq: +rekonq: +rekonq: +rekonq: -- cgit v1.2.1 From 05c60e11930e7fc969246336b2a121afbf6589d7 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 19 Mar 2009 01:28:43 +0100 Subject: updated TODO, removed unuseful svg image, updated default bookmarks --- data/browser.svg | 1598 -------------------------------------------- data/defaultbookmarks.xbel | 35 +- 2 files changed, 10 insertions(+), 1623 deletions(-) delete mode 100644 data/browser.svg (limited to 'data') diff --git a/data/browser.svg b/data/browser.svg deleted file mode 100644 index c42af2bc..00000000 --- a/data/browser.svg +++ /dev/null @@ -1,1598 +0,0 @@ - - - \ No newline at end of file diff --git a/data/defaultbookmarks.xbel b/data/defaultbookmarks.xbel index f1c9253d..4cad6c78 100644 --- a/data/defaultbookmarks.xbel +++ b/data/defaultbookmarks.xbel @@ -1,40 +1,25 @@ - - Bookmarks Bar - - Trolltech.com + + Default Bookmark + + QtSoftware WebKit.org - - Qt Documentation - - - Qt Quarterly + + rekonq site Trolltech Labs - - Qt Centre - - - Qt-Apps.org - - - qtnode + + KDE-Apps.org - - xkcd - - - - Bookmarks Menu - - reddit.com: what's new online! + + KDE site -- cgit v1.2.1 From 30a122c20971ebe638ea5763cccd8adbdb8b3307 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 22 Mar 2009 11:33:18 +0100 Subject: Fixing loading of konqueror bookmarks in a unusual place or missing.. --- data/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 41c9995f..4a17e30d 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,9 +1,13 @@ INSTALL( FILES - defaultbookmarks.xbel loading.gif DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics ) +INSTALL( FILES + defaultbookmarks.xbel + DESTINATION ${DATA_INSTALL_DIR}/rekonq +) + INSTALL( FILES rekonq.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} -- cgit v1.2.1 From 98fc1dc5406c3d4f191f899154eda1b0fa144d1a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 22 Mar 2009 12:09:30 +0100 Subject: update toolbar when bookmarks change. Yeah.. --- data/defaultbookmarks.xbel | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/defaultbookmarks.xbel b/data/defaultbookmarks.xbel index 4cad6c78..b4919c5c 100644 --- a/data/defaultbookmarks.xbel +++ b/data/defaultbookmarks.xbel @@ -1,25 +1,22 @@ - - Default Bookmark - - QtSoftware - - - WebKit.org - - - rekonq site - - - Trolltech Labs - - - KDE-Apps.org - - - KDE site - - + + QtSoftware + + + WebKit.org + + + rekonq site + + + Trolltech Labs + + + KDE-Apps.org + + + KDE site + -- cgit v1.2.1 From 08d4252602a3f18f7faa28aad11786cbba94b199 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 25 Mar 2009 01:19:51 +0100 Subject: keep house in order.. --- data/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 4a17e30d..6652b921 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -12,3 +12,8 @@ INSTALL( FILES rekonq.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) + +INSTALL( FILES + notfound.html + DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls +) -- cgit v1.2.1 From b8a008392dc11622224d6ab192febfe9fd5bc80f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 25 Mar 2009 01:25:23 +0100 Subject: pedantic.. --- data/notfound.html | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 data/notfound.html (limited to 'data') diff --git a/data/notfound.html b/data/notfound.html new file mode 100644 index 00000000..09039eb1 --- /dev/null +++ b/data/notfound.html @@ -0,0 +1,66 @@ + + + +%1 + + + +

%3

When connecting to: %4.

Check the address for errors such as ww.kde.org + instead of www.kde.org
If the address is correct, try to check the network + connection.
If your computer or network is protected by a firewall or + proxy, make sure that rekonq is permitted to access + the network.
Of course, if rekonq doesn't work properly, you can always + say it's a programmer error ;)

+

+

+ + -- cgit v1.2.1 From 651f97d0652e90ab1af4e80418f42468cc5932e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 23:46:38 +0100 Subject: pedantic --- data/rekonq.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index a2aeca1b..2e9995dc 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -3,7 +3,7 @@ Name=rekonq GenericName=Webkit KDE Browser Icon=rekonq Type=Application -Exec=rekonq %i +Exec=rekonq %u DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 -- cgit v1.2.1 From 98f53721514116b876d18bf0a2da89d2a53cc97d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:05:45 +0100 Subject: Revert "pedantic" Too much things committed a time.. This reverts commit 651f97d0652e90ab1af4e80418f42468cc5932e2. --- data/rekonq.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index 2e9995dc..a2aeca1b 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -3,7 +3,7 @@ Name=rekonq GenericName=Webkit KDE Browser Icon=rekonq Type=Application -Exec=rekonq %u +Exec=rekonq %i DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 -- cgit v1.2.1 From 08deb6b161ef0cdda7ed8e49870b16f41d78eb4e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:13:01 +0100 Subject: Revert "Revert "pedantic"" Reapplied previous changes. Sorry for confusion. Time to bed.. This reverts commit 98f53721514116b876d18bf0a2da89d2a53cc97d. --- data/rekonq.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index a2aeca1b..2e9995dc 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -3,7 +3,7 @@ Name=rekonq GenericName=Webkit KDE Browser Icon=rekonq Type=Application -Exec=rekonq %i +Exec=rekonq %u DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 -- cgit v1.2.1 From fb023c2a61537aba8684ec06aad76b206ce08440 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 07:43:05 +0200 Subject: DBUS service name --- data/rekonq.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index 2e9995dc..df150fee 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -8,3 +8,4 @@ DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 X-DBUS-StartupType=Unique +X-DBUS-ServiceName=net.sourceforge.rekonq -- cgit v1.2.1 From a532b2d4db46d4dc4fa1414938cf105729b98a8f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 17 Apr 2009 10:49:09 +0200 Subject: Updated desktop file --- data/rekonq.desktop | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/rekonq.desktop b/data/rekonq.desktop index df150fee..599e81ee 100644 --- a/data/rekonq.desktop +++ b/data/rekonq.desktop @@ -4,8 +4,9 @@ GenericName=Webkit KDE Browser Icon=rekonq Type=Application Exec=rekonq %u -DocPath=rekonq/index.html +X-DocPath=rekonq/index.html Categories=Qt;KDE;Network; Terminal=0 +MimeType=text/html;application/xhtml+xml;application/xml; X-DBUS-StartupType=Unique X-DBUS-ServiceName=net.sourceforge.rekonq -- cgit v1.2.1 From 7f3743e6359d492dec7def64a701b0153b65f11c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 17 Apr 2009 11:45:42 +0200 Subject: Added webkit icon --- data/CMakeLists.txt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 6652b921..e4535e07 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,19 +1,24 @@ -INSTALL( FILES - loading.gif +INSTALL( + FILES loading.gif DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics ) -INSTALL( FILES - defaultbookmarks.xbel +INSTALL( + FILES defaultbookmarks.xbel DESTINATION ${DATA_INSTALL_DIR}/rekonq ) -INSTALL( FILES - rekonq.desktop +INSTALL( + FILES rekonq.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -INSTALL( FILES - notfound.html +INSTALL( + FILES notfound.html DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls ) + +INSTALL( + FILES webkit-icon.png + DESTINATION ${DATA_INSTALL_DIR}/rekonq/pics +) \ No newline at end of file -- cgit v1.2.1 From 0f95f7e18ede46c1f88cd0d68c70660807742d65 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 17 Apr 2009 12:06:14 +0200 Subject: Forgotted webkit icon added ;) --- data/webkit-icon.png | Bin 0 -> 25872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/webkit-icon.png (limited to 'data') diff --git a/data/webkit-icon.png b/data/webkit-icon.png new file mode 100644 index 00000000..77096335 Binary files /dev/null and b/data/webkit-icon.png differ -- cgit v1.2.1 From 6d1c5affbba08fb423d5ab4a22b2f57f73bbb66b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 3 May 2009 17:14:30 +0200 Subject: removed webkit icon because of problems with git svn --- data/webkit-icon.png | Bin 25872 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data/webkit-icon.png (limited to 'data') diff --git a/data/webkit-icon.png b/data/webkit-icon.png deleted file mode 100644 index 77096335..00000000 Binary files a/data/webkit-icon.png and /dev/null differ -- cgit v1.2.1 From 87027b4089c3de5fe6f740c90259ca87f4bbae0b Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 3 May 2009 17:15:34 +0200 Subject: Revert "removed webkit icon because of problems with git svn" Don't do this on master.. This reverts commit 6d1c5affbba08fb423d5ab4a22b2f57f73bbb66b. --- data/webkit-icon.png | Bin 0 -> 25872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/webkit-icon.png (limited to 'data') diff --git a/data/webkit-icon.png b/data/webkit-icon.png new file mode 100644 index 00000000..77096335 Binary files /dev/null and b/data/webkit-icon.png differ -- cgit v1.2.1 From 8af3be9f28c2f87230bea7a084544b7b6a8ecfeb Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 3 May 2009 17:18:53 +0200 Subject: Modified webkit icon --- data/webkit-icon.png | Bin 25872 -> 25694 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'data') diff --git a/data/webkit-icon.png b/data/webkit-icon.png index 77096335..b3ec677a 100644 Binary files a/data/webkit-icon.png and b/data/webkit-icon.png differ -- cgit v1.2.1