Commit 3c80716a authored by camilo higuita's avatar camilo higuita

working againsts development again

parent 05fbb65c
......@@ -77,7 +77,7 @@ if (TARGET create-apk-dialer)
set_target_properties(create-apk-dialer PROPERTIES ANDROID_APK_DIR "${MAUIKIT_ANDROID_DIR}")
endif()
target_link_libraries(${PROJECT_NAME} MauiKit Qt5::Sql Qt5::Qml Qt5::Widgets Qt5::Svg Qt5::Concurrent)
target_link_libraries(${PROJECT_NAME} MauiKit Qt5::Sql Qt5::Qml Qt5::Widgets Qt5::Svg Qt5::Concurrent Qt5::Quick)
install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.dialer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
......
......@@ -103,7 +103,6 @@ void LinuxInterface::getContacts()
{FMH::MODEL_KEY::TEL, person.contactCustomProperty("phoneNumber").toString()},
// {FMH::MODEL_KEY::PHOTO, person.pictureUrl().toString()}
};
this->m_contacts << contact.unite(vCardData(QString(uri).replace("vcard:/", "")));
}
......
......@@ -2,7 +2,6 @@
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickStyle>
#include <QIcon>
#include <QCommandLineParser>
#include <QFileInfo>
......@@ -65,7 +64,6 @@ int main(int argc, char *argv[])
{
QQmlApplicationEngine engine;
// QQuickStyle::setStyle("Material");
#ifdef STATIC_KIRIGAMI
KirigamiPlugin::getInstance().registerTypes();
......
......@@ -154,7 +154,7 @@ QVariantMap CallLogs::get(const int &index) const
const auto item = this->list.at(index);
res = FM::toMap(item);
res = FMH::toMap(item);
return res;
}
......
......@@ -145,7 +145,7 @@ QVariantMap ContactsModel::get(const int &index) const
const auto item = this->list.at(index);
res = FM::toMap(item);
res = FMH::toMap(item);
#ifdef Q_OS_ANDROID
const auto id = this->list.at(index)[FMH::MODEL_KEY::ID];
......@@ -162,7 +162,7 @@ bool ContactsModel::insert(const QVariantMap &map)
if(map.isEmpty())
return false;
const auto model = FM::toModel(map);
const auto model = FMH::toModel(map);
if(!this->syncer->insertContact(model))
return false;
......@@ -182,7 +182,7 @@ bool ContactsModel::update(const QVariantMap &map, const int &index)
if(index >= this->list.size() || index < 0)
return false;
const auto newItem = FM::toModel(map);
const auto newItem = FMH::toModel(map);
const auto oldItem = this->list[index];
auto updatedItem = FMH::MODEL();
......@@ -340,6 +340,6 @@ QVariantList ContactsModel::getAccounts()
// for(const auto &account : syncer->getAccounts())
// res << FM::toMap(account);
std::transform(accounts.begin(), accounts.end(), res.begin(), FM::toMap);
std::transform(accounts.begin(), accounts.end(), res.begin(), FMH::toMap);
return res;
}
......@@ -66,7 +66,7 @@ SwipeDelegate
id: _layout
anchors.fill: parent
anchors.margins: space.small
anchors.margins: Maui.Style.space.small
Item
{
......@@ -259,7 +259,7 @@ SwipeDelegate
Layout.fillHeight: true
Layout.preferredWidth: Maui.Style.iconSizes.big
Layout.alignment: Qt.AlignRight
Layout.margins: space.big
Layout.margins: Maui.Style.space.big
Row
{
......
......@@ -100,7 +100,7 @@ Maui.Dialog
icon.name: "document-edit"
text: qsTr("Edit")
onTriggered: _editContactDialog.open()
icon.color: suggestedColor
icon.color: Kirigami.Theme.positiveTextColor
}
]
......@@ -109,7 +109,7 @@ Maui.Dialog
{
text: qsTr("Delete...")
icon.name: "user-trash"
Kirigami.Theme.textColor: warningColor
Kirigami.Theme.textColor: Kirigami.Theme.negativeTextColor
onTriggered: _removeDialog.open()
}
]
......@@ -150,13 +150,12 @@ Maui.Dialog
_editContactDialog.close()
}
headBar.drawBorder: false
headBar.rightContent: Button
{
icon.name: "user-trash"
// text: qsTr("Remove")
onClicked: _removeDialog.open()
Kirigami.Theme.backgroundColor: dangerColor
Kirigami.Theme.backgroundColor: Kirigami.Theme.negativeTextColor
Kirigami.Theme.textColor: "#fff"
}
}
......@@ -180,7 +179,7 @@ Maui.Dialog
height: Math.min(parent.height, control.width)
width: height
anchors.centerIn: parent
radius: radiusV* 2
radius: Maui.Style.radiusV* 2
color: Qt.rgba(Math.random(),Math.random(),Math.random(),1);
border.color: Qt.darker(color, 1.5)
......
......@@ -110,7 +110,7 @@ Maui.Page
{
label: section.toUpperCase()
isSection: true
boldLabel: true
width: parent.width
// colorScheme.backgroundColor: "#333"
// colorScheme.textColor: "#fafafa"
// width: iconSize
......
......@@ -10,8 +10,8 @@ Maui.Dialog
{
id: control
maxWidth: unit * 700
maxHeight: unit * 800
maxWidth: Maui.Style.unit * 700
maxHeight: Maui.Style.unit * 800
// heightHint: 1
// widthHint: 1
......
......@@ -16,7 +16,7 @@ ItemDelegate
background: Rectangle
{
radius: radiusV
radius: Maui.Style.radiusV
color:
{
var c = Qt.rgba(Math.random(),Math.random(),Math.random(),1)
......@@ -80,7 +80,7 @@ ItemDelegate
anchors.centerIn: parent
width: _img.width
height: _img.height
radius: radiusV
radius: Maui.Style.radiusV
}
}
}
......@@ -106,7 +106,7 @@ ItemDelegate
verticalAlignment: Qt.AlignVCenter
color: "#fff"
font.pointSize: fontSizes.enormous * 3
font.pointSize: Maui.Style.fontSizes.enormous * 3
font.bold: true
font.weight: Font.Bold
text: model.n[0].toUpperCase()
......@@ -123,7 +123,7 @@ ItemDelegate
{
top: parent.top
right: parent.right
margins: space.medium
margins: Maui.Style.space.medium
}
icon.color: "#fff"
......@@ -141,12 +141,12 @@ ItemDelegate
anchors.bottom: parent.bottom
clip: true
color: Qt.rgba(0,0,0, 0.3)
radius: radiusV
radius: Maui.Style.radiusV
ColumnLayout
{
anchors.fill: parent
anchors.margins: space.medium
anchors.margins: Maui.Style.space.medium
Label
{
......@@ -156,7 +156,7 @@ ItemDelegate
Layout.alignment: Qt.AlignVCenter
text: model.n
font.pointSize: fontSizes.big
font.pointSize: Maui.Style.fontSizes.big
font.bold: true
font.weight: Font.Bold
elide: Text.ElideMiddle
......@@ -170,7 +170,7 @@ ItemDelegate
Layout.fillWidth: visible
Layout.alignment: Qt.AlignVCenter
text: model.tel
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
font.weight: Font.Light
wrapMode: Text.WrapAnywhere
elide: Text.ElideMiddle
......@@ -185,7 +185,7 @@ ItemDelegate
Layout.alignment: Qt.AlignVCenter
text: model.email
font.pointSize: fontSizes.small
font.pointSize: Maui.Style.fontSizes.small
font.weight: Font.Light
wrapMode: Text.WrapAnywhere
elide: Text.ElideMiddle
......
......@@ -13,7 +13,7 @@ GridLayout
rowSpacing: buttonSize * 0.1
columnSpacing: buttonSize * 0.1
// spacing: space.medium
readonly property int buttonFontSize: fontSizes.huge * 1.5
readonly property int buttonFontSize: Maui.Style.fontSizes.huge * 1.5
property var model : ["1", "2", "3", "4", "5", "6", "7", "8", "9", "*", "0", "#"]
Repeater
......
......@@ -10,7 +10,7 @@ Maui.Page
id: control
property alias dialString : _textField.text
property int buttonSize : Math.min(iconSizes.big * 1.5 , Math.min(_dialerPad.width, _dialerPad.height) * 0.2)
property int buttonSize : Math.min(Maui.Style.iconSizes.big * 1.5 , Math.min(_dialerPad.width, _dialerPad.height) * 0.2)
onDialStringChanged:
{
// Qt.inputMethod.hide();
......@@ -40,8 +40,8 @@ Maui.Page
readOnly: true
font.bold: true
font.weight: Font.Bold
font.pointSize: fontSizes.huge
font.letterSpacing: space.tiny
font.pointSize: Maui.Style.fontSizes.huge
font.letterSpacing: Maui.Style.space.tiny
horizontalAlignment: TextInput.AlignHCenter
background: Rectangle
{
......@@ -56,8 +56,8 @@ Maui.Page
color: "transparent"
}
footBar.implicitHeight: iconSizes.big * 3
footBar.spacing: space.huge
footBar.implicitHeight: Maui.Style.iconSizes.big * 3
footBar.spacing: Maui.Style.space.huge
footBar.clip: true
footBar.flickable: false
footBar.middleContent: [
......@@ -77,9 +77,9 @@ Maui.Page
{
id: _callButton
icon.name: "call-start"
icon.width: iconSizes.big
icon.height: iconSizes.big
height: iconSizes.big * 1.5
icon.width: Maui.Style.iconSizes.big
icon.height: Maui.Style.iconSizes.big
height: Maui.Style.iconSizes.big * 1.5
width: height
// bg.radius: Math.max(width, height)
Kirigami.Theme.textColor: Kirigami.Theme.highlightColor
......@@ -108,15 +108,15 @@ Maui.Page
ColumnLayout
{
id: _layout
width: Math.min(isWide ? control.width * 0.8 : control.width * 0.95, unit * 500)
width: Math.min(isWide ? control.width * 0.8 : control.width * 0.95, Maui.Style.unit * 500)
height: parent.height
anchors.centerIn: parent
spacing: space.big
spacing: Maui.Style.space.big
ListView
{
id: _suggestionListView
spacing: space.big
spacing: Maui.Style.space.big
clip: true
visible: dialString.length && count
Layout.fillWidth: visible
......@@ -130,7 +130,7 @@ Maui.Page
{
id: _delegate
height: unit * 60
height: Maui.Style.unit * 60
width: _layout.width
anchors.horizontalCenter: parent.horizontalCenter
......@@ -162,8 +162,8 @@ Maui.Page
id: _dialerPad
Layout.fillHeight: true
Layout.fillWidth: true
Layout.minimumHeight: unit*100
Layout.maximumHeight: unit*300
Layout.minimumHeight: Maui.Style.unit*100
Layout.maximumHeight: Maui.Style.unit*300
// Layout.alignment: Qt.AlignBottom
// visible: true
......
......@@ -22,7 +22,7 @@ Maui.Page
isMask: false
title: qsTr("There's no recent contacts")
body: qsTr("recently contacted contacts will appear here")
emojiSize: iconSizes.huge
emojiSize: Maui.Style.iconSizes.huge
visible: !_listView.count
onActionTriggered: _newContactDialog.open()
}
......@@ -69,7 +69,7 @@ Maui.Page
id: _listView
anchors.fill: parent
spacing: space.big
spacing: Maui.Style.space.big
clip: true
section.property: "modified"
......@@ -79,7 +79,7 @@ Maui.Page
{
label: section
isSection: true
boldLabel: true
width: parent.width
// colorScheme.backgroundColor: "#333"
// colorScheme.textColor: "#fafafa"
// width: iconSize
......@@ -87,7 +87,7 @@ Maui.Page
// background: Rectangle
// {
// color: colorScheme.backgroundColor
// radius: radiusV
// radius: Maui.Style.radiusV
// }
......@@ -103,7 +103,7 @@ Maui.Page
label2.text: Maui.FM.formatDate(model.date, "HH:mm", "dd-MM-yyyy HH:mm") + " / " + new Date(model.duration * 1000).toISOString().substr(11, 8);
label3.text: model.type
height: unit * 60
height: Maui.Style.unit * 60
width: isWide ? control.width * 0.8 : control.width * 0.95
anchors.horizontalCenter: parent.horizontalCenter
showMenuIcon: false
......
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