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

Review comment changes

Browse source
This commit is contained in:
Peter L Jones 2020-05-25 18:47:14 +01:00
parent 0f8d15f343
commit 7977413bb6
4 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server.cpp
View file

@ -470,7 +470,7 @@ CServer::CServer ( const int iNewMaxNumChan,
QObject::connect( &JamRecorder, QObject::connect( &JamRecorder,
SIGNAL ( RecordingSessionStarted ( QString ) ), SIGNAL ( RecordingSessionStarted ( QString ) ),
this, SLOT ( OnRecordingSessionStarted ( QString ) ) ); SIGNAL ( RecordingSessionStarted ( QString ) ) );
QObject::connect ( QCoreApplication::instance(), QObject::connect ( QCoreApplication::instance(),
SIGNAL ( aboutToQuit() ), SIGNAL ( aboutToQuit() ),

5
src/server.h
View file

@ -459,11 +459,6 @@ public slots:
void OnCLDisconnection ( CHostAddress InetAddr ); void OnCLDisconnection ( CHostAddress InetAddr );
void OnRecordingSessionStarted ( QString sessionDir )
{
emit RecordingSessionStarted ( sessionDir );
}
void OnAboutToQuit(); void OnAboutToQuit();
void OnHandledSignal ( int sigNum ); void OnHandledSignal ( int sigNum );

16
src/serverdlg.cpp
View file

@ -474,11 +474,6 @@ void CServerDlg::OnCentServAddrTypeActivated ( int iTypeIdx )
UpdateGUIDependencies(); UpdateGUIDependencies();
} }
void CServerDlg::OnNewRecordingClicked()
{
pServer->RestartRecorder();
}
void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason ) void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
{ {
// on double click on the icon, show window in fore ground // on double click on the icon, show window in fore ground
@ -532,17 +527,6 @@ void CServerDlg::OnTimer()
ListViewMutex.unlock(); ListViewMutex.unlock();
} }
void CServerDlg::OnServerStarted()
{
UpdateSystemTrayIcon ( true );
}
void CServerDlg::OnServerStopped()
{
UpdateSystemTrayIcon ( false );
UpdateRecorderStatus ( QString::null );
}
void CServerDlg::UpdateGUIDependencies() void CServerDlg::UpdateGUIDependencies()
{ {

16
src/serverdlg.h
View file

@ -91,10 +91,15 @@ public slots:
void OnLocationCityTextChanged ( const QString& strNewCity ); void OnLocationCityTextChanged ( const QString& strNewCity );
void OnLocationCountryActivated ( int iCntryListItem ); void OnLocationCountryActivated ( int iCntryListItem );
void OnCentServAddrTypeActivated ( int iTypeIdx ); void OnCentServAddrTypeActivated ( int iTypeIdx );
void OnNewRecordingClicked();
void OnTimer(); void OnTimer();
void OnServerStarted();
void OnServerStopped(); void OnServerStarted() { UpdateSystemTrayIcon ( true ); }
void OnServerStopped()
{
UpdateSystemTrayIcon ( false );
UpdateRecorderStatus ( QString::null );
}
void OnSvrRegStatusChanged() { UpdateGUIDependencies(); } void OnSvrRegStatusChanged() { UpdateGUIDependencies(); }
void OnSysTrayMenuOpen() { ShowWindowInForeground(); } void OnSysTrayMenuOpen() { ShowWindowInForeground(); }
void OnSysTrayMenuHide() { hide(); } void OnSysTrayMenuHide() { hide(); }
@ -104,6 +109,11 @@ public slots:
void keyPressEvent ( QKeyEvent *e ) // block escape key void keyPressEvent ( QKeyEvent *e ) // block escape key
{ if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); } { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); }
void OnNewRecordingClicked();
{
pServer->RestartRecorder();
}
void OnRecordingSessionStarted ( QString sessionDir ) void OnRecordingSessionStarted ( QString sessionDir )
{ {
UpdateRecorderStatus ( sessionDir ); UpdateRecorderStatus ( sessionDir );