WindyMadman/qBittorrent-Enhanced-Edition
1
0
Fork 0
mirror of https://github.com/c0re100/qBittorrent-Enhanced-Edition.git synced 2025-01-08 11:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Enhanced header

Browse Source
This commit is contained in:
c0re100 2022-01-08 01:19:31 +08:00
parent 9b95275173
commit 4328a18e37
No known key found for this signature in database
GPG Key ID: 7C3B3004FE745AAF
9 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/bittorrent/session.cpp
View File

@ -116,7 +116,7 @@ const QString CATEGORIES_FILE_NAME {QStringLiteral("categories.json")};
namespace
{
const char PEER_ID[] = "qB";
const char USER_AGENT[] = "qBittorrent/" QBT_VERSION_2;
const char USER_AGENT[] = "qBittorrent Enhanced/" QBT_VERSION_2;
void torrentQueuePositionUp(const lt::torrent_handle &handle)
{

4
src/base/net/dnsupdater.cpp
View File

@ -76,7 +76,7 @@ void DNSUpdater::checkPublicIP()
Q_ASSERT(m_state == OK);
DownloadManager::instance()->download(
DownloadRequest("http://checkip.dyndns.org").userAgent("qBittorrent/" QBT_VERSION_2)
DownloadRequest("http://checkip.dyndns.org").userAgent("qBittorrent Enhanced/" QBT_VERSION_2)
, this, &DNSUpdater::ipRequestFinished);
m_lastIPCheckTime = QDateTime::currentDateTime();
@ -124,7 +124,7 @@ void DNSUpdater::updateDNSService()
m_lastIPCheckTime = QDateTime::currentDateTime();
DownloadManager::instance()->download(
DownloadRequest(getUpdateUrl()).userAgent("qBittorrent/" QBT_VERSION_2)
DownloadRequest(getUpdateUrl()).userAgent("qBittorrent Enhanced/" QBT_VERSION_2)
, this, &DNSUpdater::ipUpdateFinished);
}

8
src/gui/aboutdialog.cpp
View File

@ -48,7 +48,7 @@ AboutDialog::AboutDialog(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose);
// Title
m_ui->labelName->setText(QString::fromLatin1("<b><h2>qBittorrent " QBT_VERSION " (%1-bit)</h2></b>").arg(QT_POINTER_SIZE * 8));
m_ui->labelName->setText(QString::fromLatin1("<b><h2>qBittorrent Enhanced Edition " QBT_VERSION " (%1-bit)</h2></b>").arg(QT_POINTER_SIZE * 8));
m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(UIThemeManager::instance()->getIconPath(QLatin1String("qbittorrent-tray")), this, 32));
@ -61,13 +61,17 @@ AboutDialog::AboutDialog(QWidget *parent)
"<tr><td>%3</td><td><a href=\"https://www.qbittorrent.org\">https://www.qbittorrent.org</a></td></tr>"
"<tr><td>%4</td><td><a href=\"http://forum.qbittorrent.org\">http://forum.qbittorrent.org</a></td></tr>"
"<tr><td>%5</td><td><a href=\"http://bugs.qbittorrent.org\">http://bugs.qbittorrent.org</a></td></tr>"
"<tr><td>%6</td><td><a href=\"https://github.com/c0re100/qBittorrent-Enhanced-Edition\">GitHub Repository</a></td></tr>"
"<tr><td>%7</td><td><a href=\"https://t.me/loli_make_the_world_great_again\">Husky</a></td></tr>"
"</table>"
"</p>")
.arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.")
, tr("Copyright %1 2006-2022 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT))
, tr("Home Page:")
, tr("Forum:")
, tr("Bug Tracker:"));
, tr("Bug Tracker:")
, tr("Enhanced Edition:")
, tr("Maintainer:"));
m_ui->labelAbout->setText(aboutText);
m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/mascot.png", this));

6
src/gui/mainwindow.cpp
View File

@ -136,7 +136,7 @@ MainWindow::MainWindow(QWidget *parent)
Preferences *const pref = Preferences::instance();
m_uiLocked = pref->isUILocked();
setWindowTitle("qBittorrent " QBT_VERSION);
setWindowTitle("qBittorrent Enhanced Edition" QBT_VERSION);
m_displaySpeedInTitle = pref->speedInTitleBar();
// Setting icons
#ifndef Q_OS_MACOS
@ -1625,7 +1625,7 @@ void MainWindow::reloadSessionStats()
if (m_displaySpeedInTitle)
{
setWindowTitle(tr("[D: %1, U: %2] qBittorrent %3", "D = Download; U = Upload; %3 is qBittorrent version")
setWindowTitle(tr("[D: %1, U: %2] qBittorrent Enhanced Edition %3", "D = Download; U = Upload; %3 is qBittorrent version")
.arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)
, Utils::Misc::friendlyUnit(status.payloadUploadRate, true)
, QBT_VERSION));
@ -1815,7 +1815,7 @@ void MainWindow::on_actionSpeedInTitleBar_triggered()
if (m_displaySpeedInTitle)
reloadSessionStats();
else
setWindowTitle("qBittorrent " QBT_VERSION);
setWindowTitle("qBittorrent Enhanced Edition " QBT_VERSION);
}
void MainWindow::on_actionRSSReader_triggered()

4
src/gui/programupdater.cpp
View File

@ -75,11 +75,11 @@ namespace
void ProgramUpdater::checkForUpdates() const
{
const auto RSS_URL = QString::fromLatin1("https://www.fosshub.com/feed/5b8793a7f9ee5a5c3e97a3b2.xml");
const auto RSS_URL = QString::fromLatin1("https://husky.moe/feedqBittorent.xml");
// Don't change this User-Agent. In case our updater goes haywire,
// the filehost can identify it and contact us.
Net::DownloadManager::instance()->download(
Net::DownloadRequest(RSS_URL).userAgent("qBittorrent/" QBT_VERSION_2 " ProgramUpdater (www.qbittorrent.org)")
Net::DownloadRequest(RSS_URL).userAgent("qBittorrent Enhanced/" QBT_VERSION_2 " ProgramUpdater (git.io/qbit)")
, this, &ProgramUpdater::rssDownloadFinished);
}

2
src/webui/www/private/index.html
View File

@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=10" />
<meta name="application-name" content="qBittorrent" />
<title>qBittorrent Web UI</title>
<title>qBittorrent Enhanced Edition Web UI</title>
<link rel="icon" type="image/png" href="images/qbittorrent32.png" sizes="32x32" />
<link rel="icon" type="image/svg+xml" href="icons/qbittorrent-tray.svg" sizes="any" />
<link rel="stylesheet" type="text/css" href="css/dynamicTable.css?v=${CACHEID}" />

4
src/webui/www/private/scripts/client.js
View File

@ -722,11 +722,11 @@ window.addEvent('load', function() {
transfer_info += " (" + window.qBittorrent.Misc.friendlyUnit(serverState.up_info_data, false) + ")";
$("UpInfos").set('html', transfer_info);
if (speedInTitle) {
document.title = "QBT_TR([D: %1, U: %2] qBittorrent %3)QBT_TR[CONTEXT=MainWindow]".replace("%1", window.qBittorrent.Misc.friendlyUnit(serverState.dl_info_speed, true)).replace("%2", window.qBittorrent.Misc.friendlyUnit(serverState.up_info_speed, true)).replace("%3", qbtVersion());
document.title = "QBT_TR([D: %1, U: %2] qBittorrent Enhanced Edition %3)QBT_TR[CONTEXT=MainWindow]".replace("%1", window.qBittorrent.Misc.friendlyUnit(serverState.dl_info_speed, true)).replace("%2", window.qBittorrent.Misc.friendlyUnit(serverState.up_info_speed, true)).replace("%3", qbtVersion());
document.title += " QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]";
}
else
document.title = ("qBittorrent " + qbtVersion() + " QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]");
document.title = ("qBittorrent Enhanced Edition " + qbtVersion() + " QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]");
$('freeSpaceOnDisk').set('html', 'QBT_TR(Free space: %1)QBT_TR[CONTEXT=HttpServer]'.replace("%1", window.qBittorrent.Misc.friendlyUnit(serverState.free_space_on_disk)));
$('DHTNodes').set('html', 'QBT_TR(DHT: %1 nodes)QBT_TR[CONTEXT=StatusBar]'.replace("%1", serverState.dht_nodes));

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

@ -19,6 +19,14 @@
<td>QBT_TR(Forum:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a href="http://forum.qbittorrent.org" target="_blank">http://forum.qbittorrent.org</a></td>
</tr>
<tr>
<td>QBT_TR(Enhanced Edition:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a href="https://github.com/c0re100/qBittorrent-Enhanced-Edition" target="_blank">GitHub Repository</a></td>
</tr>
<tr>
<td>QBT_TR(Maintainer:)QBT_TR[CONTEXT=AboutDialog]</td>
<td><a href="https://t.me/loli_make_the_world_great_again" target="_blank">Husky</a></td>
</tr>
</table>
</div>
@ -671,7 +679,7 @@
'use strict';
(function() {
$('qbittorrentVersion').innerText = ("qBittorrent " + qbtVersion()
$('qbittorrentVersion').innerText = ("qBittorrent Enhanced Edition " + qbtVersion()
+ " QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]");
new Request.JSON({

4
src/webui/www/public/index.html
View File

@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<title>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
<title>qBittorrent Enhanced Edition QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
<link rel="icon" type="image/png" href="images/qbittorrent32.png" />
<link rel="icon" type="image/svg+xml" href="icons/qbittorrent-tray.svg" />
<link rel="stylesheet" type="text/css" href="css/login.css?v=${CACHEID}" />
@ -18,7 +18,7 @@
<h1>QBT_TR(JavaScript Required! You must enable JavaScript for the Web UI to work properly)QBT_TR[CONTEXT=HttpServer]</h1>
</noscript>
<div id="main">
<h1>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</h1>
<h1>qBittorrent Enhanced Edition QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</h1>
<div id="logo" class="col">
<img src="icons/qbittorrent-tray.svg" alt="qBittorrent logo" />
</div>