Skip to content
Snippets Groups Projects
Commit 60d76c8d authored by SeeLook's avatar SeeLook
Browse files

Instead of creating Tpath instance for QML add Noo.pix(), so use that in QML code

parent 84c6cbe7
No related branches found
No related tags found
No related merge requests found
......@@ -57,7 +57,7 @@ public:
/**
* Returns path to Nootka images (picts) with given image name.
* It is accessible from QML through @p Tpath::pix("image_name")
* It is accessible from QML through @p Noo.pix("image_name")
*/
Q_INVOKABLE static QString pix(const QString& imageFileName);
......
......@@ -27,7 +27,7 @@ Item {
id: logo
smooth: true
anchors.top: parent.Top
source: Tpath.pix("logo")
source: Noo.pix("logo")
sourceSize.height: nootkaLabel.height
}
......
......@@ -25,7 +25,7 @@ ToolBar {
// HeadButton {
// id: chartAct
// name: qsTr("Analyze", "could be Chart as well")
// icon: Tpath.pix("charts")
// icon: Noo.pix("charts")
// tip: qsTr("Analysis of exam results")
// }
HeadButton { id: scoreAct; action: nootkaWindow.scoreAct }
......
......@@ -18,11 +18,10 @@ Flickable {
Column {
id: aboutCont
spacing: ttt.font.pixelSize
spacing: nootkaWindow.fontSize
width: parent.width
TextBackground { text: qsTranslate("TaboutNootka", "Code"); }
Text {
id: ttt
anchors.horizontalCenter: parent.horizontalCenter; width: parent.width; color: activPal.text
text: "<b>Tomasz Bojczuk</b> <a href=\"mailto:seelook.gmail.com\">seelook@gmail.com</a><br>"
}
......@@ -35,32 +34,32 @@ Flickable {
GridLayout {
columns: 4
Layout.alignment: Qt.AlignVCenter
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-cs"); }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-cs"); }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;český "; textFormat: Text.StyledText; color: activPal.text }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>Pavel Fric</b> "; color: activPal.text }
Text { text: " <a href=\"http://fripohled.blogspot.com\">fripohled.blogspot.com</a>"; color: activPal.text }
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-de") }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-de") }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;deutsch "; textFormat: Text.StyledText; color: activPal.text}
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>Johann C. Weihe</b> "; font.bold: true; color: activPal.text }
Item { width: 10; height: 10 }
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-es") }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-es") }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;español "; textFormat: Text.StyledText; color: activPal.text }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>José Luis Marín</b> "; font.bold: true; color: activPal.text }
Text { text: " <a href=\"mailto:jsls@gmx.com\">jsls@gmx.com</a>"; color: activPal.text }
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-fr") }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-fr") }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;français "; textFormat: Text.StyledText; color: activPal.text }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>Olivier Devineau,<br>&nbsp;&nbsp;&nbsp;&nbsp;Jean-Marc Lartigue</b> "; color: activPal.text }
Item { width: 10; height: 10 }
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-pl") }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-pl") }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;polski "; textFormat: Text.StyledText; color: activPal.text }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>Tomasz Bojczuk</b> "; color: activPal.text }
Text { text: "<a href=\"mailto:seelook.gmail.com\">seelook@gmail.com</a>"; color: activPal.text }
Image { sourceSize.height: ttt.font.pixelSize * 2; source: Tpath.pix("flags-ru") }
Image { sourceSize.height: nootkaWindow.fontSize * 2; source: Noo.pix("flags-ru") }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;русский "; textFormat: Text.StyledText; color: activPal.text }
Text { text: "&nbsp;&nbsp;&nbsp;&nbsp;<b>Sergei Ivanov (tico-tico)<br>&nbsp;&nbsp;&nbsp;&nbsp;Timur Artykov</b> "; color: activPal.text }
Item { width: 10; height: 10 }
......
......@@ -27,7 +27,7 @@ Item {
Image { // body
cache: false
source: GLOB.instrument.type === Tinstrument.Piano ? "" : Tpath.pix("body" + bodyPix[GLOB.instrument.typeINT - 1])
source: GLOB.instrument.type === Tinstrument.Piano ? "" : Noo.pix("body" + bodyPix[GLOB.instrument.typeINT - 1])
height: parent.height * (GLOB.instrument.type === Tinstrument.ClassicalGuitar ? 4.0 : 3.1)
width: height * (GLOB.instrument.type === Tinstrument.ClassicalGuitar ? 1.452482269503546 : 1.04885993485342)
x: GLOB.instrument.type === Tinstrument.ClassicalGuitar ? guitar.xiiFret : parent.width * 0.65
......@@ -37,7 +37,7 @@ Item {
Image { // rosette/pickup
cache: false
source: Tpath.pix(GLOB.instrument.type === Tinstrument.ClassicalGuitar ? "rosette" : "pickup")
source: Noo.pix(GLOB.instrument.type === Tinstrument.ClassicalGuitar ? "rosette" : "pickup")
height: parent.height * (GLOB.instrument.type === Tinstrument.ClassicalGuitar ? 1.5 : 1.3)
width: height * (GLOB.instrument.type === Tinstrument.ClassicalGuitar ? 1.215351812366738 : 0.6217948717948718)
x: GLOB.instrument.type === Tinstrument.ClassicalGuitar ? guitar.fbRect.width - height * 0.2 : parent.width * 0.87
......
......@@ -78,7 +78,7 @@ Flickable {
Column {
Image {
id: flagIcon;
source: Tpath.pix("flags-" + flag)
source: Noo.pix("flags-" + flag)
sourceSize.height: (langView.currentIndex == index ? 7 : 4) * lText.font.pixelSize
}
Text {
......
......@@ -59,7 +59,7 @@ Item {
HeadButton {
id: delegateButt
name: buttonText
icon: Tpath.pix(iconName)
icon: Noo.pix(iconName)
factor: Screen.pixelDensity * (Noo.isAndroid() ? 1.1 : 1.6)
fontSize: nootkaWindow.fontSize * (Noo.isAndroid() ? 0.8 : 1.0)
onClicked: {
......
......@@ -30,7 +30,7 @@ BorderImage {
border { left: 12; right: 12; bottom: 12; top: 12 }
horizontalTileMode: BorderImage.Stretch
verticalTileMode: BorderImage.Stretch
source: Tpath.pix("tipbg")
source: Noo.pix("tipbg")
Column {
spacing: nootkaWindow.fontSize / 2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment