aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified applySettings method.

Browse Source
This commit is contained in:
Gres 2015-09-28 22:57:51 +03:00
parent aa705b0ef5
commit 4887441aeb
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Manager.cpp
View File

@ -97,35 +97,31 @@ void Manager::setActionsEnabled (bool isEnabled) {
} }
void Manager::applySettings () { void Manager::applySettings () {
#define GET(NAME) settings.value (settings_names::NAME, settings_values::NAME)
QSettings settings; QSettings settings;
settings.beginGroup (settings_names::guiGroup); settings.beginGroup (settings_names::guiGroup);
QString captureHotkey = settings.value (settings_names::captureHotkey,
settings_values::captureHotkey).toString ();
Q_CHECK_PTR (captureAction_); Q_CHECK_PTR (captureAction_);
GlobalActionHelper::removeGlobal (captureAction_); GlobalActionHelper::removeGlobal (captureAction_);
captureAction_->setShortcut (captureHotkey); captureAction_->setShortcut (GET (captureHotkey).toString ());
GlobalActionHelper::makeGlobal (captureAction_); GlobalActionHelper::makeGlobal (captureAction_);
QString repeatHotkey = settings.value (settings_names::repeatHotkey,
settings_values::repeatHotkey).toString ();
Q_CHECK_PTR (repeatAction_); Q_CHECK_PTR (repeatAction_);
GlobalActionHelper::removeGlobal (repeatAction_); GlobalActionHelper::removeGlobal (repeatAction_);
repeatAction_->setShortcut (repeatHotkey); repeatAction_->setShortcut (GET (repeatHotkey).toString ());
GlobalActionHelper::makeGlobal (repeatAction_); GlobalActionHelper::makeGlobal (repeatAction_);
QString clipboardHotkey = settings.value (settings_names::clipboardHotkey,
settings_values::clipboardHotkey).toString ();
Q_CHECK_PTR (clipboardAction_); Q_CHECK_PTR (clipboardAction_);
GlobalActionHelper::removeGlobal (clipboardAction_); GlobalActionHelper::removeGlobal (clipboardAction_);
clipboardAction_->setShortcut (clipboardHotkey); clipboardAction_->setShortcut (GET (clipboardHotkey).toString ());
GlobalActionHelper::makeGlobal (clipboardAction_); GlobalActionHelper::makeGlobal (clipboardAction_);
// Depends on SettingsEditor button indexes. 1==dialog // Depends on SettingsEditor button indexes. 1==dialog
useResultDialog_ = settings.value (settings_names::resultShowType, useResultDialog_ = GET (resultShowType).toBool ();
settings_values::resultShowType).toBool ();
Q_CHECK_PTR (dictionary_); Q_CHECK_PTR (dictionary_);
dictionary_->updateAvailableOcrLanguages (); dictionary_->updateAvailableOcrLanguages ();
#undef GET
} }
Manager::~Manager () { Manager::~Manager () {