From 2e02da046d3e56cdf4744f644af35ad07424f48b Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Mon, 3 Mar 2014 13:46:44 +0100 Subject: Update to upstream version 1.3.6 --- src/collectionfieldsdialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/collectionfieldsdialog.cpp') diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index ef3583f..7d1fc46 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -254,7 +254,6 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa // need to stretch at bottom vbox->setStretchFactor(new TQWidget(vbox), 1); - TDEAcceleratorManager::manage(vbox); // keep a default collection m_defaultCollection = CollectionFactory::collection(m_coll->type(), true); @@ -279,6 +278,9 @@ CollectionFieldsDialog::~CollectionFieldsDialog() { } void CollectionFieldsDialog::slotSelectInitial() { + // the accel management is here so that it doesn't cause conflicts with the + // ones explicitly set in the constructor + TDEAcceleratorManager::manage(mainWidget()); m_fieldsBox->setSelected(0, true); } @@ -405,7 +407,7 @@ void CollectionFieldsDialog::slotNew() { } TQString name = TQString::fromLatin1("custom") + TQString::number(m_newFields.count()+1); - int count = m_newFields.count() + 1; + size_t count = m_newFields.count() + 1; TQString title = i18n("New Field") + TQString::fromLatin1(" %1").arg(count); while(m_fieldsBox->findItem(title)) { ++count; -- cgit v1.2.3