remove old depricated code

src/Client/CMakeLists.txt

@@ -64,3 +64,9 @@ else()
     addDeployFromCustomFile("SnakeProject"
                             "${CMAKE_CURRENT_SOURCE_DIR}/../../Deploy/SnakeProject.json")
 endif()
+
+
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_import_qml_plugins(${CURRENT_PROJECT})
+    qt_finalize_executable(${CURRENT_PROJECT})
+endif()

src/Client/main.cpp

@@ -6,7 +6,6 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
     QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;

src/ClientLib/CMakeLists.txt

@@ -22,12 +22,15 @@ file(GLOB SOURCE_CPP
 set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/private")
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick Concurrent REQUIRED)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick QuickControls2 Concurrent REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick Concurrent REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick QuickControls2 Concurrent REQUIRED)
 
 add_library(${CURRENT_PROJECT} ${SOURCE_CPP} ${SOURCE_QRC})
 
-target_link_libraries(${CURRENT_PROJECT} PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::Concurrent QuasarApp QmlNotyfyService)
+target_link_libraries(${CURRENT_PROJECT} PUBLIC
+                        Qt${QT_VERSION_MAJOR}::Concurrent
+                        QuasarApp
+                        QmlNotyfyService)
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
@@ -37,4 +40,3 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts)
 prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
 
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
-

src/ClientLib/SnakeProject.qrc

@@ -2,40 +2,27 @@
     <qresource prefix="/">
         <file>SnakeProjectModule/qmldir</file>
         <file>SnakeProjectModule/SnakeProject.qml</file>
-        <file>SnakeProjectModule/About.qml</file>
-        <file>SnakeProjectModule/AboutPage.qml</file>
-        <file>SnakeProjectModule/BasePopUp.qml</file>
-        <file>SnakeProjectModule/FrameView.qml</file>
         <file>SnakeProjectModule/GraphicItem.qml</file>
         <file>SnakeProjectModule/ImageView.qml</file>
-        <file>SnakeProjectModule/LeftBoxSideBar.qml</file>
-        <file>SnakeProjectModule/LeftSideBar.qml</file>
-        <file>SnakeProjectModule/LoginView.qml</file>
         <file>SnakeProjectModule/MainMenu.qml</file>
         <file>SnakeProjectModule/MainMenuButton.qml</file>
         <file>SnakeProjectModule/Metrix.qml</file>
         <file>SnakeProjectModule/PagePopUp.qml</file>
         <file>SnakeProjectModule/PropertyView.qml</file>
         <file>SnakeProjectModule/Scene.qml</file>
-        <file>SnakeProjectModule/SelectLevelScene.qml</file>
         <file>SnakeProjectModule/SettingsView.qml</file>
-        <file>SnakeProjectModule/SideBar.qml</file>
         <file>SnakeProjectModule/SnakeItem.qml</file>
-        <file>SnakeProjectModule/TextInput.qml</file>
-        <file>SnakeProjectModule/UserView.qml</file>
     </qresource>
     <qresource prefix="/SnakeTr">
         <file>languages/en.qm</file>
+        <file>languages/uk.qm</file>
+        <file>languages/tr.qm</file>
+        <file>languages/ja.qm</file>
+        <file>languages/ru.qm</file>
     </qresource>
     <qresource prefix="/images">
         <file>res/up.svg</file>
         <file>res/logo.png</file>
         <file>res/icon.ico</file>
-        <file>res/defaultUser.png</file>
-        <file>res/defaultSnake.png</file>
-        <file>res/cogs-solid.svg</file>
-        <file>res/box-texture.png</file>
-        <file>res/asphalt.jpg</file>
-        <file>res/Settings-icon.png</file>
     </qresource>
 </RCC>

src/ClientLib/SnakeProject/clientapp.cpp

@@ -42,7 +42,7 @@ void ClientApp::initLang() {
 bool ClientApp::init(QQmlApplicationEngine *engine) {
 
     qputenv("QT_QUICK_CONTROLS_MATERIAL_THEME", initTheme());
-    qputenv("QT_QUICK_CONTROLS_STYLE", "material");
+    qputenv("QT_QUICK_CONTROLS_STYLE", "Basic");
 
     qmlRegisterAnonymousType<GuiObject>("GuiObject", 1);
     qmlRegisterAnonymousType<Diff>("Diff", 1);

src/ClientLib/SnakeProject/imageprovider.cpp

@@ -6,6 +6,8 @@
 ImageProvider::ImageProvider() = default;
 ImageProvider::~ImageProvider() = default;
 
+#define IgnoreQFuture(x) x.isRunning()
+
 QQuickImageResponse *ImageProvider::requestImageResponse(const QString &id,
                                                          const QSize &requestedSize) {
 
@@ -28,7 +30,7 @@ QQuickImageResponse *ImageProvider::requestImageResponse(const QString &id,
 
     };
 
-    QtConcurrent::run(readImage);
+    IgnoreQFuture(QtConcurrent::run(readImage));
 
     return response;
 }

src/ClientLib/SnakeProjectModule/About.qml

@@ -1,29 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls.Material 2.0
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
-
-Page {
-
-    signal close();
-
-    title: "Page"
-    header: Rectangle {
-        height: parent.height * 0.1
-        color: "#cccccc"
-        Label {
-            id: title
-            text: qsTr("About")
-            font.pointSize: 13
-            wrapMode: Text.WordWrap
-            verticalAlignment: Text.AlignVCenter
-            horizontalAlignment: Text.AlignHCenter
-            anchors.fill: parent;
-            anchors.margins: 5
-        }
-    }
-
-    contentItem: AboutPage{
-    }
-
-}

src/ClientLib/SnakeProjectModule/AboutPage.qml

@@ -1,72 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.0
-import QtQuick.Layouts 1.3
-
-Item {
-    clip: true
-    ColumnLayout {
-        id: columnLayout
-        anchors.fill: parent
-        spacing: 10
-
-        Rectangle {
-            Layout.preferredHeight: parent.width / 4
-            Layout.preferredWidth: parent.width / 4
-            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            color: "#00000000"
-            Image {
-                id: aboutLogo
-                fillMode: Image.PreserveAspectFit
-
-                source: "qrc:/images/res/logo.png"
-                anchors.margins: 10
-                anchors.fill: parent
-
-            }
-        }
-
-
-
-        Flickable {
-            id: flickable
-            clip: true
-            flickableDirection: Flickable.VerticalFlick
-
-            Layout.preferredHeight: parent.height - parent.height / 2.8
-
-
-            TextArea.flickable: TextArea {
-                id: textArea
-                textFormat: Qt.RichText
-                wrapMode: TextArea.Wrap
-                readOnly: true
-                persistentSelection: true
-
-                leftPadding: 6
-                rightPadding: 6
-                topPadding: 0
-                bottomPadding: 0
-                background: null
-
-                text: qsTr("Product of QuasarrApp");
-                font.family: "Verdana"
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignTop
-
-                onLinkActivated: Qt.openUrlExternally(link)
-            }
-
-            ScrollBar.vertical: ScrollBar { }
-            Layout.fillWidth: true
-
-        }
-
-    }
-
-}
-
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/

src/ClientLib/SnakeProjectModule/BasePopUp.qml

@@ -1,71 +0,0 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.0
-import QtQuick.Layouts 1.3
-import QtGraphicalEffects 1.12
-
-Dialog {
-    id : basePopup
-    width: 200
-    height: 100
-    x: 0
-    y: 0
-
-    transformOrigin: Item.Center
-
-    property bool autoClose: true
-    property bool clickClose: true
-
-    property int closeInterval: 15000;
-    property int margin : 0
-    property color backgroundColor: Material.background
-
-    background: Item {
-        id: bacground
-
-        Rectangle{
-            anchors.fill: parent
-            id: backCorner
-            color: backgroundColor
-            radius: metrix.mm
-        }
-
-        DropShadow {
-            anchors.fill: parent
-            source: backCorner
-            color: "#80000000"
-            verticalOffset: 10
-            samples: 30
-        }
-    }
-
-    function _show() {
-
-        if (autoClose) {
-            timerAutoClose.start();
-        }
-
-        open();
-    }
-
-    Timer {
-        id: timerAutoClose;
-        running: false;
-        repeat: false;
-        interval: closeInterval;
-
-        onTriggered: {
-            close();
-        }
-    }
-
-    onClosed: {
-        if (autoClose)
-            opacity = 0;
-    }
-
-    closePolicy: (!clickClose || autoClose)? Popup.NoAutoClose: Popup.CloseOnReleaseOutside
-
-    onRejected: close()
-
-}

src/ClientLib/SnakeProjectModule/FrameView.qml

@@ -1,32 +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
-
-Frame {
-    id: frameVew
-    property bool translucent: true
-    property bool showBorder: true
-
-    function _backGroundColor() {
-        if (translucent) {
-            if (Material.theme == Material.Dark) {
-                return "#50000000";
-            }
-
-            return "#50ffffff";
-        }
-
-        return Material.background;
-    }
-
-    background: Rectangle {
-        color: _backGroundColor()
-        border.color: (Material.theme == Material.Dark)? "#000000": "#cfcfcf"
-        border.width:  (showBorder)? 1 : 0
-        radius: metrix.mm
-    }
-
-    padding: 3 * metrix.mm
-}

src/ClientLib/SnakeProjectModule/GraphicItem.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick
 
 Rectangle {
     id: graphicItem

src/ClientLib/SnakeProjectModule/ImageView.qml

@@ -1,8 +1,7 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
-import QtGraphicalEffects 1.12
 
 Item {
     id: imageView
@@ -27,37 +26,6 @@ Item {
         anchors.fill: parent
     }
 
-    DropShadow {
-        anchors.fill: img
-        horizontalOffset: (hold)? 20: (hovered)? 10: 5
-        verticalOffset: (hold)? 20: (hovered)? 10: 5
-        radius: 8.0
-        samples: 17
-        Behavior on horizontalOffset {
-
-            ColorAnimation {
-                duration: 200
-            }
-        }
-
-        Behavior on verticalOffset {
-
-            ColorAnimation {
-                duration: 200
-            }
-        }
-
-
-        Behavior on color {
-
-            ColorAnimation {
-                duration: 200
-            }
-        }
-        color: (hold)? "#80000000": (hovered)? "#60000000": "#40000000"
-        source: img
-    }
-
     MouseArea {
         anchors.fill: parent
         hoverEnabled: true

src/ClientLib/SnakeProjectModule/LeftBoxSideBar.qml

@@ -1,13 +0,0 @@
-import QtQuick 2.0
-
-LeftSideBar {
-    resizeHeight: true;
-    closedHeight: closedWidth;
-    openHeight: 10 * metrix.pt;
-    openWidth: 10 * metrix.pt;
-    anchors.left: parent.left;
-    anchors.top: undefined;
-    anchors.bottom: undefined;
-
-}
-

src/ClientLib/SnakeProjectModule/LeftSideBar.qml

@@ -1,35 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.3
-
-SideBar {
-    id: leftSideBar
-    anchors.left: parent.left;
-    anchors.top: parent.top;
-    anchors.bottom: parent.bottom;
-    closedWidth: closeButton.width + padding * 2;
-    openWidth: 10 * metrix.pt;
-    resizeHeight: false;
-
-    header:
-        RowLayout {
-
-        Button {
-            id: closeButton
-            text: leftSideBar.isOpened? "<" : ">"
-
-            Layout.preferredHeight: metrix.controlPtMaterial;
-            Layout.preferredWidth: metrix.controlPtMaterial;
-
-            Layout.alignment: Qt.AlignRight | Qt.AlignTop
-            onClicked: {
-                if (leftSideBar.isOpened)
-                    leftSideBar.hide();
-                else
-                    leftSideBar.show();
-            }
-
-        }
-    }
-}

src/ClientLib/SnakeProjectModule/LoginView.qml

@@ -1,301 +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 {
-    id: element
-
-    property int loginStatus : 0
-
-    readonly property int currentView: tabBar.currentIndex
-    readonly property var resultEnum: [
-        qsTr("Success"), // 0
-        qsTr("Password must be at least 8 characters"), // 1
-        qsTr("Name must be at least 1 characters"), // 2
-        qsTr("Passwords must match"), // 3
-
-        qsTr("The letter must match the pattern 'X@xxxx.xxx'") // 4
-
-    ]
-
-    signal sigNewUser(var gmail, var password);
-    signal sigLogin(var gmail, var password);
-    signal toOffline();
-
-
-    function _checkLogin() {
-        const pass = loginPass.text;
-        const email = loginEmail.text;
-
-        if (pass.length < 8) {
-            return 1;
-        }
-
-        if (email.search(/[a-z\-A-Z0-9_]+@[a-z\-A-Z0-9_]+\.[a-z\-A-Z0-9_]+/) < 0) {
-            return 4;
-        }
-
-        return 0;
-
-    }
-
-    function _checkRegister () {
-        const pass = registerPassword.text;
-        const pass2 = registerPassword2.text;
-
-        const email = registerEmail.text;
-
-        if (pass.length < 8) {
-            return 1;
-        }
-
-        if (pass !== pass2) {
-            return 3;
-        }
-
-        if (email.search(/[a-z\-A-Z0-9_]+@[a-z\-A-Z0-9_]+\.[a-z\-A-Z0-9_]+/) < 0) {
-            return 4;
-        }
-
-        return 0;
-    }
-
-    function checkData(isregisterForm) {
-        if (isregisterForm) {
-            return _checkRegister();
-        }
-
-        return _checkLogin();
-    }
-
-    SwipeView {
-        id: swipeView
-        anchors.bottom: bottons.top
-        anchors.top: tabBar.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        clip: true
-
-        currentIndex: tabBar.currentIndex
-
-        Item {
-            id: loginPage
-
-            GridLayout {
-                id: columnLayout
-                anchors.fill: parent
-                columns: 2
-                rows: 2
-                Label {
-                    text: qsTr("Email")
-                }
-
-                TextField {
-                    id: loginEmail
-                    placeholderText: "Enter Your Email"
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.fillWidth: true
-                }
-
-
-                Label {
-                    text: qsTr("Passsword")
-                }
-                TextField {
-                    id: loginPass
-                    placeholderText: qsTr("Enter Your passsword")
-
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-
-                    echoMode: TextInput.Password
-                    cursorVisible: true
-                    Layout.fillWidth: true
-
-                }
-
-            }
-        }
-
-        Item {
-            id: rigisterPage
-            GridLayout {
-
-                anchors.fill: parent
-
-                columns: 2
-                rows: 3
-
-                Label {
-                    text: qsTr("Email")
-                }
-                TextField {
-                    id: registerEmail;
-                    placeholderText: qsTr("Enter Your Email")
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.fillWidth: true
-
-                }
-
-                Label {
-                    text: qsTr("Password")
-                }
-                TextField {
-                    id: registerPassword;
-
-                    placeholderText: qsTr("Enter Your passsword")
-
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.fillWidth: true
-                    echoMode: TextInput.Password
-                    cursorVisible: true
-                }
-
-                Label {
-                    text: qsTr("Repeat password")
-                }
-                TextField {
-                    id: registerPassword2;
-
-                    placeholderText: qsTr("Enter Your passsword again")
-
-                    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.fillWidth: true
-                    echoMode: TextInput.Password
-                    cursorVisible: true
-                }
-            }
-        }
-    }
-
-    TabBar {
-        id: tabBar
-        anchors.top: parent.top
-        anchors.topMargin: 0
-        anchors.left: parent.left
-        anchors.leftMargin: 0
-        anchors.right: parent.right
-        anchors.rightMargin: 0
-
-        TabButton {
-            id: login
-            text: qsTr("Sign in")
-            checkable: false
-        }
-
-        TabButton {
-            id: register
-            text: qsTr("Sign Up")
-        }
-    }
-
-    RowLayout {
-        id : bottons
-        Button {
-            text: qsTr("Cancel")
-
-            onClicked: {
-                Qt.quit()
-            }
-
-        }
-
-        Item {
-            Layout.fillWidth: true
-        }
-
-        Button {
-            text: tabBar.currentItem.text
-
-            onClicked: {
-
-                const messageIndex = checkData(tabBar.currentIndex);
-                if (messageIndex === 0) {
-
-                    if (tabBar.currentIndex) {
-                        // register request
-                        sigNewUser(registerEmail.text, registerPassword);
-                    } else {
-                        //login request
-                        sigLogin(loginEmail.text, loginPass.text);
-                    }
-                } else {
-
-                    notificationService.setNotify(qsTr("Error"),
-                                               resultEnum[messageIndex],
-                                               "",
-                                               2);
-                }
-            }
-
-        }
-
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-
-    onLoginStatusChanged: {
-        if (loginStatus === 2)
-            busy._show();
-        else {
-            busy.close();
-        }
-    }
-
-    PagePopUp {
-        id: busy
-        modal: true
-        autoClose: false;
-        clickClose: false;
-        BusyIndicator {
-            running: true
-            anchors.fill: parent
-        }
-        height: 2 * metrix.controlPtMaterial
-        width: height
-
-    }
-
-
-    FrameView {
-        visible: loginStatus === 4
-        anchors.fill: parent
-        translucent: false
-        showBorder: false
-        ColumnLayout {
-            anchors.fill: parent
-
-            Label {
-                text: qsTr("You need connect to server");
-                font.pixelSize: metrix.controlPtMaterial;
-                wrapMode: Text.WordWrap
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-
-                Layout.fillHeight: true
-                Layout.fillWidth: true
-
-            }
-
-            Button {
-                text: qsTr("Use OfflineMode");
-                Layout.alignment: Qt.AlignHCenter
-
-                onClicked: {
-                    toOffline();
-                }
-
-            }
-        }
-
-    }
-}
-
-/*##^## Designer {
-    D{i:0;autoSize:true;height:480;width:640}D{i:3;anchors_height:100;anchors_width:100;anchors_x:228;anchors_y:63}
-D{i:1;anchors_height:200;anchors_width:200;anchors_x:205;anchors_y:53}D{i:11;anchors_width:240;anchors_x:226;anchors_y:21}
-}
- ##^##*/

src/ClientLib/SnakeProjectModule/MainMenu.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.9
+import QtQuick
-import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.3
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
 Item {
     id: item1
@@ -65,7 +65,7 @@ Item {
             text: qsTr("My Settings")
 
             onClicked: {
-                settingsPopUp._show();
+                settingsPopUp.open();
 
             }
 
@@ -82,14 +82,6 @@ Item {
 
     }
 
-    PagePopUp {
-        id: about;
-        width: parent.width / 2
-        height: parent.height / 2;
-
-        source: About {}
-    }
-
     PagePopUp {
         id: settingsPopUp
         source: SettingsView {
@@ -99,8 +91,6 @@ Item {
 
         standardButtons:  Dialog.Save | Dialog.Cancel | Dialog.RestoreDefaults
         modal: false;
-        autoClose: false
-        clickClose: true
         width: 12 * metrix.controlPtMaterial
         height: 8 * metrix.controlPtMaterial;
 

src/ClientLib/SnakeProjectModule/MainMenuButton.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
 Button {
     id: exit

src/ClientLib/SnakeProjectModule/Metrix.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.0
+import QtQuick
-import QtQuick.Window 2.12
+import QtQuick.Window
-import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.3
+import QtQuick.Controls
 
 Item {
     readonly property int pointCount: 100;

src/ClientLib/SnakeProjectModule/PagePopUp.qml

@@ -1,12 +1,11 @@
-import QtQuick 2.11
+import QtQuick
-import QtQuick.Controls 2.3
+import QtQuick.Controls
-import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
-BasePopUp {
+Dialog {
     id: pagePopUp
     property var source: null
-    autoClose: false
 
     Item {
         id: sourceVal

src/ClientLib/SnakeProjectModule/PropertyView.qml

@@ -1,8 +1,7 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
-import QtGraphicalEffects 1.12
 
 Item {
     id: properyView
@@ -41,17 +40,6 @@ Item {
         }
     }
 
-    DropShadow {
-        anchors.fill: background
-        horizontalOffset: 2
-        verticalOffset: 2
-        radius: 8.0
-        samples: 17
-
-        color:  "#80000000";
-        source: background
-    }
-
     MouseArea {
         anchors.fill: parent
         hoverEnabled: true

src/ClientLib/SnakeProjectModule/Scene.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.11
+import QtQuick
-import QtQuick.Controls.Material 2.0
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.3
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
 Item {
     id: scene;

src/ClientLib/SnakeProjectModule/SelectLevelScene.qml

@@ -1,217 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.0
-import QtQuick.Layouts 1.3
-
-Item {
-    id: item1
-
-    GridLayout {
-        id: gridLayout
-        rows: 8
-        columnSpacing: 5
-        rowSpacing: 5
-        anchors.rightMargin: 200
-        anchors.leftMargin: 200
-        anchors.bottomMargin: 100
-        anchors.topMargin: 50
-        anchors.fill: parent
-        columns: 8
-
-        RoundButton {
-            id: roundButton
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "1"
-        }
-
-        RoundButton {
-            id: roundButton1
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "2"
-        }
-
-        RoundButton {
-            id: roundButton2
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "3"
-        }
-
-        RoundButton {
-            id: roundButton3
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "4"
-        }
-
-        RoundButton {
-            id: roundButton4
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "5"
-        }
-
-        RoundButton {
-            id: roundButton5
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "6"
-        }
-
-        RoundButton {
-            id: roundButton6
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "7"
-        }
-
-        RoundButton {
-            id: roundButton7
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "8"
-        }
-
-        RoundButton {
-            id: roundButton8
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "9"
-        }
-
-        RoundButton {
-            id: roundButton9
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "10"
-        }
-
-        RoundButton {
-            id: roundButton10
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "11"
-        }
-
-        RoundButton {
-            id: roundButton11
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "12"
-        }
-
-        RoundButton {
-            id: roundButton12
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "13"
-        }
-
-        RoundButton {
-            id: roundButton13
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "14"
-        }
-
-        RoundButton {
-            id: roundButton14
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "15"
-        }
-
-        RoundButton {
-            id: roundButton15
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "16"
-        }
-
-        RoundButton {
-            id: roundButton16
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "17"
-        }
-
-        RoundButton {
-            id: roundButton17
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "18"
-        }
-
-        RoundButton {
-            id: roundButton18
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "19"
-        }
-
-        RoundButton {
-            id: roundButton19
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "20"
-        }
-
-        RoundButton {
-            id: roundButton20
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "21"
-        }
-
-        RoundButton {
-            id: roundButton21
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "22"
-        }
-
-        RoundButton {
-            id: roundButton22
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "23"
-        }
-
-        RoundButton {
-            id: roundButton23
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "24"
-        }
-
-        RoundButton {
-            id: roundButton24
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "25"
-        }
-
-        RoundButton {
-            id: roundButton25
-            width: 10*mainWindow.point
-            height: 10*mainWindow.point
-            text: "26"
-        }
-    }
-
-    Label {
-        id: label
-        x: 187
-        color: "#795548"
-        text: qsTr("Select Level")
-        font.bold: true
-        font.pixelSize: 30
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: parent.top
-        anchors.topMargin: 30
-    }
-
-}
-

src/ClientLib/SnakeProjectModule/SettingsView.qml

@@ -1,7 +1,7 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material
-import QtQuick.Controls 2.12
+import QtQuick.Controls
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts
 
 Item {
     id: settingsView

src/ClientLib/SnakeProjectModule/SideBar.qml

@@ -1,103 +0,0 @@
-import QtQuick 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Controls 2.12
-
-FrameView {
-    id: sideBar
-    property int openHeight: 10 * metrix.pt
-    property int closedHeight: 1 * metrix.pt
-    property int openWidth: 10 * metrix.pt
-    property int closedWidth: 1 * metrix.pt
-    property int headerHeight : 1 * metrix.controlPtMaterial
-
-    clip: true;
-
-    property bool resizeWidth: true
-    property bool resizeHeight: true
-
-    property bool isOpened: true
-    property bool chainAnimation: true
-    property var source: null
-    property var header: null
-
-    readonly property bool openFinished: openHeight === height && openWidth == width;
-    readonly property bool closeFinished: closedHeight === height && closedWidth == width;
-
-    function show() {
-        if (resizeWidth && !(chainAnimation && resizeHeight))
-            width = openWidth;
-        if (resizeHeight )
-            height = openHeight;
-
-        isOpened = true;
-
-    }
-
-    function hide() {
-        if (resizeWidth && !(chainAnimation && resizeHeight))
-            width = closedWidth;
-        if (resizeHeight )
-            height = closedHeight;
-
-        isOpened = false;
-    }
-
-    Component.onCompleted: {
-        show();
-    }
-
-    onHeightChanged: {
-        if (isOpened) {
-            if (height === openHeight) {
-                sideBar.width = openWidth
-            }
-        }
-        else {
-            if (height === closedHeight) {
-                sideBar.width = closedWidth
-            }
-        }
-    }
-
-    Behavior on width {
-        PropertyAnimation {
-            duration: 1000
-            easing.type: Easing.OutBounce
-        }
-    }
-
-    Behavior on height {
-        PropertyAnimation {
-            duration: 1000
-            easing.type: Easing.OutBounce
-        }
-    }
-
-    Item {
-        id: headerVal
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        height: headerHeight
-    }
-
-    Item {
-        id: sourceVal
-
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: headerVal.bottom
-        anchors.bottom: parent.bottom
-
-    }
-
-    onSourceChanged: {
-        source.parent = sourceVal;
-        source.anchors.fill = sourceVal;
-    }
-
-    onHeaderChanged: {
-        header.parent = headerVal;
-        header.anchors.fill = headerVal;
-    }
-}

src/ClientLib/SnakeProjectModule/SnakeItem.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.9
+import QtQuick
 
 GraphicItem {
 

src/ClientLib/SnakeProjectModule/SnakeProject.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.12
+import QtQuick
-import QtQuick.Window 2.12
+import QtQuick.Window
-import QtQuick.Controls 2.12
+import QtQuick.Controls
 
-import NotifyModule 1.0
+import NotifyModule
 
 ApplicationWindow {
     id: mainWindow;

src/ClientLib/SnakeProjectModule/TextInput.qml

@@ -1,47 +0,0 @@
-import QtQuick 2.11
-import QtQuick.Controls 2.3
-import QtQuick.Controls.Material 2.0
-import QtQuick.Layouts 1.3
-
-
-Item {
-
-    signal close();
-
-    RowLayout {
-        anchors.fill: parent
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-
-        Label {
-            text: qsTr("Write you name ");
-
-        }
-
-        TextField {
-
-            id: input;
-
-            Layout.fillWidth: true
-            horizontalAlignment: Text.AlignHCenter
-
-        }
-
-        Button {
-
-            id: ok
-            text: qsTr("Ok")
-            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
-
-            onClicked: {
-                if (contr) {
-                    var rec = contr.getRecords()
-                    rec.append(input.text, contr.generalLong);
-                }
-
-                close();
-
-            }
-        }
-    }
-}

src/ClientLib/SnakeProjectModule/UserView.qml

@@ -1,112 +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
-
-
-Flickable {
-    id: userVewFlic
-
-    contentWidth: userVew.width
-    contentHeight: userVew.height
-    flickableDirection: Flickable.VerticalFlick;
-    property var model: null
-    signal tryConnect();
-
-    ScrollBar.vertical: ScrollBar {
-        width: metrix.pt
-    }
-
-    Item {
-        id: userVew
-
-        width: userVewFlic.width
-
-        ColumnLayout {
-            id: columnLayout
-            anchors.fill: parent
-
-            visible: (model)? !model.offline: false;
-
-            ImageView {
-                drawItem: "image://userItems/player/" + ((model)? model.id: -1).toString()
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-
-            }
-
-            PropertyView {
-                Layout.fillWidth: true
-                keyText: qsTr("You ");
-                valueText : (model)? model.name: -1
-
-            }
-
-            PropertyView {
-                valueText : ((model)? model.gmail: -1).toString()
-                Layout.fillWidth: true
-                keyText: qsTr("You gmail");
-            }
-
-            PropertyView {
-                keyText: qsTr("Money ");
-
-                valueText : ((model)? model.money: -1).toString()
-                Layout.fillWidth: true
-            }
-
-            PropertyView {
-                keyText: qsTr("Record ");
-
-                valueText : ((model)? model.record: -1).toString()
-                Layout.fillWidth: true
-            }
-
-            PropertyView {
-                keyText: qsTr("AvgRecord ");
-
-                valueText : ((model)? model.avgRecord: -1).toString()
-                Layout.fillWidth: true
-
-            }
-
-            PropertyView {
-                keyText: qsTr("Snake ");
-
-                valueImage : "image://userItems/item/" + ((model)? model.cureentSnake: -1).toString()
-                Layout.fillWidth: true
-
-            }
-        }
-
-        ColumnLayout {
-            visible: (model)? model.offline: false;
-            anchors.fill: parent
-
-            Label {
-                wrapMode: Text.WordWrap
-                Layout.fillWidth: true
-
-                text: qsTr("Offline mode. Your statistics will be frozen until you login your profile.");
-            }
-
-            Button {
-                text: qsTr("try conect to server ");
-
-                Layout.alignment: Qt.AlignHCenter
-
-                onClicked: {
-                    tryConnect();
-                }
-            }
-
-            Item {
-                Layout.fillHeight: true
-
-            }
-        }
-
-    }
-}
-

src/ClientLib/languages/en.ts

@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1">
-<context>
-    <name>About</name>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AboutPage</name>
-    <message>
-        <source>Product of QuasarrApp</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>Controller</name>
     <message>
@@ -26,81 +12,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>LoginView</name>
-    <message>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password must be at least 8 characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name must be at least 1 characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passwords must match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The letter must match the pattern &apos;X@xxxx.xxx&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passsword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Your passsword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Your Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Your passsword again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sign in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sign Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You need connect to server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use OfflineMode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>MainMenu</name>
     <message>
@@ -139,13 +50,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>SelectLevelScene</name>
-    <message>
-        <source>Select Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SettingsView</name>
     <message>
@@ -172,50 +76,4 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TextInput</name>
-    <message>
-        <source>Write you name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserView</name>
-    <message>
-        <source>You </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You gmail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Record </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AvgRecord </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snake </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Offline mode. Your statistics will be frozen until you login your profile.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>try conect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>

src/ClientLib/res/cogs-solid.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" data-prefix="fas" data-icon="cogs" class="svg-inline--fa fa-cogs fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M512.1 191l-8.2 14.3c-3 5.3-9.4 7.5-15.1 5.4-11.8-4.4-22.6-10.7-32.1-18.6-4.6-3.8-5.8-10.5-2.8-15.7l8.2-14.3c-6.9-8-12.3-17.3-15.9-27.4h-16.5c-6 0-11.2-4.3-12.2-10.3-2-12-2.1-24.6 0-37.1 1-6 6.2-10.4 12.2-10.4h16.5c3.6-10.1 9-19.4 15.9-27.4l-8.2-14.3c-3-5.2-1.9-11.9 2.8-15.7 9.5-7.9 20.4-14.2 32.1-18.6 5.7-2.1 12.1.1 15.1 5.4l8.2 14.3c10.5-1.9 21.2-1.9 31.7 0L552 6.3c3-5.3 9.4-7.5 15.1-5.4 11.8 4.4 22.6 10.7 32.1 18.6 4.6 3.8 5.8 10.5 2.8 15.7l-8.2 14.3c6.9 8 12.3 17.3 15.9 27.4h16.5c6 0 11.2 4.3 12.2 10.3 2 12 2.1 24.6 0 37.1-1 6-6.2 10.4-12.2 10.4h-16.5c-3.6 10.1-9 19.4-15.9 27.4l8.2 14.3c3 5.2 1.9 11.9-2.8 15.7-9.5 7.9-20.4 14.2-32.1 18.6-5.7 2.1-12.1-.1-15.1-5.4l-8.2-14.3c-10.4 1.9-21.2 1.9-31.7 0zm-10.5-58.8c38.5 29.6 82.4-14.3 52.8-52.8-38.5-29.7-82.4 14.3-52.8 52.8zM386.3 286.1l33.7 16.8c10.1 5.8 14.5 18.1 10.5 29.1-8.9 24.2-26.4 46.4-42.6 65.8-7.4 8.9-20.2 11.1-30.3 5.3l-29.1-16.8c-16 13.7-34.6 24.6-54.9 31.7v33.6c0 11.6-8.3 21.6-19.7 23.6-24.6 4.2-50.4 4.4-75.9 0-11.5-2-20-11.9-20-23.6V418c-20.3-7.2-38.9-18-54.9-31.7L74 403c-10 5.8-22.9 3.6-30.3-5.3-16.2-19.4-33.3-41.6-42.2-65.7-4-10.9.4-23.2 10.5-29.1l33.3-16.8c-3.9-20.9-3.9-42.4 0-63.4L12 205.8c-10.1-5.8-14.6-18.1-10.5-29 8.9-24.2 26-46.4 42.2-65.8 7.4-8.9 20.2-11.1 30.3-5.3l29.1 16.8c16-13.7 34.6-24.6 54.9-31.7V57.1c0-11.5 8.2-21.5 19.6-23.5 24.6-4.2 50.5-4.4 76-.1 11.5 2 20 11.9 20 23.6v33.6c20.3 7.2 38.9 18 54.9 31.7l29.1-16.8c10-5.8 22.9-3.6 30.3 5.3 16.2 19.4 33.2 41.6 42.1 65.8 4 10.9.1 23.2-10 29.1l-33.7 16.8c3.9 21 3.9 42.5 0 63.5zm-117.6 21.1c59.2-77-28.7-164.9-105.7-105.7-59.2 77 28.7 164.9 105.7 105.7zm243.4 182.7l-8.2 14.3c-3 5.3-9.4 7.5-15.1 5.4-11.8-4.4-22.6-10.7-32.1-18.6-4.6-3.8-5.8-10.5-2.8-15.7l8.2-14.3c-6.9-8-12.3-17.3-15.9-27.4h-16.5c-6 0-11.2-4.3-12.2-10.3-2-12-2.1-24.6 0-37.1 1-6 6.2-10.4 12.2-10.4h16.5c3.6-10.1 9-19.4 15.9-27.4l-8.2-14.3c-3-5.2-1.9-11.9 2.8-15.7 9.5-7.9 20.4-14.2 32.1-18.6 5.7-2.1 12.1.1 15.1 5.4l8.2 14.3c10.5-1.9 21.2-1.9 31.7 0l8.2-14.3c3-5.3 9.4-7.5 15.1-5.4 11.8 4.4 22.6 10.7 32.1 18.6 4.6 3.8 5.8 10.5 2.8 15.7l-8.2 14.3c6.9 8 12.3 17.3 15.9 27.4h16.5c6 0 11.2 4.3 12.2 10.3 2 12 2.1 24.6 0 37.1-1 6-6.2 10.4-12.2 10.4h-16.5c-3.6 10.1-9 19.4-15.9 27.4l8.2 14.3c3 5.2 1.9 11.9-2.8 15.7-9.5 7.9-20.4 14.2-32.1 18.6-5.7 2.1-12.1-.1-15.1-5.4l-8.2-14.3c-10.4 1.9-21.2 1.9-31.7 0zM501.6 431c38.5 29.6 82.4-14.3 52.8-52.8-38.5-29.6-82.4 14.3-52.8 52.8z"></path></svg>

submodules/SimpleQmlNotify

@@ -1 +1 @@
-Subproject commit 69e823353284a1bba33569072428ea44d1a0e332
+Subproject commit 720ef60415c4a8d94b91069ef83ab32597f4d081