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

List:       kde-commits
Subject:    playground/base/nepomuk-kde/annotation/lib/gui
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2009-10-27 12:25:09
Message-ID: 1256646309.754695.15800.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1041122 by trueg:

Fixed editing of squeezed labels: do not store the sqeezed label.

 M  +9 -4      labeleditwidget.cpp  


--- trunk/playground/base/nepomuk-kde/annotation/lib/gui/labeleditwidget.cpp #1041121:1041122
@@ -34,6 +34,8 @@
 public:
     LabelEditWidget* q;
 
+    QString m_text;
+
     KSqueezedTextLabel* m_label;
     KLineEdit* m_lineEdit;
     QToolButton* m_button;
@@ -53,15 +55,17 @@
     if ( enabled ) {
         if ( m_stack->currentWidget() != m_lineEdit ) {
             if ( saveText )
-                m_lineEdit->setText( m_label->text() );
+                m_lineEdit->setText( m_text );
             m_stack->setCurrentWidget( m_lineEdit );
             m_lineEdit->setFocus();
         }
     }
     else {
         if ( m_stack->currentWidget() == m_lineEdit ) {
-            if ( saveText )
-                m_label->setText( m_lineEdit->text() );
+            if ( saveText ) {
+                m_text = m_lineEdit->text();
+                m_label->setText( m_text );
+            }
             m_stack->setCurrentWidget( m_labelContainer );
         }
     }
@@ -139,7 +143,7 @@
 QString LabelEditWidget::text() const
 {
     if ( d->m_stack->currentWidget() == d->m_labelContainer )
-        return d->m_label->text();
+        return d->m_text;
     else
         return d->m_lineEdit->text();
 }
@@ -149,6 +153,7 @@
 {
     d->toggleEditor( false, false );
     d->m_label->setText( text );
+    d->m_text = text;
     emit textChanged( text );
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]