From 54f97050011e94a593380317f2dd2cf73ad34dd3 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 25 May 2020 21:00:02 +0200 Subject: [PATCH] quicker update of musicians list in the server list table --- ChangeLog | 2 ++ src/connectdlg.cpp | 23 +++++++---------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb10d158..1a7b622a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ - added vocal banjo/mandolin instrument icons created by atsampson (#283) +- quicker update of musicians list in the server list table + diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index 8a1ce398..9327538c 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -130,11 +130,9 @@ CConnectDlg::CConnectDlg ( CClient* pNCliP, // 3: location // 4: minimum ping time (invisible) // 5: maximum number of clients (invisible) - // 6: number of musicians (just the number, invisible) - lvwServers->setColumnCount ( 7 ); + lvwServers->setColumnCount ( 6 ); lvwServers->hideColumn ( 4 ); lvwServers->hideColumn ( 5 ); - lvwServers->hideColumn ( 6 ); // per default the root shall not be decorated (to save space) lvwServers->setRootIsDecorated ( false ); @@ -396,9 +394,6 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr, // store the maximum number of clients pNewListViewItem->setText ( 5, QString().setNum ( vecServerInfo[iIdx].iMaxNumClients ) ); - // initialize the current number of connected clients - pNewListViewItem->setText ( 6, QString().setNum ( 0 ) ); - // store host address pNewListViewItem->setData ( 0, Qt::UserRole, CurHostAddress.toString() ); @@ -690,14 +685,6 @@ void CConnectDlg::OnTimerPing() #else emit CreateCLServerListPingMes ( CurServerAddress ); #endif - - // check if the number of child list items matches the number of - // connected clients, if not then request the client names - if ( lvwServers->topLevelItem ( iIdx )->text ( 6 ).toInt() != - lvwServers->topLevelItem ( iIdx )->childCount() ) - { - emit CreateCLServerListReqConnClientsListMes ( CurServerAddress ); - } } } } @@ -783,8 +770,12 @@ void CConnectDlg::SetPingTimeAndNumClientsResult ( const CHostAddress& InetAddr, setText ( 2, QString().setNum ( iNumClients ) ); } - // update number of clients value (hidden) - pCurListViewItem->setText ( 6, QString().setNum ( iNumClients ) ); + // check if the number of child list items matches the number of + // connected clients, if not then request the client names + if ( iNumClients != pCurListViewItem->childCount() ) + { + emit CreateCLServerListReqConnClientsListMes ( InetAddr ); + } // this is the first time a ping time was received, set item to visible if ( bIsFirstPing )