diff --git a/source-android/android/gradle.properties b/source-android/android/gradle.properties index 82755ae..bedc041 100644 --- a/source-android/android/gradle.properties +++ b/source-android/android/gradle.properties @@ -1,4 +1,7 @@ +# androidBuildToolsVersion=25.0.3 +# androidCompileSdkVersion=26 buildDir=.build +# qt5AndroidDir=/home/pankraz/Qt/5.11.1/android_armv7/src/android/java android.useAndroidX=true android.enableJetifier=true android.enforceUniquePackageName=false diff --git a/source-android/qml/friendiqa.qml b/source-android/qml/friendiqa.qml index 41558a7..5bea20f 100644 --- a/source-android/qml/friendiqa.qml +++ b/source-android/qml/friendiqa.qml @@ -256,8 +256,8 @@ ApplicationWindow{ Loader{ id: newstab - Layout.fillWidth:true - Layout.fillHeight: true +// Layout.fillWidth:true +// Layout.fillHeight: true property string newstabstatus property var conversation:[] diff --git a/source-linux/application.qrc b/source-linux/application.qrc index 091eb8a..3e62eeb 100644 --- a/source-linux/application.qrc +++ b/source-linux/application.qrc @@ -247,5 +247,7 @@ qml/contactqml/ContactsListTab.qml qml/contactqml/GroupsListTab.qml qml/calendarqml/EventListItem.qml + translations/friendiqa-hu.qm + translations/friendiqa-hu.ts diff --git a/source-linux/common/updatenews.cpp b/source-linux/common/updatenews.cpp index 77d607a..5da6b54 100644 --- a/source-linux/common/updatenews.cpp +++ b/source-linux/common/updatenews.cpp @@ -135,7 +135,7 @@ void UPDATENEWS::login() } void UPDATENEWS::startsync() -{ qDebug()<<"Friendiqa start syncing "<0){ - qDebug() << "start Friendrequests imagedownload"; + //qDebug() << "start Friendrequests imagedownload"; startImagedownload("friendrequests"); + }else{ + if(m_updateInterval!=0){ + syncindex+=1; + startsync(); + } } } } diff --git a/source-linux/js/newsworker.js b/source-linux/js/newsworker.js index 4e4558d..21f5a25 100644 --- a/source-linux/js/newsworker.js +++ b/source-linux/js/newsworker.js @@ -72,11 +72,13 @@ function beautify(newsitemobject,msg){ else if (attachArray[image].mimetype=="image/png"){attachhelper.url=attachhelper.url+".png"} } else {attachhelper.url=attachArray[image].url} - imageAttachmentList.push(attachhelper) + //print("Attachhelper "+attachhelper.url) newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url,"") newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4)+".jpeg","") newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4),"") + + imageAttachmentList.push(attachhelper) } } }catch(e){print("attachment "+e)} diff --git a/source-linux/qml/configqml/LeftDrawerScrollview.qml b/source-linux/qml/configqml/LeftDrawerScrollview.qml index f7f0f62..8a11dce 100644 --- a/source-linux/qml/configqml/LeftDrawerScrollview.qml +++ b/source-linux/qml/configqml/LeftDrawerScrollview.qml @@ -92,20 +92,20 @@ ScrollView{ Component.onCompleted:{ Service.readAllLogins(db,function(accounts){ if (accounts.length>0 && bar.currentIndex==0){ - leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*13*root.fontFactor*osSettings.bigFontSize + leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*17*root.fontFactor*osSettings.bigFontSize for(var i = 0; i < accounts.length; i++) { var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponent.qml"); var accountQml = accountComponent.createObject(leftDrawerColumn,{ - "y":4.5*root.fontFactor*osSettings.bigFontSize+i*13*root.fontFactor*osSettings.bigFontSize, + "y":4.5*root.fontFactor*osSettings.bigFontSize+i*17*root.fontFactor*osSettings.bigFontSize, "currentnewstabstatus":currentnewstabstatus, "account":accounts[i]}); } }else if(accounts.length>0 && bar.currentIndex==1){ - leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*6.5*root.fontFactor*osSettings.bigFontSize + leftDrawerColumn.height=4.5*root.fontFactor*osSettings.bigFontSize+accounts.length*8*root.fontFactor*osSettings.bigFontSize for(var i = 0; i < accounts.length; i++) { var accountComponent = Qt.createComponent("qrc:/qml/genericqml/DrawerAccountComponentContacts.qml"); var accountQml = accountComponent.createObject(leftDrawerColumn,{ - "y":4.5*root.fontFactor*osSettings.bigFontSize+i*6.5*root.fontFactor*osSettings.bigFontSize, + "y":4.5*root.fontFactor*osSettings.bigFontSize+i*8*root.fontFactor*osSettings.bigFontSize, "account":accounts[i]}); } } diff --git a/source-linux/qml/genericqml/ContactComponent.qml b/source-linux/qml/genericqml/ContactComponent.qml index e652156..9688b1a 100644 --- a/source-linux/qml/genericqml/ContactComponent.qml +++ b/source-linux/qml/genericqml/ContactComponent.qml @@ -35,7 +35,7 @@ import "qrc:/qml/genericqml" Item { id: contactComponent - height: 5*root.fontFactor*osSettings.systemFontSize//8*mm + height: 4.5*root.fontFactor*osSettings.systemFontSize//8*mm width: contactComponent.ListView.view.width//parent.width property var createdAtDate: new Date(contact.created_at) property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?"":( ""+qsTr("Connect")+"
") diff --git a/source-linux/qml/newsqml/MessageSend.qml b/source-linux/qml/newsqml/MessageSend.qml index 1cd98bb..d72f109 100644 --- a/source-linux/qml/newsqml/MessageSend.qml +++ b/source-linux/qml/newsqml/MessageSend.qml @@ -132,12 +132,12 @@ Rectangle{ //print("Newsobject "+newsitemobject.id+ " "+JSON.stringify(newsitemobject.user)); if (newsitemobject!=""){ messageSend.state="conversation" - reply_to_user=newsitemobject.user.screen_name; - parentId=newsitemobject.id + messageSend.reply_to_user=newsitemobject.user.screen_name; + messageSend.parentId=newsitemobject.id } else { - messageSend.state=null; - reply_to_user=""; - parentId=""; + //messageSend.state=null; + messageSend.reply_to_user=""; + messageSend.parentId=""; bodyField.text=""; attachImageURLs.pop(); imageAttachment.source="" diff --git a/source-linux/qml/newsqml/NewsImage.qml b/source-linux/qml/newsqml/NewsImage.qml index e754d57..9527959 100644 --- a/source-linux/qml/newsqml/NewsImage.qml +++ b/source-linux/qml/newsqml/NewsImage.qml @@ -34,7 +34,7 @@ AnimatedImage {id:gif; width:toprow.width; //property string mimetype:"" fillMode: Image.PreserveAspectFit; - onStatusChanged: playing = (status == AnimatedImage.Ready) + onStatusChanged: {playing = (status == AnimatedImage.Ready)} Rectangle{ visible: (model.newsitemobject.imageAttachmentList.length>1)&&(gif.status==Image.Ready) opacity: 0.5 diff --git a/source-linux/qml/newsqml/NewsTab.qml b/source-linux/qml/newsqml/NewsTab.qml index f7b4cb6..7257bfe 100644 --- a/source-linux/qml/newsqml/NewsTab.qml +++ b/source-linux/qml/newsqml/NewsTab.qml @@ -39,11 +39,9 @@ import "qrc:/js/service.js" as Service Rectangle{ id:newstabitem - width:rootstack.width//-5*mm - height: rootstack.height-8*mm//rootstack.height-100*mm + width:rootstack.width + height: rootstack.height-8*mm - //anchors.fill: parent - //onHeightChanged: {newsSwipeview.height=height-5*mm} Timer {id:contacttimer; interval: 50; running: false; repeat: false onTriggered: { root.newContacts=Newsjs.findNewContacts(root.news,root.contactlist); @@ -155,63 +153,15 @@ Rectangle{ LeftDrawerAndroid{ id: leftDrawerAndroid } -// BlueButton{ -// z:2 -// anchors.left: newsSwipeview.left -// anchors.verticalCenter: newsSwipeview.verticalCenter//anchors.bottom: newsSwipeview.bottom -// anchors.margins: mm -// visible: wideScreen && newsSwipeview.currentIndex!=0 -// text:"\uf053" -// fontColor:"grey" -// border.color: "transparent" -// color:"transparent" -// radius:0 -// onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex-1} -// } - -// BlueButton{ -// z:2 -// anchors.right: newsSwipeview.right -// anchors.verticalCenter: newsSwipeview.verticalCenter//anchors.bottom: newsSwipeview.bottom -// anchors.margins: mm -// visible: wideScreen && newsSwipeview.currentIndex!=3 -// text:"\uf054" -// fontColor:"grey" -// border.color: "transparent" -// color:"transparent" -// radius:0 -// onClicked: {newsSwipeview.currentIndex=newsSwipeview.currentIndex+1} -// } SwipeView{ id: newsSwipeview property string stacktype:"Home" currentIndex: 0 - width: wideScreen&&rootstackView.depth<2?newstabitem.width-leftDrawer.width-mm:newstabitem.width-mm//newstabitem.width/3*2:newstabitem.width + width: wideScreen&&rootstackView.depth<2?newstabitem.width-leftDrawer.width:newstabitem.width//newstabitem.width/3*2:newstabitem.width height: newstabitem.height-4*mm x: leftDrawer.width function onDirectMessage(friend){currentIndex=2} -// transitions: Transition { -// PropertyAnimation { properties: "height"; -// easing.type: Easing.InOutQuad -// duration: 1000 -// } -// } - - -// Label{ -// text:"\uf0c9 " -// font.pixelSize: 5* mm -// anchors.left: parent.left -// anchors.margins: mm -// color: "#B0BEC5" -// MouseArea{ -// anchors.fill: parent -// onClicked:{ -// leftDrawer.open() -// } -// } -// } onCurrentIndexChanged: { switch(currentIndex){ diff --git a/source-linux/qml/newsqml/Newsitem.qml b/source-linux/qml/newsqml/Newsitem.qml index 3ae3431..a7c4c9f 100644 --- a/source-linux/qml/newsqml/Newsitem.qml +++ b/source-linux/qml/newsqml/Newsitem.qml @@ -74,7 +74,7 @@ Item { id:toprow //newscolumn width: newsitemobject.hasOwnProperty("indent")?newsitem.width-(newsitem.width/20 *(newsitemobject.indent+1)):newsitem.width//-8*mm x:newsitemobject.hasOwnProperty("indent")?newsitem.width/20*(newsitemobject.indent):0 - height: newsitemobject.nsfw?5*mm:Math.min(itemHeader.height+itemBody.height,3/4*root.height) + height: newsitemobject.nsfw?5*mm:Math.min(implicitHeight,3/4*root.height) clip: true Item{id:itemHeader height: Math.max(profileImage.height+mm,topFlow.implicitHeight+mm) diff --git a/source-linux/translations/friendiqa-hu.qm b/source-linux/translations/friendiqa-hu.qm index 8045dab..a9599bd 100644 Binary files a/source-linux/translations/friendiqa-hu.qm and b/source-linux/translations/friendiqa-hu.qm differ diff --git a/source-linux/translations/friendiqa-hu.ts b/source-linux/translations/friendiqa-hu.ts index a1a88a0..6afd3d0 100644 --- a/source-linux/translations/friendiqa-hu.ts +++ b/source-linux/translations/friendiqa-hu.ts @@ -396,7 +396,7 @@ Approve - Jóváhagyja + Jóváhagyás @@ -406,7 +406,7 @@ Ignore - Ne törődj a + Mellőzés @@ -754,7 +754,7 @@ Drop your Content here. - Tegye le itt a Tartalmát. + Ejtse ide a tartalmat.