Edit update settings.
This commit is contained in:
parent
9892a9f29b
commit
01b5d1c919
@ -18,6 +18,8 @@ namespace settings_names {
|
|||||||
const QString proxyUser = "proxyUser";
|
const QString proxyUser = "proxyUser";
|
||||||
const QString proxyPassword = "proxyPassword";
|
const QString proxyPassword = "proxyPassword";
|
||||||
const QString proxySavePassword = "proxySavePassword";
|
const QString proxySavePassword = "proxySavePassword";
|
||||||
|
const QString autoUpdateType = "autoUpdateType";
|
||||||
|
const QString lastUpdateCheck = "lastUpdateCheck";
|
||||||
|
|
||||||
//! Recognition
|
//! Recognition
|
||||||
const QString recogntionGroup = "Recognition";
|
const QString recogntionGroup = "Recognition";
|
||||||
@ -51,6 +53,8 @@ namespace settings_values {
|
|||||||
const QString proxyUser = "";
|
const QString proxyUser = "";
|
||||||
const QString proxyPassword = "";
|
const QString proxyPassword = "";
|
||||||
const bool proxySavePassword = false;
|
const bool proxySavePassword = false;
|
||||||
|
const int autoUpdateType = 0; //Never
|
||||||
|
const QString lastUpdateCheck = "";
|
||||||
|
|
||||||
//! Recognition
|
//! Recognition
|
||||||
const QString tessDataPlace = "./";
|
const QString tessDataPlace = "./";
|
||||||
|
@ -23,6 +23,10 @@ SettingsEditor::SettingsEditor (const LanguageHelper &dictionary, QWidget *paren
|
|||||||
|
|
||||||
buttonGroup_->addButton (ui->trayRadio, 0);
|
buttonGroup_->addButton (ui->trayRadio, 0);
|
||||||
buttonGroup_->addButton (ui->dialogRadio, 1);
|
buttonGroup_->addButton (ui->dialogRadio, 1);
|
||||||
|
connect (ui->updateButton, SIGNAL (clicked (bool)), SIGNAL (updateCheckRequested ()));
|
||||||
|
QStringList updateTypes = QStringList () << tr ("Никогда") << tr ("Ежедневно")
|
||||||
|
<< tr ("Еженедельно") << tr ("Ежемесячно");
|
||||||
|
ui->updateCombo->addItems (updateTypes);
|
||||||
|
|
||||||
connect (ui->tessdataButton, SIGNAL (clicked ()), SLOT (openTessdataDialog ()));
|
connect (ui->tessdataButton, SIGNAL (clicked ()), SLOT (openTessdataDialog ()));
|
||||||
connect (ui->tessdataEdit, SIGNAL (textChanged (const QString &)),
|
connect (ui->tessdataEdit, SIGNAL (textChanged (const QString &)),
|
||||||
@ -89,6 +93,7 @@ void SettingsEditor::saveSettings () const {
|
|||||||
QNetworkProxy::setApplicationProxy (proxy);
|
QNetworkProxy::setApplicationProxy (proxy);
|
||||||
}
|
}
|
||||||
settings.setValue (proxySavePassword, ui->proxySaveCheck->isChecked ());
|
settings.setValue (proxySavePassword, ui->proxySaveCheck->isChecked ());
|
||||||
|
settings.setValue (autoUpdateType, ui->updateCombo->currentIndex ());
|
||||||
settings.endGroup ();
|
settings.endGroup ();
|
||||||
|
|
||||||
|
|
||||||
@ -179,6 +184,7 @@ void SettingsEditor::loadSettings () {
|
|||||||
else {
|
else {
|
||||||
ui->proxyPassEdit->setText (QNetworkProxy::applicationProxy ().password ());
|
ui->proxyPassEdit->setText (QNetworkProxy::applicationProxy ().password ());
|
||||||
}
|
}
|
||||||
|
ui->updateCombo->setCurrentIndex (GET (autoUpdateType).toInt ());
|
||||||
settings.endGroup ();
|
settings.endGroup ();
|
||||||
|
|
||||||
settings.beginGroup (settings_names::recogntionGroup);
|
settings.beginGroup (settings_names::recogntionGroup);
|
||||||
|
@ -26,6 +26,7 @@ class SettingsEditor : public QDialog {
|
|||||||
|
|
||||||
signals:
|
signals:
|
||||||
void settingsEdited ();
|
void settingsEdited ();
|
||||||
|
void updateCheckRequested ();
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void done (int result);
|
void done (int result);
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Общее</string>
|
<string>Общее</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_5">
|
<layout class="QGridLayout" name="gridLayout_8">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QGroupBox" name="groupBox">
|
<widget class="QGroupBox" name="groupBox">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
@ -96,32 +96,6 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QGroupBox" name="resultGroup">
|
|
||||||
<property name="title">
|
|
||||||
<string>Вывод результата</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
|
||||||
<item row="0" column="0">
|
|
||||||
<widget class="QRadioButton" name="trayRadio">
|
|
||||||
<property name="text">
|
|
||||||
<string>Трей</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QRadioButton" name="dialogRadio">
|
|
||||||
<property name="text">
|
|
||||||
<string>Окно</string>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QGroupBox" name="groupBox_2">
|
<widget class="QGroupBox" name="groupBox_2">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Прокси</string>
|
<string>Прокси</string>
|
||||||
@ -194,6 +168,86 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="resultGroup">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="title">
|
||||||
|
<string>Вывод результата</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QRadioButton" name="trayRadio">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Трей</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QRadioButton" name="dialogRadio">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Окно</string>
|
||||||
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupBox_3">
|
||||||
|
<property name="title">
|
||||||
|
<string>Обновление</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QGridLayout" name="gridLayout_5">
|
||||||
|
<item row="0" column="0">
|
||||||
|
<widget class="QLabel" name="label_17">
|
||||||
|
<property name="text">
|
||||||
|
<string>Проверять обновления:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QComboBox" name="updateCombo"/>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QPushButton" name="updateButton">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Проверить</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
Loading…
Reference in New Issue
Block a user