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

First runnable qt6 Nheko

Browse source
This commit is contained in:
Nicolas Werner 2023-06-02 00:43:38 +02:00
parent b518f6902e
commit e85a1d4aeb
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
8 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/PrivacyScreen.qml
View file

@ -2,10 +2,10 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtGraphicalEffects 1.0 import QtQuick
import QtQuick 2.12 import QtQuick.Window
import QtQuick.Window 2.2 import im.nheko
import im.nheko 1.0 import QtQuick.Effects
Item { Item {
id: privacyScreen id: privacyScreen
@ -100,12 +100,15 @@ Item {
} }
] ]
FastBlur { MultiEffect {
id: blur id: blur
blurEnabled: true
anchors.fill: parent anchors.fill: parent
source: timelineRoot source: timelineRoot
radius: 50 blur: 1.0
blurMax: 32
} }
} }

23
resources/qml/components/FlatButton.qml
View file

@ -2,11 +2,11 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtGraphicalEffects 1.12 import QtQuick
import QtQuick 2.9 import QtQuick.Controls
import QtQuick.Controls 2.5 import QtQuick.Layouts
import QtQuick.Layouts 1.2 import QtQuick.Effects
import im.nheko 1.0 import im.nheko
// FIXME(Nico): Don't use hardcoded colors. // FIXME(Nico): Don't use hardcoded colors.
Button { Button {
@ -18,14 +18,13 @@ Button {
property string iconImage: "" property string iconImage: ""
DropShadow { MultiEffect {
anchors.fill: control.background anchors.fill: control.background
horizontalOffset: 3 shadowHorizontalOffset: 3
verticalOffset: 3 shadowVerticalOffset: 3
radius: 8 shadowBlur: 8
samples: 17 shadowEnabled: true
cached: true shadowColor: "#80000000"
color: "#80000000"
source: control.background source: control.background
} }

20
resources/qml/delegates/PlayableMediaMessage.qml
View file

@ -4,11 +4,11 @@
import "../" import "../"
import "../ui/media" import "../ui/media"
import QtMultimedia 5.15 import QtMultimedia
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import im.nheko 1.0 import im.nheko
Item { Item {
id: content id: content
@ -36,12 +36,12 @@ Item {
id: mxcmedia id: mxcmedia
// TODO: Show error in overlay or so? // TODO: Show error in overlay or so?
onError: console.log(error)
roomm: room roomm: room
// desiredVolume is a float from 0.0 -> 1.0, MediaPlayer volume is an int from 0 to 100 audioOutput: AudioOutput {
// this value automatically gets clamped for us between these two values.
volume: mediaControls.desiredVolume * 100
muted: mediaControls.muted muted: mediaControls.muted
volume: mediaControls.desiredVolume
}
videoOutput: videoOutput
} }
Rectangle { Rectangle {
@ -68,8 +68,6 @@ Item {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
fillMode: VideoOutput.PreserveAspectFit fillMode: VideoOutput.PreserveAspectFit
source: mxcmedia
flushMode: VideoOutput.FirstFrame
orientation: mxcmedia.orientation orientation: mxcmedia.orientation
} }

11
resources/qml/emoji/StickerPicker.qml
View file

@ -3,12 +3,11 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import "../" import "../"
import QtGraphicalEffects 1.0 import QtQuick
import QtQuick 2.9 import QtQuick.Controls
import QtQuick.Controls 2.3 import QtQuick.Layouts
import QtQuick.Layouts 1.3 import im.nheko
import im.nheko 1.0 import im.nheko.EmojiModel
import im.nheko.EmojiModel 1.0
Menu { Menu {
id: stickerPopup id: stickerPopup

5
resources/qml/ui/Ripple.qml
View file

@ -2,9 +2,8 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtGraphicalEffects 1.0 import QtQuick
import QtQuick 2.15 import QtQuick.Controls
import QtQuick.Controls 2.15
Item { Item {
id: ripple id: ripple

12
resources/qml/ui/Spinner.qml
View file

@ -3,8 +3,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import "./animations" import "./animations"
import QtGraphicalEffects 1.12 import QtQuick
import QtQuick 2.12 import QtQuick.Effects
Item { Item {
id: spinner id: spinner
@ -139,11 +139,11 @@ Item {
} }
Glow { MultiEffect {
anchors.fill: row anchors.fill: row
radius: 14 shadowBlur: 14
samples: 17 shadowEnabled: true
color: spinner.foreground shadowColor: spinner.foreground
source: row source: row
transform: Matrix4x4 { transform: Matrix4x4 {

3
resources/qml/ui/animations/BlinkAnimation.qml
View file

@ -2,8 +2,7 @@
// //
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
import QtGraphicalEffects 1.12 import QtQuick
import QtQuick 2.12
SequentialAnimation { SequentialAnimation {
property alias target: numberAnimation.target property alias target: numberAnimation.target

2
src/LoginPage.cpp
View file

@ -25,6 +25,8 @@ LoginPage::LoginPage(QObject *parent)
: QObject(parent) : QObject(parent)
, inferredServerAddress_() , inferredServerAddress_()
{ {
[[maybe_unused]] static auto ignored = qRegisterMetaType<mtx::responses::Login>();
connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk, Qt::QueuedConnection); connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk, Qt::QueuedConnection);
connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError, Qt::QueuedConnection); connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError, Qt::QueuedConnection);
connect( connect(