diff --git a/.gitmodules b/.gitmodules
index fa045e1f40f5d620a4b94f85e4da6f2f4f489cf2..087d51cdc03421260d61134bdcc70277876936ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "winsparkle"]
path = winsparkle
url = git://github.com/vslavik/winsparkle.git
+[submodule "libqrencode"]
+ path = libqrencode
+ url = https://github.com/EckoEdc/libqrencode.git
diff --git a/RingWinClient.pro b/RingWinClient.pro
index 34a6fe0c11993902c43816036c04d12bac89d480..33490aa5635a7becca91d62499a3aab4fcf272de 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -124,7 +124,7 @@ FORMS += mainwindow.ui \
qualitydialog.ui \
ringbutton.ui
-win32: LIBS += -lole32 -luuid -lshlwapi
+win32: LIBS += -lole32 -luuid -lshlwapi -lqrencode
INCLUDEPATH += $${RING}/include/libringclient
INCLUDEPATH += $${RING}/include
@@ -187,7 +187,7 @@ win32 {
RUNTIMEDIR=$$[QT_INSTALL_BINS]
- RUNTIME.files = $${RING}/bin/libring.dll $${RING}/bin/libringclient.dll
+ RUNTIME.files = $${RING}/bin/libring.dll $${RING}/bin/libringclient.dll $${RING}/bin/libqrencode.dll
RUNTIME.path = $$OUT_PWD/release
LRC_TRANSLATION.files = $${RING}/share/libringclient/translations
diff --git a/callwidget.cpp b/callwidget.cpp
index 8f8e603272c220c42dd2da424bb3d382caddf08d..c2d6793079bca4656c6e662010cd67f4fbdbecfc 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -23,6 +23,8 @@
#include <memory>
+#include "qrencode.h"
+
//ERROR is defined in windows.h
#include "utils.h"
#undef ERROR
@@ -74,6 +76,8 @@ CallWidget::CallWidget(QWidget* parent) :
ui->ringLogo->setPixmap(logo.scaledToHeight(100, Qt::SmoothTransformation));
ui->ringLogo->setAlignment(Qt::AlignHCenter);
+ setupShareMenu();
+
GlobalInstances::setPixmapManipulator(std::unique_ptr<Interfaces::PixbufManipulator>(new Interfaces::PixbufManipulator()));
try {
@@ -186,6 +190,25 @@ CallWidget::~CallWidget()
delete imDelegate_;
delete pageAnim_;
delete smartListDelegate_;
+ delete shareMenu_;
+}
+
+void
+CallWidget::setupShareMenu()
+{
+ ui->shareButton->setPopupMode(QToolButton::ToolButtonPopupMode::MenuButtonPopup);
+ shareMenu_ = new QMenu(ui->shareButton);
+ auto emailShare = new QAction(tr("Share by email"), this);
+ connect(emailShare, &QAction::triggered, [=]() {
+ Utils::InvokeMailto(tr("Contact me on Ring"), tr("My RingId is : ") + ui->ringIdLabel->text());
+ });
+ shareMenu_->addAction(emailShare);
+ auto qrcodeAction = new QAction(tr("Show QRCode"), this);
+ qrcodeAction->setCheckable(true);
+ ui->qrLabel->hide();
+ connect(qrcodeAction, &QAction::toggled, ui->qrLabel, &QLabel::setVisible);
+ shareMenu_->addAction(qrcodeAction);
+ ui->shareButton->setMenu(shareMenu_);
}
void
@@ -309,6 +332,7 @@ CallWidget::findRingAccount(QModelIndex idx1, QModelIndex idx2, QVector<int> vec
auto username = idx.data(static_cast<int>(Account::Role::Username));
ui->ringIdLabel->setText(username.toString());
found = true;
+ setupQRCode();
return;
}
}
@@ -317,6 +341,43 @@ CallWidget::findRingAccount(QModelIndex idx1, QModelIndex idx2, QVector<int> vec
}
}
+void CallWidget::setupQRCode()
+{
+ auto rcode = QRcode_encodeString(ui->ringIdLabel->text().toStdString().c_str(),
+ 8,
+ QR_ECLEVEL_H, // Highest level of error correction
+ QR_MODE_8, // 8-bit data mode
+ 1);
+ if (not rcode) {
+ qWarning() << "Failed to generate QR code: " << strerror(errno);
+ return;
+ }
+
+ auto margin = 5;
+ int qrwidth = rcode->width + margin * 2;
+ QImage result(QSize(qrwidth, qrwidth), QImage::Format_Mono);
+ QPainter painter;
+ painter.begin(&result);
+ painter.setClipRect(QRect(0, 0, qrwidth, qrwidth));
+ painter.setPen(QPen(Qt::black, 0.1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
+ painter.setBrush(Qt::black);
+ painter.fillRect(QRect(0, 0, qrwidth, qrwidth), Qt::white);
+ unsigned char *row, *p;
+ p = rcode->data;
+ for(int y = 0; y < rcode->width; y++) {
+ row = (p + (y * rcode->width));
+ for(int x = 0; x < rcode->width; x++) {
+ if(*(row + x) & 0x1) {
+ painter.drawRect(margin + x, margin + y, 1, 1);
+ }
+ }
+
+ }
+ painter.end();
+ QRcode_free(rcode);
+ ui->qrLabel->setPixmap(QPixmap::fromImage(result.scaled(QSize(qrSize_, qrSize_))));
+}
+
void
CallWidget::findRingAccount()
{
@@ -331,6 +392,8 @@ CallWidget::findRingAccount()
account->displayName() = account->alias();
auto username = account->username();
ui->ringIdLabel->setText(username);
+ setupQRCode();
+
found = true;
return;
}
@@ -726,5 +789,5 @@ CallWidget::on_copyCMButton_clicked()
void
CallWidget::on_shareButton_clicked()
{
- Utils::InvokeMailto("Contact me on Ring", QStringLiteral("My RingId is : ") + ui->ringIdLabel->text());
+ ui->shareButton->showMenu();
}
diff --git a/callwidget.h b/callwidget.h
index 96722bfd9b4b0d0c6544d907e27ba82fafe414cb..085a2ae7c1030d59787d3eda3e3b225e0e0414ba 100644
--- a/callwidget.h
+++ b/callwidget.h
@@ -108,8 +108,10 @@ private:
QMetaObject::Connection imConnection_;
QMetaObject::Connection imVisibleConnection_;
QPropertyAnimation* pageAnim_;
+ QMenu* shareMenu_;
constexpr static int animDuration_ = 200; //msecs
+ constexpr static int qrSize_ = 100;
private:
void findRingAccount();
@@ -119,5 +121,7 @@ private:
void setupSmartListMenu();
void slidePage(QWidget* widget, bool toRight = false);
void callStateToView(Call* value);
+ void setupShareMenu();
+ void setupQRCode();
};
diff --git a/callwidget.ui b/callwidget.ui
index dec919409f59c20caac3be2b99a8b261110ab391..630ebf9614c660fa803472b2b7dd7b4d3d26b8f6 100644
--- a/callwidget.ui
+++ b/callwidget.ui
@@ -751,7 +751,7 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="shareButton">
+ <widget class="QToolButton" name="shareButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -836,6 +836,13 @@
</property>
</widget>
</item>
+ <item alignment="Qt::AlignHCenter">
+ <widget class="QLabel" name="qrLabel">
+ <property name="text">
+ <string>Error while generating QR Code</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
diff --git a/libqrencode b/libqrencode
new file mode 160000
index 0000000000000000000000000000000000000000..bad61a11b5bd78a1d52b9314fb06e8bfbcd361e5
--- /dev/null
+++ b/libqrencode
@@ -0,0 +1 @@
+Subproject commit bad61a11b5bd78a1d52b9314fb06e8bfbcd361e5
diff --git a/stylesheet.css b/stylesheet.css
index fc3e707e94043dd93c06e21773cfed74db8ea15c..8531d96591f3817f656fa33bcf2e0ed530990bd1 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -184,19 +184,19 @@ QPushButton#hangupButton:pressed{
}
QPushButton#exitSettingsButton, QPushButton#settingsButton, QPushButton#addToContactButton,
-QPushButton#imBackButton, QPushButton#copyCMButton, QPushButton#shareButton{
+QPushButton#imBackButton, QPushButton#copyCMButton, QToolButton#shareButton{
background-color: #414141;
border-radius: 15px;
border:solid 1px;
}
QPushButton#exitSettingsButton:hover, QPushButton#settingsButton:hover, QPushButton#imBackButton:hover,
-QPushButton#copyCMButton:hover, QPushButton#shareButton:hover{
+QPushButton#copyCMButton:hover, QToolButton#shareButton:hover{
background-color: #515151;
}
QPushButton#exitSettingsButton:pressed, QPushButton#settingsButton:pressed, QToolButton#imBackButton:pressed,
-QPushButton#copyCMButton:pressed, QPushButton#shareButton:pressed{
+QPushButton#copyCMButton:pressed, QToolButton#shareButton:pressed{
background-color: #313131;
}
@@ -531,3 +531,7 @@ QSlider::sub-page:vertical{
QSlider::add-page:vertical{
background: #3AC0D2;
}
+
+QToolButton::menu-button {image:none;}
+
+QToolButton::menu-arrow {image:none;}