diff --git a/callwidget.cpp b/callwidget.cpp index ba6cba06b5d90419ad6168d124af560a398218a5..d5ea26f52aa20b9652c10d6fde44bf925e938673 100644 --- a/callwidget.cpp +++ b/callwidget.cpp @@ -75,11 +75,6 @@ CallWidget::CallWidget(QWidget* parent) : ui->ringLogo->setPixmap(logo.scaledToHeight(100, Qt::SmoothTransformation)); ui->ringLogo->setAlignment(Qt::AlignHCenter); - QPixmap sendPixmap(":/images/ic_send_white.svg"); - QIcon sendIcon(sendPixmap); - ui->sendButton->setIcon(sendIcon); - ui->sendButton->setIconSize(sendPixmap.rect().size()); - GlobalInstances::setPixmapManipulator(std::unique_ptr(new Interfaces::PixbufManipulator())); try { diff --git a/callwidget.ui b/callwidget.ui index 39ccc20b803a73794d684c59562f675c837f9068..0bbf9350e2145bd2b099f2dd12ba0079e93bad98 100644 --- a/callwidget.ui +++ b/callwidget.ui @@ -215,6 +215,16 @@ + + + :/images/call/btn-call.svg:/images/call/btn-call.svg + + + + 30 + 30 + + @@ -463,7 +473,7 @@ 0 - + 0 @@ -698,6 +708,16 @@ + + + :/images/ic_arrow_back_white.svg:/images/ic_arrow_back_white.svg + + + + 30 + 30 + + false @@ -845,9 +865,22 @@ 36 + + send message + + + + :/images/ic_send_white.svg:/images/ic_send_white.svg + + + + 36 + 36 + + @@ -983,8 +1016,18 @@ - 63 - 63 + 64 + 64 + + + + + :/images/call/btn-call.svg:/images/call/btn-call.svg + + + + 34 + 34 @@ -1015,19 +1058,23 @@ - 63 - 63 - - - - - 63 - 63 + 64 + 64 Qt::RightToLeft + + + :/images/call/btn-ignore.svg:/images/call/btn-ignore.svg + + + + 34 + 34 + + @@ -1160,19 +1207,35 @@ - 63 - 63 + 64 + 64 + + + + + 64 + 64 - 63 - 63 + 64 + 64 Qt::LeftToRight + + + :/images/call/btn-ignore.svg:/images/call/btn-ignore.svg + + + + 34 + 34 + + diff --git a/combar.ui b/combar.ui index bdbb20241ebc1fb7d3ab3956ff48b29a5b768c21..e8f7e49cb3515487bc2a52e21a508ba5c7c5e64d 100644 --- a/combar.ui +++ b/combar.ui @@ -58,10 +58,22 @@ + + + :/images/hover-contact/btn-video.svg:/images/hover-contact/btn-video.svg + + + + 20 + 20 + + - + + + diff --git a/images/call/btn-call.svg b/images/call/btn-call.svg index 708014f2f452b4ebaed269f00c32a638604f3633..82fc3da1784d22a484b57b3deb2000cc2d4e9961 100644 --- a/images/call/btn-call.svg +++ b/images/call/btn-call.svg @@ -22,7 +22,7 @@ sodipodi:docname="btn-call.svg">image/svg+xml - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/hover-contact/btn-video.svg b/images/hover-contact/btn-video.svg index 2dcfdc64d2f11a31553c4fbe77ae3ca0abf4c7be..b60be7823fa0324f70fd15a0734d7f2a275d12ec 100644 --- a/images/hover-contact/btn-video.svg +++ b/images/hover-contact/btn-video.svg @@ -1,15 +1,51 @@ - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-add-contact-to-conf.svg b/images/video-conf/btn-add-contact-to-conf.svg index 885c0ea84d9b38ee9a9d692b89c6de186e54f112..b06fb431f3606b28ff806120be7c4092014805a7 100644 --- a/images/video-conf/btn-add-contact-to-conf.svg +++ b/images/video-conf/btn-add-contact-to-conf.svg @@ -1,20 +1,55 @@ - - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-chat.svg b/images/video-conf/btn-chat.svg index 7a2326180ffc1826f7c61c7c883fbb7ccc0d7ab4..a1c06895f105806206a28db632aab4314e941afb 100644 --- a/images/video-conf/btn-chat.svg +++ b/images/video-conf/btn-chat.svg @@ -1,26 +1,49 @@ - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-hangup.svg b/images/video-conf/btn-hangup.svg index 8d719da1f3590fdc3ab4c91d129af6d05583e3d4..9228f25143f7a1ce07ed6dcf84b98fec372638da 100644 --- a/images/video-conf/btn-hangup.svg +++ b/images/video-conf/btn-hangup.svg @@ -1,29 +1,49 @@ - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-join.svg b/images/video-conf/btn-join.svg index 9c48b0f021092b75604bf0306dfee3181615e7df..8a23ea028b1425f0eec910a997086dc22b436ee1 100644 --- a/images/video-conf/btn-join.svg +++ b/images/video-conf/btn-join.svg @@ -24,29 +24,25 @@ rdf:about="">image/svg+xml - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-novideo.svg b/images/video-conf/btn-novideo.svg index a007c6a82e5ba3d558dd0a5e16c95a2a3033b868..f883920d70fa4c33083be5f3f7fde856aa5bfe19 100644 --- a/images/video-conf/btn-novideo.svg +++ b/images/video-conf/btn-novideo.svg @@ -1,17 +1,52 @@ - - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-pause.svg b/images/video-conf/btn-pause.svg index bdbebaf11925bef63284f6ad04ea680635e467cf..62cf6d168666f430d9a608f0f44dbb800618cc52 100644 --- a/images/video-conf/btn-pause.svg +++ b/images/video-conf/btn-pause.svg @@ -1,14 +1,52 @@ - - - - - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/images/video-conf/btn-transfer.svg b/images/video-conf/btn-transfer.svg index c2dbfa972f1b87e9d794d2b98c672c21c5c09b6b..fccbe79cfeda762b51e75d13530ffd873fd1bc55 100644 --- a/images/video-conf/btn-transfer.svg +++ b/images/video-conf/btn-transfer.svg @@ -24,28 +24,25 @@ rdf:about="">image/svg+xmlsetupUi(this); - QPixmap sendPixmap(":/images/ic_send_white.svg"); - QIcon sendIcon(sendPixmap); - ui->sendButton->setIcon(sendIcon); - ui->sendButton->setIconSize(sendPixmap.rect().size()); - this->hide(); imDelegate_ = new ImDelegate(); @@ -87,12 +82,10 @@ InstantMessagingWidget::setMediaText(Call *call) textMedia = call->addOutgoingMedia(); } if (textMedia) { - connect(ui->listMessageView->model(), - SIGNAL(rowsInserted(const QModelIndex&, int, int)), - ui->listMessageView, SLOT(scrollToBottom())); ui->listMessageView->setModel( textMedia->recording()-> instantMessagingModel()); + ui->listMessageView->scrollToBottom(); connect(ui->messageEdit, &QLineEdit::returnPressed, [=]() { if (not ui->messageEdit->text().trimmed().isEmpty()) { @@ -100,6 +93,7 @@ InstantMessagingWidget::setMediaText(Call *call) messages["text/plain"] = ui->messageEdit->text(); textMedia->send(messages); ui->messageEdit->clear(); + ui->listMessageView->scrollToBottom(); } }); } @@ -172,5 +166,6 @@ InstantMessagingWidget::onMsgReceived(const QMap& message) GlobalSystemTray::instance().showMessage("Ring: Message Received", message["text/plain"]); QApplication::alert(this, 5000); } + ui->listMessageView->scrollToBottom(); this->show(); } diff --git a/instantmessagingwidget.ui b/instantmessagingwidget.ui index 06d61ffdeb50fc83003aeec5bcf75613ab99402a..2db326c6a061f7398ff75c22f5fe4c7cc3f2240c 100644 --- a/instantmessagingwidget.ui +++ b/instantmessagingwidget.ui @@ -83,12 +83,24 @@ + + + :/images/ic_send_white.svg:/images/ic_send_white.svg + + + + 36 + 36 + + - + + + diff --git a/ressources.qrc b/ressources.qrc index 63a2a9bd56d4df93de8148f996b87fa8c1e3b5ed..dc12fe6b8fd0aa1cd108d9103c7eb8c699481619 100644 --- a/ressources.qrc +++ b/ressources.qrc @@ -1,47 +1,48 @@ - - stylesheet.css - images/ring.png - images/arrow-down-bold-circle-outline.png - images/arrow-left-bold.png - images/arrow-up-bold-circle-outline.png - images/close.png - images/logo-ring-standard-coul.png - images/minus.png - images/plus.png - images/settings.png - images/arrow-down.png - images/arrow-up.png - images/folder-download.png - images/arrow-right.png - images/history.png - images/close-ring.png - images/minimize-ring.png - images/maximize-ring.png - images/search-contact.png - images/hover-contact/btn-video.svg - images/hover-contact/btn-chat.svg - images/hover-contact/btn-contactinfo.svg - images/contactswidgetlist.png - images/historylist.png - images/user/btn-default-userpic.svg - images/call/btn-call.svg - images/call/btn-answer.svg - images/call/btn-ignore.svg - images/video-conf/btn-hangup.svg - images/video-conf/btn-pause.svg - images/video-conf/btn-pause-toggled.svg - images/video-conf/btn-chat.svg - images/video-conf/btn-nomic.svg - images/video-conf/btn-nomic-toggled.svg - images/video-conf/btn-novideo.svg - images/video-conf/btn-novideo-toggled.svg - images/video-conf/btn-missing.svg - images/video-conf/btn-add-contact-to-conf.svg - images/video-conf/btn-transfer.svg - images/btn-info.svg - images/ic_arrow_back_white.svg - images/video-conf/ic_high_quality_white.svg - images/ic_send_white.svg - + + images/video-conf/btn-join.svg + stylesheet.css + images/ring.png + images/arrow-down-bold-circle-outline.png + images/arrow-left-bold.png + images/arrow-up-bold-circle-outline.png + images/close.png + images/logo-ring-standard-coul.png + images/minus.png + images/plus.png + images/settings.png + images/arrow-down.png + images/arrow-up.png + images/folder-download.png + images/arrow-right.png + images/history.png + images/close-ring.png + images/minimize-ring.png + images/maximize-ring.png + images/search-contact.png + images/hover-contact/btn-video.svg + images/hover-contact/btn-chat.svg + images/hover-contact/btn-contactinfo.svg + images/contactswidgetlist.png + images/historylist.png + images/user/btn-default-userpic.svg + images/call/btn-call.svg + images/call/btn-answer.svg + images/call/btn-ignore.svg + images/video-conf/btn-hangup.svg + images/video-conf/btn-pause.svg + images/video-conf/btn-pause-toggled.svg + images/video-conf/btn-chat.svg + images/video-conf/btn-nomic.svg + images/video-conf/btn-nomic-toggled.svg + images/video-conf/btn-novideo.svg + images/video-conf/btn-novideo-toggled.svg + images/video-conf/btn-missing.svg + images/video-conf/btn-add-contact-to-conf.svg + images/video-conf/btn-transfer.svg + images/btn-info.svg + images/ic_arrow_back_white.svg + images/video-conf/ic_high_quality_white.svg + images/ic_send_white.svg + diff --git a/stylesheet.css b/stylesheet.css index fb55a6298f7b41119852e66a47490b9c69b35f90..feb8743e65a5609688e7c8ffc5d8b7f332a4d847 100644 --- a/stylesheet.css +++ b/stylesheet.css @@ -1,37 +1,39 @@ QPushButton#btnCall{ - border-image: url(:/images/call/btn-call.svg); + background-color: #4caf50; + border-radius: 15px; + border:solid 1px; } QPushButton#acceptButton{ - border-image: url(:/images/call/btn-answer.svg); + background-color: #4caf50; + border-radius: 32px; + border:solid 1px; } -QPushButton#refuseButton{ - border-image: url(:/images/call/btn-ignore.svg); +QPushButton#refuseButton, QPushButton#cancelButton{ + background-color: #f44336; + border-radius: 32px; + border:solid 1px; } -QPushButton#cancelButton{ - border-image: url(:/images/call/btn-ignore.svg); +QPushButton#btnCall:hover, QPushButton#acceptButton:hover{ + background-color: #5db761; } -QWidget#callInvitePage{ - background-color : rgb( 77, 77, 77 ); -} - -QWidget#outboundCallPage{ - background-color : rgb( 77, 77, 77 ); +QPushButton#btnCall:pressed, QPushButton#acceptButton:pressed{ + background-color: #449d48; } -QPushButton#btnvideo{ - border-image: url(:/images/hover-contact/btn-video.svg); +QPushButton#refuseButton:hover, QPushButton#cancelButton:hover{ + background-color: #f5554a; } -QPushButton#btnchat{ - border-image: url(:/images/hover-contact/btn-chat.svg); +QPushButton#refuseButton:pressed, QPushButton#cancelButton:pressed{ + background-color: #db3c30; } -QPushButton#btncontactinfo{ - border-image: url(:/images/hover-contact/btn-contactinfo.svg); +QWidget#callInvitePage, QWidget#outboundCallPage{ + background-color : rgb( 77, 77, 77 ); } IdLabel{ @@ -87,67 +89,77 @@ QLineEdit#messageEdit{ background-color: rgb(255, 255, 255); } -QPushButton#holdButton{ - border-image: url(:/images/video-conf/btn-pause.svg); +QPushButton#holdButton, QPushButton#chatButton, QPushButton#noMicButton, QPushButton#noVideoButton, +QPushButton#transferButton, QPushButton#addPersonButton, QPushButton#joinButton, QPushButton#qualityButton{ + background-color: rgba(0, 0, 0, 140); + border-radius: 18px; + border:solid 1px; } -QPushButton#holdButton:checked{ - border-image: url(:/images/video-conf/btn-pause-toggled.svg); +QPushButton#holdButton:hover, QPushButton#chatButton:hover, QPushButton#noMicButton:hover, QPushButton#noVideoButton:hover, +QPushButton#transferButton:hover, QPushButton#addPersonButton:hover, QPushButton#joinButton:hover, QPushButton#qualityButton:hover{ + background-color: rgba(0, 192, 213, 0.6); + border-radius: 18px; + border:solid 1px; } -QPushButton#hangupButton{ - border-image: url(:/images/video-conf/btn-hangup.svg); +QPushButton#holdButton:pressed, QPushButton#chatButton:pressed, QPushButton#noMicButton:pressed, QPushButton#noVideoButton:pressed, +QPushButton#transferButton:pressed, QPushButton#addPersonButton:pressed, QPushButton#joinButton:pressed, QPushButton#qualityButton:pressed{ + background-color: rgba(0, 192, 213, 0.8); + border-radius: 18px; + border:solid 1px; } -QPushButton#chatButton{ - border-image: url(:/images/video-conf/btn-chat.svg); +QPushButton#noMicButton:checked, QPushButton#noVideoButton:checked{ + background-color: rgba(0, 192, 213, 0.8); } -QPushButton#noMicButton{ - border-image: url(:/images/video-conf/btn-nomic.svg); +QPushButton#hangupButton{ + background-color: rgba(200, 0, 0, 0.6); + border-radius: 18px; + border:solid 1px; } -QPushButton#noMicButton:checked{ - border-image: url(:/images/video-conf/btn-nomic-toggled.svg); +QPushButton#hangupButton:hover{ + background-color: rgba(255, 0, 0, 0.6); } -QPushButton#noVideoButton{ - border-image: url(:/images/video-conf/btn-novideo.svg); +QPushButton#hangupButton:pressed{ + background-color: rgba(255, 0, 0, 0.8); } -QPushButton#noVideoButton:checked{ - border-image: url(:/images/video-conf/btn-novideo-toggled.svg); +QPushButton#imBackButton{ + background-color: #414141; + border-radius: 15px; + border:solid 1px; } -QPushButton#transferButton{ - border-image: url(:/images/video-conf/btn-transfer.svg); +QPushButton#imBackButton:hover{ + background-color: #515151; } -QPushButton#addPersonButton{ - border-image: url(:/images/video-conf/btn-add-contact-to-conf.svg); +QPushButton#imBackButton:pressed{ + background-color: #313131; } -QPushButton#joinButton{ - border-image: url(:/images/video-conf/btn-join.svg); +QPushButton#sendButton{ + background-color: #3AC0D2; + border-radius: 18px; + border:solid 1px; } -QPushButton#imBackButton{ - background-color: #414141; - border-image: url(:/images/ic_arrow_back_white.svg); +QPushButton#btnvideo{ + background-color: #3AC0D2; border-radius: 15px; border:solid 1px; } -QPushButton#qualityButton{ - background-color: rgba(0, 0, 0, 140); - border-radius: 18px; - border:solid 1px; +QPushButton#sendButton:hover, QPushButton#btnvideo:hover{ + background-color: #4dc6d6; } -QPushButton#sendButton{ - background-color: #3AC0D2; - border-radius: 18px; - border:solid 1px; +QPushButton#sendButton:pressed, QPushButton#btnvideo:pressed{ + background-color: #34acbd; } QScrollBar:vertical{ @@ -159,10 +171,10 @@ QScrollBar::handle:vertical{ background: rgb(77, 77, 77); } -QWidget#welcomePage{ +QWidget#welcomePage, QWidget#messagingPage{ background: rgb(242, 242, 242); } -QWidget#messagingPage{ - background: rgb(242, 242, 242); +QPushButton#wizardButton{ + background: transparent; } diff --git a/videooverlay.ui b/videooverlay.ui index 9301b00ed2aaea704194f47951a3b0331029d09b..4dd8f27e8f45565cc65ea9a8325f7e7ddf4faf03 100644 --- a/videooverlay.ui +++ b/videooverlay.ui @@ -40,6 +40,16 @@ + + + :/images/video-conf/btn-hangup.svg:/images/video-conf/btn-hangup.svg + + + + 36 + 36 + + @@ -103,6 +113,16 @@ + + + :/images/video-conf/btn-join.svg:/images/video-conf/btn-join.svg + + + + 36 + 36 + + @@ -122,6 +142,16 @@ + + + :/images/video-conf/btn-pause.svg:/images/video-conf/btn-pause.svg + + + + 36 + 36 + + true @@ -150,6 +180,16 @@ + + + :/images/video-conf/btn-nomic.svg:/images/video-conf/btn-nomic.svg + + + + 36 + 36 + + true @@ -172,6 +212,16 @@ + + + :/images/video-conf/btn-chat.svg:/images/video-conf/btn-chat.svg + + + + 36 + 36 + + @@ -254,6 +304,16 @@ + + + :/images/video-conf/btn-novideo.svg:/images/video-conf/btn-novideo.svg + + + + 36 + 36 + + true @@ -289,6 +349,16 @@ + + + :/images/video-conf/btn-add-contact-to-conf.svg:/images/video-conf/btn-add-contact-to-conf.svg + + + + 36 + 36 + + @@ -308,6 +378,16 @@ + + + :/images/video-conf/btn-transfer.svg:/images/video-conf/btn-transfer.svg + + + + 36 + 36 + + @@ -327,10 +407,22 @@ + + + :/images/video-conf/ic_high_quality_white.svg:/images/video-conf/ic_high_quality_white.svg + + + + 36 + 36 + + - + + + diff --git a/wizarddialog.cpp b/wizarddialog.cpp index 55431882747e6524d2a57de5001da8e63714556a..1c33470af05dea529943ddcb266e0ee9512e9ef8 100644 --- a/wizarddialog.cpp +++ b/wizarddialog.cpp @@ -34,7 +34,7 @@ WizardDialog::WizardDialog(QWidget *parent) : setFixedSize(this->width(),this->height()); - ui->joinButton->setEnabled(false); + ui->wizardButton->setEnabled(false); QPixmap logo(":/images/logo-ring-standard-coul.png"); ui->ringLogo->setPixmap(logo.scaledToHeight(100, Qt::SmoothTransformation)); @@ -50,7 +50,7 @@ void WizardDialog::accept() { ui->label->setText(tr("Please wait while we create your account.")); - ui->joinButton->setEnabled(false); + ui->wizardButton->setEnabled(false); ui->usernameEdit->setEnabled(false); repaint(); @@ -78,7 +78,7 @@ WizardDialog::endSetup(Account* a) void WizardDialog::on_usernameEdit_textChanged(const QString &arg1) { - ui->joinButton->setEnabled(!arg1.isEmpty()); + ui->wizardButton->setEnabled(!arg1.isEmpty()); } void diff --git a/wizarddialog.ui b/wizarddialog.ui index a44a980c86fc3beb425b2ba1d210a29ca40d0e5d..819d5cd9e61cbf98e1a864b2d464df095c31a4a9 100644 --- a/wizarddialog.ui +++ b/wizarddialog.ui @@ -517,7 +517,7 @@ - + @@ -1016,7 +1016,7 @@ - joinButton + wizardButton clicked() WizardDialog accept()