From 14051ca51e0d9c97109a9d042073a7ef5311c8c1 Mon Sep 17 00:00:00 2001 From: Dusko Angirevic Date: Thu, 24 May 2018 15:00:10 +0200 Subject: [PATCH] Updating navigation icons --- .gitignore | 9 ++++++ harbour-tooter.pro.user | 2 +- qml/images/federated.svg | 42 ++++++------------------ qml/images/home.svg | 49 ++++++++++++---------------- qml/images/local.svg | 49 +++++++++++++--------------- qml/images/mesagess.svg | 17 ---------- qml/images/notification.svg | 44 +++++++++++++------------ qml/images/search.svg | 50 +++++++++++++---------------- qml/pages/components/MyList.qml | 2 +- qml/pages/components/Navigation.qml | 16 +++++---- 10 files changed, 120 insertions(+), 160 deletions(-) delete mode 100644 qml/images/mesagess.svg diff --git a/.gitignore b/.gitignore index f2b0588..2b6ecca 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,12 @@ harbour-tooter.pro.user.2549760 harbour-tooter.pro.user *.user harbour-tooter.pro.user +translations/harbour-tooter-de.ts +translations/harbour-tooter-el.ts +translations/harbour-tooter-es.ts +translations/harbour-tooter-fr.ts +translations/harbour-tooter-nl.ts +translations/harbour-tooter-oc.ts +translations/harbour-tooter-ru.ts +translations/harbour-tooter-sr.ts +translations/harbour-tooter-sv.ts diff --git a/harbour-tooter.pro.user b/harbour-tooter.pro.user index 6754c13..dee0cc6 100644 --- a/harbour-tooter.pro.user +++ b/harbour-tooter.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/qml/images/federated.svg b/qml/images/federated.svg index 06087cc..5511f58 100644 --- a/qml/images/federated.svg +++ b/qml/images/federated.svg @@ -2,40 +2,18 @@ - - + viewBox="15 0 60 60" enable-background="new 15 0 60 60" xml:space="preserve"> + + - - - - - - - - - - - - + + + - + - - - - - + diff --git a/qml/images/home.svg b/qml/images/home.svg index 188ad4b..be54abc 100644 --- a/qml/images/home.svg +++ b/qml/images/home.svg @@ -3,42 +3,35 @@ - + - - + + - + - - - - - - - + + + + + - + - - - - - + + diff --git a/qml/images/local.svg b/qml/images/local.svg index ee58e44..1ae1e7f 100644 --- a/qml/images/local.svg +++ b/qml/images/local.svg @@ -2,43 +2,38 @@ + viewBox="15 0 60 60" enable-background="new 15 0 60 60" xml:space="preserve"> - + M57,7.7l-18.6,15c-0.3,0.3-0.5,0.7-0.5,1V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V34.1c0-0.7,0.7-1.4,1.4-1.4h11.1 + c0.8,0,1.4,0.7,1.4,1.4V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V23.7c0-0.4-0.2-0.8-0.5-1l-18.5-15 + C61.3,6.2,58.7,6.2,57,7.7z"/> + - - + + - + - - - + + + - + - + - + - - - - - + + diff --git a/qml/images/mesagess.svg b/qml/images/mesagess.svg deleted file mode 100644 index 8e7becc..0000000 --- a/qml/images/mesagess.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - diff --git a/qml/images/notification.svg b/qml/images/notification.svg index 7968eb1..56f1b35 100644 --- a/qml/images/notification.svg +++ b/qml/images/notification.svg @@ -2,34 +2,38 @@ + viewBox="15 0 60 60" enable-background="new 15 0 60 60" xml:space="preserve"> + M42,7.7l-18.6,15c-0.3,0.3-0.5,0.7-0.5,1V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V34.1c0-0.7,0.7-1.4,1.4-1.4h11.1 + c0.8,0,1.4,0.7,1.4,1.4V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V23.7c0-0.4-0.2-0.8-0.5-1l-18.5-15 + C46.3,6.2,43.7,6.2,42,7.7z"/> - - + + - - - - - - + + + + + + + + + - + - + - + diff --git a/qml/images/search.svg b/qml/images/search.svg index 10f4c5d..53514ed 100644 --- a/qml/images/search.svg +++ b/qml/images/search.svg @@ -2,42 +2,38 @@ + viewBox="18.9 0 60 60" enable-background="new 18.9 0 60 60" xml:space="preserve"> + M42,7.7l-18.6,15c-0.3,0.3-0.5,0.7-0.5,1V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V34.1c0-0.7,0.7-1.4,1.4-1.4h11.1 + c0.8,0,1.4,0.7,1.4,1.4V52c0,0.8,0.7,1.4,1.4,1.4h12.4c0.8,0,1.4-0.7,1.4-1.4V23.7c0-0.4-0.2-0.8-0.5-1l-18.5-15 + C46.3,6.2,43.7,6.2,42,7.7z"/> - - + + - + - - - + + + - + - + - - + - - - - - + + + + diff --git a/qml/pages/components/MyList.qml b/qml/pages/components/MyList.qml index 1b20640..b2f0626 100644 --- a/qml/pages/components/MyList.qml +++ b/qml/pages/components/MyList.qml @@ -8,7 +8,7 @@ SilicaListView { property string type; property string title property string vwPlaceholderText: qsTr("Loading") - property string vwPlaceholderHint: qsTr("Performing request, please wait or request something else") + property string vwPlaceholderHint: qsTr("please wait...") property string description property ListModel mdl: [] property variant params: [] diff --git a/qml/pages/components/Navigation.qml b/qml/pages/components/Navigation.qml index cd1414c..d2e3c35 100644 --- a/qml/pages/components/Navigation.qml +++ b/qml/pages/components/Navigation.qml @@ -14,8 +14,8 @@ SilicaGridView { ListModel { id: listModel ListElement { - //icon: "image://theme/icon-m-home" - icon: "../../images/home.svg" + icon: "image://theme/icon-m-home" + //icon: "../../images/home.svg" slug: "home" name: "Home" active: true @@ -38,15 +38,15 @@ SilicaGridView { unread: false } ListElement { - //icon: "image://theme/icon-m-alarm" - icon: "../../images/notification.svg" + icon: "image://theme/icon-m-alarm" + //icon: "../../images/notification.svg" slug: "notifications" name: "Notifications" active: false } ListElement { - //icon: "image://theme/icon-m-search" - icon: "../../images/search.svg" + icon: "image://theme/icon-m-search" + //icon: "../../images/search.svg" slug: "search" name: "Search" active: false @@ -114,10 +114,12 @@ SilicaGridView { } Image { id: image + sourceSize.width: Theme.iconSizeMedium + sourceSize.height: Theme.iconSizeMedium source: model.icon// +'?'+ (highlighted ? Theme.highlightColor : (model.active ? Theme.primaryColor : Theme.secondaryHighlightColor)) anchors.centerIn: parent visible: false - smooth: true + // smooth: true } Text {