Hello community, here is the log from the commit of package qupzilla for openSUSE:Factory checked in at 2015-03-25 21:06:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qupzilla (Old) and /work/SRC/openSUSE:Factory/.qupzilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qupzilla" Changes: -------- --- /work/SRC/openSUSE:Factory/qupzilla/qupzilla-qt5.changes 2015-01-27 09:09:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qupzilla.new/qupzilla-qt5.changes 2015-03-25 21:33:30.000000000 +0100 @@ -1,0 +2,25 @@ +Thu Mar 19 22:48:19 UTC 2015 - [email protected] + +- Added qupzilla-sendlink-fix.patch + - Fixes send link bug gh#QupZilla/qupzilla#1625 + +------------------------------------------------------------------- +Wed Mar 18 19:10:23 UTC 2015 - [email protected] + +- Regenerate qupzilla-defaults.patch to actually add + openSUSE Software and openSUSE Build Service search engines + and load its icons as well +- Add browsedata.db for the openSUSE Project bookmark icon + +------------------------------------------------------------------- +Mon Mar 16 17:47:02 UTC 2015 - [email protected] + +- Added qupzilla-defaults.patch + * Adds an openSUSE Project link to the bookmark toolbar and + speed dial as well + * Adds openSUSE Software and OBS search engines + * Hides the menu bar +- Added opensusesoftware.png and obs.png sources (favicons for + search engines) + +------------------------------------------------------------------- qupzilla.changes: same change New: ---- browsedata.db obs.png opensusesoftware.png qupzilla-defaults.patch qupzilla-sendlink-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qupzilla-qt5.spec ++++++ --- /var/tmp/diff_new_pack.Y8QBXS/_old 2015-03-25 21:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Y8QBXS/_new 2015-03-25 21:33:31.000000000 +0100 @@ -25,7 +25,16 @@ License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers Url: http://qupzilla.com/ -Source: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla-%{version}.tar.xz +Source0: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla-%{version}.tar.xz +# Search engine favicons +Source1: obs.png +Source2: opensusesoftware.png +# DB shipping openSUSE project bookmark icon +Source3: browsedata.db +# PATCH-FEATURE-OPENSUSE qupzilla-defaults.patch +Patch0: qupzilla-defaults.patch +# PATCH-FIX-UPSTREAM qupzilla-sendlink-fix.patch gh#QupZilla/qupzilla#1625 +Patch1: qupzilla-sendlink-fix.patch BuildRequires: fdupes %if %{with qt5} %if 0%{?suse_version} > 1310 @@ -112,6 +121,13 @@ # Adjust KWallet include for KF5 library sed -i 's|<KDE/KWallet/Wallet>|<KWallet>|g' src/plugins/KWalletPasswords/kwalletpasswordbackend.h %endif +# QupZilla defaults +%patch0 -p1 +# Fix for send link bug +%patch1 -p1 +# openSUSE icons +cp {%{SOURCE1},%{SOURCE2}} src/lib/data/icons/sites/ +cp %{SOURCE3} src/lib/data/data/ %build export USE_WEBGL=true ++++++ qupzilla.spec ++++++ --- /var/tmp/diff_new_pack.Y8QBXS/_old 2015-03-25 21:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Y8QBXS/_new 2015-03-25 21:33:31.000000000 +0100 @@ -25,7 +25,16 @@ License: GPL-3.0+ Group: Productivity/Networking/Web/Browsers Url: http://qupzilla.com/ -Source: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla-%{version}.tar.xz +Source0: https://github.com/QupZilla/qupzilla/releases/download/v%{version}/QupZilla-%{version}.tar.xz +# Search engine favicons +Source1: obs.png +Source2: opensusesoftware.png +# DB shipping openSUSE project bookmark icon +Source3: browsedata.db +# PATCH-FEATURE-OPENSUSE qupzilla-defaults.patch +Patch0: qupzilla-defaults.patch +# PATCH-FIX-UPSTREAM qupzilla-sendlink-fix.patch gh#QupZilla/qupzilla#1625 +Patch1: qupzilla-sendlink-fix.patch BuildRequires: fdupes %if %{with qt5} %if 0%{?suse_version} > 1310 @@ -112,6 +121,13 @@ # Adjust KWallet include for KF5 library sed -i 's|<KDE/KWallet/Wallet>|<KWallet>|g' src/plugins/KWalletPasswords/kwalletpasswordbackend.h %endif +# QupZilla defaults +%patch0 -p1 +# Fix for send link bug +%patch1 -p1 +# openSUSE icons +cp {%{SOURCE1},%{SOURCE2}} src/lib/data/icons/sites/ +cp %{SOURCE3} src/lib/data/data/ %build export USE_WEBGL=true ++++++ qupzilla-defaults.patch ++++++ diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index 2b3106e..7d2b6c5 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -455,7 +455,7 @@ void BrowserWindow::loadSettings() bool showWebSearchBar = settings.value("showWebSearchBar", true).toBool(); bool showBookmarksToolbar = settings.value("showBookmarksToolbar", true).toBool(); bool showNavigationToolbar = settings.value("showNavigationToolbar", true).toBool(); - bool showMenuBar = settings.value("showMenubar", true).toBool(); + bool showMenuBar = settings.value("showMenubar", false).toBool(); bool makeTransparent = settings.value("useTransparentBackground", false).toBool(); m_sideBarWidth = settings.value("SideBarWidth", 250).toInt(); m_webViewWidth = settings.value("WebViewWidth", 2000).toInt(); diff --git a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json index a90338d..e676486 100644 --- a/src/lib/data/data/bookmarks.json +++ b/src/lib/data/data/bookmarks.json @@ -3,11 +3,44 @@ "bookmark_bar": { "children": [ { - "description": "Source code of QupZilla", - "keyword": "qz-git", - "name": "QupZilla Git", + "description": "", + "keyword": "", + "name": "openSUSE Project", "type": "url", - "url": "https://github.com/QupZilla/qupzilla";, + "url": "https://www.opensuse.org/";, + "visit_count": 0 + }, + { + "description": "", + "keyword": "", + "name": "QupZilla", + "type": "url", + "url": "http://www.qupzilla.com/";, + "visit_count": 0 + } + ], + "description": "Bookmarks located in Bookmarks Toolbar", + "expanded": true, + "expanded_sidebar": true, + "name": "Bookmarks Toolbar", + "type": "folder" + }, + "bookmark_menu": { + "children": [ + { + "description": "QupZilla Homepage", + "keyword": "qz-home", + "name": "QupZilla Home", + "type": "url", + "url": "http://www.qupzilla.com/";, + "visit_count": 0 + }, + { + "description": "Blog with development updates", + "keyword": "qz-blog", + "name": "QupZilla Blog", + "type": "url", + "url": "http://blog.qupzilla.com/";, "visit_count": 0 }, { @@ -27,33 +60,14 @@ "visit_count": 0 }, { - "type": "separator" - }, - { - "description": "Blog with development updates", - "keyword": "qz-blog", - "name": "QupZilla Blog", - "type": "url", - "url": "http://blog.qupzilla.com/";, - "visit_count": 0 - }, - { - "description": "QupZilla Homepage", - "keyword": "qz-home", - "name": "QupZilla Home", + "description": "Source code of QupZilla", + "keyword": "qz-git", + "name": "QupZilla Git", "type": "url", - "url": "http://www.qupzilla.com/";, + "url": "https://github.com/QupZilla/qupzilla";, "visit_count": 0 - } + } ], - "description": "Bookmarks located in Bookmarks Toolbar", - "expanded": true, - "expanded_sidebar": true, - "name": "Bookmarks Toolbar", - "type": "folder" - }, - "bookmark_menu": { - "children": [], "description": "Bookmarks located in Bookmarks Menu", "expanded": true, "expanded_sidebar": true, diff --git a/src/lib/data/icons.qrc b/src/lib/data/icons.qrc index 37b9285..58c2cda 100644 --- a/src/lib/data/icons.qrc +++ b/src/lib/data/icons.qrc @@ -49,6 +49,8 @@ <file>icons/sites/google.png</file> <file>icons/sites/liferea.png</file> <file>icons/sites/netvibes.png</file> + <file>icons/sites/obs.png</file> + <file>icons/sites/opensusesoftware.png</file> <file>icons/sites/translate.png</file> <file>icons/sites/wikipedia.png</file> <file>icons/sites/yahoo.png</file> diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp index 8f9281c..c8ae2cc 100644 --- a/src/lib/opensearch/searchenginesmanager.cpp +++ b/src/lib/opensearch/searchenginesmanager.cpp @@ -191,11 +191,27 @@ void SearchEnginesManager::restoreDefaults() 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 oSSoftware; + oSSoftware.name = "openSUSE Software"; + oSSoftware.icon = QIcon(":icons/sites/opensusesoftware.png"); + oSSoftware.url = "http://software.opensuse.org/search?q=%s";; + oSSoftware.shortcut = "s"; + oSSoftware.suggestionsUrl = ""; + + Engine obs; + obs.name = "openSUSE Build Service"; + obs.icon = QIcon(":icons/sites/obs.png"); + obs.url = "https://build.opensuse.org/search?search_text=%s";; + obs.shortcut = "rpm"; + obs.suggestionsUrl = ""; addEngine(duck); addEngine(sp); addEngine(wiki); addEngine(google); + addEngine(oSSoftware); + addEngine(obs); m_defaultEngine = duck; diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp index 9dd9035..f6d8e1f 100644 --- a/src/lib/plugins/speeddial.cpp +++ b/src/lib/plugins/speeddial.cpp @@ -64,10 +64,10 @@ void SpeedDial::loadSettings() settings.endGroup(); if (allPages.isEmpty()) { - allPages = "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://duckduckgo.com\";|title:\"DuckDuckGo\";"; + allPages = "url:\"https://duckduckgo.com\";|title:\"DuckDuckGo\";" + "url:\"http://www.opensuse.org\";|title:\"openSUSE Project\";" + "url:\"http://www.qupzilla.com\";|title:\"QupZilla\";" + "url:\"https://github.com/QupZilla/qupzilla\";|title:\"QupZilla GitHub\";"; } changed(allPages); ++++++ qupzilla-sendlink-fix.patch ++++++ diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp index 9f2bec0..2b5e856 100644 --- a/src/lib/app/mainmenu.cpp +++ b/src/lib/app/mainmenu.cpp @@ -38,6 +38,7 @@ #include <QStatusBar> #include <QWebPage> #include <QMenuBar> +#include <QDesktopServices> #ifdef Q_OS_MAC extern void qt_mac_set_dock_menu(QMenu* menu); @@ -175,9 +176,8 @@ void MainMenu::savePageScreen() void MainMenu::sendLink() { - if (m_window) { - m_window->weView()->savePageAs(); - } + const QUrl mailUrl = QUrl::fromEncoded("mailto:%20?body="; + QUrl::toPercentEncoding(m_window->weView()->url().toEncoded()) + "&subject=" + QUrl::toPercentEncoding(m_window->weView()->title())); + QDesktopServices::openUrl(mailUrl); } void MainMenu::printPage() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
