github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4677 from buinsky/WebUI_misc_fixes

Browse source 
WebUI: Misc fixes and improvements
This commit is contained in:
sledgehammer999 2016-01-30 12:11:46 -06:00
commit 53261cc0b2
4 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/webui/extra_translations.h
View file

@ -38,7 +38,8 @@ static const char *__TRANSLATIONS__[] = {
QT_TRANSLATE_NOOP("HttpServer", "Help"), QT_TRANSLATE_NOOP("HttpServer", "Help"),
QT_TRANSLATE_NOOP("HttpServer", "Logout"), QT_TRANSLATE_NOOP("HttpServer", "Logout"),
QT_TRANSLATE_NOOP("HttpServer", "Exit qBittorrent"), QT_TRANSLATE_NOOP("HttpServer", "Exit qBittorrent"),
QT_TRANSLATE_NOOP("HttpServer", "Download Torrents from their URL or Magnet link"), QT_TRANSLATE_NOOP("HttpServer", "Download from URLs"),
QT_TRANSLATE_NOOP("HttpServer", "Download Torrents from their URLs or Magnet links"),
QT_TRANSLATE_NOOP("HttpServer", "Only one link per line"), QT_TRANSLATE_NOOP("HttpServer", "Only one link per line"),
QT_TRANSLATE_NOOP("HttpServer", "Upload local torrent"), QT_TRANSLATE_NOOP("HttpServer", "Upload local torrent"),
QT_TRANSLATE_NOOP("HttpServer", "Download"), QT_TRANSLATE_NOOP("HttpServer", "Download"),
@ -76,7 +77,6 @@ static const char *__TRANSLATIONS__[] = {
QT_TRANSLATE_NOOP("HttpServer", "Download limit:"), QT_TRANSLATE_NOOP("HttpServer", "Download limit:"),
QT_TRANSLATE_NOOP("HttpServer", "Apply"), QT_TRANSLATE_NOOP("HttpServer", "Apply"),
QT_TRANSLATE_NOOP("HttpServer", "Add"), QT_TRANSLATE_NOOP("HttpServer", "Add"),
QT_TRANSLATE_NOOP("HttpServer", "Upload Torrents"),
QT_TRANSLATE_NOOP("HttpServer", "All"), QT_TRANSLATE_NOOP("HttpServer", "All"),
QT_TRANSLATE_NOOP("HttpServer", "Downloading"), QT_TRANSLATE_NOOP("HttpServer", "Downloading"),
QT_TRANSLATE_NOOP("HttpServer", "Seeding"), QT_TRANSLATE_NOOP("HttpServer", "Seeding"),
@ -114,7 +114,8 @@ static const struct { const char *source; const char *comment; } __COMMENTED_TRA
QT_TRANSLATE_NOOP3("HttpServer", "Thursday", "Schedule the use of alternative rate limits on ..."), QT_TRANSLATE_NOOP3("HttpServer", "Thursday", "Schedule the use of alternative rate limits on ..."),
QT_TRANSLATE_NOOP3("HttpServer", "Friday", "Schedule the use of alternative rate limits on ..."), QT_TRANSLATE_NOOP3("HttpServer", "Friday", "Schedule the use of alternative rate limits on ..."),
QT_TRANSLATE_NOOP3("HttpServer", "Saturday", "Schedule the use of alternative rate limits on ..."), QT_TRANSLATE_NOOP3("HttpServer", "Saturday", "Schedule the use of alternative rate limits on ..."),
QT_TRANSLATE_NOOP3("HttpServer", "Sunday", "Schedule the use of alternative rate limits on ...") QT_TRANSLATE_NOOP3("HttpServer", "Sunday", "Schedule the use of alternative rate limits on ..."),
QT_TRANSLATE_NOOP3("HttpServer", "Upload Torrents", "Upload torrent files to qBittorent using WebUI")
}; };
#endif // EXTRA_TRANSLATIONS_H #endif // EXTRA_TRANSLATIONS_H

11
src/webui/www/public/newlabel.html
View file

@ -7,6 +7,17 @@
<script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script> <script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
<script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script> <script type="text/javascript" src="scripts/mootools-1.2-more.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
var newLabelKeyboardEvents = new Keyboard({
defaultEventType: 'keydown',
events: {
'enter': function (event) {
$('newLabelButton').click();
event.preventDefault();
}
}
});
newLabelKeyboardEvents.activate();
window.addEvent('domready', function() { window.addEvent('domready', function() {
$('newLabel').focus(); $('newLabel').focus();
$('newLabelButton').addEvent('click', function(e) { $('newLabelButton').addEvent('click', function(e) {

3
src/webui/www/public/properties_content.html
View file

@ -107,4 +107,5 @@
<script type="text/javascript"> <script type="text/javascript">
torrentPeersTable.setup('torrentPeersTable', 'torrentPeersTableHeader', null); torrentPeersTable.setup('torrentPeersTable', 'torrentPeersTableHeader', null);
</script> $(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
</script>

14
src/webui/www/public/scripts/client.js
View file

@ -25,9 +25,15 @@
torrentsTable = new TorrentsTable(); torrentsTable = new TorrentsTable();
torrentPeersTable = new TorrentPeersTable(); torrentPeersTable = new TorrentPeersTable();
var updatePropertiesPanel = function(){}; var updatePropertiesPanel = function () {};
var updateTorrentPeersData = function(){};
var updateMainData = function(){}; var updateTorrentData = function () {};
var updateTrackersData = function () {};
var updateTorrentPeersData = function () {};
var updateWebSeedsData = function () {};
var updateTorrentFilesData = function () {};
var updateMainData = function () {};
var alternativeSpeedLimits = false; var alternativeSpeedLimits = false;
var queueing_enabled = true; var queueing_enabled = true;
var syncMainDataTimerPeriod = 1500; var syncMainDataTimerPeriod = 1500;
@ -578,8 +584,6 @@ window.addEvent('load', function () {
$('propertiesPanel_collapseToggle').addEvent('click', function(e){ $('propertiesPanel_collapseToggle').addEvent('click', function(e){
updatePropertiesPanel(); updatePropertiesPanel();
}); });
$(getLocalStorageItem('selected_tab', 'PropGeneralLink')).click();
}, },
column : 'mainColumn', column : 'mainColumn',
height : prop_h height : prop_h