Browse Source

Disable scan folder preferences in Web UI (for now) since it was broken by "multipleScanFolders" patch

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
b7edfea4ce
  1. 5
      src/eventmanager.cpp
  2. 18
      src/webui/preferences_content.html

5
src/eventmanager.cpp

@ -231,8 +231,9 @@ QVariantMap EventManager::getGlobalPreferences() const { @@ -231,8 +231,9 @@ QVariantMap EventManager::getGlobalPreferences() const {
data["save_path"] = Preferences::getSavePath();
data["temp_path_enabled"] = Preferences::isTempPathEnabled();
data["temp_path"] = Preferences::getTempPath();
data["scan_dirs"] = Preferences::getScanDirs();
data["download_in_scan_dirs"] = Preferences::getDownloadInScanDirs();
// XXX: json.h does not encode QStringList correctly
//data["scan_dirs"] = Preferences::getScanDirs();
//data["download_in_scan_dirs"] = Preferences::getDownloadInScanDirs();
data["export_dir_enabled"] = Preferences::isTorrentExportEnabled();
data["export_dir"] = Preferences::getExportDir();
data["preallocate_all"] = Preferences::preAllocateAllFiles();

18
src/webui/preferences_content.html

@ -100,12 +100,12 @@ @@ -100,12 +100,12 @@
<tr>
<td style="vertical-align: bottom; text-align: right;"></td><td><input type="text" id="temppath_text"/></td>
</tr>
<tr>
<!-- <tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="scandir_checkbox" onclick="updateScanDirEnabled();"/></td><td>_(Automatically load .torrent files from:)</td>
</tr>
<tr>
<td style="vertical-align: bottom; text-align: right;"></td><td><input type="text" id="scandir_text"/></td>
</tr>
</tr> -->
<tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="exportdir_checkbox" onclick="updateExportDirEnabled();"/></td><td>_(Copy .torrent files to:)</td>
</tr>
@ -340,12 +340,12 @@ @@ -340,12 +340,12 @@
if($defined($('temppath_checkbox').get('checked')) && $('temppath_checkbox').get('checked'))
temp_path_enabled = 1;
var temp_path = $('temppath_text').get('value');
var scandir_enabled = 0;
/*var scandir_enabled = 0;
if($defined($('scandir_checkbox').get('checked')) && $('scandir_checkbox').get('checked'))
scandir_enabled = 1;
var scandir_path = '';
if(scandir_enabled)
scandir_path = $('scandir_text').get('value');
scandir_path = $('scandir_text').get('value');*/
var exportdir_enabled = 0;
if($defined($('exportdir_checkbox').get('checked')) && $('exportdir_checkbox').get('checked'))
exportdir_enabled = 1;
@ -467,7 +467,7 @@ @@ -467,7 +467,7 @@
dict.set('save_path', save_path);
dict.set('temp_path_enabled', temp_path_enabled);
dict.set('temp_path', temp_path);
dict.set('scan_dir', scandir_path);
//dict.set('scan_dir', scandir_path);
dict.set('export_dir', exportdir_path);
dict.set('preallocate_all', preallocate_all);
if(!$('appendexttr').hasClass('invisible')) {
@ -597,13 +597,13 @@ updateTempDirEnabled = function() { @@ -597,13 +597,13 @@ updateTempDirEnabled = function() {
}
}
updateScanDirEnabled = function() {
/*updateScanDirEnabled = function() {
if($defined($('scandir_checkbox').get('checked')) && $('scandir_checkbox').get('checked')) {
$('scandir_text').removeProperty('disabled');
} else {
$('scandir_text').set('disabled', 'true');
}
}
}*/
updateExportDirEnabled = function() {
if($defined($('exportdir_checkbox').get('checked')) && $('exportdir_checkbox').get('checked')) {
@ -793,7 +793,7 @@ loadPreferences = function() { @@ -793,7 +793,7 @@ loadPreferences = function() {
var temp_path = pref.temp_path;
$('temppath_text').set('value', temp_path);
updateTempDirEnabled();
var scan_dir_enabled = pref.scan_dir_enabled;
/*var scan_dir_enabled = pref.scan_dir_enabled;
if(scan_dir_enabled) {
$('scandir_text').set('value', pref.scan_dir);
$('scandir_checkbox').set('checked', 'checked');
@ -801,7 +801,7 @@ loadPreferences = function() { @@ -801,7 +801,7 @@ loadPreferences = function() {
$('scandir_text').set('value', '');
$('scandir_checkbox').removeProperty('checked');
}
updateScanDirEnabled();
updateScanDirEnabled();*/
var export_dir_enabled = pref.export_dir_enabled;
if(export_dir_enabled) {
$('exportdir_text').set('value', pref.export_dir);

Loading…
Cancel
Save