ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Genesis commit.

Browse Source 
Not really, but a lot of renaming.
This commit is contained in:
Black Hat
2018-09-17 21:01:02 +08:00
parent 317a6d6ec8
commit 81a7172f29
31 changed files with 145 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qml/Login.qml
View File

@@ -4,7 +4,7 @@ import QtGraphicalEffects 1.0
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import Qt.labs.settings 1.0
import Matrique.Settings 0.1
import Spectral.Settings 0.1
import "component"

6
qml/Room.qml
View File

@@ -2,8 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Matrique 0.1
import Matrique.Settings 0.1
import Spectral 0.1
import Spectral.Settings 0.1
import "form"
@@ -16,7 +16,7 @@ Page {
id: roomListModel
onRoomAdded: room.getPreviousContent(20)
onNewMessage: if (!window.active) matriqueController.showMessage(roomName, content, icon)
onNewMessage: if (!window.active) spectralController.showMessage(roomName, content, icon)
}
Rectangle {

10
qml/Setting.qml
View File

@@ -2,8 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import Matrique 0.1
import Matrique.Settings 0.1
import Spectral 0.1
import Spectral.Settings 0.1
import "component"
import "form"
@@ -81,7 +81,7 @@ Page {
color: "white"
}
SwipeDelegate.onClicked: matriqueController.logout(connection)
SwipeDelegate.onClicked: spectralController.logout(connection)
}
onClicked: expanded = !expanded
@@ -116,7 +116,7 @@ Page {
MouseArea {
anchors.fill: parent
onClicked: matriqueController.setColor(connection.localUserId, modelData)
onClicked: spectralController.setColor(connection.localUserId, modelData)
}
}
}
@@ -246,7 +246,7 @@ Page {
source: "qrc:/asset/img/icon.png"
}
Label { text: "Matrique, an IM client for the Matrix protocol." }
Label { text: "Spectral, an IM client for the Matrix protocol." }
Label { text: "Released under GNU General Public License, version 3." }
}
}

0
qml/MatriqueSettings.qml → qml/SpectralSettings.qml
View File

2
qml/component/AutoLabel.qml
View File

@@ -1,7 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import Matrique.Settings 0.1
import Spectral.Settings 0.1
Label {
property bool coloredBackground

2
qml/component/AutoMouseArea.qml
View File

@@ -1,5 +1,5 @@
import QtQuick 2.9
import Matrique.Settings 0.1
import Spectral.Settings 0.1
MouseArea {
signal primaryClicked()

2
qml/component/EmojiPicker.qml
View File

@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Matrique 0.1
import Spectral 0.1
Popup {
property var textArea

2
qml/component/GenericBubble.qml
View File

@@ -1,7 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import Matrique.Settings 0.1
import Spectral.Settings 0.1
Control {
property bool highlighted: false

2
qml/component/MaterialIcon.qml
View File

@@ -1,7 +1,7 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import Matrique.Settings 0.1
import Spectral.Settings 0.1
Text {
property alias icon: materialLabel.text

8
qml/component/MessageDelegate.qml
View File

@@ -2,8 +2,8 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Matrique 0.1
import Matrique.Settings 0.1
import Spectral 0.1
import Spectral.Settings 0.1
import "qrc:/js/util.js" as Util
RowLayout {
@@ -206,7 +206,7 @@ RowLayout {
onClicked: {
if (downloadable.downloaded)
matriqueController.playAudio(progressInfo.localPath)
spectralController.playAudio(progressInfo.localPath)
else
{
playOnFinished = true
@@ -218,7 +218,7 @@ RowLayout {
background: DownloadableContent {
id: downloadable
onDownloadedChanged: downloaded && playOnFinished ? matriqueController.playAudio(progressInfo.localPath) : {}
onDownloadedChanged: downloaded && playOnFinished ? spectralController.playAudio(progressInfo.localPath) : {}
Component.onCompleted: {
messageRow.saveFileAs.connect(saveFileAs)

4
qml/component/RoomDrawer.qml
View File

@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.2
import QtQuick.Layouts 1.3
import Matrique 0.1
import Spectral 0.1
import "qrc:/js/util.js" as Util
@@ -30,7 +30,7 @@ Drawer {
Layout.alignment: Qt.AlignHCenter
hint: room ? room.displayName : "No name"
image: matriqueController.safeImage(room ? room.avatar : null)
image: spectralController.safeImage(room ? room.avatar : null)
}
Label {

2
qml/component/StateDelegate.qml
View File

@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Matrique.Settings 0.1
import Spectral.Settings 0.1
Label {
Layout.alignment: Qt.AlignHCenter

6
qml/form/RoomForm.qml
View File

@@ -3,8 +3,8 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0
import Matrique 0.1
import Matrique.Settings 0.1
import Spectral 0.1
import Spectral.Settings 0.1
import "qrc:/qml/component"
import "qrc:/qml/menu"
@@ -63,7 +63,7 @@ Item {
Layout.fillHeight: true
hint: currentRoom ? currentRoom.displayName : "No name"
image: matriqueController.safeImage(currentRoom ? currentRoom.avatar : null)
image: spectralController.safeImage(currentRoom ? currentRoom.avatar : null)
}
ColumnLayout {

4
qml/form/RoomListForm.qml
View File

@@ -4,9 +4,9 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.2
import QtQml.Models 2.3
import Matrique 0.1
import Spectral 0.1
import SortFilterProxyModel 0.2
import Matrique.Settings 0.1
import Spectral.Settings 0.1
import "qrc:/qml/component"
import "qrc:/qml/menu"

26
qml/main.qml
View File

@@ -4,8 +4,8 @@ import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2
import Qt.labs.settings 1.0
import QtGraphicalEffects 1.0
import Matrique 0.1
import Matrique.Settings 0.1
import Spectral 0.1
import Spectral.Settings 0.1
import "component"
import "form"
@@ -22,16 +22,16 @@ ApplicationWindow {
id: window
visible: true
title: qsTr("Matrique")
title: qsTr("Spectral")
Material.theme: MSettings.darkTheme ? Material.Dark : Material.Light
Material.accent: matriqueController.color(currentConnection ? currentConnection.localUserId : "")
Material.accent: spectralController.color(currentConnection ? currentConnection.localUserId : "")
FontLoader { id: materialFont; source: "qrc:/asset/font/material.ttf" }
Controller {
id: matriqueController
id: spectralController
onShowWindow: {
window.show()
@@ -43,11 +43,11 @@ ApplicationWindow {
AccountListModel {
id: accountListModel
controller: matriqueController
controller: spectralController
}
Popup {
property bool busy: matriqueController.busy
property bool busy: spectralController.busy
x: (window.width - width) / 2
y: (window.height - height) / 2
@@ -67,7 +67,7 @@ ApplicationWindow {
Component {
id: loginPage
Login { controller: matriqueController }
Login { controller: spectralController }
}
Room {
@@ -130,7 +130,7 @@ ApplicationWindow {
image: user.avatar
}
highlightColor: matriqueController.color(user.id)
highlightColor: spectralController.color(user.id)
page: roomPage
@@ -187,7 +187,7 @@ ApplicationWindow {
}
}
onAccepted: matriqueController.createRoom(currentConnection, addRoomDialogNameTextField.text, addRoomDialogTopicTextField.text)
onAccepted: spectralController.createRoom(currentConnection, addRoomDialogNameTextField.text, addRoomDialogTopicTextField.text)
}
}
MenuItem {
@@ -213,7 +213,7 @@ ApplicationWindow {
placeholderText: "#matrix:matrix.org"
}
onAccepted: matriqueController.joinRoom(currentConnection, joinRoomDialogTextField.text)
onAccepted: spectralController.joinRoom(currentConnection, joinRoomDialogTextField.text)
}
}
@@ -292,8 +292,8 @@ ApplicationWindow {
}
Component.onCompleted: {
matriqueController.initiated.connect(function() {
if (matriqueController.accountCount == 0) stackView.push(loginPage)
spectralController.initiated.connect(function() {
if (spectralController.accountCount == 0) stackView.push(loginPage)
})
}
}

2
qml/menu/RoomContextMenu.qml
View File

@@ -1,6 +1,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import Matrique 0.1
import Spectral 0.1
Menu {
property var model: null