Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
3ffb25a4
Commit
3ffb25a4
authored
Nov 02, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): many different fixes
parent
fa2f547e
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
45 deletions
+28
-45
auto_answer.svg
tests/assets/images/auto_answer.svg
+0
-0
auto_answer_inactive.svg
tests/assets/images/auto_answer_inactive.svg
+0
-12
resources.qrc
tests/resources.qrc
+1
-2
ContactsListProxyModel.cpp
tests/src/components/contacts/ContactsListProxyModel.cpp
+0
-1
logger.cpp
tests/src/logger.cpp
+18
-14
Colors.qml
tests/ui/modules/Common/Colors.qml
+2
-3
TextField.qml
tests/ui/modules/Common/Form/TextField.qml
+1
-1
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+3
-5
ContactsStyle.qml
tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml
+2
-2
MainWindowStyle.qml
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
+1
-5
No files found.
tests/assets/images/auto_answer
_active
.svg
→
tests/assets/images/auto_answer.svg
View file @
3ffb25a4
File moved
tests/assets/images/auto_answer_inactive.svg
deleted
100644 → 0
View file @
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
tests/resources.qrc
View file @
3ffb25a4
<!DOCTYPE RCC>
<RCC
version=
"1.0"
>
<!DOCTYPE RCC>
<RCC
version=
"1.0"
>
<qresource
prefix=
"/"
>
<qresource
prefix=
"/"
>
<file>
assets/images/auto_answer_active.svg
</file>
<file>
assets/images/auto_answer.svg
</file>
<file>
assets/images/auto_answer_inactive.svg
</file>
<file>
assets/images/call_hovered.svg
</file>
<file>
assets/images/call_hovered.svg
</file>
<file>
assets/images/call_normal.svg
</file>
<file>
assets/images/call_normal.svg
</file>
<file>
assets/images/call_pressed.svg
</file>
<file>
assets/images/call_pressed.svg
</file>
...
...
tests/src/components/contacts/ContactsListProxyModel.cpp
View file @
3ffb25a4
...
@@ -137,6 +137,5 @@ bool ContactsListProxyModel::isConnectedFilterUsed () const {
...
@@ -137,6 +137,5 @@ bool ContactsListProxyModel::isConnectedFilterUsed () const {
void
ContactsListProxyModel
::
setConnectedFilter
(
bool
useConnectedFilter
)
{
void
ContactsListProxyModel
::
setConnectedFilter
(
bool
useConnectedFilter
)
{
m_use_connected_filter
=
useConnectedFilter
;
m_use_connected_filter
=
useConnectedFilter
;
qDebug
()
<<
useConnectedFilter
;
invalidate
();
invalidate
();
}
}
tests/src/logger.cpp
View file @
3ffb25a4
...
@@ -3,14 +3,16 @@
...
@@ -3,14 +3,16 @@
#include "logger.hpp"
#include "logger.hpp"
#ifdef __linux__
#ifdef __linux__
#define RED "\x1B[1;31m"
#define GREEN "\x1B[1;32m"
#define BLUE "\x1B[1;34m"
#define BLUE "\x1B[1;34m"
#define GREEN "\x1B[1;32m"
#define PURPLE "\x1B[1;35m"
#define RED "\x1B[1;31m"
#define RESET "\x1B[0m"
#define RESET "\x1B[0m"
#else
#else
#define RED ""
#define GREEN ""
#define BLUE ""
#define BLUE ""
#define GREEN ""
#define PURPLE ""
#define RED ""
#define RESET ""
#define RESET ""
#endif
#endif
...
@@ -21,26 +23,28 @@ void qmlLogger (QtMsgType type, const QMessageLogContext &context, const QString
...
@@ -21,26 +23,28 @@ void qmlLogger (QtMsgType type, const QMessageLogContext &context, const QString
QByteArray
date_time
=
QDateTime
::
currentDateTime
()
QByteArray
date_time
=
QDateTime
::
currentDateTime
()
.
toString
(
"HH:mm:ss"
).
toLocal8Bit
();
.
toString
(
"HH:mm:ss"
).
toLocal8Bit
();
const
char
*
context_file
=
context
.
file
?:
"cpp"
;
switch
(
type
)
{
switch
(
type
)
{
case
QtDebugMsg
:
case
QtDebugMsg
:
fprintf
(
stderr
,
GREEN
"[%s][Debug]"
RESET
"%s:%u:
%s
\n
"
,
fprintf
(
stderr
,
GREEN
"[%s][Debug]"
PURPLE
"%s:%u: "
RESET
"
%s
\n
"
,
date_time
.
constData
(),
context
.
file
,
context
.
line
,
local_msg
.
constData
());
date_time
.
constData
(),
context
_
file
,
context
.
line
,
local_msg
.
constData
());
break
;
break
;
case
QtInfoMsg
:
case
QtInfoMsg
:
fprintf
(
stderr
,
BLUE
"[%s][Info]"
RESET
"%s:%u:
%s
\n
"
,
fprintf
(
stderr
,
BLUE
"[%s][Info]"
PURPLE
"%s:%u: "
RESET
"
%s
\n
"
,
date_time
.
constData
(),
context
.
file
,
context
.
line
,
local_msg
.
constData
());
date_time
.
constData
(),
context
_
file
,
context
.
line
,
local_msg
.
constData
());
break
;
break
;
case
QtWarningMsg
:
case
QtWarningMsg
:
fprintf
(
stderr
,
RED
"[%s][Warning]"
RESET
"%s:%u:
%s
\n
"
,
fprintf
(
stderr
,
RED
"[%s][Warning]"
PURPLE
"%s:%u: "
RESET
"
%s
\n
"
,
date_time
.
constData
(),
context
.
file
,
context
.
line
,
local_msg
.
constData
());
date_time
.
constData
(),
context
_
file
,
context
.
line
,
local_msg
.
constData
());
break
;
break
;
case
QtCriticalMsg
:
case
QtCriticalMsg
:
fprintf
(
stderr
,
RED
"[%s][Critical]"
RESET
"%s:%u:
%s
\n
"
,
fprintf
(
stderr
,
RED
"[%s][Critical]"
PURPLE
"%s:%u: "
RESET
"
%s
\n
"
,
date_time
.
constData
(),
context
.
file
,
context
.
line
,
local_msg
.
constData
());
date_time
.
constData
(),
context
_
file
,
context
.
line
,
local_msg
.
constData
());
break
;
break
;
case
QtFatalMsg
:
case
QtFatalMsg
:
fprintf
(
stderr
,
RED
"[%s][Fatal]"
RESET
"%s:%u:
%s
\n
"
,
fprintf
(
stderr
,
RED
"[%s][Fatal]"
PURPLE
"%s:%u: "
RESET
"
%s
\n
"
,
date_time
.
constData
(),
context
.
file
,
context
.
line
,
local_msg
.
constData
());
date_time
.
constData
(),
context
_
file
,
context
.
line
,
local_msg
.
constData
());
abort
();
abort
();
}
}
}
}
tests/ui/modules/Common/Colors.qml
View file @
3ffb25a4
...
@@ -15,9 +15,6 @@ QtObject {
...
@@ -15,9 +15,6 @@ QtObject {
property
color
l
:
'
#000000
'
// Text color.
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
o
:
'
#232323
'
// TextButtonA Hovered.
property
color
p
:
'
#B1B1B1
'
// TextButtonB text Hovered.
property
color
p
:
'
#B1B1B1
'
// TextButtonB text Hovered.
...
@@ -38,6 +35,8 @@ QtObject {
...
@@ -38,6 +35,8 @@ QtObject {
property
color
j75
:
'
#BF4B5964
'
property
color
j75
:
'
#BF4B5964
'
property
color
k
:
'
#FFFFFF
'
property
color
k
:
'
#FFFFFF
'
property
color
k50
:
'
#32FFFFFF
'
property
color
k50
:
'
#32FFFFFF
'
property
color
m
:
'
#D1D1D1
'
property
color
n
:
'
#C0C0C0
'
property
color
r
:
'
#595759
'
property
color
r
:
'
#595759
'
property
color
s
:
'
#D64D00
'
property
color
s
:
'
#D64D00
'
property
color
t
:
'
#FF8600
'
property
color
t
:
'
#FF8600
'
...
...
tests/ui/modules/Common/Form/TextField.qml
View file @
3ffb25a4
...
@@ -7,7 +7,7 @@ import Common.Styles 1.0
...
@@ -7,7 +7,7 @@ import Common.Styles 1.0
// ===================================================================
// ===================================================================
Controls.TextField
{
Controls.TextField
{
property
string
icon
property
alias
icon
:
icon
.
icon
background
:
Rectangle
{
background
:
Rectangle
{
border
{
border
{
...
...
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
3ffb25a4
...
@@ -64,8 +64,8 @@ ApplicationWindow {
...
@@ -64,8 +64,8 @@ ApplicationWindow {
Icon
{
Icon
{
icon
:
AccountSettingsModel
.
autoAnswerStatus
icon
:
AccountSettingsModel
.
autoAnswerStatus
?
'
auto_answer
_active
'
?
'
auto_answer
'
:
'
auto_answer_inactive
'
:
''
iconSize
:
MainWindowStyle
.
autoAnswerStatus
.
iconSize
iconSize
:
MainWindowStyle
.
autoAnswerStatus
.
iconSize
}
}
...
@@ -76,9 +76,7 @@ ApplicationWindow {
...
@@ -76,9 +76,7 @@ ApplicationWindow {
}
}
text
:
qsTr
(
'
autoAnswerStatus
'
)
text
:
qsTr
(
'
autoAnswerStatus
'
)
width
:
parent
.
width
width
:
parent
.
width
color
:
AccountSettingsModel
.
autoAnswerStatus
color
:
MainWindowStyle
.
autoAnswerStatus
.
text
.
color
?
MainWindowStyle
.
autoAnswerStatus
.
text
.
color
.
enabled
:
MainWindowStyle
.
autoAnswerStatus
.
text
.
color
.
disabled
}
}
}
}
...
...
tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml
View file @
3ffb25a4
...
@@ -19,9 +19,9 @@ QtObject {
...
@@ -19,9 +19,9 @@ QtObject {
property
QtObject
contact
:
QtObject
{
property
QtObject
contact
:
QtObject
{
property
int
actionButtonsSize
:
36
property
int
actionButtonsSize
:
36
property
int
avatarSize
:
30
property
int
avatarSize
:
30
property
int
deleteButtonSize
:
1
6
property
int
deleteButtonSize
:
1
8
property
int
height
:
50
property
int
height
:
50
property
int
leftMargin
:
15
property
int
leftMargin
:
40
property
int
presenceLevelSize
:
12
property
int
presenceLevelSize
:
12
property
int
rightMargin
:
25
property
int
rightMargin
:
25
property
int
spacing
:
15
property
int
spacing
:
15
...
...
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
View file @
3ffb25a4
...
@@ -20,11 +20,7 @@ QtObject {
...
@@ -20,11 +20,7 @@ QtObject {
property
QtObject
text
:
QtObject
{
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
8
property
int
fontSize
:
8
property
color
color
:
Colors
.
j75
property
QtObject
color
:
QtObject
{
property
color
enabled
:
Colors
.
i
property
color
disabled
:
Colors
.
c
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment