eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

since the server GUI custom central server address edit control is now in a different tab, it has to be read/write all the time

Browse source
This commit is contained in:
Volker Fischer 2020-07-10 20:32:08 +02:00
parent 48dc79efb5
commit 10abcff239
2 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -24,6 +24,7 @@
- bug fix: grouping faders in the client should be proportional (see discussion in #202, #419) - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
TODO server list/client list connection less message seems to need a mutex at the server
TODO improve settings management -> move settings class in client/server classes, move actual settings variables TODO improve settings management -> move settings class in client/server classes, move actual settings variables
TODO improve interaction between use of inifile and command line parameters (edited) #120 TODO improve interaction between use of inifile and command line parameters (edited) #120

29
src/serverdlg.cpp
View file

@ -249,6 +249,9 @@ lvwClients->setMinimumHeight ( 140 );
cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) ); cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pServer->GetCentralServerAddressType() ) ); cbxCentServAddrType->setCurrentIndex ( static_cast<int> ( pServer->GetCentralServerAddressType() ) );
// custom central server address
edtCentralServerAddress->setText ( pServer->GetServerListCentralServerAddress() );
// update server name line edit // update server name line edit
edtServerName->setText ( pServer->GetServerName() ); edtServerName->setText ( pServer->GetServerName() );
@ -665,9 +668,6 @@ void CServerDlg::UpdateGUIDependencies()
{ {
// get the states which define the GUI dependencies from the server // get the states which define the GUI dependencies from the server
const bool bCurSerListEnabled = pServer->GetServerListEnabled(); const bool bCurSerListEnabled = pServer->GetServerListEnabled();
const bool bCurUseDefCentServAddr = ( pServer->GetCentralServerAddressType() != AT_CUSTOM );
const ESvrRegStatus eSvrRegStatus = pServer->GetSvrRegStatus(); const ESvrRegStatus eSvrRegStatus = pServer->GetSvrRegStatus();
// if register server is not enabled, we disable all the configuration // if register server is not enabled, we disable all the configuration
@ -675,29 +675,6 @@ void CServerDlg::UpdateGUIDependencies()
cbxCentServAddrType->setEnabled ( bCurSerListEnabled ); cbxCentServAddrType->setEnabled ( bCurSerListEnabled );
grbServerInfo->setEnabled ( bCurSerListEnabled ); grbServerInfo->setEnabled ( bCurSerListEnabled );
// make sure the line edit does not fire signals when we update the text
edtCentralServerAddress->blockSignals ( true );
{
if ( bCurUseDefCentServAddr )
{
// if the default central server is used, just show a text of the
// server name
edtCentralServerAddress->setText ( tr ( "Predefined Address" ) );
}
else
{
// show the current user defined server address
edtCentralServerAddress->setText (
pServer->GetServerListCentralServerAddress() );
}
}
edtCentralServerAddress->blockSignals ( false );
// the line edit of the central server address is only enabled, if the
// server list is enabled and not the default address is used
edtCentralServerAddress->setEnabled (
!bCurUseDefCentServAddr && bCurSerListEnabled );
QString strStatus = svrRegStatusToString ( eSvrRegStatus ); QString strStatus = svrRegStatusToString ( eSvrRegStatus );
switch ( eSvrRegStatus ) switch ( eSvrRegStatus )