commit 1ddb38d506a76ae367c868e2b03ca46b3a9ddf21
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed Jan 20 11:11:49 2016 -0500
committer Edric Milaret <edric.ladent-milaret@savoirfairelinux.com> Fri Jan 22 17:05:31 2016 -0400
tree ea9b136ea312c40184984de8bc31c5054ac1fa01
parent 4913047f37e3cd9b4a12ed114621f7ab3c52e282

ui: update callwidget buttons

- buttons are .css and .ui based.

- .svg used as icons are set in .ui.

- .svg updated, filled circles removed.

- backgrounds and borders are set in .css.

- redundant and no-more-used code in callwidget.cpp/instantmessagingwidget.cpp removed.

Change-Id: I9c52801a49d503c3c6a7dc8df9ae02ff90bb6a67
Tuleap: #148

videooverlay.ui

diff --git a/videooverlay.ui b/videooverlay.ui
index 9301b00..4dd8f27 100644
--- a/videooverlay.ui
+++ b/videooverlay.ui
@@ -40,6 +40,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-hangup.svg</normaloff>:/images/video-conf/btn-hangup.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="0" column="0" alignment="Qt::AlignTop">
@@ -103,6 +113,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-join.svg</normaloff>:/images/video-conf/btn-join.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="2">
@@ -122,6 +142,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-pause.svg</normaloff>:/images/video-conf/btn-pause.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
@@ -150,6 +180,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-nomic.svg</normaloff>:/images/video-conf/btn-nomic.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
@@ -172,6 +212,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-chat.svg</normaloff>:/images/video-conf/btn-chat.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="11">
@@ -254,6 +304,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-novideo.svg</normaloff>:/images/video-conf/btn-novideo.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
@@ -289,6 +349,16 @@
      <property name="text">
       <string/>
      </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>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="7">
@@ -308,6 +378,16 @@
      <property name="text">
       <string/>
      </property>
+     <property name="icon">
+      <iconset resource="ressources.qrc">
+       <normaloff>:/images/video-conf/btn-transfer.svg</normaloff>:/images/video-conf/btn-transfer.svg</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="10">
@@ -327,10 +407,22 @@
      <property name="text">
       <string/>
      </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>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>36</width>
+       <height>36</height>
+      </size>
+     </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="ressources.qrc"/>
+ </resources>
  <connections/>
 </ui>