From: Muki
Date: Sun, 10 Jun 2012 19:38:39 +0000 (+0200)
Subject: WWW update
X-Git-Url: https://vcs.maemo.org/git/?p=ubi;a=commitdiff_plain;h=HEAD
WWW update
---
diff --git a/main.cpp b/main.cpp
index 9238ebc..ba8019a 100644
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 Sun, 03 Jun 2012 19:19:01 +0200
+ -- Michal Kosciesza 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 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
--- 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
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
--- 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 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 Fri, 01 Jun 2012 22:59:59 +0200
diff --git a/translations/ubi.it.qm b/translations/ubi.it.qm
index fbda539..9e3a9bd 100644
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
--- a/translations/ubi.it.ts
+++ b/translations/ubi.it.ts
@@ -149,7 +149,7 @@
Unable to connect. Check internet connection.
- Impossibile collegarsi. Controlla la connessione a internet.
+ Impossibile collegarsi. Controlla la connessione a internet.
Unknown error:
@@ -159,6 +159,10 @@
Connecting...
Connessione...
+
+ Unable to connect. Check internet connection and restart application.
+ Impossibile collegarsi. Controlla la connessione a internet.
+
LoginPage
@@ -380,7 +384,11 @@
<p>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
- <p>Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+
+
+ <p>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+
@@ -415,7 +423,11 @@
<p>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
- <p>Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Applicazione non ufficiale di Ubuntu One per Maemo 5 e altre piattaforme compatibili con Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+
+
+ <p>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+
diff --git a/translations/ubi.pl.qm b/translations/ubi.pl.qm
index 346f878..a5385df 100644
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
--- a/translations/ubi.pl.ts
+++ b/translations/ubi.pl.ts
@@ -13,19 +13,19 @@
User name:
- Nazwa użytkownika:
+ Nazwa użytkownika:
Email:
- Email:
+ Email:
Total storage:
- CaÅkowita pojemnoÅÄ:
+ CaÅkowita pojemnoÅÄ:
Account
- Konto
+ Konto
Unable to connect!
@@ -33,30 +33,30 @@
Used:
- Wykorzystano:
+ Wykorzystano:
Ubuntu One authorization has failed. Try once again or check login settings.
- Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
+ Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
Unable to connect. Check internet connection.
- Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
Unknown error:
- Nieznany bÅÄ
d:
+ Nieznany bÅÄ
d:
DialogYesNo
Yes
- Tak
+ Tak
No
- Nie
+ Nie
@@ -67,34 +67,34 @@
No active downloads or uploads
- Brak aktywnych pobraÅ
+ Brak aktywnych pobraÅ
Active downloads and uploads
- Aktywne pobrania
+ Aktywne pobrania
FilesPage
Upload file
- WyÅlij nowy plik
+ WyÅlij nowy plik
Rename
- ZmieÅ nazwÄ
+ ZmieÅ nazwÄ
Delete
- UsuÅ
+ UsuÅ
New folder
- Nowy folder
+ Nowy folder
Refresh
- OdÅwież
+ OdÅwież
Root folder can't be renamed!
@@ -106,27 +106,27 @@
Authorization failed!
- Autoryzacja nie powiodÅa siÄ!
+ Autoryzacja nie powiodÅa siÄ!
Error:
- BÅÄ
d:
+ BÅÄ
d:
Folder renamed!
- Zmieniono nazwÄ!
+ Zmieniono nazwÄ!
New folder created!
- Utworzono folder!
+ Utworzono folder!
Folder was deleted!
- UsuniÄto folder!
+ UsuniÄto folder!
Delete folder?
- Czy usunÄ
Ä folder?
+ Czy usunÄ
Ä folder?
Enter new folder name...
@@ -134,11 +134,11 @@
Invalid folder name!
- NieprawidÅowa nazwa folderu!
+ NieprawidÅowa nazwa folderu!
Files
- Pliki
+ Pliki
Unable to connect!
@@ -146,7 +146,7 @@
Enter new folder name:
- Podaj nowÄ
nazwÄ folderu:
+ Podaj nowÄ
nazwÄ folderu:
Folder is empty.
@@ -154,65 +154,69 @@
Empty
- Pusty
+ Pusty
Root folder cannot be renamed.
- Nie można zmieniÄ nazwy gÅównego foldera.
+ Nie można zmieniÄ nazwy gÅównego foldera.
Root folder cannot be deleted.
- Nie można usunÄ
Ä gÅównego foldera.
+ Nie można usunÄ
Ä gÅównego foldera.
Ubuntu One authorization has failed. Try once again or check login settings.
- Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
+ Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
Unable to connect. Check internet connection.
- Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
Unknown error:
- Nieznany bÅÄ
d:
+ Nieznany bÅÄ
d:
InitPage
Ubuntu One authorization has failed. Try once again or check login settings.
- Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
+ Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
Unable to connect. Check internet connection.
- Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
Unknown error:
- Nieznany bÅÄ
d:
+ Nieznany bÅÄ
d:
Connecting...
- ÅÄ
czenie...
+ ÅÄ
czenie...
+
+
+ Unable to connect. Check internet connection and restart application.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem i zrestartuj aplikacje.
LoginPage
User ID
- ID użytkownika
+ ID użytkownika
Password
- HasÅo
+ HasÅo
Save
- Zapisz
+ Zapisz
Logged in!
- Zalogowany!
+ Zalogowany!
Authorization failed!
@@ -224,11 +228,11 @@
Login
- Logowanie
+ Logowanie
Ubuntu One sign in:
- Zaloguj siÄ do Ubuntu One:
+ Zaloguj siÄ do Ubuntu One:
Unable to connect!
@@ -236,30 +240,30 @@
Ubuntu One authorization has failed. Try once again or check login settings.
- Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
+ Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
Unable to connect. Check internet connection.
- Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
Unknown error:
- Nieznany bÅÄ
d:
+ Nieznany bÅÄ
d:
PropertiesPage
Download
- Pobierz
+ Pobierz
Rename
- ZmieÅ nazwÄ
+ ZmieÅ nazwÄ
Delete
- UsuÅ
+ UsuÅ
Authorization failed!
@@ -271,31 +275,31 @@
Internal error!
- BÅÄ
d wewnÄtrzny!
+ BÅÄ
d wewnÄtrzny!
File renamed!
- Zmieniono nazwÄ!
+ Zmieniono nazwÄ!
File name:
- Nazwa pliku:
+ Nazwa pliku:
Size:
- Rozmiar:
+ Rozmiar:
Created:
- Utworzono:
+ Utworzono:
Changed:
- Zmieniono:
+ Zmieniono:
Delete file?
- Czy usunÄ
Ä plik?
+ Czy usunÄ
Ä plik?
Enter new file name...
@@ -303,15 +307,15 @@
Invalid file name!
- NieprawidÅowa nazwa pliku!
+ NieprawidÅowa nazwa pliku!
File deleted!
- UsuniÄto plik!
+ UsuniÄto plik!
File
- Plik
+ Plik
Unable to connect!
@@ -319,58 +323,58 @@
Enter new file name:
- Podaj nowÄ
nazwÄ pliku:
+ Podaj nowÄ
nazwÄ pliku:
Publish
- Upublicznij
+ Upublicznij
Publishing stopped!
- Upublicznianie wyÅÄ
czone!
+ Upublicznianie wyÅÄ
czone!
Publishing started!
- Upublicznianie wÅÄ
czone!
+ Upublicznianie wÅÄ
czone!
Public URL:
- Publiczny URL:
+ Publiczny URL:
Public URL copied to clipboard!
- Publiczny URL skopiowany!
+ Publiczny URL skopiowany!
Stop publishing?
- WyÅÄ
czyÄ upublicznianie?
+ WyÅÄ
czyÄ upublicznianie?
Start publishing?
- WÅÄ
czyÄ upublicznianie?
+ WÅÄ
czyÄ upublicznianie?
Copy
- Skopiuj
+ Skopiuj
Ubuntu One authorization has failed. Try once again or check login settings.
- Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
+ Autoryzacja w Ubuntu One nie powiodÅa siÄ. Spróbuj jeszcze raz lub sprawdź ustawienia logowania.
Unknown error:
- Nieznany bÅÄ
d:
+ Nieznany bÅÄ
d:
Unable to connect. Check internet connection.
- Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
+ Nie można poÅÄ
czyÄ z sieciÄ
. Sprawadź poÅÄ
czenie z Internetem.
SettingsPage
Settings
- Ustawienia
+ Ustawienia
Polish
@@ -382,27 +386,27 @@
Language:
- JÄzyk:
+ JÄzyk:
Change
- ZmieÅ
+ ZmieÅ
Log out
- Wyloguj
+ Wyloguj
Logged as:
- Zalogowany jako:
+ Zalogowany jako:
Restart application!
- Zrestartuj aplikacje!
+ Zrestartuj aplikacje!
Choose language:
- Wybierz jÄzyk:
+ Wybierz jÄzyk:
@@ -452,15 +456,15 @@
TaskMenu
Account
- Konto
+ Konto
Settings
- Ustawienia
+ Ustawienia
About Ubi
- O Ubi
+ O Ubi
@@ -491,70 +495,78 @@
<b>Ubi</b>
- <b>Ubi</b>
+ <b>Ubi</b>
<p>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
- <p>Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
File downloaded.
- Plik zostaÅ pobrany.
+ Plik zostaÅ pobrany.
File uploaded.
- Plik zostaÅ wysÅany.
+ Plik zostaÅ wysÅany.
Error while downloading.
- BÅÄ
d podczas pobierania.
+ BÅÄ
d podczas pobierania.
Error while uploading.
- BÅÄ
d podczas wysyÅania.
+ BÅÄ
d podczas wysyÅania.
File added to the queue.
- Plik dodany do kolejki.
+ Plik dodany do kolejki.
File operation canceled.
- Operacja anulowana.
+ Operacja anulowana.
+
+
+ <p>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Nieoficjalna aplikacja Ubuntu One dla Maemo/Meego i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
meego_main
File downloaded.
- Plik zostaÅ pobrany.
+ Plik zostaÅ pobrany.
File uploaded.
- Plik zostaÅ wysÅany.
+ Plik zostaÅ wysÅany.
Error while downloading.
- BÅÄ
d podczas pobierania.
+ BÅÄ
d podczas pobierania.
Error while uploading.
- BÅÄ
d podczas wysyÅania.
+ BÅÄ
d podczas wysyÅania.
File added to the queue.
- Plik dodany do kolejki.
+ Plik dodany do kolejki.
File operation canceled.
- Operacja anulowana.
+ Operacja anulowana.
<b>Ubi</b>
- <b>Ubi</b>
+ <b>Ubi</b>
<p>An unofficial Ubuntu One app for Maemo 5 and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
- <p>Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Nieoficjalna aplikacja Ubuntu One dla Maemo 5 i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+
+
+ <p>An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled platforms.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
+ <p>Nieoficjalna aplikacja Ubuntu One dla Maemo/Meego i innych platform obsÅugujÄ
cych Qt.</p><p><small>http://ubi.garage.maemo.org</small></p><p><small>© 2012 Michal Kosciesza</small></p>
diff --git a/ubi.pro b/ubi.pro
index 660fcc9..e2214fa 100644
--- 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
--- a/ubi.pro.user
+++ b/ubi.pro.user
@@ -1,10 +1,10 @@
-
+
ProjectExplorer.Project.ActiveTarget
- 0
+ 4
ProjectExplorer.Project.EditorSettings
@@ -491,7 +491,7 @@
2012-04-28T10:41:48
2012-05-03T18:56:53
2012-06-02T12:03:04
- 2012-06-03T20:34:05
+ 2012-06-10T21:25:35
2012-05-05T14:55:15
2012-05-18T21:37:42
@@ -748,24 +748,28 @@
/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.1-2_armel.deb
/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_2__Qt_SDK__Release/ubi_0.9.3-3_armel.deb
/home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.3-3_armel.deb
+ /home/mkiol/dev/Qt/ubi-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release/ubi_0.9.4-1_armel.deb
localhost
localhost
localhost
localhost
+ localhost
+
2012-06-01T22:31:33
2012-05-04T14:25:52
2012-06-01T23:55:18
2012-06-02T12:58:48
+ 2012-06-10T20:18:05
3
diff --git a/ubi.qrc b/ubi.qrc
index 81afec8..4def844 100644
--- a/ubi.qrc
+++ b/ubi.qrc
@@ -9,7 +9,6 @@
qml/ubi/components/DialogBox.qml
qml/ubi/components/DialogCombo.qml
qml/ubi/components/DialogInfo.qml
- qml/ubi/components/DialogInput.qml
qml/ubi/components/DialogYesNo.qml
qml/ubi/components/File.qml
qml/ubi/components/FileSmall.qml
@@ -84,6 +83,7 @@
qml/ubi/TopBar.qml
qml/ubi/u1.js
qml/ubi/UIConstants.js
+ qml/ubi/components/DialogInput.qml
translations/ubi.it.qm
translations/ubi.it.ts
translations/ubi.pl.qm
diff --git a/ubi.zip b/ubi.zip
index d2fe6c5..8fa0cf3 100644
Binary files a/ubi.zip and b/ubi.zip differ
diff --git a/utils.cpp b/utils.cpp
index fef0803..808e9fb 100644
--- 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
--- a/www/index.html
+++ b/www/index.html
@@ -107,9 +107,9 @@ Contacts synchronization.
Devices
-At the moment Ubi is available only for Nokia N900 .
+At the moment Ubi is available for Nokia N900 and Nokia N9 .
-In Download section also an experimental releases for Symbian and Nokia N9 were published. Please note that these apps have not been tested on real devices.
+In Download section also an experimental releases for Symbian were published. Please note that these apps have not been tested on real devices.
Download
The latest release is version 0.9.4-1
diff --git a/www/index.html~ b/www/index.html~
index d457574..b0aac82 100644
--- a/www/index.html~
+++ b/www/index.html~
@@ -62,6 +62,19 @@ div#content {
margin: 20px;
}
+
diff --git a/www/index2.html b/www/index2.html
index 5668fc3..a53cd9a 100644
--- a/www/index2.html
+++ b/www/index2.html
@@ -1,12 +1,13 @@
+
Ubi: an unofficial Ubuntu One app for Maemo/Meego (Nokia N900 & N9) and other Qt-enabled
platforms
+
Ubi
+
An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
+platforms
-
An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
-platforms
Features
@@ -117,11 +127,7 @@ Network section if you have the
extras-devel repository enabled.
Screenshots
© 2012 Michal Kosciesza
diff --git a/www/index2.html~ b/www/index2.html~
new file mode 100644
index 0000000..914b1a9
--- /dev/null
+++ b/www/index2.html~
@@ -0,0 +1,140 @@
+
+
+
+
Ubi: an unofficial Ubuntu One app for Maemo/Meego (Nokia N900 & N9) and other Qt-enabled
+platforms
+
+
+
+
+
+
+
Ubi
+
An unofficial Ubuntu One app for Maemo/Meego and other Qt-enabled
+platforms
+
+
+
+
+
+
+
Features
+
+Ubi provides access to Ubuntu One cloud service. Initial
+version supports:
+
+file downloading
+file uploading
+file/folder deletion
+file/folder renaming
+folder creation
+file publishing
+account data view (e.g. free space)
+
+
+The plan is to provide other cloud features in future such as Notes and
+Contacts synchronization.
+
+
+
Devices
+
At the moment Ubi is available for Nokia N900 and Nokia N9 .
+
+
In Download section also an experimental releases for Symbian were published. Please note that these apps have not been tested on real devices.
+
+
Download
+
The latest release is version 0.9.4-1
+
Nokia N900
+
The application can be downloaded via the Application Manager under the
+Network section if you have the extras-devel repository enabled.
+
Here you can find instructions on how to enable extras-devel on Nokia N900.
+
+
Other devices
+
Find the right package in Download section.
+
+
Links
+
+
+
Screenshots
+
+
+
+
+© 2012 Michal Kosciesza
+
+
+