diff --git a/callwidget.cpp b/callwidget.cpp index b73a734901cb03c5c6f95dc3b54e44d66a8e5ff4..33661c69ee9e781fa6b559db42c3cd765e2a5392 100644 --- a/callwidget.cpp +++ b/callwidget.cpp @@ -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; diff --git a/callwidget.h b/callwidget.h index 9cc0e84328074c55f6ce2c13091e21f1b0d1a8d4..4e1d485f51caa5fbb9f95ec59a5df0371aa2dccb 100644 --- a/callwidget.h +++ b/callwidget.h @@ -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;}; diff --git a/callwidget.ui b/callwidget.ui index 271517a95462da4b9c1ee50673baaa402520827b..97ca074a2f93f7313deb82b0f8bc8e41429f6f89 100644 --- a/callwidget.ui +++ b/callwidget.ui @@ -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> diff --git a/combar.cpp b/combar.cpp index 23bf47e9c1ba0af5895aa696121fb007fbb59434..c864b3ad99b53a6cc0869bd1d65494ab17f8f635 100644 --- a/combar.cpp +++ b/combar.cpp @@ -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(); }); diff --git a/combar.ui b/combar.ui index 7e8f2b14b15fc85f7312111516087e0a68a675a6..b921ba2b233fa813a8ba6f11894da7fcbbcef2bf 100644 --- a/combar.ui +++ b/combar.ui @@ -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> diff --git a/images/icons/ic_arrow_back_white_24dp.png b/images/icons/ic_arrow_back_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ce5b878b0fa37a263da66cfe403868fef2d4357c Binary files /dev/null and b/images/icons/ic_arrow_back_white_24dp.png differ diff --git a/images/icons/ic_call_end_white_24dp.png b/images/icons/ic_call_end_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a4fe6889d159cac861cac4f885ae3ec28cd9ca44 Binary files /dev/null and b/images/icons/ic_call_end_white_24dp.png differ diff --git a/images/icons/ic_call_transfer_white_24px.png b/images/icons/ic_call_transfer_white_24px.png new file mode 100644 index 0000000000000000000000000000000000000000..ed68542c24cf6e16df683c78feaa1e39af1939ac Binary files /dev/null and b/images/icons/ic_call_transfer_white_24px.png differ diff --git a/images/icons/ic_call_white_24dp.png b/images/icons/ic_call_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ef45e933a99b720cc5f6127e6da22bc2fa679244 Binary files /dev/null and b/images/icons/ic_call_white_24dp.png differ diff --git a/images/icons/ic_chat_white_24dp.png b/images/icons/ic_chat_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ace0bef32ec67afbe5af73db991c704650d394bc Binary files /dev/null and b/images/icons/ic_chat_white_24dp.png differ diff --git a/images/icons/ic_clear_white_24dp.png b/images/icons/ic_clear_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b7c7ffd0e795ba76ed3a062566c9016448795f7a Binary files /dev/null and b/images/icons/ic_clear_white_24dp.png differ diff --git a/images/icons/ic_close_white_24dp.png b/images/icons/ic_close_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b7c7ffd0e795ba76ed3a062566c9016448795f7a Binary files /dev/null and b/images/icons/ic_close_white_24dp.png differ diff --git a/images/icons/ic_content_copy_white_24dp.png b/images/icons/ic_content_copy_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..537fd4e8b4444ac18d9d339f0f57badcf960454d Binary files /dev/null and b/images/icons/ic_content_copy_white_24dp.png differ diff --git a/images/icons/ic_done_white_24dp.png b/images/icons/ic_done_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3b2b65d26291575f2741d223cdf80facb436dc20 Binary files /dev/null and b/images/icons/ic_done_white_24dp.png differ diff --git a/images/icons/ic_group_add_white_24dp.png b/images/icons/ic_group_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a769931c4236a87d4b19f944f56af54faa0eb94e Binary files /dev/null and b/images/icons/ic_group_add_white_24dp.png differ diff --git a/images/icons/ic_high_quality_white_24dp.png b/images/icons/ic_high_quality_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6d2d87d21b5f22f29f5dc56f5317e05bf59b4bea Binary files /dev/null and b/images/icons/ic_high_quality_white_24dp.png differ diff --git a/images/icons/ic_mic_off_white_24dp.png b/images/icons/ic_mic_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bb7915f33df69c09fbc22cb39e913205a6f06004 Binary files /dev/null and b/images/icons/ic_mic_off_white_24dp.png differ diff --git a/images/icons/ic_pause_white_100px.png b/images/icons/ic_pause_white_100px.png new file mode 100644 index 0000000000000000000000000000000000000000..fcf21884420cb152d4bf9abf0ecfa17f977e2b4e Binary files /dev/null and b/images/icons/ic_pause_white_100px.png differ diff --git a/images/icons/ic_pause_white_24dp.png b/images/icons/ic_pause_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f49aed757118a941b567629ec217cde1aaf257e8 Binary files /dev/null and b/images/icons/ic_pause_white_24dp.png differ diff --git a/images/icons/ic_person_add_white_24dp.png b/images/icons/ic_person_add_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7c289d4971337ec3693780d13b26c146c58a5f Binary files /dev/null and b/images/icons/ic_person_add_white_24dp.png differ diff --git a/images/icons/ic_search_white_24dp.png b/images/icons/ic_search_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bfc3e39394246b221f7d4617aa5600a6406aa7c7 Binary files /dev/null and b/images/icons/ic_search_white_24dp.png differ diff --git a/images/icons/ic_send_white_24dp.png b/images/icons/ic_send_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ef59e77678dbd3f5d866bca9058b6e90cb8d6098 Binary files /dev/null and b/images/icons/ic_send_white_24dp.png differ diff --git a/images/icons/ic_videocam_off_white_24dp.png b/images/icons/ic_videocam_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5d540589b4a4f9e22a8c4f1f292e12ec75ad443b Binary files /dev/null and b/images/icons/ic_videocam_off_white_24dp.png differ diff --git a/images/icons/ic_videocam_white.png b/images/icons/ic_videocam_white.png new file mode 100644 index 0000000000000000000000000000000000000000..44c28e2f2830f927973beaa3a143ddfe439f20ed Binary files /dev/null and b/images/icons/ic_videocam_white.png differ diff --git a/instantmessagingwidget.ui b/instantmessagingwidget.ui index 2db326c6a061f7398ff75c22f5fe4c7cc3f2240c..8b12facd2042c5fc6ddf0f62248eb30a7521a487 100644 --- a/instantmessagingwidget.ui +++ b/instantmessagingwidget.ui @@ -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> diff --git a/ressources.qrc b/ressources.qrc index d2769bfc9fa17eea415a47da0b5b8db0902e3740..48efb6a1dcdc5487b099dbd0a4174180aaeabe77 100644 --- a/ressources.qrc +++ b/ressources.qrc @@ -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> diff --git a/stylesheet.css b/stylesheet.css index 5b05c9509c8ac16704271b8222e9eede86065e2a..89213937d075f3850fd03bf8d7bc4d1f28dad151 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1,18 +1,12 @@ -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{ diff --git a/videooverlay.ui b/videooverlay.ui index 0b852de147077be23e4db9a8eb7b857781aee7ea..c1567dabf0a7d24a333865ce28525193e43e12a1 100644 --- a/videooverlay.ui +++ b/videooverlay.ui @@ -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>