diff --git a/tests/assets/languages/CMakeLists.txt b/tests/assets/languages/CMakeLists.txt index 8fab0f526..9f02f752e 100644 --- a/tests/assets/languages/CMakeLists.txt +++ b/tests/assets/languages/CMakeLists.txt @@ -1,5 +1,5 @@ # ==================================================================== -# languages/CMakeLists.txt +# assets/languages/CMakeLists.txt # ==================================================================== # This line prevent `.ts` files deletion. diff --git a/tests/assets/languages/en.ts b/tests/assets/languages/en.ts index d605ebc9c..d17056cd9 100644 --- a/tests/assets/languages/en.ts +++ b/tests/assets/languages/en.ts @@ -216,6 +216,10 @@ contactsEntry Contacts + + autoAnswerStatus + auto + ManageAccounts diff --git a/tests/assets/languages/fr.ts b/tests/assets/languages/fr.ts index e251cf9f4..538c977f4 100644 --- a/tests/assets/languages/fr.ts +++ b/tests/assets/languages/fr.ts @@ -216,6 +216,10 @@ contactsEntry Contacts + + autoAnswerStatus + auto + ManageAccounts diff --git a/tests/src/components/settings/AccountSettingsModel.cpp b/tests/src/components/settings/AccountSettingsModel.cpp index e35e76072..650b96ea2 100644 --- a/tests/src/components/settings/AccountSettingsModel.cpp +++ b/tests/src/components/settings/AccountSettingsModel.cpp @@ -26,3 +26,7 @@ Presence::PresenceStatus AccountSettingsModel::getPresenceStatus () const { QString AccountSettingsModel::getSipAddress () const { return QString("e.miller@sip-linphone.org"); } + +bool AccountSettingsModel::getAutoAnswerStatus () const { + return true; +} diff --git a/tests/src/components/settings/AccountSettingsModel.hpp b/tests/src/components/settings/AccountSettingsModel.hpp index ffd4925c0..5b2f23edc 100644 --- a/tests/src/components/settings/AccountSettingsModel.hpp +++ b/tests/src/components/settings/AccountSettingsModel.hpp @@ -34,6 +34,12 @@ class AccountSettingsModel : public QObject { CONSTANT ); + Q_PROPERTY( + bool autoAnswerStatus + READ getAutoAnswerStatus + CONSTANT + ); + public: AccountSettingsModel (QObject *parent = Q_NULLPTR); @@ -45,6 +51,8 @@ private: Presence::PresenceStatus getPresenceStatus () const; QString getSipAddress () const; + + bool getAutoAnswerStatus () const; }; #endif // ACCOUNT_SETTINGS_MODEL_H_ diff --git a/tests/ui/modules/Common/Colors.qml b/tests/ui/modules/Common/Colors.qml index 175c9822d..7593d2968 100644 --- a/tests/ui/modules/Common/Colors.qml +++ b/tests/ui/modules/Common/Colors.qml @@ -31,14 +31,16 @@ QtObject { // OK. // ----------------------------------------------------------------- - property color g: '#6B7A86' - property color g10: '#1A6b7a86' - property color g20: '#336b7a86' - property color h: '#687680' - property color i: '#FE5E00' - property color j: '#4B5964' + property color c: '#CBCBCB' + property color g: '#6B7A86' + property color g10: '#1A6B7A86' + property color g20: '#336B7A86' + property color h: '#687680' + property color i: '#FE5E00' + property color j: '#4B5964' property color j75: '#BF4B5964' - property color k: '#FFFFFF' + property color k: '#FFFFFF' property color k50: '#32FFFFFF' - property color u: '#B1B1B1' + property color u: '#B1B1B1' + property color v: '#E2E2E2' } diff --git a/tests/ui/views/App/MainWindow/MainWindow.qml b/tests/ui/views/App/MainWindow/MainWindow.qml index 6e7c7282b..7f03b25c8 100644 --- a/tests/ui/views/App/MainWindow/MainWindow.qml +++ b/tests/ui/views/App/MainWindow/MainWindow.qml @@ -57,6 +57,29 @@ ApplicationWindow { Layout.preferredWidth: MainWindowStyle.accountStatus.width } + Column { + width: MainWindowStyle.autoAnswerStatus.width + + Icon { + icon: AccountSettingsModel.autoAnswerStatus + ? 'auto_answer_active' + : 'auto_answer_inactive' + iconSize: MainWindowStyle.autoAnswerStatus.iconSize + } + + Text { + clip: true + font { + pointSize: MainWindowStyle.autoAnswerStatus.text.fontSize + } + text: qsTr('autoAnswerStatus') + width: parent.width + color: AccountSettingsModel.autoAnswerStatus + ? MainWindowStyle.autoAnswerStatus.text.color.enabled + : MainWindowStyle.autoAnswerStatus.text.color.disabled + } + } + SearchBox { id: searchBox @@ -127,7 +150,7 @@ ApplicationWindow { Timeline { Layout.fillHeight: true Layout.fillWidth: true - model: ContactsListModel {} + model: ContactsListModel {} // Use History list. } } diff --git a/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml b/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml index 089708b23..e952d33a3 100644 --- a/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml @@ -1,6 +1,8 @@ pragma Singleton import QtQuick 2.7 +import Common 1.0 + // =================================================================== QtObject { @@ -12,6 +14,20 @@ QtObject { property int width: 200 } + property QtObject autoAnswerStatus: QtObject { + property int iconSize: 13 + property int width: 24 + + property QtObject text: QtObject { + property int fontSize: 8 + + property QtObject color: QtObject { + property color enabled: Colors.i + property color disabled: Colors.c + } + } + } + property QtObject menu: QtObject { property int entryHeight: 50 property int width: 250 @@ -29,7 +45,7 @@ QtObject { property int spacing: 20 property var background: Rectangle { - color: '#E2E2E2' + color: Colors.v } } }