Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Remove Page Screen action from menus

Browse Source 
Page screen functionality will hardly ever come back with QtWebEngine.
This commit is contained in:
David Rosca 2015-09-30 13:28:18 +02:00
parent bfad9eb0aa
commit 942299e649
7 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,6 @@
#include "statusbarmessage.h"
#include "browsinglibrary.h"
#include "navigationbar.h"
#include "pagescreen.h"
#include "bookmarksimport/bookmarksimportdialog.h"
#include "qztools.h"
#include "reloadstopbutton.h"
@ -1096,14 +1095,6 @@ bool BrowserWindow::event(QEvent* event)
return QMainWindow::event(event);
}
void BrowserWindow::savePageScreen()
{
#if QTWEBENGINE_DISABLED
PageScreen* dialog = new PageScreen(weView(), this);
dialog->show();
#endif
}
void BrowserWindow::resizeEvent(QResizeEvent* event)
{
m_bookmarksToolbar->setMaximumWidth(width());

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

@ -150,7 +150,6 @@ private slots:
void loadSettings();
void postLaunch();
void savePageScreen();
void refreshHistory();
void webSearch();
void searchOnPage();

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

@ -79,7 +79,6 @@ void MainMenu::initSuperMenu(QMenu* superMenu) const
superMenu->addAction(m_actions[QSL("File/NewPrivateWindow")]);
superMenu->addAction(m_actions[QSL("File/OpenFile")]);
superMenu->addSeparator();
superMenu->addAction(m_actions[QSL("File/SavePageScreen")]);
superMenu->addAction(m_actions[QSL("File/SendLink")]);
superMenu->addSeparator();
superMenu->addAction(m_actions[QSL("Edit/SelectAll")]);
@ -172,11 +171,6 @@ void MainMenu::savePageAs()
}
}
void MainMenu::savePageScreen()
{
callSlot("savePageScreen");
}
void MainMenu::sendLink()
{
const QUrl mailUrl = QUrl::fromEncoded("mailto:%20?body=" + QUrl::toPercentEncoding(m_window->weView()->url().toEncoded()) + "&subject=" + QUrl::toPercentEncoding(m_window->weView()->title()));
@ -533,7 +527,6 @@ void MainMenu::init()
ADD_ACTION("File/CloseWindow", m_menuFile, QIcon::fromTheme(QSL("window-close")), tr("Close Window"), SLOT(closeWindow()), "Ctrl+Shift+W");
m_menuFile->addSeparator();
ADD_ACTION("File/SavePageAs", m_menuFile, QIcon::fromTheme(QSL("document-save")), tr("&Save Page As..."), SLOT(savePageAs()), "Ctrl+S");
ADD_ACTION("File/SavePageScreen", m_menuFile, QIcon::fromTheme(QSL("image-loading")), tr("Save Page Screen"), SLOT(savePageScreen()), "Ctrl+Shift+S");
ADD_ACTION("File/SendLink", m_menuFile, QIcon::fromTheme(QSL("mail-message-new")), tr("Send Link..."), SLOT(sendLink()), "");
ADD_ACTION("File/Print", m_menuFile, QIcon::fromTheme(QSL("document-print")), tr("&Print..."), SLOT(printPage()), "Ctrl+P");
m_menuFile->addSeparator();

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

@ -60,7 +60,6 @@ private slots:
void closeWindow();
void toggleOfflineMode();
void savePageAs();
void savePageScreen();
void sendLink();
void printPage();

2
src/lib/lib.pro
View File

@ -459,7 +459,7 @@ FORMS += \
other/clearprivatedata.ui \
other/checkboxdialog.ui \
other/iconchooser.ui \
other/pagescreen.ui \
#other/pagescreen.ui \
other/siteinfo.ui \
other/siteinfowidget.ui \
other/sourceviewersearch.ui \

10
src/lib/popupwindow/popupwindow.cpp
View File

@ -20,7 +20,6 @@
#include "webpage.h"
#include "popupstatusbarmessage.h"
#include "progressbar.h"
#include "pagescreen.h"
#include "searchtoolbar.h"
#include "qzsettings.h"
#include "popuplocationbar.h"
@ -57,7 +56,6 @@ PopupWindow::PopupWindow(PopupWebView* view)
QMenu* menuFile = new QMenu(tr("File"));
menuFile->addAction(QIcon::fromTheme("document-save"), tr("&Save Page As..."), m_view, SLOT(savePageAs()))->setShortcut(QKeySequence("Ctrl+S"));
menuFile->addAction(tr("Save Page Screen"), this, SLOT(savePageScreen()));
menuFile->addAction(QIcon::fromTheme("mail-message-new"), tr("Send Link..."), m_view, SLOT(sendPageByMail()));
//menuFile->addAction(QIcon::fromTheme("document-print"), tr("&Print..."), m_view, SLOT(printPage()))->setShortcut(QKeySequence("Ctrl+P"));
menuFile->addSeparator();
@ -205,14 +203,6 @@ void PopupWindow::closeEvent(QCloseEvent* event)
event->accept();
}
void PopupWindow::savePageScreen()
{
#if QTWEBENGINE_DISABLED
PageScreen* pageScreen = new PageScreen(m_view, this);
pageScreen->show();
#endif
}
void PopupWindow::searchOnPage()
{
if (!m_search) {

1
src/lib/popupwindow/popupwindow.h
View File

@ -59,7 +59,6 @@ private slots:
void loadProgress(int value);
void loadFinished();
void savePageScreen();
void searchOnPage();
private: