diff --git a/README.md b/README.md index 60407cb0e..b9c13a606 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ qTox [![Build Status](https://travis-ci.org/tux3/qTox.svg)](https://travis-ci.or ---- * **Windows**: - - [**64 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_windows_x86-64_release/lastSuccessfulBuild/artifact/qTox_build_windows_x86-64_release.zip) - - [**32 bit download** (for older hardware)](https://build.tox.chat/view/Clients/job/qTox_build_windows_x86_release/lastSuccessfulBuild/artifact/qTox_build_windows_x86_release.zip) + - [**64 bit download**](https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86-64_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe) + - [**32 bit download**](https://build.tox.chat/view/qtox/job/qTox_pkg_windows_x86_stable_release/lastSuccessfulBuild/artifact/setup-qtox.exe) * **Linux**: - [**64 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_linux_x86-64_release/lastSuccessfulBuild/artifact/qTox_build_linux_x86-64_release.tar.xz) - [**32 bit download**](https://build.tox.chat/view/Clients/job/qTox_build_linux_x86_release/lastSuccessfulBuild/artifact/qTox_build_linux_x86_release.tar.xz) diff --git a/qtox.pro b/qtox.pro index c9fefdcaf..2c8b487da 100644 --- a/qtox.pro +++ b/qtox.pro @@ -142,8 +142,8 @@ contains(DEFINES, QTOX_PLATFORM_EXT) { win32 { RC_FILE = windows/qtox.rc LIBS += -L$$PWD/libs/lib -ltoxav -ltoxcore -ltoxencryptsave -ltoxdns -lsodium -lvpx -lpthread - LIBS += -L$$PWD/libs/lib -lavformat -lavdevice -lavcodec -lavutil -lswscale -lOpenAL32 -lopus - LIBS += -lopengl32 -lole32 -loleaut32 -lvfw32 -lws2_32 -liphlpapi -lz -luuid + LIBS += -L$$PWD/libs/lib -lavdevice -lavformat -lavcodec -lavutil -lswscale -lOpenAL32 -lopus + LIBS += -lopengl32 -lole32 -loleaut32 -lvfw32 -lws2_32 -liphlpapi -lgdi32 -lshlwapi -luuid LIBS += -lqrencode LIBS += -lstrmiids # For DirectShow contains(DEFINES, QTOX_FILTER_AUDIO) { diff --git a/src/net/autoupdate.cpp b/src/net/autoupdate.cpp index d5b1fa6d2..0d72cfd5c 100644 --- a/src/net/autoupdate.cpp +++ b/src/net/autoupdate.cpp @@ -47,7 +47,7 @@ const QString AutoUpdater::platform = "win64"; const QString AutoUpdater::platform = "win32"; #endif const QString AutoUpdater::updaterBin = "qtox-updater.exe"; -const QString AutoUpdater::updateServer = "http://45.79.166.124"; +const QString AutoUpdater::updateServer = "https://qtox-win.pkg.tox.chat"; unsigned char AutoUpdater::key[crypto_sign_PUBLICKEYBYTES] = { @@ -86,6 +86,9 @@ bool AutoUpdater::isUpdateAvailable() if (isDownloadingUpdate) return false; + if (!QFile::exists(updaterBin)) + return false; + QByteArray updateFlist = getUpdateFlist(); QList diff = genUpdateDiff(parseFlist(updateFlist)); return !diff.isEmpty(); @@ -100,6 +103,9 @@ AutoUpdater::VersionInfo AutoUpdater::getUpdateVersion() if (platform.isEmpty()) return versionInfo; + if (abortFlag) + return versionInfo; + QNetworkAccessManager *manager = new QNetworkAccessManager; QNetworkReply* reply = manager->get(QNetworkRequest(QUrl(checkURI))); while (!reply->isFinished()) @@ -531,6 +537,8 @@ void AutoUpdater::checkUpdatesAsyncInteractiveWorker() QDateTime::fromMSecsSinceEpoch(newVersion.timestamp*1000).toString()); + if (abortFlag) + return; if (GUI::askQuestion(QObject::tr("Update", "The title of a message box"), contentText, true, false)) diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index 61d61e14d..3aa214a45 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -165,7 +165,7 @@ void Settings::loadGlobal() currentProfileId = makeProfileId(currentProfile); } autoAwayTime = s.value("autoAwayTime", 10).toInt(); - checkUpdates = s.value("checkUpdates", false).toBool(); + checkUpdates = s.value("checkUpdates", true).toBool(); showWindow = s.value("showWindow", true).toBool(); showInFront = s.value("showInFront", false).toBool(); notifySound = s.value("notifySound", true).toBool(); diff --git a/src/widget/systemtrayicon.cpp b/src/widget/systemtrayicon.cpp index 86d7881b6..a7f3ef183 100644 --- a/src/widget/systemtrayicon.cpp +++ b/src/widget/systemtrayicon.cpp @@ -38,7 +38,7 @@ SystemTrayIcon::SystemTrayIcon() { qDebug() << "Using Unity backend"; gtk_init(nullptr, nullptr); - QString settingsDir = Settings::getSettingsDirPath(); + QString settingsDir = Settings::getInstance().getSettingsDirPath(); QFile iconFile(settingsDir+"/icon.png"); if (iconFile.open(QIODevice::Truncate | QIODevice::WriteOnly)) { @@ -108,7 +108,7 @@ QString SystemTrayIcon::extractIconToFile(QIcon icon, QString name) (void) icon; (void) name; #ifdef ENABLE_SYSTRAY_UNITY_BACKEND - iconPath = Settings::getSettingsDirPath()+"/"+name+".png"; + iconPath = Settings::getInstance().getSettingsDirPath()+"/"+name+".png"; QSize iconSize = icon.actualSize(QSize{64,64}); icon.pixmap(iconSize).save(iconPath); #endif diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 585f82adc..363f3d082 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -741,52 +741,31 @@ void Widget::confirmExecutableOpen(const QFileInfo &file) void Widget::onIconClick(QSystemTrayIcon::ActivationReason reason) { - switch (reason) + if (reason == QSystemTrayIcon::Trigger) { - case QSystemTrayIcon::Trigger: + if (isHidden() || isMinimized()) { - if (isHidden()) - { - show(); - activateWindow(); - if (wasMaximized) - showMaximized(); - else - showNormal(); - } - else if (isMinimized()) - { - forceShow(); - activateWindow(); - if (wasMaximized) - showMaximized(); - else - showNormal(); - } + if (wasMaximized) + showMaximized(); else - { - wasMaximized = isMaximized(); - if (Settings::getInstance().getMinimizeToTray()) - hide(); - else - showMinimized(); - } + showNormal(); - break; + activateWindow(); } - case QSystemTrayIcon::MiddleClick: + else if (!isActiveWindow()) + { + activateWindow(); + } + else + { wasMaximized = isMaximized(); - if (Settings::getInstance().getMinimizeToTray()) - hide(); - else - showMinimized(); - break; - case QSystemTrayIcon::Unknown: - if (isHidden()) - forceShow(); - break; - default: - break; + hide(); + } + } + else if (reason == QSystemTrayIcon::Unknown) + { + if (isHidden()) + forceShow(); } } diff --git a/translations/it.ts b/translations/it.ts index 2a66944cd..025ee8b6e 100644 --- a/translations/it.ts +++ b/translations/it.ts @@ -121,6 +121,148 @@ Può capitare che la tua connessione ad internet non sia abbastanza veloce per g qualità video elevate, questo può causare problemi con le chiamate video. + + AboutForm + + About + About + + + Qt version: + Versione Qt: + + + + AboutSettings + + Form + Form + + + Version + Versione + + + You are using a qTox nightly build. + Stai utilizzando la versione nightly build di qTox. + + + Commit hash: <a href="https://github.com/tux3/qTox/commit/$GIT_VERSION">$GIT_VERSION</a> + Commit hash: <a href="https://github.com/tux3/qTox/commit/$GIT_VERSION">$GIT_VERSION</a> + + + toxcore version: $TOXCOREVERSION + Versione toxcore: $TOXCOREVERSION + + + Qt version: + Versione Qt: + + + License + Licenza + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Oxygen-Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; color:#000000;">Copyright © 2014-2015 by The qTox Project</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">qTox is a Qt-based graphical interface for Tox.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox is libre software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">You should have received a copy of the GNU General Public License along with this program. If not, see </span><a href="https://www.gnu.org/copyleft/gpl.html"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#007af4;">https://www.gnu.org/copyleft/gpl.html</span></a><span style=" font-family:'Ubuntu';">.</span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Oxygen-Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; color:#000000;">Copyright © 2014-2015 by The qTox Project</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">qTox è un'interfaccia grafica per Tox basato su Qt.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox è un software libero: è possibile ridistribuirlo o modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, o la versione 3 della licenza o (a tua scelta) qualsiasi versione successiva.</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox è distribuito nella speranza che sia utile, ma senza alcuna garanzia; senza neppure la garanzia implicita di commerciabilità o idoneità per uno scopo particolare. Vedi la GNU General Public License per maggiori dettagli. </span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">Dovresti aver ricevuto una copia della GNU General Public License insieme a questo programma. In caso contrario, vedere </span><a href="https://www.gnu.org/copyleft/gpl.html"><span style=" font-family:'Ubuntu'; text-decoration: underline; color:#007af4;">https://www.gnu.org/copyleft/gpl.html</span></a><span style=" font-family:'Ubuntu';">.</span></p></body></html> + + + Authors + Autori + + + <html><head/><body><p>Original author: <a href="https://github.com/tux3"><span style=" text-decoration: underline; color:#0000ff;">tux3</span></a></p><p>See a full list of <a href="https://github.com/tux3/qTox/graphs/contributors"><span style=" text-decoration: underline; color:#0000ff;">contributors</span></a> at Github</p></body></html> + <html><head/><body><p>Autore originale : <a href="https://github.com/tux3"><span style=" text-decoration: underline; color:#0000ff;">tux3</span></a></p><p>Guarda la lista completa degli <a href="https://github.com/tux3/qTox/graphs/contributors"><span style=" text-decoration: underline; color:#0000ff;">sviluppatori</span></a> su Github</p></body></html> + + + Known Issues + Problemi Noti + + + <html><head/><body><p>A list of all known issues may be found at our <a href="https://github.com/tux3/qTox/issues"><span style=" text-decoration: underline; color:#0000ff;">bug-tracker</span></a> at Github. If you discover a bug or security vulnerability within qTox, please report it according to the guidelines in our <a href="https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports"><span style=" text-decoration: underline; color:#0000ff;">Writing Useful Bug Reports</span></a> wiki article.</p></body></html> + <html><head/><body><p>Un elenco di tutti i problemi noti può essere trovato presso il nostro <a href="https://github.com/tux3/qTox/issues"><span style=" text-decoration: underline; color:#0000ff;">bug-tracker</span></a> su Github. Se si trova un bug o una vulnerabilità all'interno di qTox, si prega di segnalarlo secondo le linee guida nel nostro <a href="https://github.com/tux3/qTox/wiki/Writing-Useful-Bug-Reports"><span style=" text-decoration: underline; color:#0000ff;">Writing Useful Bug Reports</span></a> articolo di wiki.</p></body></html> + + + + AboutUser + + Dialog + + + + username + Nome profilo + + + status message + messagggio di stato + + + Public key: + Chiave pubblica: + + + Used aliases: + Soprannomi usati: + + + HISTORY OF ALIASES + Cronologia dei soprannomi + + + Default directory to save files: + Cartella predefinita per salvare i file: + + + Auto accept for this contact is disabled + + + + Auto accept files + Accetta automaticamente i file + + + Remove history (operation can not be undone!) + Rimuovi la cronologia (questa operazione non può essere cancellata!) + + + Notes + Note + + + You can save comment about this contact here. + È possibile salvare un commento su questo contatto qui. + + + Choose an auto accept directory + popup title + Scegliere una cartella dove accettare automaticamente i file + + + History removed + Cronologia rimossa + + + Chat history with %1 removed! + Cronologia chat con %1 rimossa! + + AddFriendForm @@ -1545,7 +1687,7 @@ password: The passwords you've entered are different. Please make sure to enter same password twice. - Le passwords che hai inserito sono diverse. + Le password che hai inserito sono diverse. Assicurati di inserire la stessa password due volte. @@ -2009,7 +2151,7 @@ Permettimi di aggiungerti alla mia lista contatti. The passwords don't match. - Le passwords non corrispondono. + Le password non corrispondono. @@ -2019,7 +2161,7 @@ Permettimi di aggiungerti alla mia lista contatti. The password doesn't match. - Le passwords non corrispondono. + Le password non corrispondono.