Merge pull request #1655

279f6cf bump monero CLI version to 0.13.0.3 (skftn)

get_libwallet_api.sh

@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
 fi
 git submodule update --remote
 git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout release-v0.13
+git -C $MONERO_DIR checkout v0.13.0.3
 
 # get monero core tag
 get_tag

monero-wallet-gui.pro

@@ -10,8 +10,8 @@ QT += qml quick widgets
 WALLET_ROOT=$$PWD/monero
 
 CONFIG += c++11 link_pkgconfig
-packagesExist(libpcsclite) {
-    PKGCONFIG += libpcsclite
+packagesExist(hidapi-libusb) {
+    PKGCONFIG += hidapi-libusb
 }
 !win32 {
     QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
@@ -256,6 +256,8 @@ win32 {
         -lws2_32 \
         -lwsock32 \
         -lIphlpapi \
+        -lcrypt32 \
+        -lhidapi \
         -lgdi32
     
     !contains(QMAKE_TARGET.arch, x86_64) {
@@ -326,6 +328,7 @@ macx {
         -L/usr/local/opt/openssl/lib \
         -L/usr/local/opt/boost/lib \
         -lboost_serialization \
+        -lhidapi \
         -lboost_thread-mt \
         -lboost_system \
         -lboost_date_time \

pages/Receive.qml

@@ -473,7 +473,7 @@ Rectangle {
                     Image {
                         id: qrCode
                         anchors.fill: parent
-                        anchors.margins: 6
+                        anchors.margins: 1
 
                         smooth: false
                         fillMode: Image.PreserveAspectFit

src/libwalletqt/QRCodeImageProvider.cpp

@@ -7,12 +7,21 @@ QImage QRCodeImageProvider::genQrImage(const QString &id, QSize *size)
   using namespace qrcodegen;
 
   QrCode qrcode = QrCode::encodeText(id.toStdString().c_str(), QrCode::Ecc::MEDIUM);
-  QImage img = QImage(qrcode.size, qrcode.size, QImage::Format_Mono);
-  for (int y = 0; y < qrcode.size; ++y)
-    for (int x = 0; x < qrcode.size; ++x)
-      img.setPixel(x, y, !qrcode.getModule(x, y)); // 1 is black, not "255/white"
+  unsigned int black = 0;
+  unsigned int white = 1;
+  unsigned int borderSize = 4;
+  unsigned int imageSize = qrcode.size + (2 * borderSize);
+  QImage img = QImage(imageSize, imageSize, QImage::Format_Mono);
+
+  for (unsigned int y = 0; y < imageSize; ++y)
+    for (unsigned int x = 0; x < imageSize; ++x)
+      if ((x < borderSize) || (x >= imageSize - borderSize) || (y < borderSize) || (y >= imageSize - borderSize))
+        img.setPixel(x, y, white);
+      else
+        img.setPixel(x, y, qrcode.getModule(x - borderSize, y - borderSize) ? black : white);
   if (size)
-    *size = QSize(qrcode.size, qrcode.size);
+    *size = QSize(imageSize, imageSize);
+
   return img;
 }
 

windeploy_helper.sh

@@ -17,13 +17,13 @@ fi
 
 if [[ "$BUILD_TYPE" == "Release" ]]; then
 	echo "Release build"
-	ICU_FILES=(libicudt61.dll libicuin61.dll libicuio61.dll libicutu61.dll libicuuc61.dll)
+	ICU_FILES=(libicudt62.dll libicuin62.dll libicuio62.dll libicutu62.dll libicuuc62.dll)
 else
 	echo "Debug build"
-	ICU_FILES=(libicudtd61.dll libicuind61.dll libicuiod61.dll libicutud61.dll libicuucd61.dll)
+	ICU_FILES=(libicudtd62.dll libicuind62.dll libicuiod62.dll libicutud62.dll libicuucd62.dll)
 fi
 
-FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll)
+FILES=(zlib1.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll)
 
 platform=$(get_platform)