From 5b2d256bc2dc66be66a48d7c43f6d985814eb66c Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 25 Feb 2014 14:38:12 +0000 Subject: [PATCH] removed the "open chat on new message" mechanism since nobody actually uses this, now simply the window automatically opens on a new message if it is not already open, otherwise do nothing --- src/client.cpp | 1 - src/client.h | 4 - src/clientdlg.cpp | 61 +---- src/clientdlg.h | 3 +- src/clientdlgbase.ui | 446 +++++++++++++++-------------------- src/clientsettingsdlg.cpp | 31 --- src/clientsettingsdlg.h | 1 - src/clientsettingsdlgbase.ui | 22 +- src/settings.cpp | 10 - 9 files changed, 205 insertions(+), 374 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index a3e79f46..4d0f9a9d 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -57,7 +57,6 @@ CClient::CClient ( const quint16 iPortNumber ) : bFraSiFactPrefSupported ( false ), bFraSiFactDefSupported ( false ), bFraSiFactSafeSupported ( false ), - bOpenChatOnNewMessage ( true ), eGUIDesign ( GD_ORIGINAL ), bJitterBufferOK ( true ), strCentralServerAddress ( "" ), diff --git a/src/client.h b/src/client.h index 9c9185db..912201c9 100755 --- a/src/client.h +++ b/src/client.h @@ -120,9 +120,6 @@ public: bool IsConnected() { return Channel.IsConnected(); } - bool GetOpenChatOnNewMessage() const { return bOpenChatOnNewMessage; } - void SetOpenChatOnNewMessage ( const bool bNV ) { bOpenChatOnNewMessage = bNV; } - EGUIDesign GetGUIDesign() const { return eGUIDesign; } void SetGUIDesign ( const EGUIDesign eNGD ) { eGUIDesign = eNGD; } @@ -360,7 +357,6 @@ void SetAudoCompressiontype ( const EAudComprType eNAudCompressionType ); int iMonoBlockSizeSam; int iStereoBlockSizeSam; - bool bOpenChatOnNewMessage; EGUIDesign eGUIDesign; bool bJitterBufferOK; diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 96d07a53..3ed9c972 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -37,7 +37,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, QDialog ( parent, f ), pClient ( pNCliP ), pSettings ( pNSetP ), - bUnreadChatMessage ( false ), ClientSettingsDlg ( pNCliP, parent, Qt::Window ), ChatDlg ( parent, Qt::Window ), ConnectDlg ( bNewShowComplRegConnList, parent, Qt::Dialog ), @@ -217,17 +216,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) ); - // chat LED - QString strLEDChat = tr ( "Chat Status LED: " - "If the option Open Chat on New Message is not activated, this " - "status LED will turn green on a new received chat message." ); - - lblChat->setWhatsThis ( strLEDChat ); - ledChat->setWhatsThis ( strLEDChat ); - - ledBuffers->setAccessibleName ( tr ( "Chat status LED indicator" ) ); - - // init GUI design SetGUIDesign ( pClient->GetGUIDesign() ); @@ -258,7 +246,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledConnection->Reset(); ledBuffers->Reset(); ledDelay->Reset(); - ledChat->Reset(); // init slider controls --- @@ -306,7 +293,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledConnection->setEnabled ( false ); ledBuffers->setEnabled ( false ); ledDelay->setEnabled ( false ); - ledChat->setEnabled ( false ); butConnect->setFocus(); } @@ -733,23 +719,11 @@ void CClientDlg::OnInstPicturesMenuTriggered ( QAction* SelAction ) void CClientDlg::OnChatTextReceived ( QString strChatText ) { - // init flag (will maybe overwritten later in this function) - bUnreadChatMessage = false; - ChatDlg.AddChatText ( strChatText ); - // if requested, open window - if ( pClient->GetOpenChatOnNewMessage() ) - { - ShowChatWindow(); - } - else - { - if ( !ChatDlg.isVisible() ) - { - bUnreadChatMessage = true; - } - } + // open window (note that we do not want to force the dialog to be upfront + // always when a new message arrives since this is annoying) + ShowChatWindow ( false ); UpdateDisplay(); } @@ -817,17 +791,17 @@ void CClientDlg::ShowGeneralSettings() ClientSettingsDlg.activateWindow(); } -void CClientDlg::ShowChatWindow() +void CClientDlg::ShowChatWindow ( const bool bForceRaise ) { - // open chat dialog - ChatDlg.show(); + // open chat dialog if it is not visible + if ( bForceRaise || !ChatDlg.isVisible() ) + { + ChatDlg.show(); - // make sure dialog is upfront and has focus - ChatDlg.raise(); - ChatDlg.activateWindow(); - - // chat dialog is opened, reset unread message flag - bUnreadChatMessage = false; + // make sure dialog is upfront and has focus + ChatDlg.raise(); + ChatDlg.activateWindow(); + } UpdateDisplay(); } @@ -1086,7 +1060,6 @@ OnTimerStatus(); ledConnection->Reset(); ledBuffers->Reset(); ledDelay->Reset(); - ledChat->Reset(); ClientSettingsDlg.ResetStatusAndPingLED(); // clear mixer board (remove all faders) @@ -1100,16 +1073,6 @@ void CClientDlg::UpdateDisplay() { if ( pClient->IsConnected() ) { - // chat LED - if ( bUnreadChatMessage ) - { - ledChat->SetLight ( CMultiColorLED::RL_GREEN ); - } - else - { - ledChat->Reset(); - } - // connection LED ledConnection->SetLight ( CMultiColorLED::RL_GREEN ); } diff --git a/src/clientdlg.h b/src/clientdlg.h index 658a50ca..7cccb0d0 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -83,7 +83,7 @@ protected: void SetMyWindowTitle ( const int iNumClients ); void ShowConnectionSetupDialog(); void ShowGeneralSettings(); - void ShowChatWindow(); + void ShowChatWindow ( const bool bForceRaise = true ); void ShowAnalyzerConsole(); void UpdateAudioFaderSlider(); void UpdateRevSelection(); @@ -95,7 +95,6 @@ protected: CSettings* pSettings; bool bConnected; - bool bUnreadChatMessage; QTimer TimerSigMet; QTimer TimerBuffersLED; QTimer TimerStatus; diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index efc8e720..c2a97c6e 100755 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -1,7 +1,8 @@ - + + CClientDlgBase - - + + 0 0 @@ -9,85 +10,86 @@ 382 - - - - - :/png/main/res/mainicon.png - - + - + + + :/png/main/res/mainicon.png:/png/main/res/mainicon.png + + + + + true - - + + 0 - + 0 - + 3 - + 3 - - + + 0 0 - + QFrame::NoFrame - + QFrame::Plain - + - + - + - - + + 3 - + - - - + + + 0 0 - - :/png/main/res/fronticon.png + + :/png/main/res/fronticon.png - + Qt::AlignCenter - + false - + Qt::Horizontal - + QSizePolicy::Minimum - + 40 20 @@ -99,10 +101,10 @@ - + Qt::Vertical - + 10 0 @@ -111,35 +113,35 @@ - + - - + + Connection - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + false - - - + + + 0 0 - + 14 14 - + 14 14 @@ -151,10 +153,10 @@ - + Qt::Vertical - + 10 0 @@ -163,35 +165,35 @@ - + - - + + Delay - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + false - - - + + + 0 0 - + 14 14 - + 14 14 @@ -203,10 +205,10 @@ - + Qt::Vertical - + 10 0 @@ -215,35 +217,35 @@ - + - - + + Buffers - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + false - - - + + + 0 0 - + 14 14 - + 14 14 @@ -255,62 +257,10 @@ - + Qt::Vertical - - - 10 - 0 - - - - - - - - - - Chat - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - 0 - 0 - - - - - 14 - 14 - - - - - 14 - 14 - - - - - - - - - - Qt::Vertical - - + 10 0 @@ -321,35 +271,35 @@ - - + + Qt::Vertical - + - - + + Input - + Qt::AlignCenter - + - - - + + + 0 0 - + 16 88 @@ -358,14 +308,14 @@ - - - + + + 0 0 - + 16 88 @@ -376,23 +326,23 @@ - + - - + + L - + Qt::AlignCenter - - + + R - + Qt::AlignCenter @@ -403,13 +353,13 @@ - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 20 @@ -420,47 +370,47 @@ - - + + Qt::Horizontal - - + + Settings - - + + Chat - - + + Your Alias/Instrument - + false - + - - - + + + 0 0 - + 40 0 @@ -469,41 +419,42 @@ - - - + + + 0 0 - - :/png/instr/res/instrnone.png + + + :/png/instr/res/instrnone.png:/png/instr/res/instrnone.png - + - - + + C&onnect - + true - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 25 @@ -516,74 +467,65 @@ - - + + Qt::Vertical - + - - + + 3 - - + + Pan - + Qt::AlignCenter - - + + 50 0 - + Center - + Qt::AlignCenter - + false - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 20 @@ -592,30 +534,30 @@ - - + + - + 1 - + Qt::Vertical - + QSlider::TicksBothSides - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 20 @@ -628,60 +570,42 @@ - + - - + + 3 - - 0 - - - 0 - - - 0 - - + 0 - - + + Reverb - + Qt::AlignCenter - - + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 20 @@ -690,27 +614,27 @@ - - + + 1 - + Qt::Vertical - + QSlider::TicksBothSides - + Qt::Horizontal - + QSizePolicy::Minimum - + 0 20 @@ -723,20 +647,20 @@ - - + + 3 - - + + Left - - + + Right @@ -748,9 +672,9 @@ - - - + + + 0 0 @@ -792,7 +716,7 @@ rbtReverbSelR - + diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index e658c050..d95f4e1a 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -174,18 +174,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, butDriverSetup->setAccessibleName ( tr ( "ASIO setup push button" ) ); butDriverSetup->setToolTip ( strSndCrdBufDelayTT ); - // open chat on new message - chbOpenChatOnNewMessage->setWhatsThis ( tr ( "Open Chat on New " - "Message: If enabled, the chat window will " - "open on any incoming chat text if it not already opened." ) ); - - chbOpenChatOnNewMessage->setAccessibleName ( tr ( "Open chat on new " - "message check box" ) ); - - chbOpenChatOnNewMessage->setToolTip ( tr ( "If Open Chat on New Message " - "is disabled, a LED in the main window turns green when a " - "new message has arrived." ) + TOOLTIP_COM_END_TEXT ); - // fancy skin chbGUIDesignFancy->setWhatsThis ( tr ( "Fancy Skin: If enabled, " "a fancy skin will be applied to the main window." ) ); @@ -303,16 +291,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, // init sound card channel selection frame UpdateSoundChannelSelectionFrame(); - // "OpenChatOnNewMessage" check box - if ( pClient->GetOpenChatOnNewMessage() ) - { - chbOpenChatOnNewMessage->setCheckState ( Qt::Checked ); - } - else - { - chbOpenChatOnNewMessage->setCheckState ( Qt::Unchecked ); - } - // fancy GUI design check box if ( pClient->GetGUIDesign() == GD_STANDARD ) { @@ -380,9 +358,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, this, SLOT ( OnNetBufServerValueChanged ( int ) ) ); // check boxes - QObject::connect ( chbOpenChatOnNewMessage, SIGNAL ( stateChanged ( int ) ), - this, SLOT ( OnOpenChatOnNewMessageStateChanged ( int ) ) ); - QObject::connect ( chbGUIDesignFancy, SIGNAL ( stateChanged ( int ) ), this, SLOT ( OnGUIDesignFancyStateChanged ( int ) ) ); @@ -656,12 +631,6 @@ void CClientSettingsDlg::OnAutoJitBufStateChanged ( int value ) UpdateJitterBufferFrame(); } -void CClientSettingsDlg::OnOpenChatOnNewMessageStateChanged ( int value ) -{ - pClient->SetOpenChatOnNewMessage ( value == Qt::Checked ); - UpdateDisplay(); -} - void CClientSettingsDlg::OnGUIDesignFancyStateChanged ( int value ) { if ( value == Qt::Unchecked ) diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index f5af98f9..3f50c4f6 100755 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -89,7 +89,6 @@ protected: void OnNetBufServerValueChanged ( int value ); void OnSliderSndCrdBufferDelay ( int value ); void OnAutoJitBufStateChanged ( int value ); - void OnOpenChatOnNewMessageStateChanged ( int value ); void OnGUIDesignFancyStateChanged ( int value ); void OnDefaultCentralServerStateChanged ( int value ); void OnCentralServerAddressEditingFinished(); diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index 0fed2515..e66b69a8 100755 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -467,20 +467,6 @@ Misc - - - - Open Chat on New Message - - - - - - - Fancy Skin - - - @@ -513,6 +499,13 @@ + + + + Fancy Skin + + + @@ -692,7 +685,6 @@ chbAutoJitBuf sldNetBuf sldNetBufServer - chbOpenChatOnNewMessage chbGUIDesignFancy cbxAudioChannels cbxAudioQuality diff --git a/src/settings.cpp b/src/settings.cpp index 8df3d6df..52f37c0e 100755 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -210,12 +210,6 @@ void CSettings::Load() pClient->SetServerSockBufNumFrames ( iValue ); } - // flag whether the chat window shall be opened on a new chat message - if ( GetFlagIniSet ( IniXMLDocument, "client", "openchatonnewmessage", bValue ) ) - { - pClient->SetOpenChatOnNewMessage ( bValue ); - } - // GUI design if ( GetNumericIniSet ( IniXMLDocument, "client", "guidesign", 0, 1 /* GD_ORIGINAL */, iValue ) ) @@ -425,10 +419,6 @@ void CSettings::Save() SetNumericIniSet ( IniXMLDocument, "client", "jitbufserver", pClient->GetServerSockBufNumFrames() ); - // flag whether the chat window shall be opened on a new chat message - SetFlagIniSet ( IniXMLDocument, "client", "openchatonnewmessage", - pClient->GetOpenChatOnNewMessage() ); - // GUI design SetNumericIniSet ( IniXMLDocument, "client", "guidesign", static_cast ( pClient->GetGUIDesign() ) );