From 96cc2d41e2e5e94057476d3ba52d2f2833d99c66 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 15 Oct 2015 10:28:03 +0200 Subject: [PATCH] Remove non-working Work Offline option --- src/lib/app/browserwindow.cpp | 9 --------- src/lib/app/browserwindow.h | 1 - src/lib/app/mainmenu.cpp | 9 --------- src/lib/app/mainmenu.h | 1 - src/lib/other/qzsettings.cpp | 2 -- src/lib/other/qzsettings.h | 2 -- 6 files changed, 24 deletions(-) diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp index d80af4d2e..a07f5e7bf 100644 --- a/src/lib/app/browserwindow.cpp +++ b/src/lib/app/browserwindow.cpp @@ -783,15 +783,6 @@ void BrowserWindow::toggleFullScreen() } } -void BrowserWindow::toggleOfflineMode() -{ - bool enable = !qzSettings->workOffline; - - Settings().setValue("Web-Browser-Settings/WorkOffline", enable); - - qzSettings->workOffline = enable; -} - void BrowserWindow::enterHtmlFullScreen() { showFullScreen(); diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index 764c21ec8..85425b299 100644 --- a/src/lib/app/browserwindow.h +++ b/src/lib/app/browserwindow.h @@ -131,7 +131,6 @@ public slots: void toggleTabsOnTop(bool enable); void toggleFullScreen(); - void toggleOfflineMode(); void enterHtmlFullScreen(); void loadActionUrl(QObject* obj = 0); diff --git a/src/lib/app/mainmenu.cpp b/src/lib/app/mainmenu.cpp index e457efd76..2d238b801 100644 --- a/src/lib/app/mainmenu.cpp +++ b/src/lib/app/mainmenu.cpp @@ -97,7 +97,6 @@ void MainMenu::initSuperMenu(QMenu* superMenu) const superMenu->addAction(m_actions[QSL("Help/InfoAboutApp")]); superMenu->addAction(m_actions[QSL("Help/ConfigInfo")]); superMenu->addAction(m_actions[QSL("Help/ReportIssue")]); - superMenu->addAction(m_actions[QSL("File/WorkOffline")]); superMenu->addSeparator(); superMenu->addAction(m_actions[QSL("Standard/Quit")]); @@ -174,11 +173,6 @@ void MainMenu::printPage() callSlot("printPage"); } -void MainMenu::toggleOfflineMode() -{ - callSlot("toggleOfflineMode"); -} - void MainMenu::editUndo() { if (m_window) { @@ -361,7 +355,6 @@ void MainMenu::aboutToShowFileMenu() #ifndef Q_OS_MAC m_actions[QSL("File/CloseWindow")]->setEnabled(mApp->windowCount() > 1); #endif - m_actions[QSL("File/WorkOffline")]->setChecked(qzSettings->workOffline); } void MainMenu::aboutToHideFileMenu() @@ -524,8 +517,6 @@ void MainMenu::init() 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(); - ADD_CHECKABLE_ACTION("File/WorkOffline", m_menuFile, QIcon(), tr("Work &Offline"), SLOT(toggleOfflineMode()), ""); - m_menuFile->addSeparator(); m_menuFile->addAction(m_actions[QSL("Standard/Quit")]); // Edit menu diff --git a/src/lib/app/mainmenu.h b/src/lib/app/mainmenu.h index bf5a7295e..bb489f14a 100644 --- a/src/lib/app/mainmenu.h +++ b/src/lib/app/mainmenu.h @@ -58,7 +58,6 @@ private slots: void openLocation(); void openFile(); void closeWindow(); - void toggleOfflineMode(); void sendLink(); void printPage(); diff --git a/src/lib/other/qzsettings.cpp b/src/lib/other/qzsettings.cpp index 986d014f3..53ed80383 100644 --- a/src/lib/other/qzsettings.cpp +++ b/src/lib/other/qzsettings.cpp @@ -53,8 +53,6 @@ void QzSettings::loadSettings() allowJsHideMenuBar = settings.value("allowJavaScriptHideMenuBar", true).toBool(); allowJsHideStatusBar = settings.value("allowJavaScriptHideStatusBar", true).toBool(); allowJsHideToolBar = settings.value("allowJavaScriptHideToolBar", true).toBool(); - enableFormsUndoRedo = settings.value("enableFormsUndoRedo", true).toBool(); - workOffline = settings.value("WorkOffline", false).toBool(); settings.endGroup(); settings.beginGroup("Browser-Tabs-Settings"); diff --git a/src/lib/other/qzsettings.h b/src/lib/other/qzsettings.h index 79b2871e5..6d720d7ea 100644 --- a/src/lib/other/qzsettings.h +++ b/src/lib/other/qzsettings.h @@ -53,8 +53,6 @@ public: bool allowJsHideMenuBar; bool allowJsHideStatusBar; bool allowJsHideToolBar; - bool enableFormsUndoRedo; - bool workOffline; QStringList autoOpenProtocols; QStringList blockedProtocols;