d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-05 11:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation error

Browse Source
This commit is contained in:
Christophe Dumez 2010-12-06 10:16:10 +00:00
parent c80e95b219
commit 7bb44e725b
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/preferences/options.ui
View File

@ -1799,7 +1799,7 @@ QGroupBox {
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>-25</y> <y>0</y>
<width>570</width> <width>570</width>
<height>422</height> <height>422</height>
</rect> </rect>

3
src/webui/eventmanager.cpp
View File

@ -208,8 +208,6 @@ void EventManager::setGlobalPreferences(QVariantMap m) const {
pref.setSessionPort(m["listen_port"].toInt()); pref.setSessionPort(m["listen_port"].toInt());
if(m.contains("upnp")) if(m.contains("upnp"))
pref.setUPnPEnabled(m["upnp"].toBool()); pref.setUPnPEnabled(m["upnp"].toBool());
if(m.contains("natpmp"))
pref.setNATPMPEnabled(m["natpmp"].toBool());
if(m.contains("dl_limit")) if(m.contains("dl_limit"))
pref.setGlobalDownloadLimit(m["dl_limit"].toInt()); pref.setGlobalDownloadLimit(m["dl_limit"].toInt());
if(m.contains("up_limit")) if(m.contains("up_limit"))
@ -296,7 +294,6 @@ QVariantMap EventManager::getGlobalPreferences() const {
// Connection // Connection
data["listen_port"] = pref.getSessionPort(); data["listen_port"] = pref.getSessionPort();
data["upnp"] = pref.isUPnPEnabled(); data["upnp"] = pref.isUPnPEnabled();
data["natpmp"] = pref.isNATPMPEnabled();
data["dl_limit"] = pref.getGlobalDownloadLimit(); data["dl_limit"] = pref.getGlobalDownloadLimit();
data["up_limit"] = pref.getGlobalUploadLimit(); data["up_limit"] = pref.getGlobalUploadLimit();
data["max_connec"] = pref.getMaxConnecs(); data["max_connec"] = pref.getMaxConnecs();

29
src/webui/html/preferences_content.html
View File

@ -7,10 +7,7 @@
<br/> <br/>
<table> <table>
<tr> <tr>
<td style="vertical-align: bottom;"><input type="checkbox" id="upnp_checkbox" style="margin-bottom: -2px;"/></td><td>_(Enable UPnP port mapping)</td> <td style="vertical-align: bottom;"><input type="checkbox" id="upnp_checkbox" style="margin-bottom: -2px;"/></td><td>_(Use UPnP / NAT-PMP port forwarding from my router)</td>
</tr>
<tr>
<td style="vertical-align: bottom;"><input type="checkbox" id="natpmp_checkbox" style="margin-bottom: -2px;"/></td><td>_(Enable NAT-PMP port mapping)</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -52,7 +49,7 @@
<div style="padding-left: 30px;"> <div style="padding-left: 30px;">
<table> <table>
<tr> <tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="dht_checkbox"/></td><td>_(Enable DHT network (decentralized))</td> <td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="dht_checkbox"/></td><td>_(Enable DHT (decentralized network) to find more peers)</td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="DHTPortDiffThanBT_checkbox" onclick="updateDHTPortSettings();"/></td><td>_(Use a different port for DHT and Bittorrent)</td> <td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="DHTPortDiffThanBT_checkbox" onclick="updateDHTPortSettings();"/></td><td>_(Use a different port for DHT and Bittorrent)</td>
@ -61,17 +58,17 @@
<td style="vertical-align: bottom; text-align: right;">_(DHT port:)</td><td><input type="text" id="DHTPort_txt" value="6881"/></td> <td style="vertical-align: bottom; text-align: right;">_(DHT port:)</td><td><input type="text" id="DHTPort_txt" value="6881"/></td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="pex_checkbox"/></td><td>_(Enable Peer Exchange / PeX (requires restart))</td> <td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="pex_checkbox"/></td><td>_(Enable Peer Exchange (PeX) to find more peers)</td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="lsd_checkbox"/></td><td>_(Enable Local Peer Discovery)</td> <td style="vertical-align: bottom; text-align: right;"><input type="checkbox" id="lsd_checkbox"/></td><td>_(Enable Local Peer Discovery to find more peers)</td>
</tr> </tr>
</table> </table>
_(Encryption:) _(Encryption mode:)
<select id="encryption_select"> <select id="encryption_select">
<option value="0">_(Enabled)</option> <option value="0">_(Prefer encryption)</option>
<option value="1">_(Forced)</option> <option value="1">_(Require encryption)</option>
<option value="2">_(Disabled)</option> <option value="2">_(Disable encryption)</option>
</select><br/> </select><br/>
</div> </div>
</fieldset> </fieldset>
@ -277,9 +274,6 @@
var upnp = 0; var upnp = 0;
if($defined($('upnp_checkbox').get('checked')) && $('upnp_checkbox').get('checked')) if($defined($('upnp_checkbox').get('checked')) && $('upnp_checkbox').get('checked'))
upnp = 1; upnp = 1;
var natpmp = 0;
if($defined($('natpmp_checkbox').get('checked')) && $('natpmp_checkbox').get('checked'))
natpmp = 1;
var dl_limit = -1; var dl_limit = -1;
if($defined($('dl_limit_checkbox').get('checked')) && $('dl_limit_checkbox').get('checked')) { if($defined($('dl_limit_checkbox').get('checked')) && $('dl_limit_checkbox').get('checked')) {
@ -429,7 +423,6 @@
// Connection // Connection
dict.set('listen_port', listen_port); dict.set('listen_port', listen_port);
dict.set('upnp', upnp); dict.set('upnp', upnp);
dict.set('natpmp', natpmp);
dict.set('up_limit', up_limit); dict.set('up_limit', up_limit);
dict.set('dl_limit', dl_limit); dict.set('dl_limit', dl_limit);
dict.set('max_connec', max_connec); dict.set('max_connec', max_connec);
@ -698,12 +691,6 @@ loadPreferences = function() {
$('upnp_checkbox').removeProperty('checked'); $('upnp_checkbox').removeProperty('checked');
} }
if(pref.natpmp) {
$('natpmp_checkbox').set('checked', 'checked');
} else {
$('natpmp_checkbox').removeProperty('checked');
}
var dl_limit = pref.dl_limit.toInt(); var dl_limit = pref.dl_limit.toInt();
if(dl_limit <= 0) { if(dl_limit <= 0) {
$('dl_limit_checkbox').removeProperty('checked'); $('dl_limit_checkbox').removeProperty('checked');