StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'zetok/settings'

Browse Source
This commit is contained in:
agilob 2015-08-28 19:27:10 +01:00
commit 7b3ddff202
No known key found for this signature in database
GPG Key ID: 296F0B764741106C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget/form/settings/advancedform.cpp
View File

@ -36,9 +36,9 @@ AdvancedForm::AdvancedForm() :
bodyUI->cbMakeToxPortable->setChecked(Settings::getInstance().getMakeToxPortable()); bodyUI->cbMakeToxPortable->setChecked(Settings::getInstance().getMakeToxPortable());
bodyUI->syncTypeComboBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); bodyUI->syncTypeComboBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
bodyUI->syncTypeComboBox->addItems({tr("FULL - very safe, slowest (recommended)"), bodyUI->syncTypeComboBox->addItems({tr("Synchronized - safe / recommended"),
tr("NORMAL - almost as safe as FULL, about 20% faster than FULL"), tr("Partially async - risky / 20% faster"),
tr("OFF - disables all safety, when something goes wrong your history may be lost, fastest (not recommended)") tr("Asynchronous - dangerous / fastest")
}); });
int index = 2 - static_cast<int>(Settings::getInstance().getDbSyncType()); int index = 2 - static_cast<int>(Settings::getInstance().getDbSyncType());
bodyUI->syncTypeComboBox->setCurrentIndex(index); bodyUI->syncTypeComboBox->setCurrentIndex(index);

2
src/widget/form/settings/advancedsettings.ui
View File

@ -73,7 +73,7 @@
<item> <item>
<widget class="QLabel" name="dbLabel"> <widget class="QLabel" name="dbLabel">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.sqlite.org/pragma.html#pragma_synchronous&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Synchronous writing to DB&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.sqlite.org/pragma.html#pragma_synchronous&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Writing to DB&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>