fix submodules

This commit is contained in:
Andrei Yankovich 2021-05-27 16:44:14 +03:00
parent 8a82eb37b1
commit 1449f5044f
6 changed files with 3 additions and 124 deletions

View File

@ -14,8 +14,6 @@
<file>SnakeProjectModule/MainMenu.qml</file>
<file>SnakeProjectModule/MainMenuButton.qml</file>
<file>SnakeProjectModule/Metrix.qml</file>
<file>SnakeProjectModule/NotificationForm.qml</file>
<file>SnakeProjectModule/NotificationServiceView.qml</file>
<file>SnakeProjectModule/PagePopUp.qml</file>
<file>SnakeProjectModule/PropertyView.qml</file>
<file>SnakeProjectModule/Scene.qml</file>

View File

@ -1,84 +0,0 @@
import QtQuick 2.11
import QtQuick.Controls 2.3
import QtQuick.Controls.Material 2.0
import QtQuick.Layouts 1.3
BasePopUp {
id : popup
property string text: qsTr("Message")
property string img: ""
property string titleText: qsTr("Message")
property int type: 0
function _getBackGraundColor(type) {
switch(type) {
case 1: return "#FFC107"
case 2: return "#FF5722"
}
return Material.background
}
autoClose: true;
closeInterval: 5000
margins: 0
margin: 0
spacing: 0
backgroundColor: _getBackGraundColor(type);
Page {
id: page
anchors.fill: parent
spacing: 0
background: Rectangle {
color: "#00000000"
}
header: Label {
text: titleText
horizontalAlignment: Text.AlignHCenter
}
contentItem:
RowLayout {
id: rowLayout
spacing: 5
clip: true
Rectangle {
color: "#00000000"
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.preferredWidth: rowLayout.height;
Layout.preferredHeight: rowLayout.height;
Image {
id: image
fillMode: Image.PreserveAspectCrop
clip: true
anchors.fill: parent;
source: img
}
}
Label {
id: message
text: popup.text
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.fillHeight: true;
Layout.fillWidth: true;
clip: true
wrapMode: Text.WordWrap
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
}
}
}
}

View File

@ -1,30 +0,0 @@
import QtQuick 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.12
Item {
readonly property var model: notificationService;
readonly property var msg: model.notify
readonly property var history: model.history
NotificationForm {
id: notyfyView
titleText : msg.title;
text: (msg)? msg.text: "";
img: (msg)? msg.img: "";
type: (msg)? msg.type: 0;
x: parent.width - width - margin;
y: margin;
width: 6 * metrix.controlPtMaterial;
height: width * 0.5
}
onMsgChanged: {
notyfyView._show();
}
}

View File

@ -2,6 +2,8 @@ import QtQuick 2.12
import QtQuick.Window 2.12
import QtQuick.Controls 2.12
import NotifyModule 1.0
ApplicationWindow {
id: mainWindow;
visible: true;

View File

@ -128,13 +128,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NotificationForm</name>
<message>
<source>Message</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Scene</name>
<message>

@ -1 +1 @@
Subproject commit 61b683c0591a41394e30d8f1099a856d7f4a552e
Subproject commit 69e823353284a1bba33569072428ea44d1a0e332