d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-26 06:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11862 from Chocobo1/year

Browse Source 
Bump copyright year and other fixes
This commit is contained in:
Mike Tzou 2020-01-12 12:01:10 +08:00 committed by GitHub
commit 1592eb7be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/mac/Info.plist vendored
View File

@ -67,7 +67,7 @@
<key>NSAppleScriptEnabled</key> <key>NSAppleScriptEnabled</key>
<string>YES</string> <string>YES</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2006-2019 The qBittorrent project</string> <string>Copyright © 2006-2020 The qBittorrent project</string>
<key>UTExportedTypeDeclarations</key> <key>UTExportedTypeDeclarations</key>
<array> <array>
<dict> <dict>

8
dist/windows/options.nsi vendored
View File

@ -51,7 +51,7 @@ XPStyle on
;Installer Version Information ;Installer Version Information
VIAddVersionKey "ProductName" "qBittorrent" VIAddVersionKey "ProductName" "qBittorrent"
VIAddVersionKey "CompanyName" "The qBittorrent project" VIAddVersionKey "CompanyName" "The qBittorrent project"
VIAddVersionKey "LegalCopyright" "Copyright ©2006-2019 The qBittorrent project" VIAddVersionKey "LegalCopyright" "Copyright ©2006-2020 The qBittorrent project"
VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client" VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
VIAddVersionKey "FileVersion" "${PROG_VERSION}" VIAddVersionKey "FileVersion" "${PROG_VERSION}"
@ -67,7 +67,7 @@ VIProductVersion "${PROG_VERSION}.0"
InstallDir $PROGRAMFILES64\qBittorrent InstallDir $PROGRAMFILES64\qBittorrent
!endif !endif
; Registry key to check for directory (so if you install again, it will ; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically) ; overwrite the old one automatically)
InstallDirRegKey HKLM Software\qbittorrent InstallLocation InstallDirRegKey HKLM Software\qbittorrent InstallLocation
@ -85,8 +85,8 @@ RequestExecutionLevel user
;-------------------------------- ;--------------------------------
;Remember the unistaller/installer language ;Remember the unistaller/installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKLM" !define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
!define MUI_LANGDLL_REGISTRY_KEY "Software\qbittorrent" !define MUI_LANGDLL_REGISTRY_KEY "Software\qbittorrent"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;-------------------------------- ;--------------------------------

2
src/gui/aboutdialog.cpp
View File

@ -59,7 +59,7 @@ AboutDialog::AboutDialog(QWidget *parent)
"</table>" "</table>"
"</p>") "</p>")
.arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.") .arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.")
, tr("Copyright %1 2006-2019 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)) , tr("Copyright %1 2006-2020 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT))
, tr("Home Page:") , tr("Home Page:")
, tr("Forum:") , tr("Forum:")
, tr("Bug Tracker:")); , tr("Bug Tracker:"));

5
src/gui/mainwindow.cpp
View File

@ -1775,6 +1775,7 @@ void MainWindow::on_actionSearchWidget_triggered()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QMessageBox::StandardButton buttonPressed = QMessageBox::question(this, tr("Old Python Runtime") const QMessageBox::StandardButton buttonPressed = QMessageBox::question(this, tr("Old Python Runtime")
, tr("Your Python version (%1) is outdated. Minimum requirement: 2.7.9 / 3.3.0.\nDo you want to install a newer version now?") , tr("Your Python version (%1) is outdated. Minimum requirement: 2.7.9 / 3.3.0.\nDo you want to install a newer version now?")
.arg(pyInfo.version)
, (QMessageBox::Yes | QMessageBox::No), QMessageBox::Yes); , (QMessageBox::Yes | QMessageBox::No), QMessageBox::Yes);
if (buttonPressed == QMessageBox::Yes) if (buttonPressed == QMessageBox::Yes)
installPython(); installPython();
@ -2011,9 +2012,9 @@ void MainWindow::installPython()
setCursor(QCursor(Qt::WaitCursor)); setCursor(QCursor(Qt::WaitCursor));
// Download python // Download python
#ifdef QBT_APP_64BIT #ifdef QBT_APP_64BIT
const QString installerURL = "https://www.python.org/ftp/python/3.7.4/python-3.7.4-amd64.exe"; const QString installerURL = "https://www.python.org/ftp/python/3.8.1/python-3.8.1-amd64.exe";
#else #else
const QString installerURL = "https://www.python.org/ftp/python/3.7.4/python-3.7.4.exe"; const QString installerURL = "https://www.python.org/ftp/python/3.8.1/python-3.8.1.exe";
#endif #endif
Net::DownloadManager::instance()->download( Net::DownloadManager::instance()->download(
Net::DownloadRequest(installerURL).saveToFile(true) Net::DownloadRequest(installerURL).saveToFile(true)

BIN
src/qbittorrent.rc
View File

Binary file not shown.

2
src/webui/www/private/views/about.html
View File

@ -2,7 +2,7 @@
<img src="images/skin/mascot.png" style="float: right;" alt="qBittorrent Mascot" /> <img src="images/skin/mascot.png" style="float: right;" alt="qBittorrent Mascot" />
<h3 id="qbittorrentVersion"></h3> <h3 id="qbittorrentVersion"></h3>
<p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p> <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p>
<p>Copyright (c) 2011-2019 The qBittorrent project</p> <p>Copyright (c) 2011-2020 The qBittorrent project</p>
<p>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="https://www.qbittorrent.org"> https://www.qbittorrent.org</a></p> <p>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="https://www.qbittorrent.org"> https://www.qbittorrent.org</a></p>
<p>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="http://bugs.qbittorrent.org"> http://bugs.qbittorrent.org</a></p> <p>QBT_TR(Bug Tracker:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="http://bugs.qbittorrent.org"> http://bugs.qbittorrent.org</a></p>
<p>QBT_TR(Forum:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="http://forum.qbittorrent.org"> http://forum.qbittorrent.org</a></p> <p>QBT_TR(Forum:)QBT_TR[CONTEXT=AboutDialog] <a target="_blank" href="http://forum.qbittorrent.org"> http://forum.qbittorrent.org</a></p>