From 5e8c38223933f18bb06b6efb01d0844c61e301b0 Mon Sep 17 00:00:00 2001
From: Nicolas Jager <nicolas.jager@savoirfairelinux.com>
Date: Fri, 5 Feb 2016 17:01:49 -0500
Subject: [PATCH] refreshing icons
- icons used in this patch are in /images/icons.
- icon btnVideo renamed btnComBarVideo.
Change-Id: Ia7b94b4086f53befd3f06b17b2c2de7998da0771
Tuleap: #354
---
callwidget.cpp | 4 +-
callwidget.h | 2 +-
callwidget.ui | 80 ++++++++++++-------
combar.cpp | 2 +-
combar.ui | 13 ++-
images/icons/ic_arrow_back_white_24dp.png | Bin 0 -> 151 bytes
images/icons/ic_call_end_white_24dp.png | Bin 0 -> 389 bytes
images/icons/ic_call_transfer_white_24px.png | Bin 0 -> 703 bytes
images/icons/ic_call_white_24dp.png | Bin 0 -> 420 bytes
images/icons/ic_chat_white_24dp.png | Bin 0 -> 205 bytes
images/icons/ic_clear_white_24dp.png | Bin 0 -> 257 bytes
images/icons/ic_close_white_24dp.png | Bin 0 -> 257 bytes
images/icons/ic_content_copy_white_24dp.png | Bin 0 -> 188 bytes
images/icons/ic_done_white_24dp.png | Bin 0 -> 199 bytes
images/icons/ic_group_add_white_24dp.png | Bin 0 -> 384 bytes
images/icons/ic_high_quality_white_24dp.png | Bin 0 -> 218 bytes
images/icons/ic_mic_off_white_24dp.png | Bin 0 -> 484 bytes
images/icons/ic_pause_white_100px.png | Bin 0 -> 437 bytes
images/icons/ic_pause_white_24dp.png | Bin 0 -> 90 bytes
images/icons/ic_person_add_white_24dp.png | Bin 0 -> 329 bytes
images/icons/ic_search_white_24dp.png | Bin 0 -> 465 bytes
images/icons/ic_send_white_24dp.png | Bin 0 -> 344 bytes
images/icons/ic_videocam_off_white_24dp.png | Bin 0 -> 296 bytes
images/icons/ic_videocam_white.png | Bin 0 -> 234 bytes
instantmessagingwidget.ui | 25 ++++--
ressources.qrc | 18 +++++
stylesheet.css | 22 ++---
videooverlay.ui | 75 ++++++++---------
28 files changed, 138 insertions(+), 103 deletions(-)
create mode 100644 images/icons/ic_arrow_back_white_24dp.png
create mode 100644 images/icons/ic_call_end_white_24dp.png
create mode 100644 images/icons/ic_call_transfer_white_24px.png
create mode 100644 images/icons/ic_call_white_24dp.png
create mode 100644 images/icons/ic_chat_white_24dp.png
create mode 100644 images/icons/ic_clear_white_24dp.png
create mode 100644 images/icons/ic_close_white_24dp.png
create mode 100644 images/icons/ic_content_copy_white_24dp.png
create mode 100644 images/icons/ic_done_white_24dp.png
create mode 100644 images/icons/ic_group_add_white_24dp.png
create mode 100644 images/icons/ic_high_quality_white_24dp.png
create mode 100644 images/icons/ic_mic_off_white_24dp.png
create mode 100644 images/icons/ic_pause_white_100px.png
create mode 100644 images/icons/ic_pause_white_24dp.png
create mode 100644 images/icons/ic_person_add_white_24dp.png
create mode 100644 images/icons/ic_search_white_24dp.png
create mode 100644 images/icons/ic_send_white_24dp.png
create mode 100644 images/icons/ic_videocam_off_white_24dp.png
create mode 100644 images/icons/ic_videocam_white.png
diff --git a/callwidget.cpp b/callwidget.cpp
index b73a734..33661c6 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 9cc0e84..4e1d485 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 271517a..97ca074 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 23bf47e..c864b3a 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 7e8f2b1..b921ba2 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
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBah@)YArXh)UOdRz;K1W@
z@uiop&j+PtDQgvWsjrVr6yyIdY9KGf>9D+q=Y5Uvy`O2H&&{_qJa6;)%>K{vGoJq!
z*f2liz~tlVdO}x^_$-<h;SnOV`iak*PnAOL3?;i5<F;9(tudQAlYxPO!PC{xWt~$(
F698=LI7<Kk
literal 0
HcmV?d00001
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
GIT binary patch
literal 389
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZtsKAtX)Ar*{o&l-9&CCVKC
z_<wP?`4w(~>?}cJ=7lxPyn7oKbu6k<RBTBQaP@W;aCLTZHo0+4fJN6-#O>`)j#l60
zd{@mEF09$JdG}`NrsuzJ*UKBW&Oe!AB$zrQ)y#6S&r~+~wWceAmK|a9Uecj(S8d1I
z`IdbvKSt}z7<$i_cbNFN!K!Z4&Ga+e3uZj&S`cg0_=>HksPUe*>L;Jcs(r3YOuH>2
zmz@Y+)OOD@GyOo)-11x1O70>rH*q`;$#~zZWGH*$gGah~NBiANH*HtWKVakgBbedU
znHt8f&@W9)RoWVfyiUvu6il31Umaq87yF&(4rk`P!tB$+8+xNdCp8&7^0*<=QOTs!
zWiscz;K7*|i3}e%I{M9hC%AC(hDZlRyX6r_uDus@RM$$G&~Q57=f3NViYFC!t4xra
tme6k7CLqg^%VyBP$dk}e&sf9se8%y!qK{WGGB7YOc)I$ztaD0e0s!;aoi+df
literal 0
HcmV?d00001
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
GIT binary patch
literal 703
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIY)RhkE)4%caKYZ?lNlHo
zI14-?iy0VruY)k7lg8`{1_lQ95>H=O_6JPdLTrql>soyo7?^xKT^vI)?!BG4H(SI}
z;@Et_&V&3MjyyLy=FAhj<-+RPX{NcQ$CKsaHK$7&D|KAn9I<y;bHu5sw|7B$x|ZvP
zaF;-SLDt^Rq@K=yI(H5jo~b)icjxUPyMn8C?SB6$dsdsC=D#X*b=cY<E(^vjong`z
zabXQRKCG^~e|nA@Q-WtuywiN%V>9OOWrz^|c$c4l{#iNYYOV;iowG6-_lYwm^z77r
z*|TKoBKL%Ihtp4F-+RU($ok>d;pYwIAD^-avVOR9I9(-_{U?9nUX2EEIlJ}-yZf`5
z+f{u<SwCDkoW6I-Tg^lEQ?{%WU`Rfr?fJIFu6xqHiWYmNl}|b9{V&b834eT>^Vb(6
zgNL7=G_tmze>$Ob(M;9^CC48p_Z({1DVxdgt8wRq584MZ{rBJ8@j-UKt@NG6GfSoJ
zo>8uOV9H_B&z<jRvWe+UIfGC72Wf_RM_bQVXa7CHR59n``u(@ln+1<+^n|``xweVH
zj-fe}=?3SYO$zTqaz)lzExYtni*e27TM7q+3buF&@IIK$YRLa)wa^iZ57(Q1@bFas
z%3=J*kX_AKcrlRw^8v&D+G|M#cbzUg)ni<IATA+$mT{Z@5mWXf`3YLjc6s)j3+Fdn
zT*TnR!E&G{doIVkJ?FDU8@9XlA7OR(WvF2}X57ZUK-#qM(#5%9rrbWudGCuhFeFKT
zXkohY_UJn=_x6=y4(uoR9yq2lt||WTcY>0>y#xCRg97FsQJxH|-HtUxAK1O7e$fo0
z96nXqDO;j1>3Q;cG9OG|yu^RfImzTGa1391DerP#s3=)*jsyb(1B0ilpUXO@geCy%
CX)JsI
literal 0
HcmV?d00001
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
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZts*`6+rArYK!5AM$jPLw(R
z@cnHu9SH+(_3ciAN!ogaIwIV$*-a09mU@>>Uo;_fj!JnzjLy<-4!@<&-s=xMlXH5x
zQq?<4;pD@|1vW=2?q&S@b8g!6iO-(-1S+N6&{e&usG>VXR;flTrIpXlGV-C+{LsjS
zjpw~1A4=Qhr?gtxsc$-DXJ;QVg_rAx?Q~wT9m;DDcdaQnbH8fOBw41mubQWYEZ<4K
z_#AcZhsz>=*KZY$kJfHFsJgLu&ZYxqos%{-Jno5@yl2w^tJ)-Yi_}Jbl~t#hPMdU;
z-V70|IAyz0?EDl~EfpuTCr6XJbTXr^cx<^5!o?W7;HWs?jl^Deoh%`XS1P+g3V$&(
z3TAGfVqzy#%GP({wK<d0A17ZX_ufXe)HyB=M?7YUh~DCv^SQ61{=yTDf}=M~c;!CK
zlS{t1MWf)9gbDYy9S`hHw7X<3rKv<dP!zQjo>Zo6Z82}darb?n=Bn9u?nn$TE?!p0
Z=s77q>`q0569WSSgQu&X%Q~loCIEZ{tuz1t
literal 0
HcmV?d00001
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
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBQ#@T9Ln02py&TEs;2_ZQ
z(2lq7rGwDvg948QpSrf3+2d0Zx#%^+|LJFxlBzFGSahgiwe&>=?x(^f7oy}90vw9B
z@^4wy@VU`bw1NK&n+wy${U;boA2hGeNR*$*xRK%SB>8&RdX@s?1@$M{?(kTc1r#-k
zaq<^vFjw-QaIJpwhcn>`KZE*y<~4uVK73MovWLSmzq&x1uT*av!`<&n3=9kmp00i_
I>zopr0A!#`<p2Nx
literal 0
HcmV?d00001
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
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBCp=voLn02po#xGT*no$X
z)iR}Sxp$Tmf94E5F4bOVotvi?9nH@@->^YmC^Iwj=j{uEFRm_653`c~$LTV+X(mSw
z8*5{^QnL{MhYQ?o=a=>*wfFy;xJvZs4;RB-k6m3P){9*Ik=@E|7wGe@LQrto;zOeI
zweEcEJS1N)aa#6=%ftTtu?3$y_Qm;KG0)}PcilW!@Lt$6*NWK7VGlq1M)#HnKCynj
zC-d%y=f1DI)(32O_5Zcs#t5<XXZKXFzRpXJmK7J?w{+>#<DZxkP2w$ny=0xqz`(%Z
M>FVdQ&MBb@0ESC#XaE2J
literal 0
HcmV?d00001
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
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBCp=voLn02po#xGT*no$X
z)iR}Sxp$Tmf94E5F4bOVotvi?9nH@@->^YmC^Iwj=j{uEFRm_653`c~$LTV+X(mSw
z8*5{^QnL{MhYQ?o=a=>*wfFy;xJvZs4;RB-k6m3P){9*Ik=@E|7wGe@LQrto;zOeI
zweEcEJS1N)aa#6=%ftTtu?3$y_Qm;KG0)}PcilW!@Lt$6*NWK7VGlq1M)#HnKCynj
zC-d%y=f1DI)(32O_5Zcs#t5<XXZKXFzRpXJmK7J?w{+>#<DZxkP2w$ny=0xqz`(%Z
M>FVdQ&MBb@0ESC#XaE2J
literal 0
HcmV?d00001
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
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB&7LlfArXh)UU%ebFyL{y
zIM1!>_boY}CA<F1Ezt1Xz@3^l-zI~@MDwpkN|@ETid*kllGwv$aDTbku>F8-5@Vgh
z266S?9F|4Z2kV@9918RsvY4wREOHzYUi6zXv2X||I5ac_^fE9q1wE?y`PrI5muJe#
qc1!8*zu(r&>^r`2#_f7F@pe9!%}D}B7cnp}FnGH9xvX<aXaWH5mO*s@
literal 0
HcmV?d00001
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
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBeV#6kArY-_FYo4UP!MTN
zwDLawapw%#?46B|e@HyIA<*0)`dz~C`<I$}rh^i5{gzjkOBfdZWNvu+NkP?So}k7Y
z`6>VP_t#H#@0H}89M7=ke5cL6Ly!9MUb=j{dpPd6Fy|L0|7!0okNy-p_4EtPwUAdo
z@>5~s<hr%f6Fzjdn8>S0?3teMQSacBQma@-YsSkBbA-2_I*`r4z`)??>gTe~DWM4f
DC>~Gp
literal 0
HcmV?d00001
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
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZts?w&4=Ar*{oCmVV(2a32Z
zFG%9Jl@+kYWy%Ytn4W7<JW`h;GLN{uxgzQzrm#+7L7A1{)RLr3VUJx$5?UUMtpCB&
ze{zqK!msmh-~H`BEFkp9+(wSyHEWB6TIb3jg$Z*$J}t{*`jp;jrgvWF#HKSEcW<(~
z-da+rH05j5%bq4Fsok6MH0LS_ggA2dR!4?UJ*OeD=;GwkYj5jTD!4uNyJou7m}^zW
zn-ja%mbe`>S-+%n=A^G~FI^_|YDYg|oi3Id8TO;hdh>ywUA1zODwPUF{{oiR?3x>x
zaPA4~GWnnUoLVj>9WM>ME-5Z^bW#19HQCl|O;crGg>!p~Wy-nATGl<qK9=(pmiWyt
z{IXK`)KMOJ1|ADV8Fh_|D*C=&MWqb~beA@)iAi`Ev+mm5cSg|{jyi>}<MO+HT1?{N
pyFCXqW;pCQz`f@HchM8}bS}m8j*DI&7#J8BJYD@<);T3K0RV)^q1XTb
literal 0
HcmV?d00001
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
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB3q4&NLn02po#xHeV!-22
z%u$+WP~pRG67c#UTj2NnZU3U!d>st)!*4yg$e-yVb3D?~_w<24HLF)OzvgZJBFU;N
zb!1CIfM8E%qmW*~!J3QzI{1$&ty6iy)#aPARO^TSw=D`AcXxAsdmdXb)!VFQ*_7EQ
zrms^7SbNF6JL!5y$AufAmw$81{aoyOtv7tR634c)@28jV+uzr7oWFg7?|TdWr|h?u
X)mN6(&wtCnz`)??>gTe~DWM4fO!!(F
literal 0
HcmV?d00001
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
GIT binary patch
literal 484
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZtst36#DLn;{GUfZ7)94N#7
z!Fr~~qK%V}*(dA#V%gWkpJ2{@&@pgjNr7<T2i_W9bMdKZn>~D%UTn(K%Un9yne!w6
z-yJ6wnzSF*XSeG3TetkaZ6p78IX?BXf&b=aL~qQ?%6hSIn%XtDHPdr$&F|N{!Wdh-
zcjo-9xmGhKUi;&4UA!l~Lv*LkdHyeo&TCGm8rWYjJ|`5s(<jNHMdE}Sn@dNZqpg72
zsz!@I{v(}L3Vv6Z3m3_C2p2Ax)WJN}MW#cb+ER&!<=1SPK>j~0<(Kz(w^>ZR_P#m3
zFhSbJ_p^18%PZpzqU>P@Pn*~;@YutY|LB0QLE*3WHD}x!BR(+O^f8As_FtO(+3g9Z
ztn&s5wo6Zc#{PQ0Aob>fBS+rx6dtQyZ~CYq``dw8kBzgtw;AUbs&Xu`V_);CrQ?dm
zg>7s<URBu!UJ~bF+*9gpzP9A<w@!|W8ef-)e@j1pqD@w_Qi)~By)V9YJ)h;ZIF`&S
zIM2>*T;d*mK5S-&OZ7!w2JcHhH3T?2%<Dtr^aQ^;OjyBU<Wjf$btBV7dl7}X@6Ml-
pWtz~jZ}Ugn74HQ<)HBvIH0C}tIBj!4h=GBD!PC{xWt~$(69C`#&p7}9
literal 0
HcmV?d00001
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
GIT binary patch
literal 437
zcmeAS@N?(olHy`uVBq!ia0y~yU^oH79Bd2>3~M9S&0}C-U`z6LcVYMsf(!O8pUl9(
zz**oCS<Jw|dmV%soit`wFfcH%mw5WRvOi$r7Gl!=R@ph9fq~J<)5S5Q;?~<MjhqYy
z9L$cF|Cak5*SN8pS80zi13vIa`!?Iwx0jpMHrDq)c5iTSP*4yM;NW0kVPaxzY;a&`
zBrL=LR*9k!QwVAvvMLNAxUC3Pm_m<OP#g$S3c^Tk25~_cB81QL2)P4s;ti%84@4ij
Q*MbB+UHx3vIVCg!0GBCFRsaA1
literal 0
HcmV?d00001
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
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-Mg|53hWg4QS_}*fOeH~n!3+##lh0Z(Ffa&v
qx;TbZFeWb$dhq|i|HO>oD~t?n0_G=g2b}K*Y4UXSb6Mw<&;$Tw#~1$q
literal 0
HcmV?d00001
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
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZts0-i38Ar*{oFZp{Nc93!Z
zSdv=Jad(=Y$}_&E>cYkDo8H};q*KLwaOt}x97<IU+fJ(TbY0S$lWu0jG1LB}z6jUn
zeZPMmIODRgtkp>+MI>kS(<Mh-p1GRbZLs_wobqKi6Pr!obthq?guazqxD^i0QJTgq
zxh<{kKzyk~<Jze*H<Ge9vpe*yT`J?T(R3oSAy;r$vhjmc&lmf3?qc|*v*PtcX3Yhi
zJgs~p!L@r>E_Bb_m=v6Q(&hf%9~19#AK+_HUbo|6qp7O>Rj+GzjGs+%)|_Cl>_FH#
zQ+2TeJLJUoJiM*_{L3r`<+zMn#?J8%di-yFIk=MF;L+@DwT30k<sQ3AnN=s<yW3!(
kDZuda8w-a6LmgxJo||({saKXWFfcH9y85}Sb4q9e0Fz&d3;+NC
literal 0
HcmV?d00001
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
GIT binary patch
literal 465
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZtsGdx`!Ln1ie9`yH$4wPtr
zc;Cg@gzwFb&iZA&76KC+9$AUpJr=sy?QWCs(cBKDt1er3EOGRgkHReAf<*8&G2
z{^#4$15SMQaCY|Gc)(D1*OMnDnMFtT{1d(Q!_S_7&8vLFW0vzR7q5Br<B+mqu39Kh
zvdyC}I}+w*x=EzA@#=lNH6@hgxrM*ZE9Pl09?a2_%eJ^L5iTFH<7i}{PF=!0iR%m@
zFB0B~wzK;5yVf?P&RLaI(6cjuA$*4O(FLuM;S959NFQC$Ju{49^9=E$3degi8ibzt
z8lEs*%(bAUGMs1E3`tgl_R3J6Su=Q9H?(GIvANIiW-aK=)L{E;;r)xnbk6#&!_3Q^
zU6~CI8b9;f7;$vx(nWSN7PP($47NE}V5Re#Im_npoE03WwtQT7BW0S9>a!b<r1aCh
zjv9E*o*+}aKuM$cRD!MFj6*lW4c8R-+m~PY!hLUE*P>I3=6gOIvtDnK8E{qJ<ijhk
zM&>=cf)eEO!!<XwZ(l63;&HAv>#K^HK?&me!CY@1q<A&w)}5ZhCpojN?Vr0nBk#FC
WhfPINcQP<AFnGH9xvX<aXaWE!=*I^D
literal 0
HcmV?d00001
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
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZts@}4e^Ar*{ouLb%Ya*$wn
zc(8!MvSG%H-tC-Q?m3*YY<c8(D{i67$D?W{yKa^|vO9U+I^J4)|89lPf7Bna#qi}+
zr2Z&=aOitYf%|#x=vy@m2WHx`w#OW>crP+BLF&h!!UwjZs=0OvJYp7Uj4lSeJqNdy
z$n6l26!c+Gn!(^=z}a&!i>uF=!Bm~AjECvML8Sv-%U7SDwUk3F<I#bVX=~IUoMMYs
zIW^<^>lGR=(-<E8W&6e=#c$)+@H@U?)`3jFMbB63*LbLCX}&z}@=Y?iUFJsNJef@u
zZVFOI|6jONZ@x3kb-}jPO0r8A2%h$H32eAAUv7qu$zT6?7r}-OB?dv)SXpnaTQSq`
yPv}_G_$Brrv+=vjOclwK`yMgcn?GQyVLa=<gI(=&^IrxA1_n=8KbLh*2~7ZVB8*u8
literal 0
HcmV?d00001
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
GIT binary patch
literal 296
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsB?>$`{Ln02py=KeT<RH-Y
z(6T9NB|AgD^BzI<X6_YRud#8&JlbsVNbimOX`iGs`(#<~2Rj(Ltd!?+zj8w5xjciE
zA(QDnPr(xxyo7(w7no~OD5O&0#=mvq0Y38?(g7{Zf8TsHYj~lqy;Rmf)ZxYFUz_DQ
z6u$g?+A#gX^JIppHy&lN*?lf-n0(=RG9&xK^T(OX7H#<-dYWN@Yu<k`83%!ld>1;q
zSstifW0q@TE)cS5Xnw%7hDCmX&}{vKoD!UI3@?_km>VenXyi;}XOla`C(^e2(DmXy
zZ0=3JXPvsBk|Y@@=qXhGrt?V$7rWQe8P$x_11)W*nk<;jz`(%Z>FVdQ&MBb@0L4Xc
A(f|Me
literal 0
HcmV?d00001
diff --git a/images/icons/ic_videocam_white.png b/images/icons/ic_videocam_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..44c28e2f2830f927973beaa3a143ddfe439f20ed
GIT binary patch
literal 234
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BZ1i+-45?szd&7|Huz`R}
zVCXs1qNL^n>}Pm;{0uag3!TVd7XDE$U0%1OU`y5)6D1`jrAyw^+g3@vvbqv>ynmke
z)vqUC-_KsK@YOrc=bPDnISThFIXrV|IMc~6Q<%|6ohikS<-{DB36_Ei#Yzs(S{lx9
zGI9ziI5hk)X!~DkGTEXoN9KaXp;;=|7OZuh7<y~T|2=&#SG~KldxO=LQt^LQ&o^uD
m-N4Ag0n)<2$RuJG|K`QJx(|o>yBQc57(8A5T-G@yGywo(w_QR2
literal 0
HcmV?d00001
diff --git a/instantmessagingwidget.ui b/instantmessagingwidget.ui
index 2db326c..8b12fac 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 d2769bf..48efb6a 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 5b05c95..8921393 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 0b852de..c1567da 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>
--
GitLab