marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 10:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[dialer] Make the history work

Browse source
This commit is contained in:
Martin Klapetek 2015-06-29 19:54:44 +02:00
parent 9b1cc9f1b0
commit 5eefb274e8
6 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dialer/package/contents/ui/Dialer/History.qml
View file

@ -26,7 +26,6 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
Item { Item {
function secondsToTimeString(seconds) { function secondsToTimeString(seconds) {
seconds = Math.floor(seconds/1000)
var h = Math.floor(seconds / 3600); var h = Math.floor(seconds / 3600);
var m = Math.floor((seconds - (h * 3600)) / 60); var m = Math.floor((seconds - (h * 3600)) / 60);
var s = seconds - h * 3600 - m * 60; var s = seconds - h * 3600 - m * 60;

2
dialer/package/contents/ui/Dialer/HistoryDelegate.qml
View file

@ -102,7 +102,7 @@ Item {
text: "Name (todo)" text: "Name (todo)"
} }
PlasmaComponents.Label { PlasmaComponents.Label {
text: i18n("Number: %1", model.number) text: model.number
Layout.fillWidth: true Layout.fillWidth: true
} }
} }

3
dialer/package/contents/ui/main.qml
View file

@ -47,6 +47,9 @@ ApplicationWindow {
onMissedCallsActionTriggered: { onMissedCallsActionTriggered: {
root.visible = true; root.visible = true;
} }
onCallEnded: {
insertCallInHistory(callContactNumber, callDuration, incomingCall ? 1 : 2);
}
} }
onVisibleChanged: { onVisibleChanged: {

2
dialer/src/call-manager.cpp
View file

@ -56,6 +56,7 @@ CallManager::CallManager(const Tp::CallChannelPtr &callChannel, DialerUtils *dia
connect(d->callChannel.data(), &Tp::CallChannel::invalidated, this, [=]() { connect(d->callChannel.data(), &Tp::CallChannel::invalidated, this, [=]() {
qDebug() << "Channel invalidated"; qDebug() << "Channel invalidated";
d->dialerUtils->setCallState("idle"); d->dialerUtils->setCallState("idle");
d->dialerUtils->emitCallEnded();
}); });
d->ringingNotification = nullptr; d->ringingNotification = nullptr;
@ -197,7 +198,6 @@ void CallManager::onCallStateChanged(Tp::CallState state)
d->callTimer->stop(); d->callTimer->stop();
d->callTimer->deleteLater(); d->callTimer->deleteLater();
d->callTimer = nullptr; d->callTimer = nullptr;
d->dialerUtils->setCallDuration(0);
} }
//if we requested the call, make sure we have a window to show the error (if any) //if we requested the call, make sure we have a window to show the error (if any)
// if (d->callChannel->isRequested()) { // if (d->callChannel->isRequested()) {

9
dialer/src/dialerutils.cpp
View file

@ -122,6 +122,15 @@ void DialerUtils::setCallContactNumber(const QString &contactNumber)
} }
} }
void DialerUtils::emitCallEnded()
{
qDebug() << "Call ended:" << m_callContactNumber << m_callDuration;
Q_EMIT callEnded(m_callContactNumber, m_callDuration, true);
m_callDuration = 0;
m_callContactNumber = QString();
m_callContactAlias = QString();
}
void DialerUtils::resetMissedCalls() void DialerUtils::resetMissedCalls()
{ {
m_missedCalls = 0; m_missedCalls = 0;

3
dialer/src/dialerutils.h
View file

@ -50,6 +50,8 @@ public:
QString callContactNumber() const; QString callContactNumber() const;
void setCallContactNumber(const QString &contactNumber); void setCallContactNumber(const QString &contactNumber);
void emitCallEnded();
Q_INVOKABLE void resetMissedCalls(); Q_INVOKABLE void resetMissedCalls();
Q_INVOKABLE void dial(const QString &number); Q_INVOKABLE void dial(const QString &number);
@ -62,6 +64,7 @@ Q_SIGNALS:
void acceptCall(); void acceptCall();
void rejectCall(); void rejectCall();
void hangUp(); void hangUp();
void callEnded(const QString &callContactNumber, uint callDuration, bool incomingCall);
private: private:
QPointer <KNotification> m_callsNotification; QPointer <KNotification> m_callsNotification;