jamulussoftware#1993 resolve conflicts

src/audiomixerboard.cpp

@@ -643,7 +643,9 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
 
     // Label text --------------------------------------------------------------
 
-    QString strModText = cChanInfo.strName;
+    QString             strModText = cChanInfo.strName;
+    QTextBoundaryFinder tbfName ( QTextBoundaryFinder::Grapheme, cChanInfo.strName );
+    int                 iBreakPos;
 
     // apply break position and font size depending on the selected design
     if ( eDesign == GD_SLIMFADER )
@@ -652,22 +654,28 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
         plblLabel->setStyleSheet ( "QLabel { color: black; }" );
 
         // break at every 4th character
-        for ( int iInsPos = 4; iInsPos <= strModText.size() - 1; iInsPos += 4 + 1 )
-        {
-            strModText.insert ( iInsPos, "\n" );
-        }
+        iBreakPos = 4;
     }
     else
     {
         // in normal mode use bold font
         plblLabel->setStyleSheet ( "QLabel { color: black; font: bold; }" );
 
         // break text at predefined position
-        const int iBreakPos = MAX_LEN_FADER_TAG / 2;
+        iBreakPos = MAX_LEN_FADER_TAG / 2;
+    }
 
-        if ( strModText.length() > iBreakPos )
+    int iInsPos     = iBreakPos;
+    int iCount      = 0;
+    int iLineNumber = 0;
+    while ( tbfName.toNextBoundary() != -1 )
+    {
+        ++iCount;
+        if ( iCount == iInsPos )
         {
-            strModText.insert ( iBreakPos, QString ( "\n" ) );
+            strModText.insert ( tbfName.position() + iLineNumber, QString ( "\n" ) );
+            iLineNumber++;
+            iInsPos += iBreakPos;
         }
     }
 

src/audiomixerboard.h

@@ -38,6 +38,7 @@
 #include <QListWidget>
 #include <QMenu>
 #include <QMutex>
+#include <QTextBoundaryFinder>
 #include "global.h"
 #include "util.h"
 #include "levelmeter.h"

src/util.cpp

@@ -665,6 +665,19 @@ void CLanguageComboBox::OnLanguageActivated ( int iLanguageIdx )
         emit LanguageChanged ( itemData ( iLanguageIdx ).toString() );
     }
 }
+
+static inline QString TruncateString ( QString str, int position )
+{
+    QTextBoundaryFinder tbfString ( QTextBoundaryFinder::Grapheme, str );
+
+    tbfString.setPosition ( position );
+    if ( !tbfString.isAtBoundary() )
+    {
+        tbfString.toPreviousBoundary();
+        position = tbfString.position();
+    }
+    return str.left ( position );
+}
 #endif
 
 /******************************************************************************\

src/util.h

@@ -40,6 +40,7 @@
 #    include <QDateTime>
 #    include <QDesktopServices>
 #    include <QKeyEvent>
+#    include <QTextBoundaryFinder>
 #    include "ui_aboutdlgbase.h"
 #endif
 #include <QFile>