Commit aa87975b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Move class directly here

parent aa7aaecc
Pipeline #23269 failed with stage
in 16 minutes and 37 seconds
......@@ -63,6 +63,7 @@ set(incidenceeditors_ng_shared_LIB_SRCS
resourcemanagement.cpp
resourceitem.cpp
resourcemodel.cpp
kweekdaycheckcombo.cpp
)
qt5_add_resources(incidenceeditors_ng_shared_LIB_SRCS incidenceeditor.qrc)
......
......@@ -113,7 +113,7 @@ IncidenceRecurrence::IncidenceRecurrence(IncidenceDateTime *dateTime, Ui::EventO
connect(mUi->mRecurrenceTypeCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, &IncidenceRecurrence::checkDirtyStatus);
connect(mUi->mFrequencyEdit, qOverload<int>(&QSpinBox::valueChanged), this, &IncidenceRecurrence::checkDirtyStatus);
connect(mUi->mFrequencyEdit, qOverload<int>(&QSpinBox::valueChanged), this, &IncidenceRecurrence::checkDirtyStatus);
connect(mUi->mWeekDayCombo, &KPIM::KWeekdayCheckCombo::checkedItemsChanged, this,
connect(mUi->mWeekDayCombo, &IncidenceEditorNG::KWeekdayCheckCombo::checkedItemsChanged, this,
&IncidenceRecurrence::checkDirtyStatus);
connect(mUi->mMonthlyCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, &IncidenceRecurrence::checkDirtyStatus);
connect(mUi->mYearlyCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, &IncidenceRecurrence::checkDirtyStatus);
......
/*
Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
Copyright (c) 2010 Bertjan Broeksema <broeksema@kde.org>
Copyright (C) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library 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 Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#include "kweekdaycheckcombo.h"
#include "incidenceeditor_debug.h"
#include <QLocale>
using namespace IncidenceEditorNG;
KWeekdayCheckCombo::KWeekdayCheckCombo(QWidget *parent, bool first5Checked) : KCheckComboBox(parent)
{
const int weekStart = QLocale().firstDayOfWeek();
QStringList checkedItems;
for (int i = 0; i < 7; ++i) {
// i is the nr of the combobox, not the day of week!
const int dayOfWeek = (i + weekStart + 6) % 7;
const QString weekDayName = QLocale::system().dayName(dayOfWeek + 1, QLocale::ShortFormat);
addItem(weekDayName);
// by default Monday - Friday should be checked
// which corresponds to index 0 - 4;
if (first5Checked && dayOfWeek < 5) {
checkedItems << weekDayName;
}
}
if (first5Checked) {
setCheckedItems(checkedItems);
}
}
KWeekdayCheckCombo::~KWeekdayCheckCombo()
{
}
QBitArray KWeekdayCheckCombo::days() const
{
QBitArray days(7);
const int weekStart = QLocale().firstDayOfWeek();
for (int i = 0; i < 7; ++i) {
// i is the nr of the combobox, not the day of week!
const int index = (1 + i + (7 - weekStart)) % 7;
days.setBit(i, itemCheckState(index) == Qt::Checked);
}
return days;
}
int KWeekdayCheckCombo::weekdayIndex(const QDate &date) const
{
if (!date.isValid()) {
return -1;
}
const int weekStart = QLocale().firstDayOfWeek();
const int dayOfWeek = date.dayOfWeek() - 1; // Values 1 - 7, we need 0 - 6
// qCDebug(INCIDENCEEDITOR_LOG) << "dayOfWeek = " << dayOfWeek << " weekStart = " << weekStart
// << "; result " << ( ( dayOfWeek + weekStart ) % 7 ) << "; date = " << date;
return (1 + dayOfWeek + (7 - weekStart)) % 7;
}
void KWeekdayCheckCombo::setDays(const QBitArray &days, const QBitArray &disableDays)
{
Q_ASSERT(count() == 7); // The combobox must be filled.
QStringList checkedDays;
const int weekStart = QLocale().firstDayOfWeek();
for (int i = 0; i < 7; ++i) {
// i is the nr of the combobox, not the day of week!
const int index = (1 + i + (7 - weekStart)) % 7;
// qCDebug(INCIDENCEEDITOR_LOG) << "Checking for i = " << i << "; index = " << index << days.testBit( i );
// qCDebug(INCIDENCEEDITOR_LOG) << "Disabling? for i = " << i << "; index = " << index << !disableDays.testBit( i );
if (days.testBit(i)) {
checkedDays << itemText(index);
}
if (!disableDays.isEmpty()) {
setItemEnabled(index, !disableDays.testBit(i));
}
}
setCheckedItems(checkedDays);
}
/*
Copyright (C) 2010 Casey Link <unnamedrambler@gmail.com>
Copyright (c) 2010 Bertjan Broeksema <broeksema@kde.org>
Copyright (C) 2009-2010 Klaralvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library 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 Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef KWEEKDAYCHECKCOMBO_H
#define KWEEKDAYCHECKCOMBO_H
#include <Libkdepim/KCheckComboBox>
#include <QBitArray>
#include <QDate>
namespace IncidenceEditorNG {
//FIXME: This class assumes all weeks have 7 days. We should use KCalenderSystem instead.
/**
* A combobox that is populated with the days of the week from the current
* KCalenderSystem. The days are checkable.
* @note: KCalenderSystem numbers weekdays starting with 1, however this widget is 0 indexed and handles the conversion to the 1 based system internally. Use this widget as a normal 0 indexed container.
* @see KCalenderSystem
*/
class KWeekdayCheckCombo : public KPIM::KCheckComboBox
{
Q_OBJECT
public:
/**
* @param first5Checked if true the first 5 weekdays will be checked by default
*/
explicit KWeekdayCheckCombo(QWidget *parent = nullptr, bool first5Checked = false);
~KWeekdayCheckCombo() override;
/**
* Retrieve the checked days
* @param days a 7 bit array indicating the checked days (bit 0 = Monday, value 1 = checked).
*/
Q_REQUIRED_RESULT QBitArray days() const;
/**
* Set the checked days on this combobox
* @param days a 7 bit array indicating the days to check/uncheck (bit 0 = Monday, value 1 = check).
* @param disableDays if not empty, the corresponding days will be disabled, all others enabled (bit 0 = Monday, value 1 = disable).
* @see days()
*/
void setDays(const QBitArray &days, const QBitArray &disableDays = QBitArray());
/**
* Returns the index of the weekday represented by the
* QDate object.
*/
int weekdayIndex(const QDate &date) const;
};
}
#endif // KWEEKDAYCHECKCOMBO_H
......@@ -70,9 +70,9 @@ SchedulingDialog::SchedulingDialog(const QDate &startDate, const QTime &startTim
connect(mStartDate, &KDateComboBox::dateEdited, this, &SchedulingDialog::slotStartDateChanged);
connect(mWeekdayCombo, &KPIM::KWeekdayCheckCombo::checkedItemsChanged, this,
connect(mWeekdayCombo, &IncidenceEditorNG::KWeekdayCheckCombo::checkedItemsChanged, this,
&SchedulingDialog::slotWeekdaysChanged);
connect(mWeekdayCombo, &KPIM::KWeekdayCheckCombo::checkedItemsChanged, this,
connect(mWeekdayCombo, &IncidenceEditorNG::KWeekdayCheckCombo::checkedItemsChanged, this,
&SchedulingDialog::slotMandatoryRolesChanged);
connect(mResolver, &ConflictResolver::freeSlotsAvailable, mPeriodModel,
......
......@@ -1275,7 +1275,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="KPIM::KWeekdayCheckCombo" name="mWeekDayCombo">
<widget class="IncidenceEditorNG::KWeekdayCheckCombo" name="mWeekDayCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -1779,9 +1779,9 @@
<header>ktimecombobox.h</header>
</customwidget>
<customwidget>
<class>KPIM::KWeekdayCheckCombo</class>
<class>IncidenceEditorNG::KWeekdayCheckCombo</class>
<extends>KPIM::KCheckComboBox</extends>
<header>Libkdepim/KWeekdayCheckCombo</header>
<header>kweekdaycheckcombo.h</header>
</customwidget>
<customwidget>
<class>IncidenceEditorNG::KTimeZoneComboBox</class>
......
......@@ -97,7 +97,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KPIM::KWeekdayCheckCombo" name="mWeekdayCombo">
<widget class="IncidenceEditorNG::KWeekdayCheckCombo" name="mWeekdayCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -284,9 +284,9 @@
<header>ktimecombobox.h</header>
</customwidget>
<customwidget>
<class>KPIM::KWeekdayCheckCombo</class>
<class>IncidenceEditorNG::KWeekdayCheckCombo</class>
<extends>KPIM::KCheckComboBox</extends>
<header>Libkdepim/KWeekdayCheckCombo</header>
<header>kweekdaycheckcombo.h</header>
</customwidget>
</customwidgets>
<resources/>
......
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