diff --git a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h --- a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h +++ b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.h @@ -23,15 +23,11 @@ #include #include "sieveglobalvariablewidget.h" class QPushButton; - +class QComboBox; class QGridLayout; class QToolButton; class QXmlStreamReader; -namespace PimCommon { -class MinimumComboBox; -} - namespace KSieveUi { class SieveAction; class SieveHelpButton; @@ -68,7 +64,7 @@ QList mActionList; QPushButton *mAdd = nullptr; QPushButton *mRemove = nullptr; - PimCommon::MinimumComboBox *mComboBox = nullptr; + QComboBox *mComboBox = nullptr; QGridLayout *mLayout = nullptr; SieveHelpButton *mHelpButton = nullptr; QToolButton *mCommentButton = nullptr; diff --git a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp --- a/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp +++ b/src/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp @@ -25,14 +25,15 @@ #include "sieveactions/sieveactionlist.h" #include "commonwidgets/sievehelpbutton.h" #include "autocreatescriptutil_p.h" -#include #include #include #include +#include #include #include +#include #include "libksieve_debug.h" #include #include @@ -114,8 +115,10 @@ mLayout = new QGridLayout(this); mLayout->setContentsMargins(0, 0, 0, 0); - mComboBox = new PimCommon::MinimumComboBox; + mComboBox = new QComboBox; mComboBox->setEditable(false); + mComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow); + mComboBox->setMaximumWidth(50); const QList list = KSieveUi::SieveActionList::actionList(mSieveGraphicalModeWidget); QList::const_iterator it; QList::const_iterator end(list.constEnd()); @@ -165,7 +168,7 @@ updateGeometry(); - connect(mComboBox, QOverload::of(&PimCommon::MinimumComboBox::activated), this, &SieveActionWidget::slotActionChanged); + connect(mComboBox, QOverload::of(&QComboBox::activated), this, &SieveActionWidget::slotActionChanged); mAdd = new QPushButton(this); mAdd->setIcon(QIcon::fromTheme(QStringLiteral("list-add")));