diff --git a/CMakeLists.txt b/CMakeLists.txt index fe85c56..5255d2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,108 +1,108 @@ cmake_minimum_required(VERSION 3.5) set(PIM_VERSION "5.14.40") project(akonadiconsole VERSION ${PIM_VERSION}) set(KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(ECMInstallIcons) include(ECMSetupVersion) include(ECMAddTests) include(GenerateExportHeader) include(ECMGenerateHeaders) include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) # Do NOT add quote -set(KDEPIM_DEV_VERSION alpha) +set(KDEPIM_DEV_VERSION ) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() set(RELEASE_SERVICE_VERSION "20.07.40") set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") set(AKONADI_CONTACT_VERSION "5.14.40") set(CALENDARSUPPORT_LIB_VERSION_LIB "5.14.40") set(AKONADI_VERSION "5.14.40") set(AKONADI_SEARCH_VERSION "5.14.40") set(QT_REQUIRED_VERSION "5.12.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql Test) set(MESSAGELIB_LIB_VERSION_LIB "5.14.40") set(LIBKDEPIM_LIB_VERSION_LIB "5.14.40") set(KMIME_LIB_VERSION "5.14.40") # Find KF5 package find_package(KF5Completion ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ConfigWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5ItemModels ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED) find_package(KF5Completion ${KF5_MIN_VERSION} REQUIRED) find_package(KF5ItemViews ${KF5_MIN_VERSION} REQUIRED) find_package(KF5KIO ${KF5_MIN_VERSION} REQUIRED) # Find KdepimLibs Package find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) if (NOT WIN32) find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED) find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED) find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED) find_package(Xapian CONFIG) set_package_properties(Xapian PROPERTIES DESCRIPTION "The Xapian search engine library" URL "https://xapian.org" TYPE REQUIRED ) set(ENABLE_LIBKDEPIM TRUE) set(ENABLE_SEARCH TRUE) set(ENABLE_CONTENTVIEWS TRUE) endif() if (EXISTS "${CMAKE_SOURCE_DIR}/.git") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR} ${XAPIAN_INCLUDE_DIR}) configure_file(akonadiconsole-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/akonadiconsole-version.h @ONLY) configure_file(config-akonadiconsole.h.cmake ${CMAKE_BINARY_DIR}/config-akonadiconsole.h) add_subdirectory(src) if(BUILD_TESTING) add_subdirectory(autotests) endif() feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/jobtrackersearchwidget.cpp b/src/jobtrackersearchwidget.cpp index f2fa0c9..9e94c50 100644 --- a/src/jobtrackersearchwidget.cpp +++ b/src/jobtrackersearchwidget.cpp @@ -1,74 +1,70 @@ /* Copyright (C) 2017-2020 Laurent Montel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "jobtrackersearchwidget.h" #include #include #include #include JobTrackerSearchWidget::JobTrackerSearchWidget(QWidget *parent) : QWidget(parent) { QHBoxLayout *mainLayout = new QHBoxLayout(this); mainLayout->setObjectName(QStringLiteral("mainlayout")); mainLayout->setContentsMargins(0, 0, 0, 0); mSearchLineEdit = new QLineEdit(this); mSearchLineEdit->setObjectName(QStringLiteral("searchline")); mSearchLineEdit->setClearButtonEnabled(true); mSearchLineEdit->setPlaceholderText(QStringLiteral("Search...")); mainLayout->addWidget(mSearchLineEdit); connect(mSearchLineEdit, &QLineEdit::textChanged, this, &JobTrackerSearchWidget::searchTextChanged); mSelectOnlyError = new QCheckBox(QStringLiteral("Show Only Errors"), this); mSelectOnlyError->setObjectName(QStringLiteral("selectonlyerror")); mainLayout->addWidget(mSelectOnlyError); connect(mSelectOnlyError, &QCheckBox::toggled, this, &JobTrackerSearchWidget::selectOnlyErrorChanged); mSelectColumn = new QComboBox(this); mSelectColumn->setObjectName(QStringLiteral("selectcolumn")); mainLayout->addWidget(mSelectColumn); mSelectColumn->addItem(QStringLiteral("All Columns"), -1); mSelectColumn->addItem(QStringLiteral("Job ID"), 0); mSelectColumn->addItem(QStringLiteral("Created"), 1); mSelectColumn->addItem(QStringLiteral("Wait time"), 2); mSelectColumn->addItem(QStringLiteral("Job duration"), 3); mSelectColumn->addItem(QStringLiteral("Job Type"), 4); mSelectColumn->addItem(QStringLiteral("State"), 5); mSelectColumn->addItem(QStringLiteral("Info"), 6); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(mSelectColumn, QOverload::of(&QComboBox::currentIndexChanged), this, &JobTrackerSearchWidget::slotColumnChanged); -#else - connect(mSelectColumn, QOverload::of(&QComboBox::currentIndexChanged), this, &JobTrackerSearchWidget::slotColumnChanged); -#endif } JobTrackerSearchWidget::~JobTrackerSearchWidget() { } void JobTrackerSearchWidget::slotColumnChanged(int index) { QVariant var = mSelectColumn->itemData(index); if (var.isValid()) { Q_EMIT columnChanged(var.toInt()); } }