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

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2009-09-11 17:49:23
Message-ID: 1252691363.673413.28512.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022407 by mwiesweg:

Adjust behavior of caption edit so that the caption is marked as edited if and only
if the user edited it. Additionally, do not discard the change if the user removed
the text in the caption edit box to remove the comment.

CCBUG: 203732

 M  +2 -0      imageproperties/captionedit.cpp  
 M  +0 -1      imageproperties/imagedescedittab.cpp  
 M  +3 -2      template/altlangstredit.cpp  


--- trunk/extragear/graphics/digikam/libs/imageproperties/captionedit.cpp #1022406:1022407
@@ -106,11 +106,13 @@
     val.author  = d->authorEdit->text();
     val.date    = QDateTime::currentDateTime();
     d->captionsValues.insert(lang, val);
+    emit signalModified();
 }
 
 void CaptionEdit::slotDeleteValue(const QString& lang)
 {
     d->captionsValues.remove(lang);
+    emit signalModified();
 }
 
 void CaptionEdit::slotSelectionChanged(const QString& lang)
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagedescedittab.cpp #1022406:1022407
@@ -542,7 +542,6 @@
         return;
 
     d->captionsEdit->apply();
-    slotCommentChanged();
 
     bool progressInfo                   = (d->currInfos.count() > 1);
     MetadataWriteSettings writeSettings = MetadataHub::defaultWriteSettings();
--- trunk/extragear/graphics/digikam/libs/template/altlangstredit.cpp #1022406:1022407
@@ -460,7 +460,7 @@
     QString text = d->valueEdit->toPlainText();
     if (text.isEmpty())
     {
-        d->addValueButton->setEnabled(false);
+        slotDeleteValue();
         return;
     }
 
@@ -487,7 +487,8 @@
 
 void AltLangStrEdit::apply()
 {
-    slotAddValue();
+    if (d->addValueButton->isEnabled())
+        slotAddValue();
 }
 
 }  // namespace Digikam
[prev in list] [next in list] [prev in thread] [next in thread]