From b64d0ddb2859754ad9e8fbc712477b941bf1c926 Mon Sep 17 00:00:00 2001 From: dsc Date: Thu, 11 Nov 2021 17:29:58 +0100 Subject: [PATCH] wepogi9heih0ogn23w904nm90p3weh --- README.md | 9 +- src/CMakeLists.txt | 3 +- src/assets/html/chat/SMSConversation.html | 11 + src/chatwindow.cpp | 46 ++++ src/chatwindow.h | 45 ++++ src/chatwindow.ui | 309 ++++++++++++++++++++++ src/conversations.cpp | 56 ++++ src/{ctx.h => conversations.h} | 23 +- src/ctx.cpp | 68 ----- src/lib/utils.h | 2 +- src/main.cpp | 6 +- src/mainwindow.cpp | 34 ++- src/mainwindow.h | 14 +- src/mainwindow.ui | 30 +-- 14 files changed, 531 insertions(+), 125 deletions(-) create mode 100644 src/chatwindow.cpp create mode 100644 src/chatwindow.h create mode 100644 src/chatwindow.ui create mode 100644 src/conversations.cpp rename src/{ctx.h => conversations.h} (74%) delete mode 100644 src/ctx.cpp diff --git a/README.md b/README.md index 4c23662..0a946ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ op maemo: ``` -sudo apt install -y libqt5svg5-dev en nog wat meer dingen +sudo apt install -y cmake build-essential libx11-dev zlib1g-dev libpng-dev qtbase5-dev libqt5svg5-dev qtwebengine5-dev libqt5webchannel5-dev libqt5svg5-dev en nog wat meer dingen ``` Als user (uid 1000) anders gaat 'ie zeuren :P @@ -21,3 +21,10 @@ Since we run as root we need env. variables: QTWEBENGINE_DISABLE_SANDBOX=1 DISPLAY=:0.0 ``` + + +# Stacked windows +https://github.com/maemo-leste-extras/dorian/commit/5e8f2e1b87c87ded67030d723c1c5fad3e967b78#diff-e12fae2282221bbdc52470acd3d3170f13683567557cca988671189c88ba7c45L43 + +# link +https://github.com/maemo-leste/rtcom-eventlogger diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5c4686..1150710 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ file(GLOB SOURCE_FILES "lib/*.cpp" ) -find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebEngineWidgets WebChannel) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui Network Svg Xml WebEngineWidgets WebChannel Maemo5) qt5_add_resources(RESOURCES assets.qrc assets/images/flags/flags.qrc) @@ -68,6 +68,7 @@ target_link_libraries(conversations PUBLIC Qt5::Xml Qt5::WebEngineWidgets Qt5::WebChannel + Qt5::Maemo5 Threads::Threads ) diff --git a/src/assets/html/chat/SMSConversation.html b/src/assets/html/chat/SMSConversation.html index 53301e8..989b5df 100644 --- a/src/assets/html/chat/SMSConversation.html +++ b/src/assets/html/chat/SMSConversation.html @@ -4,6 +4,17 @@ + +