Use QKeySequenceEdit in settings.

This commit is contained in:
Gres 2015-09-27 18:57:50 +03:00
parent 670fda2ac5
commit 26ddd92584
2 changed files with 33 additions and 42 deletions

View File

@ -39,28 +39,29 @@ void SettingsEditor::done (int result) {
} }
void SettingsEditor::saveSettings () const { void SettingsEditor::saveSettings () const {
using namespace settings_names;
QSettings settings; QSettings settings;
settings.beginGroup (settings_names::guiGroup); settings.beginGroup (guiGroup);
settings.setValue (settings_names::captureHotkey, ui->captureEdit->text ()); settings.setValue (captureHotkey, ui->captureEdit->keySequence ().toString ());
settings.setValue (settings_names::repeatHotkey, ui->repeatEdit->text ()); settings.setValue (repeatHotkey, ui->repeatEdit->keySequence ().toString ());
settings.setValue (settings_names::clipboardHotkey, ui->clipboardEdit->text ()); settings.setValue (clipboardHotkey, ui->clipboardEdit->keySequence ().toString ());
settings.setValue (settings_names::resultShowType, buttonGroup_->checkedId ()); settings.setValue (resultShowType, buttonGroup_->checkedId ());
settings.endGroup (); settings.endGroup ();
settings.beginGroup (settings_names::recogntionGroup); settings.beginGroup (recogntionGroup);
settings.setValue (settings_names::tessDataPlace, ui->tessdataEdit->text ()); settings.setValue (tessDataPlace, ui->tessdataEdit->text ());
QString ocrLanguage = dictionary_.ocrUiToCode (ui->ocrLangCombo->currentText ()); QString ocrLanguage = dictionary_.ocrUiToCode (ui->ocrLangCombo->currentText ());
settings.setValue (settings_names::ocrLanguage, ocrLanguage); settings.setValue (ocrLanguage, ocrLanguage);
settings.setValue (settings_names::imageScale, ui->imageScaleSpin->value ()); settings.setValue (imageScale, ui->imageScaleSpin->value ());
settings.endGroup (); settings.endGroup ();
settings.beginGroup (settings_names::translationGroup); settings.beginGroup (translationGroup);
QString trLanguage = dictionary_.translateUiToCode (ui->translateLangCombo->currentText ()); QString trLanguage = dictionary_.translateUiToCode (ui->translateLangCombo->currentText ());
settings.setValue (settings_names::translationLanguage, trLanguage); settings.setValue (translationLanguage, trLanguage);
QString sourceLanguage = dictionary_.translateForOcrCode (ocrLanguage); QString sourceLanguage = dictionary_.translateForOcrCode (ocrLanguage);
settings.setValue (settings_names::sourceLanguage, sourceLanguage); settings.setValue (sourceLanguage, sourceLanguage);
settings.endGroup (); settings.endGroup ();
} }
@ -81,9 +82,9 @@ void SettingsEditor::loadSettings () {
QSettings settings; QSettings settings;
settings.beginGroup (settings_names::guiGroup); settings.beginGroup (settings_names::guiGroup);
ui->captureEdit->setText (GET (captureHotkey).toString ()); ui->captureEdit->setKeySequence (QKeySequence (GET (captureHotkey).toString ()));
ui->repeatEdit->setText (GET (repeatHotkey).toString ()); ui->repeatEdit->setKeySequence (QKeySequence (GET (repeatHotkey).toString ()));
ui->clipboardEdit->setText (GET (clipboardHotkey).toString ()); ui->clipboardEdit->setKeySequence (QKeySequence (GET (clipboardHotkey).toString ()));
QAbstractButton *button = buttonGroup_->button (GET (resultShowType).toInt ()); QAbstractButton *button = buttonGroup_->button (GET (resultShowType).toInt ());
Q_CHECK_PTR (button); Q_CHECK_PTR (button);
button->setChecked (true); button->setChecked (true);

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>435</width> <width>435</width>
<height>221</height> <height>242</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -28,29 +28,10 @@
<property name="text"> <property name="text">
<string>Захватить</string> <string>Захватить</string>
</property> </property>
<property name="buddy">
<cstring>captureEdit</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1" colspan="2"> <item row="0" column="1">
<widget class="QLineEdit" name="captureEdit"/> <widget class="QKeySequenceEdit" name="captureEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сочетание клавиш для перехода в режим захвата.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Скопировать</string>
</property>
<property name="buddy">
<cstring>captureEdit</cstring>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="clipboardEdit"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
@ -60,13 +41,23 @@
<property name="text"> <property name="text">
<string>Повторить</string> <string>Повторить</string>
</property> </property>
<property name="buddy"> </widget>
<cstring>captureEdit</cstring> </item>
<item row="1" column="1">
<widget class="QKeySequenceEdit" name="repeatEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Сочетание клавиш для перехода в режим захвата.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Скопировать</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2"> <item row="2" column="1">
<widget class="QLineEdit" name="repeatEdit"/> <widget class="QKeySequenceEdit" name="clipboardEdit"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -225,7 +216,6 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>captureEdit</tabstop>
<tabstop>translateLangCombo</tabstop> <tabstop>translateLangCombo</tabstop>
<tabstop>tessdataEdit</tabstop> <tabstop>tessdataEdit</tabstop>
<tabstop>tessdataButton</tabstop> <tabstop>tessdataButton</tabstop>