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

List:       kde-commits
Subject:    [kbibtex/kbibtex/0.6] src/gui/element: Fixing minor issue with fix for bug 371593
From:       Thomas Fischer <fischer () unix-ag ! uni-kl ! de>
Date:       2016-11-06 18:53:05
Message-ID: E1c3SYz-0003Hp-GJ () code ! kde ! org
[Download RAW message or body]

Git commit 2efcd73009d411c2d502ab72883483b7b1d7ed90 by Thomas Fischer, on behalf of Juergen Spitzmueller.
Committed on 06/11/2016 at 18:52.
Pushed by thomasfischer into branch 'kbibtex/0.6'.

Fixing minor issue with fix for bug 371593

There was a small glitch in previous the commit that was meant
to fix bug 371593: Customized text was set too early and then
overwritten. This commit fixes the problem.

Signed-off-by: Thomas Fischer <fischer@unix-ag.uni-kl.de>

M  +4    -1    src/gui/element/elementwidgets.cpp

http://commits.kde.org/kbibtex/2efcd73009d411c2d502ab72883483b7b1d7ed90

diff --git a/src/gui/element/elementwidgets.cpp b/src/gui/element/elementwidgets.cpp
index 0ccfc02..87813e6 100644
--- a/src/gui/element/elementwidgets.cpp
+++ b/src/gui/element/elementwidgets.cpp
@@ -372,7 +372,6 @@ bool ReferenceWidget::reset(QSharedPointer<const Element> element)
         buttonSuggestId->setEnabled(!isReadOnly);
         BibTeXEntries *be = BibTeXEntries::self();
         QString type = be->format(entry->type(), KBibTeX::cUpperCamelCase);
-        entryType->lineEdit()->setText(type);
         int index = entryType->findData(type);
         if (index == -1) {
             const QString typeLower(type.toLower());
@@ -383,6 +382,10 @@ bool ReferenceWidget::reset(QSharedPointer<const Element> element)
                 }
         }
         entryType->setCurrentIndex(index);
+        if (index == -1) {
+             /// A customized value not known to KBibTeX
+             entryType->lineEdit()->setText(type);
+        }
 
         entryId->setText(entry->id());
         /// New entries have no values. Use this fact
[prev in list] [next in list] [prev in thread] [next in thread]