d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add native themeing to QML (where possible)

Browse source
This commit is contained in:
Nicolas Werner 2019-10-17 09:36:16 +02:00
parent a83ae7e95f
commit cff46d97a8
5 changed files with 91 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/TimelineView.qml
View file

@ -12,8 +12,9 @@ import "./delegates"
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
SystemPalette { id: colors; colorGroup: SystemPalette.Active } property var colors: currentActivePalette
SystemPalette { id: inactiveColors; colorGroup: SystemPalette.Disabled } property var systemInactive: SystemPalette { colorGroup: SystemPalette.Disabled }
property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive
property int avatarSize: 32 property int avatarSize: 32
color: colors.window color: colors.window

28
resources/qml/delegates/TimelineRow.qml
View file

@ -1,5 +1,5 @@
import QtQuick 2.6 import QtQuick 2.6
import QtQuick.Controls 2.1 import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Window 2.2 import QtQuick.Window 2.2
@ -48,8 +48,12 @@ RowLayout {
id: replyButton id: replyButton
flat: true flat: true
Layout.preferredHeight: 16 Layout.preferredHeight: 16
ToolTip.visible: hovered
ToolTip.text: qsTr("Reply") ToolTip {
visible: replyButton.hovered
text: qsTr("Reply")
palette: colors
}
// disable background, because we don't want a border on hover // disable background, because we don't want a border on hover
background: Item { background: Item {
@ -74,8 +78,12 @@ RowLayout {
id: optionsButton id: optionsButton
flat: true flat: true
Layout.preferredHeight: 16 Layout.preferredHeight: 16
ToolTip.visible: hovered
ToolTip.text: qsTr("Options") ToolTip {
visible: optionsButton.hovered
text: qsTr("Options")
palette: colors
}
// disable background, because we don't want a border on hover // disable background, because we don't want a border on hover
background: Item { background: Item {
@ -98,6 +106,7 @@ RowLayout {
Menu { Menu {
y: optionsButton.height y: optionsButton.height
id: contextMenu id: contextMenu
palette: colors
MenuItem { MenuItem {
text: qsTr("Read receipts") text: qsTr("Read receipts")
@ -127,13 +136,16 @@ RowLayout {
text: model.timestamp.toLocaleTimeString("HH:mm") text: model.timestamp.toLocaleTimeString("HH:mm")
color: inactiveColors.text color: inactiveColors.text
ToolTip.visible: ma.containsMouse
ToolTip.text: Qt.formatDateTime(model.timestamp, Qt.DefaultLocaleLongDate)
MouseArea{ MouseArea{
id: ma id: ma
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
} }
ToolTip {
visible: ma.containsMouse
text: Qt.formatDateTime(model.timestamp, Qt.DefaultLocaleLongDate)
palette: colors
}
} }
} }

24
src/Utils.cpp
View file

@ -323,16 +323,26 @@ utils::linkifyMessage(const QString &body)
return doc; return doc;
} }
QByteArray escapeRawHtml(const QByteArray &data) { QByteArray
escapeRawHtml(const QByteArray &data)
{
QByteArray buffer; QByteArray buffer;
const size_t length = data.size(); const size_t length = data.size();
buffer.reserve(length); buffer.reserve(length);
for(size_t pos = 0; pos != length; ++pos) { for (size_t pos = 0; pos != length; ++pos) {
switch(data.at(pos)) { switch (data.at(pos)) {
case '&': buffer.append("&"); break; case '&':
case '<': buffer.append("&lt;"); break; buffer.append("&amp;");
case '>': buffer.append("&gt;"); break; break;
default: buffer.append(data.at(pos)); break; case '<':
buffer.append("&lt;");
break;
case '>':
buffer.append("&gt;");
break;
default:
buffer.append(data.at(pos));
break;
} }
} }
return buffer; return buffer;

44
src/timeline2/TimelineViewManager.cpp
View file

@ -3,13 +3,51 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMetaType> #include <QMetaType>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QPalette>
#include <QQmlContext> #include <QQmlContext>
#include <QStandardPaths> #include <QStandardPaths>
#include "ChatPage.h"
#include "Logging.h" #include "Logging.h"
#include "MxcImageProvider.h" #include "MxcImageProvider.h"
#include "UserSettingsPage.h"
#include "dialogs/ImageOverlay.h" #include "dialogs/ImageOverlay.h"
void
TimelineViewManager::updateColorPalette()
{
UserSettings settings;
if (settings.theme() == "light") {
QPalette lightActive(/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"),
/*light*/ QColor(),
/*dark*/ QColor(220, 220, 220, 120),
/*mid*/ QColor(),
/*text*/ QColor("#333"),
/*bright_text*/ QColor(),
/*base*/ QColor("white"),
/*window*/ QColor("white"));
view->rootContext()->setContextProperty("currentActivePalette", lightActive);
view->rootContext()->setContextProperty("currentInactivePalette", lightActive);
} else if (settings.theme() == "dark") {
QPalette darkActive(/*windowText*/ QColor("#caccd1"),
/*button*/ QColor("#caccd1"),
/*light*/ QColor(),
/*dark*/ QColor(45, 49, 57, 120),
/*mid*/ QColor(),
/*text*/ QColor("#caccd1"),
/*bright_text*/ QColor(),
/*base*/ QColor("#202228"),
/*window*/ QColor("#202228"));
darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9"));
view->rootContext()->setContextProperty("currentActivePalette", darkActive);
view->rootContext()->setContextProperty("currentInactivePalette", darkActive);
} else {
view->rootContext()->setContextProperty("currentActivePalette", QPalette());
view->rootContext()->setContextProperty("currentInactivePalette", nullptr);
}
}
TimelineViewManager::TimelineViewManager(QWidget *parent) TimelineViewManager::TimelineViewManager(QWidget *parent)
: imgProvider(new MxcImageProvider()) : imgProvider(new MxcImageProvider())
{ {
@ -23,8 +61,14 @@ TimelineViewManager::TimelineViewManager(QWidget *parent)
container = QWidget::createWindowContainer(view, parent); container = QWidget::createWindowContainer(view, parent);
container->setMinimumSize(200, 200); container->setMinimumSize(200, 200);
view->rootContext()->setContextProperty("timelineManager", this); view->rootContext()->setContextProperty("timelineManager", this);
updateColorPalette();
view->engine()->addImageProvider("MxcImage", imgProvider); view->engine()->addImageProvider("MxcImage", imgProvider);
view->setSource(QUrl("qrc:///qml/TimelineView.qml")); view->setSource(QUrl("qrc:///qml/TimelineView.qml"));
connect(dynamic_cast<ChatPage *>(parent),
&ChatPage::themeChanged,
this,
&TimelineViewManager::updateColorPalette);
} }
void void

1
src/timeline2/TimelineViewManager.h
View file

@ -71,6 +71,7 @@ public slots:
void initWithMessages(const std::map<QString, mtx::responses::Timeline> &msgs); void initWithMessages(const std::map<QString, mtx::responses::Timeline> &msgs);
void setHistoryView(const QString &room_id); void setHistoryView(const QString &room_id);
void updateColorPalette();
void queueTextMessage(const QString &msg); void queueTextMessage(const QString &msg);
void queueReplyMessage(const QString &reply, const RelatedInfo &related); void queueReplyMessage(const QString &reply, const RelatedInfo &related);