if network name/address contains spaces, they are removed now, coded by dingodoppelt (#462)
This commit is contained in:
parent
5657bc9e55
commit
63ebc28a18
6 changed files with 13 additions and 4 deletions
|
@ -6,6 +6,9 @@
|
||||||
- do not change the server list order if the mouse is over the table to
|
- do not change the server list order if the mouse is over the table to
|
||||||
avoid selecting an incorrect server on a mouse double click (#293)
|
avoid selecting an incorrect server on a mouse double click (#293)
|
||||||
|
|
||||||
|
- if network name/address contains spaces, they are removed now,
|
||||||
|
coded by dingodoppelt (#462)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TODO improve compact channels: smaller font size of name is too long
|
TODO improve compact channels: smaller font size of name is too long
|
||||||
|
|
|
@ -676,7 +676,7 @@ void CClientSettingsDlg::OnCentralServerAddressEditingFinished()
|
||||||
{
|
{
|
||||||
// store new setting in the client
|
// store new setting in the client
|
||||||
pClient->SetServerListCentralServerAddress (
|
pClient->SetServerListCentralServerAddress (
|
||||||
edtCentralServerAddress->text() );
|
NetworkUtil::FixAddress ( edtCentralServerAddress->text() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton* button )
|
void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton* button )
|
||||||
|
|
|
@ -658,8 +658,7 @@ void CConnectDlg::OnConnectClicked()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// remove all spaces from the parsed string in the the combo box
|
strSelectedAddress = NetworkUtil::FixAddress ( cbxServerAddr->currentText() );
|
||||||
strSelectedAddress = cbxServerAddr->currentText().simplified().replace ( " ", "" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// tell the parent window that the connection shall be initiated
|
// tell the parent window that the connection shall be initiated
|
||||||
|
|
|
@ -462,7 +462,7 @@ int main ( int argc, char** argv )
|
||||||
"--connect",
|
"--connect",
|
||||||
strArgument ) )
|
strArgument ) )
|
||||||
{
|
{
|
||||||
strConnOnStartupAddress = strArgument.simplified().replace( " ", "" );
|
strConnOnStartupAddress = NetworkUtil::FixAddress ( strArgument );
|
||||||
tsConsole << "- connect on startup to address: " << strConnOnStartupAddress << endl;
|
tsConsole << "- connect on startup to address: " << strConnOnStartupAddress << endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1061,6 +1061,12 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString NetworkUtil::FixAddress ( const QString& strAddress )
|
||||||
|
{
|
||||||
|
// remove all spaces from the address string
|
||||||
|
return strAddress.simplified().replace ( " ", "" );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Instrument picture data base ------------------------------------------------
|
// Instrument picture data base ------------------------------------------------
|
||||||
CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable ( const bool bReGenerateTable )
|
CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable ( const bool bReGenerateTable )
|
||||||
|
|
|
@ -1112,6 +1112,7 @@ public:
|
||||||
static bool ParseNetworkAddress ( QString strAddress,
|
static bool ParseNetworkAddress ( QString strAddress,
|
||||||
CHostAddress& HostAddress );
|
CHostAddress& HostAddress );
|
||||||
|
|
||||||
|
static QString FixAddress ( const QString& strAddress );
|
||||||
static CHostAddress GetLocalAddress();
|
static CHostAddress GetLocalAddress();
|
||||||
static QString GetCentralServerAddress ( const ECSAddType eCentralServerAddressType,
|
static QString GetCentralServerAddress ( const ECSAddType eCentralServerAddressType,
|
||||||
const QString& strCentralServerAddress );
|
const QString& strCentralServerAddress );
|
||||||
|
|
Loading…
Reference in a new issue