mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-10-04 17:41:42 +02:00
Code Issues Releases Wiki Activity

Fix up the advanced settings dialog. Make it more clear whether

Browse Source 
UPnP/Static/LAN-only is going to be used. Use a checkbox to enable proxy
since we'll likely never support anything other than socks -- at least,
not anytime soon. Group items in a nicer fashion.
This commit is contained in:
Jeff Mitchell
2012-05-03 13:36:23 -04:00
parent b1210ea43f
commit 3b332d6d12
8 changed files with 268 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/TomahawkSettings.cpp
View File

@@ -1048,8 +1048,13 @@ TomahawkSettings::removeAccount( const QString& accountId )
TomahawkSettings::ExternalAddressMode
TomahawkSettings::externalAddressMode() const
TomahawkSettings::externalAddressMode()
{
if ( value( "network/prefer-static-host-and-port", false ).toBool() )
{
remove( "network/prefer-static-host-and-port" );
setValue( "network/external-address-mode", TomahawkSettings::Static );
}
return (TomahawkSettings::ExternalAddressMode) value( "network/external-address-mode", TomahawkSettings::Upnp ).toInt();
}
@@ -1061,18 +1066,6 @@ TomahawkSettings::setExternalAddressMode( ExternalAddressMode externalAddressMod
}
bool TomahawkSettings::preferStaticHostPort() const
{
return value( "network/prefer-static-host-and-port", false ).toBool();
}
void TomahawkSettings::setPreferStaticHostPort( bool prefer )
{
setValue( "network/prefer-static-host-and-port", prefer );
}
QString
TomahawkSettings::externalHostname() const
{