[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/notifications/ui
From:       Rafael Fernández López <ereslibre () kde ! org>
Date:       2010-12-17 15:42:51
Message-ID: 20101217154251.6DEDAAC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207358 by ereslibre:

Replace \n with <br/> before it gets elided (in case it gets elided), and place the \
elide at the end of the string, instead of the middle (which is more handy for \
filesystem paths)


 M  +6 -7      notificationwidget.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/notifications/ui/notificationwidget.cpp \
#1207357:1207358 @@ -330,6 +330,7 @@
 
     /*if there is a < that is not closed as a tag, replace it with an entity*/
     processed = processed.replace(QRegExp("<([^>]*($|<))"), "&lt;\\1");
+    processed.replace('\n', "<br>");
 
     QFontMetricsF fm(messageLabel->font());
 
@@ -346,8 +347,8 @@
 
         if (c == '<') {
             inTag = true;
-            parsed.append(fm.elidedText(sentence, Qt::ElideMiddle, 250));
-            parsed.append(fm.elidedText(word, Qt::ElideMiddle, 250));
+            parsed.append(fm.elidedText(sentence, Qt::ElideRight, 250));
+            parsed.append(fm.elidedText(word, Qt::ElideRight, 250));
             sentence = QString();
             word = QString();
         } else if (c == '>') {
@@ -359,18 +360,16 @@
             if (inTag) {
                 parsed.append(word);
             } else {
-                sentence.append(fm.elidedText(word, Qt::ElideMiddle, 250));
+                sentence.append(fm.elidedText(word, Qt::ElideRight, 250));
             }
             word = QString();
         }
 
         ++i;
     }
-    parsed.append(fm.elidedText(sentence, Qt::ElideMiddle, 300));
-    parsed.append(fm.elidedText(word, Qt::ElideMiddle, 250));
+    parsed.append(fm.elidedText(sentence, Qt::ElideRight, 300));
+    parsed.append(fm.elidedText(word, Qt::ElideRight, 250));
 
-
-    parsed.replace('\n', "<br>");
     messageLabel->setText(parsed);
 
     if (!collapsed) {


[prev in list] [next in list] [prev in thread] [next in thread]