Page MenuHomePhorge
Files F117898117

D39.1775376289.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D39.1775376289.diff
View Options

Index: src/widgets/editorview.h
===================================================================
--- src/widgets/editorview.h
+++ src/widgets/editorview.h
@@ -38,6 +38,7 @@
class QListWidget;
class KLineEdit;
+class KTimeComboBox;
namespace KPIM {
class KDateEdit;
@@ -95,6 +96,8 @@
void onAttachmentLinkActivated(const QString &link);
void onRemoveAttachmentClicked();
void onAddAttachmentClicked();
+ void onStartTimeEntered(const QTime &start);
+ void onDueTimeEntered(const QTime &due);
void toggleFullscreenEditor();
@@ -106,7 +109,9 @@
EditorWidget *m_textEdit;
QWidget *m_taskGroup;
KPIM::KDateEdit *m_startDateEdit;
+ KTimeComboBox *m_startTimeEdit;
KPIM::KDateEdit *m_dueDateEdit;
+ KTimeComboBox *m_dueTimeEdit;
QAbstractButton *m_startTodayButton;
KLineEdit *m_delegateEdit;
QComboBox *m_statusComboBox;
Index: src/widgets/editorview.cpp
===================================================================
--- src/widgets/editorview.cpp
+++ src/widgets/editorview.cpp
@@ -41,6 +41,7 @@
#include <KIcon>
#include <KRichTextWidget>
#include "kdateedit.h"
+#include <ktimecombobox.h>
#include "addressline/addresseelineedit.h"
#include "presentation/metatypes.h"
#include <KTemporaryFile>
@@ -64,7 +65,9 @@
m_textEdit(new EditorWidget(this)),
m_taskGroup(new QWidget(this)),
m_startDateEdit(new KPIM::KDateEdit(m_taskGroup)),
+ m_startTimeEdit(new KTimeComboBox(m_taskGroup)),
m_dueDateEdit(new KPIM::KDateEdit(m_taskGroup)),
+ m_dueTimeEdit(new KTimeComboBox(m_taskGroup)),
m_startTodayButton(new QPushButton(tr("Start today"), m_taskGroup)),
m_delegateEdit(0),
m_statusComboBox(new QComboBox(m_taskGroup)),
@@ -85,7 +88,9 @@
m_textEdit->setObjectName("textEdit");
m_titleEdit->setObjectName("titleEdit");
m_startDateEdit->setObjectName("startDateEdit");
+ m_startTimeEdit->setObjectName("startTimeEdit");
m_dueDateEdit->setObjectName("dueDateEdit");
+ m_dueTimeEdit->setObjectName("dueTimeEdit");
m_startTodayButton->setObjectName("startTodayButton");
m_statusComboBox->setObjectName("statusComboBox");
m_progressEdit->setObjectName("progressEdit");
@@ -124,8 +129,10 @@
QHBoxLayout *datesHBox = new QHBoxLayout;
datesHBox->addWidget(new QLabel(tr("Start date"), m_taskGroup));
datesHBox->addWidget(m_startDateEdit, 1);
+ datesHBox->addWidget(m_startTimeEdit, 1);
datesHBox->addWidget(new QLabel(tr("Due date"), m_taskGroup));
datesHBox->addWidget(m_dueDateEdit, 1);
+ datesHBox->addWidget(m_dueTimeEdit, 1);
vbox->addLayout(datesHBox);
QHBoxLayout *bottomHBox = new QHBoxLayout;
bottomHBox->addWidget(m_startTodayButton);
@@ -177,7 +184,9 @@
connect(m_textEdit->editor(), SIGNAL(textChanged()), this, SLOT(onTextEditChanged()));
connect(m_titleEdit, SIGNAL(editingFinished()), this, SLOT(onTextEditChanged()));
connect(m_startDateEdit, SIGNAL(dateEntered(QDate)), this, SLOT(onStartEditEntered(QDate)));
+ connect(m_startTimeEdit, SIGNAL(timeEntered(QTime)), this, SLOT(onStartTimeEntered(QTime)));
connect(m_dueDateEdit, SIGNAL(dateEntered(QDate)), this, SLOT(onDueEditEntered(QDate)));
+ connect(m_dueTimeEdit, SIGNAL(timeEntered(QTime)), this, SLOT(onDueTimeEntered(QTime)));
connect(m_startTodayButton, SIGNAL(clicked()), this, SLOT(onStartTodayClicked()));
connect(m_delegateEdit, SIGNAL(returnPressed()), this, SLOT(onDelegateEntered()));
connect(m_progressEdit, SIGNAL(valueChanged(int)), this, SLOT(onProgressChanged(int)));
@@ -303,11 +312,13 @@
void EditorView::onStartDateChanged()
{
m_startDateEdit->setDate(m_model->property("startDate").toDateTime().date());
+ m_startTimeEdit->setTime(m_model->property("startDate").toDateTime().time());
}
void EditorView::onDueDateChanged()
{
m_dueDateEdit->setDate(m_model->property("dueDate").toDateTime().date());
+ m_dueTimeEdit->setTime(m_model->property("dueDate").toDateTime().time());
}
void EditorView::onProgressChanged()
@@ -535,14 +546,26 @@
void EditorView::onStartEditEntered(const QDate &start)
{
- emit startDateChanged(QDateTime(start));
+ emit startDateChanged(QDateTime(start, m_startTimeEdit->time()));
}
+void EditorView::onStartTimeEntered(const QTime &start)
+{
+ emit startDateChanged(QDateTime(m_startDateEdit->date() , start));
+}
+
+
void EditorView::onDueEditEntered(const QDate &due)
{
- emit dueDateChanged(QDateTime(due));
+ emit dueDateChanged(QDateTime(due, m_dueTimeEdit->time()));
}
+void EditorView::onDueTimeEntered(const QTime &due)
+{
+ emit dueDateChanged(QDateTime(m_dueDateEdit->date(), due));
+}
+
+
void EditorView::onStartTodayClicked()
{
QDate today(QDate::currentDate());

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 5, 8:04 AM (2 d, 15 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18832825
Default Alt Text
D39.1775376289.diff (4 KB)

Event Timeline