Changeset 7513 in ntrip


Ignore:
Timestamp:
Oct 16, 2015, 12:38:42 PM (7 years ago)
Author:
weber
Message:

Keyname 'ignoreSslErrors' changed to 'sslIngoreErrors'

Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnchelp.html

    r7511 r7513  
    45664566   proxyPort       {Proxy port [integer number]}
    45674567   sslCaCertPath   {Full path to SSL certificates [character string]}
    4568    ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}
     4568   sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}
    45694569
    45704570General Panel keys:
  • trunk/BNC/src/bncmain.cpp

    r7512 r7513  
    9494      "   proxyPort       {Proxy port [integer number]}\n"
    9595      "   sslCaCertPath   {Full path to SSL certificates [character string]}\n"
    96       "   ignoreSslErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
     96      "   sslIgnoreErrors {Ignore SSL authorization errors [integer number: 0=no,2=yes]}\n"
    9797      "\n"
    9898      "General Panel keys:\n"
  • trunk/BNC/src/bncnetqueryv2.cpp

    r6787 r7513  
    3838
    3939  bncSettings settings;
    40   _ignoreSslErrors =
    41      (Qt::CheckState(settings.value("ignoreSslErrors").toInt()) == Qt::Checked);
     40  _sslIgnoreErrors =
     41     (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
    4242
    4343  if (_secure && !QSslSocket::supportsSsl()) {
     
    227227  BNC_CORE->slotMessage(msg.toAscii(), true);
    228228
    229   if (_ignoreSslErrors) {
     229  if (_sslIgnoreErrors) {
    230230    _reply->ignoreSslErrors();
    231231  }
  • trunk/BNC/src/bncnetqueryv2.h

    r6787 r7513  
    3030  bool                   _firstData;
    3131  bool                   _secure;
    32   bool                   _ignoreSslErrors;
     32  bool                   _sslIgnoreErrors;
    3333};
    3434
  • trunk/BNC/src/bncsettings.cpp

    r7488 r7513  
    7878    setValue_p("proxyPort",           "");
    7979    setValue_p("sslCaCertPath",       "");
    80     setValue_p("ignoreSslErrors",     "0");
     80    setValue_p("sslIgnoreErrors",     "0");
    8181    // General
    8282    setValue_p("logFile",             "");
  • trunk/BNC/src/bncwindow.cpp

    r7506 r7513  
    174174
    175175  _sslCaCertPathLineEdit   = new QLineEdit(settings.value("sslCaCertPath").toString());
    176   _ignoreSslErrorsCheckBox = new QCheckBox();
    177   _ignoreSslErrorsCheckBox->setCheckState(Qt::CheckState(
    178                                           settings.value("ignoreSslErrors").toInt()));
     176  _sslIgnoreErrorsCheckBox = new QCheckBox();
     177  _sslIgnoreErrorsCheckBox->setCheckState(Qt::CheckState(
     178                                          settings.value("sslIgnoreErrors").toInt()));
    179179
    180180  // General Options
     
    646646  pLayout->addWidget(new QLabel("Default:  " + bncSslConfig::defaultPath()), 3,11, 1,20);
    647647  pLayout->addWidget(new QLabel("Ignore SSL authorization errors"),          4, 0);
    648   pLayout->addWidget(_ignoreSslErrorsCheckBox,                               4, 1, 1,10);
     648  pLayout->addWidget(_sslIgnoreErrorsCheckBox,                               4, 1, 1,10);
    649649  pLayout->addWidget(new QLabel(""),                                         5, 1);
    650650  pLayout->setRowStretch(6, 999);
     
    12951295  _proxyPortLineEdit->setWhatsThis(tr("<p>Enter your proxy server port number in case a proxy is operated in front of BNC.</p>"));
    12961296  _sslCaCertPathLineEdit->setWhatsThis(tr("<p>Communication with an Ntrip broadcaster over SSL requires the exchange of client and/or server certificates. Specify the path to a directory where you save certificates on your system. Don't try communication via SSL if you are not sure wheter this is supported by the involved Ntrip broadcaster. Note that SSL communication is usually done over port 443.</p>"));
    1297   _ignoreSslErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>"));
     1297  _sslIgnoreErrorsCheckBox->setWhatsThis(tr("<p>SSL communication may involve queries coming from the Ntrip broadcaster. Tick 'Ignore SSL authorization erros' if you don't want to be bothered with this.</p>"));
    12981298  _outWaitSpinBox->setWhatsThis(tr("<p>When feeding a real-time GNSS network engine waiting for synchronized input epoch by epoch, BNC drops whatever is received later than 'Wait for full obs epoch' seconds. A value of 3 to 5 seconds is recommended, depending on the latency of the incoming streams and the delay acceptable to your real-time GNSS network engine or products.</p>"));
    12991299  _outFileLineEdit->setWhatsThis(tr("Specify the full path to a file where synchronized observations are saved in plain ASCII format. Beware that the size of this file can rapidly increase depending on the number of incoming streams."));
     
    15011501
    15021502  settings.setValue("sslCaCertPath",   _sslCaCertPathLineEdit->text());
    1503   settings.setValue("ignoreSslErrors", _ignoreSslErrorsCheckBox->checkState());
     1503  settings.setValue("sslIgnoreErrors", _sslIgnoreErrorsCheckBox->checkState());
    15041504
    15051505  QMessageBox msgBox;
     
    17321732  settings.setValue("proxyPort",   _proxyPortLineEdit->text());
    17331733  settings.setValue("sslCaCertPath",   _sslCaCertPathLineEdit->text());
    1734   settings.setValue("ignoreSslErrors",  _ignoreSslErrorsCheckBox->checkState());
     1734  settings.setValue("sslIgnoreErrors",  _sslIgnoreErrorsCheckBox->checkState());
    17351735// General
    17361736  settings.setValue("logFile",     _logFileLineEdit->text());
  • trunk/BNC/src/bncwindow.h

    r7420 r7513  
    128128    QLineEdit* _proxyPortLineEdit;
    129129    QLineEdit* _sslCaCertPathLineEdit;
    130     QCheckBox* _ignoreSslErrorsCheckBox;
     130    QCheckBox* _sslIgnoreErrorsCheckBox;
    131131    QLineEdit* _outFileLineEdit;
    132132    QLineEdit* _outPortLineEdit;
Note: See TracChangeset for help on using the changeset viewer.