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
This commit is contained in:
Volker Fischer
parent
3ba632be9e
commit
5b2d256bc2
9 changed files with 205 additions and 374 deletions
|
|
@ -57,7 +57,6 @@ CClient::CClient ( const quint16 iPortNumber ) :
|
|||
bFraSiFactPrefSupported ( false ),
|
||||
bFraSiFactDefSupported ( false ),
|
||||
bFraSiFactSafeSupported ( false ),
|
||||
bOpenChatOnNewMessage ( true ),
|
||||
eGUIDesign ( GD_ORIGINAL ),
|
||||
bJitterBufferOK ( true ),
|
||||
strCentralServerAddress ( "" ),
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 ( "<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
|
||||
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
|
||||
// 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;
|
||||
}
|
||||
|
||||
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 );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<ui version="4.0" >
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>CClientDlgBase</class>
|
||||
<widget class="QDialog" name="CClientDlgBase" >
|
||||
<property name="geometry" >
|
||||
<widget class="QDialog" name="CClientDlgBase">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
|
|
@ -9,85 +10,86 @@
|
|||
<height>382</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string></string>
|
||||
</property>
|
||||
<property name="windowIcon" >
|
||||
<iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
|
||||
</property>
|
||||
<property name="styleSheet" >
|
||||
<property name="windowTitle">
|
||||
<string/>
|
||||
</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>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="leftMargin" >
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<property name="rightMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="bottomMargin">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QFrame" name="backgroundFrame" >
|
||||
<property name="minimumSize" >
|
||||
<widget class="QFrame" name="backgroundFrame">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="frameShape" >
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="frameShadow" >
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QVBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="pxlLogo" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
|
||||
<widget class="QLabel" name="pxlLogo">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="pixmap" >
|
||||
<pixmap resource="resources.qrc" >:/png/main/res/fronticon.png</pixmap>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="resources.qrc">:/png/main/res/fronticon.png</pixmap>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
|
|
@ -99,10 +101,10 @@
|
|||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>10</width>
|
||||
<height>0</height>
|
||||
|
|
@ -111,35 +113,35 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblConnection" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblConnection">
|
||||
<property name="text">
|
||||
<string>Connection</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="CMultiColorLED" native="1" name="ledConnection" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
|
||||
<widget class="CMultiColorLED" name="ledConnection" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
|
|
@ -151,10 +153,10 @@
|
|||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>10</width>
|
||||
<height>0</height>
|
||||
|
|
@ -163,35 +165,35 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblDelay" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblDelay">
|
||||
<property name="text">
|
||||
<string>Delay</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="CMultiColorLED" native="1" name="ledDelay" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
|
||||
<widget class="CMultiColorLED" name="ledDelay" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
|
|
@ -203,10 +205,10 @@
|
|||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>10</width>
|
||||
<height>0</height>
|
||||
|
|
@ -215,35 +217,35 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblBuffers" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblBuffers">
|
||||
<property name="text">
|
||||
<string>Buffers</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="CMultiColorLED" native="1" name="ledBuffers" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
|
||||
<widget class="CMultiColorLED" name="ledBuffers" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>14</width>
|
||||
<height>14</height>
|
||||
|
|
@ -255,62 +257,10 @@
|
|||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<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" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>10</width>
|
||||
<height>0</height>
|
||||
|
|
@ -321,35 +271,35 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="lineMeter" >
|
||||
<property name="orientation" >
|
||||
<widget class="Line" name="lineMeter">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblInputLEDMeter" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblInputLEDMeter">
|
||||
<property name="text">
|
||||
<string>Input</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="CMultiColorLEDBar" native="1" name="lbrInputLevelL" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
|
||||
<widget class="CMultiColorLEDBar" name="lbrInputLevelL" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>16</width>
|
||||
<height>88</height>
|
||||
|
|
@ -358,14 +308,14 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="CMultiColorLEDBar" native="1" name="lbrInputLevelR" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
|
||||
<widget class="CMultiColorLEDBar" name="lbrInputLevelR" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>16</width>
|
||||
<height>88</height>
|
||||
|
|
@ -376,23 +326,23 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblLevelMeterLeft" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblLevelMeterLeft">
|
||||
<property name="text">
|
||||
<string>L</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblLevelMeterRight" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblLevelMeterRight">
|
||||
<property name="text">
|
||||
<string>R</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
|
|
@ -403,13 +353,13 @@
|
|||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
|
|
@ -420,47 +370,47 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="lineUpperLowerLeft" >
|
||||
<property name="orientation" >
|
||||
<widget class="Line" name="lineUpperLowerLeft">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="chbSettings" >
|
||||
<property name="text" >
|
||||
<widget class="QCheckBox" name="chbSettings">
|
||||
<property name="text">
|
||||
<string>Settings</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="chbChat" >
|
||||
<property name="text" >
|
||||
<widget class="QCheckBox" name="chbChat">
|
||||
<property name="text">
|
||||
<string>Chat</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblServerTag" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblServerTag">
|
||||
<property name="text">
|
||||
<string>Your Alias/Instrument</string>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="edtFaderTag" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Ignored" >
|
||||
<widget class="QLineEdit" name="edtFaderTag">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>0</height>
|
||||
|
|
@ -469,41 +419,42 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="butInstPicture" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
|
||||
<widget class="QPushButton" name="butInstPicture">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="resources.qrc" >:/png/instr/res/instrnone.png</iconset>
|
||||
<property name="icon">
|
||||
<iconset resource="resources.qrc">
|
||||
<normaloff>:/png/instr/res/instrnone.png</normaloff>:/png/instr/res/instrnone.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="butConnect" >
|
||||
<property name="text" >
|
||||
<widget class="QPushButton" name="butConnect">
|
||||
<property name="text">
|
||||
<string>C&onnect</string>
|
||||
</property>
|
||||
<property name="default" >
|
||||
<property name="default">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>25</height>
|
||||
|
|
@ -516,74 +467,65 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="Line" name="linePanReverb" >
|
||||
<property name="orientation" >
|
||||
<widget class="Line" name="linePanReverb">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QVBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblAudioPan" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblAudioPan">
|
||||
<property name="text">
|
||||
<string>Pan</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblAudioPanValue" >
|
||||
<property name="minimumSize" >
|
||||
<widget class="QLabel" name="lblAudioPanValue">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<property name="text">
|
||||
<string>Center</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<property name="wordWrap">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
|
|
@ -592,30 +534,30 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="sldAudioPan" >
|
||||
<property name="styleSheet" >
|
||||
<widget class="QSlider" name="sldAudioPan">
|
||||
<property name="styleSheet">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pageStep" >
|
||||
<property name="pageStep">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="tickPosition" >
|
||||
<property name="tickPosition">
|
||||
<enum>QSlider::TicksBothSides</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
|
|
@ -628,60 +570,42 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<layout class="QVBoxLayout">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QVBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblAudioReverb" >
|
||||
<property name="text" >
|
||||
<widget class="QLabel" name="lblAudioReverb">
|
||||
<property name="text">
|
||||
<string>Reverb</string>
|
||||
</property>
|
||||
<property name="alignment" >
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QHBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
|
|
@ -690,27 +614,27 @@
|
|||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSlider" name="sldAudioReverb" >
|
||||
<property name="pageStep" >
|
||||
<widget class="QSlider" name="sldAudioReverb">
|
||||
<property name="pageStep">
|
||||
<number>1</number>
|
||||
</property>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="tickPosition" >
|
||||
<property name="tickPosition">
|
||||
<enum>QSlider::TicksBothSides</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType" >
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Minimum</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
|
|
@ -723,20 +647,20 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" >
|
||||
<property name="spacing" >
|
||||
<layout class="QVBoxLayout">
|
||||
<property name="spacing">
|
||||
<number>3</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbtReverbSelL" >
|
||||
<property name="text" >
|
||||
<widget class="QRadioButton" name="rbtReverbSelL">
|
||||
<property name="text">
|
||||
<string>Left</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="rbtReverbSelR" >
|
||||
<property name="text" >
|
||||
<widget class="QRadioButton" name="rbtReverbSelR">
|
||||
<property name="text">
|
||||
<string>Right</string>
|
||||
</property>
|
||||
</widget>
|
||||
|
|
@ -748,9 +672,9 @@
|
|||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="CAudioMixerBoard" native="1" name="MainMixerBoard" >
|
||||
<property name="sizePolicy" >
|
||||
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
|
||||
<widget class="CAudioMixerBoard" name="MainMixerBoard" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
|
|
@ -792,7 +716,7 @@
|
|||
<tabstop>rbtReverbSelR</tabstop>
|
||||
</tabstops>
|
||||
<resources>
|
||||
<include location="resources.qrc" />
|
||||
<include location="resources.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
|
|||
|
|
@ -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 ( "<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
|
||||
chbGUIDesignFancy->setWhatsThis ( tr ( "<b>Fancy Skin:</b> 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 )
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -467,20 +467,6 @@
|
|||
<string>Misc</string>
|
||||
</property>
|
||||
<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>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
|
|
@ -513,6 +499,13 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="chbGUIDesignFancy">
|
||||
<property name="text">
|
||||
<string>Fancy Skin</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<item>
|
||||
|
|
@ -692,7 +685,6 @@
|
|||
<tabstop>chbAutoJitBuf</tabstop>
|
||||
<tabstop>sldNetBuf</tabstop>
|
||||
<tabstop>sldNetBufServer</tabstop>
|
||||
<tabstop>chbOpenChatOnNewMessage</tabstop>
|
||||
<tabstop>chbGUIDesignFancy</tabstop>
|
||||
<tabstop>cbxAudioChannels</tabstop>
|
||||
<tabstop>cbxAudioQuality</tabstop>
|
||||
|
|
|
|||
|
|
@ -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<int> ( pClient->GetGUIDesign() ) );
|
||||
|
|
|
|||
Loading…
Reference in a new issue