diff --git a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp index 87a5d2f5e..f312e0954 100644 --- a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp +++ b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp @@ -53,11 +53,11 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n QSize buttonSize = QSize(iconSize + QSize(3,3)); QIcon iconaudioListenToggleButton ; - iconaudioListenToggleButton.addPixmap(QPixmap(":/images/audio-volume-muted.png")) ; - iconaudioListenToggleButton.addPixmap(QPixmap(":/images/audio-volume-high.png"),QIcon::Normal,QIcon::On) ; - iconaudioListenToggleButton.addPixmap(QPixmap(":/images/audio-volume-high.png"),QIcon::Disabled,QIcon::On) ; - iconaudioListenToggleButton.addPixmap(QPixmap(":/images/audio-volume-high.png"),QIcon::Active,QIcon::On) ; - iconaudioListenToggleButton.addPixmap(QPixmap(":/images/audio-volume-high.png"),QIcon::Selected,QIcon::On) ; + iconaudioListenToggleButton.addPixmap(QPixmap(":/images/speaker_mute.png")) ; + iconaudioListenToggleButton.addPixmap(QPixmap(":/images/speaker.png"),QIcon::Normal,QIcon::On) ; + iconaudioListenToggleButton.addPixmap(QPixmap(":/images/speaker.png"),QIcon::Disabled,QIcon::On) ; + iconaudioListenToggleButton.addPixmap(QPixmap(":/images/speaker.png"),QIcon::Active,QIcon::On) ; + iconaudioListenToggleButton.addPixmap(QPixmap(":/images/speaker.png"),QIcon::Selected,QIcon::On) ; audioListenToggleButton = new QToolButton ; audioListenToggleButton->setIcon(iconaudioListenToggleButton) ; @@ -71,11 +71,11 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n audioListenToggleButton->setEnabled(false); QIcon iconaudioCaptureToggleButton ; - iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/call-start.png")) ; - iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/call-hold.png"),QIcon::Normal,QIcon::On) ; - iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/call-hold.png"),QIcon::Disabled,QIcon::On) ; - iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/call-hold.png"),QIcon::Active,QIcon::On) ; - iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/call-hold.png"),QIcon::Selected,QIcon::On) ; + iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/phone.png")) ; + iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/microphone_mute.png"),QIcon::Normal,QIcon::On) ; + iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/microphone_mute.png"),QIcon::Disabled,QIcon::On) ; + iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/microphone_mute.png"),QIcon::Active,QIcon::On) ; + iconaudioCaptureToggleButton.addPixmap(QPixmap(":/images/microphone_mute.png"),QIcon::Selected,QIcon::On) ; audioCaptureToggleButton = new QToolButton ; audioCaptureToggleButton->setIcon(iconaudioCaptureToggleButton) ; @@ -88,11 +88,11 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n audioCaptureToggleButton->setToolTip(tr("Start Call")); QIcon iconvideoCaptureToggleButton ; - iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/video-icon-on.png")) ; - iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/video-icon-off.png"),QIcon::Normal,QIcon::On) ; - iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/video-icon-off.png"),QIcon::Disabled,QIcon::On) ; - iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/video-icon-off.png"),QIcon::Active,QIcon::On) ; - iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/video-icon-off.png"),QIcon::Selected,QIcon::On) ; + iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/filmcam.png")) ; + iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/filmcam-off.png"),QIcon::Normal,QIcon::On) ; + iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/filmcam-off.png"),QIcon::Disabled,QIcon::On) ; + iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/filmcam-off.png"),QIcon::Active,QIcon::On) ; + iconvideoCaptureToggleButton.addPixmap(QPixmap(":/images/filmcam-off.png"),QIcon::Selected,QIcon::On) ; videoCaptureToggleButton = new QToolButton ; videoCaptureToggleButton->setIcon(iconvideoCaptureToggleButton) ; @@ -105,7 +105,7 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n videoCaptureToggleButton->setToolTip(tr("Start Video Call")); hangupButton = new QToolButton ; - hangupButton->setIcon(QIcon(":/images/call-stop.png")) ; + hangupButton->setIcon(QIcon(":/images/phone_hangup.png")) ; hangupButton->setIconSize(iconSize) ; hangupButton->setMinimumSize(buttonSize) ; hangupButton->setMaximumSize(buttonSize) ; @@ -116,11 +116,11 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n hangupButton->hide(); QIcon iconhideChatTextToggleButton ; - iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/orange-bubble-64.png")) ; - iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/white-bubble-64.png"),QIcon::Normal,QIcon::On) ; - iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/white-bubble-64.png"),QIcon::Disabled,QIcon::On) ; - iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/white-bubble-64.png"),QIcon::Active,QIcon::On) ; - iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/white-bubble-64.png"),QIcon::Selected,QIcon::On) ; + iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/chat-bubble.png")) ; + iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/chat-bubble.png"),QIcon::Normal,QIcon::On) ; + iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/chat-bubble.png"),QIcon::Disabled,QIcon::On) ; + iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/chat-bubble.png"),QIcon::Active,QIcon::On) ; + iconhideChatTextToggleButton.addPixmap(QPixmap(":/images/chat-bubble.png"),QIcon::Selected,QIcon::On) ; hideChatTextToggleButton = new QToolButton ; hideChatTextToggleButton->setIcon(iconhideChatTextToggleButton) ; @@ -134,11 +134,11 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n hideChatTextToggleButton->setEnabled(false) ; QIcon iconfullscreenToggleButton ; - iconfullscreenToggleButton.addPixmap(QPixmap(":/images/channels32.png")) ; - iconfullscreenToggleButton.addPixmap(QPixmap(":/images/folder-draft24.png"),QIcon::Normal,QIcon::On) ; - iconfullscreenToggleButton.addPixmap(QPixmap(":/images/folder-draft24.png"),QIcon::Disabled,QIcon::On) ; - iconfullscreenToggleButton.addPixmap(QPixmap(":/images/folder-draft24.png"),QIcon::Active,QIcon::On) ; - iconfullscreenToggleButton.addPixmap(QPixmap(":/images/folder-draft24.png"),QIcon::Selected,QIcon::On) ; + iconfullscreenToggleButton.addPixmap(QPixmap(":/images/fullscreen_arrows.png")) ; + iconfullscreenToggleButton.addPixmap(QPixmap(":/images/fullscreen.png"),QIcon::Normal,QIcon::On) ; + iconfullscreenToggleButton.addPixmap(QPixmap(":/images/fullscreen.png"),QIcon::Disabled,QIcon::On) ; + iconfullscreenToggleButton.addPixmap(QPixmap(":/images/fullscreen.png"),QIcon::Active,QIcon::On) ; + iconfullscreenToggleButton.addPixmap(QPixmap(":/images/fullscreen.png"),QIcon::Selected,QIcon::On) ; fullscreenToggleButton = new QToolButton ; fullscreenToggleButton->setIcon(iconfullscreenToggleButton) ; @@ -236,7 +236,7 @@ VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *n videoCaptureToggleButtonFS->setToolTip(tr("Start Video Call")); hangupButtonFS = new QToolButton(fullScreenFrame) ; - hangupButtonFS->setIcon(QIcon(":/images/call-stop.png")) ; + hangupButtonFS->setIcon(QIcon(":/images/phone_hangup.png")) ; hangupButtonFS->setIconSize(iconSize) ; hangupButtonFS->setMinimumSize(buttonSize) ; hangupButtonFS->setMaximumSize(buttonSize) ; diff --git a/plugins/VOIP/gui/VOIP_images.qrc b/plugins/VOIP/gui/VOIP_images.qrc index 0f69a2c2c..218ef9068 100644 --- a/plugins/VOIP/gui/VOIP_images.qrc +++ b/plugins/VOIP/gui/VOIP_images.qrc @@ -1,18 +1,19 @@ - - images/audio-volume-high.png - images/muted_self.svg - images/audio-volume-muted.png - images/talking_on.svg - images/talking_off.svg - images/call-start.png - images/call-stop.png - images/call-hold.png - images/camera-on.png - images/camera-off.png - images/video-icon-big.png - images/video-icon-on.png - images/video-icon-off.png - + + images/muted_self.svg + images/talking_on.svg + images/talking_off.svg + images/chat-bubble.png + images/filmcam.png + images/fullscreen.png + images/fullscreen_arrows.png + images/microphone.png + images/microphone_mute.png + images/phone.png + images/phone_hangup.png + images/speaker.png + images/speaker_mute.png + images/webcam.png + images/video-icon-big.png + - diff --git a/plugins/VOIP/gui/images/audio-volume-high.png b/plugins/VOIP/gui/images/audio-volume-high.png deleted file mode 100644 index e11a90649..000000000 Binary files a/plugins/VOIP/gui/images/audio-volume-high.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/audio-volume-medium-22.png b/plugins/VOIP/gui/images/audio-volume-medium-22.png deleted file mode 100644 index bf6b49f2a..000000000 Binary files a/plugins/VOIP/gui/images/audio-volume-medium-22.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/audio-volume-muted-22.png b/plugins/VOIP/gui/images/audio-volume-muted-22.png deleted file mode 100644 index 426ec3313..000000000 Binary files a/plugins/VOIP/gui/images/audio-volume-muted-22.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/audio-volume-muted.png b/plugins/VOIP/gui/images/audio-volume-muted.png deleted file mode 100644 index 2ee846d70..000000000 Binary files a/plugins/VOIP/gui/images/audio-volume-muted.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-hold-22.png b/plugins/VOIP/gui/images/call-hold-22.png deleted file mode 100644 index d133bdc5f..000000000 Binary files a/plugins/VOIP/gui/images/call-hold-22.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-hold.png b/plugins/VOIP/gui/images/call-hold.png deleted file mode 100644 index 1c41abb7a..000000000 Binary files a/plugins/VOIP/gui/images/call-hold.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-start-22.png b/plugins/VOIP/gui/images/call-start-22.png deleted file mode 100644 index 9a0cf4ca6..000000000 Binary files a/plugins/VOIP/gui/images/call-start-22.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-start.png b/plugins/VOIP/gui/images/call-start.png deleted file mode 100644 index 04ef2f399..000000000 Binary files a/plugins/VOIP/gui/images/call-start.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-stop-22.png b/plugins/VOIP/gui/images/call-stop-22.png deleted file mode 100644 index 2307fe3e0..000000000 Binary files a/plugins/VOIP/gui/images/call-stop-22.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/call-stop.png b/plugins/VOIP/gui/images/call-stop.png deleted file mode 100644 index bce13e65d..000000000 Binary files a/plugins/VOIP/gui/images/call-stop.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/camera-off.png b/plugins/VOIP/gui/images/camera-off.png deleted file mode 100644 index c1721d492..000000000 Binary files a/plugins/VOIP/gui/images/camera-off.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/camera-on.png b/plugins/VOIP/gui/images/camera-on.png deleted file mode 100644 index e6c8bd9ff..000000000 Binary files a/plugins/VOIP/gui/images/camera-on.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/chat-bubble.png b/plugins/VOIP/gui/images/chat-bubble.png new file mode 100644 index 000000000..9b69b9863 Binary files /dev/null and b/plugins/VOIP/gui/images/chat-bubble.png differ diff --git a/plugins/VOIP/gui/images/filmcam-off.png b/plugins/VOIP/gui/images/filmcam-off.png new file mode 100644 index 000000000..f9585030c Binary files /dev/null and b/plugins/VOIP/gui/images/filmcam-off.png differ diff --git a/plugins/VOIP/gui/images/filmcam.png b/plugins/VOIP/gui/images/filmcam.png new file mode 100644 index 000000000..67dae9a59 Binary files /dev/null and b/plugins/VOIP/gui/images/filmcam.png differ diff --git a/plugins/VOIP/gui/images/fullscreen.png b/plugins/VOIP/gui/images/fullscreen.png new file mode 100644 index 000000000..fba08ff31 Binary files /dev/null and b/plugins/VOIP/gui/images/fullscreen.png differ diff --git a/plugins/VOIP/gui/images/fullscreen_arrows.png b/plugins/VOIP/gui/images/fullscreen_arrows.png new file mode 100644 index 000000000..0e5eba575 Binary files /dev/null and b/plugins/VOIP/gui/images/fullscreen_arrows.png differ diff --git a/plugins/VOIP/gui/images/microphone.png b/plugins/VOIP/gui/images/microphone.png new file mode 100644 index 000000000..08bc32458 Binary files /dev/null and b/plugins/VOIP/gui/images/microphone.png differ diff --git a/plugins/VOIP/gui/images/microphone_mute.png b/plugins/VOIP/gui/images/microphone_mute.png new file mode 100644 index 000000000..965d6998e Binary files /dev/null and b/plugins/VOIP/gui/images/microphone_mute.png differ diff --git a/plugins/VOIP/gui/images/phone.png b/plugins/VOIP/gui/images/phone.png new file mode 100644 index 000000000..9992fc719 Binary files /dev/null and b/plugins/VOIP/gui/images/phone.png differ diff --git a/plugins/VOIP/gui/images/phone_hangup.png b/plugins/VOIP/gui/images/phone_hangup.png new file mode 100644 index 000000000..9ee63a8cf Binary files /dev/null and b/plugins/VOIP/gui/images/phone_hangup.png differ diff --git a/plugins/VOIP/gui/images/speaker.png b/plugins/VOIP/gui/images/speaker.png new file mode 100644 index 000000000..f3fae8a69 Binary files /dev/null and b/plugins/VOIP/gui/images/speaker.png differ diff --git a/plugins/VOIP/gui/images/speaker_mute.png b/plugins/VOIP/gui/images/speaker_mute.png new file mode 100644 index 000000000..2671e0407 Binary files /dev/null and b/plugins/VOIP/gui/images/speaker_mute.png differ diff --git a/plugins/VOIP/gui/images/video-icon-off.png b/plugins/VOIP/gui/images/video-icon-off.png deleted file mode 100644 index 1a4c04840..000000000 Binary files a/plugins/VOIP/gui/images/video-icon-off.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/video-icon-on.png b/plugins/VOIP/gui/images/video-icon-on.png deleted file mode 100644 index 6c4618293..000000000 Binary files a/plugins/VOIP/gui/images/video-icon-on.png and /dev/null differ diff --git a/plugins/VOIP/gui/images/webcam.png b/plugins/VOIP/gui/images/webcam.png new file mode 100644 index 000000000..4388bb580 Binary files /dev/null and b/plugins/VOIP/gui/images/webcam.png differ