Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-24 23:19:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed the voip icons and the tooltips

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-10-03 22:00:16 +00:00
parent bf9270dd54
commit a4524485ad
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/VOIP/gui/AudioPopupChatDialog.cpp
View File

@ -5,6 +5,9 @@
#include "interface/rsvoip.h" #include "interface/rsvoip.h"
#include "gui/SoundManager.h" #include "gui/SoundManager.h"
#define CALL_START ":/images/call-start-22.png"
#define CALL_STOP ":/images/call-stop-22.png"
AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent) AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
: PopupChatDialog(parent) : PopupChatDialog(parent)
{ {
@ -32,14 +35,14 @@ AudioPopupChatDialog::AudioPopupChatDialog(QWidget *parent)
audioMuteCaptureToggleButton->setMinimumSize(QSize(28,28)) ; audioMuteCaptureToggleButton->setMinimumSize(QSize(28,28)) ;
audioMuteCaptureToggleButton->setMaximumSize(QSize(28,28)) ; audioMuteCaptureToggleButton->setMaximumSize(QSize(28,28)) ;
audioMuteCaptureToggleButton->setText(QString()) ; audioMuteCaptureToggleButton->setText(QString()) ;
audioMuteCaptureToggleButton->setToolTip(tr("Deafen yourself")); audioMuteCaptureToggleButton->setToolTip(tr("Start Call"));
QIcon icon2 ; QIcon icon2 ;
icon2.addPixmap(QPixmap(":/images/muted_self.svg")) ; icon2.addPixmap(QPixmap(":/images/call-start-22.png")) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Normal,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/call-stop-22.png"),QIcon::Normal,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Disabled,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/call-stop-22.png"),QIcon::Disabled,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Active,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/call-stop-22.png"),QIcon::Active,QIcon::On) ;
icon2.addPixmap(QPixmap(":/images/talking_off.svg"),QIcon::Selected,QIcon::On) ; icon2.addPixmap(QPixmap(":/images/call-stop-22.png"),QIcon::Selected,QIcon::On) ;
audioMuteCaptureToggleButton->setIcon(icon2) ; audioMuteCaptureToggleButton->setIcon(icon2) ;
audioMuteCaptureToggleButton->setIconSize(QSize(22,22)) ; audioMuteCaptureToggleButton->setIconSize(QSize(22,22)) ;
@ -78,6 +81,7 @@ void AudioPopupChatDialog::toggleAudioMuteCapture()
if (audioMuteCaptureToggleButton->isChecked()) { if (audioMuteCaptureToggleButton->isChecked()) {
//activate audio output //activate audio output
audioListenToggleButton->setChecked(true); audioListenToggleButton->setChecked(true);
audioMuteCaptureToggleButton->setToolTip(tr("Stop Call"));
//activate audio input //activate audio input
if (!inputProcessor) { if (!inputProcessor) {
@ -97,20 +101,21 @@ void AudioPopupChatDialog::toggleAudioMuteCapture()
if (inputDevice) { if (inputDevice) {
inputDevice->stop(); inputDevice->stop();
} }
audioMuteCaptureToggleButton->setToolTip(tr("Start Call"));
} }
} }
void AudioPopupChatDialog::addAudioData(const QString name, QByteArray* array) void AudioPopupChatDialog::addAudioData(const QString name, QByteArray* array)
{ {
if (!audioListenToggleButton->isChecked()) { if (!audioMuteCaptureToggleButton->isChecked()) {
//launch an animation. Don't launch it if already animating //launch an animation. Don't launch it if already animating
if (!audioListenToggleButton->graphicsEffect() || if (!audioMuteCaptureToggleButton->graphicsEffect() ||
(audioListenToggleButton->graphicsEffect()->inherits("QGraphicsOpacityEffect") && (audioMuteCaptureToggleButton->graphicsEffect()->inherits("QGraphicsOpacityEffect") &&
((QGraphicsOpacityEffect*)audioListenToggleButton->graphicsEffect())->opacity() == 1) ((QGraphicsOpacityEffect*)audioMuteCaptureToggleButton->graphicsEffect())->opacity() == 1)
) { ) {
QGraphicsOpacityEffect *effect = new QGraphicsOpacityEffect(audioListenToggleButton); QGraphicsOpacityEffect *effect = new QGraphicsOpacityEffect(audioListenToggleButton);
audioListenToggleButton->setGraphicsEffect(effect); audioMuteCaptureToggleButton->setGraphicsEffect(effect);
QPropertyAnimation *anim = new QPropertyAnimation(effect, "opacity"); QPropertyAnimation *anim = new QPropertyAnimation(effect, "opacity");
anim->setStartValue(1); anim->setStartValue(1);
anim->setKeyValueAt(0.5,0); anim->setKeyValueAt(0.5,0);
@ -121,6 +126,8 @@ void AudioPopupChatDialog::addAudioData(const QString name, QByteArray* array)
// soundManager->play(VOIP_SOUND_INCOMING_CALL); // soundManager->play(VOIP_SOUND_INCOMING_CALL);
audioMuteCaptureToggleButton->setToolTip(tr("Answer"));
//TODO make a toaster and a sound for the incoming call //TODO make a toaster and a sound for the incoming call
return; return;
} }

2
plugins/VOIP/gui/VOIP_images.qrc
View File

@ -5,6 +5,8 @@
<file>images/self_undeafened.svg</file> <file>images/self_undeafened.svg</file>
<file>images/talking_on.svg</file> <file>images/talking_on.svg</file>
<file>images/talking_off.svg</file> <file>images/talking_off.svg</file>
<file>images/call-start-22.png</file>
<file>images/call-stop-22.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
plugins/VOIP/gui/images/call-start-22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
plugins/VOIP/gui/images/call-stop-22.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 995 B

BIN
plugins/VOIP/gui/sounds/ring3.wav Normal file
View File

Binary file not shown.