Commit adf6e83c authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Merge branch 'release/21.04'

parents 9acb2ed8 3a388a6e
Pipeline #60766 passed with stage
in 12 minutes and 16 seconds
......@@ -215,14 +215,10 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if (mIsPart) {
if (mMainWindow->hasDocument()) {
QAction *a = mACollection->addAction(KStandardAction::Open, this, SLOT(file_open()));
mACollection->addAction(QStringLiteral("korganizer_open"), a);
mACollection->addAction(KStandardAction::Open, QStringLiteral("korganizer_open"), this, qOverload<>(&ActionManager::file_open));
}
QAction *a = mACollection->addAction(KStandardAction::Print, mCalendarView, SLOT(print()));
mACollection->addAction(QStringLiteral("korganizer_print"), a);
a = mACollection->addAction(KStandardAction::PrintPreview, mCalendarView, SLOT(printPreview()));
mACollection->addAction(QStringLiteral("korganizer_print_preview"), a);
mACollection->addAction(KStandardAction::Print, QStringLiteral("korganizer_print"), mCalendarView, &CalendarView::print);
mACollection->addAction(KStandardAction::PrintPreview, QStringLiteral("korganizer_print_preview"), mCalendarView, &CalendarView::printPreview);
} else {
KStandardAction::open(this, qOverload<>(&ActionManager::file_open), mACollection);
KStandardAction::print(mCalendarView, &CalendarView::print, mACollection);
......@@ -293,26 +289,25 @@ void ActionManager::initActions()
Akonadi::History *history = mCalendarView->history();
if (mIsPart) {
// edit menu
mCutAction = mACollection->addAction(KStandardAction::Cut, QStringLiteral("korganizer_cut"), mCalendarView, SLOT(edit_cut()));
mCopyAction = mACollection->addAction(KStandardAction::Copy, QStringLiteral("korganizer_copy"), mCalendarView, SLOT(edit_copy()));
pasteAction = mACollection->addAction(KStandardAction::Paste, QStringLiteral("korganizer_paste"), mCalendarView, SLOT(edit_paste()));
mUndoAction = mACollection->addAction(KStandardAction::Undo, QStringLiteral("korganizer_undo"), history, SLOT(undo()));
mRedoAction = mACollection->addAction(KStandardAction::Redo, QStringLiteral("korganizer_redo"), history, SLOT(redo()));
mCutAction = mACollection->addAction(KStandardAction::Cut, QStringLiteral("korganizer_cut"), mCalendarView, &CalendarView::edit_cut);
mCopyAction = mACollection->addAction(KStandardAction::Copy, QStringLiteral("korganizer_copy"), mCalendarView, &CalendarView::edit_copy);
pasteAction = mACollection->addAction(KStandardAction::Paste, QStringLiteral("korganizer_paste"), mCalendarView, &CalendarView::edit_paste);
mUndoAction = mACollection->addAction(KStandardAction::Undo, QStringLiteral("korganizer_undo"), this, [=](){history->undo();});
mRedoAction = mACollection->addAction(KStandardAction::Redo, QStringLiteral("korganizer_redo"), this, [=](){history->redo();});
} else {
mCutAction = KStandardAction::cut(mCalendarView, &CalendarView::edit_cut, mACollection);
mCopyAction = KStandardAction::copy(mCalendarView, &CalendarView::edit_copy, mACollection);
pasteAction = KStandardAction::paste(mCalendarView, &CalendarView::edit_paste, mACollection);
mUndoAction = KStandardAction::undo(history, SLOT(undo()), mACollection);
mRedoAction = KStandardAction::redo(history, SLOT(redo()), mACollection);
mUndoAction = KStandardAction::undo(this, [=](){history->undo();}, mACollection);
mRedoAction = KStandardAction::redo(this, [=](){history->redo();}, mACollection);
}
mDeleteAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("&Delete"), this);
mACollection->addAction(QStringLiteral("edit_delete"), mDeleteAction);
connect(mDeleteAction, &QAction::triggered, mCalendarView, &CalendarView::appointment_delete);
if (mIsPart) {
QAction *a = KStandardAction::find(mCalendarView->dialogManager(), SLOT(showSearchDialog()), mACollection);
mACollection->addAction(QStringLiteral("korganizer_find"), a);
mACollection->addAction(KStandardAction::Find, QStringLiteral("korganizer_find"), mCalendarView->dialogManager(), &KODialogManager::showSearchDialog);
} else {
KStandardAction::find(mCalendarView->dialogManager(), SLOT(showSearchDialog()), mACollection);
KStandardAction::find(mCalendarView->dialogManager(), &KODialogManager::showSearchDialog, mACollection);
}
pasteAction->setEnabled(false);
mUndoAction->setEnabled(false);
......@@ -580,36 +575,36 @@ void ActionManager::initActions()
/************************** SCHEDULE MENU ********************************/
mPublishEvent = new QAction(QIcon::fromTheme(QStringLiteral("mail-send")), i18n("&Publish Item Information..."), this);
mACollection->addAction(QStringLiteral("schedule_publish"), mPublishEvent);
connect(mPublishEvent, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_publish()));
connect(mPublishEvent, &QAction::triggered, this, [=](bool){mCalendarView->schedule_publish();});
mPublishEvent->setEnabled(false);
mSendInvitation = new QAction(QIcon::fromTheme(QStringLiteral("mail-send")), i18n("Send &Invitation to Attendees"), this);
mACollection->addAction(QStringLiteral("schedule_request"), mSendInvitation);
connect(mSendInvitation, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_request()));
connect(mSendInvitation, &QAction::triggered, this, [=](bool){mCalendarView->schedule_request();});
mSendInvitation->setEnabled(false);
connect(mCalendarView, &CalendarView::organizerEventsSelected, mSendInvitation, &QAction::setEnabled);
mRequestUpdate = new QAction(i18n("Re&quest Update"), this);
mACollection->addAction(QStringLiteral("schedule_refresh"), mRequestUpdate);
connect(mRequestUpdate, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_refresh()));
connect(mRequestUpdate, &QAction::triggered, this, [=](bool){mCalendarView->schedule_refresh();});
mRequestUpdate->setEnabled(false);
connect(mCalendarView, &CalendarView::groupEventsSelected, mRequestUpdate, &QAction::setEnabled);
mSendCancel = new QAction(i18n("Send &Cancellation to Attendees"), this);
mACollection->addAction(QStringLiteral("schedule_cancel"), mSendCancel);
connect(mSendCancel, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_cancel()));
connect(mSendCancel, &QAction::triggered, this, [=](bool){mCalendarView->schedule_cancel();});
mSendCancel->setEnabled(false);
connect(mCalendarView, &CalendarView::organizerEventsSelected, mSendCancel, &QAction::setEnabled);
mSendStatusUpdate = new QAction(QIcon::fromTheme(QStringLiteral("mail-reply-sender")), i18n("Send Status &Update"), this);
mACollection->addAction(QStringLiteral("schedule_reply"), mSendStatusUpdate);
connect(mSendStatusUpdate, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_reply()));
connect(mSendStatusUpdate, &QAction::triggered, this, [=](bool){mCalendarView->schedule_reply();});
mSendStatusUpdate->setEnabled(false);
connect(mCalendarView, &CalendarView::groupEventsSelected, mSendStatusUpdate, &QAction::setEnabled);
mRequestChange = new QAction(i18nc("counter proposal", "Request Chan&ge"), this);
mACollection->addAction(QStringLiteral("schedule_counter"), mRequestChange);
connect(mRequestChange, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_counter()));
connect(mRequestChange, &QAction::triggered, this, [=](bool){mCalendarView->schedule_counter();});
mRequestChange->setEnabled(false);
connect(mCalendarView, &CalendarView::groupEventsSelected, mRequestChange, &QAction::setEnabled);
......@@ -620,7 +615,7 @@ void ActionManager::initActions()
mForwardEvent = new QAction(QIcon::fromTheme(QStringLiteral("mail-forward")), i18n("&Send as iCalendar..."), this);
mACollection->addAction(QStringLiteral("schedule_forward"), mForwardEvent);
connect(mForwardEvent, SIGNAL(triggered(bool)), mCalendarView, SLOT(schedule_forward()));
connect(mForwardEvent, &QAction::triggered, this, [=](bool){mCalendarView->schedule_forward();});
mForwardEvent->setEnabled(false);
action = new QAction(i18n("&Upload Free Busy Information"), this);
......@@ -690,7 +685,7 @@ void ActionManager::initActions()
action = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("&Configure KOrganizer..."), this);
mACollection->addAction(QStringLiteral("korganizer_configure"), action);
connect(action, &QAction::triggered, mCalendarView, &CalendarView::edit_options);
mACollection->addAction(KStandardAction::KeyBindings, QStringLiteral("korganizer_configure_shortcuts"), this, SLOT(keyBindings()));
mACollection->addAction(KStandardAction::KeyBindings, QStringLiteral("korganizer_configure_shortcuts"), this, &ActionManager::keyBindings);
} else {
KStandardAction::preferences(mCalendarView, &CalendarView::edit_options, mACollection);
KStandardAction::keyBindings(this, &ActionManager::keyBindings, mACollection);
......
......@@ -186,15 +186,18 @@ CalendarView::CalendarView(QWidget *parent)
// Signals emitted by mDateNavigator
connect(mDateNavigator, &DateNavigator::datesSelected, this, &CalendarView::showDates);
connect(mDateNavigatorContainer, SIGNAL(newEventSignal(QDate)), SLOT(newEvent(QDate)));
connect(mDateNavigatorContainer, SIGNAL(newTodoSignal(QDate)), SLOT(newTodo(QDate)));
connect(mDateNavigatorContainer, SIGNAL(newJournalSignal(QDate)), SLOT(newJournal(QDate)));
connect(mDateNavigatorContainer, &DateNavigatorContainer::newEventSignal,
this, qOverload<const QDate &>(&CalendarView::newEvent));
connect(mDateNavigatorContainer, &DateNavigatorContainer::newTodoSignal,
this, qOverload<const QDate &>(&CalendarView::newTodo));
connect(mDateNavigatorContainer, &DateNavigatorContainer::newJournalSignal,
this, qOverload<const QDate &>(&CalendarView::newJournal));
// Signals emitted by mNavigatorBar
connect(mNavigatorBar, &NavigatorBar::prevYearClicked, mDateNavigator, &DateNavigator::selectPreviousYear);
connect(mNavigatorBar, &NavigatorBar::nextYearClicked, mDateNavigator, &DateNavigator::selectNextYear);
connect(mNavigatorBar, SIGNAL(prevMonthClicked()), mDateNavigator, SLOT(selectPreviousMonth()));
connect(mNavigatorBar, SIGNAL(nextMonthClicked()), mDateNavigator, SLOT(selectNextMonth()));
connect(mNavigatorBar, &NavigatorBar::prevMonthClicked, this, [=](){mDateNavigator->selectPreviousMonth();});
connect(mNavigatorBar, &NavigatorBar::nextMonthClicked, this, [=](){mDateNavigator->selectNextMonth();});
connect(mNavigatorBar, &NavigatorBar::monthSelected, mDateNavigator, &DateNavigator::selectMonth);
connect(mNavigatorBar, &NavigatorBar::yearSelected, mDateNavigator, &DateNavigator::selectYear);
......
......@@ -108,9 +108,12 @@ void KODialogManager::showSearchDialog()
if (!mSearchDialog) {
mSearchDialog = new SearchDialog(mMainView);
// mSearchDialog->setCalendar( mMainView->calendar() );
connect(mSearchDialog, SIGNAL(showIncidenceSignal(Akonadi::Item)), mMainView, SLOT(showIncidence(Akonadi::Item)));
connect(mSearchDialog, SIGNAL(editIncidenceSignal(Akonadi::Item)), mMainView, SLOT(editIncidence(Akonadi::Item)));
connect(mSearchDialog, SIGNAL(deleteIncidenceSignal(Akonadi::Item)), mMainView, SLOT(deleteIncidence(Akonadi::Item)));
connect(mSearchDialog, &SearchDialog::showIncidenceSignal,
mMainView, qOverload<const Akonadi::Item &>(&CalendarView::showIncidence));
connect(mSearchDialog, &SearchDialog::editIncidenceSignal,
mMainView, [=](const Akonadi::Item & i){mMainView->editIncidence(i);});
connect(mSearchDialog, &SearchDialog::deleteIncidenceSignal,
mMainView, [=](const Akonadi::Item & i){mMainView->deleteIncidence(i, false);});
}
// make sure the widget is on top again
mSearchDialog->show();
......@@ -166,15 +169,6 @@ void KODialogManager::connectTypeAhead(IncidenceEditorNG::IncidenceDialog *dialo
}
}
void KODialogManager::connectEditor(IncidenceEditorNG::IncidenceDialog *editor)
{
createCategoryEditor();
connect(editor, SIGNAL(deleteIncidenceSignal(Akonadi::Item)), mMainView, SLOT(deleteIncidence(Akonadi::Item)));
connect(editor, SIGNAL(dialogClose(Akonadi::Item)), mMainView, SLOT(dialogClosing(Akonadi::Item)));
connect(editor, SIGNAL(deleteAttendee(Akonadi::Item)), mMainView, SIGNAL(cancelAttendees(Akonadi::Item)));
}
void KODialogManager::updateSearchDialog()
{
if (mSearchDialog) {
......
......@@ -49,9 +49,6 @@ public:
IncidenceEditorNG::IncidenceDialog *createDialog(const Akonadi::Item &item);
// TODO_NG: see if editors-NG have the needed slots.
void connectEditor(IncidenceEditorNG::IncidenceDialog *editor);
void updateSearchDialog();
void connectTypeAhead(IncidenceEditorNG::IncidenceDialog *editor, KOEventView *view);
......
......@@ -252,9 +252,9 @@ void KOViewManager::connectView(KOrg::BaseView *view)
connect(view, &BaseView::incidenceSelected, mMainView, &CalendarView::processMainViewSelection);
// showing/editing/deleting an incidence. The calendar view takes care of the action.
connect(view, SIGNAL(showIncidenceSignal(Akonadi::Item)), mMainView, SLOT(showIncidence(Akonadi::Item)));
connect(view, SIGNAL(editIncidenceSignal(Akonadi::Item)), mMainView, SLOT(editIncidence(Akonadi::Item)));
connect(view, SIGNAL(deleteIncidenceSignal(Akonadi::Item)), mMainView, SLOT(deleteIncidence(Akonadi::Item)));
connect(view, &BaseView::showIncidenceSignal, mMainView, qOverload<const Akonadi::Item &>(&CalendarView::showIncidence));
connect(view, &BaseView::editIncidenceSignal, this, [=](const Akonadi::Item &i){mMainView->editIncidence(i, false);});
connect(view, &BaseView::deleteIncidenceSignal, this, [=](const Akonadi::Item &i){mMainView->deleteIncidence(i, false);});
connect(view, &BaseView::copyIncidenceSignal, mMainView, &CalendarView::copyIncidence);
connect(view, &BaseView::cutIncidenceSignal, mMainView, &CalendarView::cutIncidence);
connect(view, &BaseView::pasteIncidenceSignal, mMainView, &CalendarView::pasteIncidence);
......@@ -265,14 +265,19 @@ void KOViewManager::connectView(KOrg::BaseView *view)
connect(view, &BaseView::dissociateOccurrencesSignal, mMainView, &CalendarView::dissociateOccurrences);
// signals to create new incidences
connect(view, SIGNAL(newEventSignal()), mMainView, SLOT(newEvent()));
connect(view, SIGNAL(newEventSignal(QDateTime)), mMainView, SLOT(newEvent(QDateTime)));
connect(view, SIGNAL(newEventSignal(QDateTime, QDateTime)), mMainView, SLOT(newEvent(QDateTime, QDateTime)));
connect(view, SIGNAL(newEventSignal(QDate)), mMainView, SLOT(newEvent(QDate)));
connect(view, SIGNAL(newTodoSignal(QDate)), mMainView, SLOT(newTodo(QDate)));
connect(view, SIGNAL(newSubTodoSignal(Akonadi::Item)), mMainView, SLOT(newSubTodo(Akonadi::Item)));
connect(view, SIGNAL(newJournalSignal(QDate)), mMainView, SLOT(newJournal(QDate)));
connect(view, qOverload<>(&BaseView::newEventSignal), mMainView, qOverload<>(&CalendarView::newEvent));
connect(view, qOverload<const QDateTime &>(&BaseView::newEventSignal),
mMainView, qOverload<const QDateTime &>(&CalendarView::newEvent));
connect(view, qOverload<const QDateTime &, const QDateTime &>(&BaseView::newEventSignal),
this, [=](const QDateTime &s, const QDateTime &e){mMainView->newEvent(s, e, false);});
connect(view, qOverload<const QDate &>(&BaseView::newEventSignal),
mMainView, qOverload<const QDate &>(&CalendarView::newEvent));
connect(view, qOverload<const QDate &>(&BaseView::newTodoSignal),
mMainView, qOverload<const QDate &>(&CalendarView::newTodo));
connect(view, qOverload<const Akonadi::Item &>(&BaseView::newSubTodoSignal),
mMainView, qOverload<const Akonadi::Item &>(&CalendarView::newSubTodo));
connect(view, &BaseView::newJournalSignal, mMainView, qOverload<const QDate &>(&CalendarView::newJournal));
// reload settings
connect(mMainView, &CalendarView::configChanged, view, &KOrg::BaseView::updateConfig);
......@@ -282,7 +287,7 @@ void KOViewManager::connectView(KOrg::BaseView *view)
connect(view, &BaseView::startMultiModify, mMainView, &CalendarView::startMultiModify);
connect(view, &BaseView::endMultiModify, mMainView, &CalendarView::endMultiModify);
connect(mMainView, SIGNAL(newIncidenceChanger(Akonadi::IncidenceChanger *)), view, SLOT(setIncidenceChanger(Akonadi::IncidenceChanger *)));
connect(mMainView, &CalendarView::newIncidenceChanger, view, &BaseView::setIncidenceChanger);
view->setIncidenceChanger(mMainView->incidenceChanger());
}
......@@ -403,7 +408,8 @@ void KOViewManager::showAgendaView()
addView(mAgendaView, showBoth);
connect(mAgendaView, SIGNAL(zoomViewHorizontally(QDate, int)), mMainView->dateNavigator(), SLOT(selectDates(QDate, int)));
connect(mAgendaView, &KOAgendaView::zoomViewHorizontally,
this, [=](const QDate &d, int n){mMainView->dateNavigator()->selectDates(d, n, QDate());});
auto config = KSharedConfig::openConfig();
mAgendaView->readSettings(config.data());
}
......@@ -421,10 +427,6 @@ void KOViewManager::showAgendaView()
mAgendaSideBySideView->setIdentifier("DefaultAgendaSideBySideView");
mAgendaSideBySideView->setCalendar(mMainView->calendar());
addView(mAgendaSideBySideView, showBoth);
/*
connect( mAgendaSideBySideView,SIGNAL(zoomViewHorizontally(QDate,int)),
mMainView->dateNavigator(),SLOT(selectDates(QDate,int)) );*/
}
if (showBoth && mAgendaViewTabs->indexOf(mAgendaSideBySideView) < 0) {
mAgendaViewTabs->addTab(mAgendaSideBySideView, i18n("Calendars Side by Side"));
......
......@@ -82,13 +82,16 @@ KOAgendaView::KOAgendaView(QWidget *parent, bool isSideBySide)
connect(d->mAgendaView, &EventViews::EventView::dissociateOccurrencesSignal, this, &KOrg::BaseView::dissociateOccurrencesSignal);
connect(d->mAgendaView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(d->mAgendaView, qOverload<>(&EventViews::AgendaView::newEventSignal), this, qOverload<>(&KOAgendaView::newEventSignal));
connect(d->mAgendaView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(d->mAgendaView, qOverload<const QDate &>(&EventViews::AgendaView::newEventSignal),
this, qOverload<const QDate &>(&KOAgendaView::newEventSignal));
connect(d->mAgendaView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(d->mAgendaView, qOverload<const QDateTime &>(&EventViews::AgendaView::newEventSignal),
this, qOverload<const QDateTime &>(&KOAgendaView::newEventSignal));
connect(d->mAgendaView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(d->mAgendaView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::AgendaView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOAgendaView::newEventSignal));
connect(d->mAgendaView, &EventViews::EventView::newTodoSignal, this, &KOrg::BaseView::newTodoSignal);
......
......@@ -58,13 +58,16 @@ KOJournalView::KOJournalView(QWidget *parent)
connect(mJournalView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
connect(mJournalView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mJournalView, qOverload<>(&EventViews::JournalView::newEventSignal), this, qOverload<>(&KOJournalView::newEventSignal));
connect(mJournalView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mJournalView, qOverload<const QDate &>(&EventViews::JournalView::newEventSignal),
this, qOverload<const QDate &>(&KOJournalView::newEventSignal));
connect(mJournalView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mJournalView, qOverload<const QDateTime &>(&EventViews::JournalView::newEventSignal),
this, qOverload<const QDateTime &>(&KOJournalView::newEventSignal));
connect(mJournalView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mJournalView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::JournalView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOJournalView::newEventSignal));
connect(mJournalView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
......
......@@ -60,13 +60,16 @@ KOListView::KOListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *paren
connect(mListView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
connect(mListView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mListView, qOverload<>(&EventViews::EventView::newEventSignal), this, qOverload<>(&KOListView::newEventSignal));
connect(mListView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mListView, qOverload<const QDate &>(&EventViews::EventView::newEventSignal),
this, qOverload<const QDate &>(&KOListView::newEventSignal));
connect(mListView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mListView, qOverload<const QDateTime &>(&EventViews::EventView::newEventSignal),
this, qOverload<const QDateTime &>(&KOListView::newEventSignal));
connect(mListView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mListView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::EventView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOListView::newEventSignal));
connect(mListView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
......
......@@ -59,13 +59,16 @@ MonthView::MonthView(QWidget *parent)
connect(mMonthView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
connect(mMonthView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mMonthView, qOverload<>(&EventViews::MonthView::newEventSignal), this, qOverload<>(&KOrg::MonthView::newEventSignal));
connect(mMonthView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mMonthView, qOverload<const QDate &>(&EventViews::MonthView::newEventSignal),
this, qOverload<const QDate &>(&KOrg::MonthView::newEventSignal));
connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mMonthView, qOverload<const QDateTime &>(&EventViews::MonthView::newEventSignal),
this, qOverload<const QDateTime &>(&KOrg::MonthView::newEventSignal));
connect(mMonthView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mMonthView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::MonthView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOrg::MonthView::newEventSignal));
connect(mMonthView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
......
......@@ -93,13 +93,17 @@ MultiAgendaView::MultiAgendaView(QWidget *parent)
connect(d->mMultiAgendaView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
connect(d->mMultiAgendaView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(d->mMultiAgendaView, qOverload<>(&EventViews::MultiAgendaView::newEventSignal),
this, qOverload<>(&KOrg::MultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(d->mMultiAgendaView, qOverload<const QDate &>(&EventViews::MultiAgendaView::newEventSignal),
this, qOverload<const QDate &>(&KOrg::MultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(d->mMultiAgendaView, qOverload<const QDateTime &>(&EventViews::MultiAgendaView::newEventSignal),
this, qOverload<const QDateTime &>(&KOrg::MultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(d->mMultiAgendaView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::MultiAgendaView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOrg::MultiAgendaView::newEventSignal));
connect(d->mMultiAgendaView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
......
......@@ -58,13 +58,16 @@ KOTimelineView::KOTimelineView(QWidget *parent)
connect(mTimeLineView, &EventViews::EventView::dissociateOccurrencesSignal, this, &KOrg::BaseView::dissociateOccurrencesSignal);
connect(mTimeLineView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mTimeLineView, qOverload<>(&EventViews::TimelineView::newEventSignal), this, qOverload<>(&KOTimelineView::newEventSignal));
connect(mTimeLineView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mTimeLineView, qOverload<const QDate &>(&EventViews::TimelineView::newEventSignal),
this, qOverload<const QDate &>(&KOTimelineView::newEventSignal));
connect(mTimeLineView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mTimeLineView, qOverload<const QDateTime &>(&EventViews::TimelineView::newEventSignal),
this, qOverload<const QDateTime &>(&KOTimelineView::newEventSignal));
connect(mTimeLineView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mTimeLineView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::TimelineView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOTimelineView::newEventSignal));
connect(mTimeLineView, &EventViews::EventView::newTodoSignal, this, &KOrg::BaseView::newTodoSignal);
......
......@@ -56,13 +56,16 @@ KOTodoView::KOTodoView(bool sidebarView, QWidget *parent)
connect(mView, &EventViews::EventView::dissociateOccurrencesSignal, this, &BaseView::dissociateOccurrencesSignal);
connect(mView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mView, qOverload<>(&EventViews::TodoView::newEventSignal), this, qOverload<>(&KOTodoView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mView, qOverload<const QDate &>(&EventViews::TodoView::newEventSignal),
this, qOverload<const QDate &>(&KOTodoView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mView, qOverload<const QDateTime &>(&EventViews::TodoView::newEventSignal),
this, qOverload<const QDateTime &>(&KOTodoView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::TodoView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOTodoView::newEventSignal));
connect(mView, &EventViews::EventView::newTodoSignal, this, &BaseView::newTodoSignal);
......
......@@ -40,13 +40,16 @@ KOWhatsNextView::KOWhatsNextView(QWidget *parent)
connect(mView, &EventViews::EventView::dissociateOccurrencesSignal, this, &KOrg::BaseView::dissociateOccurrencesSignal);
connect(mView, SIGNAL(newEventSignal()), SIGNAL(newEventSignal()));
connect(mView, qOverload<>(&EventViews::WhatsNextView::newEventSignal), this, qOverload<>(&KOWhatsNextView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDate)), SIGNAL(newEventSignal(QDate)));
connect(mView, qOverload<const QDate &>(&EventViews::WhatsNextView::newEventSignal),
this, qOverload<const QDate &>(&KOWhatsNextView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDateTime)), SIGNAL(newEventSignal(QDateTime)));
connect(mView, qOverload<const QDateTime &>(&EventViews::WhatsNextView::newEventSignal),
this, qOverload<const QDateTime &>(&KOWhatsNextView::newEventSignal));
connect(mView, SIGNAL(newEventSignal(QDateTime, QDateTime)), SIGNAL(newEventSignal(QDateTime, QDateTime)));
connect(mView, qOverload<const QDateTime &, const QDateTime &>(&EventViews::WhatsNextView::newEventSignal),
this, qOverload<const QDateTime &, const QDateTime &>(&KOWhatsNextView::newEventSignal));
connect(mView, &EventViews::EventView::newTodoSignal, this, &KOrg::BaseView::newTodoSignal);
......
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