diff --git a/qml/pages/ConversationPage.qml b/qml/pages/ConversationPage.qml index 8c82fd8..6cea652 100644 --- a/qml/pages/ConversationPage.qml +++ b/qml/pages/ConversationPage.qml @@ -16,7 +16,7 @@ Page { property string status_id: "" property string status_url: "" property string status_uri: "" - property int tootMaxChar: 500; + property int tootMaxChar: 500 property bool bot: false //otherwise ReferenceError ProfileHeader.qml property bool followed_by: false //otherwise ReferenceError ProfileHeader.qml property bool locked: false //otherwise ReferenceError ProfileHeader.qml @@ -60,6 +60,7 @@ Page { SilicaListView { id: myList + header: PageHeader { title: headerTitle // pageTitle pushed from MainPage.qml or VisualContainer.qml } diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml index 0ce3be1..cb47a5c 100644 --- a/qml/pages/MainPage.qml +++ b/qml/pages/MainPage.qml @@ -85,7 +85,7 @@ Page { height: parent.itemHeight onSearchChanged: { console.log(search) - loader.sourceComponent = loading + //loader.sourceComponent = loading if (search.charAt(0) === "@") { loader.sourceComponent = userListComponent } else if (search.charAt(0) === "#") { @@ -119,14 +119,14 @@ Page { } } - Component { - id: loading - BusyIndicator { - size: BusyIndicatorSize.Large - anchors.centerIn: parent - running: true - } - } +// Component { +// id: loading +// BusyIndicator { +// size: BusyIndicatorSize.Large +// anchors.centerIn: parent +// running: true +// } +// } Component { id: tagListComponent diff --git a/qml/pages/components/MediaBlock.qml b/qml/pages/components/MediaBlock.qml index 5963062..e3bb587 100644 --- a/qml/pages/components/MediaBlock.qml +++ b/qml/pages/components/MediaBlock.qml @@ -14,7 +14,7 @@ Item { height: height Component.onCompleted: { if (model && model.count && model.get(0).type === "video") { - while (model.count>1){ + while (model.count>1) { model.remove(model.count-1) } //console.log(JSON.stringify(model.get(0))) diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index 3d96f61..a4add0b 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -41,22 +41,16 @@ SilicaListView { description: myList.description } - BusyIndicator { - size: BusyIndicatorSize.Large - running: myList.model.count === 0 && !viewPlaceHolder.visible - anchors.centerIn: parent - } - - ViewPlaceholder { - id: viewPlaceHolder - enabled: model.count === 0 - text: qsTr("Loading") - hintText: qsTr("please wait...") - anchors.centerIn: parent + BusyLabel { + id: loadStatusList + running: model.count === 0 + anchors { + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter + } } PullDownMenu { - MenuItem { text: qsTr("Settings") visible: !profilePage @@ -124,10 +118,13 @@ SilicaListView { } BusyIndicator { + running: loadStarted + visible: loadStatusList.running ? false : true size: BusyIndicatorSize.Small - running: loadStarted; - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + anchors { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + } } } @@ -171,10 +168,10 @@ SilicaListView { function loadData(mode) { var p = [] - if (params.length) + if (params.length) { for(var i = 0; iSettings Einstellungen - - Loading - Wird geladen - - - please wait... - bitte warten... - New Toot Neuer Toot @@ -194,6 +186,10 @@ Open in Browser Im Browser öffnen + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-el.ts b/translations/harbour-tooter-el.ts index 25a224e..f8fdd97 100644 --- a/translations/harbour-tooter-el.ts +++ b/translations/harbour-tooter-el.ts @@ -174,14 +174,6 @@ Settings Ρυθμίσεις - - Loading - Φόρτωση - - - please wait... - - New Toot Νέος @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-es.ts b/translations/harbour-tooter-es.ts index 6973817..baf2096 100644 --- a/translations/harbour-tooter-es.ts +++ b/translations/harbour-tooter-es.ts @@ -174,14 +174,6 @@ Settings Ajustes - - Loading - Cargando - - - please wait... - por favor, espera... - New Toot Nuevo toot @@ -194,6 +186,10 @@ Open in Browser Abrir en el navegador + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-fr.ts b/translations/harbour-tooter-fr.ts index aa50e34..9f08856 100644 --- a/translations/harbour-tooter-fr.ts +++ b/translations/harbour-tooter-fr.ts @@ -174,14 +174,6 @@ Settings Paramètres - - Loading - Chargement - - - please wait... - patientez... - New Toot Nouveau pouet @@ -194,6 +186,10 @@ Open in Browser Ouvrir dans le navigateur + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-it.ts b/translations/harbour-tooter-it.ts index 4e12a4d..b88c20d 100644 --- a/translations/harbour-tooter-it.ts +++ b/translations/harbour-tooter-it.ts @@ -174,14 +174,6 @@ Settings Impostazioni - - Loading - Caricamento - - - please wait... - Attendere un momento... - New Toot Nuovo Toot @@ -194,6 +186,10 @@ Open in Browser Aprire nel browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-nl.ts b/translations/harbour-tooter-nl.ts index 9e6e937..b09d25f 100644 --- a/translations/harbour-tooter-nl.ts +++ b/translations/harbour-tooter-nl.ts @@ -174,14 +174,6 @@ Settings Instellingen - - Loading - Laden - - - please wait... - even geduld… - New Toot Nieuwe Toot @@ -194,6 +186,10 @@ Open in Browser Open een Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-nl_BE.ts b/translations/harbour-tooter-nl_BE.ts index 20dccf8..952bd2d 100644 --- a/translations/harbour-tooter-nl_BE.ts +++ b/translations/harbour-tooter-nl_BE.ts @@ -174,14 +174,6 @@ Settings Instellingen - - Loading - Laden - - - please wait... - efkens geduld… - New Toot Nieuwen toot @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-oc.ts b/translations/harbour-tooter-oc.ts index 8eb237f..3545567 100644 --- a/translations/harbour-tooter-oc.ts +++ b/translations/harbour-tooter-oc.ts @@ -174,14 +174,6 @@ Settings Parmètres - - Loading - Cargament - - - please wait... - esperatz.... - New Toot Nòu Tut @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-pl.ts b/translations/harbour-tooter-pl.ts index 41e4364..fe8a424 100644 --- a/translations/harbour-tooter-pl.ts +++ b/translations/harbour-tooter-pl.ts @@ -174,14 +174,6 @@ Settings Ustawienia - - Loading - Ładowanie - - - please wait... - proszę czekać… - New Toot Nowy wpis @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-ru.ts b/translations/harbour-tooter-ru.ts index 495b13c..bd663b9 100644 --- a/translations/harbour-tooter-ru.ts +++ b/translations/harbour-tooter-ru.ts @@ -174,14 +174,6 @@ Settings Настройки - - Loading - Загрузка - - - please wait... - Пожалуйста, подождите... - New Toot Новый @@ -194,6 +186,10 @@ Open in Browser Открыть в браузере + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-sr.ts b/translations/harbour-tooter-sr.ts index 5cc6c90..0dcdbd6 100644 --- a/translations/harbour-tooter-sr.ts +++ b/translations/harbour-tooter-sr.ts @@ -174,14 +174,6 @@ Settings Подешавања - - Loading - Učitavanje - - - please wait... - молимо вас, сачекајте... - New Toot Novi toot @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-sv.ts b/translations/harbour-tooter-sv.ts index da2e70c..6ff4080 100644 --- a/translations/harbour-tooter-sv.ts +++ b/translations/harbour-tooter-sv.ts @@ -174,14 +174,6 @@ Settings Inställningar - - Loading - Laddar - - - please wait... - Vänligen vänta... - New Toot Ny toot @@ -194,6 +186,10 @@ Open in Browser + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter-zh_CN.ts b/translations/harbour-tooter-zh_CN.ts index f82ed64..5a0bd4c 100644 --- a/translations/harbour-tooter-zh_CN.ts +++ b/translations/harbour-tooter-zh_CN.ts @@ -174,14 +174,6 @@ Settings 设置 - - Loading - 加载中 - - - please wait... - 稍等片刻...... - New Toot 新嘟嘟 @@ -194,6 +186,10 @@ Open in Browser 在浏览器打开个人简介 + + Loading... + + ProfileHeader diff --git a/translations/harbour-tooter.ts b/translations/harbour-tooter.ts index 09af8b4..28efe0d 100644 --- a/translations/harbour-tooter.ts +++ b/translations/harbour-tooter.ts @@ -174,14 +174,6 @@ Settings Settings - - Loading - - - - please wait... - - New Toot New Toot @@ -194,6 +186,10 @@ Open in Browser Open in Browser + + Loading... + + ProfileHeader