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 branch 'pr574'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-29 21:37:39 +01:00
commit e5f801f616
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc/smileypack.cpp
View File

@ -68,11 +68,13 @@ QList<QPair<QString, QString> > SmileyPack::listSmileyPacks(const QStringList &p
QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(absPath); QString relPath = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(absPath);
if (relPath.leftRef(2) == "..") if (relPath.leftRef(2) == "..")
smileyPacks << QPair<QString, QString>(packageName, absPath); {
else if(!smileyPacks.contains(QPair<QString, QString>(packageName, absPath)))
smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories smileyPacks << QPair<QString, QString>(packageName, absPath);
else if(!smileyPacks.contains(QPair<QString, QString>(packageName, relPath)))
smileyPacks << QPair<QString, QString>(packageName, relPath); // use relative path for subdirectories
}
} }
dir.cdUp(); dir.cdUp();
} }
} }

4
src/widget/form/settings/generalform.cpp
View File

@ -62,7 +62,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
bodyUI->autoAwaySpinBox->setValue(Settings::getInstance().getAutoAwayTime()); bodyUI->autoAwaySpinBox->setValue(Settings::getInstance().getAutoAwayTime());
bodyUI->cbUDPDisabled->setChecked(Settings::getInstance().getForceTCP()); bodyUI->cbUDPDisabled->setChecked(!Settings::getInstance().getForceTCP());
bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr()); bodyUI->proxyAddr->setText(Settings::getInstance().getProxyAddr());
int port = Settings::getInstance().getProxyPort(); int port = Settings::getInstance().getProxyPort();
if (port != -1) if (port != -1)
@ -153,7 +153,7 @@ void GeneralForm::onSmileyBrowserIndexChanged(int index)
void GeneralForm::onUDPUpdated() void GeneralForm::onUDPUpdated()
{ {
Settings::getInstance().setForceTCP(bodyUI->cbUDPDisabled->isChecked()); Settings::getInstance().setForceTCP(!bodyUI->cbUDPDisabled->isChecked());
} }
void GeneralForm::onProxyAddrEdited() void GeneralForm::onProxyAddrEdited()

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

@ -299,7 +299,7 @@
<string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string> <string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string>
</property> </property>
<property name="text"> <property name="text">
<string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string> <string extracomment="Text on checkbox to disable UDP">Enable UDP (recommended)</string>
</property> </property>
</widget> </widget>
</item> </item>