From c5e4d75be077df7026413ccf7385cf237c1f59fa Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 15 Jun 2020 22:45:11 +0200 Subject: [PATCH] move the channels tighter together in slim fader mode; adjust help text so that we have as little HTML as possible to simplify translation --- src/audiomixerboard.cpp | 20 ++++++++++++++------ src/res/translation/translation_de_DE.ts | 24 +++++++----------------- src/res/translation/translation_es_ES.ts | 24 +++++++----------------- src/res/translation/translation_fr_FR.ts | 24 +++++++----------------- src/res/translation/translation_it_IT.ts | 24 +++++++----------------- src/res/translation/translation_nl_NL.ts | 24 +++++++----------------- src/res/translation/translation_pl_PL.ts | 24 +++++++----------------- src/res/translation/translation_pt_PT.ts | 24 +++++++----------------- 8 files changed, 63 insertions(+), 125 deletions(-) diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp index 0a1d902d..23279582 100755 --- a/src/audiomixerboard.cpp +++ b/src/audiomixerboard.cpp @@ -628,13 +628,11 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags ) : pScrollArea = new CMixerBoardScrollArea ( this ); pMainLayout = new QHBoxLayout ( pMixerWidget ); - setAccessibleName ( "Personal Mix at the Server groupbox" ); - setWhatsThis ( "" + tr ( "Personal Mix at the Server" ) + ": " + - tr ( "When connected to a server, the controls here allow you to set " ) + - tr ( "your local mix without affecting what others hear from you." ) + "
" + - tr ( "The title shows the server name and, when known, " - "whether it is actively recording." ) ); + setWhatsThis ( "" + tr ( "Personal Mix at the Server" ) + ": " + tr ( + "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." ) ); // set title text (default: no server given) SetServerName ( "" ); @@ -718,6 +716,16 @@ void CAudioMixerBoard::SetServerName ( const QString& strNewServerName ) 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 for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) { diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 69ce25b3..e277548b 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -190,42 +190,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server - + T R Y I N G T O C O N N E C T V E R B I N D U N G S A U F B A U - + RECORDING ACTIVE - + Personal Mix at: Eigener Mix am Server: diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 525fb649..46f1aa36 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -194,42 +194,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server Servidor - + T R Y I N G T O C O N N E C T I N T E N T A N D O C O N E C T A R - + RECORDING ACTIVE - + Personal Mix at: Mezcla Personal en el Servidor: diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 0e73552b..a6856791 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -202,42 +202,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server Serveur - + T R Y I N G T O C O N N E C T T E N T A T I V E D E C O N N E X I O N - + RECORDING ACTIVE - + Personal Mix at: Mixage personnel du serveur : diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index d49733c2..ab4e9633 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -190,42 +190,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server Server - + T R Y I N G T O C O N N E C T I N A T T E S A D I C O N N E S S I O N E - + RECORDING ACTIVE - + Personal Mix at: Mixer personale sul Server: diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index c864878d..e5536f94 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -190,42 +190,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server Server - + T R Y I N G T O C O N N E C T A A N H E T V E R B I N D E N - + RECORDING ACTIVE - + Personal Mix at: diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index 18bd9f20..8c0cb2bb 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -158,42 +158,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server - + T R Y I N G T O C O N N E C T - + RECORDING ACTIVE - + Personal Mix at: diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index bb350ebc..7eb3a462 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -202,42 +202,32 @@ CAudioMixerBoard - + Personal Mix at the Server - - 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 local mix without affecting what others hear from you. The title shows the server name and, when known, whether it is actively recording. - - your local mix without affecting what others hear from you. - - - - - The title shows the server name and, when known, whether it is actively recording. - - - - + Server Servidor - + T R Y I N G T O C O N N E C T T E N T A N D O L I G A R - + RECORDING ACTIVE - + Personal Mix at: Mistura Pessoal no Servidor: