WWW update

diff --git a/main.cpp b/main.cpp
index 9238ebc..ba8019a 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -26,7 +26,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     }
     QTranslator translator;
     QString dir = "translations";
-    //dir = ":/translations";
+    dir = ":/translations";
 #if defined(MEEGO_EDITION_HARMATTAN)
     dir = ":/translations";
 #endif
@@ -53,8 +53,9 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #if defined(Q_WS_MAEMO_5)
     qputenv("N900_PORTRAIT_SENSORS", "1");
     //viewer.setMainQmlFile(QLatin1String("qml/ubi/meego_main.qml"));
-    viewer.setSource(QUrl("qrc:///qml/ubi/meego_main.qml"));
-    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.setSource(QUrl("qrc:///qml/ubi/main.qml"));
+    //viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
     viewer.setGeometry(QRect(0,0,800,480));
 #endif
 

diff --git a/qml/ubi/InitPage.qml b/qml/ubi/InitPage.qml
index 554cd02..d912d0e 100644 (file)
--- a/qml/ubi/InitPage.qml
+++ b/qml/ubi/InitPage.qml
@@ -29,12 +29,14 @@ Showable {
     }
 
     function onErr(status) {
-        hide()
         if(status==401) {
+            hide()
             tip.show(qsTr("Ubuntu One authorization has failed. Try once again or check login settings."));
         } else if(status==0) {
-            tip.show(qsTr("Unable to connect. Check internet connection."));
+            hide()
+            tip.show(qsTr("Unable to connect. Check internet connection and restart application."));
         } else {
+            hide()
             tip.show(qsTr("Unknown error: ")+status);
         }
     }
@@ -70,11 +72,19 @@ Showable {
             }
 
             BusyIndicator {
+                id: busy
                 anchors.horizontalCenter: parent.horizontalCenter
                 running: true
             }
         }
 
+        Button {
+            id: close
+            iconSource: "images/close.png"
+            anchors { right: parent.right; top: parent.top; margins: Const.DEFAULT_MARGIN }
+            onButtonClicked: Qt.quit()
+        }
+
         Text {
             anchors.bottom: ver.top
             anchors.horizontalCenter: parent.horizontalCenter

diff --git a/qml/ubi/LoginPage.qml b/qml/ubi/LoginPage.qml
index 4b55018..c5a16c7 100644 (file)
--- a/qml/ubi/LoginPage.qml
+++ b/qml/ubi/LoginPage.qml
@@ -78,7 +78,11 @@ Page {
 
             Button {
                 label: qsTr("Save")
-                onButtonClicked: root.getToken()
+                onButtonClicked: {
+                    root.getToken();
+                    user.closeSoftwareInputPanel();
+                    pass.closeSoftwareInputPanel();
+                }
                 anchors.left: parent.left
             }
         }

diff --git a/qml/ubi/components/DialogInput.qml b/qml/ubi/components/DialogInput.qml
index d24d26e..790b24a 100644 (file)
--- a/qml/ubi/components/DialogInput.qml
+++ b/qml/ubi/components/DialogInput.qml
@@ -15,6 +15,9 @@ DialogBox {
         input.text = "";
     }
 
+    onClosed: input.closeSoftwareInputPanel()
+    onCanceled: input.closeSoftwareInputPanel()
+
     Rectangle {
         id: box
         anchors.left: root.left; anchors.right: root.right

diff --git a/qml/ubi/components/TextField.qml b/qml/ubi/components/TextField.qml
index b13ab84..966e9f2 100644 (file)
--- a/qml/ubi/components/TextField.qml
+++ b/qml/ubi/components/TextField.qml
@@ -16,6 +16,11 @@ Rectangle {
     border.width: 3
     border.color: input.activeFocus ? "black" : "grey"
 
+    function closeSoftwareInputPanel() {
+        input.focus = false;
+        input.closeSoftwareInputPanel();
+    }
+
     TextInput {
         id: input
 
@@ -24,10 +29,20 @@ Rectangle {
         selectByMouse: true
         selectionColor: "gray"
         onTextChanged: root.textChanged()
+        //focus: true
+
+        Keys.onPressed: {
+            if (event.key == Qt.Key_Enter || event.key == Qt.Key_Return) {
+                closeSoftwareInputPanel();
+                focus = false;
+                dummy.focus = true;
+            }
+        }
 
-        Keys.onReturnPressed: {
-            closeSoftwareInputPanel()
-            dummy.focus = true
+        onFocusChanged: {
+            if(focus == false) {
+                closeSoftwareInputPanel();
+            }
         }
 
     }

diff --git a/qml/ubi/oauth/oauth.js b/qml/ubi/oauth/oauth.js
index 295569a..e145694 100644 (file)
--- a/qml/ubi/oauth/oauth.js
+++ b/qml/ubi/oauth/oauth.js
@@ -462,6 +462,9 @@ OAuth.setProperties(OAuth.SignatureMethod, // class members
                 parameters.push(toAdd[a]);
             }
         }
+
+
+
         return OAuth.percentEncode(message.method.toUpperCase())
          +'&'+ OAuth.percentEncode(OAuth.SignatureMethod.normalizeUrl(URL))
          +'&'+ OAuth.percentEncode(OAuth.SignatureMethod.normalizeParameters(parameters));

diff --git a/qml/ubi/u1.js b/qml/ubi/u1.js
index a118cb7..478f7f9 100644 (file)
--- a/qml/ubi/u1.js
+++ b/qml/ubi/u1.js
@@ -87,7 +87,7 @@ function oAuthHeader(url,secrets,method)
 
 function registerToken(secrets,user,root)
 {
-    var url = "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/" + user;
+    var url = "https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"+user;
     var xhr = oAuthRequest(url,secrets);
     xhr.onreadystatechange = function() {
                 if(xhr.readyState===4) {
@@ -129,8 +129,8 @@ function getAccount(secrets,root)
 
 function getFiles(secrets,rootNode,root)
 {
-    var url = "https://one.ubuntu.com/api/file_storage/v1"
-            +encodeURI(rootNode)+"/?include_children=true";
+    var url = encodeURI2("https://one.ubuntu.com/api/file_storage/v1"
+            +rootNode+"/?include_children=true");
     //console.log("url: "+url);
     var xhr = oAuthRequest(url,secrets);
     xhr.onreadystatechange = function() {
@@ -191,8 +191,8 @@ function getFileTree(secrets,root)
 
 function renameFile(secrets,resourcePath,targetPath,root)
 {
-    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
-    //console.log("url: "+url);
+    var url = encodeURI2("https://one.ubuntu.com/api/file_storage/v1"+resourcePath);
+    console.log("url: "+url);
     //console.log("target: "+encodeURI(targetPath));
     //console.log("target: "+targetPath);
     var xhr = oAuthRequest(url,secrets,"PUT");
@@ -221,7 +221,7 @@ function renameFile(secrets,resourcePath,targetPath,root)
 
 function stopPublishing(secrets,resourcePath,root)
 {
-    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    var url = encodeURI2("https://one.ubuntu.com/api/file_storage/v1"+resourcePath);
     var xhr = oAuthRequest(url,secrets,"PUT");
     xhr.setRequestHeader("Content-Type","application/json");
     var body = '{"is_public":false}';
@@ -245,7 +245,7 @@ function stopPublishing(secrets,resourcePath,root)
 
 function startPublishing(secrets,resourcePath,root)
 {
-    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    var url = encodeURI2("https://one.ubuntu.com/api/file_storage/v1"+resourcePath);
     var xhr = oAuthRequest(url,secrets,"PUT");
     xhr.setRequestHeader("Content-Type","application/json");
     var body = '{"is_public":true}';
@@ -269,7 +269,7 @@ function startPublishing(secrets,resourcePath,root)
 
 function newFolder(secrets,resourcePath,root)
 {
-    var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    var url = encodeURI2("https://one.ubuntu.com/api/file_storage/v1"+resourcePath);
     //console.log("url: "+url);
     var xhr = oAuthRequest(url,secrets,"PUT");
     xhr.setRequestHeader("Content-Type","application/json");
@@ -294,8 +294,10 @@ function newFolder(secrets,resourcePath,root)
 
 function deleteFile(secrets,resourcePath,root,utils)
 {
-    var urlA = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
+    //var urlA = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(resourcePath);
     var url = "https://one.ubuntu.com/api/file_storage/v1"+resourcePath;
+    var urlA = encodeURI2(url);
+
     //console.log("u1.js:delete url="+url);
     var auth = oAuthHeader(urlA,secrets,"DELETE");
     utils.deleteFile(url,auth);
@@ -304,7 +306,7 @@ function deleteFile(secrets,resourcePath,root,utils)
 function getFileContentType(secrets,root,path)
 {
     //var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(path);
-    var url = "https://files.one.ubuntu.com"+encodeURI(path);
+    var url = encodeURI2("https://files.one.ubuntu.com"+path);
     //console.log("url: "+url);
     var xhr = oAuthRequest(url,secrets,"GET","bytes=0-10");
     xhr.onreadystatechange = function() {
@@ -355,9 +357,8 @@ function fixFolder(path) {
 function getFileContent(secrets,root,path,folder,size,utils)
 {
     //var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(path);
-
     var url = "https://files.one.ubuntu.com"+path;
-    var urlA = "https://files.one.ubuntu.com"+encodeURI(path);
+    var urlA = encodeURI2(url);
 
     var filename = fixFilename(path);
     var ffolder = fixFolder(folder);
@@ -370,18 +371,21 @@ function getFileContent(secrets,root,path,folder,size,utils)
 
 function uploadFile(secrets,root,path,filename,folder,utils)
 {
-    //var url = "https://one.ubuntu.com/api/file_storage/v1"+encodeURI(path);
-    //var url = "https://files.one.ubuntu.com"+path;
-
     var url = "https://files.one.ubuntu.com"+path;
-    var urlA = "https://files.one.ubuntu.com"+encodeURI(path);
+    var urlA = encodeURI2(url);
 
-    //console.log("u1.js:uploadFile path=" + path);
     //console.log("u1.js:uploadFile url=" + url);
+    //console.log("u1.js:uploadFile urAl=" + urlA);
 
     var ffolder = fixFolder(folder);
     var auth = oAuthHeader(urlA,secrets,"PUT");
     utils.uploadFile(ffolder,filename,url,auth);
 }
 
-
+function encodeURI2(uri)
+{
+    var uri2 = encodeURI(uri);
+    uri2 = uri2.replace(/\%5B/g, "[");
+    uri2 = uri2.replace(/\%5D/g, "]");
+    return uri2;
+}

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index f7048db..504bcd3 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,14 +1,16 @@
 ubi (0.9.4-1) unstable; urgency=low
 
-  * Italian translation
-  * Support for Meego/Harmattan devices
+  * Italian translation (thanks to Alessandro Pra' contribution)
+  * Initial support for Meego/Harmattan devices
+  * Fix: vkb hiding on 'Enter' key
+  * Fix: support '[' and ']' in files names
 
- -- Michal Kosciesza <mkiol@o2.pl>  Sun, 03 Jun 2012 19:19:01 +0200
+ -- Michal Kosciesza <mkiol@o2.pl>  Sun, 10 Jun 2012 19:00:36 +0200
 
 ubi (0.9.3-3) unstable; urgency=low
 
   * Portrait mode for Meego/Harmattan
-  * SW keyboard hiding fix for Meego/Harmattan
+  * Vkb hiding fix for Meego/Harmattan
 
  -- Michal Kosciesza <mkiol@o2.pl>  Fri, 01 Jun 2012 22:59:59 +0200
 

diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules
index 069aa2e..19b3c16 100755 (executable)
--- a/qtc_packaging/debian_fremantle/rules
+++ b/qtc_packaging/debian_fremantle/rules
@@ -38,7 +38,7 @@ clean:
        rm -f build-stamp configure-stamp
 
        # Add here commands to clean up after the build process.
-       $(MAKE) clean
+       # $(MAKE) clean
 
        dh_clean
 
@@ -82,7 +82,7 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       # dh_shlibdeps # Uncomment this line for use without Qt Creator
+       dh_shlibdeps # Uncomment this line for use without Qt Creator
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/qtc_packaging/debian_fremantle/rules~ b/qtc_packaging/debian_fremantle/rules~
new file mode 100755 (executable)
index 0000000..7dbcff2
--- /dev/null
+++ b/qtc_packaging/debian_fremantle/rules~
@@ -0,0 +1,91 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+
+
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+    qmake PREFIX=/usr # Uncomment this line for use without Qt Creator
+
+       touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: configure-stamp
+       dh_testdir
+
+       # Add here commands to compile the package.
+       $(MAKE) # Uncomment this line for use without Qt Creator
+       #docbook-to-man debian/ubi.sgml > ubi.1
+
+       touch $@
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+
+       # Add here commands to clean up after the build process.
+       $(MAKE) clean
+
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       # Add here commands to install the package into debian/ubi.
+       $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/ubi install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs 
+       dh_installdocs
+       dh_installexamples
+#      dh_install
+#      dh_installmenu
+#      dh_installdebconf       
+#      dh_installlogrotate
+#      dh_installemacsen
+#      dh_installpam
+#      dh_installmime
+#      dh_python
+#      dh_installinit
+#      dh_installcron
+#      dh_installinfo
+       dh_installman
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+#      dh_perl
+#      dh_makeshlibs
+       dh_installdeb
+       # dh_shlibdeps # Uncomment this line for use without Qt Creator
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog
index f7048db..9143f45 100644 (file)
--- a/qtc_packaging/debian_harmattan/changelog
+++ b/qtc_packaging/debian_harmattan/changelog
@@ -1,14 +1,16 @@
 ubi (0.9.4-1) unstable; urgency=low
 
-  * Italian translation
-  * Support for Meego/Harmattan devices
+  * Italian translation (thanks to Alessandro Pra' contribution)
+  * Initial support for Meego/Harmattan devices
+  * Fix: vkb hiding on 'Enter' key
+  * Fix: support '[' and ']' in files names
 
  -- Michal Kosciesza <mkiol@o2.pl>  Sun, 03 Jun 2012 19:19:01 +0200
 
 ubi (0.9.3-3) unstable; urgency=low
 
   * Portrait mode for Meego/Harmattan
-  * SW keyboard hiding fix for Meego/Harmattan
+  * Vkb hiding fix for Meego/Harmattan
 
  -- Michal Kosciesza <mkiol@o2.pl>  Fri, 01 Jun 2012 22:59:59 +0200
 

diff --git a/translations/ubi.it.qm b/translations/ubi.it.qm
index fbda539..9e3a9bd 100644 (file)
Binary files a/translations/ubi.it.qm and b/translations/ubi.it.qm differ

diff --git a/translations/ubi.it.ts b/translations/ubi.it.ts
index af109cb..cddbe22 100644 (file)
--- a/translations/ubi.it.ts
+++ b/translations/ubi.it.ts
@@ -149,7 +149,7 @@
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation>Impossibile collegarsi. Controlla la connessione a internet.</translation>
+        <translation type="obsolete">Impossibile collegarsi. Controlla la connessione a internet.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
@@ -159,6 +159,10 @@
         <source>Connecting...</source>
         <translation>Connessione...</translation>
     </message>
+    <message>
+        <source>Unable to connect. Check internet connection and restart application.</source>
+        <translation>Impossibile collegarsi. Controlla la connessione a internet.</translation>
+    </message>
 </context>
 <context>
     <name>LoginPage</name>
@@ -380,7 +384,11 @@
     </message>
     <message>
         <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
+        <translation></translation>
     </message>
 </context>
 <context>
@@ -415,7 +423,11 @@
     </message>
     <message>
         <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
+        <translation></translation>
     </message>
 </context>
 </TS>

diff --git a/translations/ubi.pl.qm b/translations/ubi.pl.qm
index 346f878..a5385df 100644 (file)
Binary files a/translations/ubi.pl.qm and b/translations/ubi.pl.qm differ

diff --git a/translations/ubi.pl.ts b/translations/ubi.pl.ts
index 97305de..9a5db15 100644 (file)
--- a/translations/ubi.pl.ts
+++ b/translations/ubi.pl.ts
@@ -13,19 +13,19 @@
     </message>
     <message>
         <source>User name:</source>
-        <translation type="unfinished">Nazwa użytkownika:</translation>
+        <translation>Nazwa użytkownika:</translation>
     </message>
     <message>
         <source>Email:</source>
-        <translation type="unfinished">Email:</translation>
+        <translation>Email:</translation>
     </message>
     <message>
         <source>Total storage:</source>
-        <translation type="unfinished">Całkowita pojemność:</translation>
+        <translation>Całkowita pojemność:</translation>
     </message>
     <message>
         <source>Account</source>
-        <translation type="unfinished">Konto</translation>
+        <translation>Konto</translation>
     </message>
     <message>
         <source>Unable to connect!</source>
@@ -33,30 +33,30 @@
     </message>
     <message>
         <source>Used:</source>
-        <translation type="unfinished">Wykorzystano:</translation>
+        <translation>Wykorzystano:</translation>
     </message>
     <message>
         <source>Ubuntu One authorization has failed. Try once again or check login settings.</source>
-        <translation type="unfinished">Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
+        <translation>Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation type="unfinished">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
+        <translation>Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
-        <translation type="unfinished">Nieznany błąd:</translation>
+        <translation>Nieznany błąd:</translation>
     </message>
 </context>
 <context>
     <name>DialogYesNo</name>
     <message>
         <source>Yes</source>
-        <translation type="unfinished">Tak</translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
 </context>
 <context>
@@ -67,34 +67,34 @@
     </message>
     <message>
         <source>No active downloads or uploads</source>
-        <translation type="unfinished">Brak aktywnych pobrań</translation>
+        <translation>Brak aktywnych pobrań</translation>
     </message>
     <message>
         <source>Active downloads and uploads</source>
-        <translation type="unfinished">Aktywne pobrania</translation>
+        <translation>Aktywne pobrania</translation>
     </message>
 </context>
 <context>
     <name>FilesPage</name>
     <message>
         <source>Upload file</source>
-        <translation type="unfinished">Wyślij nowy plik</translation>
+        <translation>Wyślij nowy plik</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished">Zmień nazwę</translation>
+        <translation>Zmień nazwę</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Usuń</translation>
+        <translation>Usuń</translation>
     </message>
     <message>
         <source>New folder</source>
-        <translation type="unfinished">Nowy folder</translation>
+        <translation>Nowy folder</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation type="unfinished">Odśwież</translation>
+        <translation>Odśwież</translation>
     </message>
     <message>
         <source>Root folder can&apos;t be renamed!</source>
@@ -106,27 +106,27 @@
     </message>
     <message>
         <source>Authorization failed!</source>
-        <translation type="unfinished">Autoryzacja nie powiodła się!</translation>
+        <translation>Autoryzacja nie powiodła się!</translation>
     </message>
     <message>
         <source>Error: </source>
-        <translation type="unfinished">Błąd:</translation>
+        <translation>Błąd:</translation>
     </message>
     <message>
         <source>Folder renamed!</source>
-        <translation type="unfinished">Zmieniono nazwę!</translation>
+        <translation>Zmieniono nazwę!</translation>
     </message>
     <message>
         <source>New folder created!</source>
-        <translation type="unfinished">Utworzono folder!</translation>
+        <translation>Utworzono folder!</translation>
     </message>
     <message>
         <source>Folder was deleted!</source>
-        <translation type="unfinished">Usunięto folder!</translation>
+        <translation>Usunięto folder!</translation>
     </message>
     <message>
         <source>Delete folder?</source>
-        <translation type="unfinished">Czy usunąć folder?</translation>
+        <translation>Czy usunąć folder?</translation>
     </message>
     <message>
         <source>Enter new folder name...</source>
@@ -134,11 +134,11 @@
     </message>
     <message>
         <source>Invalid folder name!</source>
-        <translation type="unfinished">Nieprawidłowa nazwa folderu!</translation>
+        <translation>Nieprawidłowa nazwa folderu!</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation type="unfinished">Pliki</translation>
+        <translation>Pliki</translation>
     </message>
     <message>
         <source>Unable to connect!</source>
@@ -146,7 +146,7 @@
     </message>
     <message>
         <source>Enter new folder name:</source>
-        <translation type="unfinished">Podaj nową nazwę folderu:</translation>
+        <translation>Podaj nową nazwę folderu:</translation>
     </message>
     <message>
         <source>Folder is empty.</source>
@@ -154,65 +154,69 @@
     </message>
     <message>
         <source>Empty</source>
-        <translation type="unfinished">Pusty</translation>
+        <translation>Pusty</translation>
     </message>
     <message>
         <source>Root folder cannot be renamed.</source>
-        <translation type="unfinished">Nie można zmienić nazwy głównego foldera.</translation>
+        <translation>Nie można zmienić nazwy głównego foldera.</translation>
     </message>
     <message>
         <source>Root folder cannot be deleted.</source>
-        <translation type="unfinished">Nie można usunąć głównego foldera.</translation>
+        <translation>Nie można usunąć głównego foldera.</translation>
     </message>
     <message>
         <source>Ubuntu One authorization has failed. Try once again or check login settings.</source>
-        <translation type="unfinished">Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
+        <translation>Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation type="unfinished">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
+        <translation>Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
-        <translation type="unfinished">Nieznany błąd:</translation>
+        <translation>Nieznany błąd:</translation>
     </message>
 </context>
 <context>
     <name>InitPage</name>
     <message>
         <source>Ubuntu One authorization has failed. Try once again or check login settings.</source>
-        <translation type="unfinished">Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
+        <translation>Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation type="unfinished">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
+        <translation type="obsolete">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
-        <translation type="unfinished">Nieznany błąd:</translation>
+        <translation>Nieznany błąd:</translation>
     </message>
     <message>
         <source>Connecting...</source>
-        <translation type="unfinished">Łączenie...</translation>
+        <translation>Łączenie...</translation>
+    </message>
+    <message>
+        <source>Unable to connect. Check internet connection and restart application.</source>
+        <translation>Nie można połączyć z siecią. Sprawadź połączenie z Internetem i zrestartuj aplikacje.</translation>
     </message>
 </context>
 <context>
     <name>LoginPage</name>
     <message>
         <source>User ID</source>
-        <translation type="unfinished">ID użytkownika</translation>
+        <translation>ID użytkownika</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished">Hasło</translation>
+        <translation>Hasło</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Zapisz</translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Logged in!</source>
-        <translation type="unfinished">Zalogowany!</translation>
+        <translation>Zalogowany!</translation>
     </message>
     <message>
         <source>Authorization failed!</source>
@@ -224,11 +228,11 @@
     </message>
     <message>
         <source>Login</source>
-        <translation type="unfinished">Logowanie</translation>
+        <translation>Logowanie</translation>
     </message>
     <message>
         <source>Ubuntu One sign in:</source>
-        <translation type="unfinished">Zaloguj się do Ubuntu One:</translation>
+        <translation>Zaloguj się do Ubuntu One:</translation>
     </message>
     <message>
         <source>Unable to connect!</source>
@@ -236,30 +240,30 @@
     </message>
     <message>
         <source>Ubuntu One authorization has failed. Try once again or check login settings.</source>
-        <translation type="unfinished">Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
+        <translation>Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation type="unfinished">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
+        <translation>Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
-        <translation type="unfinished">Nieznany błąd:</translation>
+        <translation>Nieznany błąd:</translation>
     </message>
 </context>
 <context>
     <name>PropertiesPage</name>
     <message>
         <source>Download</source>
-        <translation type="unfinished">Pobierz</translation>
+        <translation>Pobierz</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished">Zmień nazwę</translation>
+        <translation>Zmień nazwę</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Usuń</translation>
+        <translation>Usuń</translation>
     </message>
     <message>
         <source>Authorization failed!</source>
@@ -271,31 +275,31 @@
     </message>
     <message>
         <source>Internal error!</source>
-        <translation type="unfinished">Błąd wewnętrzny!</translation>
+        <translation>Błąd wewnętrzny!</translation>
     </message>
     <message>
         <source>File renamed!</source>
-        <translation type="unfinished">Zmieniono nazwę!</translation>
+        <translation>Zmieniono nazwę!</translation>
     </message>
     <message>
         <source>File name:</source>
-        <translation type="unfinished">Nazwa pliku:</translation>
+        <translation>Nazwa pliku:</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished">Rozmiar:</translation>
+        <translation>Rozmiar:</translation>
     </message>
     <message>
         <source>Created:</source>
-        <translation type="unfinished">Utworzono:</translation>
+        <translation>Utworzono:</translation>
     </message>
     <message>
         <source>Changed:</source>
-        <translation type="unfinished">Zmieniono:</translation>
+        <translation>Zmieniono:</translation>
     </message>
     <message>
         <source>Delete file?</source>
-        <translation type="unfinished">Czy usunąć plik?</translation>
+        <translation>Czy usunąć plik?</translation>
     </message>
     <message>
         <source>Enter new file name...</source>
@@ -303,15 +307,15 @@
     </message>
     <message>
         <source>Invalid file name!</source>
-        <translation type="unfinished">Nieprawidłowa nazwa pliku!</translation>
+        <translation>Nieprawidłowa nazwa pliku!</translation>
     </message>
     <message>
         <source>File deleted!</source>
-        <translation type="unfinished">Usunięto plik!</translation>
+        <translation>Usunięto plik!</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished">Plik</translation>
+        <translation>Plik</translation>
     </message>
     <message>
         <source>Unable to connect!</source>
@@ -319,58 +323,58 @@
     </message>
     <message>
         <source>Enter new file name:</source>
-        <translation type="unfinished">Podaj nową nazwę pliku:</translation>
+        <translation>Podaj nową nazwę pliku:</translation>
     </message>
     <message>
         <source>Publish</source>
-        <translation type="unfinished">Upublicznij</translation>
+        <translation>Upublicznij</translation>
     </message>
     <message>
         <source>Publishing stopped!</source>
-        <translation type="unfinished">Upublicznianie wyłączone!</translation>
+        <translation>Upublicznianie wyłączone!</translation>
     </message>
     <message>
         <source>Publishing started!</source>
-        <translation type="unfinished">Upublicznianie włączone!</translation>
+        <translation>Upublicznianie włączone!</translation>
     </message>
     <message>
         <source>Public URL:</source>
-        <translation type="unfinished">Publiczny URL:</translation>
+        <translation>Publiczny URL:</translation>
     </message>
     <message>
         <source>Public URL copied to clipboard!</source>
-        <translation type="unfinished">Publiczny URL skopiowany!</translation>
+        <translation>Publiczny URL skopiowany!</translation>
     </message>
     <message>
         <source>Stop publishing?</source>
-        <translation type="unfinished">Wyłączyć upublicznianie?</translation>
+        <translation>Wyłączyć upublicznianie?</translation>
     </message>
     <message>
         <source>Start publishing?</source>
-        <translation type="unfinished">Włączyć upublicznianie?</translation>
+        <translation>Włączyć upublicznianie?</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished">Skopiuj</translation>
+        <translation>Skopiuj</translation>
     </message>
     <message>
         <source>Ubuntu One authorization has failed. Try once again or check login settings.</source>
-        <translation type="unfinished">Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
+        <translation>Autoryzacja w Ubuntu One nie powiodła się. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.</translation>
     </message>
     <message>
         <source>Unknown error: </source>
-        <translation type="unfinished">Nieznany błąd:</translation>
+        <translation>Nieznany błąd:</translation>
     </message>
     <message>
         <source>Unable to connect. Check internet connection.</source>
-        <translation type="unfinished">Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
+        <translation>Nie można połączyć z siecią. Sprawadź połączenie z Internetem.</translation>
     </message>
 </context>
 <context>
     <name>SettingsPage</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Ustawienia</translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Polish</source>
@@ -382,27 +386,27 @@
     </message>
     <message>
         <source>Language:</source>
-        <translation type="unfinished">Język:</translation>
+        <translation>Język:</translation>
     </message>
     <message>
         <source>Change</source>
-        <translation type="unfinished">Zmień</translation>
+        <translation>Zmień</translation>
     </message>
     <message>
         <source>Log out</source>
-        <translation type="unfinished">Wyloguj</translation>
+        <translation>Wyloguj</translation>
     </message>
     <message>
         <source>Logged as:</source>
-        <translation type="unfinished">Zalogowany jako:</translation>
+        <translation>Zalogowany jako:</translation>
     </message>
     <message>
         <source>Restart application!</source>
-        <translation type="unfinished">Zrestartuj aplikacje!</translation>
+        <translation>Zrestartuj aplikacje!</translation>
     </message>
     <message>
         <source>Choose language:</source>
-        <translation type="unfinished">Wybierz język:</translation>
+        <translation>Wybierz język:</translation>
     </message>
 </context>
 <context>
@@ -452,15 +456,15 @@
     <name>TaskMenu</name>
     <message>
         <source>Account</source>
-        <translation type="unfinished">Konto</translation>
+        <translation>Konto</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Ustawienia</translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>About Ubi</source>
-        <translation type="unfinished">O Ubi</translation>
+        <translation>O Ubi</translation>
     </message>
 </context>
 <context>
@@ -491,70 +495,78 @@
     </message>
     <message>
         <source>&lt;b&gt;Ubi&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Ubi&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Ubi&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
     </message>
     <message>
         <source>File downloaded.</source>
-        <translation type="unfinished">Plik został pobrany.</translation>
+        <translation>Plik został pobrany.</translation>
     </message>
     <message>
         <source>File uploaded.</source>
-        <translation type="unfinished">Plik został wysłany.</translation>
+        <translation>Plik został wysłany.</translation>
     </message>
     <message>
         <source>Error while downloading.</source>
-        <translation type="unfinished">Błąd podczas pobierania.</translation>
+        <translation>Błąd podczas pobierania.</translation>
     </message>
     <message>
         <source>Error while uploading.</source>
-        <translation type="unfinished">Błąd podczas wysyłania.</translation>
+        <translation>Błąd podczas wysyłania.</translation>
     </message>
     <message>
         <source>File added to the queue.</source>
-        <translation type="unfinished">Plik dodany do kolejki.</translation>
+        <translation>Plik dodany do kolejki.</translation>
     </message>
     <message>
         <source>File operation canceled.</source>
-        <translation type="unfinished">Operacja anulowana.</translation>
+        <translation>Operacja anulowana.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo/Meego i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>meego_main</name>
     <message>
         <source>File downloaded.</source>
-        <translation type="unfinished">Plik został pobrany.</translation>
+        <translation>Plik został pobrany.</translation>
     </message>
     <message>
         <source>File uploaded.</source>
-        <translation type="unfinished">Plik został wysłany.</translation>
+        <translation>Plik został wysłany.</translation>
     </message>
     <message>
         <source>Error while downloading.</source>
-        <translation type="unfinished">Błąd podczas pobierania.</translation>
+        <translation>Błąd podczas pobierania.</translation>
     </message>
     <message>
         <source>Error while uploading.</source>
-        <translation type="unfinished">Błąd podczas wysyłania.</translation>
+        <translation>Błąd podczas wysyłania.</translation>
     </message>
     <message>
         <source>File added to the queue.</source>
-        <translation type="unfinished">Plik dodany do kolejki.</translation>
+        <translation>Plik dodany do kolejki.</translation>
     </message>
     <message>
         <source>File operation canceled.</source>
-        <translation type="unfinished">Operacja anulowana.</translation>
+        <translation>Operacja anulowana.</translation>
     </message>
     <message>
         <source>&lt;b&gt;Ubi&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Ubi&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Ubi&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Nieoficjalna aplikacja Ubuntu One dla Maemo/Meego i innych platform obsługujących Qt.&lt;/p&gt;&lt;p&gt;&lt;small&gt;http://ubi.garage.maemo.org&lt;/small&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;© 2012 Michal Kosciesza&lt;/small&gt;&lt;/p&gt;</translation>
     </message>
 </context>
 </TS>

diff --git a/ubi.pro b/ubi.pro
index 660fcc9..e2214fa 100644 (file)
--- a/ubi.pro
+++ b/ubi.pro
@@ -1,15 +1,15 @@
 # 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
 
-folder_03.source = translations/ubi.it.qm
-folder_03.target = translations
-DEPLOYMENTFOLDERS += folder_03
+#folder_03.source = translations/ubi.it.qm
+#folder_03.target = translations
+#DEPLOYMENTFOLDERS += folder_03
 
 # Additional import path used to resolve QML modules in Creator's code model
 QML_IMPORT_PATH =

diff --git a/ubi.pro.user b/ubi.pro.user
index 813a546..8f5fc82 100644 (file)
--- a/ubi.pro.user
+++ b/ubi.pro.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2012-06-08T14:51:24. -->
+<!-- Written by Qt Creator 2.4.1, 2012-06-10T21:36:59. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="int">4</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -491,7 +491,7 @@
        <value type="QDateTime">2012-04-28T10:41:48</value>
        <value type="QDateTime">2012-05-03T18:56:53</value>
        <value type="QDateTime">2012-06-02T12:03:04</value>
-       <value type="QDateTime">2012-06-03T20:34:05</value>
+       <value type="QDateTime">2012-06-10T21:25:35</value>
        <value type="QDateTime">2012-05-05T14:55:15</value>
        <value type="QDateTime">2012-05-18T21:37:42</value>
       </valuelist>
@@ -748,24 +748,28 @@
        <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>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_2__Qt_SDK__Release/ubi_0.9.3-3_armel.deb</value>
        <value type="QString">/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.3-3_armel.deb</value>
+       <value type="QString">/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.4-1_armel.deb</value>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
        <value type="QString">localhost</value>
        <value type="QString">localhost</value>
        <value type="QString">localhost</value>
        <value type="QString">localhost</value>
+       <value type="QString">localhost</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>
       </valuelist>
       <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
        <value type="QDateTime">2012-06-01T22:31:33</value>
        <value type="QDateTime">2012-05-04T14:25:52</value>
        <value type="QDateTime">2012-06-01T23:55:18</value>
        <value type="QDateTime">2012-06-02T12:58:48</value>
+       <value type="QDateTime">2012-06-10T20:18:05</value>
       </valuelist>
      </valuemap>
      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>

diff --git a/ubi.qrc b/ubi.qrc
index 81afec8..4def844 100644 (file)
--- a/ubi.qrc
+++ b/ubi.qrc
@@ -9,7 +9,6 @@
         <file>qml/ubi/components/DialogBox.qml</file>
         <file>qml/ubi/components/DialogCombo.qml</file>
         <file>qml/ubi/components/DialogInfo.qml</file>
-        <file>qml/ubi/components/DialogInput.qml</file>
         <file>qml/ubi/components/DialogYesNo.qml</file>
         <file>qml/ubi/components/File.qml</file>
         <file>qml/ubi/components/FileSmall.qml</file>
@@ -84,6 +83,7 @@
         <file>qml/ubi/TopBar.qml</file>
         <file>qml/ubi/u1.js</file>
         <file>qml/ubi/UIConstants.js</file>
+        <file>qml/ubi/components/DialogInput.qml</file>
         <file>translations/ubi.it.qm</file>
         <file>translations/ubi.it.ts</file>
         <file>translations/ubi.pl.qm</file>

diff --git a/ubi.zip b/ubi.zip
index d2fe6c5..8fa0cf3 100644 (file)
Binary files a/ubi.zip and b/ubi.zip differ

diff --git a/utils.cpp b/utils.cpp
index fef0803..808e9fb 100644 (file)
--- a/utils.cpp
+++ b/utils.cpp
@@ -168,6 +168,8 @@ void Utils::start()
 
     QUrl url(data.url);
     QNetworkRequest req(url);
+    //qDebug() << "Authorization: " << data.auth;
+    //qDebug() << "Url: " << url.toEncoded();
     req.setRawHeader("Authorization", data.auth.toAscii());
 
     if(data.isDownload)

diff --git a/www/index.html b/www/index.html
index b0aac82..a3077b0 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -107,9 +107,9 @@ Contacts synchronization.
 </p>
 
 <h1>Devices</h1>
-<p>At the moment Ubi is available only for <strong>Nokia N900</strong>.</p>
+<p>At the moment Ubi is available for <strong>Nokia N900</strong> and <strong>Nokia N9</strong>.</p>
 
-<p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental releases for <strong>Symbian</strong> and <strong>Nokia N9</strong> were published. Please note that these apps have not been tested on real devices.</p>
+<p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental releases for <strong>Symbian</strong> were published. Please note that these apps have not been tested on real devices.</p>
 
 <h1>Download</h1>
 <p>The latest release is version <strong>0.9.4-1</strong></p>

diff --git a/www/index.html~ b/www/index.html~
index d457574..b0aac82 100644 (file)
--- a/www/index.html~
+++ b/www/index.html~
@@ -62,6 +62,19 @@ div#content {
   margin: 20px;
 }
 </style>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-32503867-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
 </head>
 <body>
 

diff --git a/www/index2.html b/www/index2.html
index 5668fc3..a53cd9a 100644 (file)
--- a/www/index2.html
+++ b/www/index2.html
@@ -1,12 +1,13 @@
 <html>
 <head>
+<meta name="google-site-verification" content="4BCkc18HpbaqGMPerUI_EwkOttI0NzkeH2yhpRySHfA" />
 <title>Ubi: an unofficial Ubuntu One app for Maemo/Meego (Nokia N900 & N9) and other Qt-enabled
 platforms</title>
 <style type="text/css">
 body {
   background-color: #dd4814;
   color: white;
-  margin: 0;
+  margin: 0; padding: 0; border: 0;
   font-family: "Ubuntu", Arial, sans-serif;
   font-size:14px;
   max-width: 800px;
@@ -48,30 +49,39 @@ img {
 }
 div#head {
   font-size:40px;
-  margin: 20px;
+  margin-left: 20px;
+  position: absolute;
+  margin: 0; padding: 0; border: 0;
+  top: 0; left: 0;
   /*border-bottom: 2px solid black;
   background-color: #77216f;*/
 }
 #head img {
-  border: 0;
-  margin: 10px;
+  border: 0; padding: 0; margin: 0;
+  /*margin: 10px;*/
   vertical-align:middle;
 }
+div#top {
+  background-color: #77216F;
+  height: 10px;
+}
 div#content {
   margin: 20px;
+  padding-top: 150px;
 }
 </style>
 </head>
 <body>
 
 <div id="head">
+<div id="top"></div>
 <img src="ubi100.png" alt="Ubi logo" height="70" width="104"/> Ubi
+<h1>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
+platforms</h1>
 </div>
 
 <div id="content">
 
-<h1>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
-platforms</h1>
 <br/>
 
 <h1>Features</h1>
@@ -117,11 +127,7 @@ Network section if you have the <i>extras-devel</i> repository enabled.</p>
 <br/>
 <h1>Screenshots</h1>
 <div id="screenshots">
-<a href="big/screenshot001.png"><img src="screenshot001.png"/></a>
-<a href="big/screenshot002.png"><img src="screenshot002.png"/></a>
 <a href="big/screenshot003.png"><img src="screenshot003.png"/></a>
-<a href="big/screenshot004.png"><img src="screenshot004.png"/></a>
-<a href="big/screenshot005.png"><img src="screenshot005.png"/></a>
 <a href="big/screenshot006.png"><img src="screenshot006.png"/></a>
 </div>
 &copy; 2012 Michal Kosciesza

diff --git a/www/index2.html~ b/www/index2.html~
new file mode 100644 (file)
index 0000000..914b1a9
--- /dev/null
+++ b/www/index2.html~
@@ -0,0 +1,140 @@
+<html>
+<head>
+<meta name="google-site-verification" content="4BCkc18HpbaqGMPerUI_EwkOttI0NzkeH2yhpRySHfA" />
+<title>Ubi: an unofficial Ubuntu One app for Maemo/Meego (Nokia N900 & N9) and other Qt-enabled
+platforms</title>
+<style type="text/css">
+body {
+  background-color: #dd4814;
+  color: white;
+  margin: 0; padding: 0; border: 0;
+  font-family: "Ubuntu", Arial, sans-serif;
+  font-size:14px;
+  max-width: 800px;
+}
+h1 {
+  font-size:18px;
+  font-weight:bold;
+}
+h2 {
+  font-size:14px;
+  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 {
+  font-size:40px;
+  margin-left: 20px;
+  position: absolute;
+  margin: 0; padding: 0; border: 0;
+  x: 0; y: 0;
+  /*border-bottom: 2px solid black;
+  background-color: #77216f;*/
+}
+#head img {
+  border: 0; padding: 0; margin: 0;
+  /*margin: 10px;*/
+  vertical-align:middle;
+}
+div#top {
+  background-color: #77216F;
+  height: 10px;
+}
+div#content {
+  margin: 20px;
+  padding-top: 150px;
+}
+</style>
+</head>
+<body>
+
+<div id="head">
+<div id="top"></div>
+<img src="ubi100.png" alt="Ubi logo" height="70" width="104"/> Ubi
+<h1>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
+platforms</h1>
+</div>
+
+<div id="content">
+
+<br/>
+
+<h1>Features</h1>
+<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>
+The plan is to provide other cloud features in future such as Notes and
+Contacts synchronization.
+</p>
+
+<h1>Devices</h1>
+<p>At the moment Ubi is available for <strong>Nokia N900</strong> and <strong>Nokia N9</strong>.</p>
+
+<p>In <a href="https://garage.maemo.org/frs/?group_id=2327">Download</a> section also an experimental releases for <strong>Symbian</strong> were published. Please note that these apps have not been tested on real devices.</p>
+
+<h1>Download</h1>
+<p>The latest release is version <strong>0.9.4-1</strong></p>
+<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>
+
+<h1>Links</h1>
+<ul>
+<li><a href="https://garage.maemo.org/projects/ubi">Project Info page @garage</a></li>
+<li><a href="http://maemo.org/packages/view/ubi/">Ubi package @maemo.org</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>
+<br/>
+<h1>Screenshots</h1>
+<div id="screenshots">
+<a href="big/screenshot003.png"><img src="screenshot003.png"/></a>
+<a href="big/screenshot006.png"><img src="screenshot006.png"/></a>
+</div>
+&copy; 2012 Michal Kosciesza
+</div>
+
+<div id="foot">
+<div>
+
+</body>
+</html>