WWW update

[ubi] / qml / ubi / components / File.qml

diff --git a/qml/ubi/components/File.qml b/qml/ubi/components/File.qml
index 8b5dde8..a268ff2 100644 (file)
--- a/qml/ubi/components/File.qml
+++ b/qml/ubi/components/File.qml
@@ -1,59 +1,60 @@
 import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
 import "../UIConstants.js" as Const
 
-
 Item {
     id: root
     property alias name: label.text
+    property alias description: details.text
     property bool isDirectory: false
+    property bool isPhoto: false
+    property bool isMusic: false
+    property bool isVideo: false
+    property bool isPublic: false
     property variant properties: null
     property string filename: ""
     property int textMax: 27
 
     state: mouseArea.pressed && !root.disabled ? "pressed" : "unpressed"
 
-    //width: box.width
+    width: mainWindow.width
     height: box.height
 
     signal clicked(variant prop)
 
-    /*Rectangle {
-        id: shadow
-        width: box.width
-        height: box.height
-        color: Const.SHADOW_COLOR;
-        radius: 10
-        x: Const.SHADOW_OFFSET;
-        y: Const.SHADOW_OFFSET;
-    }*/
-
     Rectangle {
         id: box
         color: Const.TRANSPARENT
-        height: label.height+3*Const.DEFAULT_MARGIN
+        height: label.height+4*Const.DEFAULT_MARGIN
         width: root.width
     }
 
     Rectangle {
-        width: box.width-2*Const.TEXT_MARGIN+2*Const.DEFAULT_MARGIN
+        id: boxShadow
+        width: box.width
         height: box.height
-        x: box.x
-        y: box.y
-        //color: root.isDirectory ? "white" : "black"
+        y: 5
         color: Const.DEFAULT_DIALOG_FOREGROUND_COLOR
-        anchors.verticalCenter: box.verticalCenter
         anchors.horizontalCenter: box.horizontalCenter
         opacity: 0.4
-        radius: 10
         visible: mouseArea.pressed
     }
 
+    /*Line {
+        width: box.width-2*Const.TEXT_MARGIN
+        anchors.bottom: boxShadow.bottom
+        anchors.horizontalCenter: box.horizontalCenter
+    }*/
+
+
     Image {
         id: icon
-        width: 40
-        height: 40
-        x: Const.TEXT_MARGIN
-        source: root.isDirectory ? "../images/folder.png" : "../images/file-black.png"
+        width: 60
+        height: 60
+        x: Const.TEXT_MARGIN-8
+        source: root.isDirectory ? "../images/folder.png" :
+                root.isPhoto ? "../images/photo.png" :
+                root.isMusic ? "../images/music.png" :
+                root.isVideo ? "../images/video.png" : "../images/document.png"
         sourceSize.width: width
         sourceSize.height: height
         anchors.verticalCenter: box.verticalCenter
@@ -61,29 +62,49 @@ Item {
 
     Text {
         id: label
-        x: Const.TEXT_MARGIN + icon.width + Const.DEFAULT_MARGIN
+        x: Const.TEXT_MARGIN + icon.width + 2*Const.DEFAULT_MARGIN
         font.pixelSize: 30
-        color: root.isDirectory ? "white" : "black"
-        //color: "white"
+        color: Const.DEFAULT_FOREGROUND_COLOR
+        elide: Text.ElideRight
+        //wrapMode: Text.Wrap
+        width: root.isPublic ?
+                   root.width-x-Const.TEXT_MARGIN-3*Const.DEFAULT_MARGIN-arrow.width-publicIcon.width :
+                   root.width-x-Const.TEXT_MARGIN-1*Const.DEFAULT_MARGIN-arrow.width
+        anchors.verticalCenter: box.verticalCenter
+    }
+
+    Text {
+        id: details
+        x: Const.TEXT_MARGIN + icon.width + 2*Const.DEFAULT_MARGIN
+        font.pixelSize: 18
+        font.italic: true
+        color: "black"
         elide: Text.ElideRight
         wrapMode: Text.Wrap
-        width: root.width-x-Const.TEXT_MARGIN-Const.DEFAULT_MARGIN-arrow.width
+        width: root.width-x-Const.TEXT_MARGIN-2*Const.DEFAULT_MARGIN-arrow.width
+        y: box.height-height+3
+    }
 
-        //width: root.width
+    Image {
+        id: publicIcon
+        width: 50
+        height: 50
+        anchors.right: arrow.left
+        anchors.margins: Const.DEFAULT_MARGIN
+        source: "../images/internet.png"
+        sourceSize.width: width
+        sourceSize.height: height
         anchors.verticalCenter: box.verticalCenter
-        /*onTextChanged: {
-            if(text.length>root.textMax)
-                root.name = text.substring(0,root.textMax-3)+"...";
-        }*/
+        visible: root.isPublic
     }
 
     Image {
         id: arrow
-        width: 12
-        height: 20
+        width: 30
+        height: 30
         anchors.right: box.right
-        anchors.margins: Const.TEXT_MARGIN
-        source: root.isDirectory ? "../images/arrow-frw.png" : "../images/arrow-frw-black.png"
+        anchors.margins: Const.DEFAULT_MARGIN
+        source: "../images/next.png"
         sourceSize.width: width
         sourceSize.height: height
         anchors.verticalCenter: box.verticalCenter
@@ -97,21 +118,4 @@ Item {
             root.clicked(root.properties);
         }
     }
-
-    /*states: [
-        State {
-            name: "unpressed"
-            PropertyChanges {target: shadow; x: Const.SHADOW_OFFSET}
-            PropertyChanges {target: shadow; y: Const.SHADOW_OFFSET}
-            PropertyChanges {target: box; x: 0}
-            PropertyChanges {target: box; y: 0}
-        },
-        State {
-            name: "pressed"
-            PropertyChanges {target: shadow; x: Const.SHADOW_OFFSET}
-            PropertyChanges {target: shadow; y: Const.SHADOW_OFFSET}
-            PropertyChanges {target: box; x: Const.SHADOW_OFFSET}
-            PropertyChanges {target: box; y: Const.SHADOW_OFFSET}
-        }
-    ]*/
 }