Verified Commit 7493049c authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Port from KPIM::TagCombo to its Akonadi equivalent

parent 8a55450c
...@@ -7,7 +7,7 @@ if(DEFINED KDEPIM_DEV_VERSION) ...@@ -7,7 +7,7 @@ if(DEFINED KDEPIM_DEV_VERSION)
set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif() endif()
set(PIM_VERSION "5.14.40") set(PIM_VERSION "5.14.43")
set(RELEASE_SERVICE_VERSION "20.07.40") set(RELEASE_SERVICE_VERSION "20.07.40")
set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include <CalendarSupport/KCalPrefs> #include <CalendarSupport/KCalPrefs>
#include <CalendarSupport/CategoryConfig> #include <CalendarSupport/CategoryConfig>
#include <LibkdepimAkonadi/TagSelectionCombo>
#include <IncidenceEditor/IncidenceEditorSettings> #include <IncidenceEditor/IncidenceEditorSettings>
#include <AkonadiCore/AgentFilterProxyModel> #include <AkonadiCore/AgentFilterProxyModel>
...@@ -45,6 +43,7 @@ ...@@ -45,6 +43,7 @@
#include <AkonadiWidgets/AgentTypeDialog> #include <AkonadiWidgets/AgentTypeDialog>
#include <AkonadiWidgets/CollectionComboBox> #include <AkonadiWidgets/CollectionComboBox>
#include <AkonadiWidgets/ManageAccountWidget> #include <AkonadiWidgets/ManageAccountWidget>
#include <AkonadiWidgets/TagSelectionComboBox>
#include <akonadi/calendar/calendarsettings.h> //krazy:exclude=camelcase this is a generated file #include <akonadi/calendar/calendarsettings.h> //krazy:exclude=camelcase this is a generated file
#include <KCalendarCore/Event> #include <KCalendarCore/Event>
...@@ -835,7 +834,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent) ...@@ -835,7 +834,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent)
unsetCategoryColor->label()->setWhatsThis(unsetCategoryColor->button()->whatsThis()); unsetCategoryColor->label()->setWhatsThis(unsetCategoryColor->button()->whatsThis());
unsetCategoryColor->label()->setToolTip(unsetCategoryColor->button()->toolTip()); unsetCategoryColor->label()->setToolTip(unsetCategoryColor->button()->toolTip());
mCategoryCombo = new KPIM::TagCombo(categoryGroup); mCategoryCombo = new Akonadi::TagSelectionComboBox(categoryGroup);
mCategoryCombo->setWhatsThis( mCategoryCombo->setWhatsThis(
i18nc("@info:whatsthis", i18nc("@info:whatsthis",
"Select here the event category you want to modify. " "Select here the event category you want to modify. "
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <KColorButton> #include <KColorButton>
class QPushButton; class QPushButton;
class QComboBox;
namespace Ui { namespace Ui {
class KOGroupwarePrefsPage; class KOGroupwarePrefsPage;
...@@ -82,7 +83,7 @@ protected Q_SLOTS: ...@@ -82,7 +83,7 @@ protected Q_SLOTS:
void updateResourceColor(); void updateResourceColor();
private: private:
KComboBox *mCategoryCombo = nullptr; QComboBox *mCategoryCombo = nullptr;
KColorButton *mCategoryButton = nullptr; KColorButton *mCategoryButton = nullptr;
QHash<QString, QColor> mCategoryDict; QHash<QString, QColor> mCategoryDict;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment