From: Sudheer K Date: Mon, 3 Jun 2013 13:25:14 +0000 (-0700) Subject: Harmattan font changes completed X-Git-Url: http://git.maemo.org/git/?p=marketstoday;a=commitdiff_plain;h=0f8d4b44f550d528c2b6b09fb0f6a8c7821caf9f Harmattan font changes completed --- diff --git a/src/cpp/configqmlview.cpp b/src/cpp/configqmlview.cpp index 22e30bf..eda7b47 100644 --- a/src/cpp/configqmlview.cpp +++ b/src/cpp/configqmlview.cpp @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/configqmlview.h b/src/cpp/configqmlview.h index e2c8a50..9204ad0 100644 --- a/src/cpp/configqmlview.h +++ b/src/cpp/configqmlview.h @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/connectionutility.h b/src/cpp/connectionutility.h index 5eb6ff8..ebf07e2 100644 --- a/src/cpp/connectionutility.h +++ b/src/cpp/connectionutility.h @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/logutility.h b/src/cpp/logutility.h index b762616..521c5de 100644 --- a/src/cpp/logutility.h +++ b/src/cpp/logutility.h @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index 0f4a98f..075ba99 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/marketstodayqmlview.cpp b/src/cpp/marketstodayqmlview.cpp index 90a4b8f..c348a44 100644 --- a/src/cpp/marketstodayqmlview.cpp +++ b/src/cpp/marketstodayqmlview.cpp @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/marketstodayqmlview.h b/src/cpp/marketstodayqmlview.h index 8e3e76e..fa0efd0 100644 --- a/src/cpp/marketstodayqmlview.h +++ b/src/cpp/marketstodayqmlview.h @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/cpp/sharedcontext.h b/src/cpp/sharedcontext.h index 5aa492f..74f9458 100644 --- a/src/cpp/sharedcontext.h +++ b/src/cpp/sharedcontext.h @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/Config.qml b/src/qml/Config.qml index 9e987c8..af5d0d3 100644 --- a/src/qml/Config.qml +++ b/src/qml/Config.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/ConfigOptionsComponent.qml b/src/qml/ConfigOptionsComponent.qml index 09aa601..9a69124 100644 --- a/src/qml/ConfigOptionsComponent.qml +++ b/src/qml/ConfigOptionsComponent.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/ConfigParametersComponent.qml b/src/qml/ConfigParametersComponent.qml index 61a1a13..4ef7b43 100644 --- a/src/qml/ConfigParametersComponent.qml +++ b/src/qml/ConfigParametersComponent.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -12,6 +12,9 @@ Item { property bool updateFreqEnabled property string updateFreqMin property bool updateWeekdaysOnly + property int fontSizeMed: 24 + property int fontSizeSmall: 20 + //property bool updateOnSavedNetworksOnly property string rssURL: "http://finance.yahoo.com/rss/topfinstories" signal logRequest(string strMessage) @@ -34,7 +37,7 @@ Item { function loadSettings(){ var value; value = DBUtility.getSetting("UpdateFreqency"); - if (!value || value == "0.0" || value === "" || isNaN(value)){ + if (!value || value === "0.0" || value === "" || isNaN(value)){ configParametersComponent.updateFreqEnabled = false; } else{ @@ -42,7 +45,7 @@ Item { configParametersComponent.updateFreqMin = parseInt(value); } value = DBUtility.getSetting("UpdateWeekdaysOnly"); - if (!value || value == "0.0" || value === ""|| !configParametersComponent.updateFreqEnabled){ + if (!value || value === "0.0" || value === ""|| !configParametersComponent.updateFreqEnabled){ configParametersComponent.updateWeekdaysOnly = false; } else{ @@ -60,7 +63,7 @@ Item { */ value = DBUtility.getSetting("RSSURL"); - if (!value || value == "Unknown" || value === ""){ + if (!value || value === "Unknown" || value === ""){ //configParametersComponent.rssURL = configParametersComponent.defaultRSSFeed; } else{ @@ -86,7 +89,7 @@ Item { anchors.leftMargin: 35 height: 50 horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 22; font.bold: true; elide: Text.ElideRight; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeMed; font.bold: true; elide: Text.ElideRight; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" text: "News Feed" } @@ -118,7 +121,7 @@ Item { Text{ height:parent.height horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 20; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeSmall; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" text: "RSS URL: " color: "#ffffff"; } @@ -151,12 +154,12 @@ Item { Text { id: autoUpdateSectionLabel anchors.top: newsSection.bottom - //anchors.topMargin: 10 + anchors.topMargin: 20 anchors.left: parent.left anchors.leftMargin: 35 height: 50 horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 22; font.bold: true; elide: Text.ElideRight; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeMed; font.bold: true; elide: Text.ElideRight; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" text: "Auto-Update *" } @@ -203,7 +206,7 @@ Item { Text{ height:parent.height horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 20; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeSmall; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" text: "Every " color: configParametersComponent.updateFreqEnabled? "#ffffff" :"#B8B8B8"; } @@ -227,7 +230,7 @@ Item { Text{ height:parent.height horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 20; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeSmall; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" text: " minutes" color: configParametersComponent.updateFreqEnabled? "#ffffff" :"#B8B8B8"; } @@ -257,7 +260,7 @@ Item { Text{ height:parent.height horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 20; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeSmall; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" text: "Only on weekdays" color: configParametersComponent.updateWeekdaysOnly? "#ffffff" :"#B8B8B8"; } @@ -288,7 +291,7 @@ Item { Text{ height:parent.height horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 20; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + font.pixelSize: fontSizeSmall; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" text: "Only on saved Wifi connections" color: configParametersComponent.updateOnSavedNetworksOnly? "#ffffff" :"#B8B8B8"; } diff --git a/src/qml/ConfigTickersComponent.qml b/src/qml/ConfigTickersComponent.qml index 55639f6..c7ff4cd 100644 --- a/src/qml/ConfigTickersComponent.qml +++ b/src/qml/ConfigTickersComponent.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -34,7 +34,7 @@ Item { logRequest("Removing symbol "+symbol+" at index "+index); var result = DBUtility.removeSymbol(symbol); - if (result != "Error"){ + if (result !== "Error"){ symbolsListModel.remove(index); } else{ @@ -50,7 +50,7 @@ Item { var result = DBUtility.addSymbol(symbol); logRequest("Result is "+result); - if (result != "Error"){ + if (result !== "Error"){ symbolsListModel.append({"symbol": symbol}); } else{ @@ -85,7 +85,7 @@ Item { verticalAlignment: Text.AlignVCenter width: parent.width - 120; height: parent.height - font.pixelSize: 18; + font.pixelSize: 24; font.bold: true; elide: Text.ElideRight; color: "white"; @@ -145,7 +145,7 @@ Item { anchors.leftMargin: 5 anchors.verticalCenter: parent.verticalCenter maximumLength:25 - font.pixelSize: 18 + font.pixelSize: 24 font.bold: true font.capitalization: Font.AllUppercase inputMethodHints: Qt.ImhNoPredictiveText @@ -213,8 +213,8 @@ Item { Rectangle{ id: footerTextArea width: parent.width - height: itemHeight - z: 5 + height: 25 + //z: 5 color: "#343434" anchors.bottom: parent.bottom Text { diff --git a/src/qml/Library/Button.qml b/src/qml/Library/Button.qml index 6169b71..470a653 100644 --- a/src/qml/Library/Button.qml +++ b/src/qml/Library/Button.qml @@ -48,7 +48,7 @@ Item { property string text property bool keyUsing: false - property int fontSize: 12 + property int fontSize: 20 BorderImage { id: buttonImage diff --git a/src/qml/Library/MenuBar.qml b/src/qml/Library/MenuBar.qml index e51af03..aa620cb 100644 --- a/src/qml/Library/MenuBar.qml +++ b/src/qml/Library/MenuBar.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -26,7 +26,7 @@ Item { Button { id: buttonTickers text: "Add/Remove Tickers" - fontSize: 14 + fontSize: 18 width: 200; height: parent.height onClicked: menuBar.tickersClicked() } @@ -34,7 +34,7 @@ Item { Button { id: buttonOptions text: "Update Settings" - fontSize: 14 + fontSize: 18 width: 200; height: parent.height onClicked: menuBar.optionsClicked() } diff --git a/src/qml/Library/TitleBar.qml b/src/qml/Library/TitleBar.qml index 152cdcd..6e17b45 100644 --- a/src/qml/Library/TitleBar.qml +++ b/src/qml/Library/TitleBar.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License @@ -162,7 +162,7 @@ Item { elide: Text.ElideMiddle text: title font.bold: true; color: "White"; style: Text.Raised; styleColor: "Black" - font.pixelSize: 18 + font.pixelSize: 20 } Image { diff --git a/src/qml/Library/ToolBar.qml b/src/qml/Library/ToolBar.qml index da38a5d..472193f 100644 --- a/src/qml/Library/ToolBar.qml +++ b/src/qml/Library/ToolBar.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/Library/js/Common.js b/src/qml/Library/js/Common.js index 56ce2a9..cd1febe 100644 --- a/src/qml/Library/js/Common.js +++ b/src/qml/Library/js/Common.js @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -11,6 +11,7 @@ function isTodayAWeekDay(){ } +//Source: Mout JS library (https://github.com/mout/mout/blob/master/src/number/abbreviate.js) /** * Enforce a specific amount of decimal digits and also fix floating diff --git a/src/qml/Library/js/CoreLogic.js b/src/qml/Library/js/CoreLogic.js index 630f894..f6dd8e1 100644 --- a/src/qml/Library/js/CoreLogic.js +++ b/src/qml/Library/js/CoreLogic.js @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/Library/js/DBUtility.js b/src/qml/Library/js/DBUtility.js index fb87297..193bacd 100644 --- a/src/qml/Library/js/DBUtility.js +++ b/src/qml/Library/js/DBUtility.js @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/MarketsTodayApp.qml b/src/qml/MarketsTodayApp.qml index f3ac3e8..1467d5a 100644 --- a/src/qml/MarketsTodayApp.qml +++ b/src/qml/MarketsTodayApp.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/MarketsTodayLegacyApp.qml b/src/qml/MarketsTodayLegacyApp.qml index 78f9e90..fad35c5 100644 --- a/src/qml/MarketsTodayLegacyApp.qml +++ b/src/qml/MarketsTodayLegacyApp.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/MarketsTodayWidget.qml b/src/qml/MarketsTodayWidget.qml index c3327b1..56d66e2 100644 --- a/src/qml/MarketsTodayWidget.qml +++ b/src/qml/MarketsTodayWidget.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ diff --git a/src/qml/StockDetailsComponent.qml b/src/qml/StockDetailsComponent.qml index ede381b..32cefc5 100644 --- a/src/qml/StockDetailsComponent.qml +++ b/src/qml/StockDetailsComponent.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -15,7 +15,9 @@ Item { id: stockDetailsScreen property int componentWidth: width - property int itemHeight: 50 + property int itemHeight: 75 + property int fontSizeMed: 24 + property int fontSizeSmall: 20 property string symbol: "YHOO" property string stockName: "" property string lastTradedPrice: "" @@ -186,7 +188,7 @@ Item { Rectangle { color: "black"; opacity: index % 2 ? 0.2 : 0.4; height: newsWrapper.height - 2; width: newsWrapper.width; y: 1 } Text { anchors {verticalCenter: parent.verticalCenter;left: parent.left;leftMargin: 10;right: parent.right} - text: title; font.pixelSize: 14 + text: title; font.pixelSize: stockDetailsScreen.fontSizeSmall font.bold: false; verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft @@ -219,9 +221,9 @@ Item { anchors.top: parent.top width: parent.width anchors.horizontalCenter: parent.horizontalCenter - height: 30 + height: stockDetailsScreen.fontSizeMed + 15 horizontalAlignment: Text.AlignHCenter; verticalAlignment: Text.AlignVCenter - font.pixelSize: 18; font.bold: true; elide: Text.ElideMiddle; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" + font.pixelSize: stockDetailsScreen.fontSizeMed; font.bold: true; elide: Text.ElideMiddle; color: "#B8B8B8"; style: Text.Raised; styleColor: "black" text: (stockName != "")? (stockName +" ("+symbol+")"):symbol } @@ -232,38 +234,46 @@ Item { border.color: "#BFBFBF" color:"#2E2E2E" anchors {top: stockNameLabel.bottom;left: parent.left;right: parent.right} - height: 125 + height: (stockDetailsScreen.width > stockDetailsScreen.height)? 105:155 radius: 15 Column{ id: stockDetailsColumn - anchors {top: parent.top; left: parent.left; leftMargin: 10} - width: parent.width + anchors {top: parent.top; left: parent.left; leftMargin: 10; right: parent.right; rightMargin: 10} + //spacing: 10 + //width: parent.width StockDetailsRow{ label1: "Last Traded" value1: lastTradedPrice cell1Width: stockDetailsColumn.width/2 + multilineLabel1: false + landscape: (stockDetailsScreen.width > stockDetailsScreen.height) label2: "Day's Range" value2: daysRange cell2Width: stockDetailsColumn.width/2 + multilineLabel2: true } StockDetailsRow{ label1: "Last Trade Time" value1: lastTradedDateTime cell1Width: stockDetailsColumn.width/2 + multilineLabel1: true + landscape: (stockDetailsScreen.width > stockDetailsScreen.height) label2: "52w Range" value2: yearRange cell2Width: stockDetailsColumn.width/2 + multilineLabel2: true } StockDetailsRow{ label1: "Change" value1: ((change != "" && changePercentage != "")? change + " ("+changePercentage+")":"") cell1Width: stockDetailsColumn.width/2 + landscape: (stockDetailsScreen.width > stockDetailsScreen.height) label2: "Volume" value2: marketVolume @@ -274,6 +284,7 @@ Item { label1: "Prev. Close" value1: prevClose cell1Width: stockDetailsColumn.width/2 + landscape: (stockDetailsScreen.width > stockDetailsScreen.height) label2: "Market Cap" value2: marketCap @@ -287,7 +298,7 @@ Item { border.color: "#BFBFBF" color:"#2E2E2E" width: parent.width - anchors {top: stockDetailsSection.bottom;topMargin: 5; + anchors {top: stockDetailsSection.bottom;topMargin: 10; bottom: parent.bottom; left: parent.left; right: parent.right} @@ -418,7 +429,7 @@ Item { width: 130 spacing: 20 anchors {top: parent.top; topMargin: 40; bottom: parent.bottom; - right: chartAreaLand.right;rightMargin: 10} + right: chartAreaLand.right;rightMargin: 60} Row { height: 40 @@ -427,14 +438,14 @@ Item { Library.Button { text: "1d" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("1d"); } Library.Button { text: "5d" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("5d"); } } @@ -446,14 +457,14 @@ Item { Library.Button { text: "3m" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("3m"); } Library.Button { text: "6m" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("6m"); } } @@ -464,14 +475,14 @@ Item { Library.Button { text: "1y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("1y"); } Library.Button { text: "2y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("2y"); } } @@ -482,14 +493,14 @@ Item { Library.Button { text: "5y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("5y"); } Library.Button { text: "max" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("my"); } } @@ -558,7 +569,7 @@ Item { Column { width: 280 spacing: 20 - anchors {verticalCenter: parent.verticalCenter;verticalCenterOffset: 80; horizontalCenter: parent.horizontalCenter} + anchors {verticalCenter: parent.verticalCenter;verticalCenterOffset: 100; horizontalCenter: parent.horizontalCenter} Row { height: 40 @@ -567,28 +578,28 @@ Item { Library.Button { text: "1d" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("1d"); } Library.Button { text: "5d" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("5d"); } Library.Button { text: "3m" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("3m"); } Library.Button { text: "6m" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("6m"); } } @@ -600,28 +611,28 @@ Item { Library.Button { text: "1y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("1y"); } Library.Button { text: "2y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("2y"); } Library.Button { text: "5y" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("5y"); } Library.Button { text: "max" anchors { verticalCenter: parent.verticalCenter} - width: 50; height: 32 + width: 75; height: 40 onClicked: loadChart("my"); } } diff --git a/src/qml/StockDetailsRow.qml b/src/qml/StockDetailsRow.qml index 7cc2702..3b3414d 100644 --- a/src/qml/StockDetailsRow.qml +++ b/src/qml/StockDetailsRow.qml @@ -1,5 +1,5 @@ /* -@version: 0.4 +@version: 0.5 @author: Sudheer K. @license: GNU General Public License */ @@ -13,15 +13,19 @@ Row{ property string label2 property string value2 property int cell2Width + property int fontSize: 20 + property bool multilineLabel1:false + property bool multilineLabel2:false + property bool landscape: false - height: 30 + height: (multilineLabel1|multilineLabel2) && !landscape? 50:25 spacing: 5 Text{ width: cell1Width height: itemHeight - horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 14;font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignTop + font.pixelSize: fontSize;font.bold: false; style: Text.Raised; styleColor: "black"; wrapMode: multilineLabel1?Text.Wrap:Text.NoWrap color: "#ffffff"; text: label1+": " + value1 } @@ -29,8 +33,8 @@ Row{ Text{ width: cell2Width height: itemHeight - horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignVCenter - font.pixelSize: 14; font.bold: false; elide: Text.ElideRight; style: Text.Raised; styleColor: "black" + horizontalAlignment: Text.AlignLeft; verticalAlignment: Text.AlignTop + font.pixelSize: fontSize; font.bold: false; style: Text.Raised; styleColor: "black"; wrapMode: multilineLabel2?Text.Wrap:Text.NoWrap color: "#ffffff"; text: label2+": " + value2 }