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

Merge pull request #1431 from kdave/preferences-ctrl-q

Browse Source 
[Preferences] add option to set Ctrl-Q behaviour (Quit or nothing)
This commit is contained in:
David Rosca 2014-07-23 21:36:48 +02:00
commit de4f7115f8
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,17 @@
const QString BrowserWindow::WEBKITVERSION = qWebKitVersion(); const QString BrowserWindow::WEBKITVERSION = qWebKitVersion();
static QKeySequence actionShortcut(QKeySequence shortcut, QKeySequence fallBack, QKeySequence shortcutRTL = QKeySequence(), QKeySequence fallbackRTL = QKeySequence())
{
if (QApplication::isRightToLeft() && (!shortcutRTL.isEmpty() || !fallbackRTL.isEmpty())) {
return (shortcutRTL.isEmpty() ? fallbackRTL : shortcutRTL);
}
else {
return (shortcut.isEmpty() ? fallBack : shortcut);
}
}
BrowserWindow::BrowserWindow(Qz::BrowserWindowType type, const QUrl &startUrl) BrowserWindow::BrowserWindow(Qz::BrowserWindowType type, const QUrl &startUrl)
: QMainWindow(0) : QMainWindow(0)
, m_startUrl(startUrl) , m_startUrl(startUrl)
@ -445,6 +456,15 @@ void BrowserWindow::loadSettings()
m_useSingleKeyShortcuts = settings.value("useSingleKeyShortcuts", false).toBool(); m_useSingleKeyShortcuts = settings.value("useSingleKeyShortcuts", false).toBool();
settings.endGroup(); settings.endGroup();
settings.beginGroup("Web-Browser-Settings");
QAction *quitAction = m_mainMenu->action(QSL("Standard/Quit"));
if (settings.value("closeAppWithCtrlQ", true).toBool()) {
quitAction->setShortcut(actionShortcut(QKeySequence::Quit, QKeySequence(QSL("Ctrl+Q"))));
} else {
quitAction->setShortcut(QKeySequence());
}
settings.endGroup();
m_adblockIcon->setEnabled(settings.value("AdBlock/enabled", true).toBool()); m_adblockIcon->setEnabled(settings.value("AdBlock/enabled", true).toBool());
statusBar()->setVisible(!isFullScreen() && showStatusBar); statusBar()->setVisible(!isFullScreen() && showStatusBar);

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

@ -39,16 +39,6 @@
#include <QWebPage> #include <QWebPage>
#include <QMenuBar> #include <QMenuBar>
static QKeySequence actionShortcut(QKeySequence shortcut, QKeySequence fallBack, QKeySequence shortcutRTL = QKeySequence(), QKeySequence fallbackRTL = QKeySequence())
{
if (QApplication::isRightToLeft() && (!shortcutRTL.isEmpty() || !fallbackRTL.isEmpty())) {
return (shortcutRTL.isEmpty() ? fallbackRTL : shortcutRTL);
}
else {
return (shortcut.isEmpty() ? fallBack : shortcut);
}
}
MainMenu::MainMenu(BrowserWindow* window, QWidget* parent) MainMenu::MainMenu(BrowserWindow* window, QWidget* parent)
: QMenu(parent) : QMenu(parent)
, m_window(window) , m_window(window)
@ -516,7 +506,7 @@ void MainMenu::init()
action = new QAction(QIcon::fromTheme(QSL("application-exit")), tr("Quit"), this); action = new QAction(QIcon::fromTheme(QSL("application-exit")), tr("Quit"), this);
action->setMenuRole(QAction::QuitRole); action->setMenuRole(QAction::QuitRole);
action->setShortcut(actionShortcut(QKeySequence::Quit, QKeySequence(QSL("Ctrl+Q")))); // shortcut set from browserwindow
connect(action, SIGNAL(triggered()), this, SLOT(quitApplication())); connect(action, SIGNAL(triggered()), this, SLOT(quitApplication()));
m_actions[QSL("Standard/Quit")] = action; m_actions[QSL("Standard/Quit")] = action;

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

@ -295,6 +295,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent)
ui->defaultZoomLevel->addItem(QString("%1%").arg(level)); ui->defaultZoomLevel->addItem(QString("%1%").arg(level));
} }
ui->defaultZoomLevel->setCurrentIndex(settings.value("DefaultZoomLevel", WebView::zoomLevels().indexOf(100)).toInt()); ui->defaultZoomLevel->setCurrentIndex(settings.value("DefaultZoomLevel", WebView::zoomLevels().indexOf(100)).toInt());
ui->closeAppWithCtrlQ->setChecked(settings.value("closeAppWithCtrlQ", true).toBool());
//Cache //Cache
ui->pagesInCache->setValue(settings.value("maximumCachedPages", 3).toInt()); ui->pagesInCache->setValue(settings.value("maximumCachedPages", 3).toInt());
@ -995,6 +996,7 @@ void Preferences::saveSettings()
settings.setValue("DefaultZoomLevel", ui->defaultZoomLevel->currentIndex()); settings.setValue("DefaultZoomLevel", ui->defaultZoomLevel->currentIndex());
settings.setValue("XSSAuditing", ui->xssAuditing->isChecked()); settings.setValue("XSSAuditing", ui->xssAuditing->isChecked());
settings.setValue("enableFormsUndoRedo", ui->formsUndoRedo->isChecked()); settings.setValue("enableFormsUndoRedo", ui->formsUndoRedo->isChecked());
settings.setValue("closeAppWithCtrlQ", ui->closeAppWithCtrlQ->isChecked());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
settings.setValue("CheckDefaultBrowser", ui->checkDefaultBrowser->isChecked()); settings.setValue("CheckDefaultBrowser", ui->checkDefaultBrowser->isChecked());
#endif #endif

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

@ -1997,7 +1997,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="closeAppWithCtrlQ">
<property name="toolTip">
<string>If unchecked, prevents accidental exit from the application if the Ctrl-W shortcut was intended.</string>
</property>
<property name="text">
<string>Close application with Ctrl-Q</string>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="verticalSpacer_13"> <spacer name="verticalSpacer_13">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>