diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui index d926333a..d2612b81 100755 --- a/src/aboutdlgbase.ui +++ b/src/aboutdlgbase.ui @@ -224,6 +224,10 @@ + + buttonOk + TextViewCredits + diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index bca80a44..0576bf59 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -73,18 +73,23 @@ CChannelFader::CChannelFader ( QWidget* pNW, pFader->setWhatsThis ( "Mixer Fader: 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 ( "Mute: With the Mute checkbox, the current " "audio channel can be muted." ); + pcbMute->setAccessibleName ( "Mute button" ); pcbSolo->setWhatsThis ( "Solo: 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.
" "Only one channel at a time can be set to solo." ); + pcbSolo->setAccessibleName ( "Solo button" ); pLabel->setWhatsThis ( "Mixer Fader Label: 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 ------------------------------------------------------------- diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index f77712eb..a5555471 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -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 ( "Jitter Buffer Size: 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.
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 diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 0ca7987f..308758e6 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -49,45 +49,67 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, { setupUi ( this ); - // add help text to controls - QString strInpLevH = tr ( "Input level meter: The input level " + // add help text to controls ----------------------------------------------- + // input level meter + QString strInpLevH = tr ( "Input Level Meter: 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.
" "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 ( "Connect / Disconnect Button:" " 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 ( "Status Bar: 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 ( "Server Address: 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 ( "Fader Tag: 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 ( "Local Audio Input Fader: 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 L -x, where " "x 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 ( "Reverberation Level: 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 ( "Reverberation Channel Selection: " "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 ( "Overall Status: " "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." "
  • The CPU of the client or server is at 100%.
    • " "" ) ); + 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, diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui index e41816e3..0bc725a7 100755 --- a/src/llconclientdlgbase.ui +++ b/src/llconclientdlgbase.ui @@ -500,12 +500,13 @@ - LineEditFaderTag + LineEditServerAddr PushButtonConnect + LineEditFaderTag + SliderAudInFader SliderAudReverb RadioButtonRevSelL RadioButtonRevSelR - SliderAudInFader diff --git a/src/util.cpp b/src/util.cpp index 371f4042..d6a79564 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -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 ) ); diff --git a/windows/installer.nsi b/windows/installer.nsi index a7d641b4..a69f40af 100755 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -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}"