Update WWW
authorMuki <mkiol@o2.pl>
Sun, 6 May 2012 13:34:06 +0000 (15:34 +0200)
committerMuki <mkiol@o2.pl>
Sun, 6 May 2012 13:34:06 +0000 (15:34 +0200)
41 files changed:
graphics/account.svg [new file with mode: 0644]
graphics/folder.svg
graphics/internet.svg [new file with mode: 0644]
graphics/settings.svg [new file with mode: 0644]
graphics/toolbar-share.svg
main.cpp
qml/ubi/FilesPage.qml
qml/ubi/InitPage.qml [new file with mode: 0644]
qml/ubi/LoginPage.qml
qml/ubi/PropertiesPage.qml
qml/ubi/StartPage.qml
qml/ubi/SystemBar.qml
qml/ubi/UIConstants.js
qml/ubi/components/Button.qml
qml/ubi/components/ButtonNew.qml
qml/ubi/components/File.qml
qml/ubi/images/account.png [new file with mode: 0644]
qml/ubi/images/files.png [new file with mode: 0644]
qml/ubi/images/internet.png [new file with mode: 0644]
qml/ubi/images/settings.png [new file with mode: 0644]
qml/ubi/images/share.png [new file with mode: 0644]
qml/ubi/images/ubi100.png [new file with mode: 0644]
qml/ubi/main.qml
qml/ubi/u1.js
qtc_packaging/debian_fremantle/changelog
qtc_packaging/debian_fremantle/changelog~
qtc_packaging/debian_harmattan/changelog
qtc_packaging/debian_harmattan/changelog~
translation.pri [new file with mode: 0644]
translations/ubi.pl.qm
translations/ubi.pl.ts
ubi.pro
ubi.pro.user
ubi.qrc
ubi.zip
utils.cpp
utils.h
www/big/screenshot22.png [new file with mode: 0644]
www/index.html
www/index.html~
www/screenshot22.png [new file with mode: 0644]

diff --git a/graphics/account.svg b/graphics/account.svg
new file mode 100644 (file)
index 0000000..59b9415
--- /dev/null
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="30px"
+   height="30px"
+   viewBox="0 0 30 30"
+   enable-background="new 0 0 30 30"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="account.svg"
+   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/account.png"
+   inkscape:export-xdpi="120"
+   inkscape:export-ydpi="120"><metadata
+   id="metadata23"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs21" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="480"
+   id="namedview19"
+   showgrid="false"
+   inkscape:zoom="7.8666667"
+   inkscape:cx="15"
+   inkscape:cy="15"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+<g
+   id="DO_NOT_EDIT_-_BOUNDING_BOX">
+       <rect
+   id="BOUNDING_BOX"
+   fill="none"
+   width="30"
+   height="30" />
+</g>
+<g
+   id="PLACE_YOUR_GRAPHIC_HERE">
+       <g
+   id="g7">
+               <path
+   opacity="0.3"
+   d="M26.735,25.381c-0.27-1.084-1.572-1.738-1.572-1.738c-1.948-1.139-3.883-1.891-3.883-1.891    c-0.271-0.104-0.509-0.227-0.725-0.363c-1.189-0.816-1.798-2.27-1.856-2.492c-0.167-0.67-0.315-1.379-0.078-1.605    c1.203-1.043,1.681-3.523,1.681-3.523c0.032-0.096,0.061-0.188,0.096-0.273c0.59,0.723,0.892-0.98,1.137-1.762    c0.255-0.822,0.362-1.361,0.362-1.361c0.104-0.838-0.532-0.59-0.532-0.59l-0.049,0.055c0.092-1.166,0.429-1.877,0.429-2.928    c0.007-1.623,0.406-2.213-1.249-4.699c-0.513-0.77-1.221-0.896-4.155-1.842c-2.926-0.947-3.343,0.252-4.315,0.137    c-0.971-0.117-1.104,0.279-1.293,0.629c-0.189,0.344,0,0.621-0.529,0.645C9.67,1.803,9.434,2.209,9.434,2.209    c-1.58,2.535-0.994,3.295-1.048,4.916C8.357,7.984,8.495,8.627,8.944,9.816L8.896,9.75c0,0-0.619-0.291-0.573,0.549    c0,0-0.086,0.262,0.265,1.389c0.211,0.646,0.372,2.445,0.975,1.875c0.019,0.066,0.048,0.139,0.069,0.205    c0,0,0.474,2.48,1.677,3.523c0.244,0.227,0.089,0.936-0.078,1.605c-0.069,0.256-0.411,2.01-2.53,2.855    c0,0-1.934,0.752-3.878,1.891c0,0-1.31,0.654-1.582,1.738l-0.028,0.162c1.106,0.633,2.412,1.148,3.932,1.543    c3.713,0.961,6.271,0.938,8.005,0.9c1.732,0.037,4.288,0.061,8.003-0.9c1.407-0.365,2.606-0.838,3.64-1.414L26.735,25.381z"
+   id="path9" />
+               <path
+   opacity="0.15"
+   d="M16.177,29.999c-0.379,0-0.729-0.006-1.051-0.013c-0.279,0.007-0.629,0.013-1.009,0.013    c-1.534,0-3.951-0.098-7.225-0.945c-1.586-0.411-2.991-0.964-4.178-1.643c-0.366-0.209-0.561-0.625-0.488-1.04l0.028-0.162    c0.389-1.559,1.944-2.373,2.12-2.461c1.932-1.134,3.88-1.896,3.962-1.928c1.014-0.405,1.659-1.119,1.91-2.119    c0.103-0.411,0.162-0.694,0.181-0.864c-0.921-0.937-1.422-2.45-1.644-3.292c-0.66-0.342-0.867-1.298-1.026-2.034    c-0.043-0.199-0.081-0.383-0.123-0.513C7.339,12.044,7.29,11.542,7.32,11.24c-0.004-0.44,0.111-0.802,0.343-1.077    c-0.229-0.769-0.3-1.356-0.277-2.071c0.011-0.343-0.01-0.642-0.03-0.93C7.281,6.048,7.204,4.896,8.585,2.68    c0.182-0.313,0.595-0.7,1.183-0.846C9.792,1.775,9.821,1.714,9.855,1.65c0.202-0.386,0.612-1.167,1.849-1.167    c0.131,0,0.277,0.008,0.439,0.028c0,0,0.001,0,0.001,0c0.082,0,0.233-0.061,0.394-0.125C12.947,0.224,13.506,0,14.368,0    c0.67,0,1.417,0.136,2.28,0.416l1.089,0.347c2.149,0.681,2.954,0.936,3.591,1.892c1.479,2.223,1.512,3.176,1.441,4.546    c-0.011,0.218-0.023,0.451-0.024,0.712c0,0.673-0.116,1.219-0.228,1.747c-0.029,0.136-0.058,0.27-0.084,0.405    c0.044,0.038,0.085,0.078,0.123,0.122c0.288,0.326,0.4,0.766,0.333,1.308c-0.017,0.097-0.132,0.673-0.399,1.535    c-0.039,0.125-0.079,0.272-0.121,0.428c-0.226,0.83-0.497,1.83-1.229,2.126c-0.219,0.815-0.719,2.303-1.636,3.25    c0.015,0.143,0.059,0.391,0.167,0.822c0.055,0.166,0.567,1.303,1.451,1.91c0.145,0.09,0.323,0.18,0.516,0.253    c0.088,0.034,2.037,0.797,4.031,1.962c0.119,0.058,1.668,0.873,2.038,2.36l0.066,0.348c0.08,0.423-0.12,0.849-0.495,1.058    c-1.135,0.633-2.402,1.127-3.876,1.509C20.125,29.901,17.709,29.999,16.177,29.999z"
+   id="path11" />
+               <path
+   opacity="0.15"
+   d="M26.735,26.381c-0.27-1.084-1.572-1.738-1.572-1.738c-1.948-1.139-3.883-1.891-3.883-1.891    c-0.271-0.104-0.509-0.227-0.725-0.363c-1.189-0.816-1.798-2.27-1.856-2.492c-0.167-0.67-0.315-1.379-0.078-1.605    c1.203-1.043,1.681-3.523,1.681-3.523c0.032-0.096,0.061-0.188,0.096-0.273c0.59,0.723,0.892-0.98,1.137-1.762    c0.255-0.822,0.362-1.361,0.362-1.361c0.104-0.838-0.532-0.59-0.532-0.59l-0.049,0.055c0.092-1.166,0.429-1.877,0.429-2.928    c0.007-1.623,0.406-2.213-1.249-4.699c-0.513-0.77-1.221-0.896-4.155-1.842c-2.926-0.947-3.343,0.252-4.315,0.137    c-0.971-0.117-1.104,0.279-1.293,0.629c-0.189,0.344,0,0.621-0.529,0.645C9.67,2.803,9.434,3.209,9.434,3.209    c-1.58,2.535-0.994,3.295-1.048,4.916c-0.028,0.859,0.109,1.502,0.559,2.691L8.896,10.75c0,0-0.619-0.291-0.573,0.549    c0,0-0.086,0.262,0.265,1.389c0.211,0.646,0.372,2.445,0.975,1.875c0.019,0.066,0.048,0.139,0.069,0.205    c0,0,0.474,2.48,1.677,3.523c0.244,0.227,0.089,0.936-0.078,1.605c-0.069,0.256-0.411,2.01-2.53,2.855    c0,0-1.934,0.752-3.878,1.891c0,0-1.31,0.654-1.582,1.738l-0.028,0.162c1.106,0.633,2.412,1.148,3.932,1.543    c3.713,0.961,6.271,0.938,8.005,0.9c1.732,0.037,4.288,0.061,8.003-0.9c1.407-0.365,2.606-0.838,3.64-1.414L26.735,26.381z"
+   id="path13" />
+               <path
+   fill="#FFFFFF"
+   d="M26.735,26.381c-0.27-1.084-1.572-1.738-1.572-1.738c-1.948-1.139-3.883-1.891-3.883-1.891    c-0.271-0.104-0.509-0.227-0.725-0.363c-1.189-0.816-1.798-2.27-1.856-2.492c-0.167-0.67-0.315-1.379-0.078-1.605    c1.203-1.043,1.681-3.523,1.681-3.523c0.032-0.096,0.061-0.188,0.096-0.273c0.59,0.723,0.892-0.98,1.137-1.762    c0.255-0.822,0.362-1.361,0.362-1.361c0.104-0.838-0.532-0.59-0.532-0.59l-0.049,0.055c0.092-1.166,0.429-1.877,0.429-2.928    c0.007-1.623,0.406-2.213-1.249-4.699c-0.513-0.77-1.221-0.896-4.155-1.842c-2.926-0.947-3.343,0.252-4.315,0.137    c-0.971-0.117-1.104,0.279-1.293,0.629c-0.189,0.344,0,0.621-0.529,0.645C9.67,2.803,9.434,3.209,9.434,3.209    c-1.58,2.535-0.994,3.295-1.048,4.916c-0.028,0.859,0.109,1.502,0.559,2.691L8.896,10.75c0,0-0.619-0.291-0.573,0.549    c0,0-0.086,0.262,0.265,1.389c0.211,0.646,0.372,2.445,0.975,1.875c0.019,0.066,0.048,0.139,0.069,0.205    c0,0,0.474,2.48,1.677,3.523c0.244,0.227,0.089,0.936-0.078,1.605c-0.069,0.256-0.411,2.01-2.53,2.855    c0,0-1.934,0.752-3.878,1.891c0,0-1.31,0.654-1.582,1.738l-0.028,0.162c1.106,0.633,2.412,1.148,3.932,1.543    c3.713,0.961,6.271,0.938,8.005,0.9c1.732,0.037,4.288,0.061,8.003-0.9c1.407-0.365,2.606-0.838,3.64-1.414L26.735,26.381z"
+   id="path15" />
+               <rect
+   fill="none"
+   width="30"
+   height="30"
+   id="rect17" />
+       </g>
+</g>
+</svg>
\ No newline at end of file
index 8054299..960a178 100644 (file)
@@ -20,9 +20,9 @@
    id="svg2"
    inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="folder.svg"
-   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/folder.png"
-   inkscape:export-xdpi="150"
-   inkscape:export-ydpi="150"><metadata
+   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/files.png"
+   inkscape:export-xdpi="120"
+   inkscape:export-ydpi="120"><metadata
    id="metadata19"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
diff --git a/graphics/internet.svg b/graphics/internet.svg
new file mode 100644 (file)
index 0000000..6ab4f2a
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="30px"
+   height="30px"
+   viewBox="0 0 30 30"
+   enable-background="new 0 0 30 30"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="internet.svg"
+   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/internet.png"
+   inkscape:export-xdpi="150"
+   inkscape:export-ydpi="150"><metadata
+   id="metadata25"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs23" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="480"
+   id="namedview21"
+   showgrid="false"
+   inkscape:zoom="7.8666667"
+   inkscape:cx="15"
+   inkscape:cy="15"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+<g
+   id="DO_NOT_EDIT_-_BOUNDING_BOX">
+       <rect
+   id="BOUNDING_BOX"
+   fill="none"
+   width="30"
+   height="30" />
+</g>
+<g
+   id="PLACE_YOUR_GRAPHIC_HERE">
+       <g
+   id="g7">
+               <path
+   opacity="0.3"
+   d="M15,1C7.822,1,2,6.822,2,13.996C2,21.18,7.822,27,15,27c7.182,0,13-5.82,13-13.004C28,6.822,22.182,1,15,1z     M12.152,18.549c-0.252,0.506-0.811,0.695-0.76,1.621c0.08,1.486-1.115,1.367-1.391,2.381c-0.268,0.973-0.582,1.611-0.582,1.611    c-0.783-0.43-1.51-0.949-2.168-1.541c0.178-0.949-0.141-3.287-0.527-3.549c-1.111-0.758-1.072-0.539-1.168-3.506    c-0.053-1.646,2.736-1.178,3.338-0.523c0.576,0.627,0.48,1.539,2.156,2.24C11.525,17.48,12.406,18.043,12.152,18.549z     M11.248,5.66c-0.592,0.215-0.824,0.176-1.232-0.094C9.443,5.184,8.197,6.203,8.967,6.563c0.262,0.121,0.734,0.162,1.482,0.418    c1.193,0.412,1.539,1.119,0.848,1.305c-3.451,0.936-1.836,2.012-3.145,3.322c-0.672,0.672-0.627,0.941-1.102,1.102    c-0.582,0.193-0.676-0.654-1.225-0.678c-0.195-0.01-1.801,0.027-2.207,0.027c-0.057,0,0.012-0.432,0.012-0.432    C4.182,8.93,5.676,6.576,7.75,4.918c0,0,2.146-1.627,3.949-2.037c0.797-0.18,2.383-0.533,2.277,0.016    C13.861,3.49,11.844,5.449,11.248,5.66z M25.402,14.303c-0.721-0.131-1.191-2.002-1.965-1.416c-1.295,0.977,1.99,2.605,1.99,3.119    s-0.695,1.268-0.994,1.51c-0.451,0.363-0.371,1.754-0.371,1.754c0,0.98-0.658,2.152-0.996,2.602    c-0.34,0.449-1.809,2.125-2.666,1.09c-0.639-0.77-0.1-2.352-0.287-4.043c-0.066-0.607,0.049-2.334-2.551-2.648    c-2.313-0.277-2.113-1.961-1.963-2.814c0.209-1.174,0.338-1.871,1.33-2.111c0.557-0.137,2.227-0.352,3.391,0.111    c0.549,0.215,1.426,0.127,1.557-0.598c0.145-0.773-0.369-0.824-1.617-1.174c-1.121-0.316-2.182,0.631-3.092,0.629    c-0.408,0-0.389-0.344-0.379-0.826c0.004-0.48,1.764-1.719,1.949-1.859c0.357-0.273,1.4-0.162,1.422-0.162    c1.15,0.035,0.898-0.744,0.121-0.781c-1.363-0.066-1.262-0.781-1.277-0.996c-0.018-0.217,0.199-0.762,1.246-0.789    c0.34-0.01,1.672-0.064,2.033,0.039c0.09,0.068,0.586,0.5,0.586,0.5c1.951,1.797,3.283,4.254,3.645,7.018    c0.02,0.416,0.068,0.855,0.053,0.988C26.533,13.684,26.053,14.424,25.402,14.303z"
+   id="path9" />
+               <g
+   id="g11">
+                       <rect
+   fill="none"
+   width="30"
+   height="30"
+   id="rect13" />
+               </g>
+               <path
+   opacity="0.15"
+   d="M15,29C7.28,29,1,22.718,1,14.996C1,7.279,7.28,1,15,1s14,6.279,14,13.996C29,22.718,22.72,29,15,29z"
+   id="path15" />
+               <path
+   opacity="0.15"
+   d="M15,2C7.822,2,2,7.822,2,14.996C2,22.18,7.822,28,15,28c7.182,0,13-5.82,13-13.004C28,7.822,22.182,2,15,2    z M12.152,19.549c-0.252,0.506-0.811,0.695-0.76,1.621c0.08,1.486-1.115,1.367-1.391,2.381c-0.268,0.973-0.582,1.611-0.582,1.611    c-0.783-0.43-1.51-0.949-2.168-1.541c0.178-0.949-0.141-3.287-0.527-3.549c-1.111-0.758-1.072-0.539-1.168-3.506    c-0.053-1.646,2.736-1.178,3.338-0.523c0.576,0.627,0.48,1.539,2.156,2.24C11.525,18.48,12.406,19.043,12.152,19.549z     M11.248,6.66c-0.592,0.215-0.824,0.176-1.232-0.094C9.443,6.184,8.197,7.203,8.967,7.563c0.262,0.121,0.734,0.162,1.482,0.418    c1.193,0.412,1.539,1.119,0.848,1.305c-3.451,0.936-1.836,2.012-3.145,3.322c-0.672,0.672-0.627,0.941-1.102,1.102    c-0.582,0.193-0.676-0.654-1.225-0.678c-0.195-0.01-1.801,0.027-2.207,0.027c-0.057,0,0.012-0.432,0.012-0.432    C4.182,9.93,5.676,7.576,7.75,5.918c0,0,2.146-1.627,3.949-2.037c0.797-0.18,2.383-0.533,2.277,0.016    C13.861,4.49,11.844,6.449,11.248,6.66z M25.402,15.303c-0.721-0.131-1.191-2.002-1.965-1.416c-1.295,0.977,1.99,2.605,1.99,3.119    s-0.695,1.268-0.994,1.51c-0.451,0.363-0.371,1.754-0.371,1.754c0,0.98-0.658,2.152-0.996,2.602    c-0.34,0.449-1.809,2.125-2.666,1.09c-0.639-0.77-0.1-2.352-0.287-4.043c-0.066-0.607,0.049-2.334-2.551-2.648    c-2.313-0.277-2.113-1.961-1.963-2.814c0.209-1.174,0.338-1.871,1.33-2.111c0.557-0.137,2.227-0.352,3.391,0.111    c0.549,0.215,1.426,0.127,1.557-0.598c0.145-0.773-0.369-0.824-1.617-1.174c-1.121-0.316-2.182,0.631-3.092,0.629    c-0.408,0-0.389-0.344-0.379-0.826c0.004-0.48,1.764-1.719,1.949-1.859c0.357-0.273,1.4-0.162,1.422-0.162    c1.15,0.035,0.898-0.744,0.121-0.781c-1.363-0.066-1.262-0.781-1.277-0.996c-0.018-0.217,0.199-0.762,1.246-0.789    c0.34-0.01,1.672-0.064,2.033,0.039c0.09,0.068,0.586,0.5,0.586,0.5c1.951,1.797,3.283,4.254,3.645,7.018    c0.02,0.416,0.068,0.855,0.053,0.988C26.533,14.684,26.053,15.424,25.402,15.303z"
+   id="path17" />
+               <path
+   fill="#FFFFFF"
+   d="M15,2C7.822,2,2,7.822,2,14.996C2,22.18,7.822,28,15,28c7.182,0,13-5.82,13-13.004C28,7.822,22.182,2,15,2    z M12.152,19.549c-0.252,0.506-0.811,0.695-0.76,1.621c0.08,1.486-1.115,1.367-1.391,2.381c-0.268,0.973-0.582,1.611-0.582,1.611    c-0.783-0.43-1.51-0.949-2.168-1.541c0.178-0.949-0.141-3.287-0.527-3.549c-1.111-0.758-1.072-0.539-1.168-3.506    c-0.053-1.646,2.736-1.178,3.338-0.523c0.576,0.627,0.48,1.539,2.156,2.24C11.525,18.48,12.406,19.043,12.152,19.549z     M11.248,6.66c-0.592,0.215-0.824,0.176-1.232-0.094C9.443,6.184,8.197,7.203,8.967,7.563c0.262,0.121,0.734,0.162,1.482,0.418    c1.193,0.412,1.539,1.119,0.848,1.305c-3.451,0.936-1.836,2.012-3.145,3.322c-0.672,0.672-0.627,0.941-1.102,1.102    c-0.582,0.193-0.676-0.654-1.225-0.678c-0.195-0.01-1.801,0.027-2.207,0.027c-0.057,0,0.012-0.432,0.012-0.432    C4.182,9.93,5.676,7.576,7.75,5.918c0,0,2.146-1.627,3.949-2.037c0.797-0.18,2.383-0.533,2.277,0.016    C13.861,4.49,11.844,6.449,11.248,6.66z M25.402,15.303c-0.721-0.131-1.191-2.002-1.965-1.416c-1.295,0.977,1.99,2.605,1.99,3.119    s-0.695,1.268-0.994,1.51c-0.451,0.363-0.371,1.754-0.371,1.754c0,0.98-0.658,2.152-0.996,2.602    c-0.34,0.449-1.809,2.125-2.666,1.09c-0.639-0.77-0.1-2.352-0.287-4.043c-0.066-0.607,0.049-2.334-2.551-2.648    c-2.313-0.277-2.113-1.961-1.963-2.814c0.209-1.174,0.338-1.871,1.33-2.111c0.557-0.137,2.227-0.352,3.391,0.111    c0.549,0.215,1.426,0.127,1.557-0.598c0.145-0.773-0.369-0.824-1.617-1.174c-1.121-0.316-2.182,0.631-3.092,0.629    c-0.408,0-0.389-0.344-0.379-0.826c0.004-0.48,1.764-1.719,1.949-1.859c0.357-0.273,1.4-0.162,1.422-0.162    c1.15,0.035,0.898-0.744,0.121-0.781c-1.363-0.066-1.262-0.781-1.277-0.996c-0.018-0.217,0.199-0.762,1.246-0.789    c0.34-0.01,1.672-0.064,2.033,0.039c0.09,0.068,0.586,0.5,0.586,0.5c1.951,1.797,3.283,4.254,3.645,7.018    c0.02,0.416,0.068,0.855,0.053,0.988C26.533,14.684,26.053,15.424,25.402,15.303z"
+   id="path19" />
+       </g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/graphics/settings.svg b/graphics/settings.svg
new file mode 100644 (file)
index 0000000..0a00126
--- /dev/null
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="30px"
+   height="30px"
+   viewBox="0 0 30 30"
+   enable-background="new 0 0 30 30"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="settings.svg"
+   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/settings.png"
+   inkscape:export-xdpi="120"
+   inkscape:export-ydpi="120"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs17" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="640"
+   inkscape:window-height="480"
+   id="namedview15"
+   showgrid="false"
+   inkscape:zoom="7.8666667"
+   inkscape:cx="15"
+   inkscape:cy="15"
+   inkscape:window-x="65"
+   inkscape:window-y="24"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+<g
+   id="DO_NOT_EDIT_-_BOUNDING_BOX">
+       <rect
+   id="BOUNDING_BOX"
+   fill="none"
+   width="30"
+   height="30" />
+</g>
+<g
+   id="PLACE_YOUR_GRAPHIC_HERE">
+       <path
+   opacity="0.3"
+   d="M24.938,15.732c0.099-0.564,0.16-1.14,0.16-1.732c0-0.59-0.062-1.166-0.159-1.729l2.701-2.225   c0.365-0.299,0.47-0.879,0.234-1.289l-1.896-3.285c-0.234-0.409-0.789-0.607-1.232-0.442l-3.269,1.226   c-0.885-0.741-1.902-1.325-3.007-1.729l-0.575-3.451c-0.078-0.465-0.528-0.847-0.999-0.847h-3.792c-0.473,0-0.921,0.382-1,0.847   l-0.575,3.451c-1.104,0.404-2.121,0.988-3.005,1.729L5.254,5.031C4.812,4.866,4.257,5.064,4.021,5.473L2.126,8.758   C1.89,9.167,1.995,9.746,2.359,10.045l2.702,2.224c-0.099,0.564-0.16,1.14-0.16,1.731c0,0.592,0.061,1.168,0.16,1.732L2.36,17.955   c-0.364,0.301-0.469,0.881-0.233,1.291l1.895,3.281c0.237,0.41,0.792,0.607,1.233,0.443l3.268-1.225   c0.885,0.74,1.901,1.322,3.005,1.727l0.575,3.451c0.078,0.467,0.529,0.848,1,0.848h3.792c0.472,0,0.921-0.381,0.999-0.848   l0.575-3.451c1.104-0.404,2.121-0.986,3.006-1.729l3.27,1.227c0.442,0.164,0.997-0.035,1.231-0.443l1.896-3.283   c0.236-0.41,0.131-0.99-0.233-1.289L24.938,15.732z M14.999,19.148c-2.84,0-5.15-2.309-5.15-5.148c0-2.839,2.31-5.15,5.15-5.15   c2.839,0,5.149,2.311,5.149,5.15C20.148,16.84,17.838,19.148,14.999,19.148z"
+   id="path7" />
+       <path
+   opacity="0.15"
+   d="M13.103,29.771c-0.956,0-1.828-0.739-1.986-1.683l-0.482-2.895c-0.82-0.349-1.586-0.789-2.289-1.313   l-2.74,1.026c-0.218,0.081-0.446,0.121-0.681,0.121c-0.724,0-1.419-0.393-1.77-1.001l-1.895-3.281   c-0.478-0.83-0.274-1.954,0.462-2.563l2.264-1.862C3.929,15.867,3.901,15.431,3.901,15s0.028-0.866,0.086-1.319l-2.263-1.863   c-0.738-0.606-0.942-1.73-0.464-2.56l1.895-3.284c0.352-0.608,1.046-1.001,1.77-1.001c0.236,0,0.464,0.041,0.68,0.121l2.742,1.028   c0.703-0.526,1.47-0.967,2.29-1.316l0.482-2.894c0.158-0.944,1.031-1.683,1.986-1.683h3.792c0.955,0,1.827,0.739,1.985,1.682   l0.482,2.895c0.82,0.349,1.587,0.79,2.291,1.315l2.739-1.028c0.218-0.081,0.447-0.122,0.683-0.122c0.725,0,1.419,0.394,1.769,1.003   l1.896,3.282c0.478,0.831,0.272,1.956-0.467,2.562l-2.262,1.863c0.058,0.457,0.086,0.892,0.086,1.318   c0,0.428-0.028,0.864-0.087,1.32l2.265,1.862c0.737,0.605,0.942,1.73,0.464,2.561l-1.896,3.284   c-0.349,0.607-1.044,1.001-1.769,1.001l0,0c-0.234,0-0.462-0.04-0.677-0.12l-2.744-1.029c-0.701,0.525-1.469,0.966-2.29,1.315   l-0.482,2.894c-0.158,0.944-1.03,1.684-1.985,1.684H13.103z M14.999,10.85c-2.288,0-4.15,1.862-4.15,4.15   c0,2.287,1.862,4.148,4.15,4.148s4.149-1.861,4.149-4.148C19.148,12.712,17.287,10.85,14.999,10.85z"
+   id="path9" />
+       <path
+   opacity="0.15"
+   d="M24.938,16.732c0.099-0.564,0.16-1.14,0.16-1.732c0-0.59-0.062-1.166-0.159-1.729l2.701-2.225   c0.365-0.299,0.47-0.879,0.234-1.289l-1.896-3.285c-0.234-0.409-0.789-0.607-1.232-0.442l-3.269,1.226   c-0.885-0.741-1.902-1.325-3.007-1.729l-0.575-3.451c-0.078-0.465-0.528-0.847-0.999-0.847h-3.792c-0.473,0-0.921,0.382-1,0.847   l-0.575,3.451c-1.104,0.404-2.121,0.988-3.005,1.729L5.254,6.031C4.812,5.866,4.257,6.064,4.021,6.473L2.126,9.758   c-0.236,0.409-0.131,0.988,0.233,1.288l2.702,2.224c-0.099,0.564-0.16,1.14-0.16,1.731c0,0.592,0.061,1.168,0.16,1.732L2.36,18.955   c-0.364,0.301-0.469,0.881-0.233,1.291l1.895,3.281c0.237,0.41,0.792,0.607,1.233,0.443l3.268-1.225   c0.885,0.74,1.901,1.322,3.005,1.727l0.575,3.451c0.078,0.467,0.529,0.848,1,0.848h3.792c0.472,0,0.921-0.381,0.999-0.848   l0.575-3.451c1.104-0.404,2.121-0.986,3.006-1.729l3.27,1.227c0.442,0.164,0.997-0.035,1.231-0.443l1.896-3.283   c0.236-0.41,0.131-0.99-0.233-1.289L24.938,16.732z M14.999,20.148c-2.84,0-5.15-2.309-5.15-5.148c0-2.839,2.31-5.15,5.15-5.15   c2.839,0,5.149,2.311,5.149,5.15C20.148,17.84,17.838,20.148,14.999,20.148z"
+   id="path11" />
+       <path
+   fill="#FFFFFF"
+   d="M24.938,16.732c0.099-0.564,0.16-1.14,0.16-1.732c0-0.59-0.062-1.166-0.159-1.729l2.701-2.225   c0.365-0.299,0.47-0.879,0.234-1.289l-1.896-3.285c-0.234-0.409-0.789-0.607-1.232-0.442l-3.269,1.226   c-0.885-0.741-1.902-1.325-3.007-1.729l-0.575-3.451c-0.078-0.465-0.528-0.847-0.999-0.847h-3.792c-0.473,0-0.921,0.382-1,0.847   l-0.575,3.451c-1.104,0.404-2.121,0.988-3.005,1.729L5.254,6.031C4.812,5.866,4.257,6.064,4.021,6.473L2.126,9.758   c-0.236,0.409-0.131,0.988,0.233,1.288l2.702,2.224c-0.099,0.564-0.16,1.14-0.16,1.731c0,0.592,0.061,1.168,0.16,1.732L2.36,18.955   c-0.364,0.301-0.469,0.881-0.233,1.291l1.895,3.281c0.237,0.41,0.792,0.607,1.233,0.443l3.268-1.225   c0.885,0.74,1.901,1.322,3.005,1.727l0.575,3.451c0.078,0.467,0.529,0.848,1,0.848h3.792c0.472,0,0.921-0.381,0.999-0.848   l0.575-3.451c1.104-0.404,2.121-0.986,3.006-1.729l3.27,1.227c0.442,0.164,0.997-0.035,1.231-0.443l1.896-3.283   c0.236-0.41,0.131-0.99-0.233-1.289L24.938,16.732z M14.999,20.148c-2.84,0-5.15-2.309-5.15-5.148c0-2.839,2.31-5.15,5.15-5.15   c2.839,0,5.149,2.311,5.149,5.15C20.148,17.84,17.838,20.148,14.999,20.148z"
+   id="path13" />
+</g>
+</svg>
\ No newline at end of file
index 24b243e..b91521a 100644 (file)
@@ -1,8 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M23.25,29c-3.171,0-5.75-2.58-5.75-5.75c0-0.031,0.002-0.064,0.002-0.096l-4.773-2.705  C11.454,21.453,9.89,22,8.25,22C4.252,22,1,18.748,1,14.75C1,10.752,4.252,7.5,8.25,7.5c1.71,0,3.326,0.587,4.625,1.667L17.5,6.701  C17.526,3.553,20.096,1,23.25,1C26.421,1,29,3.58,29,6.75s-2.579,5.75-5.75,5.75c-1.127,0-2.201-0.328-3.144-0.957l-4.644,2.476  c0.024,0.244,0.037,0.487,0.037,0.73c0,0.301-0.021,0.606-0.061,0.914l4.791,2.715c0.914-0.576,1.945-0.879,3.02-0.879  c3.171,0,5.75,2.58,5.75,5.75S26.421,29,23.25,29L23.25,29z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M23.25,17.5c-1.125,0-2.146,0.408-2.959,1.063l-5.963-3.379c0.108-0.461,0.172-0.939,0.172-1.434  c0-0.438-0.046-0.866-0.132-1.279l5.829-3.109c0.828,0.7,1.884,1.139,3.053,1.139c2.625,0,4.75-2.127,4.75-4.75S25.875,1,23.25,1  c-2.623,0-4.75,2.127-4.75,4.75c0,0.179,0.033,0.349,0.053,0.522l-5.834,3.111C11.584,8.223,10.002,7.5,8.25,7.5  C4.799,7.5,2,10.298,2,13.75C2,17.201,4.799,20,8.25,20c1.695,0,3.229-0.676,4.354-1.771l5.96,3.379  c-0.029,0.211-0.064,0.422-0.064,0.643c0,2.623,2.127,4.75,4.75,4.75c2.625,0,4.75-2.127,4.75-4.75S25.875,17.5,23.25,17.5z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M23.25,18.5c-1.125,0-2.146,0.408-2.959,1.063l-5.963-3.379c0.108-0.461,0.172-0.94,0.172-1.434  c0-0.438-0.046-0.866-0.132-1.279l5.829-3.109c0.828,0.7,1.884,1.139,3.053,1.139c2.625,0,4.75-2.127,4.75-4.75S25.875,2,23.25,2  c-2.623,0-4.75,2.127-4.75,4.75c0,0.179,0.033,0.349,0.053,0.522l-5.834,3.111C11.584,9.223,10.002,8.5,8.25,8.5  C4.799,8.5,2,11.298,2,14.75C2,18.201,4.799,21,8.25,21c1.695,0,3.229-0.676,4.354-1.771l5.96,3.379  c-0.029,0.211-0.064,0.422-0.064,0.643c0,2.623,2.127,4.75,4.75,4.75c2.625,0,4.75-2.127,4.75-4.75S25.875,18.5,23.25,18.5z" fill="#FFFFFF"/>
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="30px"
+   version="1.1"
+   viewBox="0 0 30 30"
+   width="30px"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="toolbar-share.svg"
+   inkscape:export-filename="/home/mkiol/dev/Qt/ubi/qml/ubi/images/share.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="7.8666667"
+     inkscape:cx="15"
+     inkscape:cy="15"
+     inkscape:window-x="71"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M23.25,29c-3.171,0-5.75-2.58-5.75-5.75c0-0.031,0.002-0.064,0.002-0.096l-4.773-2.705  C11.454,21.453,9.89,22,8.25,22C4.252,22,1,18.748,1,14.75C1,10.752,4.252,7.5,8.25,7.5c1.71,0,3.326,0.587,4.625,1.667L17.5,6.701  C17.526,3.553,20.096,1,23.25,1C26.421,1,29,3.58,29,6.75s-2.579,5.75-5.75,5.75c-1.127,0-2.201-0.328-3.144-0.957l-4.644,2.476  c0.024,0.244,0.037,0.487,0.037,0.73c0,0.301-0.021,0.606-0.061,0.914l4.791,2.715c0.914-0.576,1.945-0.879,3.02-0.879  c3.171,0,5.75,2.58,5.75,5.75S26.421,29,23.25,29L23.25,29z"
+     fill-opacity="0.15"
+     stroke-opacity="0.15"
+     id="path4" />
+  <path
+     d="M23.25,17.5c-1.125,0-2.146,0.408-2.959,1.063l-5.963-3.379c0.108-0.461,0.172-0.939,0.172-1.434  c0-0.438-0.046-0.866-0.132-1.279l5.829-3.109c0.828,0.7,1.884,1.139,3.053,1.139c2.625,0,4.75-2.127,4.75-4.75S25.875,1,23.25,1  c-2.623,0-4.75,2.127-4.75,4.75c0,0.179,0.033,0.349,0.053,0.522l-5.834,3.111C11.584,8.223,10.002,7.5,8.25,7.5  C4.799,7.5,2,10.298,2,13.75C2,17.201,4.799,20,8.25,20c1.695,0,3.229-0.676,4.354-1.771l5.96,3.379  c-0.029,0.211-0.064,0.422-0.064,0.643c0,2.623,2.127,4.75,4.75,4.75c2.625,0,4.75-2.127,4.75-4.75S25.875,17.5,23.25,17.5z"
+     fill-opacity="0.3"
+     stroke-opacity="0.3"
+     id="path6" />
+  <path
+     d="M23.25,18.5c-1.125,0-2.146,0.408-2.959,1.063l-5.963-3.379c0.108-0.461,0.172-0.94,0.172-1.434  c0-0.438-0.046-0.866-0.132-1.279l5.829-3.109c0.828,0.7,1.884,1.139,3.053,1.139c2.625,0,4.75-2.127,4.75-4.75S25.875,2,23.25,2  c-2.623,0-4.75,2.127-4.75,4.75c0,0.179,0.033,0.349,0.053,0.522l-5.834,3.111C11.584,9.223,10.002,8.5,8.25,8.5  C4.799,8.5,2,11.298,2,14.75C2,18.201,4.799,21,8.25,21c1.695,0,3.229-0.676,4.354-1.771l5.96,3.379  c-0.029,0.211-0.064,0.422-0.064,0.643c0,2.623,2.127,4.75,4.75,4.75c2.625,0,4.75-2.127,4.75-4.75S25.875,18.5,23.25,18.5z"
+     fill="#FFFFFF"
+     id="path8" />
+  <rect
+     fill="none"
+     height="30"
+     width="30"
+     id="rect10" />
 </svg>
index 4bdceea..c51513a 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -29,10 +29,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 
     //qDebug() << "locale3=" << locale;
     QTranslator translator;
-    //QString dir = "translations";
-    QString dir = ":/translations";
+    QString dir = "translations";
+    //QString dir = ":/translations";
 #if defined(Q_WS_MAEMO_5)
-    //dir = "/opt/ubi/"+dir;
+    dir = "/opt/ubi/"+dir;
 #endif
     if (translator.load(QString("ubi.")+locale,dir)) {
         app->installTranslator(&translator);
@@ -48,8 +48,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #if defined(Q_WS_MAEMO_5)
     //viewer.engine()->addImportPath(QString("/opt/qtm12/imports"));
 #endif
-    //viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml"));
-    viewer.setSource(QUrl("qrc:///qml/ubi/main.qml"));
+    viewer.setMainQmlFile(QLatin1String("qml/ubi/main.qml"));
+    //viewer.setSource(QUrl("qrc:///qml/ubi/main.qml"));
     viewer.setWindowTitle(QString("Ubi"));
 
 #if defined(Q_WS_MAEMO_5)
index 61a0d8a..72f1f42 100644 (file)
@@ -169,6 +169,7 @@ Page {
             } else {
                 var txt = "" + Conv.bytesToSize(nodes[i].size);
                 object.description = txt;
+                object.isPublic = nodes[i].is_public;
                 object.clicked.connect(function(prop) {
                             pageStack.push("PropertiesPage.qml");
                             pageStack.currentPage.init(prop);
diff --git a/qml/ubi/InitPage.qml b/qml/ubi/InitPage.qml
new file mode 100644 (file)
index 0000000..755df06
--- /dev/null
@@ -0,0 +1,125 @@
+import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
+import "UIConstants.js" as Const
+import "u1.js" as U1
+import "components"
+
+Rectangle {
+    id: root
+
+    color: Const.DEFAULT_BACKGROUND_COLOR
+    state: "opened"
+
+    function hide() {
+        root.state = "closed";
+    }
+
+    Component.onCompleted: init()
+
+    function init() {
+        if(Utils.isAuthorized()) {
+            //title = "Hi, "+Utils.name();
+            login();
+        } else {
+            pageStack.initialPage = "LoginPage.qml";
+            hide();
+        }
+    }
+
+    function login() {
+        var secrets = {
+            token: Utils.token(),
+            secret: Utils.tokenSecret(),
+            consumer_key : Utils.customerKey(),
+            consumer_secret: Utils.customerSecret()
+        };
+        U1.getRootNode(secrets,root);
+    }
+
+    function onRespRootNode(resp) {
+        hide();
+    }
+
+    function onErr(status) {
+        hide()
+        if(status==401) {
+            tip.show(qsTr("Authorization failed!"));
+        } else if(status==0) {
+            tip.show(qsTr("Unable to connect!"));
+        } else {
+            tip.show(qsTr("Error: ")+status);
+        }
+    }
+
+    Image {
+        id: pic
+        source: "images/ubi100.png"
+        width: 104; height: 70
+        anchors.horizontalCenter: parent.horizontalCenter
+        y: (root.height-height)/3
+    }
+
+    Text {
+        id: loading
+        anchors.top: pic.bottom
+        anchors.margins: Const.TEXT_MARGIN
+        anchors.horizontalCenter: parent.horizontalCenter
+        font.pixelSize: 25
+        color: "white"
+        text: "Loading..."
+    }
+
+    Image {
+        id: icon
+        width: 64
+        height: 64
+        anchors.top: loading.bottom
+        anchors.margins: 2*Const.TEXT_MARGIN
+        source: "images/progress.png"
+        sourceSize.width: width
+        sourceSize.height: height
+        anchors.horizontalCenter: parent.horizontalCenter
+        Component.onCompleted: animationIcon.start()
+
+        NumberAnimation {
+            id: animationIcon
+            target: icon
+            properties: "rotation"
+            from: 0
+            to: 360
+            duration: 500
+            loops: Animation.Infinite
+        }
+    }
+
+    Text {
+        anchors.bottom: root.bottom
+        anchors.bottomMargin: Const.TEXT_MARGIN
+        anchors.horizontalCenter: parent.horizontalCenter
+        font.pixelSize: 18
+        color: "white"
+        text: "ver. 0.9.2-2"
+    }
+
+    MouseArea {
+        anchors.fill: parent
+    }
+
+    states: [
+        State {
+            name: "opened"
+            //PropertyChanges { target: root; opacity: 1 }
+            PropertyChanges { target: root; y: 0}
+        },
+        State {
+            name: "closed"
+            //PropertyChanges { target: root; opacity: 0 }
+            PropertyChanges { target: root; y: root.height }
+        }
+    ]
+
+    transitions: Transition {
+        //NumberAnimation { properties: "opacity"; easing.type: Easing.InOutQuad }
+        NumberAnimation { properties: "y"; easing.type: Easing.InOutQuad }
+    }
+
+}
index 2c9202b..deee992 100644 (file)
@@ -1,42 +1,13 @@
 import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
 import "components"
 import "u1.js" as U1
+import "UIConstants.js" as Const
 
 Page {
     id: root
     title: qsTr("Login")
     orientation: "auto"
 
-    Column {
-        id: column
-        anchors.centerIn: parent
-        spacing: 20
-
-        Text {
-            font.pixelSize: 30
-            color: "white"
-            text: qsTr("Ubuntu One sign in:")
-        }
-
-        TextField {
-            id: user
-            placeholderText: qsTr("User ID")
-            width: 400
-        }
-
-        TextField {
-            id: pass
-            width: 400
-            placeholderText: qsTr("Password")
-            echoMode: TextInput.Password
-        }
-
-        Button {
-            label: qsTr("Save")
-            onButtonClicked: root.getToken()
-        }
-    }
-
     function getToken() {
         mask.state = "busy";
         U1.getToken(user.text,pass.text,root)
@@ -65,4 +36,45 @@ Page {
             tip.show(qsTr("Error: ")+status);
         }
     }
+
+    Flickable {
+        width: root.width
+        height: root.height
+        contentHeight: content.height+Const.SYSTEM_BAR_HEIGHT+Const.TEXT_MARGIN
+        y: Const.SYSTEM_BAR_HEIGHT+2*Const.TEXT_MARGIN
+
+        Column {
+            id: content
+            spacing: Const.DEFAULT_MARGIN
+            x: Const.TEXT_MARGIN
+
+            Text {
+                font.pixelSize: 30
+                color: "white"
+                text: qsTr("Ubuntu One sign in:")
+            }
+
+            Spacer {}
+
+            TextField {
+                id: user
+                placeholderText: qsTr("User ID")
+                width: 400
+            }
+
+            TextField {
+                id: pass
+                width: 400
+                placeholderText: qsTr("Password")
+                echoMode: TextInput.Password
+            }
+
+            Spacer {}
+
+            Button {
+                label: qsTr("Save")
+                onButtonClicked: root.getToken()
+            }
+        }
+    }
 }
index 00e8adf..4aeef62 100644 (file)
@@ -11,9 +11,11 @@ Page {
 
     property variant secrets
     property variant properties
+    property bool isPublic
 
     menu: [
         [qsTr("Download"),false],
+        [qsTr("Publish"),false],
         [qsTr("Rename"),false],
         [qsTr("Delete"),false]
     ]
@@ -22,6 +24,13 @@ Page {
         if(id==qsTr("Download")) {
             fileSelector.state = "visible";
         }
+        if(id==qsTr("Publish")) {
+            if(isPublic) {
+                dialogStopPublish.open();
+            } else {
+                dialogStartPublish.open();
+            }
+        }
         if(id==qsTr("Rename")) {
             dialogRename.open();
         }
@@ -66,10 +75,19 @@ Page {
             created.text = Qt.formatDateTime(crd, "d/M/yyyy h:mm");
             changed.text = Qt.formatDateTime(chd, "d/M/yyyy h:mm");
             size.text = Conv.bytesToSize(prop.size);
+            if(prop && prop.is_public) {
+                url.text = prop.public_url;
+            }
+
         } else {
             tip.show(qsTr("Internal error!"));
         }
         root.properties = prop;
+        if(root.properties && root.properties.is_public) {
+            root.isPublic = true;
+        } else {
+            root.isPublic = false;
+        }
     }
 
     function setContentType(type)
@@ -78,6 +96,18 @@ Page {
         //ctype.font.italic = false;
     }
 
+    function onErr(status)
+    {
+        mask.state = "idle";
+        if(status==401) {
+            tip.show(qsTr("Authorization failed!"));
+        } else if(status==0) {
+            tip.show(qsTr("Unable to connect!"));
+        } else {
+            tip.show(qsTr("Error: ")+status);
+        }
+    }
+
     function onRespRename(prop)
     {
         //console.log("onRespRename");
@@ -88,15 +118,33 @@ Page {
 
     function onErrRename(status)
     {
-        //console.log("onErrRename");
+        onErr(status);
+    }
+
+    function onRespStopPublishing(prop)
+    {
+        //console.log("onRespStopPublishing");
         mask.state = "idle";
-        if(status==401) {
-            tip.show(qsTr("Authorization failed!"));
-        } else if(status==0) {
-            tip.show(qsTr("Unable to connect!"));
-        } else {
-            tip.show(qsTr("Error: ")+status);
-        }
+        init(prop); pageStack.prevPage().init();
+        tip.show(qsTr("Publishing stopped!"));
+    }
+
+    function onErrStopPublishing(status)
+    {
+        onErr(status);
+    }
+
+    function onRespStartPublishing(prop)
+    {
+        //console.log("onRespStartPublishing");
+        mask.state = "idle";
+        init(prop); pageStack.prevPage().init();
+        tip.show(qsTr("Publishing started!"));
+    }
+
+    function onErrStartPublishing(status)
+    {
+        onErr(status);
     }
 
     Flickable {
@@ -162,6 +210,34 @@ Page {
                 font.pixelSize: 30
                 color: "black"
             }
+            Line {
+                width: root.width-2*Const.TEXT_MARGIN
+                visible: root.isPublic
+            }
+            Text {
+                font.pixelSize: 30
+                color: "white"
+                text: qsTr("Public URL:")
+                visible: root.isPublic
+            }
+            Text {
+                id: url
+                font.pixelSize: 30
+                color: "black"
+                wrapMode: Text.Wrap
+                width: root.width - 6*Const.DEFAULT_MARGIN
+                visible: root.isPublic
+            }
+            Button {
+                label: qsTr("Copy")
+                fontSize: 25
+                visible: root.isPublic
+                onButtonClicked: {
+                    Utils.setClipboardText(url.text);
+                    tip.show(qsTr("Public URL copied to clipboard!"));
+                }
+            }
+
             /*Text {
                 font.pixelSize: 30
                 color: "white"
@@ -207,6 +283,38 @@ Page {
         onCanceled: mask.state = "idle"
     }
 
+    DialogYesNo {
+        id: dialogStopPublish
+        z: 200
+        text: qsTr("Stop publishing?")
+        onOpened: mask.state = "dialog"
+        onClosed: {
+            mask.state = "idle";
+            if(ok) {
+                mask.state = "busy";
+                var currentPath = root.properties.resource_path;
+                U1.stopPublishing(root.secrets,currentPath,root);
+            }
+        }
+        onCanceled: mask.state = "idle"
+    }
+
+    DialogYesNo {
+        id: dialogStartPublish
+        z: 200
+        text: qsTr("Start publishing?")
+        onOpened: mask.state = "dialog"
+        onClosed: {
+            mask.state = "idle";
+            if(ok) {
+                mask.state = "busy";
+                var currentPath = root.properties.resource_path;
+                U1.startPublishing(root.secrets,currentPath,root);
+            }
+        }
+        onCanceled: mask.state = "idle"
+    }
+
 
     function getParentPath(path) {
         //console.log(path);
index 638d154..e64466c 100644 (file)
@@ -7,16 +7,16 @@ Page {
     id: root
     title: "Ubi"
 
-    Component.onCompleted: init()
+    //Component.onCompleted: init()
 
-    function init() {
+    /*function init() {
         if(Utils.isAuthorized()) {
             //title = "Hi, "+Utils.name();
         } else {
             console.log("not authorized!");
             pageStack.initialPage = "LoginPage.qml";
         }
-    }
+    }*/
 
     menu: [
         [qsTr("About Ubi"),false]
@@ -45,8 +45,9 @@ Page {
         Spacer{}
 
         ButtonNew {
-            height: 100; width: 200
+            height: 100; width: 250
             label: qsTr("Files")
+            //iconSource: "images/files.png"
             anchors.horizontalCenter: parent.horizontalCenter
             onButtonClicked: {
                 pageStack.push("FilesPage.qml");
@@ -64,16 +65,18 @@ Page {
         }*/
 
         ButtonNew {
-            height: 100; width: 200
+            height: 100; width: 250
             label: qsTr("Account")
+            //iconSource: "images/account.png"
             anchors.horizontalCenter: parent.horizontalCenter
             onButtonClicked: {
                 pageStack.push("AccountPage.qml");
             }
         }
         ButtonNew {
-            height: 100; width: 200
+            height: 100; width: 250
             label: qsTr("Settings")
+            //iconSource: "images/settings.png"
             anchors.horizontalCenter: parent.horizontalCenter
             onButtonClicked: pageStack.push("SettingsPage.qml");
         }
@@ -103,14 +106,4 @@ Page {
         onOpened: mask.state = "dialog"
         onCanceled: mask.state = "idle"
     }
-
-
-    Text {
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 10
-        anchors.horizontalCenter: parent.horizontalCenter
-        font.pixelSize: 18
-        color: "white"
-        text: "ver. 0.9.1-2"
-    }
 }
index 5aec31d..1124e06 100644 (file)
@@ -12,8 +12,6 @@ Item {
 
     signal clicked()
 
-
-
     Rectangle {
         width: parent.width
         height: Const.SYSTEM_BAR_HEIGHT
index e46c605..1e99bf7 100644 (file)
@@ -20,7 +20,6 @@ var SHADOW_COLOR = "#77000000";
 var SHADOW_OFFSET = 3;
 
 var DEFAULT_BACKGROUND_COLOR = UBUNTU_ORANGE_COLOR;
-//var DEFAULT_BACKGROUND_COLOR = LIGHT_AUBERGINE_COLOR;
 
 var DEFAULT_FOREGROUND_COLOR = "white";
 
@@ -38,7 +37,7 @@ var DEFAULT_TEXT_COLOR = DEFAULT_FOREGROUND_COLOR;
 var DEFAULT_FOLDER = "file:///home/user/MyDocs";
 
 var SYSTEM_BAR_HEIGHT = 60;
-var TEXT_MARGIN = 30;
+var TEXT_MARGIN = 25;
 
 // images
 
index 8c6cb6d..fd947ef 100644 (file)
@@ -5,6 +5,7 @@ Item {
     id: root
     property string label
     property bool disabled: false
+    property int fontSize: 30
     property int maxSize: 27
     property string iconSource
 
@@ -68,7 +69,7 @@ Item {
         id: textbox
         //x: 10
         //y: 10
-        font.pixelSize: 30
+        font.pixelSize: root.fontSize
         color: root.disabled ? "gray" : "white"
         anchors.centerIn: box
         visible: root.iconSource == ""
index 2e752f2..cbb438c 100644 (file)
@@ -45,16 +45,6 @@ Item {
         //border.width: Const.SHADOW_OFFSET
     }
 
-    Image {
-        id: icon
-        width: 40
-        height: 40
-        anchors.centerIn: box
-        source: root.iconSource == "" ? "" : "../" + root.iconSource
-        sourceSize.width: width
-        sourceSize.height: height
-    }
-
     onLabelChanged: {
         if(root.label.length>root.maxSize) {
             //console.log("root.label: "+root.label)
@@ -66,14 +56,26 @@ Item {
         }
     }
 
-    Text {
-        id: textbox
-        //x: 10
-        //y: 10
-        font.pixelSize: 30
-        color: root.disabled ? "gray" : "white"
+    Row {
         anchors.centerIn: box
-        visible: root.iconSource == ""
+        spacing: Const.DEFAULT_MARGIN
+        Image {
+            id: icon
+            width: 40
+            height: 40
+            source: root.iconSource == "" ? "" : "../" + root.iconSource
+            sourceSize.width: width
+            sourceSize.height: height
+            visible: root.iconSource!=""
+        }
+
+        Text {
+            id: textbox
+            //x: 10
+            //y: 10
+            font.pixelSize: 30
+            color: root.disabled ? "gray" : "white"
+        }
     }
 
     MouseArea {
index 417eeb1..cfeace7 100644 (file)
@@ -7,13 +7,14 @@ Item {
     property alias description: details.text
     property bool isDirectory: false
     property bool isPhoto: 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: parent.width
     height: box.height
 
     signal clicked(variant prop)
@@ -31,7 +32,7 @@ Item {
     Rectangle {
         id: box
         color: Const.TRANSPARENT
-        height: label.height+5*Const.DEFAULT_MARGIN
+        height: label.height+4*Const.DEFAULT_MARGIN
         width: root.width
     }
 
@@ -45,7 +46,8 @@ Item {
 
     Rectangle {
         id: boxShadow
-        width: box.width-2*Const.TEXT_MARGIN+2*Const.DEFAULT_MARGIN
+        //width: box.width-2*Const.TEXT_MARGIN+2*Const.DEFAULT_MARGIN
+        width: box.width
         height: box.height
         y: 5
         //color: root.isDirectory ? "white" : "black"
@@ -53,11 +55,12 @@ Item {
         //anchors.verticalCenter: box.verticalCenter
         anchors.horizontalCenter: box.horizontalCenter
         opacity: 0.4
-        radius: 10
+        //radius: 10
         visible: mouseArea.pressed
     }
+
     /*Line {
-        width: boxShadow.width
+        width: box.width-2*Const.TEXT_MARGIN
         anchors.bottom: boxShadow.bottom
         anchors.horizontalCenter: box.horizontalCenter
     }*/
@@ -68,7 +71,9 @@ Item {
         width: 50
         height: 50
         x: Const.TEXT_MARGIN-5
-        source: root.isDirectory ? "../images/folder.png" : root.isPhoto ? "../images/photo.png" : "../images/document.png"
+        source: root.isDirectory ? "../images/folder.png" :
+                                   root.isPhoto ? "../images/photo.png" :
+                                                  "../images/document.png"
         sourceSize.width: width
         sourceSize.height: height
         anchors.verticalCenter: box.verticalCenter
@@ -81,21 +86,35 @@ Item {
         color: Const.DEFAULT_FOREGROUND_COLOR
         elide: Text.ElideRight
         wrapMode: Text.Wrap
-        width: root.width-x-Const.TEXT_MARGIN-2*Const.DEFAULT_MARGIN-arrow.width
+        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: 20
+        font.pixelSize: 18
         font.italic: true
         color: "black"
         elide: Text.ElideRight
         wrapMode: Text.Wrap
         width: root.width-x-Const.TEXT_MARGIN-2*Const.DEFAULT_MARGIN-arrow.width
-        //anchors.bottom: boxShadow.bottom
-        y: box.height-height
+        y: box.height-height+3
+    }
+
+    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
+        visible: root.isPublic
     }
 
     Image {
diff --git a/qml/ubi/images/account.png b/qml/ubi/images/account.png
new file mode 100644 (file)
index 0000000..eb7bc72
Binary files /dev/null and b/qml/ubi/images/account.png differ
diff --git a/qml/ubi/images/files.png b/qml/ubi/images/files.png
new file mode 100644 (file)
index 0000000..f95e411
Binary files /dev/null and b/qml/ubi/images/files.png differ
diff --git a/qml/ubi/images/internet.png b/qml/ubi/images/internet.png
new file mode 100644 (file)
index 0000000..11ab3d2
Binary files /dev/null and b/qml/ubi/images/internet.png differ
diff --git a/qml/ubi/images/settings.png b/qml/ubi/images/settings.png
new file mode 100644 (file)
index 0000000..5f533a7
Binary files /dev/null and b/qml/ubi/images/settings.png differ
diff --git a/qml/ubi/images/share.png b/qml/ubi/images/share.png
new file mode 100644 (file)
index 0000000..92564de
Binary files /dev/null and b/qml/ubi/images/share.png differ
diff --git a/qml/ubi/images/ubi100.png b/qml/ubi/images/ubi100.png
new file mode 100644 (file)
index 0000000..7ad82ca
Binary files /dev/null and b/qml/ubi/images/ubi100.png differ
index 4f7021a..8684481 100644 (file)
@@ -54,4 +54,9 @@ Rectangle {
         anchors.bottom: parent.bottom
     }
 
+    InitPage {
+        height: mainWindow.height;
+        width: mainWindow.width;
+    }
+
 }
index 0cc3521..91bdd0e 100644 (file)
@@ -155,7 +155,7 @@ function getRootNode(secrets,root)
     xhr.onreadystatechange = function() {
                 if(xhr.readyState===4) {
                     if(xhr.status>=400||xhr.status===0) {
-                        console.log(xhr.status);
+                        //console.log(xhr.status);
                         root.onErr(xhr.status);
                     } else {
                         //console.log(xhr.responseText);
@@ -174,7 +174,7 @@ function getFileTree(secrets,root)
     xhr.onreadystatechange = function() {
                 if(xhr.readyState===4) {
                     if(xhr.status>=400||xhr.status===0) {
-                        console.log(xhr.status);
+                        //console.log(xhr.status);
                         root.onErr(xhr.status);
                     } else {
                         //console.log(xhr.responseText);
@@ -217,6 +217,54 @@ function renameFile(secrets,resourcePath,targetPath,root)
     xhr.send(body);
 }
 
+function stopPublishing(secrets,resourcePath,root)
+{
+    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    var xhr = oAuthRequest(url,secrets,"PUT");
+    xhr.setRequestHeader("Content-Type","application/json");
+    var body = '{"is_public":false}';
+    xhr.onreadystatechange = function() {
+                if(xhr.readyState===4) {
+                    if(xhr.status>=400||xhr.status===0) {
+                        //console.log("status: "+xhr.status);
+                        //console.log(xhr.responseText);
+                        root.onErrStopPublishing(xhr.status);
+                    } else {
+                        //console.log("status: "+xhr.status);
+                        //console.log(xhr.responseText);
+                        var resp = eval('('+xhr.responseText+')');
+                        //console.log(resp);
+                        root.onRespStopPublishing(resp);
+                    }
+                }
+            }
+    xhr.send(body);
+}
+
+function startPublishing(secrets,resourcePath,root)
+{
+    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    var xhr = oAuthRequest(url,secrets,"PUT");
+    xhr.setRequestHeader("Content-Type","application/json");
+    var body = '{"is_public":true}';
+    xhr.onreadystatechange = function() {
+                if(xhr.readyState===4) {
+                    if(xhr.status>=400||xhr.status===0) {
+                        //console.log("status: "+xhr.status);
+                        //console.log(xhr.responseText);
+                        root.onErrStartPublishing(xhr.status);
+                    } else {
+                        //console.log("status: "+xhr.status);
+                        //console.log(xhr.responseText);
+                        var resp = eval('('+xhr.responseText+')');
+                        //console.log(resp);
+                        root.onRespStartPublishing(resp);
+                    }
+                }
+            }
+    xhr.send(body);
+}
+
 function newFolder(secrets,resourcePath,root)
 {
     var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
index 58b6bd7..5fc6d58 100644 (file)
@@ -1,3 +1,9 @@
+ubi (0.9.2-1) unstable; urgency=low
+
+  * Added "publishing" feature
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 05 May 2012 14:56:55 +0200
+
 ubi (0.9.1-2) unstable; urgency=low
 
   * New icons
index 3e07b84..5fc6d58 100644 (file)
@@ -1,7 +1,13 @@
+ubi (0.9.2-1) unstable; urgency=low
+
+  * Added "publishing" feature
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 05 May 2012 14:56:55 +0200
+
 ubi (0.9.1-2) unstable; urgency=low
 
   * New icons
-  * Updated Files tab
+  * Updated GUI
 
  -- Michal Kosciesza <mkiol@o2.pl>  Thu, 03 May 2012 19:04:26 +0200
 
index 58b6bd7..5fc6d58 100644 (file)
@@ -1,3 +1,9 @@
+ubi (0.9.2-1) unstable; urgency=low
+
+  * Added "publishing" feature
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 05 May 2012 14:56:55 +0200
+
 ubi (0.9.1-2) unstable; urgency=low
 
   * New icons
index ed0359a..a31c309 100644 (file)
@@ -1,3 +1,16 @@
+ubi (0.9.1-3) unstable; urgency=low
+
+  * Added "publishing" feature
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Sat, 05 May 2012 14:56:55 +0200
+
+ubi (0.9.1-2) unstable; urgency=low
+
+  * New icons
+  * Updated GUI
+
+ -- Michal Kosciesza <mkiol@o2.pl>  Thu, 03 May 2012 19:04:26 +0200
+
 ubi (0.9.1-1) unstable; urgency=low
 
   * Used storage information in Account tab
diff --git a/translation.pri b/translation.pri
new file mode 100644 (file)
index 0000000..03b9331
--- /dev/null
@@ -0,0 +1,34 @@
+evil_hack_to_fool_lupdate {
+        SOURCES += \
+            qml/ubi/AccountPage.qml \
+            qml/ubi/DownloadArea.qml \
+            qml/ubi/FileSelector.qml \
+            qml/ubi/FilesPage.qml \
+            qml/ubi/LoginPage.qml \
+            qml/ubi/main.qml \
+            qml/ubi/PageStack.qml \
+            qml/ubi/PropertiesPage.qml \
+            qml/ubi/SettingsPage.qml \
+            qml/ubi/Shadow.qml \
+            qml/ubi/StartPage.qml \
+            qml/ubi/SystemBar.qml \
+            qml/ubi/TaskBar.qml \
+            qml/ubi/DownloadProgressBar.qml \
+        qml/ubi/components/Bar.qml \
+        qml/ubi/components/DialogCombo.qml \
+        qml/ubi/components/FileOld.qml \
+        qml/ubi/components/Notification.qml \
+        qml/ubi/components/ToolIcon.qml \
+        qml/ubi/components/ButtonNew.qml \
+        qml/ubi/components/DialogInfo.qml \
+        qml/ubi/components/File.qml \
+        qml/ubi/components/Page.qml \
+        qml/ubi/components/Button.qml \
+        qml/ubi/components/DialogInput.qml \
+        qml/ubi/components/Line.qml \
+        qml/ubi/components/Spacer.qml \
+        qml/ubi/components/DialogBox.qml \
+        qml/ubi/components/DialogYesNo.qml \
+        qml/ubi/components/Mask.qml \
+        qml/ubi/components/TextField.qml
+}
index 271196a..79b90df 100644 (file)
Binary files a/translations/ubi.pl.qm and b/translations/ubi.pl.qm differ
index efef542..97a8925 100644 (file)
         <source>Enter new file name:</source>
         <translation>Podaj nowÄ… nazwÄ™ pliku:</translation>
     </message>
+    <message>
+        <source>Publish</source>
+        <translation>Upublicznij</translation>
+    </message>
+    <message>
+        <source>Publishing stopped!</source>
+        <translation>Upublicznianie wyÅ‚Ä…czone!</translation>
+    </message>
+    <message>
+        <source>Publishing started!</source>
+        <translation>Upublicznianie wÅ‚Ä…czone!</translation>
+    </message>
+    <message>
+        <source>Public URL:</source>
+        <translation>Publiczny URL:</translation>
+    </message>
+    <message>
+        <source>Public URL copied to clipboard!</source>
+        <translation>Publiczny URL skopiowany!</translation>
+    </message>
+    <message>
+        <source>Stop publishing?</source>
+        <translation>WyÅ‚Ä…czyć upublicznianie?</translation>
+    </message>
+    <message>
+        <source>Start publishing?</source>
+        <translation>WÅ‚Ä…czyć upublicznianie?</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Skopiuj</translation>
+    </message>
 </context>
 <context>
     <name>SettingsPage</name>
diff --git a/ubi.pro b/ubi.pro
index 7f89259..620d29c 100644 (file)
--- a/ubi.pro
+++ b/ubi.pro
@@ -1,18 +1,18 @@
 # Add more folders to ship with the application, here
-#folder_01.source = qml/ubi
-#folder_01.target = qml
-#DEPLOYMENTFOLDERS = folder_01
+folder_01.source = qml/ubi
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
 
-#folder_02.source = translations/ubi.pl.qm
-#folder_02.target = translations
-#DEPLOYMENTFOLDERS += folder_02
+folder_02.source = translations/ubi.pl.qm
+folder_02.target = translations
+DEPLOYMENTFOLDERS += folder_02
 
 # Additional import path used to resolve QML modules in Creator's code model
 QML_IMPORT_PATH =
 
 symbian:TARGET.UID3 = 0xE6DE55DD
 
-# Smart Installer package's UID
+# Smart Installer package's UI
 # This UID is from the protected range and therefore the package will
 # fail to install if self-signed. By default qmake uses the unprotected
 # range value if unprotected UID is defined for the application and
@@ -42,24 +42,8 @@ maemo5 {
 SOURCES += main.cpp \
     utils.cpp
 
-evil_hack_to_fool_lupdate {
-    SOURCES += \
-    qml/ubi/AccountPage.qml \
-    qml/ubi/DownloadArea.qml \
-    qml/ubi/FileSelector.qml \
-    qml/ubi/FilesPage.qml \
-    qml/ubi/LoginPage.qml \
-    qml/ubi/main.qml \
-    qml/ubi/PageStack.qml \
-    qml/ubi/PropertiesPage.qml \
-    qml/ubi/SettingsPage.qml \
-    qml/ubi/Shadow.qml \
-    qml/ubi/StartPage.qml \
-    qml/ubi/SystemBar.qml \
-    qml/ubi/TaskBar.qml \
-    qml/ubi/DownloadProgressBar.qml \
-    qml/ubi/components/DialogYesNo.qml
-}
+# evil_hack_to_fool_lupdate
+#include(translation.pri)
 
 # Please do not modify the following two lines. Required for deployment.
 include(qmlapplicationviewer/qmlapplicationviewer.pri)
@@ -78,7 +62,8 @@ OTHER_FILES += \
     qtc_packaging/debian_harmattan/copyright \
     qtc_packaging/debian_harmattan/control \
     qtc_packaging/debian_harmattan/compat \
-    qtc_packaging/debian_harmattan/changelog
+    qtc_packaging/debian_harmattan/changelog \
+    translation.pri
 
 HEADERS += \
     utils.h
index 7043fdd..20ef615 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-05-03T19:08:52. -->
+<!-- Written by Qt Creator 2.4.1, 2012-05-06T15:27:39. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_0_2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_0-2_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-1_armel.deb</value>
+       <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_1-2_armel.deb</value>
+       <value type="QString">/home/mkiol/dev/Qt/ubi-build-maemo-Maemo_Qt_4_7_0__fremantle-pr13__Release/ubi_0_9_2-1_armel.deb</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
        <value type="QString">192.168.2.101</value>
+       <value type="QString">192.168.2.101</value>
+       <value type="QString">192.168.2.101</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
        <value type="QString"></value>
        <value type="QString"></value>
        <value type="QString"></value>
        <value type="QString"></value>
+       <value type="QString"></value>
+       <value type="QString"></value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
        <value type="QDateTime">2012-02-12T21:15:32</value>
        <value type="QDateTime">2012-04-20T23:23:40</value>
        <value type="QDateTime">2012-04-28T10:41:48</value>
        <value type="QDateTime">2012-05-03T18:56:53</value>
+       <value type="QDateTime">2012-05-05T14:55:15</value>
+       <value type="QDateTime">2012-05-06T15:26:36</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/gdb</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1_rt1.0/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target (Qt SDK) Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.0 (Qt SDK) Release</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">10</value>
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/gdb</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Debian package via SFTP upload</value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoUploadAndInstallDpkgPackageStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles"/>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts"/>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths"/>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes"/>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
+       <value type="QString">/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.1-2_armel.deb</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
+       <value type="QString">localhost</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
+       <value type="QString"></value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
+       <value type="QDateTime">2012-05-04T14:25:52</value>
+      </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build Debian Package and Install to Harmattan Device</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToHarmattan</value>
-    <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">4</value>
+    <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">5</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/home/mkiol/dev/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/gcc.arm-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Maemo/gdb</value>
+    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit./home/mkiol/dev/QtSDK/debugger/Desktop/bin/gdb</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
       <value type="int" key="RemoteCompiler.BuildStep.PostOp">1</value>
       <value type="QString" key="RemoteCompiler.BuildStep.QtVersion">4_7_2_m1_1_1</value>
       <value type="int" key="RemoteCompiler.BuildStep.SisOpt">0</value>
-      <value type="QString" key="RemoteCompiler.BuildStep.Target">s60_3_2</value>
+      <value type="QString" key="RemoteCompiler.BuildStep.Target">s60_5_0</value>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
diff --git a/ubi.qrc b/ubi.qrc
index 1bb1db8..d92407e 100644 (file)
--- a/ubi.qrc
+++ b/ubi.qrc
@@ -18,9 +18,6 @@
         <file>qml/ubi/TaskBar.qml</file>
         <file>qml/ubi/u1.js</file>
         <file>qml/ubi/UIConstants.js</file>
-        <file>qml/ubi/oauth/oauth.js</file>
-        <file>qml/ubi/oauth/README.txt</file>
-        <file>qml/ubi/oauth/sha1.js</file>
         <file>qml/ubi/components/Bar.qml</file>
         <file>qml/ubi/components/Button.qml</file>
         <file>qml/ubi/components/ButtonNew.qml</file>
         <file>qml/ubi/components/Spacer.qml</file>
         <file>qml/ubi/components/TextField.qml</file>
         <file>qml/ubi/components/ToolIcon.qml</file>
+        <file>qml/ubi/images/account.png</file>
         <file>qml/ubi/images/back.png</file>
         <file>qml/ubi/images/close.png</file>
         <file>qml/ubi/images/document.png</file>
         <file>qml/ubi/images/down.png</file>
         <file>qml/ubi/images/download.png</file>
+        <file>qml/ubi/images/files.png</file>
         <file>qml/ubi/images/folder.png</file>
+        <file>qml/ubi/images/internet.png</file>
         <file>qml/ubi/images/menu-arrow.png</file>
         <file>qml/ubi/images/menu-arrow-grey.png</file>
         <file>qml/ubi/images/menu-arrow-orange.png</file>
         <file>qml/ubi/images/photo.png</file>
         <file>qml/ubi/images/progress.png</file>
         <file>qml/ubi/images/progress-small.png</file>
+        <file>qml/ubi/images/settings.png</file>
+        <file>qml/ubi/images/share.png</file>
         <file>qml/ubi/images/ubi50.png</file>
         <file>qml/ubi/images/up.png</file>
         <file>qml/ubi/images/upload.png</file>
+        <file>qml/ubi/oauth/oauth.js</file>
+        <file>qml/ubi/oauth/README.txt</file>
+        <file>qml/ubi/oauth/sha1.js</file>
         <file>translations/ubi.pl.qm</file>
     </qresource>
 </RCC>
diff --git a/ubi.zip b/ubi.zip
index ded5548..229e53b 100644 (file)
Binary files a/ubi.zip and b/ubi.zip differ
index ab7d65b..5a458f2 100644 (file)
--- a/utils.cpp
+++ b/utils.cpp
@@ -6,6 +6,7 @@ Utils::Utils(QmlApplicationViewer *viewer, QSettings *settings, QObject *parent)
 {
     _viewer = viewer;
     _settings = settings;
+    _clipboard = QApplication::clipboard();
 
     _nam = new QNetworkAccessManager(this);
     isFinished = true;
@@ -380,3 +381,9 @@ void Utils::deleteFinished()
     temp_reply->close();
     temp_reply->deleteLater();
 }
+
+void Utils::setClipboardText(const QString &text)
+{
+    _clipboard->setText(text, QClipboard::Clipboard);
+    _clipboard->setText(text, QClipboard::Selection);
+}
diff --git a/utils.h b/utils.h
index bf7e35e..9093eb4 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -12,6 +12,8 @@
 #include <QMap>
 #include <QStringList>
 #include <QMessageBox>
+#include <QApplication>
+#include <QClipboard>
 
 #if defined(Q_WS_MAEMO_5)
 #include <QDBusConnection>
@@ -25,6 +27,8 @@ class Utils : public QObject
     Q_OBJECT
 public:
     explicit Utils(QmlApplicationViewer *viewer, QSettings *settings, QObject *parent = 0);
+
+    Q_INVOKABLE void setClipboardText(const QString &);
     
 signals:
     void downloadAdded(QString filename);
@@ -110,6 +114,8 @@ private:
 
     QMap<QNetworkReply*,QStringList> downloads;
 
+    QClipboard *_clipboard;
+
     void start();
 };
 
diff --git a/www/big/screenshot22.png b/www/big/screenshot22.png
new file mode 100644 (file)
index 0000000..af6b5f1
Binary files /dev/null and b/www/big/screenshot22.png differ
index 835798e..08eecc4 100644 (file)
@@ -8,7 +8,20 @@ body {
   color: white;
   margin: 0;
   font-family: "Ubuntu", Arial, sans-serif;
-  max-width: 750px;
+  font-size:14px;
+  max-width: 800px;
+}
+h1 {
+  font-size:18px;
+  font-weight:bold;
+}
+h2 {
+  font-size:15px;
+  font-weight:bold;
+}
+h3 {
+  font-size:14px;
+  font-weight:bold;
 }
 a {
   color: white;
@@ -25,10 +38,12 @@ ul {
 p {
   margin: 10px;
   margin-bottom: 20px;
+  font-size:14px;
 }
 img {
   border-right: 1px solid black;
   border-bottom: 1px solid black;
+  border: 1px solid black;
   margin: 10px
 }
 div#head {
@@ -54,50 +69,64 @@ div#content {
 </div>
 
 <div id="content">
-<p><strong>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled
-platforms</strong></p>
 
+<h1>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled
+platforms</h1>
+
+<h1>Features</h1>
 <p>
-<strong>Ubi</strong> provides access to Ubuntu One cloud service. Initial
-version supports simple storage management tasks like: file Download, Upload and
-Deletion, but the plan is to provide other cloud features i.e. Notes editing and
-Contacts synchronization.
-</p>
+Ubi provides access to Ubuntu One cloud service. Initial
+version supports:</p>
+<ul>
+<li>file downloading</li>
+<li>file uploading</li>
+<li>file/folder deletion</li>
+<li>file/folder renaming</li>
+<li>folder creation</li>
+<li>file publishing</li>
+<li>account data view (e.g. free space)</li>
+</ul>
 <p>
-At the moment <strong>Ubi</strong> is available only for Nokia N900, but in
-Download section also an experimental release for Nokia N9 and Symbian was published.
+The plan is to provide other cloud features in future such as Notes and
+Contacts synchronization.
 </p>
-<p>
-The application can be downloaded via the application manager under the
-Network section if you have the <strong>extras-devel</strong> repository enabled.
+
+<h1>Devices</h1>
+<p>At the moment <strong>Ubi is available only for Nokia N900.</strong></p>
+<p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental release for Nokia N9 and Symbian was published. Please note that these apps have not been tested on real devices.</p>
+
+<h1>Download</h1>
+<h2>Nokia N900</h2>
+<p>The application can be downloaded via the Application Manager under the
+Network section if you have the <i>extras-devel</i> repository enabled.</p>
+<p><a href="http://wiki.maemo.org/Extras-devel">Here</a> you can find instructions on how to enable <i>extras-devel</i> on Nokia N900.
 </p>
+<h2>Other devices</h2>
+<p>Find the right package in <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section.</p>
 
-<p>
-Links:
+<h1>Links:</h1>
 <ul>
 <li><a href="https://garage.maemo.org/projects/ubi">Project Info page @garage</a></li>
-<li><a href="https://garage.maemo.org/tracker/?group_id=2327">Bug reports, feature requests</a></li>
+<li><a href="https://garage.maemo.org/tracker/?group_id=2327">Feedback, Bug reports, feature requests</a></li>
 <li><a href="https://garage.maemo.org/frs/?group_id=2327">Downloads</a></li>
 </ul>
-</p>
 
+<h1>Screenshots:</h1>
 <div id="screenshots">
 <br/>
-<a href="big/screenshot00.png"><img src="screenshot00.png"/></a>
-<a href="big/screenshot04.png"><img src="screenshot04.png"/></a>
-<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
+<a href="big/screenshot22.png"><img src="screenshot22.png"/></a>
 <a href="big/screenshot06.png"><img src="screenshot06.png"/></a>
+<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
 <a href="big/screenshot09.png"><img src="screenshot09.png"/></a>
 <a href="big/screenshot10.png"><img src="screenshot10.png"/></a>
 <a href="big/screenshot11.png"><img src="screenshot11.png"/></a>
 <a href="big/screenshot12.png"><img src="screenshot12.png"/></a>
-<a href="big/screenshot13.png"><img src="screenshot13.png"/></a>
 <a href="big/screenshot14.png"><img src="screenshot14.png"/></a>
 </div>
 
 <div id="foot">
 <div>
-
+&copy; 2012 Michal Kosciesza
 </div>
 
 </body>
index c49ad09..4547260 100644 (file)
@@ -8,23 +8,42 @@ body {
   color: white;
   margin: 0;
   font-family: "Ubuntu", Arial, sans-serif;
-  max-width: 750px;
+  font-size:14px;
+  max-width: 800px;
+}
+h1 {
+  font-size:18px;
+  font-weight:bold;
+}
+h2 {
+  font-size:15px;
+  font-weight:bold;
+}
+h3 {
+  font-size:14px;
+  font-weight:bold;
 }
 a {
   color: white;
   text-decoration: none;
   border-bottom: 1px dotted white;
 }
+#screenshots a {
+  text-decoration: none;
+  border: 0
+}
 ul {
   list-style: square;
 }
 p {
   margin: 10px;
   margin-bottom: 20px;
+  font-size:14px;
 }
 img {
   border-right: 1px solid black;
   border-bottom: 1px solid black;
+  border: 1px solid black;
   margin: 10px
 }
 div#head {
@@ -50,50 +69,64 @@ div#content {
 </div>
 
 <div id="content">
-<p><strong>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled
-platforms</strong></p>
 
+<h1>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled
+platforms</h1>
+
+<h1>Features</h1>
 <p>
-<strong>Ubi</strong> provides access to Ubuntu One cloud service. Initial
-version supports simple storage management tasks like: file Download, Upload and
-Deletion, but the plan is to provide other cloud features i.e. Notes editing and
-Contact synchronization.
-</p>
+Ubi provides access to Ubuntu One cloud service. Initial
+version supports:</p>
+<ul>
+<li>file downloading</li>
+<li>file uploading</li>
+<li>file/folder deletion</li>
+<li>file/folder renaming</li>
+<li>folder creation</li>
+<li>file publishing</li>
+<li>account data view (e.g. free space)</li>
+</ul>
 <p>
-At the moment <strong>Ubi</strong> is available only for Nokia N900, but in
-Download section also an experimental release for Nokia N9 and Symbian was published.
+The plan is to provide other cloud features in future such as Notes and
+Contacts synchronization.
 </p>
-<p>
-The application can be downloaded via the application manager under the
-Network section if you have the <strong>extras-devel</strong> repository enabled.
+
+<h1>Devices</h1>
+<p>At the moment <strong>Ubi is available only for Nokia N900.</strong></p>
+<p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental release for Nokia N9 and Symbian was published. Please note that these apps have not been tested on real devices.</p>
+
+<h1>Download</h1>
+<h2>Nokia N900</h2>
+<p>The application can be downloaded via the Application Manager under the
+Network section if you have the <i>extras-devel</i> repository enabled.</p>
+<p><a href="http://wiki.maemo.org/Extras-devel">Here</a> you can find instructions on how to enable <i>extras-devel</i> on Nokia N900.
 </p>
+<h2>Other devices</h2>
+<p>Find the right package in <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section.</p>
 
-<p>
-Links:
+<h1>Links:</h1>
 <ul>
 <li><a href="https://garage.maemo.org/projects/ubi">Project Info page @garage</a></li>
-<li><a href="https://garage.maemo.org/tracker/?group_id=2327">Bug reports, feature requests</a></li>
+<li><a href="https://garage.maemo.org/tracker/?group_id=2327">Feedback, Bug reports, feature requests</a></li>
 <li><a href="https://garage.maemo.org/frs/?group_id=2327">Downloads</a></li>
 </ul>
-</p>
 
-<div>
+<h1>Screenshots:</h1>
+<div id="screenshots">
 <br/>
-<img src="screenshot00.png"/>
-<img src="screenshot04.png"/>
-<img src="screenshot05.png"/>
-<img src="screenshot06.png"/>
-<img src="screenshot09.png"/>
-<img src="screenshot10.png"/>
-<img src="screenshot11.png"/>
-<img src="screenshot12.png"/>
-<img src="screenshot13.png"/>
-<img src="screenshot14.png"/>
+<a href="big/screenshot22.png"><img src="screenshot22.png"/></a>
+<a href="big/screenshot06.png"><img src="screenshot06.png"/></a>
+<a href="big/screenshot05.png"><img src="screenshot05.png"/></a>
+<a href="big/screenshot09.png"><img src="screenshot09.png"/></a>
+<a href="big/screenshot10.png"><img src="screenshot10.png"/></a>
+<a href="big/screenshot11.png"><img src="screenshot11.png"/></a>
+<a href="big/screenshot12.png"><img src="screenshot12.png"/></a>
+<a href="big/screenshot14.png"><img src="screenshot14.png"/></a>
 </div>
 
 <div id="foot">
 <div>
-
+&copy;
 </div>
 
 </body>
diff --git a/www/screenshot22.png b/www/screenshot22.png
new file mode 100644 (file)
index 0000000..7e7a5a4
Binary files /dev/null and b/www/screenshot22.png differ