Merge branch 'pr574'

src/misc/smileypack.cpp

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

src/widget/form/settings/generalform.cpp

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

src/widget/form/settings/generalsettings.ui

@@ -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>
             </property>
             <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>
            </widget>
           </item>