Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Enable new features in QtWebKit 2.3.0

Browse Source 
Also hiding new features in preferences if building
with older QtWebKit versions.
This commit is contained in:
nowrep 2013-01-09 18:47:36 +01:00
parent 151bba6293
commit 64a180d1fe
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/app/mainapplication.cpp
View File

@ -375,7 +375,7 @@ void MainApplication::loadSettings()
m_websettings->setMaximumPagesInCache(settings.value("maximumCachedPages", 3).toInt()); m_websettings->setMaximumPagesInCache(settings.value("maximumCachedPages", 3).toInt());
m_websettings->setDefaultTextEncoding(settings.value("DefaultEncoding", m_websettings->defaultTextEncoding()).toString()); m_websettings->setDefaultTextEncoding(settings.value("DefaultEncoding", m_websettings->defaultTextEncoding()).toString());
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000 || (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 3, 0))
m_websettings->setAttribute(QWebSettings::CaretBrowsingEnabled, settings.value("CaretBrowsing", false).toBool()); m_websettings->setAttribute(QWebSettings::CaretBrowsingEnabled, settings.value("CaretBrowsing", false).toBool());
m_websettings->setAttribute(QWebSettings::ScrollAnimatorEnabled, settings.value("AnimateScrolling", true).toBool()); m_websettings->setAttribute(QWebSettings::ScrollAnimatorEnabled, settings.value("AnimateScrolling", true).toBool());
#endif #endif

11
src/lib/app/qupzilla.cpp
View File

@ -401,11 +401,14 @@ void QupZilla::setupMenu()
m_menuEncoding = new QMenu(this); m_menuEncoding = new QMenu(this);
actionEncoding->setMenu(m_menuEncoding); actionEncoding->setMenu(m_menuEncoding);
connect(m_menuEncoding, SIGNAL(aboutToShow()), this, SLOT(aboutToShowEncodingMenu())); connect(m_menuEncoding, SIGNAL(aboutToShow()), this, SLOT(aboutToShowEncodingMenu()));
#if QT_VERSION >= 0x050000
m_actionCaretBrowsing = new QAction(tr("Enable &Caret Browsing"), this); m_actionCaretBrowsing = new QAction(tr("Enable &Caret Browsing"), this);
m_actionCaretBrowsing->setVisible(false);
m_actionCaretBrowsing->setCheckable(true); m_actionCaretBrowsing->setCheckable(true);
m_actionCaretBrowsing->setShortcut(QKeySequence("F7")); m_actionCaretBrowsing->setShortcut(QKeySequence("F7"));
connect(m_actionCaretBrowsing, SIGNAL(triggered()), this, SLOT(triggerCaretBrowsing())); connect(m_actionCaretBrowsing, SIGNAL(triggered()), this, SLOT(triggerCaretBrowsing()));
#if QT_VERSION >= 0x050000 || (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 3, 0))
m_actionCaretBrowsing->setVisible(true);
#endif #endif
QMenu* toolbarsMenu = new QMenu(tr("Toolbars")); QMenu* toolbarsMenu = new QMenu(tr("Toolbars"));
@ -428,9 +431,7 @@ void QupZilla::setupMenu()
m_menuView->addAction(QIcon::fromTheme("zoom-out"), tr("Zoom &Out"), this, SLOT(zoomOut()))->setShortcut(QKeySequence("Ctrl+-")); m_menuView->addAction(QIcon::fromTheme("zoom-out"), tr("Zoom &Out"), this, SLOT(zoomOut()))->setShortcut(QKeySequence("Ctrl+-"));
m_menuView->addAction(QIcon::fromTheme("zoom-original"), tr("Reset"), this, SLOT(zoomReset()))->setShortcut(QKeySequence("Ctrl+0")); m_menuView->addAction(QIcon::fromTheme("zoom-original"), tr("Reset"), this, SLOT(zoomReset()))->setShortcut(QKeySequence("Ctrl+0"));
m_menuView->addSeparator(); m_menuView->addSeparator();
#if QT_VERSION >= 0x050000
m_menuView->addAction(m_actionCaretBrowsing); m_menuView->addAction(m_actionCaretBrowsing);
#endif
m_menuView->addAction(actionEncoding); m_menuView->addAction(actionEncoding);
m_menuView->addSeparator(); m_menuView->addSeparator();
m_menuView->addAction(QIcon::fromTheme("text-html"), tr("&Page Source"), this, SLOT(showSource()))->setShortcut(QKeySequence("Ctrl+U")); m_menuView->addAction(QIcon::fromTheme("text-html"), tr("&Page Source"), this, SLOT(showSource()))->setShortcut(QKeySequence("Ctrl+U"));
@ -1088,9 +1089,9 @@ void QupZilla::changeEncoding()
} }
} }
#if QT_VERSION >= 0x050000
void QupZilla::triggerCaretBrowsing() void QupZilla::triggerCaretBrowsing()
{ {
#if QT_VERSION >= 0x050000 || (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 3, 0))
bool enable = !mApp->webSettings()->testAttribute(QWebSettings::CaretBrowsingEnabled); bool enable = !mApp->webSettings()->testAttribute(QWebSettings::CaretBrowsingEnabled);
Settings settings; Settings settings;
@ -1099,8 +1100,8 @@ void QupZilla::triggerCaretBrowsing()
settings.endGroup(); settings.endGroup();
mApp->webSettings()->setAttribute(QWebSettings::CaretBrowsingEnabled, enable); mApp->webSettings()->setAttribute(QWebSettings::CaretBrowsingEnabled, enable);
}
#endif #endif
}
void QupZilla::bookmarkPage() void QupZilla::bookmarkPage()
{ {

2
src/lib/app/qupzilla.h
View File

@ -188,9 +188,7 @@ private slots:
void fullScreen(bool make); void fullScreen(bool make);
void changeEncoding(); void changeEncoding();
#if QT_VERSION >= 0x050000
void triggerCaretBrowsing(); void triggerCaretBrowsing();
#endif
void closeWindow(); void closeWindow();
bool quitApp(); bool quitApp();

6
src/lib/preferences/jsoptions.cpp
View File

@ -20,7 +20,9 @@
#include "mainapplication.h" #include "mainapplication.h"
#include "settings.h" #include "settings.h"
#include <QWebPage> // QTWEBKIT_VERSION_CHECK macro
#include <QFileDialog> #include <QFileDialog>
#include <QDebug>
JsOptions::JsOptions(QWidget* parent) JsOptions::JsOptions(QWidget* parent)
: QDialog(parent) : QDialog(parent)
@ -38,6 +40,10 @@ JsOptions::JsOptions(QWidget* parent)
ui->jscanHideTool->setChecked(settings.value("allowJavaScriptHideToolBar", true).toBool()); ui->jscanHideTool->setChecked(settings.value("allowJavaScriptHideToolBar", true).toBool());
ui->jscanAccessClipboard->setChecked(settings.value("allowJavaScriptAccessClipboard", false).toBool()); ui->jscanAccessClipboard->setChecked(settings.value("allowJavaScriptAccessClipboard", false).toBool());
settings.endGroup(); settings.endGroup();
#if (QTWEBKIT_VERSION < QTWEBKIT_VERSION_CHECK(2, 2, 0)) && QT_VERSION < 0x050000
ui->jscanCloseWindow->setHidden(true);
#endif
} }
void JsOptions::accept() void JsOptions::accept()

5
src/lib/preferences/preferences.cpp
View File

@ -460,6 +460,11 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
ui->version->setText(" QupZilla v" + QupZilla::VERSION); ui->version->setText(" QupZilla v" + QupZilla::VERSION);
ui->listWidget->setCurrentRow(currentSettingsPage); ui->listWidget->setCurrentRow(currentSettingsPage);
#if QT_VERSION < 0x050000 && (QTWEBKIT_VERSION < QTWEBKIT_VERSION_CHECK(2, 3, 0))
ui->caretBrowsing->setHidden(true);
ui->animateScrolling->setHidden(true);
#endif
} }
void Preferences::showStackedPage(QListWidgetItem* item) void Preferences::showStackedPage(QListWidgetItem* item)