Commit be1076cd authored by Camilo Higuita's avatar Camilo Higuita

update version. multiple fixes and i18n usage

parents b8d91936 c9eee20f
cmake_minimum_required(VERSION 3.1)
set(COMMUNICATOR_VERSION 1.0.0)
set(COMMUNICATOR_VERSION 1.2.0)
project(communicator LANGUAGES CXX VERSION ${COMMUNICATOR_VERSION})
set(CMAKE_INCLUDE_CURRENT_DIR ON)
......
......@@ -10,8 +10,8 @@ TARGET = contacts
TEMPLATE = app
VERSION_MAJOR = 1
VERSION_MINOR = 0
VERSION_BUILD = 0
VERSION_MINOR = 1
VERSION_BUILD = 1
VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}.$${VERSION_BUILD}
......
......@@ -2,12 +2,20 @@
Name=Contacts
Name[ca]=Contactes
Name[ca@valencia]=Contactes
Name[cs]=Kontakty
Name[es]=Contactos
Name[et]=Kontaktid
Name[fi]=Yhteystiedot
Name[fr]=Contacts
Name[it]=Contatti
Name[ko]=연락처
Name[lt]=Adresatai
Name[nl]=Contactpersonen
Name[nn]=Kontaktar
Name[pt]=Contactos
Name[pt_BR]=Contatos
Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
Name[x-test]=xxContactsxx
Name[zh_TW]=聯絡人
......@@ -19,13 +27,21 @@ Categories=Qt;KDE;System;
GenericName=Contacts
GenericName[ca]=Contactes
GenericName[ca@valencia]=Contactes
GenericName[cs]=Kontakty
GenericName[es]=Contactos
GenericName[et]=Kontaktid
GenericName[fi]=Yhteystiedot
GenericName[fr]=Contacts
GenericName[it]=Contatti
GenericName[ko]=연락처
GenericName[lt]=Adresatai
GenericName[nl]=Contactpersonen
GenericName[nn]=Kontaktar
GenericName[pt]=Contactos
GenericName[pt_BR]=Contatos
GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
GenericName[sv]=Kontakter
GenericName[uk]=Контакти
GenericName[x-test]=xxContactsxx
GenericName[zh_TW]=聯絡人
......
......@@ -3,13 +3,21 @@ IconName=call-start
Comment=Phone
Comment[ca]=Telèfon
Comment[ca@valencia]=Telèfon
Comment[cs]=Telefon
Comment[es]=Teléfono
Comment[et]=Telefon
Comment[fi]=Puhelin
Comment[fr]=Téléphone
Comment[it]=Telefono
Comment[ko]=전화
Comment[lt]=Telefonas
Comment[nl]=Telefoon
Comment[nn]=Telefon
Comment[pt]=Telefone
Comment[pt_BR]=Telefone
Comment[sk]=Telefón
Comment[sl]=Telefon
Comment[sv]=Telefon
Comment[uk]=Телефон
Comment[x-test]=xxPhonexx
Comment[zh_TW]=手機
......@@ -18,13 +26,21 @@ Comment[zh_TW]=手機
Name=Missed Call
Name[ca]=Trucada perduda
Name[ca@valencia]=Trucada perduda
Name[cs]=Zmeškaný hovor
Name[es]=Llamada perdida
Name[et]=Vastamata kõne
Name[fi]=Vastaamaton puhelu
Name[fr]=Appel manqué
Name[it]=Chiamata persa
Name[ko]=부재 중 전화
Name[lt]=Praleistas skambutis
Name[nl]=Gemiste oproep
Name[nn]=Tapt oppringing
Name[pt]=Chamada Não Atendida
Name[pt_BR]=Chamada não atendida
Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
Name[sv]=Missat samtal
Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx
Name[zh_TW]=未接來電
......@@ -33,10 +49,17 @@ Comment[ca]=S'ha perdut una trucada
Comment[ca@valencia]=S'ha perdut una trucada
Comment[es]=Se ha perdido una llamada
Comment[et]=Vastamata jäänud kõne
Comment[fi]=Vastaamaton puhelu
Comment[fr]=Un appel a été manqué
Comment[it]=Una chiamata è stata persa
Comment[ko]=부재 중 전화가 있음
Comment[lt]=Buvo praleistas skambutis
Comment[nl]=Er is een gemiste oproep
Comment[nn]=Du mista ei oppringing
Comment[pt]=Uma chamada não foi atendida
Comment[pt_BR]=Uma chamada não foi atendida
Comment[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок
Comment[x-test]=xxA call has been missedxx
Comment[zh_TW]=有一通未接來電
......@@ -46,25 +69,41 @@ Action=Popup
Name=Ringing
Name[ca]=Sonant
Name[ca@valencia]=Sonant
Name[cs]=Zvoní
Name[es]=Llamando
Name[et]=Helistamine
Name[fi]=Soi
Name[fr]=Sonnerie en cours
Name[it]=Sta squillando
Name[ko]=전화 오는 중
Name[lt]=Skambina
Name[nl]=Bel gaat over
Name[nn]=Ringjer
Name[pt]=A tocar
Name[pt_BR]=Tocando
Name[sk]=Zvoní
Name[sl]=Zvonjenje
Name[sv]=Ringer
Name[uk]=Дзвінок
Name[x-test]=xxRingingxx
Name[zh_TW]=響鈴
Comment=The phone is ringing
Comment[ca]=El telèfon està sonant
Comment[ca@valencia]=El telèfon està sonant
Comment[cs]=Telefon zvoní
Comment[es]=El teléfono está sonando
Comment[et]=Telefon kutsub
Comment[fi]=Puhelin soi
Comment[fr]=Le téléphone sonne
Comment[it]=Il telefono sta squillando
Comment[ko]=수신 전화가 있음
Comment[lt]=Skambina telefonas
Comment[nl]=De telefoon gaat over
Comment[nn]=Telefonen ringjer
Comment[pt]=O telefone está a tocar
Comment[pt_BR]=O telefone está tocando
Comment[sl]=Telefon zvoni
Comment[sv]=Telefonen ringer
Comment[uk]=Телефон дзвонить
Comment[x-test]=xxThe phone is ringingxx
Comment[zh_TW]=手機正在響鈴
......
#include <QQmlApplicationEngine>
#include <QIcon>
#include <QCommandLineParser>
#include <QQmlContext>
#ifdef Q_OS_ANDROID
#include <QGuiApplication>
......@@ -92,6 +93,7 @@ int main(int argc, char *argv[])
#ifdef STATIC_MAUIKIT
MauiKit::getInstance().registerTypes();
#endif
engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
engine.addImageProvider("contact", new ContactImage(QQuickImageProvider::ImageType::Image));
qmlRegisterType<ContactsModel>(COMMUNICATOR_URI, 1, 0, "ContactsList");
......
import QtQuick 2.9
import QtQuick.Controls 2.3
import org.kde.mauikit 1.0 as Maui
import org.kde.kirigami 2.6 as Kirigami
//import org.mauikit.accounts 1.0 as Accounts
import org.kde.mauikit 1.1 as MauiLab
import org.kde.kirigami 2.8 as Kirigami
import QtQuick.Layouts 1.3
import "views/contacts"
......@@ -24,58 +24,23 @@ Maui.ApplicationWindow
})
/** UI PROPS**/
property color cardColor: Qt.darker(Maui.Style.buttonBackgroundColor, 1.05)
leftIcon.checked: footBar.visible
leftIcon.visible: true
headBar.rightContent: ToolButton
{
id: _dialerButton
icon.name: "dialer-call"
checked: _actionGroup.currentIndex === views.dialer
onClicked: _actionGroup.currentIndex = views.dialer
checked: swipeView.currentIndex === views.dialer
onClicked: swipeView.currentIndex = views.dialer
}
headBar.middleContent: Maui.ActionGroup
{
id: _actionGroup
Layout.fillHeight: true
// Layout.fillWidth: true
Layout.minimumWidth: implicitWidth
currentIndex : swipeView.currentIndex
onCurrentIndexChanged: swipeView.currentIndex = currentIndex
Action
{
id: _favsButton
icon.name: "draw-star"
text: i18n("Favorites")
}
Action
{
id: _logButton
icon.name: "view-media-recent"
text: i18n("Recent")
}
Action
{
icon.name: "view-pim-contacts"
text: i18n("Contacts")
}
}
SwipeView
MauiLab.AppViews
{
id: swipeView
anchors.fill : parent
currentIndex: _actionGroup.currentIndex
interactive: Maui.Handy.isTouch
onCurrentIndexChanged:
{
_actionGroup.currentIndex = currentIndex
if(currentIndex === views.contacts)
_contacsView.list.query = ""
else if(currentIndex === views.dialer)
......@@ -85,6 +50,9 @@ Maui.ApplicationWindow
ContactsView
{
id: _favsView
MauiLab.AppView.iconName: "draw-star"
MauiLab.AppView.title: qsTr("Favorites")
list.query : "fav=1"
headBar.visible: false
gridView: true
......@@ -96,12 +64,15 @@ Maui.ApplicationWindow
LogsView
{
id: _logView
MauiLab.AppView.iconName: "view-media-recent"
MauiLab.AppView.title: qsTr("Recent")
}
ContactsView
{
id: _contacsView
MauiLab.AppView.iconName: "view-pim-contacts"
MauiLab.AppView.title: qsTr("Contacts")
list.query: ""
showAccountFilter: isAndroid
holder.emoji: "qrc:/list-add-user.svg"
......
......@@ -14,11 +14,10 @@ Maui.Dialog
maxHeight: Maui.Style.unit * 800
property var contact : ({})
rejectButton.visible: false
acceptButton.visible: false
page.padding: Maui.Style.space.large
defaultButtons: false
page.margins: Maui.Style.space.large
headBar.visible: true
headBar.middleContent: [
ToolButton
{
......@@ -44,6 +43,7 @@ Maui.Dialog
}
]
footBar.visible: true
footBar.middleContent: [
ToolButton
......
import QtQuick 2.10
import QtQuick.Controls 2.10
import org.kde.mauikit 1.0 as Maui
import UnionModels 1.0
import org.maui.communicator 1.0
Maui.Page
{
......@@ -15,7 +15,7 @@ Maui.Page
property bool gridView : false
property bool showAccountFilter: false
padding: Maui.Style.space.big
margins: Maui.Style.space.big
Maui.BaseModel
{
......@@ -148,7 +148,6 @@ Maui.Page
cellWidth: Maui.Style.unit * 120
cellHeight: Maui.Style.unit * 120
itemSize: Math.min(Maui.Style.unit * 120)
spacing: Maui.Style.space.medium
adaptContent: true
visible: count > 0
......
......@@ -12,7 +12,7 @@ Maui.Dialog
maxWidth: Maui.Style.unit * 700
maxHeight: Maui.Style.unit * 800
page.padding: Maui.Style.space.large
page.margins: Maui.Style.space.large
property var contact : ({})
signal newContact(var contact)
......
import QtQuick 2.9
import QtQuick.Controls 2.3
import org.kde.mauikit 1.0 as Maui
import UnionModels 1.0
import org.maui.communicator 1.0
import "../contacts"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment