Browse Source

Merge pull request #13567 from Chocobo1/typo

Fix typos
adaptive-webui-19844
Mike Tzou 4 years ago committed by GitHub
parent
commit
39c61327b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      Changelog
  2. 4
      src/app/qtlocalpeer/qtlockedfile.cpp
  3. 2
      src/base/bittorrent/magneturi.cpp
  4. 2
      src/gui/mainwindow.cpp
  5. 2
      src/webui/www/private/scripts/contextmenu.js
  6. 6
      src/webui/www/private/scripts/dynamicTable.js
  7. 14
      src/webui/www/private/views/rss.html

12
Changelog

@ -86,7 +86,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0 @@ -86,7 +86,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
- BUGFIX: Remove the max half-open connections option (thalieht)
- BUGFIX: Center align the section labels in advanced settings (thalieht)
- BUGFIX: Add documentation links to some advanced settings (thalieht)
- BUGFIX: Impove DownloadManager code (glassez)
- BUGFIX: Improve DownloadManager code (glassez)
- BUGFIX: Limit DownloadHandler max redirection to 20 (Chocobo1)
- BUGFIX: Log DownloadManager SSL errors (Chocobo1)
- BUGFIX: Force recheck multiple torrents one by one (glassez)
@ -317,10 +317,10 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0 @@ -317,10 +317,10 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
- BUGFIX: Restore torrent in two steps (glassez)
- BUGFIX: Improve scaling of speed graphs (dzmat)
- BUGFIX: Add isNetworkFileSystem() detection on Windows. This allows network mounts to be monitored correctly by polling timer. (Chocobo1)
- BUGFIX: Reduce horizontal graphs resolution. Improves perfomance. (dzmat)
- BUGFIX: Reduce horizontal graphs resolution. Improves performance. (dzmat)
- BUGFIX: Don't recheck just checked torrent (mj-p, glassez)
- BUGFIX: Add SMB2 magic number (Chocobo1)
- BUGFIX: Restore startup perfomance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
- BUGFIX: Restore startup performance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
- BUGFIX: Make strings actually translatable (sledgehammer999)
- WEBUI: Handle downloading .torrent file as success (Tom Piccirello)
- WEBUI: Fix Alternative Web UI to be available (glassez)
@ -391,7 +391,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0 @@ -391,7 +391,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
- BUGFIX: Improve torrent initialization (glassez)
- BUGFIX: Save resume data on torrent change events (glassez)
- BUGFIX: Increase default resume data save interval (Chocobo1)
- BUGFIX: Work around crash when procesing recursive download. Closes #9086 (Chocobo1)
- BUGFIX: Work around crash when processing recursive download. Closes #9086 (Chocobo1)
- BUGFIX: Reduce queries to python version (Chocobo1)
- BUGFIX: Disable certain mouse wheel events in Options dialog (Chocobo1)
- WEBUI: Send all rechecks in one request (Thomas Piccirello)
@ -878,7 +878,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0 @@ -878,7 +878,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
- COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
- OSX: Fix crash on exit using Qt4. (Yez Ezey)
- OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
- LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
- LINUX: Workaround a Qt5 bug which results in a flood of network interface change signals. (Eugene Shalygin)
- OTHER: Turkish translation for installer. (Burak Yavuz)
- OTHER: Update portugueseBR for installer. (DaRKSoM)
- OTHER: Update portuguese for installer. (EdwardLinux)
@ -2225,7 +2225,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0 @@ -2225,7 +2225,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
- FEATURE: Added "Unread" item to RSS feed list to display all unread news
- FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
- FEATURE: A random listening port can be chosen automatically
- BUGFIX: torrent resume code rewrited
- BUGFIX: torrent resume code rewritten
- BUGFIX: Fixed uTorrent spoofing code
- BUGFIX: Greatly improved column sorting code
- BUGFIX: Possibility to create trackerless torrents

4
src/app/qtlocalpeer/qtlockedfile.cpp

@ -178,8 +178,8 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const @@ -178,8 +178,8 @@ QtLockedFile::LockMode QtLockedFile::lockMode() const
can be locked.
If \a block is true, this function will block until the lock is
aquired. If \a block is false, this function returns \e false
immediately if the lock cannot be aquired.
acquired. If \a block is false, this function returns \e false
immediately if the lock cannot be acquired.
If this object already has a lock of type \a mode, this function
returns \e true immediately. If this object has a lock of a

2
src/base/bittorrent/magneturi.cpp

@ -42,7 +42,7 @@ namespace @@ -42,7 +42,7 @@ namespace
{
bool isBitTorrentInfoHash(const QString &string)
{
// There are 2 represenations for BitTorrent info hash:
// There are 2 representations for BitTorrent info hash:
// 1. 40 chars hex-encoded string
// == 20 (SHA-1 length in bytes) * 2 (each byte maps to 2 hex characters)
// 2. 32 chars Base32 encoded string

2
src/gui/mainwindow.cpp

@ -1311,7 +1311,7 @@ void MainWindow::dropEvent(QDropEvent *event) @@ -1311,7 +1311,7 @@ void MainWindow::dropEvent(QDropEvent *event)
for (const QString &file : asConst(otherFiles)) {
createTorrentTriggered(file);
// currently only hande the first entry
// currently only handle the first entry
// this is a stub that can be expanded later to create many torrents at once
break;
}

2
src/webui/www/private/scripts/contextmenu.js

@ -548,7 +548,7 @@ window.qBittorrent.ContextMenu = (function() { @@ -548,7 +548,7 @@ window.qBittorrent.ContextMenu = (function() {
this.menu.getElement('a[href$=newSubscription]').parentNode.addClass('separator');
switch (selectedRows.length) {
case 0:
// remove seperator on top of newSubscription entry to avoid double line
// remove separator on top of newSubscription entry to avoid double line
this.menu.getElement('a[href$=newSubscription]').parentNode.removeClass('separator');
// menu when nothing selected
this.hideItem('update');

6
src/webui/www/private/scripts/dynamicTable.js

@ -2062,9 +2062,9 @@ window.qBittorrent.DynamicTable = (function() { @@ -2062,9 +2062,9 @@ window.qBittorrent.DynamicTable = (function() {
}
row['data'] = {};
tds[0].style.overflow = 'visible';
let indentaion = row.full_data.indentaion;
tds[0].style.paddingLeft = (indentaion * 32 + 4) + 'px';
tds[1].style.paddingLeft = (indentaion * 32 + 4) + 'px';
let indentation = row.full_data.indentation;
tds[0].style.paddingLeft = (indentation * 32 + 4) + 'px';
tds[1].style.paddingLeft = (indentation * 32 + 4) + 'px';
},
updateIcons: function() {
// state_icon

14
src/webui/www/private/views/rss.html

@ -428,7 +428,7 @@ @@ -428,7 +428,7 @@
return torrentDate;
})());
// Place in iframe with sandbox atribute to prevent js execution
// Place in iframe with sandbox attribute to prevent js execution
let torrentDescription = document.createRange().createContextualFragment('<iframe sandbox id="rssDescription"></iframe>');
$('rssDetailsView').append(torrentDescription);
document.getElementById('rssDescription').srcdoc = '<html><head><link rel="stylesheet" type="text/css" href="css/style.css" /></head><body>' + article.description + "</body></html>";
@ -474,7 +474,7 @@ @@ -474,7 +474,7 @@
};
recFlatten(response);
// check if rows matche flattend response
// check if rows matches flattened response
let match = false;
if (rssFeedTable.rows.getLength() - 1 === flattenedResp.length) {
match = true;
@ -551,7 +551,7 @@ @@ -551,7 +551,7 @@
showRssFeed(r.fullName);
}
else {
// calculate read differnce and update feed data
// calculate read difference and update feed data
let readDifference = 0;
let readChanged = false;
for (let i = 0; i < r.articles.length; ++i) {
@ -570,7 +570,7 @@ @@ -570,7 +570,7 @@
rssFeedTable.rows.filter((row) => r.fullName.slice(0, row.full_data.dataPath.length) === row.full_data.dataPath)
.each((row) => row.full_data.unread += readDifference);
// if feed that is opened changed update dynamicly
// if feed that is opened changed update dynamically
if (openedFeedPath !== undefined && r.fullName.slice(0, openedFeedPath.length) === openedFeedPath) {
for (let i = 0; i < r.articles.length; ++i) {
let matchingRow = rssArticleTable.rows.filter((row) => row.full_data.feedUid === r.uid)
@ -599,7 +599,7 @@ @@ -599,7 +599,7 @@
name: 'Unread',
unread: 0,
status: 'unread',
indentaion: 0,
indentation: 0,
dataUid: '',
dataUrl: '',
dataPath: ''
@ -613,7 +613,7 @@ @@ -613,7 +613,7 @@
name: dataEntry.name,
unread: 0,
status: 'isFolder',
indentaion: dataEntry.depth,
indentation: dataEntry.depth,
dataUid: '',
dataUrl: '',
dataPath: dataEntry.fullName
@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
name: dataEntry.name,
unread: 0,
status: status,
indentaion: dataEntry.depth,
indentation: dataEntry.depth,
dataUid: dataEntry.uid,
dataUrl: dataEntry.url,
dataPath: dataEntry.fullName

Loading…
Cancel
Save