diff options
author | Damien Churchill <damoc@gmail.com> | 2009-01-07 01:28:19 +0000 |
---|---|---|
committer | Damien Churchill <damoc@gmail.com> | 2009-01-07 01:28:19 +0000 |
commit | d669e6e864e7e54646e5c10170d21a18c725614f (patch) | |
tree | 85e822c48969ea49e8453c3cb635709a47e3b361 | |
parent | 1a7000769703e87c77f901c73cd09b6f7e537dac (diff) | |
download | deluge-d669e6e864e7e54646e5c10170d21a18c725614f.tar.gz deluge-d669e6e864e7e54646e5c10170d21a18c725614f.tar.bz2 deluge-d669e6e864e7e54646e5c10170d21a18c725614f.zip |
add stub for filepicker to trunk
start implementing the options dialog
add another not implemented alert to edit trackers
update changelog
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | deluge/ui/webui/templates/ajax/render/html/add_torrent_options.html | 10 | ||||
-rw-r--r-- | deluge/ui/webui/templates/ajax/static/js/deluge-add.js | 46 | ||||
-rw-r--r-- | deluge/ui/webui/templates/ajax/static/js/deluge-ui.js | 4 |
4 files changed, 58 insertions, 8 deletions
@@ -1,6 +1,12 @@ Deluge 1.1.0_RC4 (In Development) Core: * Fix issue in get_tracker_host when the torrent has no tracker + + Ajaxui: + * Fix loading on iPods. + * Fix sorting on the name column. + * Add "Not Implemented" alerts to some functions. + * Improve the options tab on the Add Torrent dialog Deluge 1.1.0_RC3 (05 January 2009) Core: diff --git a/deluge/ui/webui/templates/ajax/render/html/add_torrent_options.html b/deluge/ui/webui/templates/ajax/render/html/add_torrent_options.html index dcc0848da..e20bf27f2 100644 --- a/deluge/ui/webui/templates/ajax/render/html/add_torrent_options.html +++ b/deluge/ui/webui/templates/ajax/render/html/add_torrent_options.html @@ -14,21 +14,21 @@ <legend>$_('Bandwidth')</legend> <label>$_('Max Down Speed'):</label> - <input type="text" class="moouiSpinner" /><br/> + <input type="text" name="max_download_speed" class="moouiSpinner" /><br/> <label>$_('Max Up Speed'):</label> - <input type="text" class="moouiSpinner" /><br/> + <input type="text" name="max_upload_speed" class="moouiSpinner" /><br/> <label>$_('Max Connections'):</label> - <input type="text" class="moouiSpinner" /><br/> + <input type="text" name="max_connections" class="moouiSpinner" /><br/> <label>$_('Max Upload Slots'):</label> - <input type="text" class="moouiSpinner" /> + <input type="text" name="max_upload_slots" class="moouiSpinner" /> </fieldset> <fieldset> <legend>$_('General')</legend> <label class="fluid"> - <input type="checkbox" /> + <input type="checkbox" name="add_paused" /> $_('Add in Paused State') </label><br/> <label class="fluid"> diff --git a/deluge/ui/webui/templates/ajax/static/js/deluge-add.js b/deluge/ui/webui/templates/ajax/static/js/deluge-add.js index c0d61adb3..ed543bdc5 100644 --- a/deluge/ui/webui/templates/ajax/static/js/deluge-add.js +++ b/deluge/ui/webui/templates/ajax/static/js/deluge-add.js @@ -23,11 +23,13 @@ Deluge.Widgets.AddWindow = new Class({ this.bound = { onLoad: this.onLoad.bindWithEvent(this), onAdd: this.onAdd.bindWithEvent(this), + onShow: this.onShow.bindWithEvent(this), onCancel: this.onCancel.bindWithEvent(this), onTorrentAdded: this.onTorrentAdded.bindWithEvent(this), onTorrentChanged: this.onTorrentChanged.bindWithEvent(this) } this.addEvent('loaded', this.bound.onLoad); + this.addEvent('show', this.bound.onShow); }, onLoad: function(e) { @@ -37,10 +39,9 @@ Deluge.Widgets.AddWindow = new Class({ this.torrentInfo = new Hash(); this.tabs = new Widgets.Tabs(this.content.getElement('div.moouiTabs')); this.filesTab = new Deluge.Widgets.AddTorrent.FilesTab(); + this.optionsTab = new Deluge.Widgets.AddTorrent.OptionsTab(); this.tabs.addPage(this.filesTab); - this.tabs.addPage(new Widgets.TabPage('Options', { - url: '/template/render/html/add_torrent_options.html' - })); + this.tabs.addPage(this.optionsTab); this.fileWindow = new Deluge.Widgets.AddTorrent.File(); this.fileWindow.addEvent('torrentAdded', this.bound.onTorrentAdded); @@ -86,6 +87,10 @@ Deluge.Widgets.AddWindow = new Class({ this.onCancel() }, + onShow: function(e) { + this.optionsTab.getDefaults(); + }, + onCancel: function(e) { this.hide(); this.torrents.empty(); @@ -268,6 +273,41 @@ Deluge.Widgets.AddTorrent.FilesTab = new Class({ } }); +Deluge.Widgets.AddTorrent.OptionsTab = new Class({ + Extends: Widgets.TabPage, + + options: { + url: '/template/render/html/add_torrent_options.html' + }, + + initialize: function() { + this.parent('Options'); + this.addEvent('loaded', this.onLoad.bindWithEvent(this)); + }, + + onLoad: function(e) { + this.form = this.element.getElement('form'); + }, + + getDefaults: function() { + var keys = [ + 'add_paused', + 'compact_allocation', + 'download_location', + 'max_connections_per_torrent', + 'max_download_speed_per_torrent', + 'max_upload_slots_per_torrent', + 'max_upload_speed_per_torrent', + 'prioritize_first_last_pieces' + ] + Deluge.Client.get_config_values(keys, { + onSuccess: function(config) { + alert(JSON.encode(config)); + } + }); + } +}); + Deluge.Widgets.CreateTorrent = new Class({ Extends: Widgets.Window, diff --git a/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js b/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js index 845856698..3c58ff144 100644 --- a/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js +++ b/deluge/ui/webui/templates/ajax/static/js/deluge-ui.js @@ -404,6 +404,10 @@ Deluge.UI = { break; case 'connections': alert('Sorry, this hasn\'t been implemented yet.'); + break; + case 'edit_trackers': + alert('Sorry, this hasn\'t been implemented yet.'); + break; default: break; } |