StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

tox URI and updated install.md

Browse Source
This commit is contained in:
agilob 2015-03-07 20:29:39 +00:00
parent 3096d2422f
commit 8eb1a6fdb1
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
INSTALL.md
View File

@ -59,22 +59,22 @@ git clone https://github.com/tux3/qTox.git qTox
The following steps assumes that you cloned the repository at "/home/user/qTox". If you decided to choose another location, replace corresponding parts. The following steps assumes that you cloned the repository at "/home/user/qTox". If you decided to choose another location, replace corresponding parts.
###GCC, Qt, OpenCV and OpanAL Soft ###GCC, Qt, OpenCV, OpanAL Soft and QRCode
Arch Linux: Arch Linux:
```bash ```bash
sudo pacman -S --needed base-devel qt5 opencv openal libxss sudo pacman -S --needed base-devel qt5 opencv openal libxss qrencode
``` ```
Debian / Ubuntu: Debian / Ubuntu:
```bash ```bash
sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev libxss-dev sudo apt-get install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libopencv-dev libxss-dev qrencode
``` ```
Fedora: Fedora:
```bash ```bash
yum groupinstall "Development Tools" yum groupinstall "Development Tools"
yum install qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel openal-soft-devel libXScrnSaver-devel yum install qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel openal-soft-devel libXScrnSaver-devel qrencode
``` ```
Slackware: Slackware:
@ -87,6 +87,8 @@ http://slackbuilds.org/repository/14.1/libraries/qt5/
http://slackbuilds.org/repository/14.1/libraries/opencv/ http://slackbuilds.org/repository/14.1/libraries/opencv/
http://slackbuilds.org/slackbuilds/14.1/graphics/qrencode/
###Tox Core ###Tox Core

13
src/misc/qrwidget.cpp
View File

@ -7,7 +7,8 @@
#include "qrencode.h" #include "qrencode.h"
QRWidget::QRWidget(QWidget *parent) : QWidget(parent), data("0") QRWidget::QRWidget(QWidget *parent) : QWidget(parent), data("0")
//Note: The encoding fails with empty string so I just default to something else. Use the setQRData() call to change this. //Note: The encoding fails with empty string so I just default to something else.
//Use the setQRData() call to change this.
{ {
//size of the qimage might be problematic in the future, but it works for me //size of the qimage might be problematic in the future, but it works for me
size.setWidth(480); size.setWidth(480);
@ -17,7 +18,7 @@ QRWidget::QRWidget(QWidget *parent) : QWidget(parent), data("0")
void QRWidget::setQRData(QString data) void QRWidget::setQRData(QString data)
{ {
this->data = data; this->data = "tox:" + data;
paintImage(); paintImage();
} }
@ -30,7 +31,8 @@ QString QRWidget::getImageAsText()
image->save(&buffer, "PNG"); // writes the image in PNG format inside the buffer image->save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
QString iconBase64 = QString::fromLatin1(ba.toBase64().data()); QString iconBase64 = QString::fromLatin1(ba.toBase64().data());
QString base64Image = "<img width=\"350\" heigth=\"350\" src=\"data:image/png;base64," + iconBase64 +"\" />"; QString base64Image = "<img width=\"300\" heigth=\"300\" src=\"data:image/png;base64," + iconBase64 +"\" />";
qDebug() << base64Image;
return QString(base64Image); return QString(base64Image);
} }
@ -40,7 +42,8 @@ void QRWidget::paintImage()
{ {
QPainter painter(image); QPainter painter(image);
//NOTE: I have hardcoded some parameters here that would make more sense as variables. //NOTE: I have hardcoded some parameters here that would make more sense as variables.
QRcode *qr = QRcode_encodeString(data.toStdString().c_str(), 1, QR_ECLEVEL_L, QR_MODE_8, 0); // ECLEVEL_M is much faster recognizable by barcodescanner any any other type
QRcode *qr = QRcode_encodeString(data.toStdString().c_str(), 1, QR_ECLEVEL_M, QR_MODE_8, 0);
if(0 != qr) if(0 != qr)
{ {
@ -50,7 +53,7 @@ void QRWidget::paintImage()
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);
painter.drawRect(0, 0, size.width(), size.height()); painter.drawRect(0, 0, size.width(), size.height());
painter.setBrush(fg); painter.setBrush(fg);
const int s = qr->width>0 ? qr->width : 1; const int s = qr->width > 0 ? qr->width : 1;
const double w = width(); const double w = width();
const double h = height(); const double h = height();
const double aspect = w / h; const double aspect = w / h;