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

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

Browse source
This commit is contained in:
Volker Fischer 2014-02-25 14:38:12 +00:00
parent 3ba632be9e
commit 5b2d256bc2
9 changed files with 205 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/client.cpp
View file

@ -57,7 +57,6 @@ CClient::CClient ( const quint16 iPortNumber ) :
bFraSiFactPrefSupported ( false ), bFraSiFactPrefSupported ( false ),
bFraSiFactDefSupported ( false ), bFraSiFactDefSupported ( false ),
bFraSiFactSafeSupported ( false ), bFraSiFactSafeSupported ( false ),
bOpenChatOnNewMessage ( true ),
eGUIDesign ( GD_ORIGINAL ), eGUIDesign ( GD_ORIGINAL ),
bJitterBufferOK ( true ), bJitterBufferOK ( true ),
strCentralServerAddress ( "" ), strCentralServerAddress ( "" ),

4
src/client.h
View file

@ -120,9 +120,6 @@ public:
bool IsConnected() { return Channel.IsConnected(); } bool IsConnected() { return Channel.IsConnected(); }
bool GetOpenChatOnNewMessage() const { return bOpenChatOnNewMessage; }
void SetOpenChatOnNewMessage ( const bool bNV ) { bOpenChatOnNewMessage = bNV; }
EGUIDesign GetGUIDesign() const { return eGUIDesign; } EGUIDesign GetGUIDesign() const { return eGUIDesign; }
void SetGUIDesign ( const EGUIDesign eNGD ) { eGUIDesign = eNGD; } void SetGUIDesign ( const EGUIDesign eNGD ) { eGUIDesign = eNGD; }
@ -360,7 +357,6 @@ void SetAudoCompressiontype ( const EAudComprType eNAudCompressionType );
int iMonoBlockSizeSam; int iMonoBlockSizeSam;
int iStereoBlockSizeSam; int iStereoBlockSizeSam;
bool bOpenChatOnNewMessage;
EGUIDesign eGUIDesign; EGUIDesign eGUIDesign;
bool bJitterBufferOK; bool bJitterBufferOK;

61
src/clientdlg.cpp
View file

@ -37,7 +37,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
QDialog ( parent, f ), QDialog ( parent, f ),
pClient ( pNCliP ), pClient ( pNCliP ),
pSettings ( pNSetP ), pSettings ( pNSetP ),
bUnreadChatMessage ( false ),
ClientSettingsDlg ( pNCliP, parent, Qt::Window ), ClientSettingsDlg ( pNCliP, parent, Qt::Window ),
ChatDlg ( parent, Qt::Window ), ChatDlg ( parent, Qt::Window ),
ConnectDlg ( bNewShowComplRegConnList, parent, Qt::Dialog ), ConnectDlg ( bNewShowComplRegConnList, parent, Qt::Dialog ),
@ -217,17 +216,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
ledBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) ); ledBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) );
// chat LED
QString strLEDChat = tr ( "<b>Chat Status LED:</b> "
"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 // init GUI design
SetGUIDesign ( pClient->GetGUIDesign() ); SetGUIDesign ( pClient->GetGUIDesign() );
@ -258,7 +246,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
ledConnection->Reset(); ledConnection->Reset();
ledBuffers->Reset(); ledBuffers->Reset();
ledDelay->Reset(); ledDelay->Reset();
ledChat->Reset();
// init slider controls --- // init slider controls ---
@ -306,7 +293,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
ledConnection->setEnabled ( false ); ledConnection->setEnabled ( false );
ledBuffers->setEnabled ( false ); ledBuffers->setEnabled ( false );
ledDelay->setEnabled ( false ); ledDelay->setEnabled ( false );
ledChat->setEnabled ( false );
butConnect->setFocus(); butConnect->setFocus();
} }
@ -733,23 +719,11 @@ void CClientDlg::OnInstPicturesMenuTriggered ( QAction* SelAction )
void CClientDlg::OnChatTextReceived ( QString strChatText ) void CClientDlg::OnChatTextReceived ( QString strChatText )
{ {
// init flag (will maybe overwritten later in this function)
bUnreadChatMessage = false;
ChatDlg.AddChatText ( strChatText ); ChatDlg.AddChatText ( strChatText );
// if requested, open window // open window (note that we do not want to force the dialog to be upfront
if ( pClient->GetOpenChatOnNewMessage() ) // always when a new message arrives since this is annoying)
{ ShowChatWindow ( false );
ShowChatWindow();
}
else
{
if ( !ChatDlg.isVisible() )
{
bUnreadChatMessage = true;
}
}
UpdateDisplay(); UpdateDisplay();
} }
@ -817,17 +791,17 @@ void CClientDlg::ShowGeneralSettings()
ClientSettingsDlg.activateWindow(); ClientSettingsDlg.activateWindow();
} }
void CClientDlg::ShowChatWindow() void CClientDlg::ShowChatWindow ( const bool bForceRaise )
{ {
// open chat dialog // open chat dialog if it is not visible
ChatDlg.show(); if ( bForceRaise || !ChatDlg.isVisible() )
{
ChatDlg.show();
// make sure dialog is upfront and has focus // make sure dialog is upfront and has focus
ChatDlg.raise(); ChatDlg.raise();
ChatDlg.activateWindow(); ChatDlg.activateWindow();
}
// chat dialog is opened, reset unread message flag
bUnreadChatMessage = false;
UpdateDisplay(); UpdateDisplay();
} }
@ -1086,7 +1060,6 @@ OnTimerStatus();
ledConnection->Reset(); ledConnection->Reset();
ledBuffers->Reset(); ledBuffers->Reset();
ledDelay->Reset(); ledDelay->Reset();
ledChat->Reset();
ClientSettingsDlg.ResetStatusAndPingLED(); ClientSettingsDlg.ResetStatusAndPingLED();
// clear mixer board (remove all faders) // clear mixer board (remove all faders)
@ -1100,16 +1073,6 @@ void CClientDlg::UpdateDisplay()
{ {
if ( pClient->IsConnected() ) if ( pClient->IsConnected() )
{ {
// chat LED
if ( bUnreadChatMessage )
{
ledChat->SetLight ( CMultiColorLED::RL_GREEN );
}
else
{
ledChat->Reset();
}
// connection LED // connection LED
ledConnection->SetLight ( CMultiColorLED::RL_GREEN ); ledConnection->SetLight ( CMultiColorLED::RL_GREEN );
} }

3
src/clientdlg.h
View file

@ -83,7 +83,7 @@ protected:
void SetMyWindowTitle ( const int iNumClients ); void SetMyWindowTitle ( const int iNumClients );
void ShowConnectionSetupDialog(); void ShowConnectionSetupDialog();
void ShowGeneralSettings(); void ShowGeneralSettings();
void ShowChatWindow(); void ShowChatWindow ( const bool bForceRaise = true );
void ShowAnalyzerConsole(); void ShowAnalyzerConsole();
void UpdateAudioFaderSlider(); void UpdateAudioFaderSlider();
void UpdateRevSelection(); void UpdateRevSelection();
@ -95,7 +95,6 @@ protected:
CSettings* pSettings; CSettings* pSettings;
bool bConnected; bool bConnected;
bool bUnreadChatMessage;
QTimer TimerSigMet; QTimer TimerSigMet;
QTimer TimerBuffersLED; QTimer TimerBuffersLED;
QTimer TimerStatus; QTimer TimerStatus;

446
src/clientdlgbase.ui
View file

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CClientDlgBase</class> <class>CClientDlgBase</class>
<widget class="QDialog" name="CClientDlgBase" > <widget class="QDialog" name="CClientDlgBase">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,85 +10,86 @@
<height>382</height> <height>382</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string></string>
</property>
<property name="windowIcon" >
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
</property>
<property name="styleSheet" >
<string/> <string/>
</property> </property>
<property name="sizeGripEnabled" > <property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/png/main/res/mainicon.png</normaloff>:/png/main/res/mainicon.png</iconset>
</property>
<property name="styleSheet">
<string/>
</property>
<property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="leftMargin" > <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin" > <property name="rightMargin">
<number>3</number> <number>3</number>
</property> </property>
<property name="bottomMargin" > <property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="backgroundFrame" > <widget class="QFrame" name="backgroundFrame">
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="frameShape" > <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow" > <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="pxlLogo" > <widget class="QLabel" name="pxlLogo">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="pixmap" > <property name="pixmap">
<pixmap resource="resources.qrc" >:/png/main/res/fronticon.png</pixmap> <pixmap resource="resources.qrc">:/png/main/res/fronticon.png</pixmap>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -99,10 +101,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>10</width>
<height>0</height> <height>0</height>
@ -111,35 +113,35 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="lblConnection" > <widget class="QLabel" name="lblConnection">
<property name="text" > <property name="text">
<string>Connection</string> <string>Connection</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="CMultiColorLED" native="1" name="ledConnection" > <widget class="CMultiColorLED" name="ledConnection" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
@ -151,10 +153,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>10</width>
<height>0</height> <height>0</height>
@ -163,35 +165,35 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="lblDelay" > <widget class="QLabel" name="lblDelay">
<property name="text" > <property name="text">
<string>Delay</string> <string>Delay</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="CMultiColorLED" native="1" name="ledDelay" > <widget class="CMultiColorLED" name="ledDelay" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
@ -203,10 +205,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>10</width> <width>10</width>
<height>0</height> <height>0</height>
@ -215,35 +217,35 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="lblBuffers" > <widget class="QLabel" name="lblBuffers">
<property name="text" > <property name="text">
<string>Buffers</string> <string>Buffers</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="CMultiColorLED" native="1" name="ledBuffers" > <widget class="CMultiColorLED" name="ledBuffers" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize">
<size> <size>
<width>14</width> <width>14</width>
<height>14</height> <height>14</height>
@ -255,62 +257,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="lblChat" >
<property name="text" >
<string>Chat</string>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="CMultiColorLED" native="1" name="ledChat" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>14</width>
<height>14</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>14</width>
<height>14</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size> <size>
<width>10</width> <width>10</width>
<height>0</height> <height>0</height>
@ -321,35 +271,35 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="Line" name="lineMeter" > <widget class="Line" name="lineMeter">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="lblInputLEDMeter" > <widget class="QLabel" name="lblInputLEDMeter">
<property name="text" > <property name="text">
<string>Input</string> <string>Input</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="CMultiColorLEDBar" native="1" name="lbrInputLevelL" > <widget class="CMultiColorLEDBar" name="lbrInputLevelL" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>88</height> <height>88</height>
@ -358,14 +308,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="CMultiColorLEDBar" native="1" name="lbrInputLevelR" > <widget class="CMultiColorLEDBar" name="lbrInputLevelR" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" > <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>88</height> <height>88</height>
@ -376,23 +326,23 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLabel" name="lblLevelMeterLeft" > <widget class="QLabel" name="lblLevelMeterLeft">
<property name="text" > <property name="text">
<string>L</string> <string>L</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lblLevelMeterRight" > <widget class="QLabel" name="lblLevelMeterRight">
<property name="text" > <property name="text">
<string>R</string> <string>R</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
@ -403,13 +353,13 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -420,47 +370,47 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="Line" name="lineUpperLowerLeft" > <widget class="Line" name="lineUpperLowerLeft">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="chbSettings" > <widget class="QCheckBox" name="chbSettings">
<property name="text" > <property name="text">
<string>Settings</string> <string>Settings</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="chbChat" > <widget class="QCheckBox" name="chbChat">
<property name="text" > <property name="text">
<string>Chat</string> <string>Chat</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lblServerTag" > <widget class="QLabel" name="lblServerTag">
<property name="text" > <property name="text">
<string>Your Alias/Instrument</string> <string>Your Alias/Instrument</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QLineEdit" name="edtFaderTag" > <widget class="QLineEdit" name="edtFaderTag">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Ignored" > <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>40</width> <width>40</width>
<height>0</height> <height>0</height>
@ -469,41 +419,42 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="butInstPicture" > <widget class="QPushButton" name="butInstPicture">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="icon" > <property name="icon">
<iconset resource="resources.qrc" >:/png/instr/res/instrnone.png</iconset> <iconset resource="resources.qrc">
<normaloff>:/png/instr/res/instrnone.png</normaloff>:/png/instr/res/instrnone.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<item> <item>
<widget class="QPushButton" name="butConnect" > <widget class="QPushButton" name="butConnect">
<property name="text" > <property name="text">
<string>C&amp;onnect</string> <string>C&amp;onnect</string>
</property> </property>
<property name="default" > <property name="default">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>25</height> <height>25</height>
@ -516,74 +467,65 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="Line" name="linePanReverb" > <widget class="Line" name="linePanReverb">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="lblAudioPan" > <widget class="QLabel" name="lblAudioPan">
<property name="text" > <property name="text">
<string>Pan</string> <string>Pan</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lblAudioPanValue" > <widget class="QLabel" name="lblAudioPanValue">
<property name="minimumSize" > <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="text" > <property name="text">
<string>Center</string> <string>Center</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" > <property name="margin">
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -592,30 +534,30 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QSlider" name="sldAudioPan" > <widget class="QSlider" name="sldAudioPan">
<property name="styleSheet" > <property name="styleSheet">
<string/> <string/>
</property> </property>
<property name="pageStep" > <property name="pageStep">
<number>1</number> <number>1</number>
</property> </property>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="tickPosition" > <property name="tickPosition">
<enum>QSlider::TicksBothSides</enum> <enum>QSlider::TicksBothSides</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -628,60 +570,42 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="leftMargin" > <property name="margin">
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="lblAudioReverb" > <widget class="QLabel" name="lblAudioReverb">
<property name="text" > <property name="text">
<string>Reverb</string> <string>Reverb</string>
</property> </property>
<property name="alignment" > <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" > <property name="margin">
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -690,27 +614,27 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QSlider" name="sldAudioReverb" > <widget class="QSlider" name="sldAudioReverb">
<property name="pageStep" > <property name="pageStep">
<number>1</number> <number>1</number>
</property> </property>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="tickPosition" > <property name="tickPosition">
<enum>QSlider::TicksBothSides</enum> <enum>QSlider::TicksBothSides</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Minimum</enum> <enum>QSizePolicy::Minimum</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -723,20 +647,20 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<item> <item>
<widget class="QRadioButton" name="rbtReverbSelL" > <widget class="QRadioButton" name="rbtReverbSelL">
<property name="text" > <property name="text">
<string>Left</string> <string>Left</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="rbtReverbSelR" > <widget class="QRadioButton" name="rbtReverbSelR">
<property name="text" > <property name="text">
<string>Right</string> <string>Right</string>
</property> </property>
</widget> </widget>
@ -748,9 +672,9 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="CAudioMixerBoard" native="1" name="MainMixerBoard" > <widget class="CAudioMixerBoard" name="MainMixerBoard" native="true">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" > <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -792,7 +716,7 @@
<tabstop>rbtReverbSelR</tabstop> <tabstop>rbtReverbSelR</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="resources.qrc" /> <include location="resources.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

31
src/clientsettingsdlg.cpp
View file

@ -174,18 +174,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
butDriverSetup->setAccessibleName ( tr ( "ASIO setup push button" ) ); butDriverSetup->setAccessibleName ( tr ( "ASIO setup push button" ) );
butDriverSetup->setToolTip ( strSndCrdBufDelayTT ); butDriverSetup->setToolTip ( strSndCrdBufDelayTT );
// open chat on new message
chbOpenChatOnNewMessage->setWhatsThis ( tr ( "<b>Open Chat on New "
"Message:</b> 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 // fancy skin
chbGUIDesignFancy->setWhatsThis ( tr ( "<b>Fancy Skin:</b> If enabled, " chbGUIDesignFancy->setWhatsThis ( tr ( "<b>Fancy Skin:</b> If enabled, "
"a fancy skin will be applied to the main window." ) ); "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 // init sound card channel selection frame
UpdateSoundChannelSelectionFrame(); UpdateSoundChannelSelectionFrame();
// "OpenChatOnNewMessage" check box
if ( pClient->GetOpenChatOnNewMessage() )
{
chbOpenChatOnNewMessage->setCheckState ( Qt::Checked );
}
else
{
chbOpenChatOnNewMessage->setCheckState ( Qt::Unchecked );
}
// fancy GUI design check box // fancy GUI design check box
if ( pClient->GetGUIDesign() == GD_STANDARD ) if ( pClient->GetGUIDesign() == GD_STANDARD )
{ {
@ -380,9 +358,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
this, SLOT ( OnNetBufServerValueChanged ( int ) ) ); this, SLOT ( OnNetBufServerValueChanged ( int ) ) );
// check boxes // check boxes
QObject::connect ( chbOpenChatOnNewMessage, SIGNAL ( stateChanged ( int ) ),
this, SLOT ( OnOpenChatOnNewMessageStateChanged ( int ) ) );
QObject::connect ( chbGUIDesignFancy, SIGNAL ( stateChanged ( int ) ), QObject::connect ( chbGUIDesignFancy, SIGNAL ( stateChanged ( int ) ),
this, SLOT ( OnGUIDesignFancyStateChanged ( int ) ) ); this, SLOT ( OnGUIDesignFancyStateChanged ( int ) ) );
@ -656,12 +631,6 @@ void CClientSettingsDlg::OnAutoJitBufStateChanged ( int value )
UpdateJitterBufferFrame(); UpdateJitterBufferFrame();
} }
void CClientSettingsDlg::OnOpenChatOnNewMessageStateChanged ( int value )
{
pClient->SetOpenChatOnNewMessage ( value == Qt::Checked );
UpdateDisplay();
}
void CClientSettingsDlg::OnGUIDesignFancyStateChanged ( int value ) void CClientSettingsDlg::OnGUIDesignFancyStateChanged ( int value )
{ {
if ( value == Qt::Unchecked ) if ( value == Qt::Unchecked )

1
src/clientsettingsdlg.h
View file

@ -89,7 +89,6 @@ protected:
void OnNetBufServerValueChanged ( int value ); void OnNetBufServerValueChanged ( int value );
void OnSliderSndCrdBufferDelay ( int value ); void OnSliderSndCrdBufferDelay ( int value );
void OnAutoJitBufStateChanged ( int value ); void OnAutoJitBufStateChanged ( int value );
void OnOpenChatOnNewMessageStateChanged ( int value );
void OnGUIDesignFancyStateChanged ( int value ); void OnGUIDesignFancyStateChanged ( int value );
void OnDefaultCentralServerStateChanged ( int value ); void OnDefaultCentralServerStateChanged ( int value );
void OnCentralServerAddressEditingFinished(); void OnCentralServerAddressEditingFinished();

22
src/clientsettingsdlgbase.ui
View file

@ -467,20 +467,6 @@
<string>Misc</string> <string>Misc</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="chbOpenChatOnNewMessage">
<property name="text">
<string>Open Chat on New Message</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chbGUIDesignFancy">
<property name="text">
<string>Fancy Skin</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -513,6 +499,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QCheckBox" name="chbGUIDesignFancy">
<property name="text">
<string>Fancy Skin</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<item> <item>
@ -692,7 +685,6 @@
<tabstop>chbAutoJitBuf</tabstop> <tabstop>chbAutoJitBuf</tabstop>
<tabstop>sldNetBuf</tabstop> <tabstop>sldNetBuf</tabstop>
<tabstop>sldNetBufServer</tabstop> <tabstop>sldNetBufServer</tabstop>
<tabstop>chbOpenChatOnNewMessage</tabstop>
<tabstop>chbGUIDesignFancy</tabstop> <tabstop>chbGUIDesignFancy</tabstop>
<tabstop>cbxAudioChannels</tabstop> <tabstop>cbxAudioChannels</tabstop>
<tabstop>cbxAudioQuality</tabstop> <tabstop>cbxAudioQuality</tabstop>

10
src/settings.cpp
View file

@ -210,12 +210,6 @@ void CSettings::Load()
pClient->SetServerSockBufNumFrames ( iValue ); 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 // GUI design
if ( GetNumericIniSet ( IniXMLDocument, "client", "guidesign", if ( GetNumericIniSet ( IniXMLDocument, "client", "guidesign",
0, 1 /* GD_ORIGINAL */, iValue ) ) 0, 1 /* GD_ORIGINAL */, iValue ) )
@ -425,10 +419,6 @@ void CSettings::Save()
SetNumericIniSet ( IniXMLDocument, "client", "jitbufserver", SetNumericIniSet ( IniXMLDocument, "client", "jitbufserver",
pClient->GetServerSockBufNumFrames() ); pClient->GetServerSockBufNumFrames() );
// flag whether the chat window shall be opened on a new chat message
SetFlagIniSet ( IniXMLDocument, "client", "openchatonnewmessage",
pClient->GetOpenChatOnNewMessage() );
// GUI design // GUI design
SetNumericIniSet ( IniXMLDocument, "client", "guidesign", SetNumericIniSet ( IniXMLDocument, "client", "guidesign",
static_cast<int> ( pClient->GetGUIDesign() ) ); static_cast<int> ( pClient->GetGUIDesign() ) );