Release 0.4-1: Spanish language and comments page

matrixx · Feb 9, 2015 · d1da6d4 · d1da6d4
1 parent 55b2019
commit d1da6d4
Show file tree

Hide file tree

Showing 14 changed files with 326 additions and 109 deletions.
diff --git a/harbour-trulyyours.pro b/harbour-trulyyours.pro
@@ -1,43 +1,45 @@
-TEMPLATE = app
-TARGET = harbour-trulyyours
-CONFIG += sailfishapp
-
-QT += dbus
-
-system(qdbusxml2cpp -p src/ambienced.h:src/ambienced.cpp src/ambienced.xml)
-
-HEADERS += \
- src/ambiencemanager.h \
- src/tagmanager.h \
- src/ambienced.h
-
-SOURCES += src/harbour-trulyyours.cpp \
- src/ambiencemanager.cpp \
- src/tagmanager.cpp \
- src/ambienced.cpp
-
-OTHER_FILES += rpm/$${TARGET}.spec \
- rpm/$${TARGET}.yaml \
- $${TARGET}.desktop \
- translations/*.ts \
- qml/harbour-trulyyours.qml \
- qml/cover/CoverPage.qml \
- qml/pages/AmbienceDetailPage.qml \
- qml/pages/BrowseAmbienceListPage.qml \
- qml/pages/Data.js \
- qml/pages/MainPage.qml \
- qml/pages/Components/QuickTagCloud.qml
-
-js.path = /usr/share/$${TARGET}/qml/pages
-js.files = Data.js
-INSTALLS += js
-
-# to disable building translations every time, comment out the
-# following CONFIG line
-CONFIG += sailfishapp_i18n
-TRANSLATIONS += \
- translations/$${TARGET}-fi.ts \
- translations/$${TARGET}-ru.ts \
- translations/$${TARGET}-de.ts \
- translations/$${TARGET}-en.ts
-
+TEMPLATE = app
+TARGET = harbour-trulyyours
+CONFIG += sailfishapp
+
+QT += dbus
+
+system(qdbusxml2cpp -p src/ambienced.h:src/ambienced.cpp src/ambienced.xml)
+
+HEADERS += \
+ src/ambiencemanager.h \
+ src/tagmanager.h \
+ src/ambienced.h
+
+SOURCES += src/harbour-trulyyours.cpp \
+ src/ambiencemanager.cpp \
+ src/tagmanager.cpp \
+ src/ambienced.cpp
+
+OTHER_FILES += rpm/$${TARGET}.spec \
+ rpm/$${TARGET}.yaml \
+ $${TARGET}.desktop \
+ translations/*.ts \
+ qml/harbour-trulyyours.qml \
+ qml/cover/CoverPage.qml \
+ qml/pages/AmbienceDetailPage.qml \
+ qml/pages/BrowseAmbienceListPage.qml \
+ qml/pages/Data.js \
+ qml/pages/MainPage.qml \
+ qml/pages/Components/QuickTagCloud.qml \
+ qml/pages/CommentsPage.qml
+
+js.path = /usr/share/$${TARGET}/qml/pages
+js.files = Data.js
+INSTALLS += js
+
+# to disable building translations every time, comment out the
+# following CONFIG line
+CONFIG += sailfishapp_i18n
+TRANSLATIONS += \
+ translations/$${TARGET}-fi.ts \
+ translations/$${TARGET}-ru.ts \
+ translations/$${TARGET}-de.ts \
+ translations/$${TARGET}-en.ts \
+ translations/$${TARGET}-es.ts
+
diff --git a/qml/pages/AmbienceDetailPage.qml b/qml/pages/AmbienceDetailPage.qml
@@ -30,6 +30,7 @@ Page {
  id: page
  property string url: ""
  property string name: ""
+ property string mediaId: ""
  property bool savingInProgress: false
  Component.onCompleted: {
  ambienceMgr.saveFullImageSucceeded.connect(page.setSource)
@@ -44,6 +45,13 @@ Page {
  contentHeight: fullImage.height
 
  PullDownMenu {
+ MenuItem {
+ text: qsTr("Show comments")
+ visible: fullImage.source != "" && !savingInProgress
+ onClicked: {
+ pageStack.push("CommentsPage.qml", { "mediaId" : mediaId })
+ }
+ }
  MenuItem {
  text: qsTr("Save and create ambience")
  visible: fullImage.source != "" && !savingInProgress
@@ -52,7 +60,6 @@ Page {
  ambienceMgr.saveImageToGalleryAndApplyAmbience(name)
  }
  }
-
  MenuItem {
  text: qsTr("Save to gallery")
  visible: fullImage.source != "" && !savingInProgress

diff --git a/qml/pages/BrowseAmbienceListPage.qml b/qml/pages/BrowseAmbienceListPage.qml
@@ -152,7 +152,7 @@ Page {
  MouseArea {
  anchors.fill: parent
  onClicked: {
- pageStack.push("AmbienceDetailPage.qml", { "url" : rootWindow.ambiences.get(index).fullUri, "name" : fileName })
+ pageStack.push("AmbienceDetailPage.qml", { "url" : rootWindow.ambiences.get(index).fullUri, "name" : fileName, "mediaId" : rootWindow.ambiences.get(index).id })
  }
  }
  }

diff --git a/qml/pages/Components/QuickTagCloud.qml b/qml/pages/Components/QuickTagCloud.qml
@@ -53,15 +53,15 @@ Flow {
  function fontSize(index)
  {
  var count = tagCloud.tagAmounts[index];
- if (count >= (tagCloud.maxTagCount / 4 * 3))
+ if (count >= (tagCloud.maxTagCount / 3 * 2))
  {
  return Theme.fontSizeExtraLarge;
  }
- else if (count >= (tagCloud.maxTagCount / 4 * 2))
+ else if (count >= (tagCloud.maxTagCount / 3))
  {
  return Theme.fontSizeLarge;
  }
- else if (count >= (tagCloud.maxTagCount / 4))
+ else if (count >= (tagCloud.maxTagCount / 6))
  {
  return Theme.fontSizeMedium;
  }

diff --git a/qml/pages/Data.js b/qml/pages/Data.js
@@ -84,7 +84,7 @@ function saveTags(tagString)
  break;
  }
 
- var index = tags.indexOf(tagList[i]);
+ var index = tags.indexOf(tagList[i].toLowerCase());
  if (index > -1)
  {
  tagCounts[index] += 1;
@@ -109,3 +109,25 @@ function hasTag(tag, tagString)
  }
  return false;
 }
+
+function fetchComments(model, id, loading)
+{
+ model.clear();
+ loading = true;
+ var xhr = new XMLHttpRequest
+ var query = "http:https://www.jollawalls.com/api/comments/" + id;
+ xhr.open("GET", query);
+ xhr.onreadystatechange = function()
+ {
+ if (xhr.readyState === XMLHttpRequest.DONE)
+ {
+ var results = JSON.parse(xhr.responseText)
+ for (var i in results)
+ {
+ model.append(results[i]);
+ }
+ loading = false;
+ }
+ }
+ xhr.send();
+}
diff --git a/rpm/harbour-trulyyours.yaml b/rpm/harbour-trulyyours.yaml
@@ -1,6 +1,6 @@
 Name: harbour-trulyyours
 Summary: TrulyYours - Mobile JollaWalls client
-Version: 0.3
+Version: 0.4
 Release: 1
 Group: Qt/Qt
 URL: https://github.com/matrixx/TrulyYours

diff --git a/src/harbour-trulyyours.cpp b/src/harbour-trulyyours.cpp
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
  if (translator.load("harbour-trulyyours-" + QLocale::system().name(),
  SailfishApp::pathTo("translations").path()))
  app->installTranslator(&translator);
-
+ qDebug() << "locale:" << QLocale::system().name();
  AmbienceManager mgr;
  TagManager tagMgr;
  view->rootContext()->setContextProperty("ambienceMgr", &mgr);

diff --git a/src/tagmanager.cpp b/src/tagmanager.cpp
@@ -37,7 +37,6 @@ void TagManager::sortAndSaveTags(const QVariantList &names, const QVariantList &
  {
  mSortedTags.insert(names.at(i).toString().toLower(), counts.at(i).toInt());
  }
- qDebug() << "got" << mSortedTags.size() << "sorted tags";
  emit tagsAvailable();
 }
 
@@ -66,8 +65,9 @@ int TagManager::getMaxTagAmount() const
  int max = 0;
  foreach(int value, mSortedTags.values())
  {
- if (value > max)
+ if (value > max) {
  max = value;
+ }
  }
  return max;
 }
diff --git a/translations/harbour-trulyyours-de.ts b/translations/harbour-trulyyours-de.ts
@@ -4,12 +4,17 @@
 <context>
  <name>AmbienceDetailPage</name>
  <message>
- <location filename="../qml/pages/AmbienceDetailPage.qml" line="57"/>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="49"/>
+ <source>Show comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="64"/>
  <source>Save to gallery</source>
  <translation>Zur Galerie hinzufügen</translation>
  </message>
  <message>
- <location filename="../qml/pages/AmbienceDetailPage.qml" line="48"/>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="56"/>
  <source>Save and create ambience</source>
  <translation>Speichern und Ambiente erstellen</translation>
  </message>
@@ -27,6 +32,24 @@
  <translation>&apos;%1&apos;-Ambiente</translation>
  </message>
 </context>
+<context>
+ <name>CommentsPage</name>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="44"/>
+ <source>Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>Loading</source>
+ <translation type="unfinished">Lade</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>This ambience has no comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
 <context>
  <name>MainPage</name>
  <message>

diff --git a/translations/harbour-trulyyours-en.ts b/translations/harbour-trulyyours-en.ts
@@ -4,12 +4,17 @@
 <context>
  <name>AmbienceDetailPage</name>
  <message>
- <location filename="../qml/pages/AmbienceDetailPage.qml" line="48"/>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="49"/>
+ <source>Show comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="56"/>
  <source>Save and create ambience</source>
  <translation>Save and create ambience</translation>
  </message>
  <message>
- <location filename="../qml/pages/AmbienceDetailPage.qml" line="57"/>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="64"/>
  <source>Save to gallery</source>
  <translation>Save to gallery</translation>
  </message>
@@ -27,6 +32,24 @@
  <translation>Ambiences for &apos;%1&apos;</translation>
  </message>
 </context>
+<context>
+ <name>CommentsPage</name>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="44"/>
+ <source>Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>Loading</source>
+ <translation type="unfinished">Loading</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>This ambience has no comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
 <context>
  <name>MainPage</name>
  <message>

diff --git a/translations/harbour-trulyyours-es.ts b/translations/harbour-trulyyours-es.ts
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es">
+<context>
+ <name>AmbienceDetailPage</name>
+ <message>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="49"/>
+ <source>Show comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="56"/>
+ <source>Save and create ambience</source>
+ <translation>Guardar y crear ambiente</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/AmbienceDetailPage.qml" line="64"/>
+ <source>Save to gallery</source>
+ <translation>Guardar en la galería</translation>
+ </message>
+</context>
+<context>
+ <name>BrowseAmbienceListPage</name>
+ <message>
+ <location filename="../qml/pages/BrowseAmbienceListPage.qml" line="39"/>
+ <source>Found ambiences</source>
+ <translation>Ambientes encontrados</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/BrowseAmbienceListPage.qml" line="39"/>
+ <source>Ambiences for &apos;%1&apos;</source>
+ <translation>Ambientes de &apos;%1&apos;</translation>
+ </message>
+</context>
+<context>
+ <name>CommentsPage</name>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="44"/>
+ <source>Comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>Loading</source>
+ <translation type="unfinished">Cargando</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/CommentsPage.qml" line="64"/>
+ <source>This ambience has no comments</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>MainPage</name>
+ <message>
+ <location filename="../qml/pages/MainPage.qml" line="45"/>
+ <source>Show all ambiences</source>
+ <translation>Mostrar todos loa ambientes</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/MainPage.qml" line="54"/>
+ <source>Tags</source>
+ <translation>Etiquetas</translation>
+ </message>
+ <message>
+ <location filename="../qml/pages/MainPage.qml" line="71"/>
+ <source>Loading</source>
+ <translation>Cargando</translation>
+ </message>
+</context>
+</TS>