From 62c4fbfb775034ac120d013ad9120b3dcabeff31 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Mon, 25 May 2020 21:55:45 +0100 Subject: [PATCH] Further review comments --- ChangeLog | 2 ++ src/serverdlg.cpp | 6 ++++++ src/serverdlg.h | 18 +++--------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ed3e4f..91855ad6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ - faster update of musicians list in the server list table +- display recorder state and latest recording directory, + allow a new recording to be requested, by pljones (#228) diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 48895317..0f967d52 100755 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -474,6 +474,12 @@ void CServerDlg::OnCentServAddrTypeActivated ( int iTypeIdx ) UpdateGUIDependencies(); } +void CServerDlg::OnServerStopped(); +{ + UpdateSystemTrayIcon ( false ); + UpdateRecorderStatus ( QString::null ); +} + void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason ) { // on double click on the icon, show window in fore ground diff --git a/src/serverdlg.h b/src/serverdlg.h index 55600744..ef80c8e4 100755 --- a/src/serverdlg.h +++ b/src/serverdlg.h @@ -92,14 +92,8 @@ public slots: void OnLocationCountryActivated ( int iCntryListItem ); void OnCentServAddrTypeActivated ( int iTypeIdx ); void OnTimer(); - void OnServerStarted() { UpdateSystemTrayIcon ( true ); } - void OnServerStopped() - { - UpdateSystemTrayIcon ( false ); - UpdateRecorderStatus ( QString::null ); - } - + void OnServerStopped(); void OnSvrRegStatusChanged() { UpdateGUIDependencies(); } void OnSysTrayMenuOpen() { ShowWindowInForeground(); } void OnSysTrayMenuHide() { hide(); } @@ -109,13 +103,7 @@ public slots: void keyPressEvent ( QKeyEvent *e ) // block escape key { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); } - void OnNewRecordingClicked(); - { - pServer->RestartRecorder(); - } - + void OnNewRecordingClicked(); { pServer->RestartRecorder(); } void OnRecordingSessionStarted ( QString sessionDir ) - { - UpdateRecorderStatus ( sessionDir ); - } + { UpdateRecorderStatus ( sessionDir ); } };