Добавлен "Одинокий пастух". Исправлена ошибка с начальной загрузкой

Algorithm0 · Algorithm0 · commit 8077ef8eca92 · 2020-09-15T01:21:00.000+03:00
темы.
diff --git a/qml-other/panels/PersonPanel.qml b/qml-other/panels/PersonPanel.qml
@@ -71,27 +71,27 @@ Item {
     ListModel {
         id: modelView
         ListElement {
-            number: 1
+            num: 1
             title: qsTr("Что такое депрессия?")
         }
         ListElement {
-            number: 2
+            num: 2
             title: qsTr("Тест Вашего состояния")
         }
         ListElement {
-            number: 3
+            num: 3
             title: qsTr("Дневник мыслей")
         }
         ListElement {
-            number: 4
+            num: 4
             title: qsTr("Помощь специалиста")
         }
         ListElement {
-            number: 5
+            num: 5
             title: qsTr("Темные цвета")
         }
         ListElement {
-            number: 6
+            num: 6
             title: qsTr("О приложении")
         }
     }
@@ -119,8 +119,7 @@ Item {
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
-                    if (number != 5)
-                        clicked(number)
+                    personPanel.clicked(index)
                 }
             }
         }
@@ -176,7 +175,6 @@ Item {
     }
 
     state: "active"
-    anchors.right: root.left
 
     states: [
         State {
diff --git a/qml-other/settings/ColorTheme.qml b/qml-other/settings/ColorTheme.qml
@@ -14,7 +14,7 @@ Item {
     Settings {
         id: colorThemesSet
         category: "color_theme"
-        property string selected: "whiteTh"
+        property string selected: "white"
     }
 
     states: [
diff --git a/qml.qrc b/qml.qrc
@@ -21,5 +21,6 @@
         <file>resources/RelaxMusic/Ennio Morricone - Chi Mai.mp3</file>
         <file>resources/RelaxMusic/Weathertunes - Sunny Day (Lemongrass Lazy Afternoon).mp3</file>
         <file>resources/RelaxMusic/Weber - In This Dream.mp3</file>
+        <file>resources/RelaxMusic/James Last - The Lonely Shepherd.mp3</file>
     </qresource>
 </RCC>
diff --git a/resources/RelaxMusic/James Last - The Lonely Shepherd.mp3 b/resources/RelaxMusic/James Last - The Lonely Shepherd.mp3

Original file line number	Diff line number	Diff line change
`@@ -71,27 +71,27 @@ Item {`
`71`	`71`	`ListModel {`
`72`	`72`	`id: modelView`
`73`	`73`	`ListElement {`
`74`		`- number: 1`
	`74`	`+ num: 1`
`75`	`75`	`title: qsTr("Что такое депрессия?")`
`76`	`76`	`}`
`77`	`77`	`ListElement {`
`78`		`- number: 2`
	`78`	`+ num: 2`
`79`	`79`	`title: qsTr("Тест Вашего состояния")`
`80`	`80`	`}`
`81`	`81`	`ListElement {`
`82`		`- number: 3`
	`82`	`+ num: 3`
`83`	`83`	`title: qsTr("Дневник мыслей")`
`84`	`84`	`}`
`85`	`85`	`ListElement {`
`86`		`- number: 4`
	`86`	`+ num: 4`
`87`	`87`	`title: qsTr("Помощь специалиста")`
`88`	`88`	`}`
`89`	`89`	`ListElement {`
`90`		`- number: 5`
	`90`	`+ num: 5`
`91`	`91`	`title: qsTr("Темные цвета")`
`92`	`92`	`}`
`93`	`93`	`ListElement {`
`94`		`- number: 6`
	`94`	`+ num: 6`
`95`	`95`	`title: qsTr("О приложении")`
`96`	`96`	`}`
`97`	`97`	`}`
`@@ -119,8 +119,7 @@ Item {`
`119`	`119`	`MouseArea {`
`120`	`120`	`anchors.fill: parent`
`121`	`121`	`onClicked: {`
`122`		`- if (number != 5)`
`123`		`- clicked(number)`
	`122`	`+ personPanel.clicked(index)`
`124`	`123`	`}`
`125`	`124`	`}`
`126`	`125`	`}`
`@@ -176,7 +175,6 @@ Item {`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`state: "active"`
`179`		`- anchors.right: root.left`
`180`	`178`
`181`	`179`	`states: [`
`182`	`180`	`State {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Item {`
`14`	`14`	`Settings {`
`15`	`15`	`id: colorThemesSet`
`16`	`16`	`category: "color_theme"`
`17`		`- property string selected: "whiteTh"`
	`17`	`+ property string selected: "white"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`states: [`