some fine-tuning on UI, background, text etc

ekke · ekke · commit 63d3a519b966 · 2012-11-06T15:39:49.000+01:00
Signed-off-by: ekkes-corner &lt;ekke@ekkes-corner.org&gt;
diff --git a/assets/images/bg.png b/assets/images/bg.png
diff --git a/assets/images/bg.png.amd b/assets/images/bg.png.amd
@@ -0,0 +1,3 @@
+#RimCascadesAssetMetaData version=1.0
+source: "bg.png"
+sliceMargins: 35 15 15 15
diff --git a/assets/main.qml b/assets/main.qml
@@ -141,12 +141,15 @@ Page {
             }
         }
     ]
-    titleBar: TitleBar {
-        id: titleBarId
-        title: qsTr("Invoke ODS as APP vs Card") + Retranslate.onLanguageChanged
-        visibility: ChromeVisibility.Visible
-    }
     Container {
+        background: back.imagePaint
+        attachedObjects: [
+            ImagePaintDefinition {
+                id: back
+                repeatPattern: RepeatPattern.Fill
+                imageSource: "asset:///images/bg.png.amd"
+            }
+        ]
         layout: DockLayout {
         }
         ImageView {
@@ -167,30 +170,43 @@ Page {
             translationX: 10
             translationY: 10
         }
+        TextArea {
+            id: titletext
+            editable: false
+            text: "File 2 ODS Cloud"
+            textStyle.color: Color.White
+            textStyle.base: SystemDefaults.TextStyles.BigText
+            verticalAlignment: VerticalAlignment.Top
+            horizontalAlignment: HorizontalAlignment.Left
+            translationX: 60
+            translationY: 20
+        }
         TextArea {
             id: theNextStep
             editable: false
             text: ""
-            textStyle.base: SystemDefaults.TextStyles.BodyText
+            textStyle.color: Color.White
+            textStyle.base: SystemDefaults.TextStyles.TitleText
             verticalAlignment: VerticalAlignment.Top
             horizontalAlignment: HorizontalAlignment.Left
-            translationX: 80
-            translationY: 40
+            translationX: 60
+            translationY: 120
         }
         TextArea {
             id: fileLabel
             editable: false
             visible: false
             text: ""
+            textStyle.color: Color.White
             textStyle.base: SystemDefaults.TextStyles.BodyText
             verticalAlignment: VerticalAlignment.Top
             horizontalAlignment: HorizontalAlignment.Left
-            translationX: 80
-            translationY: 360
+            translationX: 60
+            translationY: 560
         }
     }
     function fileActions() {
-        theNextStep.text = qsTr("You have selected the file below.\nEmbed the card from ODS:\nCloud Action (Previewer/Composer)\nor Share Action (Previewer)") + Retranslate.onLanguageChanged
+        theNextStep.text = qsTr("You have selected the file below.\n\nEmbed the card from ODS:\n* Cloud Action\n(Previewer || Composer)\n* Share Action (Previewer)") + Retranslate.onLanguageChanged
         fileLabel.text = picker.selectedFile
         fileLabel.visible = true
         page.addAction(cloudActionPreviewer, 0)
diff --git a/translations/FileUpload2ODS.ts b/translations/FileUpload2ODS.ts
@@ -51,20 +51,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="146"/>
-        <source>Invoke ODS as APP vs Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../assets/main.qml" line="193"/>
+        <location filename="../assets/main.qml" line="209"/>
         <source>You have selected the file below.
+
 Embed the card from ODS:
-Cloud Action (Previewer/Composer)
-or Share Action (Previewer)</source>
+* Cloud Action
+(Previewer || Composer)
+* Share Action (Previewer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="211"/>
+        <location filename="../assets/main.qml" line="227"/>
         <source>Select a file from Overflow Menu:
 
 Document, Image,
diff --git a/translations/FileUpload2ODS_de.ts b/translations/FileUpload2ODS_de.ts
@@ -51,20 +51,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="146"/>
-        <source>Invoke ODS as APP vs Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../assets/main.qml" line="193"/>
+        <location filename="../assets/main.qml" line="209"/>
         <source>You have selected the file below.
+
 Embed the card from ODS:
-Cloud Action (Previewer/Composer)
-or Share Action (Previewer)</source>
+* Cloud Action
+(Previewer || Composer)
+* Share Action (Previewer)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="211"/>
+        <location filename="../assets/main.qml" line="227"/>
         <source>Select a file from Overflow Menu:
 
 Document, Image,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#RimCascadesAssetMetaData version=1.0`
	`2`	`+source: "bg.png"`
	`3`	`+sliceMargins: 35 15 15 15`