Version 0.2.0

Author: AaronDewes

CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+## Beta versions
+
+### v0.2.0
+
+- Add Umbrel logo to the QR code
+- Remove movable cursor
+- Switch to CMake build system
+
+## Alpha versions
+
+### v0.1.1
+
+- Add Umbrel logo in the bottom right corner
+- Add "Thank you for using Umbrel" text
+
+### v0.1.0
+
+- Fix missing "http://" in QR Code link
+- Optimize text align
+- Remove unsused wayland compositor
+- Code cleanups
+
+### v0.0.1
+
+- First release

CMakeLists.txt

@@ -0,0 +1,34 @@
+project(umbrel-details)
+cmake_minimum_required(VERSION 3.16)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_definitions(-Wall)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Svg REQUIRED)
+find_package(Qt5Network REQUIRED)
+
+INCLUDE_DIRECTORIES(
+    qrcode/
+)
+
+set(SRCS
+    main.cpp
+    window.cpp
+    qrcode/QrCode.cpp
+)
+
+QT5_ADD_RESOURCES(RSCS umbrel-details.qrc)
+
+add_executable(umbrel-details ${SRCS} ${RSCS})
+qt5_use_modules(umbrel-details Core)
+qt5_use_modules(umbrel-details Gui)
+qt5_use_modules(umbrel-details Svg)
+qt5_use_modules(umbrel-details Network)

README.md

@@ -15,15 +15,16 @@ sudo apt install libqt5gui5 libqt5svg5 libqt5network5 -y
 ```
 mkdir build
 cd build
-qmake ..
+cmake ..
 make -j$(nproc)
 ```
 
 ## Running
 
 To run this on an Raspberry Pi with Umbrel OS, run
 ```
-./umbrel-details -platform linuxfb
+export QT_QPA_LINUXFB_HIDECURSOR=1
+./umbrel-details -platform eglfs
 ```
 
 ## License

example.png

@@ -1,5 +1,6 @@
 <RCC>
     <qresource>
         <file alias="umbrel.svg">umbrel.svg</file>
+        <file alias="umbrel2.svg">umbrel2.svg</file>
     </qresource>
 </RCC>

umbrel-details.pro

@@ -50,18 +50,17 @@
 
 #include "window.h"
 
-#include <QMouseEvent>
+#include <QFile>
+#include <QExposeEvent>
+#include <QResizeEvent>
 #include <QWindow>
 #include <QBackingStore>
-#include <QMatrix4x4>
 #include <QPainter>
 #include <QXmlStreamReader>
 #include <QSvgRenderer>
 #include <QHostAddress>
 #include <QNetworkInterface>
 
-#include <QtWaylandCompositor/qwaylandseat.h>
-
 #include "QrCode.hpp"
 
 Window::Window()
@@ -82,6 +81,10 @@ void Window::drawBackground()
     file2.open(QIODevice::ReadOnly);
     QTextStream s2(&file2);
     QString logoString = s2.readAll();
+    QFile file3(":/umbrel2.svg");
+    file3.open(QIODevice::ReadOnly);
+    QTextStream s3(&file3);
+    QString logoString2 = s3.readAll();
 
     // Get tor host name
     QFile file("/home/umbrel/umbrel/tor/data/web/hostname");
@@ -110,9 +113,19 @@ void Window::drawBackground()
     QPainter painter2(device);
     int deltaX = this->geometry().width() - backgroundImage.width();
     int deltaY = this->geometry().height() - backgroundImage.height() + 260;
+    int deltaX2 = backgroundImage.width() - 136;
+    int deltaY2 = backgroundImage.height() - 153;
     painter2.drawImage(this->geometry(), backgroundColorImage);
     painter2.translate(deltaX / 2, deltaY / 2);
     painter2.drawImage(backgroundImage.rect(), backgroundImage);
+    QImage logoImage2(136, 153, QImage::Format_ARGB32);
+    logoImage2.fill(Qt::white);
+    QPainter painter6(&logoImage2);
+    QXmlStreamReader *reader2 = new QXmlStreamReader(logoString2);
+    QSvgRenderer *renderer3 = new QSvgRenderer(reader2);
+    renderer3->render(&painter6);
+    painter2.translate(deltaX2 / 2, deltaY2 / 2);
+    painter2.drawImage(logoImage2.rect(), logoImage2);
     painter2.end();
 
     // Add text
@@ -141,25 +154,29 @@ void Window::drawBackground()
     QXmlStreamReader *reader = new QXmlStreamReader(logoString);
     QSvgRenderer *renderer2 = new QSvgRenderer(reader);
     renderer2->render(&painter4);
-    QPaintDevice *device2 = m_backingStore->paintDevice();
-    QPainter painter5(device2);
-    int delta2X = this->geometry().width() - logoImage.width() - 15;
-    int delta2Y = this->geometry().height() - logoImage.height() - 15;
-    painter5.translate(delta2X, delta2Y);
+    QPainter painter5(device);
+    int deltaX3 = this->geometry().width() - logoImage.width() - 15;
+    int deltaY3 = this->geometry().height() - logoImage.height() - 15;
+    painter5.translate(deltaX3, deltaY3);
     painter5.drawImage(logoImage.rect(), logoImage);
     painter5.end();
 }
+
 void Window::update()
 {
     if (!isExposed())
         return;
+    // Remove this for screenshots using linuxfb, but having it otherwise results in glitches
+    if(updated)
+        return;
 
     QRect rect(0, 0, width(), height());
     m_backingStore->beginPaint(rect);
 
     drawBackground();
     m_backingStore->endPaint();
     m_backingStore->flush(rect);
+    updated = true;
 }
 
 bool Window::event(QEvent *event)
@@ -183,7 +200,7 @@ void Window::resizeEvent(QResizeEvent *resizeEvent)
 }
 
 QSvgRenderer *Window::getQrCode(QString *address) {
-    qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText(address->toStdString().c_str(), qrcodegen::QrCode::Ecc::MEDIUM);
+    qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText(address->toStdString().c_str(), qrcodegen::QrCode::Ecc::HIGH);
     QString svg = QString::fromStdString(qr0.toSvgString(4));
     QXmlStreamReader *reader = new QXmlStreamReader(svg);
     QSvgRenderer *renderer = new QSvgRenderer(reader);

umbrel-details.qrc

@@ -48,8 +48,8 @@
 **
 ****************************************************************************/
 
-#ifndef COMPOSITORWINDOW_H
-#define COMPOSITORWINDOW_H
+#ifndef WINDOW_H
+#define WINDOW_H
 
 #include <QWindow>
 #include <QPointer>
@@ -93,8 +93,9 @@ public slots:
     QPointF m_initialMousePos;
     View *m_dragIconView = nullptr;
     QBackingStore *m_backingStore = nullptr;
+    bool updated = false;
 };
 
 QT_END_NAMESPACE
 
-#endif // COMPOSITORWINDOW_H
+#endif // WINDOW_H