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
5ea03efe
Commit
5ea03efe
authored
Apr 04, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Linphone/Codecs): in progress
parent
ed550b73
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
121 additions
and
23 deletions
+121
-23
resources.qrc
linphone-desktop/resources.qrc
+3
-0
CodecsModel.cpp
linphone-desktop/src/components/codecs/CodecsModel.cpp
+6
-3
CodecAttribute.qml
...one-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml
+11
-0
CodecLegend.qml
linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
+15
-0
CodecsViewer.qml
linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml
+52
-20
CodecsViewerStyle.qml
...p/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
+32
-0
qmldir
linphone-desktop/ui/modules/Linphone/Styles/qmldir
+2
-0
No files found.
linphone-desktop/resources.qrc
View file @
5ea03efe
...
@@ -275,6 +275,8 @@
...
@@ -275,6 +275,8 @@
<file>
ui/modules/Linphone/Chat/Message.js
</file>
<file>
ui/modules/Linphone/Chat/Message.js
</file>
<file>
ui/modules/Linphone/Chat/Message.qml
</file>
<file>
ui/modules/Linphone/Chat/Message.qml
</file>
<file>
ui/modules/Linphone/Chat/OutgoingMessage.qml
</file>
<file>
ui/modules/Linphone/Chat/OutgoingMessage.qml
</file>
<file>
ui/modules/Linphone/Codecs/CodecAttribute.qml
</file>
<file>
ui/modules/Linphone/Codecs/CodecLegend.qml
</file>
<file>
ui/modules/Linphone/Codecs/CodecsViewer.qml
</file>
<file>
ui/modules/Linphone/Codecs/CodecsViewer.qml
</file>
<file>
ui/modules/Linphone/Contact/Avatar.qml
</file>
<file>
ui/modules/Linphone/Contact/Avatar.qml
</file>
<file>
ui/modules/Linphone/Contact/ContactDescription.qml
</file>
<file>
ui/modules/Linphone/Contact/ContactDescription.qml
</file>
...
@@ -293,6 +295,7 @@
...
@@ -293,6 +295,7 @@
<file>
ui/modules/Linphone/Styles/Calls/CallsStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Calls/CallsStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/CardBlockStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/CardBlockStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/ChatStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/ChatStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/ContactDescriptionStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/ContactStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/ContactStyle.qml
</file>
...
...
linphone-desktop/src/components/codecs/CodecsModel.cpp
View file @
5ea03efe
...
@@ -42,6 +42,7 @@ inline void addCodecToList (QVariantList &list, const T &codec, CodecsModel::Cod
...
@@ -42,6 +42,7 @@ inline void addCodecToList (QVariantList &list, const T &codec, CodecsModel::Cod
map
[
"mime"
]
=
::
Utils
::
linphoneStringToQString
(
codec
->
getMimeType
());
map
[
"mime"
]
=
::
Utils
::
linphoneStringToQString
(
codec
->
getMimeType
());
map
[
"number"
]
=
codec
->
getNumber
();
map
[
"number"
]
=
codec
->
getNumber
();
map
[
"type"
]
=
type
;
map
[
"type"
]
=
type
;
map
[
"recvFmtp"
]
=
::
Utils
::
linphoneStringToQString
(
codec
->
getRecvFmtp
());
list
<<
map
;
list
<<
map
;
}
}
...
@@ -49,13 +50,15 @@ inline void addCodecToList (QVariantList &list, const T &codec, CodecsModel::Cod
...
@@ -49,13 +50,15 @@ inline void addCodecToList (QVariantList &list, const T &codec, CodecsModel::Cod
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
CodecsModel
::
CodecsModel
(
QObject
*
parent
)
:
QAbstractListModel
(
parent
)
{
CodecsModel
::
CodecsModel
(
QObject
*
parent
)
:
QAbstractListModel
(
parent
)
{
for
(
const
auto
&
codec
:
CoreManager
::
getInstance
()
->
getCore
()
->
getAudioPayloadTypes
())
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
for
(
const
auto
&
codec
:
core
->
getAudioPayloadTypes
())
addCodecToList
(
m_codecs
,
codec
,
AudioCodec
);
addCodecToList
(
m_codecs
,
codec
,
AudioCodec
);
for
(
const
auto
&
codec
:
CoreManager
::
getInstance
()
->
getCore
()
->
getVideoPayloadTypes
())
for
(
const
auto
&
codec
:
core
->
getVideoPayloadTypes
())
addCodecToList
(
m_codecs
,
codec
,
VideoCodec
);
addCodecToList
(
m_codecs
,
codec
,
VideoCodec
);
for
(
const
auto
&
codec
:
CoreManager
::
getInstance
()
->
getCore
()
->
getTextPayloadTypes
())
for
(
const
auto
&
codec
:
core
->
getTextPayloadTypes
())
addCodecToList
(
m_codecs
,
codec
,
TextCodec
);
addCodecToList
(
m_codecs
,
codec
,
TextCodec
);
}
}
...
...
linphone-desktop/ui/modules/Linphone/Codecs/CodecAttribute.qml
0 → 100644
View file @
5ea03efe
import
QtQuick
2.7
import
Linphone
.
Styles
1.0
// =============================================================================
Text
{
color
:
CodecsViewerStyle
.
attribute
.
color
elide
:
Text
.
ElideRight
font.pointSize
:
CodecsViewerStyle
.
attribute
.
fontSize
}
linphone-desktop/ui/modules/Linphone/Codecs/CodecLegend.qml
0 → 100644
View file @
5ea03efe
import
QtQuick
2.7
import
Linphone
.
Styles
1.0
// =============================================================================
Text
{
color
:
CodecsViewerStyle
.
legend
.
color
elide
:
Text
.
ElideRight
font
{
bold
:
true
pointSize
:
CodecsViewerStyle
.
legend
.
fontSize
}
}
linphone-desktop/ui/modules/Linphone/Codecs/CodecsViewer.qml
View file @
5ea03efe
...
@@ -2,58 +2,90 @@ import QtQuick 2.7
...
@@ -2,58 +2,90 @@ import QtQuick 2.7
import
QtQuick
.
Layouts
1.3
import
QtQuick
.
Layouts
1.3
import
Common
1.0
import
Common
1.0
import
Linphone
.
Styles
1.0
// =============================================================================
// =============================================================================
Column
Layout
{
Column
{
property
alias
model
:
view
.
model
property
alias
model
:
view
.
model
// ---------------------------------------------------------------------------
height
:
350
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// Header.
// Header.
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
Row
{
Row
{
Layout.fillWidth
:
true
anchors
{
height
:
50
left
:
parent
.
left
leftMargin
:
CodecsViewerStyle
.
leftMargin
right
:
parent
.
right
}
height
:
CodecsViewerStyle
.
legend
.
height
}
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// Codecs.
// Codecs.
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
Scrollable
ListView
{
ListView
{
id
:
view
id
:
view
Layout.fillWidth
:
true
boundsBehavior
:
Flickable
.
StopAtBounds
Layout.fillHeight
:
true
clip
:
true
spacing
:
0
anchors
{
left
:
parent
.
left
leftMargin
:
CodecsViewerStyle
.
leftMargin
right
:
parent
.
right
}
height
:
count
*
CodecsViewerStyle
.
attribute
.
height
delegate
:
Rectangle
{
delegate
:
Rectangle
{
color
:
'
red
'
color
:
'
transparent
'
height
:
30
width
:
view
.
width
height
:
CodecsViewerStyle
.
attribute
.
height
width
:
parent
.
width
Row
{
Row
Layout
{
anchors.fill
:
parent
anchors.fill
:
parent
spacing
:
CodecsViewerStyle
.
column
.
spacing
Text
{
CodecAttribute
{
Layout.preferredWidth
:
CodecsViewerStyle
.
column
.
mimeWidth
text
:
$codec
.
mime
text
:
$codec
.
mime
}
}
Text
{
CodecAttribute
{
text
:
$codec
.
description
Layout.preferredWidth
:
CodecsViewerStyle
.
column
.
encoderDescriptionWidth
text
:
$codec
.
encoderDescription
}
}
Text
{
CodecAttribute
{
text
:
$codec
.
channels
Layout.preferredWidth
:
CodecsViewerStyle
.
column
.
clockRateWidth
text
:
$codec
.
clockRate
}
}
Text
{
CodecAttribute
{
Layout.preferredWidth
:
CodecsViewerStyle
.
column
.
bitrateWidth
text
:
$codec
.
bitrate
text
:
$codec
.
bitrate
}
}
TextField
{
Layout.preferredWidth
:
CodecsViewerStyle
.
column
.
recvFmtpWidth
text
:
$codec
.
recvFmtp
}
Switch
{
}
}
MouseArea
{
id
:
mouseArea
anchors.fill
:
parent
}
}
}
}
}
}
...
...
linphone-desktop/ui/modules/Linphone/Styles/Codecs/CodecsViewerStyle.qml
0 → 100644
View file @
5ea03efe
pragma
Singleton
import
QtQuick
2.7
import
Common
1.0
// =============================================================================
QtObject
{
property
int
leftMargin
:
10
property
QtObject
attribute
:
QtObject
{
property
color
color
:
Colors
.
j
property
int
fontSize
:
10
property
int
height
:
40
}
property
QtObject
column
:
QtObject
{
property
int
spacing
:
5
property
int
bitrateWidth
:
100
property
int
clockRateWidth
:
100
property
int
recvFmtpWidth
:
200
property
int
encoderDescriptionWidth
:
300
property
int
mimeWidth
:
100
}
property
QtObject
legend
:
QtObject
{
property
color
color
:
Colors
.
k
property
int
fontSize
:
10
property
int
height
:
50
}
}
linphone-desktop/ui/modules/Linphone/Styles/qmldir
View file @
5ea03efe
...
@@ -13,6 +13,8 @@ singleton ChatStyle 1.0 ChatStyle.qml
...
@@ -13,6 +13,8 @@ singleton ChatStyle 1.0 ChatStyle.qml
singleton CallsStyle 1.0 Calls/CallsStyle.qml
singleton CallsStyle 1.0 Calls/CallsStyle.qml
singleton CallControlsStyle 1.0 Calls/CallControlsStyle.qml
singleton CallControlsStyle 1.0 Calls/CallControlsStyle.qml
singleton CodecsViewerStyle 1.0 Codecs/CodecsViewerStyle.qml
singleton AvatarStyle 1.0 Contact/AvatarStyle.qml
singleton AvatarStyle 1.0 Contact/AvatarStyle.qml
singleton ContactDescriptionStyle 1.0 Contact/ContactDescriptionStyle.qml
singleton ContactDescriptionStyle 1.0 Contact/ContactDescriptionStyle.qml
singleton ContactStyle 1.0 Contact/ContactStyle.qml
singleton ContactStyle 1.0 Contact/ContactStyle.qml
...
...
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