Commit 3ffb25a4 authored by Ronan's avatar Ronan
Browse files

fix(app): many different fixes

parent fa2f547e
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>auto_answer_inactive</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="auto_answer_inactive" stroke="#CBCBCB">
<path d="M0.797365543,2.49263511 C-0.109836641,5.04855335 1.161449,8.70129794 3.21892643,10.7501941 L3.26206927,10.7928576 C5.31909573,12.8413047 8.98804084,14.1072881 11.5537619,13.2038696 L13.5,10.6632204 L10.8490455,8.02362183 L8.42387683,10.0659313 L6.20750748,7.85910537 L6.16496594,7.81644186 L3.94889724,5.60961588 L5.99930947,3.19366387 L3.34940721,0.554364667 L0.797365543,2.49263511 L0.797365543,2.49263511 Z"></path>
</g>
</g>
</svg>
\ No newline at end of file
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/">
<file>assets/images/auto_answer_active.svg</file>
<file>assets/images/auto_answer_inactive.svg</file>
<file>assets/images/auto_answer.svg</file>
<file>assets/images/call_hovered.svg</file>
<file>assets/images/call_normal.svg</file>
<file>assets/images/call_pressed.svg</file>
......
......@@ -137,6 +137,5 @@ bool ContactsListProxyModel::isConnectedFilterUsed () const {
void ContactsListProxyModel::setConnectedFilter (bool useConnectedFilter) {
m_use_connected_filter = useConnectedFilter;
qDebug() << useConnectedFilter;
invalidate();
}
......@@ -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();
}
}
......@@ -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'
......
......@@ -7,7 +7,7 @@ import Common.Styles 1.0
// ===================================================================
Controls.TextField {
property string icon
property alias icon: icon.icon
background: Rectangle {
border {
......
......@@ -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
}
}
......
......@@ -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
......
......@@ -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
}
}
......
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