From fc97cdcfa270c8dbac9f0a49e9051fe438498f13 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 28 May 2015 13:59:20 +0000 Subject: [PATCH] Beautify Answer Button for VOIP Toaster Display peername on voip notify text git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8307 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/VOIP/gui/VOIPChatWidgetHolder.cpp | 5 +- plugins/VOIP/gui/VOIPToasterItem.cpp | 4 +- plugins/VOIP/gui/VOIPToasterItem.ui | 84 +++++++++++++++++------ plugins/VOIP/gui/VOIPToasterNotify.cpp | 4 +- 4 files changed, 71 insertions(+), 26 deletions(-) diff --git a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp index 8bdd31a65..1d94960d7 100644 --- a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp +++ b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp @@ -35,6 +35,7 @@ #include "QVideoDevice.h" #include +#include #define CALL_START ":/images/call-start.png" #define CALL_STOP ":/images/call-stop.png" @@ -288,7 +289,7 @@ void VOIPChatWidgetHolder::addVideoData(const RsPeerId &peer_id, QByteArray* arr { if (!videoCaptureToggleButton->isChecked()) { if (mChatWidget) { - QString buttonName = QString::fromStdString(peer_id.toStdString()); + QString buttonName = QString::fromUtf8(rsPeers->getPeerName(peer_id).c_str()); if (buttonName.isEmpty()) buttonName = "VoIP";//TODO maybe change all with GxsId button_map::iterator it = buttonMapTakeVideo.find(buttonName); if (it == buttonMapTakeVideo.end()){ @@ -380,7 +381,7 @@ void VOIPChatWidgetHolder::addAudioData(const RsPeerId &peer_id, QByteArray* arr } if (mChatWidget) { - QString buttonName = QString::fromStdString(peer_id.toStdString()); + QString buttonName = QString::fromUtf8(rsPeers->getPeerName(peer_id).c_str()); if (buttonName.isEmpty()) buttonName = "VoIP";//TODO maybe change all with GxsId button_map::iterator it = buttonMapTakeVideo.find(buttonName); if (it == buttonMapTakeVideo.end()){ diff --git a/plugins/VOIP/gui/VOIPToasterItem.cpp b/plugins/VOIP/gui/VOIPToasterItem.cpp index adc048247..f848ea3e6 100644 --- a/plugins/VOIP/gui/VOIPToasterItem.cpp +++ b/plugins/VOIP/gui/VOIPToasterItem.cpp @@ -40,9 +40,11 @@ VOIPToasterItem::VOIPToasterItem(const RsPeerId &peer_id, const QString &msg, co switch (mType){ case AudioCall: toasterButton->setIcon(QIcon("://images/call-start.png")); + toasterButton->setText(tr("Answer")); break; case VideoCall: toasterButton->setIcon(QIcon("://images/video-icon-on.png")); + toasterButton->setText(tr("Answer with video")); break; default: ChatDialog::chatFriend(ChatId(mPeerId)); @@ -53,7 +55,7 @@ VOIPToasterItem::VOIPToasterItem(const RsPeerId &peer_id, const QString &msg, co /* set informations */ textLabel->setText(RsHtml().formatText(NULL, msg, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS | RSHTML_FORMATTEXT_CLEANSTYLE)); - toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(mPeerId).c_str())); + //toasterLabel->setText(QString::fromUtf8(rsPeers->getPeerName(mPeerId).c_str())); avatarWidget->setFrameType(AvatarWidget::STATUS_FRAME); avatarWidget->setId(ChatId(mPeerId)); } diff --git a/plugins/VOIP/gui/VOIPToasterItem.ui b/plugins/VOIP/gui/VOIPToasterItem.ui index fc0987fd5..ef15056c4 100644 --- a/plugins/VOIP/gui/VOIPToasterItem.ui +++ b/plugins/VOIP/gui/VOIPToasterItem.ui @@ -37,7 +37,7 @@ QFrame::Raised - + 2 @@ -70,7 +70,7 @@ - :/images/logo/logo_16.png + :/images/logo/logo_16.png true @@ -80,7 +80,7 @@ - Name + RetroShare @@ -112,7 +112,7 @@ - + :/images/closenormal.png:/images/closenormal.png @@ -123,27 +123,70 @@ - - - 2 - + - - - Show Chat + + + + 0 + 24 + + + + + 218 + 24 + + + + + 10 + 75 + true + + + + true - - - - 218 - 43 - + + + QPushButton{ +border: 1px solid #199909; +font-size: 12pt; color: white; +min-width: 128px; min-height: 24px; +border-radius: 6px; +background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.67, + stop: 0 #22c70d, stop: 1 #116a06); +} +QPushButton::hover{ +border: 1px solid #199909; +font-size: 12pt; color: white; +min-width: 128px; min-height: 24px; +border-radius: 6px; +background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.67, + stop: 0 #26df0f, stop: 1 #1db20a); +} + +QPushButton::pressed{ +border: 1px solid #333333; +font-size: 12pt; color: white; +min-width: 128px; min-height: 24px; +border-radius: 6px; +background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.67, + stop: 0 #444444, stop: 1 #222222); +} - - true + + + + + + 22 + 22 + @@ -179,8 +222,7 @@ - - + diff --git a/plugins/VOIP/gui/VOIPToasterNotify.cpp b/plugins/VOIP/gui/VOIPToasterNotify.cpp index ebefc1217..050e30925 100644 --- a/plugins/VOIP/gui/VOIPToasterNotify.cpp +++ b/plugins/VOIP/gui/VOIPToasterNotify.cpp @@ -322,7 +322,7 @@ void VOIPToasterNotify::voipAudioCallReceived(const RsPeerId &peer_id) if (!mToasterAudioCall.contains(peer_id)){ ToasterItemData toasterItemData; toasterItemData.mPeerId = peer_id; - toasterItemData.mMsg = tr("Audio Call received from this peer."); + toasterItemData.mMsg = QString::fromUtf8(rsPeers->getPeerName(toasterItemData.mPeerId).c_str()) + " " + tr("calling"); mPendingToasterAudioCall.push_back(toasterItemData); mToasterAudioCall.insert(peer_id, NULL); @@ -346,7 +346,7 @@ void VOIPToasterNotify::voipVideoCallReceived(const RsPeerId &peer_id) if (!mToasterVideoCall.contains(peer_id)){ ToasterItemData toasterItemData; toasterItemData.mPeerId = peer_id; - toasterItemData.mMsg = tr("Video Call received from this peer."); + toasterItemData.mMsg = QString::fromUtf8(rsPeers->getPeerName(toasterItemData.mPeerId).c_str()) + " " + tr("calling"); mPendingToasterVideoCall.push_back(toasterItemData); mToasterVideoCall.insert(peer_id, NULL);