diff --git a/core.cpp b/core.cpp index fbba751c0..db9e62b2c 100644 --- a/core.cpp +++ b/core.cpp @@ -161,7 +161,7 @@ void Core::start() return; } - qsrand(time(nullptr)); + qsrand(time(nullptr)); // where do we find the data file? QString path; @@ -943,7 +943,6 @@ void Core::saveConfiguration(const QString& path) delete[] data; } - qDebug() << "Core: writing settings"; Settings::getInstance().save(); } diff --git a/debian/changelog b/debian/changelog index 5b1593c67..1b56f518a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qtox (0.01pre-alpha-1) UNRELEASED; urgency=medium local package +qtox (1.0-1) UNRELEASED; urgency=medium local package * Initial release. diff --git a/res/settings.ini b/res/settings.ini index 25d126190..e335c7c8d 100644 --- a/res/settings.ini +++ b/res/settings.ini @@ -1,6 +1,6 @@ [DHT%20Server] dhtServerList\size=9 -dhtServerList\1\name=stqism +dhtServerList\1\name=Nikolai Toryzin dhtServerList\1\userId=951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F dhtServerList\1\address=192.254.75.98 dhtServerList\1\port=33445 @@ -36,3 +36,7 @@ dhtServerList\9\name=SylvieLorxu dhtServerList\9\userId=4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057 dhtServerList\9\address=178.21.112.187 dhtServerList\9\port=33445 +dhtServerList\10\name=Unknown (uTox) +dhtServerList\10\userId=7187969BB10B54C98538BAE94C069CE5C84E650D54F7E596543D8FB1ECF4CF23 +dhtServerList\10\address=95.85.13.245 +dhtServerList\10\port=33445 diff --git a/settings.cpp b/settings.cpp index 434236d4e..f2fcf58c0 100644 --- a/settings.cpp +++ b/settings.cpp @@ -30,7 +30,7 @@ const QString Settings::FILENAME = "settings.ini"; bool Settings::makeToxPortable{false}; Settings::Settings() : - loaded(false) + loaded(false), useCustomDhtList{false} { load(); } @@ -54,7 +54,14 @@ void Settings::load() QFile portableSettings(FILENAME); if (portableSettings.exists()) - makeToxPortable=true; + { + QSettings ps(FILENAME, QSettings::IniFormat); + ps.beginGroup("General"); + makeToxPortable = ps.value("makeToxPortable", false).toBool(); + ps.endGroup(); + } + else + makeToxPortable = false; QString filePath = QDir(getSettingsDirPath()).filePath(FILENAME); @@ -65,19 +72,28 @@ void Settings::load() filePath = ":/conf/" + FILENAME; } + qDebug() << "Settings: Loading from "< dhtServerList; int dhtServerId; bool dontShowDhtDialog; diff --git a/tools/buildPackages.sh b/tools/buildPackages.sh index d0ec345c0..dc01f4a82 100755 --- a/tools/buildPackages.sh +++ b/tools/buildPackages.sh @@ -1,7 +1,7 @@ #!/bin/bash # Config (Update me if needed !) -VERSION_UPSTREAM="0.01pre-alpha" +VERSION_UPSTREAM="1.0" VERSION_PACKAGE="1" PACKAGENAME="qtox" UPSTREAM_URL="https://github.com/tux3/qTox/archive/master.tar.gz"