From db71be10892949d35962030fa11a68de95fa8a0e Mon Sep 17 00:00:00 2001
From: Ragaeeb Haq <7464039+ragaeeb@users.noreply.github.com>
Date: Tue, 1 Dec 2015 09:42:22 -0500
Subject: [PATCH] GCR v4.3.0.0
---
assets/AyatImageListItem.qml | 2 +-
assets/AyatImageTranslationListItem.qml | 6 +++---
assets/AyatListItem.qml | 4 ++--
assets/AyatPage.qml | 18 +++++++++---------
assets/AyatTafsirParser.qml | 2 +-
assets/AyatTafsirPicker.qml | 4 ++--
assets/AyatTranslationListItem.qml | 6 +++---
assets/QuranHelp.qml | 6 +++---
assets/QuranPane.qml | 6 +++---
assets/SearchPage.qml | 2 +-
assets/SettingsPage.qml | 6 +++---
assets/SimilarAyatControl.qml | 2 +-
assets/SurahPickerPage.qml | 10 +++++-----
assets/TransfersDialog.qml | 22 +++++++++++-----------
assets/VersesListView.qml | 6 +++---
assets/main.qml | 10 +++++-----
bar-descriptor.xml | 1 +
17 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/assets/AyatImageListItem.qml b/assets/AyatImageListItem.qml
index 52d37c4e..995b9d02 100644
--- a/assets/AyatImageListItem.qml
+++ b/assets/AyatImageListItem.qml
@@ -43,7 +43,7 @@ AyatListItemBase
{
horizontalAlignment: HorizontalAlignment.Fill
verticalAlignment: VerticalAlignment.Fill
- topPadding: deviceUtils.du(1); bottomPadding: deviceUtils.du(1); leftPadding: deviceUtils.du(1); rightPadding: deviceUtils.du(1)
+ topPadding: tutorial.du(1); bottomPadding: tutorial.du(1); leftPadding: tutorial.du(1); rightPadding: tutorial.du(1)
ImageView
{
diff --git a/assets/AyatImageTranslationListItem.qml b/assets/AyatImageTranslationListItem.qml
index 07fc163b..7cd3dcb9 100644
--- a/assets/AyatImageTranslationListItem.qml
+++ b/assets/AyatImageTranslationListItem.qml
@@ -8,9 +8,9 @@ AyatImageListItem
Container
{
horizontalAlignment: HorizontalAlignment.Fill
- rightPadding: deviceUtils.du(1)
- leftPadding: deviceUtils.du(1)
- bottomPadding: deviceUtils.du(1)
+ rightPadding: tutorial.du(1)
+ leftPadding: tutorial.du(1)
+ bottomPadding: tutorial.du(1)
Label
{
diff --git a/assets/AyatListItem.qml b/assets/AyatListItem.qml
index f6178a2e..78374c9e 100644
--- a/assets/AyatListItem.qml
+++ b/assets/AyatListItem.qml
@@ -13,8 +13,8 @@ AyatListItemBase
Container
{
horizontalAlignment: HorizontalAlignment.Fill
- rightPadding: deviceUtils.du(1)
- leftPadding: deviceUtils.du(1)
+ rightPadding: tutorial.du(1)
+ leftPadding: tutorial.du(1)
Label
{
diff --git a/assets/AyatPage.qml b/assets/AyatPage.qml
index 79e9a249..e4b01d48 100644
--- a/assets/AyatPage.qml
+++ b/assets/AyatPage.qml
@@ -131,24 +131,24 @@ Page
tutorial.execActionBar( "markFav", qsTr("To quickly access this verse again, tap on the '%1' action at the bottom to put it in the Favourites tab.").arg(markFav.title) );
tutorial.execActionBar( "addShortcutHome", qsTr("To quickly access this verse again, tap on the '%1' action at the bottom to pin it to your homescreen.").arg(addHome.title), "l" );
tutorial.execActionBar( "share", qsTr("To share this verse with your friends tap on the '%1' action at the bottom.").arg(shareAction.title), "r" );
- tutorial.exec( "lpArabic", qsTr("Press-and-hold on the arabic text if you want to copy or share it."), HorizontalAlignment.Right, VerticalAlignment.Top, 0, deviceUtils.du(2), deviceUtils.du(21));
+ tutorial.exec( "lpArabic", qsTr("Press-and-hold on the arabic text if you want to copy or share it."), HorizontalAlignment.Right, VerticalAlignment.Top, 0, tutorial.du(2), tutorial.du(21));
if (tafsirOption.tafsirCount > 0 && similarOption.similarCount > 0)
{
tutorial.execTitle( "tafsir", qsTr("There are explanations of this verse by the people of knowledge! Tap on the '%1' option at the top to view them.").arg(tafsirOption.text), "r");
- tutorial.exec( "similarAyat", qsTr("There appears to be other verses with similar wording, choose the '%1' option at the top to view them in a split screen.").arg(similarOption.text), HorizontalAlignment.Center, VerticalAlignment.Top, deviceUtils.du(16), 0, deviceUtils.du(4));
- tutorial.exec( "ayatAudio", qsTr("Tap on the '%1' option to listen to this verse over and over in isolation.").arg(recitationOption.text), HorizontalAlignment.Center, VerticalAlignment.Top, 0, deviceUtils.du(24), deviceUtils.du(4));
+ tutorial.exec( "similarAyat", qsTr("There appears to be other verses with similar wording, choose the '%1' option at the top to view them in a split screen.").arg(similarOption.text), HorizontalAlignment.Center, VerticalAlignment.Top, tutorial.du(16), 0, tutorial.du(4));
+ tutorial.exec( "ayatAudio", qsTr("Tap on the '%1' option to listen to this verse over and over in isolation.").arg(recitationOption.text), HorizontalAlignment.Center, VerticalAlignment.Top, 0, tutorial.du(24), tutorial.du(4));
}
if (body.text.length > 0)
{
tutorial.execCentered( "arabicZoom", qsTr("Do a pinch gesture on the arabic text to increase or decrease the size of the font!"), "images/common/pinch.png" );
- tutorial.exec( "transliteration", qsTr("Tap on the arabic text to show the transliteration."), HorizontalAlignment.Right, VerticalAlignment.Top, 0, deviceUtils.du(2), deviceUtils.du(21));
+ tutorial.exec( "transliteration", qsTr("Tap on the arabic text to show the transliteration."), HorizontalAlignment.Right, VerticalAlignment.Top, 0, tutorial.du(2), tutorial.du(21));
}
if (helper.showTranslation) {
- tutorial.exec( "translationZoom", qsTr("Do a pinch gesture on the translation text to increase or decrease the size of the font!"), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, 0, deviceUtils.du(10), "images/common/pinch.png" );
- tutorial.exec( "lpTranslation", qsTr("Press-and-hold on the translation text if you want to copy or share it."), HorizontalAlignment.Left, VerticalAlignment.Center, 0, 0, deviceUtils.du(36));
+ tutorial.exec( "translationZoom", qsTr("Do a pinch gesture on the translation text to increase or decrease the size of the font!"), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, 0, tutorial.du(10), "images/common/pinch.png" );
+ tutorial.exec( "lpTranslation", qsTr("Press-and-hold on the translation text if you want to copy or share it."), HorizontalAlignment.Left, VerticalAlignment.Center, 0, 0, tutorial.du(36));
}
reporter.record("AyatOpened", surahId+":"+verseId);
@@ -476,7 +476,7 @@ Page
easingCurve: StockCurve.ExponentialIn
onEnded: {
- tutorial.exec( "transliterationWarning", qsTr("Please note that the scholars have mentioned to avoid the transliteration option since when depended upon it may introduce many mistakes because it cannot capture the Arabic pronunciations and rules properly.\n\nPlease use the Audio option to play the verse, and only use the transliteration text as a tool to help you, and do not depend on it fully."), HorizontalAlignment.Center, VerticalAlignment.Top, 0, 0, deviceUtils.du(18) );
+ tutorial.exec( "transliterationWarning", qsTr("Please note that the scholars have mentioned to avoid the transliteration option since when depended upon it may introduce many mistakes because it cannot capture the Arabic pronunciations and rules properly.\n\nPlease use the Audio option to play the verse, and only use the transliteration text as a tool to help you, and do not depend on it fully."), HorizontalAlignment.Center, VerticalAlignment.Top, 0, 0, tutorial.du(18) );
}
}
]
@@ -506,8 +506,8 @@ Page
{
horizontalAlignment: HorizontalAlignment.Fill
verticalAlignment: VerticalAlignment.Fill
- leftPadding: deviceUtils.du(1)
- rightPadding: deviceUtils.du(1)
+ leftPadding: tutorial.du(1)
+ rightPadding: tutorial.du(1)
Label
{
diff --git a/assets/AyatTafsirParser.qml b/assets/AyatTafsirParser.qml
index ddf99a85..eb20b200 100644
--- a/assets/AyatTafsirParser.qml
+++ b/assets/AyatTafsirParser.qml
@@ -256,7 +256,7 @@ QtObject
parser.process();
footer.visible = true;
- tutorial.exec( "tapBio", qsTr("Tap on the author's name to see his/her profile, biography, quotes, and works."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(14), 0, deviceUtils.du(14) );
+ tutorial.exec( "tapBio", qsTr("Tap on the author's name to see his/her profile, biography, quotes, and works."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(14), 0, tutorial.du(14) );
}
}
},
diff --git a/assets/AyatTafsirPicker.qml b/assets/AyatTafsirPicker.qml
index 8218cd80..081bfae4 100644
--- a/assets/AyatTafsirPicker.qml
+++ b/assets/AyatTafsirPicker.qml
@@ -32,8 +32,8 @@ ResizableContainer
duration: 1200
onEnded: {
- tutorial.execBelowTitleBar( "tafsirPicking", qsTr("These are the explanations for this verse from the various people of knowledge. As more tafsir is available the app will automatically try to fetch them and update its database in the future with your permission. Tap on any one of them to open it and read it."), deviceUtils.du(20) );
- tutorial.execBelowTitleBar( "tafsirShortcut", qsTr("Press-and-hold on any of the tafsir and choose 'Add Shortcut' to pin it to your homescreen."), deviceUtils.du(15) );
+ tutorial.execBelowTitleBar( "tafsirPicking", qsTr("These are the explanations for this verse from the various people of knowledge. As more tafsir is available the app will automatically try to fetch them and update its database in the future with your permission. Tap on any one of them to open it and read it."), tutorial.du(20) );
+ tutorial.execBelowTitleBar( "tafsirShortcut", qsTr("Press-and-hold on any of the tafsir and choose 'Add Shortcut' to pin it to your homescreen."), tutorial.du(15) );
}
}
]
diff --git a/assets/AyatTranslationListItem.qml b/assets/AyatTranslationListItem.qml
index d4920229..42f30116 100644
--- a/assets/AyatTranslationListItem.qml
+++ b/assets/AyatTranslationListItem.qml
@@ -8,9 +8,9 @@ AyatListItem
Container
{
horizontalAlignment: HorizontalAlignment.Fill
- rightPadding: deviceUtils.du(1)
- leftPadding: deviceUtils.du(1)
- bottomPadding: deviceUtils.du(1)
+ rightPadding: tutorial.du(1)
+ leftPadding: tutorial.du(1)
+ bottomPadding: tutorial.du(1)
Label
{
diff --git a/assets/QuranHelp.qml b/assets/QuranHelp.qml
index 684cc9aa..b2334c0a 100644
--- a/assets/QuranHelp.qml
+++ b/assets/QuranHelp.qml
@@ -113,9 +113,9 @@ HelpPage
onExpandedChanged: {
if (expanded)
{
- tutorial.execBelowTitleBar( "disabledUpdates", qsTr("As more and more tafsir and biographies become available, the app can try to download them. Use the '%1' option to never check for these updates.").arg(disabledUpdates.text), deviceUtils.du(16) );
- tutorial.execBelowTitleBar( "promptUpdates", qsTr("To be prompted before downloading the latest tafsir updates, use the '%1' option.").arg(promptUpdates.text), deviceUtils.du(24) );
- tutorial.execBelowTitleBar( "autoUpdates", qsTr("To automatically download the latest tafsir updates as they become available, use the '%1' option.").arg(autoUpdates.text), deviceUtils.du(32) );
+ tutorial.execBelowTitleBar( "disabledUpdates", qsTr("As more and more tafsir and biographies become available, the app can try to download them. Use the '%1' option to never check for these updates.").arg(disabledUpdates.text), tutorial.du(16) );
+ tutorial.execBelowTitleBar( "promptUpdates", qsTr("To be prompted before downloading the latest tafsir updates, use the '%1' option.").arg(promptUpdates.text), tutorial.du(24) );
+ tutorial.execBelowTitleBar( "autoUpdates", qsTr("To automatically download the latest tafsir updates as they become available, use the '%1' option.").arg(autoUpdates.text), tutorial.du(32) );
}
}
}
diff --git a/assets/QuranPane.qml b/assets/QuranPane.qml
index c01bcbea..1f9b50bc 100644
--- a/assets/QuranPane.qml
+++ b/assets/QuranPane.qml
@@ -54,7 +54,7 @@ NavigationPane
text: progressData ? progressData.surah_id+":"+progressData.verse_id : ""
imageSource: "images/dropdown/saved_bookmark.png"
verticalAlignment: VerticalAlignment.Center
- maxWidth: deviceUtils.du(18.75)
+ maxWidth: tutorial.du(18.75)
translationX: -250
scaleX: 1.1
scaleY: 1.1
@@ -67,7 +67,7 @@ NavigationPane
onVisibleChanged: {
if ( visible && tutorial.isTopPane(navigationPane, pickerPage) ) {
- tutorial.exec( "bookmarkAnchor", qsTr("Notice the button on the top left. This is used to track your Qu'ran reading progress. You can use it to quickly jump to the verse you last left off."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(2), 0, deviceUtils.du(4) );
+ tutorial.exec( "bookmarkAnchor", qsTr("Notice the button on the top left. This is used to track your Qu'ran reading progress. You can use it to quickly jump to the verse you last left off."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(2), 0, tutorial.du(4) );
}
if (visible && scaleX != 1) {
@@ -310,7 +310,7 @@ NavigationPane
tutorial.execActionBar( "openMushaf", qsTr("Tap here to open the mushaf!") );
tutorial.execActionBar("selectAllSurahs", qsTr("Tap on the '%1' action to view the entire Qu'ran (all the surahs)!").arg(selectAll.title), "r");
- var noMoreTutorialsLeft = tutorial.exec("lpSurahPicker", "Press and hold on a surah for a menu to select multiple chapters.", HorizontalAlignment.Center, VerticalAlignment.Center, deviceUtils.du(2), 0, 0, deviceUtils.du(2));
+ var noMoreTutorialsLeft = tutorial.exec("lpSurahPicker", "Press and hold on a surah for a menu to select multiple chapters.", HorizontalAlignment.Center, VerticalAlignment.Center, tutorial.du(2), 0, 0, tutorial.du(2));
if ( !noMoreTutorialsLeft && persist.getValueFor("hideRandomQuote") != 1 ) {
helper.fetchRandomQuote(pickerPage);
diff --git a/assets/SearchPage.qml b/assets/SearchPage.qml
index 32904467..9ab79f2e 100644
--- a/assets/SearchPage.qml
+++ b/assets/SearchPage.qml
@@ -29,7 +29,7 @@ Page
titleBar.kindProperties.expandableArea.expanded = true;
tutorial.execBelowTitleBar("searchOptions", qsTr("Tap on the '%1' button to restrict the search to only a specific surah.").arg(restrictButton.text) );
} if (key == "searchOptions") {
- tutorial.execBelowTitleBar("searchGoogle", qsTr("Sometimes the translations are not the same depending on where you got your translated text from. Quran10 can also search Google to find a better match than the ones found in the app. Enable the '%1' check box to enable it.").arg(searchGoogleCheckBox.text), deviceUtils.du(8) );
+ tutorial.execBelowTitleBar("searchGoogle", qsTr("Sometimes the translations are not the same depending on where you got your translated text from. Quran10 can also search Google to find a better match than the ones found in the app. Enable the '%1' check box to enable it.").arg(searchGoogleCheckBox.text), tutorial.du(8) );
} else if (key == "searchGoogle") {
titleBar.kindProperties.expandableArea.expanded = false;
}
diff --git a/assets/SettingsPage.qml b/assets/SettingsPage.qml
index 04597f96..94ee37ed 100644
--- a/assets/SettingsPage.qml
+++ b/assets/SettingsPage.qml
@@ -214,9 +214,9 @@ Page
}
tutorial.execBelowTitleBar( "translation", qsTr("If you want to show a specific translation for the Qu'ran, choose it here.") );
- tutorial.execBelowTitleBar( "qaree", qsTr("If you want to use a specific qaree to recite the Qu'ran set it here."), deviceUtils.du(8) );
- tutorial.execBelowTitleBar( "dloadDir", qsTr("To change the directory where the mushaf pages, ayat images, and recitations are downloaded, set it here."), deviceUtils.du(21), "r" );
- tutorial.exec( "overlay", qsTr("Sometimes BlackBerry 10's font rules override the arabic rulings of the Qu'ran, and some letters get disconnected. It does not change the meaning however it looks slightly different from the original mushaf text, if you want to prevent this, choose '%1' to display images for the ayats instead of text. Please note that this will have a negative performance impact.").arg(joinDisconnected.text), HorizontalAlignment.Right, VerticalAlignment.Center, 0, 0, 0, deviceUtils.du(8) );
+ tutorial.execBelowTitleBar( "qaree", qsTr("If you want to use a specific qaree to recite the Qu'ran set it here."), tutorial.du(8) );
+ tutorial.execBelowTitleBar( "dloadDir", qsTr("To change the directory where the mushaf pages, ayat images, and recitations are downloaded, set it here."), tutorial.du(21), "r" );
+ tutorial.exec( "overlay", qsTr("Sometimes BlackBerry 10's font rules override the arabic rulings of the Qu'ran, and some letters get disconnected. It does not change the meaning however it looks slightly different from the original mushaf text, if you want to prevent this, choose '%1' to display images for the ayats instead of text. Please note that this will have a negative performance impact.").arg(joinDisconnected.text), HorizontalAlignment.Right, VerticalAlignment.Center, 0, 0, 0, tutorial.du(8) );
tutorial.exec( "keepAwake", qsTr("Use the '%1' feature if you want to keep the device screen lit up when the app is playing the recitation so you can follow along and not have to continually touch the screen.").arg(keepAwake.text), HorizontalAlignment.Right, VerticalAlignment.Center);
tutorial.execCentered( "hideBenefits", qsTr("Use the '%1' feature if you want to supress the random quotes that shows up in the start of the app.").arg(hideBenefits.text), "images/menu/ic_copy_from_english.png");
}
diff --git a/assets/SimilarAyatControl.qml b/assets/SimilarAyatControl.qml
index 63ffade6..f806eddc 100644
--- a/assets/SimilarAyatControl.qml
+++ b/assets/SimilarAyatControl.qml
@@ -14,7 +14,7 @@ ResizableContainer
offloader.decorateSimilarResults(data, bodyControl.value, adm, bodyControl);
tutorial.execBelowTitleBar( "relatedExpand", qsTr("You can expand this top section by tapping on the 'Related' header.") );
- tutorial.exec( "relatedExpand2", qsTr("To minimize it, tap on the ayat header on the bottom pane."), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, deviceUtils.du(12) );
+ tutorial.exec( "relatedExpand2", qsTr("To minimize it, tap on the ayat header on the bottom pane."), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, tutorial.du(12) );
}
ListView
diff --git a/assets/SurahPickerPage.qml b/assets/SurahPickerPage.qml
index 4b0c0725..65ade17b 100644
--- a/assets/SurahPickerPage.qml
+++ b/assets/SurahPickerPage.qml
@@ -138,9 +138,9 @@ Page
if (expanded)
{
tutorial.execBelowTitleBar( "alphabetical", qsTr("To arrange the surahs in ascending order relative to their name use the '%1' option.").arg(alphabet.text) );
- tutorial.execBelowTitleBar( "juz", qsTr("To categorize the surahs into their respective Juz, use the '%1' option.").arg(juzOption.text), deviceUtils.du(8) );
- tutorial.execBelowTitleBar( "normal", qsTr("To arrange the surahs in the order they appear in the Mushaf, use the '%1' option.").arg(normal.text), deviceUtils.du(16) );
- tutorial.execBelowTitleBar( "recent", qsTr("To arrange the surahs in their original order of revelation (ascending), use the '%1' option.").arg(recent.text), deviceUtils.du(24) );
+ tutorial.execBelowTitleBar( "juz", qsTr("To categorize the surahs into their respective Juz, use the '%1' option.").arg(juzOption.text), tutorial.du(8) );
+ tutorial.execBelowTitleBar( "normal", qsTr("To arrange the surahs in the order they appear in the Mushaf, use the '%1' option.").arg(normal.text), tutorial.du(16) );
+ tutorial.execBelowTitleBar( "recent", qsTr("To arrange the surahs in their original order of revelation (ascending), use the '%1' option.").arg(recent.text), tutorial.du(24) );
}
}
@@ -222,7 +222,7 @@ Page
textField.input["keyLayout"] = 7;
deviceUtils.attachTopBottomKeys(mainPage, listView);
- tutorial.execBelowTitleBar("qPaneSurahPicker", qsTr("Search for surah names here. For example you can enter 'Baqara' or 'Fatiha'.\n\nYou can also enter surah numbers like '2' to go directly to Surah Baqara.\n\nYou can also enter '2:3' to go to Surah Baqara verse #3"), deviceUtils.du(8));
+ tutorial.execBelowTitleBar("qPaneSurahPicker", qsTr("Search for surah names here. For example you can enter 'Baqara' or 'Fatiha'.\n\nYou can also enter surah numbers like '2' to go directly to Surah Baqara.\n\nYou can also enter '2:3' to go to Surah Baqara verse #3"), tutorial.du(8));
tutorial.execBelowTitleBar("displayStyle", qsTr("Tap here on the '%1' to change the order of the surahs or display Juz related information!").arg(sortOrder.title) );
}
}
@@ -330,7 +330,7 @@ Page
gdm.sortingKeys = ["juz_id", "surah_id", "verse_number"];
data = offloader.normalizeJuzs(data);
- tutorial.execBelowTitleBar("juzHeader", qsTr("Tap on any of the Juz headers to open that Juz, or tap on any of the surahs to open them individually."), deviceUtils.du(16));
+ tutorial.execBelowTitleBar("juzHeader", qsTr("Tap on any of the Juz headers to open that Juz, or tap on any of the surahs to open them individually."), tutorial.du(16));
}
var total = gdm.size();
diff --git a/assets/TransfersDialog.qml b/assets/TransfersDialog.qml
index 73f3354e..282caaed 100644
--- a/assets/TransfersDialog.qml
+++ b/assets/TransfersDialog.qml
@@ -103,19 +103,19 @@ Delegate
background: bg.imagePaint
horizontalAlignment: HorizontalAlignment.Right
verticalAlignment: VerticalAlignment.Center
- minHeight: deviceUtils.du(25)
- minWidth: deviceUtils.du(37.5)
- maxHeight: deviceUtils.du(50)
- maxWidth: deviceUtils.du(75)
+ minHeight: tutorial.du(25)
+ minWidth: tutorial.du(37.5)
+ maxHeight: tutorial.du(50)
+ maxWidth: tutorial.du(75)
rightPadding: 30
- translationX: deviceUtils.du(50)
+ translationX: tutorial.du(50)
bottomPadding: 20
layout: DockLayout {}
animations: [
TranslateTransition {
id: tt
- fromX: deviceUtils.du(50)
+ fromX: tutorial.du(50)
toX: 0
easingCurve: StockCurve.ExponentialOut
delay: 250
@@ -126,7 +126,7 @@ Delegate
{
id: out
fromX: 0
- toX: deviceUtils.du(50)
+ toX: tutorial.du(50)
easingCurve: StockCurve.CircularIn
delay: 250
duration: 750
@@ -146,7 +146,7 @@ Delegate
Container
{
- topPadding: deviceUtils.du(3.75)
+ topPadding: tutorial.du(3.75)
EmptyDelegate
{
@@ -161,7 +161,7 @@ Delegate
horizontalAlignment: HorizontalAlignment.Fill
verticalAlignment: VerticalAlignment.Fill
visible: queue.queued > 0
- topPadding: offliner.delegateActive ? deviceUtils.du(6) : 0
+ topPadding: offliner.delegateActive ? tutorial.du(6) : 0
OfflineDelegate
{
@@ -179,8 +179,8 @@ Delegate
ListView
{
id: listView
- maxWidth: deviceUtils.du(75)
- maxHeight: deviceUtils.du(50)
+ maxWidth: tutorial.du(75)
+ maxHeight: tutorial.du(50)
scrollRole: ScrollRole.Main
onCreationCompleted: {
diff --git a/assets/VersesListView.qml b/assets/VersesListView.qml
index c9ffd0fa..f3f70ec4 100644
--- a/assets/VersesListView.qml
+++ b/assets/VersesListView.qml
@@ -74,8 +74,8 @@ ListView
onActiveChanged: {
if (active) {
tutorial.exec("selectRangeCopy", qsTr("Use the '%1' action if you want to copy the ayats to the clipboard so you can later paste it somewhere.").arg(multiCopy.title), HorizontalAlignment.Center, VerticalAlignment.Bottom);
- tutorial.exec("selectRangePlay", qsTr("Use the '%1' action if you want to play the recitation of the selected ayats.").arg(multiPlayAction.title), HorizontalAlignment.Left, VerticalAlignment.Bottom, deviceUtils.du(22));
- tutorial.exec("selectRangeShare", qsTr("Use the '%1' action if you want to share the ayats with one of your contacts or somewhere else.").arg(multiShare.title), HorizontalAlignment.Right, VerticalAlignment.Bottom, 0, deviceUtils.du(22));
+ tutorial.exec("selectRangePlay", qsTr("Use the '%1' action if you want to play the recitation of the selected ayats.").arg(multiPlayAction.title), HorizontalAlignment.Left, VerticalAlignment.Bottom, tutorial.du(22));
+ tutorial.exec("selectRangeShare", qsTr("Use the '%1' action if you want to share the ayats with one of your contacts or somewhere else.").arg(multiShare.title), HorizontalAlignment.Right, VerticalAlignment.Bottom, 0, tutorial.du(22));
}
}
@@ -190,7 +190,7 @@ ListView
}
if (helper.showTranslation) {
- tutorial.exec("surahPageZoomTranslation", qsTr("Do a pinch gesture on the translation text to increase or decrease the size of the font!"), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, 0, deviceUtils.du(12), "images/common/pinch.png");
+ tutorial.exec("surahPageZoomTranslation", qsTr("Do a pinch gesture on the translation text to increase or decrease the size of the font!"), HorizontalAlignment.Center, VerticalAlignment.Center, 0, 0, 0, tutorial.du(12), "images/common/pinch.png");
}
tutorial.execActionBar( "repeat", qsTr("Tap on the repeat action at the bottom to enable or disable repeating the recitation in a loop once it finishes."), "l" );
diff --git a/assets/main.qml b/assets/main.qml
index f18f46a6..99367d2c 100644
--- a/assets/main.qml
+++ b/assets/main.qml
@@ -14,10 +14,10 @@ TabbedPane
sidebarStateChanged.disconnect(onSidebarVisualStateChanged);
tutorial.tutorialFinished.connect(onTutorialFinished);
- tutorial.exec("tabsFavs", qsTr("In the Favourites tab: Any verses you mark as favourite will end up here."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(1), 0, deviceUtils.du(10), 0, favs.imageSource.toString(), "d" );
- tutorial.exec("tabsSearch", qsTr("In the Search tab you can use this to quickly find a specific verse via keywords."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(1), 0, deviceUtils.du(10), 0, search.imageSource.toString(), "d" );
- tutorial.exec("tabsDuaa", qsTr("In the Supplications tab you will find a collection of some of the many du'aa that are found across the Qu'ran."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(1), 0, deviceUtils.du(10), 0, supplications.imageSource.toString(), "d" );
- tutorial.exec("tabsUmmah", qsTr("In the Ummah tab you can browse the various callers, students of knowledge, and scholars of the past and present."), HorizontalAlignment.Left, VerticalAlignment.Top, deviceUtils.du(1), 0, deviceUtils.du(10), 0, ummahTab.imageSource.toString(), "d" );
+ tutorial.exec("tabsFavs", qsTr("In the Favourites tab: Any verses you mark as favourite will end up here."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(1), 0, tutorial.du(10), 0, favs.imageSource.toString(), "d" );
+ tutorial.exec("tabsSearch", qsTr("In the Search tab you can use this to quickly find a specific verse via keywords."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(1), 0, tutorial.du(10), 0, search.imageSource.toString(), "d" );
+ tutorial.exec("tabsDuaa", qsTr("In the Supplications tab you will find a collection of some of the many du'aa that are found across the Qu'ran."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(1), 0, tutorial.du(10), 0, supplications.imageSource.toString(), "d" );
+ tutorial.exec("tabsUmmah", qsTr("In the Ummah tab you can browse the various callers, students of knowledge, and scholars of the past and present."), HorizontalAlignment.Left, VerticalAlignment.Top, tutorial.du(1), 0, tutorial.du(10), 0, ummahTab.imageSource.toString(), "d" );
reporter.record( "TabbedPaneExpanded", root.sidebarVisualState.toString() );
}
@@ -65,7 +65,7 @@ TabbedPane
onFinished: {
sidebarStateChanged.connect(onSidebarVisualStateChanged);
- tutorial.exec("openTabMenu", qsTr("Tap here to open the menu"), HorizontalAlignment.Left, VerticalAlignment.Bottom, deviceUtils.du(2), 0, 0, deviceUtils.du(1)/2);
+ tutorial.exec("openTabMenu", qsTr("Tap here to open the menu"), HorizontalAlignment.Left, VerticalAlignment.Bottom, tutorial.du(2), 0, 0, tutorial.du(1)/2);
tutorial.execSwipe("swipeOpenTabMenu", qsTr("Swipe right to expand the menu!"), HorizontalAlignment.Left, VerticalAlignment.Center, "r");
if ( reporter.deferredCheck("checkedSalat10", 10) ) {
diff --git a/bar-descriptor.xml b/bar-descriptor.xml
index 5f91360a..fe3c863c 100644
--- a/bar-descriptor.xml
+++ b/bar-descriptor.xml
@@ -217,6 +217,7 @@
assets/AlFurqanAdvertisement.qml
assets/BugReportPage.qml
assets/CanadaIncMenu.qml
+ assets/CanadaIncUtils.qml
assets/ClassicBackDelegate.qml
assets/EmptyDelegate.qml
assets/FontSizePincher.qml