diff --git a/contactpickeritemdelegate.cpp b/contactpickeritemdelegate.cpp index b86bf5bf7737269beaac5b0e1e5f018a2764cadf..28b277d56ea6ab8a26285ffecf7325b7470db565 100644 --- a/contactpickeritemdelegate.cpp +++ b/contactpickeritemdelegate.cpp @@ -140,7 +140,6 @@ ContactPickerItemDelegate::paintRingContactItem(QPainter* painter, } auto leftMargin = dx_ + sizeImage_ + dx_; - auto rightMargin = dx_; auto topMargin = 4; auto bottomMargin = 8; @@ -202,7 +201,6 @@ ContactPickerItemDelegate::paintSIPContactItem(QPainter* painter, } auto leftMargin = dx_ + sizeImage_ + dx_; - auto rightMargin = dx_; auto topMargin = 4; auto bottomMargin = 8; diff --git a/settingswidget.ui b/settingswidget.ui index 98ae9fdd3c1063699eb9c1efcc7ebf115ec32e0f..a0b9cfe7b4fdcd55fc1d2d0a846e98a0f61acea0 100644 --- a/settingswidget.ui +++ b/settingswidget.ui @@ -716,7 +716,7 @@ </property> <property name="icon"> <iconset> - <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset> + <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset> </property> <property name="iconSize"> <size> @@ -1061,7 +1061,7 @@ </property> <property name="icon"> <iconset> - <normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</normaloff>../../../../.designer/backup/images/icons/round-folder-24px.svg</iconset> + <normaloff>images/icons/round-folder-24px.svg</normaloff>images/icons/round-folder-24px.svg</iconset> </property> <property name="iconSize"> <size> diff --git a/videooverlay.cpp b/videooverlay.cpp index 09c175551675e2f47215958c2fb204bff6d7f7a1..03ee6ffab9ae5178a77d32ea65cd58411484bb1c 100644 --- a/videooverlay.cpp +++ b/videooverlay.cpp @@ -49,8 +49,7 @@ VideoOverlay::VideoOverlay(QWidget* parent) : contactPicker_->setVisible(false); contactPicker_->setTitle(QObject::tr("Select peer to transfer to")); - connect(ui->transferCallButton, &QPushButton::toggled, this, &VideoOverlay::on_transferButton_toggled); - connect(contactPicker_, &ContactPicker::contactWillDoTransfer, this, &VideoOverlay::on_transferCall_requested); + connect(contactPicker_, &ContactPicker::contactWillDoTransfer, this, &VideoOverlay::slotWillDoTransfer); } VideoOverlay::~VideoOverlay() @@ -190,7 +189,7 @@ VideoOverlay::setTransferCallAvailability(bool visible) } void -VideoOverlay::on_transferButton_toggled(bool checked) +VideoOverlay::on_transferCallButton_toggled(bool checked) { if (callId_.empty() || !checked) { return; @@ -224,7 +223,7 @@ VideoOverlay::on_transferButton_toggled(bool checked) } void -VideoOverlay::on_transferCall_requested(const std::string& callId, const std::string& contactUri) +VideoOverlay::slotWillDoTransfer(const std::string& callId, const std::string& contactUri) { auto callModel = LRCInstance::getCurrentCallModel(); contactPicker_->hide(); diff --git a/videooverlay.h b/videooverlay.h index c7b1c6721c8c82101fb889ddbee3c0361af9bd3c..6b585f839b1ec62e5c8a3de01408f90430bea08e 100644 --- a/videooverlay.h +++ b/videooverlay.h @@ -58,8 +58,8 @@ private slots: void on_noMicButton_toggled(bool checked); void on_noVideoButton_toggled(bool checked); void on_recButton_clicked(); - void on_transferButton_toggled(bool checked); - void on_transferCall_requested(const std::string& callId, const std::string& contactUri); + void on_transferCallButton_toggled(bool checked); + void slotWillDoTransfer(const std::string& callId, const std::string& contactUri); private: Ui::VideoOverlay* ui;