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
21cb2767
Commit
21cb2767
authored
Oct 31, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(MainWindow): supports account status
parent
c0bb3fcb
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
72 additions
and
11 deletions
+72
-11
CMakeLists.txt
tests/assets/languages/CMakeLists.txt
+1
-1
en.ts
tests/assets/languages/en.ts
+4
-0
fr.ts
tests/assets/languages/fr.ts
+4
-0
AccountSettingsModel.cpp
tests/src/components/settings/AccountSettingsModel.cpp
+4
-0
AccountSettingsModel.hpp
tests/src/components/settings/AccountSettingsModel.hpp
+8
-0
Colors.qml
tests/ui/modules/Common/Colors.qml
+10
-8
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+24
-1
MainWindowStyle.qml
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
+17
-1
No files found.
tests/assets/languages/CMakeLists.txt
View file @
21cb2767
# ====================================================================
# ====================================================================
# languages/CMakeLists.txt
#
assets/
languages/CMakeLists.txt
# ====================================================================
# ====================================================================
# This line prevent `.ts` files deletion.
# This line prevent `.ts` files deletion.
...
...
tests/assets/languages/en.ts
View file @
21cb2767
...
@@ -216,6 +216,10 @@
...
@@ -216,6 +216,10 @@
<
source
>
contactsEntry
<
/source
>
<
source
>
contactsEntry
<
/source
>
<
translation
>
Contacts
<
/translation
>
<
translation
>
Contacts
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
autoAnswerStatus
<
/source
>
<
translation
>
auto
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
ManageAccounts
<
/name
>
<
name
>
ManageAccounts
<
/name
>
...
...
tests/assets/languages/fr.ts
View file @
21cb2767
...
@@ -216,6 +216,10 @@
...
@@ -216,6 +216,10 @@
<
source
>
contactsEntry
<
/source
>
<
source
>
contactsEntry
<
/source
>
<
translation
>
Contacts
<
/translation
>
<
translation
>
Contacts
<
/translation
>
<
/message
>
<
/message
>
<
message
>
<
source
>
autoAnswerStatus
<
/source
>
<
translation
>
auto
<
/translation
>
<
/message
>
<
/context
>
<
/context
>
<
context
>
<
context
>
<
name
>
ManageAccounts
<
/name
>
<
name
>
ManageAccounts
<
/name
>
...
...
tests/src/components/settings/AccountSettingsModel.cpp
View file @
21cb2767
...
@@ -26,3 +26,7 @@ Presence::PresenceStatus AccountSettingsModel::getPresenceStatus () const {
...
@@ -26,3 +26,7 @@ Presence::PresenceStatus AccountSettingsModel::getPresenceStatus () const {
QString
AccountSettingsModel
::
getSipAddress
()
const
{
QString
AccountSettingsModel
::
getSipAddress
()
const
{
return
QString
(
"e.miller@sip-linphone.org"
);
return
QString
(
"e.miller@sip-linphone.org"
);
}
}
bool
AccountSettingsModel
::
getAutoAnswerStatus
()
const
{
return
true
;
}
tests/src/components/settings/AccountSettingsModel.hpp
View file @
21cb2767
...
@@ -34,6 +34,12 @@ class AccountSettingsModel : public QObject {
...
@@ -34,6 +34,12 @@ class AccountSettingsModel : public QObject {
CONSTANT
CONSTANT
);
);
Q_PROPERTY
(
bool
autoAnswerStatus
READ
getAutoAnswerStatus
CONSTANT
);
public:
public:
AccountSettingsModel
(
QObject
*
parent
=
Q_NULLPTR
);
AccountSettingsModel
(
QObject
*
parent
=
Q_NULLPTR
);
...
@@ -45,6 +51,8 @@ private:
...
@@ -45,6 +51,8 @@ private:
Presence
::
PresenceStatus
getPresenceStatus
()
const
;
Presence
::
PresenceStatus
getPresenceStatus
()
const
;
QString
getSipAddress
()
const
;
QString
getSipAddress
()
const
;
bool
getAutoAnswerStatus
()
const
;
};
};
#endif // ACCOUNT_SETTINGS_MODEL_H_
#endif // ACCOUNT_SETTINGS_MODEL_H_
tests/ui/modules/Common/Colors.qml
View file @
21cb2767
...
@@ -31,14 +31,16 @@ QtObject {
...
@@ -31,14 +31,16 @@ QtObject {
// OK.
// OK.
// -----------------------------------------------------------------
// -----------------------------------------------------------------
property
color
g
:
'
#6B7A86
'
property
color
c
:
'
#CBCBCB
'
property
color
g10
:
'
#1A6b7a86
'
property
color
g
:
'
#6B7A86
'
property
color
g20
:
'
#336b7a86
'
property
color
g10
:
'
#1A6B7A86
'
property
color
h
:
'
#687680
'
property
color
g20
:
'
#336B7A86
'
property
color
i
:
'
#FE5E00
'
property
color
h
:
'
#687680
'
property
color
j
:
'
#4B5964
'
property
color
i
:
'
#FE5E00
'
property
color
j
:
'
#4B5964
'
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
u
:
'
#B1B1B1
'
property
color
u
:
'
#B1B1B1
'
property
color
v
:
'
#E2E2E2
'
}
}
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
21cb2767
...
@@ -57,6 +57,29 @@ ApplicationWindow {
...
@@ -57,6 +57,29 @@ ApplicationWindow {
Layout.preferredWidth
:
MainWindowStyle
.
accountStatus
.
width
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
{
SearchBox
{
id
:
searchBox
id
:
searchBox
...
@@ -127,7 +150,7 @@ ApplicationWindow {
...
@@ -127,7 +150,7 @@ ApplicationWindow {
Timeline
{
Timeline
{
Layout.fillHeight
:
true
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.fillWidth
:
true
model
:
ContactsListModel
{}
model
:
ContactsListModel
{}
// Use History list.
}
}
}
}
...
...
tests/ui/views/App/Styles/MainWindow/MainWindowStyle.qml
View file @
21cb2767
pragma
Singleton
pragma
Singleton
import
QtQuick
2.7
import
QtQuick
2.7
import
Common
1.0
// ===================================================================
// ===================================================================
QtObject
{
QtObject
{
...
@@ -12,6 +14,20 @@ QtObject {
...
@@ -12,6 +14,20 @@ QtObject {
property
int
width
:
200
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
QtObject
menu
:
QtObject
{
property
int
entryHeight
:
50
property
int
entryHeight
:
50
property
int
width
:
250
property
int
width
:
250
...
@@ -29,7 +45,7 @@ QtObject {
...
@@ -29,7 +45,7 @@ QtObject {
property
int
spacing
:
20
property
int
spacing
:
20
property
var
background
:
Rectangle
{
property
var
background
:
Rectangle
{
color
:
'
#E2E2E2
'
color
:
Colors
.
v
}
}
}
}
}
}
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