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

move the channels tighter together in slim fader mode; adjust help text so that we have as little HTML as possible to simplify translation

Browse source
This commit is contained in:
Volker Fischer 2020-06-15 22:45:11 +02:00
parent 8d3cdb7a4b
commit c5e4d75be0
8 changed files with 63 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/audiomixerboard.cpp
View file

@ -628,13 +628,11 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) :
pScrollArea = new CMixerBoardScrollArea ( this ); pScrollArea = new CMixerBoardScrollArea ( this );
pMainLayout = new QHBoxLayout ( pMixerWidget ); pMainLayout = new QHBoxLayout ( pMixerWidget );
setAccessibleName ( "Personal Mix at the Server groupbox" ); setAccessibleName ( "Personal Mix at the Server groupbox" );
setWhatsThis ( "<b>" + tr ( "Personal Mix at the Server" ) + "</b>: " + setWhatsThis ( "<b>" + tr ( "Personal Mix at the Server" ) + "</b>: " + tr (
tr ( "When connected to a server, the controls here allow you to set " ) + "When connected to a server, the controls here allow you to set your "
tr ( "your local mix without affecting what others hear from you." ) + "<br/>" + "local mix without affecting what others hear from you. The title shows "
tr ( "The title shows the server name and, when known, " "the server name and, when known, whether it is actively recording." ) );
"whether it is actively recording." ) );
// set title text (default: no server given) // set title text (default: no server given)
SetServerName ( "" ); SetServerName ( "" );
@ -718,6 +716,16 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName )
void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign ) void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
{ {
// move the channels tighter together in slim fader mode
if ( eNewDesign == GD_SLIMFADER )
{
pMainLayout->setSpacing ( 2 );
}
else
{
pMainLayout->setSpacing ( 6 ); // Qt default spacing value
}
// apply GUI design to child GUI controls // apply GUI design to child GUI controls
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
{ {

24
src/res/translation/translation_de_DE.ts
View file

@ -190,42 +190,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>V E R B I N D U N G S A U F B A U</translation> <translation>V E R B I N D U N G S A U F B A U</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation>Eigener Mix am Server: </translation> <translation>Eigener Mix am Server: </translation>
</message> </message>

24
src/res/translation/translation_es_ES.ts
View file

@ -194,42 +194,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>I N T E N T A N D O C O N E C T A R</translation> <translation>I N T E N T A N D O C O N E C T A R</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation>Mezcla Personal en el Servidor: </translation> <translation>Mezcla Personal en el Servidor: </translation>
</message> </message>

24
src/res/translation/translation_fr_FR.ts
View file

@ -202,42 +202,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Serveur</translation> <translation>Serveur</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>T E N T A T I V E D E C O N N E X I O N</translation> <translation>T E N T A T I V E D E C O N N E X I O N</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation>Mixage personnel du serveur : </translation> <translation>Mixage personnel du serveur : </translation>
</message> </message>

24
src/res/translation/translation_it_IT.ts
View file

@ -190,42 +190,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>I N A T T E S A D I C O N N E S S I O N E</translation> <translation>I N A T T E S A D I C O N N E S S I O N E</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation>Mixer personale sul Server: </translation> <translation>Mixer personale sul Server: </translation>
</message> </message>

24
src/res/translation/translation_nl_NL.ts
View file

@ -190,42 +190,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>A A N H E T V E R B I N D E N</translation> <translation>A A N H E T V E R B I N D E N</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

24
src/res/translation/translation_pl_PL.ts
View file

@ -158,42 +158,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

24
src/res/translation/translation_pt_PT.ts
View file

@ -202,42 +202,32 @@
<context> <context>
<name>CAudioMixerBoard</name> <name>CAudioMixerBoard</name>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="633"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>Personal Mix at the Server</source> <source>Personal Mix at the Server</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="634"/> <location filename="../../audiomixerboard.cpp" line="632"/>
<source>When connected to a server, the controls here allow you to set </source> <source>When connected to a server, the controls here allow you to set your local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="635"/> <location filename="../../audiomixerboard.cpp" line="704"/>
<source>your local mix without affecting what others hear from you.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="636"/>
<source>The title shows the server name and, when known, whether it is actively recording.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../audiomixerboard.cpp" line="706"/>
<source>Server</source> <source>Server</source>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="715"/> <location filename="../../audiomixerboard.cpp" line="713"/>
<source>T R Y I N G T O C O N N E C T</source> <source>T R Y I N G T O C O N N E C T</source>
<translation>T E N T A N D O L I G A R</translation> <translation>T E N T A N D O L I G A R</translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="825"/> <location filename="../../audiomixerboard.cpp" line="833"/>
<source>RECORDING ACTIVE</source> <source>RECORDING ACTIVE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../audiomixerboard.cpp" line="828"/> <location filename="../../audiomixerboard.cpp" line="836"/>
<source>Personal Mix at: </source> <source>Personal Mix at: </source>
<translation>Mistura Pessoal no Servidor: </translation> <translation>Mistura Pessoal no Servidor: </translation>
</message> </message>