Skip to content

J
jami-client-windows
Commit 5e8c3822 authored by Nicolas Jager's avatar Nicolas Jager Committed by Edric Milaret
Browse files
Options

refreshing icons 

- icons used in this patch are in /images/icons.

- icon btnVideo renamed btnComBarVideo.

Change-Id: Ia7b94b4086f53befd3f06b17b2c2de7998da0771
Tuleap: #354
parent b47d7f0e
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 103 deletions
callwidget.cpp
View file @ 5e8c3822
......@@ -154,7 +154,7 @@ CallWidget::CallWidget(QWidget* parent) :
setupOutOfCallIM();
setupSmartListMenu();
connect(ui->smartList, &SmartList::btnVideoClicked, this, &CallWidget::on_btnvideo_clicked);
connect(ui->smartList, &SmartList::btnVideoClicked, this, &CallWidget::on_btnComBarVideo_clicked);
connect(RecentModel::instance().selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
......@@ -592,7 +592,7 @@ CallWidget::on_btnCall_clicked()
}
void
CallWidget::on_btnvideo_clicked()
CallWidget::on_btnComBarVideo_clicked()
{
if (not highLightedIndex_.isValid())
return;
......
callwidget.h
View file @ 5e8c3822
......@@ -62,7 +62,7 @@ public slots:
public slots:
void on_ringContactLineEdit_returnPressed();
void on_btnCall_clicked();
void on_btnvideo_clicked();
void on_btnComBarVideo_clicked();
void showIMOutOfCall(const QModelIndex& nodeIdx);
inline void on_entered(const QModelIndex& i){highLightedIndex_ = i;};
......
callwidget.ui
View file @ 5e8c3822
......@@ -217,12 +217,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/call/btn-call.svg</normaloff>:/images/call/btn-call.svg</iconset>
<normaloff>:/images/icons/ic_videocam_white.png</normaloff>:/images/icons/ic_videocam_white.png</iconset>
</property>
<property name="iconSize">
<size>
<width>30</width>
<height>30</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......@@ -660,6 +660,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>30</width>
......@@ -678,8 +684,8 @@
</property>
<property name="iconSize">
<size>
<width>30</width>
<height>25</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......@@ -791,12 +797,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/ic_arrow_back_white.svg</normaloff>:/images/ic_arrow_back_white.svg</iconset>
<normaloff>:/images/icons/ic_arrow_back_white_24dp.png</normaloff>:/images/icons/ic_arrow_back_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>30</width>
<height>30</height>
<width>18</width>
<height>18</height>
</size>
</property>
<property name="flat">
......@@ -879,7 +885,13 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/ic_content_copy_white.svg</normaloff>:/images/ic_content_copy_white.svg</iconset>
<normaloff>:/images/icons/ic_content_copy_white_24dp.png</normaloff>:/images/icons/ic_content_copy_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
</item>
......@@ -943,6 +955,15 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
......@@ -965,8 +986,8 @@
<widget class="QPushButton" name="sendButton">
<property name="minimumSize">
<size>
<width>36</width>
<height>36</height>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
......@@ -983,12 +1004,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/ic_send_white.svg</normaloff>:/images/ic_send_white.svg</iconset>
<normaloff>:/images/icons/ic_send_white_24dp.png</normaloff>:/images/icons/ic_send_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......@@ -1126,18 +1147,18 @@
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
<width>56</width>
<height>56</height>
</size>
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/call/btn-call.svg</normaloff>:/images/call/btn-call.svg</iconset>
<normaloff>:/images/icons/ic_done_white_24dp.png</normaloff>:/images/icons/ic_done_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>34</width>
<height>34</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -1168,8 +1189,8 @@
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
<width>56</width>
<height>56</height>
</size>
</property>
<property name="layoutDirection">
......@@ -1177,12 +1198,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/call/btn-ignore.svg</normaloff>:/images/call/btn-ignore.svg</iconset>
<normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>34</width>
<height>34</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -1317,8 +1338,8 @@
</property>
<property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
<width>56</width>
<height>56</height>
</size>
</property>
<property name="maximumSize">
......@@ -1338,12 +1359,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/call/btn-ignore.svg</normaloff>:/images/call/btn-ignore.svg</iconset>
<normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>34</width>
<height>34</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -1479,7 +1500,6 @@
<height>0</height>
</size>
</property>
<zorder>stackedWidget</zorder>
</widget>
</item>
</layout>
......
combar.cpp
View file @ 5e8c3822
......@@ -26,7 +26,7 @@ ComBar::ComBar(QWidget* parent) :
ui(new Ui::ComBar)
{
ui->setupUi(this);
connect(ui->btnvideo, &QPushButton::clicked , this , [=](){
connect(ui->btnComBarVideo, &QPushButton::clicked , this , [=](){
emit btnVideoClicked();
});
......
combar.ui
View file @ 5e8c3822
......@@ -49,9 +49,9 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnvideo">
<widget class="QPushButton" name="btnComBarVideo">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -68,20 +68,17 @@
<height>30</height>
</size>
</property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/hover-contact/btn-video.svg</normaloff>:/images/hover-contact/btn-video.svg</iconset>
<normaloff>:/images/icons/ic_videocam_white.png</normaloff>:/images/icons/ic_videocam_white.png</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......
instantmessagingwidget.ui
View file @ 5e8c3822
......@@ -47,8 +47,17 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>0</number>
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QLineEdit" name="messageEdit">
......@@ -70,14 +79,14 @@
<widget class="QPushButton" name="sendButton">
<property name="minimumSize">
<size>
<width>36</width>
<height>36</height>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>36</width>
<height>36</height>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="text">
......@@ -85,12 +94,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/ic_send_white.svg</normaloff>:/images/ic_send_white.svg</iconset>
<normaloff>:/images/icons/ic_send_white_24dp.png</normaloff>:/images/icons/ic_send_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......
ressources.qrc
View file @ 5e8c3822
......@@ -48,5 +48,23 @@
<file>images/ic_content_copy_white.svg</file>
<file>images/ic_voicemail_white.svg</file>
<file>images/ic_share_white.png</file>
<file>images/icons/ic_arrow_back_white_24dp.png</file>
<file>images/icons/ic_mic_off_white_24dp.png</file>
<file>images/icons/ic_call_end_white_24dp.png</file>
<file>images/icons/ic_person_add_white_24dp.png</file>
<file>images/icons/ic_call_white_24dp.png</file>
<file>images/icons/ic_search_white_24dp.png</file>
<file>images/icons/ic_content_copy_white_24dp.png</file>
<file>images/icons/ic_send_white_24dp.png</file>
<file>images/icons/ic_group_add_white_24dp.png</file>
<file>images/icons/ic_videocam_off_white_24dp.png</file>
<file>images/icons/ic_high_quality_white_24dp.png</file>
<file>images/icons/ic_pause_white_24dp.png</file>
<file>images/icons/ic_chat_white_24dp.png</file>
<file>images/icons/ic_done_white_24dp.png</file>
<file>images/icons/ic_close_white_24dp.png</file>
<file>images/icons/ic_call_transfer_white_24px.png</file>
<file>images/icons/ic_pause_white_100px.png</file>
<file>images/icons/ic_videocam_white.png</file>
</qresource>
</RCC>
stylesheet.css
View file @ 5e8c3822
QPushButton#btnCall{
background-color: #4caf50;
border-radius: 15px;
border:solid 1px;
}
QPushButton#acceptButton{
background-color: #4caf50;
border-radius: 32px;
border-radius: 28px;
border:solid 1px;
}
QPushButton#refuseButton, QPushButton#cancelButton{
background-color: #f44336;
border-radius: 32px;
border-radius: 28px;
border:solid 1px;
}
......@@ -156,12 +150,18 @@ QPushButton#btnvideo{
border:solid 1px;
}
QPushButton#sendButton:hover, QPushButton#btnvideo:hover{
QPushButton#btnCall, QPushButton#btnComBarVideo, QPushButton#sendButton{
background-color: #3AC0D2;
border-radius: 15px;
border:solid 1px;
}
QPushButton#btnCall:hover, QPushButton#sendButton:hover, QPushButton#btnComBarVideo:hover{
background-color: #4dc6d6;
}
QPushButton#sendButton:pressed, QPushButton#btnvideo:pressed{
background-color: #34acbd;
QPushButton#sendButton:pressed, QPushButton#btnCall:pressed, QPushButton#sendButton:pressed, QPushButton#btnComBarVideo:pressed{
background-color: #34acbd;
}
QScrollBar:vertical{
......
videooverlay.ui
View file @ 5e8c3822
......@@ -33,12 +33,6 @@
<height>100</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="font">
<font>
<stylestrategy>PreferAntialias</stylestrategy>
......@@ -54,10 +48,7 @@
<string notr="true"/>
</property>
<property name="pixmap">
<pixmap resource="ressources.qrc">:/images/ic_pause_white.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
<pixmap resource="ressources.qrc">:/images/icons/ic_pause_white_100px.png</pixmap>
</property>
</widget>
</item>
......@@ -100,12 +91,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-hangup.svg</normaloff>:/images/video-conf/btn-hangup.svg</iconset>
<normaloff>:/images/icons/ic_close_white_24dp.png</normaloff>:/images/icons/ic_close_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -132,12 +123,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-pause.svg</normaloff>:/images/video-conf/btn-pause.svg</iconset>
<normaloff>:/images/icons/ic_pause_white_24dp.png</normaloff>:/images/icons/ic_pause_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
......@@ -167,12 +158,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-chat.svg</normaloff>:/images/video-conf/btn-chat.svg</iconset>
<normaloff>:/images/icons/ic_chat_white_24dp.png</normaloff>:/images/icons/ic_chat_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -199,12 +190,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-add-contact-to-conf.svg</normaloff>:/images/video-conf/btn-add-contact-to-conf.svg</iconset>
<normaloff>:/images/icons/ic_person_add_white_24dp.png</normaloff>:/images/icons/ic_person_add_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -231,12 +222,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-transfer.svg</normaloff>:/images/video-conf/btn-transfer.svg</iconset>
<normaloff>:/images/icons/ic_call_transfer_white_24px.png</normaloff>:/images/icons/ic_call_transfer_white_24px.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -269,12 +260,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-nomic.svg</normaloff>:/images/video-conf/btn-nomic.svg</iconset>
<normaloff>:/images/icons/ic_mic_off_white_24dp.png</normaloff>:/images/icons/ic_mic_off_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
......@@ -310,12 +301,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-novideo.svg</normaloff>:/images/video-conf/btn-novideo.svg</iconset>
<normaloff>:/images/icons/ic_videocam_off_white_24dp.png</normaloff>:/images/icons/ic_videocam_off_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="checkable">
......@@ -352,8 +343,8 @@
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -380,12 +371,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/ic_high_quality_white.svg</normaloff>:/images/video-conf/ic_high_quality_white.svg</iconset>
<normaloff>:/images/icons/ic_videocam_off_white_24dp.png</normaloff>:/images/icons/ic_videocam_off_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -412,12 +403,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-join.svg</normaloff>:/images/video-conf/btn-join.svg</iconset>
<normaloff>:/images/icons/ic_group_add_white_24dp.png</normaloff>:/images/icons/ic_group_add_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>36</width>
<height>36</height>
<width>24</width>
<height>24</height>
</size>
</property>
</widget>
......@@ -508,12 +499,12 @@
</property>
<property name="icon">
<iconset resource="ressources.qrc">
<normaloff>:/images/video-conf/btn-add-contact-to-conf.svg</normaloff>:/images/video-conf/btn-add-contact-to-conf.svg</iconset>
<normaloff>:/images/icons/ic_person_add_white_24dp.png</normaloff>:/images/icons/ic_person_add_white_24dp.png</iconset>
</property>
<property name="iconSize">
<size>
<width>30</width>
<height>30</height>
<width>18</width>
<height>18</height>
</size>
</property>
</widget>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment