bug_1422_fix_2.diff

cfarmer -, 2008-11-24 04:21 PM

Download (1.44 KB)

View differences:

src/app/qgsoptions.cpp (working copy)
56 56 
  QgsDebugMsg( QString( "Standard Identify radius setting read from settings file: %1" ).arg( identifyValue ) );
57 57 
  spinBoxIdentifyValue->setValue( identifyValue );
58 58 

  		




  
  59
  
    
  //Add proxy types to leProxyType comboBox

  		




  
  60
  
    
  leProxyType->addItem( "http" );

  		




  
  61
  
    
  leProxyType->addItem( "socks5" );

  		




  
  62
  
    

  		




  59
  63
  
    
  //Web proxy settings

  		




  60
  64
  
    
  grpProxy->setChecked( settings.value( "proxy/proxyEnabled", "0" ).toBool() );

  		




  61
  65
  
    
  leProxyHost->setText( settings.value( "proxy/proxyHost", "" ).toString() );

  		




  62
  66
  
    
  leProxyPort->setText( settings.value( "proxy/proxyPort", "" ).toString() );

  		




  
  67
  
    
  leProxyType->setCurrentIndex( settings.value( "proxy/proxyType", "" ).toInt() );

  		




  63
  68
  
    
  leProxyUser->setText( settings.value( "proxy/proxyUser", "" ).toString() );

  		




  64
  69
  
    
  leProxyPassword->setText( settings.value( "proxy/proxyPassword", "" ).toString() );

  		




  65
  70
  
    
  // set the current theme

  		




  ......




  258
  263
  
    
  settings.setValue( "proxy/proxyEnabled", grpProxy->isChecked() );

  		




  259
  264
  
    
  settings.setValue( "proxy/proxyHost", leProxyHost->text() );

  		




  260
  265
  
    
  settings.setValue( "proxy/proxyPort", leProxyPort->text() );

  		




  
  266
  
    
  settings.setValue( "proxy/proxyType", leProxyType->currentIndex() );

  		




  261
  267
  
    
  settings.setValue( "proxy/proxyUser", leProxyUser->text() );

  		




  262
  268
  
    
  settings.setValue( "proxy/proxyPassword", leProxyPassword->text() );

  		




  263
  269
  
    
  //general settings