From 7d648ab081c54563a49e0e6001046c0e629b62ef Mon Sep 17 00:00:00 2001 From: vae Date: Tue, 11 May 2021 19:11:02 +0300 Subject: [PATCH] feat: add omemo buttons --- ui/CMakeLists.txt | 2 ++ ui/squawk.ui | 20 +++++++++++++++++++- ui/widgets/conversation.ui | 17 +++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 11b8f3d..2ff67e6 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -18,6 +18,8 @@ add_subdirectory(widgets) set(squawkUI_SRC squawk.cpp + squawk.h + squawk.ui models/accounts.cpp models/roster.cpp models/item.cpp diff --git a/ui/squawk.ui b/ui/squawk.ui index f6cb300..cb48de6 100644 --- a/ui/squawk.ui +++ b/ui/squawk.ui @@ -162,14 +162,24 @@ 0 0 718 - 27 + 23 Settings + + + OMEMO + + + + + + + @@ -224,6 +234,14 @@ Add conference + + + + + + Device list + + diff --git a/ui/widgets/conversation.ui b/ui/widgets/conversation.ui index bb38666..36b74a4 100644 --- a/ui/widgets/conversation.ui +++ b/ui/widgets/conversation.ui @@ -292,6 +292,19 @@ + + + + + + + + + + true + + + @@ -400,8 +413,8 @@ background-color: transparent <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Liberation Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Liberation Sans';"><br /></p></body></html> false