Rebase bugs fixed

Author: igor-sirotin

sandbox/pages/StatusPopupMenuPage.qml

@@ -66,14 +66,14 @@ GridLayout {
         }
 
         StatusMenuItem { 
-            text: "Three"
+            text: "Three [disabled]"
             assetSettings.name: "info"
             enabled: false
         }
 
         StatusPopupMenu {
             title: "Four"
-            iconSettings.name: "info"
+            assetSettings.name: "info"
 
             StatusMenuItem { 
                 text: "One"
@@ -84,6 +84,11 @@ GridLayout {
                 assetSettings.name: "info"
             }
         }
+
+        StatusMenuItem {
+            text: "Five [Danger]"
+            type: StatusMenuItem.Type.Danger
+        }
     }
 
     StatusPopupMenu {
@@ -115,14 +120,14 @@ GridLayout {
 
         StatusPopupMenu {
             title: "Chat"
-            iconSettings.name: "chat"
+            assetSettings.name: "chat"
 
             StatusMenuItem { 
                 text: "vitalik.eth"
                 assetSettings.isImage: true
+                assetSettings.imgIsIdenticon: true
                 assetSettings.name: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0Bh
 CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
-                assetSettings.imgIsIdenticon: true
             }
 
             StatusMenuItem { 
@@ -134,7 +139,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
 
         StatusPopupMenu {
             title: "Cryptokitties"
-            imageSettings.source: "qrc:/demoapp/data/profile-image-1.jpeg"
+            assetSettings.source: "qrc:/demoapp/data/profile-image-1.jpeg"
 
             StatusMenuItem { 
                 text: "welcome" 
@@ -158,8 +163,8 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
 
         StatusPopupMenu {
             title: "Another community"
-            iconSettings.isLetterIdenticon: true
-            iconSettings.color: "red"
+            assetSettings.isLetterIdenticon: true
+            assetSettings.color: "red"
 
             StatusMenuItem { 
                 text: "welcome" 

src/StatusQ/Popups/StatusMenuItem.qml

@@ -11,24 +11,14 @@ Action {
     }
 
     property int type: StatusMenuItem.Type.Normal
-    property real iconRotation: 0
 
-    // TODO: Rename to "imageSettings"
-    property StatusImageSettings image: StatusImageSettings {
-        height: 16
-        width: 16
-        isIdenticon: false
-    }
-
-    property StatusAssetSettings iconSettings: StatusAssetSettings {
+    property StatusAssetSettings assetSettings: StatusAssetSettings {
         width: 18
         height: 18
         rotation: 0
         isLetterIdenticon: false
-        background: StatusIconBackgroundSettings {}
-        color: "transparent"
-        isLetterIdenticon: false
         imgIsIdenticon: false
+        color: "transparent"
         name: statusMenuItem.icon.name
     }
 

src/StatusQ/Popups/StatusMenuItemDelegate.qml

@@ -37,30 +37,22 @@ MenuItem {
         readonly property bool isStatusAction: d.hasAction && (root.action instanceof StatusMenuItem)
         readonly property bool isDangerIcon: d.isStatusAction && root.action.type === StatusMenuItem.Type.Danger
 
-        readonly property StatusImageSettings imageSettings: d.isStatusSubMenu
-                                                     ? root.subMenu.imageSettings
-                                                     : d.isStatusAction ? root.action.image : d.defaultImage
-
-        readonly property StatusIconSettings iconSettings: {
-            console.log("<<<--- Calling iconSettings", root.logObjectName)
-            return d.isStatusSubMenu
-                    ? root.subMenu.iconSettings
-                    : d.isStatusAction ? root.action.iconSettings : d.defaultIcon
-        }
+        readonly property StatusAssetSettings assetSettings: d.isStatusSubMenu
+                                                             ? root.subMenu.assetSettings
+                                                             : d.isStatusAction
+                                                               ? root.action.assetSettings
+                                                               : d.defaultAsset
 
         readonly property StatusFontSettings fontSettings: d.isStatusSubMenu
                                                            ? root.subMenu.fontSettings
                                                            : d.isStatusAction ? root.action.fontSettings : d.defaultFontSettings
 
-        readonly property StatusImageSettings defaultImage: StatusImageSettings {
-            width: 16
-            height: 16
-        }
-        readonly property StatusIconSettings defaultIcon: StatusIconSettings {
+        readonly property StatusAssetSettings defaultAsset: StatusAssetSettings {
             width: 18
             height: 18
             rotation: 0
         }
+
         readonly property StatusFontSettings defaultFontSettings: StatusFontSettings {
             pixelSize: 13
             bold: false
@@ -74,7 +66,7 @@ MenuItem {
         StatusIcon {
             width: d.assetSettings.width // TODO: Also process action.icon.width?
             height: d.assetSettings.height // TODO: Also process action.icon.height?
-            rotation: d.assetSettings.rotation // TODO: Also process action.icon.rotation? // !!root.action.iconRotation ? root.action.iconRotation : 0
+            rotation: d.assetSettings.rotation // TODO: Also process action.icon.rotation?
             icon: d.assetSettings.name // TODO: Also process action.icon?
             color: {
                 const c = d.assetSettings.color;
@@ -105,36 +97,33 @@ MenuItem {
         StatusRoundedImage {
             width: d.assetSettings.width
             height: d.assetSettings.height
-            image.source: d.assetSettings.source
+            image.source: d.assetSettings.name
             border.width: d.isSubMenu && d.assetSettings.imgIsIdenticon ? 1 : 0
             border.color: Theme.palette.directColor7
         }
     }
 
     indicator: Item {
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.leftMargin: 8
         implicitWidth: 24
         implicitHeight: 24
+
         Loader {
             anchors.centerIn: parent
-    //        sourceComponent: {
-    //            if (d.assetSettings.isImage)
-    //                return indicatorImage;
-    //            if (d.assetSettings.isLetterIdenticon)
-    //                return indicatorLetterIdenticon;
-    //            return indicatorIcon;
-    //        }
-
-    //        sourceComponent: indicatorIcon
-    //        sourceComponent: indicatorLetterIdenticon
-    //        sourceComponent: indicatorImage
-
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 8
-    //        active: enabled // TODO: Also process action.icon.name ?
-    //                && (d.assetSettings.isLetterIdenticon
-    //                    || d.assetSettings.isImage
-    //                    || !!d.assetSettings.name)
+            sourceComponent: {
+                if (d.assetSettings.isImage)
+                    return indicatorImage;
+                if (d.assetSettings.isLetterIdenticon)
+                    return indicatorLetterIdenticon;
+                return indicatorIcon;
+            }
+
+            active: enabled
+                    && (d.assetSettings.isLetterIdenticon
+                        || d.assetSettings.isImage
+                        || !!d.assetSettings.name)
         }
     }
 
@@ -148,7 +137,9 @@ MenuItem {
         verticalAlignment: Text.AlignVCenter
 
         text: root.text
-        color: d.isDangerIcon ? Theme.palette.dangerColor1 : Theme.palette.directColor1
+        color: !root.enabled ? Theme.palette.directColor5
+                             : d.isDangerIcon ? Theme.palette.dangerColor1 : Theme.palette.directColor1
+
         font.pixelSize: d.fontSettings.pixelSize // !!root.action.fontSettings ? root.action.fontSettings.pixelSize : 13
         font.bold: d.fontSettings.bold // !!root.action.fontSettings ? root.action.fontSettings.bold : false
         font.italic: d.fontSettings.italic // !!root.action.fontSettings ? root.action.fontSettings.italic : false
@@ -180,7 +171,7 @@ MenuItem {
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor
-        hoverEnabled: root.enabled // WARNING: use root.enabled ?
+        hoverEnabled: root.enabled
         onPressed: mouse.accepted = false
     }
 }

src/StatusQ/Popups/StatusPopupMenu.qml

@@ -35,18 +35,12 @@ Menu {
     //    color: model.iconColor,                                   // -> StatusLetterIdenticon.color,
     //    isLetterIdenticon: !model.imageSource && !model.iconName  // -> decide indicator component
 
-    property StatusImageSettings imageSettings: StatusImageSettings {
-        height: 16
-        width: 16
-        isIdenticon: false
-    }
-
-    property StatusIconSettings iconSettings: StatusIconSettings {
+    property StatusAssetSettings assetSettings: StatusAssetSettings {
         width: 18
         height: 18
         rotation: 0
         isLetterIdenticon: false
-        background: StatusIconBackgroundSettings {}
+        isImage: false
         color: "transparent"
     }