From 2a5482cf468b9043991a62033501cbb47245b383 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 5 Sep 2009 08:34:21 +0000 Subject: [PATCH] updates for help texts (according to current text in the Wiki --- src/audiomixerboard.cpp | 10 +++--- src/llconclientdlg.cpp | 68 ++++++++++++++++++++++++++++++----------- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 6f1abfac..dd103fa6 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -87,11 +87,13 @@ CChannelFader::CChannelFader ( QWidget* pNW, "this channel. All connected clients at the server will be assigned " "an audio fader at each client." ); - pcbMute->setWhatsThis ( "Mute: Mutes the current channel." ); + pcbMute->setWhatsThis ( "Mute: With the Mute checkbox, the current " + "audio channel can be muted." ); - pcbSolo->setWhatsThis ( "Solo: If Solo checkbox is checked, only " - "the current channel is active and all other channels are muted. Only " - "one channel at a time can be set to solo." ); + 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." ); pLabel->setWhatsThis ( "Mixer Fader Label: Label (fader tag) " "identifying the connected client. The tag name can be set in the " diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 27784a58..1ee8706c 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -50,8 +50,13 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, setupUi ( this ); // add help text to controls - QString strInpLevH = tr ( "Input level meter: Shows the level of the " - "input audio signal of the sound card. Overload should be avoided." ); + 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 ); @@ -66,28 +71,45 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, "different messages are displayed. E.g., if an error occurred or the " "status of the connection is shown." ) ); - QString strServAddrH = tr ( "Server Address: In this edit control, " - "the IP address of the server can be set. If an invalid address was " - "chosen, an error message is shown in the status bar." ); + 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 ); - QString strFaderTag = tr ( "Fader Tag: In this edit control, " - "the tag string of your fader can be set. This tag will appear " - "at your fader on the mixer board when connected to the server."); + 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 ); - QString strAudFader = tr ( "Audio Fader: With the audio fader " - "control the level of left and right audio input channels can " - "be controlled." ); + 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 " + "channels. If, e.g., a microphone is connected to the right input " + "channel and an instrument is connected to the left input channel " + "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 ); - QString strAudReverb = tr ( "Reverberation Level: The level of " - "reverberation effect can be set with this control. The channel to " - "which that reverberation effect shall be applied can be chosen " - "with the Reverberation Channel Selection radio buttons." ); + 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., " + "the microphone signal is fed into the right audio channel of the " + "sound card and a reverberation effect shall be applied, set the " + "channel selector to right and move the fader upwards until the " + "desired reverberation level is reached.
" + "The reverberation effect requires significant CPU so that it should " + "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 ); @@ -99,9 +121,19 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, RadioButtonRevSelR->setWhatsThis ( strRevChanSel ); LEDOverallStatus->setWhatsThis ( tr ( "Overall Status: " - "The overall status of the software is shown. If either the " - "network or sound interface has bad status, this LED will show " - "red color." ) ); + "The light next to the status bar shows the current audio/streaming " + "status. If the light is green, there are no buffer overruns/underruns " + "and the audio stream is not interrupted. If the light is red, the " + "audio stream is interrupted caused by one of the following problems:" + "" ) ); // init fader tag line edit LineEditFaderTag->setText ( pClient->strName );