diff --git a/imports/Spectral/Component/FullScreenImage.qml b/imports/Spectral/Component/FullScreenImage.qml
index 9bb380c07..8ca750e6b 100644
--- a/imports/Spectral/Component/FullScreenImage.qml
+++ b/imports/Spectral/Component/FullScreenImage.qml
@@ -11,7 +11,7 @@ ApplicationWindow {
visible: true
visibility: Qt.WindowFullScreen
- title: "Image View - " + filename
+ title: i18n("Image View - %1", filename)
color: "#BB000000"
@@ -41,11 +41,6 @@ ApplicationWindow {
width: 64
height: 64
- contentItem: MaterialIcon {
- icon: "\ue5cd"
- color: "white"
- }
-
onClicked: root.destroy()
}
}
diff --git a/imports/Spectral/Component/MaterialIcon.qml b/imports/Spectral/Component/MaterialIcon.qml
deleted file mode 100644
index 83c4d7e13..000000000
--- a/imports/Spectral/Component/MaterialIcon.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
-
-import Spectral.Setting 0.1
-import Spectral.Font 0.1
-
-Text {
- property alias icon: materialLabel.text
-
- id: materialLabel
-
- color: MPalette.foreground
- font.pixelSize: 24
- font.family: MaterialFont.name
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
-}
diff --git a/imports/Spectral/Component/Timeline/AudioDelegate.qml b/imports/Spectral/Component/Timeline/AudioDelegate.qml
index cb537b609..f868d1c61 100644
--- a/imports/Spectral/Component/Timeline/AudioDelegate.qml
+++ b/imports/Spectral/Component/Timeline/AudioDelegate.qml
@@ -1,7 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.12
import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0 as Platform
import QtMultimedia 5.12
@@ -13,7 +12,6 @@ import Spectral.Setting 0.1
import Spectral.Component 2.0
import Spectral.Dialog 2.0
import Spectral.Menu.Timeline 2.0
-import Spectral.Font 0.1
import Spectral.Effect 2.0
RowLayout {
@@ -71,9 +69,7 @@ RowLayout {
contentItem: RowLayout {
ToolButton {
- contentItem: MaterialIcon {
- icon: audio.playbackState == Audio.PlayingState ? "\ue034" : "\ue405"
- }
+ icon.name: audio.playbackState == Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
onClicked: {
if (audio.playbackState == Audio.PlayingState) {
diff --git a/imports/Spectral/Component/Timeline/FileDelegate.qml b/imports/Spectral/Component/Timeline/FileDelegate.qml
index f333079e0..73c8ce94e 100644
--- a/imports/Spectral/Component/Timeline/FileDelegate.qml
+++ b/imports/Spectral/Component/Timeline/FileDelegate.qml
@@ -12,7 +12,6 @@ import Spectral.Setting 0.1
import Spectral.Component 2.0
import Spectral.Dialog 2.0
import Spectral.Menu.Timeline 2.0
-import Spectral.Font 0.1
import Spectral.Effect 2.0
RowLayout {
@@ -69,9 +68,7 @@ RowLayout {
contentItem: RowLayout {
ToolButton {
- contentItem: MaterialIcon {
- icon: progressInfo.completed ? "\ue5ca" : "\ue2c4"
- }
+ icon.name: progressInfo.completed ? "document-open" : "document-save"
onClicked: progressInfo.completed ? openSavedFile() : saveFileAs()
}
diff --git a/imports/Spectral/Component/Timeline/ImageDelegate.qml b/imports/Spectral/Component/Timeline/ImageDelegate.qml
index d1e025a81..eaef076ce 100644
--- a/imports/Spectral/Component/Timeline/ImageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/ImageDelegate.qml
@@ -1,7 +1,6 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
-import QtQuick.Controls.Material 2.12
import QtGraphicalEffects 1.0
import Qt.labs.platform 1.0 as Platform
@@ -12,7 +11,6 @@ import Spectral.Component 2.0
import Spectral.Dialog 2.0
import Spectral.Menu.Timeline 2.0
import Spectral.Effect 2.0
-import Spectral.Font 0.1
Image {
readonly property bool isAnimated: contentType === "image/gif"
diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index 821f99e6c..3f0359003 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -100,7 +100,7 @@ RowLayout {
Layout.fillWidth: true
text: replyVisible ? reply.author.displayName : ""
- color: replay.author.color
+ color: reply.author.color
wrapMode: Text.Wrap
}
diff --git a/imports/Spectral/Dialog/InviteUserDialog.qml b/imports/Spectral/Dialog/InviteUserDialog.qml
index d2be719a7..708ab84eb 100644
--- a/imports/Spectral/Dialog/InviteUserDialog.qml
+++ b/imports/Spectral/Dialog/InviteUserDialog.qml
@@ -131,12 +131,6 @@ Dialog {
visible: inRoom
- contentItem: MaterialIcon {
- icon: "\ue89e"
- color: MPalette.lighter
- font.pixelSize: 20
- }
-
background: RippleEffect {
circular: true
}
@@ -148,12 +142,6 @@ Dialog {
visible: !inRoom
- contentItem: MaterialIcon {
- icon: "\ue7fe"
- color: MPalette.lighter
- font.pixelSize: 20
- }
-
background: RippleEffect {
circular: true
diff --git a/imports/Spectral/Dialog/RoomSettingsDialog.qml b/imports/Spectral/Dialog/RoomSettingsDialog.qml
index 2032490a6..3b97659bf 100644
--- a/imports/Spectral/Dialog/RoomSettingsDialog.qml
+++ b/imports/Spectral/Dialog/RoomSettingsDialog.qml
@@ -134,13 +134,6 @@ Dialog {
padding: 8
contentItem: RowLayout {
- MaterialIcon {
- Layout.preferredWidth: 48
- Layout.preferredHeight: 48
-
- icon: "\ue8d4"
- }
-
ColumnLayout {
Layout.fillWidth: true
@@ -185,13 +178,6 @@ Dialog {
padding: 8
contentItem: RowLayout {
- MaterialIcon {
- Layout.preferredWidth: 48
- Layout.preferredHeight: 48
-
- icon: "\ue8d4"
- }
-
ColumnLayout {
Layout.fillWidth: true
@@ -289,19 +275,9 @@ Dialog {
color: MPalette.lighter
}
- MaterialIcon {
- icon: "\ue5cd"
-
- color: MPalette.lighter
- font.pixelSize: 12
-
- RippleEffect {
- anchors.fill: parent
-
- circular: true
-
- onClicked: room.removeLocalAlias(modelData)
- }
+ ToolButton {
+ icon.name: ""
+ onClicked: room.removeLocalAlias(modelData)
}
}
}
diff --git a/imports/Spectral/Dialog/UserDetailDialog.qml b/imports/Spectral/Dialog/UserDetailDialog.qml
index 0ef1bbf43..d4260ed27 100644
--- a/imports/Spectral/Dialog/UserDetailDialog.qml
+++ b/imports/Spectral/Dialog/UserDetailDialog.qml
@@ -81,15 +81,6 @@ Dialog {
spacing: 8
- MaterialIcon {
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- Layout.alignment: Qt.AlignTop
-
- icon: "\ue88f"
- color: MPalette.lighter
- }
-
ColumnLayout {
Layout.fillWidth: true
@@ -120,15 +111,6 @@ Dialog {
Layout.fillWidth: true
contentItem: RowLayout {
- MaterialIcon {
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- Layout.alignment: Qt.AlignTop
-
- icon: room.connection.isIgnored(user) ? "\ue7f5" : "\ue7f6"
- color: MPalette.lighter
- }
-
Label {
Layout.fillWidth: true
@@ -151,15 +133,6 @@ Dialog {
Layout.fillWidth: true
contentItem: RowLayout {
- MaterialIcon {
- Layout.preferredWidth: 32
- Layout.preferredHeight: 32
- Layout.alignment: Qt.AlignTop
-
- icon: "\ue5d9"
- color: MPalette.lighter
- }
-
Label {
Layout.fillWidth: true
diff --git a/imports/Spectral/Font/MaterialFont.qml b/imports/Spectral/Font/MaterialFont.qml
deleted file mode 100644
index c1a3d6644..000000000
--- a/imports/Spectral/Font/MaterialFont.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma Singleton
-import QtQuick 2.12
-
-FontLoader {
- source: "qrc:/assets/font/material.ttf"
-}
diff --git a/imports/Spectral/Font/qmldir b/imports/Spectral/Font/qmldir
deleted file mode 100644
index 96721b274..000000000
--- a/imports/Spectral/Font/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module Spectral.Font
-singleton MaterialFont 0.1 MaterialFont.qml
diff --git a/qml/RoomPage.qml b/qml/RoomPage.qml
index d6540c306..7aae45b96 100644
--- a/qml/RoomPage.qml
+++ b/qml/RoomPage.qml
@@ -225,6 +225,7 @@ Kirigami.ScrollablePage {
Layout.fillWidth: true
innerObject: ImageDelegate {
+ Layout.maximumWidth: parent.width
Layout.preferredWidth: Math.min(320, info.w)
Layout.preferredHeight: Math.min(320, info.h)
}
diff --git a/res.qrc b/res.qrc
index 37269067f..f982bfa12 100644
--- a/res.qrc
+++ b/res.qrc
@@ -13,14 +13,11 @@
imports/Spectral/Component/Timeline/qmldir
imports/Spectral/Component/Timeline/StateDelegate.qml
imports/Spectral/Component/AutoMouseArea.qml
- imports/Spectral/Component/MaterialIcon.qml
imports/Spectral/Component/qmldir
imports/Spectral/Effect/ElevationEffect.qml
imports/Spectral/Effect/qmldir
assets/img/icon.png
imports/Spectral/Setting/Setting.qml
- imports/Spectral/Font/MaterialFont.qml
- imports/Spectral/Font/qmldir
imports/Spectral/Setting/qmldir
imports/Spectral/Panel/qmldir
imports/Spectral/Panel/RoomDrawer.qml