Don't allow newline characters in preference (#5840).

[lyx.git] / src / frontends / qt4 / GuiBranches.cpp

diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp
index 5f9121dd640c5a032b67d6d0cd0f4a4c434618a1..ebc1f01eb6f91a5e741d5580138b2c920c398a92 100644 (file)
--- a/src/frontends/qt4/GuiBranches.cpp
+++ b/src/frontends/qt4/GuiBranches.cpp
@@ -51,6 +51,8 @@ GuiBranches::GuiBranches(QWidget * parent)
        branchesTW->headerItem()->setText(2, qt_("Color"));
        branchesTW->headerItem()->setText(3, qt_("Filename Suffix"));
        branchesTW->setSortingEnabled(true);
+       branchesTW->resizeColumnToContents(1);
+       branchesTW->resizeColumnToContents(2);
 
        undef_ = new BranchesUnknownDialog(this);
        undef_bc_.setPolicy(ButtonPolicy::OkCancelPolicy);
@@ -102,7 +104,7 @@ void GuiBranches::updateView()
                        coloritem.fill(itemcolor);
                        newItem->setIcon(2, QIcon(coloritem));
                }
-               newItem->setText(3, it->hasFilenameSuffix() ? qt_("Yes") : qt_("No"));
+               newItem->setText(3, it->hasFileNameSuffix() ? qt_("Yes") : qt_("No"));
                // restore selected branch
                if (bname == sel_branch) {
                        branchesTW->setCurrentItem(newItem);
@@ -285,7 +287,7 @@ void GuiBranches::toggleSuffix(QTreeWidgetItem * item)
 
        Branch * branch = branchlist_.find(qstring_to_ucs4(sel_branch));
        if (branch) {
-               branch->setFilenameSuffix(!branch->hasFilenameSuffix());
+               branch->setFileNameSuffix(!branch->hasFileNameSuffix());
                newBranchLE->clear();
                updateView();
        }