diff --git a/tests/assets/images/auto_answer_active.svg b/tests/assets/images/auto_answer.svg similarity index 100% rename from tests/assets/images/auto_answer_active.svg rename to tests/assets/images/auto_answer.svg diff --git a/tests/assets/images/auto_answer_inactive.svg b/tests/assets/images/auto_answer_inactive.svg deleted file mode 100644 index 4751e1c0c..000000000 --- a/tests/assets/images/auto_answer_inactive.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - auto_answer_inactive - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/tests/resources.qrc b/tests/resources.qrc index d59ae408b..bbb1661fc 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -1,7 +1,6 @@ - assets/images/auto_answer_active.svg - assets/images/auto_answer_inactive.svg + assets/images/auto_answer.svg assets/images/call_hovered.svg assets/images/call_normal.svg assets/images/call_pressed.svg diff --git a/tests/src/components/contacts/ContactsListProxyModel.cpp b/tests/src/components/contacts/ContactsListProxyModel.cpp index dea313fbc..9ac52d428 100644 --- a/tests/src/components/contacts/ContactsListProxyModel.cpp +++ b/tests/src/components/contacts/ContactsListProxyModel.cpp @@ -137,6 +137,5 @@ bool ContactsListProxyModel::isConnectedFilterUsed () const { void ContactsListProxyModel::setConnectedFilter (bool useConnectedFilter) { m_use_connected_filter = useConnectedFilter; - qDebug() << useConnectedFilter; invalidate(); } diff --git a/tests/src/logger.cpp b/tests/src/logger.cpp index b5a7275c6..3504441d7 100644 --- a/tests/src/logger.cpp +++ b/tests/src/logger.cpp @@ -3,14 +3,16 @@ #include "logger.hpp" #ifdef __linux__ - #define RED "\x1B[1;31m" - #define GREEN "\x1B[1;32m" #define BLUE "\x1B[1;34m" + #define GREEN "\x1B[1;32m" + #define PURPLE "\x1B[1;35m" + #define RED "\x1B[1;31m" #define RESET "\x1B[0m" #else - #define RED "" - #define GREEN "" #define BLUE "" + #define GREEN "" + #define PURPLE "" + #define RED "" #define RESET "" #endif @@ -21,26 +23,28 @@ void qmlLogger (QtMsgType type, const QMessageLogContext &context, const QString QByteArray date_time = QDateTime::currentDateTime() .toString("HH:mm:ss").toLocal8Bit(); + const char *context_file = context.file ?: "cpp"; + switch (type) { case QtDebugMsg: - fprintf(stderr, GREEN "[%s][Debug]" RESET "%s:%u: %s\n", - date_time.constData(), context.file, context.line, local_msg.constData()); + fprintf(stderr, GREEN "[%s][Debug]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context.line, local_msg.constData()); break; case QtInfoMsg: - fprintf(stderr, BLUE "[%s][Info]" RESET "%s:%u: %s\n", - date_time.constData(), context.file, context.line, local_msg.constData()); + fprintf(stderr, BLUE "[%s][Info]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context.line, local_msg.constData()); break; case QtWarningMsg: - fprintf(stderr, RED "[%s][Warning]" RESET "%s:%u: %s\n", - date_time.constData(), context.file, context.line, local_msg.constData()); + fprintf(stderr, RED "[%s][Warning]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context.line, local_msg.constData()); break; case QtCriticalMsg: - fprintf(stderr, RED "[%s][Critical]" RESET "%s:%u: %s\n", - date_time.constData(), context.file, context.line, local_msg.constData()); + fprintf(stderr, RED "[%s][Critical]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context.line, local_msg.constData()); break; case QtFatalMsg: - fprintf(stderr, RED "[%s][Fatal]" RESET "%s:%u: %s\n", - date_time.constData(), context.file, context.line, local_msg.constData()); + fprintf(stderr, RED "[%s][Fatal]" PURPLE "%s:%u: " RESET "%s\n", + date_time.constData(), context_file, context.line, local_msg.constData()); abort(); } } diff --git a/tests/ui/modules/Common/Colors.qml b/tests/ui/modules/Common/Colors.qml index ddb7be38c..b05e8eef8 100644 --- a/tests/ui/modules/Common/Colors.qml +++ b/tests/ui/modules/Common/Colors.qml @@ -15,9 +15,6 @@ QtObject { property color l: '#000000' // Text color. - property color m: '#D1D1D1' // SmallButton Normal. - property color n: '#C0C0C0' // SmallButton Hovered. - property color o: '#232323' // TextButtonA Hovered. property color p: '#B1B1B1' // TextButtonB text Hovered. @@ -38,6 +35,8 @@ QtObject { property color j75: '#BF4B5964' property color k: '#FFFFFF' property color k50: '#32FFFFFF' + property color m: '#D1D1D1' + property color n: '#C0C0C0' property color r: '#595759' property color s: '#D64D00' property color t: '#FF8600' diff --git a/tests/ui/modules/Common/Form/TextField.qml b/tests/ui/modules/Common/Form/TextField.qml index 5620266a4..2882baa16 100644 --- a/tests/ui/modules/Common/Form/TextField.qml +++ b/tests/ui/modules/Common/Form/TextField.qml @@ -7,7 +7,7 @@ import Common.Styles 1.0 // =================================================================== Controls.TextField { - property string icon + property alias icon: icon.icon background: Rectangle { border { diff --git a/tests/ui/views/App/MainWindow/MainWindow.qml b/tests/ui/views/App/MainWindow/MainWindow.qml index 76af5009e..729822396 100644 --- a/tests/ui/views/App/MainWindow/MainWindow.qml +++ b/tests/ui/views/App/MainWindow/MainWindow.qml @@ -64,8 +64,8 @@ ApplicationWindow { Icon { icon: AccountSettingsModel.autoAnswerStatus - ? 'auto_answer_active' - : 'auto_answer_inactive' + ? 'auto_answer' + : '' iconSize: MainWindowStyle.autoAnswerStatus.iconSize } @@ -76,9 +76,7 @@ ApplicationWindow { } text: qsTr('autoAnswerStatus') width: parent.width - color: AccountSettingsModel.autoAnswerStatus - ? MainWindowStyle.autoAnswerStatus.text.color.enabled - : MainWindowStyle.autoAnswerStatus.text.color.disabled + color: MainWindowStyle.autoAnswerStatus.text.color } } diff --git a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml index 5b15f61b8..632ee5053 100644 --- a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml @@ -19,9 +19,9 @@ QtObject { property QtObject contact: QtObject { property int actionButtonsSize: 36 property int avatarSize: 30 - property int deleteButtonSize: 16 + property int deleteButtonSize: 18 property int height: 50 - property int leftMargin: 15 + property int leftMargin: 40 property int presenceLevelSize: 12 property int rightMargin: 25 property int spacing: 15 diff --git a/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml b/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml index e952d33a3..f049e81a8 100644 --- a/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml @@ -20,11 +20,7 @@ QtObject { property QtObject text: QtObject { property int fontSize: 8 - - property QtObject color: QtObject { - property color enabled: Colors.i - property color disabled: Colors.c - } + property color color: Colors.j75 } }