Hello community,

here is the log from the commit of package yast2-qt for openSUSE:Factory
checked in at Wed Apr 27 11:28:01 CEST 2011.



--------
--- yast2-qt/yast2-qt.changes   2011-04-18 16:28:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes      2011-04-21 
11:08:11.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 21 11:05:49 CEST 2011 - [email protected]
+
+- Cleaned-up fix for line breaks in LogView (bnc #684759)
+- V 2.21.2
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  yast2-qt-2.21.1.tar.bz2

New:
----
  yast2-qt-2.21.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.QoBjZd/_old  2011-04-27 11:25:41.000000000 +0200
+++ /var/tmp/diff_new_pack.QoBjZd/_new  2011-04-27 11:25:41.000000000 +0200
@@ -18,11 +18,11 @@
 
 
 Name:           yast2-qt
-Version:        2.21.1
+Version:        2.21.2
 Release:        1
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-qt-2.21.1.tar.bz2
+Source0:        yast2-qt-2.21.2.tar.bz2
 Group:          System/YaST
 License:        GPLv2+
 BuildRequires:  docbook-xsl-stylesheets

++++++ yast2-qt-2.21.1.tar.bz2 -> yast2-qt-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-2.21.1/VERSION.cmake 
new/yast2-qt-2.21.2/VERSION.cmake
--- old/yast2-qt-2.21.1/VERSION.cmake   2011-04-19 12:21:08.000000000 +0200
+++ new/yast2-qt-2.21.2/VERSION.cmake   2011-04-21 15:32:06.000000000 +0200
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-2.21.1/package/yast2-qt.changes 
new/yast2-qt-2.21.2/package/yast2-qt.changes
--- old/yast2-qt-2.21.1/package/yast2-qt.changes        2011-04-19 
12:21:09.000000000 +0200
+++ new/yast2-qt-2.21.2/package/yast2-qt.changes        2011-04-21 
15:32:06.000000000 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Thu Apr 21 11:05:49 CEST 2011 - [email protected]
+
+- Cleaned-up fix for line breaks in LogView (bnc #684759)
+- V 2.21.2
+
+-------------------------------------------------------------------
 Mon Apr 18 16:16:59 CEST 2011 - [email protected]
 
 - Enable busy cursor for tree widget during time consuming 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-qt-2.21.1/src/YQLogView.cc 
new/yast2-qt-2.21.2/src/YQLogView.cc
--- old/yast2-qt-2.21.1/src/YQLogView.cc        2011-04-19 12:21:08.000000000 
+0200
+++ new/yast2-qt-2.21.2/src/YQLogView.cc        2011-04-21 15:32:06.000000000 
+0200
@@ -93,22 +93,32 @@
 YQLogView::displayLogText( const string & text )
 {
     QScrollBar *sb = _qt_text->verticalScrollBar();
-
     QString newString = fromUTF8( text );
-    newString[ newString.length() ] = ' ';
 
     bool atEnd = sb->value() == sb->maximum();
 
-    if (newString.startsWith(_lastText) && !_lastText.isEmpty() ) {
-        _qt_text->append(newString.mid(_lastText.length() + 1 ));
-    } else {
+    if (newString.startsWith(_lastText) && !_lastText.isEmpty() ) 
+    {
+       int position = _lastText.length();
+
+       // prevent double line break caused by QTextEdit::append()
+       if ( newString.mid( _lastText.length(), 1 ) == QString('\n') )
+               position++;
+
+        _qt_text->append( newString.mid( position) );
+    }
+    else
+    {
         _qt_text->setPlainText( newString );
     }
 
-    if (atEnd) {
+
+    if (atEnd)
+    {
         _qt_text->moveCursor( QTextCursor::End );
         _qt_text->ensureCursorVisible();
     }
+
     _lastText = newString;
 }
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to