Commit f6413771 authored by Manuel's avatar Manuel
Browse files

Merge branch 'testing' of gitorious.org:chakra-packages/desktop into testing

parents 7952a601 96c23989
#
# Apps Packages for Chakra, part of chakra-project.org
#
# maintainer: Anke Boersma <abveritas@chakra-project.org>
# contributor: Neophytos Kolokotronis <tetris4@gmail.com>
# contributor: Fabian Kosmale <0inkane@googlemail.com>
pkgname=qupzilla
pkgver=1.3.5
pkgrel=8
_commit=8f06ad8
pkgdesc="A very fast open source browser based on WebKit core"
url="http://www.qupzilla.com"
arch=('x86_64')
license=('GPL3')
depends=('qtwebkit' 'qtwebkit-plugins')
categories=('network')
source=("https://github.com/QupZilla/QupZilla/tarball/master/QupZilla-qupzilla-${pkgver}.tar.gz"
#"https://github.com/downloads/QupZilla/qupzilla/QupZilla-${pkgver}.tar.gz"
'searchenginesmanager.diff'
'speeddial.diff'
'preferences.diff'
'qupzilla.diff'
'start-white.png')
md5sums=('1c103e6d394058027316fa29d66e1d34'
'c5c0f9e3640d0f5695034aef63648967'
'b58d03f2e52ea3391e63c0eeea3e82a4'
'c2bf22cac2fcdd6ea82ab7fcdd08a706'
'152c8168e80e3a1c8987aa895d9f0d48'
'fc705d7aba952361a626a2c79726bbfa')
build() {
cd "${srcdir}/QupZilla-qupzilla-${_commit}/"
patch -p0 -i "${srcdir}/searchenginesmanager.diff"
patch -p0 -i "${srcdir}/speeddial.diff"
patch -p0 -i "${srcdir}/preferences.diff"
patch -p0 -i "${srcdir}/qupzilla.diff"
export USE_WEBGL="true"
export KDE="true"
qmake QupZilla.pro
make
}
package() {
cd "${srcdir}/QupZilla-qupzilla-${_commit}/"
mkdir -p ${pkgdir}/usr/share/icons
install -m 644 -p ${srcdir}/start-white.png ${pkgdir}/usr/share/icons/
make INSTALL_ROOT=$pkgdir install
}
--- src/lib/preferences/preferences.cpp.orig 2012-11-28 05:27:30.000000000 -0500
+++ src/lib/preferences/preferences.cpp 2012-11-29 11:06:26.153868088 -0500
@@ -92,7 +92,7 @@
Settings settings;
//GENERAL URLs
settings.beginGroup("Web-URL-Settings");
- m_homepage = settings.value("homepage", "qupzilla:start").toString();
+ m_homepage = settings.value("homepage", "http://www.chakra-linux.org/welcome.html").toString();
m_newTabUrl = settings.value("newTabUrl", "qupzilla:speeddial").toString();
ui->homepage->setText(m_homepage);
ui->newTabUrl->setText(m_newTabUrl);
@@ -157,7 +157,7 @@
//APPEREANCE
m_themesManager = new ThemeManager(ui->themesWidget, this);
settings.beginGroup("Browser-View-Settings");
- ui->showStatusbar->setChecked(settings.value("showStatusBar", true).toBool());
+ ui->showStatusbar->setChecked(settings.value("showStatusBar", false).toBool());
if (p_QupZilla) {
ui->showBookmarksToolbar->setChecked(p_QupZilla->bookmarksToolbar()->isVisible());
ui->showNavigationToolbar->setChecked(p_QupZilla->navigationBar()->isVisible());
--- src/lib/app/qupzilla.cpp.orig 2012-11-29 11:13:29.713925058 -0500
+++ src/lib/app/qupzilla.cpp 2012-11-29 11:14:38.660600110 -0500
@@ -560,7 +560,7 @@
//Url settings
settings.beginGroup("Web-URL-Settings");
- m_homepage = settings.value("homepage", "qupzilla:start").toUrl();
+ m_homepage = settings.value("homepage", "http://www.chakra-linux.org/welcome.html").toUrl();
settings.endGroup();
QWebSettings* websettings = mApp->webSettings();
@@ -576,7 +576,7 @@
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();
--- src/lib/opensearch/searchenginesmanager.cpp.orig 2012-11-29 10:53:16.160433207 -0500
+++ src/lib/opensearch/searchenginesmanager.cpp 2012-11-29 10:53:36.250436051 -0500
@@ -51,8 +51,8 @@
{
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").toString();
+ m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo").toString();
settings.endGroup();
connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave()));
@@ -146,7 +146,7 @@
Engine duck;
duck.name = "DuckDuckGo";
duck.icon = QIcon(":/icons/sites/duck.png");
- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla";
+ duck.url = "https://duckduckgo.com/?t=chakra&q=%s";
duck.shortcut = "d";
addEngine(google);
--- src/lib/plugins/speeddial.cpp 2012-09-17 12:03:30.000000000 -0400
+++ src/lib/plugins/speeddial.cpp 2012-09-17 15:51:19.070088443 -0400
@@ -46,19 +46,18 @@
Settings settings;
settings.beginGroup("SpeedDial");
QString allPages = settings.value("pages", QString()).toString();
- m_backgroundImage = settings.value("background", QString()).toString();
- m_backgroundImageSize = settings.value("backsize", "auto").toString();
+ m_backgroundImage = settings.value("background", "file:///usr/share/icons/start-white.png").toString();
+ m_backgroundImageSize = settings.value("backsize", "contain").toString();
m_maxPagesInRow = settings.value("pagesrow", 4).toInt();
- m_sizeOfSpeedDials = settings.value("sdsize", 231).toInt();
+ m_sizeOfSpeedDials = settings.value("sdsize", 150).toInt();
m_sdcentered = settings.value("sdcenter", 0).toInt();
settings.endGroup();
if (allPages.isEmpty()) {
- allPages = "url:\"http://www.google.com\"|title:\"Google\";"
- "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\";";
+ allPages = "url:\"http://www.chakra-linux.org\"|title:\"The Chakra Project - Welcome\";"
+ "url:\"http://www.chakra-project.org/bbs\"|title:\"Forums\";"
+ "url:\"http://webchat.freenode.net/?channels=chakra\"|title:\"IRC\";"
+ "url:\"http://www.youtube.com/html5\"|title:\"YouTube-html5\";";
}
changed(allPages);
#
# Apps Packages for Chakra, part of chakra-project.org
#
# maintainer: abveritas@chakra-project.org
pkgname=rekonq
pkgver=2.1
pkgrel=2
pkgdesc='A WebKit based web browser for KDE'
arch=('x86_64')
url='http://rekonq.sourceforge.net/'
license=('GPL')
depends=('kde-baseapps' 'qoauth' 'qca-ossl')
makedepends=('cmake' 'automoc4' 'docbook-xsl')
categories=('network')
screenshot=('http://rekonq.kde.org/sites/rekonq.kde.org/files/images/Rekonq-0.6.0.png')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'background.png'
'background.diff'
'searchengine.diff')
md5sums=('90b3737246feb22a8f142f9c45d31512'
'cd493df91e34030a8195eaf8b6d68140'
'5d7bab51b8f4b78c0f7cd94c885f22c3'
'7ab9dc2e4397a66c7a64e08265171996')
# source PKGBUILD && mksource
mksource() {
git clone git://anongit.kde.org/rekonq.git
pushd rekonq
popd
tar -cvJf rekonq-${pkgver}.tar.xz rekonq/*
md5sum rekonq-${pkgver}.tar.xz
}
build(){
cd ${srcdir}/${pkgname}-${pkgver}
# Chakra theme:
patch -p1 -i "${srcdir}/background.diff"
cd ${srcdir}
mkdir -p build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
cd ${srcdir}/build
make DESTDIR=${pkgdir} install
rm ${pkgdir}/usr/share/apps/rekonq/pics/background.png
install -m 644 -p ${srcdir}/background.png ${pkgdir}/usr/share/apps/rekonq/pics/background.png
}
--- a/src/data/home.html 2012-07-09 18:15:31.000000000 -0400
+++ b/src/data/home.html 2012-07-20 18:24:19.650246881 -0400
@@ -35,7 +35,7 @@
}
body {
- background: url($DEFAULT_PATH/pics/background.png) repeat-y center #fff;
+ background: url($DEFAULT_PATH/pics/background.png) no-repeat center #fff;
font-family: 'Nunito', sans-serif;
font-size: 0.9em;
border: 0;
--- a/src/data/rekonqinfo.html 2012-07-20 18:25:08.594903239 -0400
+++ b/src/data/rekonqinfo.html 2012-07-20 18:25:21.325242141 -0400
@@ -35,7 +35,7 @@
}
body{
- background: url($DEFAULT_PATH/pics/background.png) repeat-y center #bbb;
+ background: url($DEFAULT_PATH/pics/background.png) no-repeat center #bbb;
margin:0;
padding:0;
font-family: 'Nunito', sans-serif;
commit 58bd0c195b60c3cf597a8d9296e5725dc4be7c9b
Author: Andrea Diamantini <adjam7@gmail.com>
Date: Tue Jan 8 17:09:03 2013 +0100
Workaround to fix Google Bookmarks sync + minor speed improvement
Courtesy patch by "Francesco". Thanks :)
BUG: 312824
diff --git a/src/sync/googlesynchandler.cpp b/src/sync/googlesynchandler.cpp
index c2de762..f2e23da 100644
--- a/src/sync/googlesynchandler.cpp
+++ b/src/sync/googlesynchandler.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com>
-* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -172,24 +172,24 @@ void GoogleSyncHandler::loadFinished(bool ok)
QString path = _webPage.mainFrame()->url().path();
- if (path == "/ServiceLogin" && _doLogin == true)
+ if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true)
{
// Let's login to our Google account
QWebFrame *frame = _webPage.mainFrame();
- QWebElement email = frame->findFirstElement("#Email");
- QWebElement passwd = frame->findFirstElement("#Passwd");
- QWebElement form = frame->findFirstElement("#gaia_loginform");
+ QWebElement email = frame->findFirstElement( QL1S("#Email") );
+ QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") );
+ QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") );
- email.setAttribute("value", ReKonfig::syncUser());
- passwd.setAttribute("value", ReKonfig::syncPass());
- form.evaluateJavaScript("this.submit();");
+ email.setAttribute( QL1S("value"), ReKonfig::syncUser());
+ passwd.setAttribute( QL1S("value"), ReKonfig::syncPass());
+ form.evaluateJavaScript( QL1S("this.submit();") );
emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in..."));
// Login only once
_doLogin = false;
}
- else if (path == "/bookmarks/")
+ else if (path == QL1S("/bookmarks/") )
{
// We get to this page after successful login, let's fetch the bookmark list in Xml format.
QNetworkAccessManager *qnam = _webPage.networkAccessManager();
@@ -199,16 +199,16 @@ void GoogleSyncHandler::loadFinished(bool ok)
emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server..."));
connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished()));
}
- else if (path == "/ServiceLoginAuth")
+ else if (path == QL1S("/ServiceLoginAuth") )
{
emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!"));
_isSyncing = false;
}
- else if (path == "/bookmarks/mark")
+ else if (path == QL1S("/bookmarks/mark") )
{
QWebFrame *frame = _webPage.mainFrame();
- QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value");
+ QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") );
kDebug() << "Signature Key is : " << sigKey;
QNetworkAccessManager *qnam = _webPage.networkAccessManager();
@@ -219,7 +219,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter)
{
QNetworkRequest request;
- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey));
+ request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey));
kDebug() << "Delete url is : " << request.url();
QNetworkReply *r = qnam->get(request);
@@ -243,7 +243,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
postData.append("&sig=" + sigKey.toUtf8());
QNetworkRequest request;
- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA"));
+ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") ));
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
kDebug() << "Url: " << request.url();
kDebug() << "Post data is :" << postData;
@@ -257,7 +257,7 @@ void GoogleSyncHandler::loadFinished(bool ok)
_bookmarksToAdd.clear();
}
- else if (path == "/Logout")
+ else if (path == QL1S("/Logout") )
{
//Session finished
emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!"));
@@ -277,10 +277,10 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
{
QString data = _reply->readAll();
- QDomDocument doc("bookmarks");
+ QDomDocument doc( QL1S("bookmarks") );
doc.setContent(data);
- QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark");
+ QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") );
emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks..."));
BookmarkManager *manager = BookmarkManager::self();
@@ -291,8 +291,8 @@ void GoogleSyncHandler::fetchingBookmarksFinished()
for (int i = 0; i < bookmarksOnServer.size(); ++i)
{
- QString title = getChildElement(bookmarksOnServer.at(i), "title");
- QString url = getChildElement(bookmarksOnServer.at(i), "url");
+ QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") );
+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
KBookmark bookmark = manager->bookmarkForUrl(KUrl(url));
if (bookmark.isNull())
@@ -377,7 +377,7 @@ void GoogleSyncHandler::checkToAddGB(const KBookmarkGroup &root, const QDomNodeL
found = true;
break;
}
- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url"))
+ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) )
{
found = true;
}
@@ -398,13 +398,13 @@ void GoogleSyncHandler::checkToDeleteGB(BookmarkManager *manager, const QDomNode
for (int i = 0; i < bookmarksOnServer.count(); ++i)
{
- QString url = getChildElement(bookmarksOnServer.at(i), "url");
+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") );
KBookmark result = manager->bookmarkForUrl(KUrl(url));
if (result.isNull())
{
kDebug() << "Deleting from Google Bookmarks: " << url;
- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id"));
+ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") ));
}
}
post_install() {
xdg-icon-resource forceupdate --theme hicolor &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}
diff --git a/src/opensearch/searchengine.cpp b/src/opensearch/searchengine.cpp
index aef06a7..2adb2a5 100644
--- a/src/opensearch/searchengine.cpp
+++ b/src/opensearch/searchengine.cpp
@@ -61,7 +61,7 @@ void SearchEngine::reload()
//load favorite engines
QStringList favoriteEngines;
- favoriteEngines = cg.readEntry("FavoriteSearchEngines", favoriteEngines);
+ favoriteEngines = cg.readEntry("PreferredWebShortcuts", favoriteEngines);
KService::List favorites;
KService::Ptr service;
Q_FOREACH(const QString & engine, favoriteEngines)
@@ -78,7 +78,7 @@ void SearchEngine::reload()
d->favorites = favorites;
//load default engine
- QString dse = cg.readEntry("DefaultSearchEngine");
+ QString dse = cg.readEntry("DefaultWebShortcut");
d->defaultEngine = KService::serviceByDesktopPath(QString("searchproviders/%1.desktop").arg(dse));
d->isLoaded = true;
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 21debce..f5b47b8 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -293,6 +293,8 @@ void UrlBar::keyPressEvent(QKeyEvent *event)
if (currentText.isEmpty())
return KLineEdit::keyPressEvent(event);
+ activateSuggestions(true);
+
// this handles the Modifiers + Return key combinations
if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
{
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment