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

added some accessibility support

Browse Source
This commit is contained in:
Volker Fischer 2009-11-27 10:47:13 +00:00
parent a7b471cace
commit 7e0ae4b765
7 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aboutdlgbase.ui
View File

@ -224,6 +224,10 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>buttonOk</tabstop>
<tabstop>TextViewCredits</tabstop>
</tabstops>
<resources>
<include location="resources.qrc" />
</resources>

5
src/audiomixerboard.cpp
View File

@ -73,18 +73,23 @@ CChannelFader::CChannelFader ( QWidget* pNW,
pFader->setWhatsThis ( "<b>Mixer Fader:</b> Adjusts the audio level of "
"this channel. All connected clients at the server will be assigned "
"an audio fader at each client." );
pFader->setAccessibleName ( "Mixer level setting of the connected client "
"at the server" );
pcbMute->setWhatsThis ( "<b>Mute:</b> With the Mute checkbox, the current "
"audio channel can be muted." );
pcbMute->setAccessibleName ( "Mute button" );
pcbSolo->setWhatsThis ( "<b>Solo:</b> With the Solo checkbox, the current "
"audio channel can be set to solo which means that all other channels "
"except of the current channel are muted.<br/>"
"Only one channel at a time can be set to solo." );
pcbSolo->setAccessibleName ( "Solo button" );
pLabel->setWhatsThis ( "<b>Mixer Fader Label:</b> Label (fader tag) "
"identifying the connected client. The tag name can be set in the "
"clients main window." );
pLabel->setAccessibleName ( "Mixer level label (fader tag)" );
// connections -------------------------------------------------------------

10
src/clientsettingsdlg.cpp
View File

@ -31,7 +31,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
{
setupUi ( this );
// add help text to controls
// add help text to controls -----------------------------------------------
// jitter buffer
QString strJitterBufferSize = tr ( "<b>Jitter Buffer Size:</b> The size of "
"the network buffer (jitter buffer). The jitter buffer compensates for "
"the network jitter. The larger this buffer is, the more robust the "
@ -39,9 +40,12 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
"This setting is therefore a trade-off between audio drop outs and "
"overall audio delay.<br>By changing this setting, both, the client "
"and the server jitter buffer is set to the same value." );
SliderNetBuf->setWhatsThis ( strJitterBufferSize );
TextNetBuf->setWhatsThis ( strJitterBufferSize );
TextNetBuf->setWhatsThis ( strJitterBufferSize );
GroupBoxJitterBuffer->setWhatsThis ( strJitterBufferSize );
SliderNetBuf->setWhatsThis ( strJitterBufferSize );
SliderNetBuf->setAccessibleName ( "Jitter buffer slider control" );
cbAutoJitBuf->setAccessibleName ( "Auto jitter buffer switch" );
// init driver button
#ifdef _WIN32

69
src/llconclientdlg.cpp
View File

@ -49,45 +49,67 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
{
setupUi ( this );
// add help text to controls
QString strInpLevH = tr ( "<b>Input level meter:</b> The input level "
// add help text to controls -----------------------------------------------
// input level meter
QString strInpLevH = tr ( "<b>Input Level Meter:</b> The input level "
"indicators show the current input level of the two stereo channels "
"of the current selected audio input. The upper level display belongs "
"to the left channel and the lower level display to the right channel "
"of the audio input.<br/>"
"Make sure not to clip the input signal to avoid distortions of the "
"audio signal." );
TextLabelInputLevelL->setWhatsThis ( strInpLevH );
TextLabelInputLevelR->setWhatsThis ( strInpLevH );
MultiColorLEDBarInputLevelL->setWhatsThis ( strInpLevH );
MultiColorLEDBarInputLevelR->setWhatsThis ( strInpLevH );
QString strInpLevHAccText = "Input level meter";
QString strInpLevHAccDescr = "Simulates an analog LED level meter.";
TextLabelInputLevelL->setWhatsThis ( strInpLevH );
TextLabelInputLevelR->setWhatsThis ( strInpLevH );
MultiColorLEDBarInputLevelL->setWhatsThis ( strInpLevH );
MultiColorLEDBarInputLevelL->setAccessibleName ( strInpLevHAccText );
MultiColorLEDBarInputLevelL->setAccessibleDescription ( strInpLevHAccDescr );
MultiColorLEDBarInputLevelR->setWhatsThis ( strInpLevH );
MultiColorLEDBarInputLevelR->setAccessibleName ( strInpLevHAccText );
MultiColorLEDBarInputLevelR->setAccessibleDescription ( strInpLevHAccDescr );
// connect/disconnect button
PushButtonConnect->setWhatsThis ( tr ( "<b>Connect / Disconnect Button:"
"</b> Push this button to connect the server. A valid IP address has "
"to be specified before. If the client is connected, pressing this "
"button will disconnect the connection." ) );
PushButtonConnect->setAccessibleName ( "Connect and disconnect toggle button" );
PushButtonConnect->setAccessibleDescription ( "Clicking on this button "
"changes the caption of the button from Connect to Disconnect, i.e., it "
"implements a toggle functionality for connecting and disconnecting "
"the llcon software." );
// status bar
TextLabelStatus->setWhatsThis ( tr ( "<b>Status Bar:</b> In the status bar "
"different messages are displayed. E.g., if an error occurred or the "
"status of the connection is shown." ) );
TextLabelStatus->setAccessibleName ( "Status bar" );
// server address
QString strServAddrH = tr ( "<b>Server Address:</b> The IP address or URL "
"of the server running the llcon server software must be set here. "
"A list of the most recent used server URLs is available for "
"selection. If an invalid address was chosen, an error message is "
"shown in the status bar." );
TextLabelServerAddr->setWhatsThis ( strServAddrH );
LineEditServerAddr->setWhatsThis ( strServAddrH );
TextLabelServerAddr->setWhatsThis ( strServAddrH );
LineEditServerAddr->setWhatsThis ( strServAddrH );
LineEditServerAddr->setAccessibleName ( "Server address input" );
LineEditServerAddr->setAccessibleDescription ( "Holds the current server "
"URL. It also stores old URLs in the combo box list." );
// fader tag
QString strFaderTag = tr ( "<b>Fader Tag:</b> The fader tag of the local "
"client is set in the fader tag edit box. This tag will appear "
"at your fader on the mixer board when you are connected to a llcon "
"server. This tag will also show up at each client which is connected "
"to the same server as the local client. If the fader tag is empty, "
"the IP address of the client is displayed instead.");
TextLabelServerTag->setWhatsThis ( strFaderTag );
LineEditFaderTag->setWhatsThis ( strFaderTag );
TextLabelServerTag->setWhatsThis ( strFaderTag );
LineEditFaderTag->setWhatsThis ( strFaderTag );
LineEditFaderTag->setAccessibleName ( "Fader tag edit box" );
// local audio input fader
QString strAudFader = tr ( "<b>Local Audio Input Fader:</b> With the "
"audio fader, the relative levels of the left and right local audio "
"channels can be changed. It acts like a panning between the two "
@ -96,9 +118,11 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
"which is much louder than the microphone, move the audio fader in "
"a direction where the label above the fader shows <i>L -x</i>, where "
"<i>x</i> is the current attenuation indication. " );
TextAudInFader->setWhatsThis ( strAudFader );
SliderAudInFader->setWhatsThis ( strAudFader );
TextAudInFader->setWhatsThis ( strAudFader );
SliderAudInFader->setWhatsThis ( strAudFader );
SliderAudInFader->setAccessibleName ( "Local audio input fader (left/right)" );
// reverberation level
QString strAudReverb = tr ( "<b>Reverberation Level:</b> A reverberation "
"effect can be applied to one local audio channel. The channel "
"selection and the reverberation level can be modified. If, e.g., "
@ -110,16 +134,21 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
"only be used on fast PCs. If the reverberation level fader is set to "
"minimum (which is the default setting), the reverberation effect is "
"switched off and does not cause any additional CPU usage." );
TextLabelAudReverb->setWhatsThis ( strAudReverb );
SliderAudReverb->setWhatsThis ( strAudReverb );
TextLabelAudReverb->setWhatsThis ( strAudReverb );
SliderAudReverb->setWhatsThis ( strAudReverb );
SliderAudReverb->setAccessibleName ( "Reverberation effect level setting" );
// reverberation channel selection
QString strRevChanSel = tr ( "<b>Reverberation Channel Selection:</b> "
"With these radio buttons the audio input channel on which the "
"reverberation effect is applied can be chosen. Either the left "
"or right input channel can be selected." );
RadioButtonRevSelL->setWhatsThis ( strRevChanSel );
RadioButtonRevSelR->setWhatsThis ( strRevChanSel );
RadioButtonRevSelL->setWhatsThis ( strRevChanSel );
RadioButtonRevSelL->setAccessibleName ( "Left channel selection for reverberation" );
RadioButtonRevSelR->setWhatsThis ( strRevChanSel );
RadioButtonRevSelR->setAccessibleName ( "Right channel selection for reverberation" );
// overall status
LEDOverallStatus->setWhatsThis ( tr ( "<b>Overall Status:</b> "
"The light next to the status bar shows the current audio/streaming "
"status. If the light is green, there are no buffer overruns/underruns "
@ -134,6 +163,8 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
"available internet bandwidth.</li>"
"<li>The CPU of the client or server is at 100%.</li>"
"</ul>" ) );
LEDOverallStatus->setAccessibleName ( "Overall status LED indicator" );
// init GUI design
SetGUIDesign ( pClient->GetGUIDesign() );
@ -219,7 +250,8 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
// Settings menu ----------------------------------------------------------
pSettingsMenu = new QMenu ( "&View", this );
pSettingsMenu->addAction ( tr ( "&Chat..." ), this,
pSettingsMenu->setAccessibleName ( "View menu" );
QAction* test = pSettingsMenu->addAction ( tr ( "&Chat..." ), this,
SLOT ( OnOpenChatDialog() ) );
pSettingsMenu->addAction ( tr ( "&General Settings..." ), this,
SLOT ( OnOpenGeneralSettings() ) );
@ -231,6 +263,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
// Main menu bar -----------------------------------------------------------
pMenu = new QMenuBar ( this );
pMenu->setAccessibleName ( "Main menu" );
pMenu->addMenu ( pSettingsMenu );
pMenu->addMenu ( new CLlconHelpMenu ( this ) );
@ -272,7 +305,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
this, SLOT ( OnLineEditServerAddrTextChanged ( const QString ) ) );
QObject::connect ( LineEditServerAddr, SIGNAL ( activated ( int ) ),
this, SLOT ( OnLineEditServerAddrActivated ( int ) ) );
this, SLOT ( OnLineEditServerAddrActivated ( int ) ) );
// other
QObject::connect ( pClient,

5
src/llconclientdlgbase.ui
View File

@ -500,12 +500,13 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>LineEditFaderTag</tabstop>
<tabstop>LineEditServerAddr</tabstop>
<tabstop>PushButtonConnect</tabstop>
<tabstop>LineEditFaderTag</tabstop>
<tabstop>SliderAudInFader</tabstop>
<tabstop>SliderAudReverb</tabstop>
<tabstop>RadioButtonRevSelL</tabstop>
<tabstop>RadioButtonRevSelR</tabstop>
<tabstop>SliderAudInFader</tabstop>
</tabstops>
<resources>
<include location="resources.qrc" />

2
src/util.cpp
View File

@ -403,6 +403,8 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// Help menu -------------------------------------------------------------------
CLlconHelpMenu::CLlconHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent )
{
setAccessibleName ( "Help menu" );
// standard help menu consists of about and what's this help
addAction ( tr ( "What's &This" ), this,
SLOT ( OnHelpWhatsThis() ), QKeySequence ( Qt::SHIFT + Qt::Key_F1 ) );

3
windows/installer.nsi
View File

@ -4,7 +4,8 @@
!define APP_EXE "llcon.exe"
!define UNINSTALL_EXE "Uninstall.exe"
!define INSTALLER_NAME "llconinstaller.exe"
!define VS_REDIST_PATH "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
;!define VS_REDIST_PATH "C:\Program Files\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
!define VS_REDIST_PATH "C:\Programme\Microsoft Visual Studio 8\SDK\v2.0\BootStrapper\Packages\vcredist_x86\"
!define VS_REDIST_EXE "vcredist_x86.exe"
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"