Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Remove Caret Browsing option

Browse Source 
No longer available with QtWebEngine
This commit is contained in:
David Rosca 2015-09-25 17:45:47 +02:00
parent ced9c8553c
commit a115d91564
9 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -780,17 +780,6 @@ void BrowserWindow::toggleTabsOnTop(bool enable)
m_navigationContainer->toggleTabsOnTop(enable);
}
void BrowserWindow::toggleCaretBrowsing()
{
#if QTWEBENGINE_DISABLED
bool enable = !QWebEngineSettings::globalSettings()->testAttribute(QWebEngineSettings::CaretBrowsingEnabled);
Settings().setValue("Web-Browser-Settings/CaretBrowsing", enable);
QWebEngineSettings::globalSettings()->setAttribute(QWebEngineSettings::CaretBrowsingEnabled, enable);
#endif
}
void BrowserWindow::toggleFullScreen()
{
if (isFullScreen()) {

1
src/lib/app/browserwindow.h
View File

@ -129,7 +129,6 @@ public slots:
void toggleShowNavigationToolbar();
void toggleTabsOnTop(bool enable);
void toggleCaretBrowsing();
void toggleFullScreen();
void toggleOfflineMode();

14
src/lib/app/mainmenu.cpp
View File

@ -282,11 +282,6 @@ void MainMenu::zoomReset()
}
}
void MainMenu::toggleCaretBrowsing()
{
callSlot("toggleCaretBrowsing");
}
void MainMenu::showPageSource()
{
callSlot("showSource");
@ -400,10 +395,6 @@ void MainMenu::aboutToShowViewMenu()
m_actions[QSL("View/ShowStatusBar")]->setChecked(m_window->statusBar()->isVisible());
m_actions[QSL("View/FullScreen")]->setChecked(m_window->isFullScreen());
m_actions[QSL("View/PageSource")]->setEnabled(true);
#if QTWEBENGINE_DISABLED
m_actions[QSL("View/CaretBrowsing")]->setChecked(m_window->weView()->settings()->testAttribute(QWebEngineSettings::CaretBrowsingEnabled));
#endif
}
void MainMenu::aboutToHideViewMenu()
@ -596,7 +587,6 @@ void MainMenu::init()
ADD_ACTION("View/ZoomOut", m_menuView, QIcon::fromTheme(QSL("zoom-out")), tr("Zoom &Out"), SLOT(zoomOut()), "Ctrl+-");
ADD_ACTION("View/ZoomReset", m_menuView, QIcon::fromTheme(QSL("zoom-original")), tr("Reset"), SLOT(zoomReset()), "Ctrl+0");
m_menuView->addSeparator();
ADD_CHECKABLE_ACTION("View/CaretBrowsing", m_menuView, QIcon(), tr("&Caret Browsing"), SLOT(toggleCaretBrowsing()), "F7");
m_menuView->addMenu(encodingMenu);
m_menuView->addSeparator();
ADD_ACTION("View/PageSource", m_menuView, QIcon::fromTheme(QSL("text-html")), tr("&Page Source"), SLOT(showPageSource()), "Ctrl+U");
@ -670,10 +660,6 @@ void MainMenu::init()
m_menuTools->addAction(m_actions[QSL("Standard/Preferences")]);
#endif
#ifndef QTWEBKIT_FROM_2_3
m_actions[QSL("View/CaretBrowsing")]->setVisible(false);
#endif
// Menus are hidden by default
aboutToHideFileMenu();
aboutToHideViewMenu();

1
src/lib/app/mainmenu.h
View File

@ -80,7 +80,6 @@ private slots:
void zoomIn();
void zoomOut();
void zoomReset();
void toggleCaretBrowsing();
void showPageSource();
void showFullScreen();

5
src/lib/other/macmenureceiver.cpp
View File

@ -304,11 +304,6 @@ void MacMenuReceiver::changeEncoding(QObject* obj)
callSlot("changeEncoding", false, Q_ARG(QObject*, obj));
}
void MacMenuReceiver::triggerCaretBrowsing()
{
callSlot("triggerCaretBrowsing");
}
void MacMenuReceiver::triggerTabsOnTop(bool enable)
{
callSlot("triggerTabsOnTop", false, Q_ARG(bool, enable));

1
src/lib/other/macmenureceiver.h
View File

@ -120,7 +120,6 @@ private slots:
void toggleFullScreen();
void changeEncoding(QObject* obj = 0);
void triggerCaretBrowsing();
void triggerTabsOnTop(bool enable);
void closeWindow();

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

@ -281,7 +281,6 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent)
ui->linksInFocusChain->setChecked(settings.value("IncludeLinkInFocusChain", false).toBool());
ui->zoomTextOnly->setChecked(settings.value("zoomTextOnly", false).toBool());
ui->spatialNavigation->setChecked(settings.value("SpatialNavigation", false).toBool());
ui->caretBrowsing->setChecked(settings.value("CaretBrowsing", false).toBool());
ui->animateScrolling->setChecked(settings.value("AnimateScrolling", true).toBool());
ui->printEBackground->setChecked(settings.value("PrintElementBackground", true).toBool());
ui->wheelScroll->setValue(settings.value("wheelScrollLines", qApp->wheelScrollLines()).toInt());
@ -981,7 +980,6 @@ void Preferences::saveSettings()
settings.setValue("IncludeLinkInFocusChain", ui->linksInFocusChain->isChecked());
settings.setValue("zoomTextOnly", ui->zoomTextOnly->isChecked());
settings.setValue("SpatialNavigation", ui->spatialNavigation->isChecked());
settings.setValue("CaretBrowsing", ui->caretBrowsing->isChecked());
settings.setValue("AnimateScrolling", ui->animateScrolling->isChecked());
settings.setValue("PrintElementBackground", ui->printEBackground->isChecked());
settings.setValue("wheelScrollLines", ui->wheelScroll->value());

11
src/lib/preferences/preferences.ui
View File

@ -140,8 +140,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>602</width>
<height>466</height>
<width>596</width>
<height>470</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -1152,13 +1152,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="caretBrowsing">
<property name="text">
<string>Enable caret browsing</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="spatialNavigation">
<property name="text">

2
src/plugins/TestPlugin/testplugin.cpp
View File

@ -141,6 +141,8 @@ void TestPlugin::showSettings(QWidget* parent)
void TestPlugin::populateWebViewMenu(QMenu* menu, WebView* view, const QWebHitTestResult &r)
{
Q_UNUSED(r)
// Called from WebView when creating context menu
m_view = view;