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
5182938f
Commit
5182938f
authored
Oct 07, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): new `Borders` component
parent
25183046
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
158 additions
and
74 deletions
+158
-74
resources.qrc
tests/resources.qrc
+2
-0
Borders.qml
tests/ui/modules/Linphone/Borders.qml
+69
-0
Constants.qml
tests/ui/modules/Linphone/Constants.qml
+2
-0
DropZone.qml
tests/ui/modules/Linphone/DropZone.qml
+46
-46
DroppableTextArea.qml
tests/ui/modules/Linphone/DroppableTextArea.qml
+23
-0
qmldir
tests/ui/modules/Linphone/qmldir
+6
-0
Conversation.qml
tests/ui/views/MainWindow/Conversation.qml
+10
-28
No files found.
tests/resources.qrc
View file @
5182938f
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
<file>
imgs/valid.svg
</file>
<file>
imgs/valid.svg
</file>
<file>
languages/en.qm
</file>
<file>
languages/en.qm
</file>
<file>
languages/fr.qm
</file>
<file>
languages/fr.qm
</file>
<file>
ui/modules/Linphone/Borders.qml
</file>
<file>
ui/modules/Linphone/Chat/Chat.qml
</file>
<file>
ui/modules/Linphone/Chat/Chat.qml
</file>
<file>
ui/modules/Linphone/Chat/Event.qml
</file>
<file>
ui/modules/Linphone/Chat/Event.qml
</file>
<file>
ui/modules/Linphone/Chat/IncomingMessage.qml
</file>
<file>
ui/modules/Linphone/Chat/IncomingMessage.qml
</file>
...
@@ -40,6 +41,7 @@
...
@@ -40,6 +41,7 @@
<file>
ui/modules/Linphone/Dialog/ConfirmDialog.qml
</file>
<file>
ui/modules/Linphone/Dialog/ConfirmDialog.qml
</file>
<file>
ui/modules/Linphone/Dialog/DialogDescription.qml
</file>
<file>
ui/modules/Linphone/Dialog/DialogDescription.qml
</file>
<file>
ui/modules/Linphone/Dialog/DialogPlus.qml
</file>
<file>
ui/modules/Linphone/Dialog/DialogPlus.qml
</file>
<file>
ui/modules/Linphone/DroppableTextArea.qml
</file>
<file>
ui/modules/Linphone/DropZone.qml
</file>
<file>
ui/modules/Linphone/DropZone.qml
</file>
<file>
ui/modules/Linphone/ForceScrollBar.qml
</file>
<file>
ui/modules/Linphone/ForceScrollBar.qml
</file>
<file>
ui/modules/Linphone/Form/AbstractTextButton.qml
</file>
<file>
ui/modules/Linphone/Form/AbstractTextButton.qml
</file>
...
...
tests/ui/modules/Linphone/Borders.qml
0 → 100644
View file @
5182938f
import
QtQuick
2.7
// ===================================================================
Item
{
default
property
alias
content
:
content
.
data
property
var
borderColor
property
var
borderWidth
property
color
bottomColor
:
'
transparent
'
property
color
leftColor
:
'
transparent
'
property
color
rightColor
:
'
transparent
'
property
color
topColor
:
'
transparent
'
property
int
bottomWidth
:
0
property
int
leftWidth
:
0
property
int
rightWidth
:
0
property
int
topWidth
:
0
Rectangle
{
id
:
bottomBorder
anchors.bottom
:
parent
.
bottom
color
:
borderColor
!=
null
?
borderColor
:
bottomColor
height
:
borderWidth
!=
null
?
borderWidth
:
bottomWidth
width
:
parent
.
width
}
Rectangle
{
id
:
leftBorder
anchors.left
:
parent
.
left
color
:
borderColor
!=
null
?
borderColor
:
leftColor
height
:
parent
.
height
width
:
borderWidth
!=
null
?
borderWidth
:
leftWidth
}
Rectangle
{
id
:
rightBorder
anchors.right
:
parent
.
right
color
:
borderColor
!=
null
?
borderColor
:
rigthColor
height
:
parent
.
height
width
:
borderWidth
!=
null
?
borderWidth
:
rightWidth
}
Rectangle
{
id
:
topBorder
anchors.top
:
parent
.
top
color
:
borderColor
!=
null
?
borderColor
:
topColor
height
:
borderWidth
!=
null
?
borderWidth
:
topWidth
width
:
parent
.
width
}
Item
{
id
:
content
anchors
{
fill
:
parent
bottomMargin
:
bottomBorder
.
height
leftMargin
:
leftBorder
.
width
rightMargin
:
rightBorder
.
width
topMargin
:
topBorder
.
height
}
}
}
tests/ui/modules/Linphone/Constants.qml
View file @
5182938f
pragma
Singleton
pragma
Singleton
import
QtQuick
2.7
import
QtQuick
2.7
// ===================================================================
QtObject
{
QtObject
{
property
int
zPopup
:
999
property
int
zPopup
:
999
property
int
zMax
:
999999
property
int
zMax
:
999999
...
...
tests/ui/modules/Linphone/DropZone.qml
View file @
5182938f
tests/ui/modules/Linphone/DroppableTextArea.qml
0 → 100644
View file @
5182938f
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
RowLayout
{
property
alias
placeholderText
:
textArea
.
placeholderText
Flickable
{
Layout.preferredHeight
:
parent
.
height
Layout.fillWidth
:
true
ScrollBar.vertical
:
ScrollBar
{
}
TextArea.flickable
:
TextArea
{
id
:
textArea
wrapMode
:
TextArea
.
Wrap
}
}
DropZone
{
Layout.preferredHeight
:
parent
.
height
Layout.preferredWidth
:
40
}
}
tests/ui/modules/Linphone/qmldir
View file @
5182938f
...
@@ -11,6 +11,9 @@ singleton Constants 1.0 Constants.qml
...
@@ -11,6 +11,9 @@ singleton Constants 1.0 Constants.qml
# Components ---------------------------------------------------------
# Components ---------------------------------------------------------
# Chat
Borders 1.0 Borders.qml
# Chat
# Chat
Chat 1.0 Chat/Chat.qml
Chat 1.0 Chat/Chat.qml
...
@@ -29,6 +32,9 @@ DialogPlus 1.0 Dialog/DialogPlus.qml
...
@@ -29,6 +32,9 @@ DialogPlus 1.0 Dialog/DialogPlus.qml
# DropZone
# DropZone
DropZone 1.0 DropZone.qml
DropZone 1.0 DropZone.qml
# DroppableTextArea
DroppableTextArea 1.0 DroppableTextArea.qml
# ForceScrollBar
# ForceScrollBar
ForceScrollBar 1.0 ForceScrollBar.qml
ForceScrollBar 1.0 ForceScrollBar.qml
...
...
tests/ui/views/MainWindow/Conversation.qml
View file @
5182938f
...
@@ -105,47 +105,29 @@ ColumnLayout {
...
@@ -105,47 +105,29 @@ ColumnLayout {
}
}
}
}
Rectangle
{
Borders
{
Layout.fillHeight
:
true
Layout.fillHeight
:
true
Layout.fillWidth
:
true
Layout.fillWidth
:
true
border.color
:
'
#C7C7C7
'
borderColor
:
'
#C7C7C7
'
border.width
:
1
bottomWidth
:
1
id
:
messagesArea
leftWidth
:
1
topWidth
:
1
Chat
{
Chat
{
ScrollBar.vertical
:
ForceScrollBar
{
}
ScrollBar.vertical
:
ForceScrollBar
{
}
anchors.bottomMargin
:
messagesArea
.
border
.
width
anchors.fill
:
parent
anchors.fill
:
parent
anchors.topMargin
:
messagesArea
.
border
.
width
}
}
}
}
// Send area.
Borders
{
Rectangle
{
Layout.fillWidth
:
true
Layout.fillWidth
:
true
Layout.preferredHeight
:
70
Layout.preferredHeight
:
70
border.color
:
textArea
.
activeFocus
?
'
#8E8E8E
'
:
'
#C7C7C7
'
borderColor
:
'
#C7C7C7
'
border.width
:
1
leftWidth
:
1
id
:
newMessageArea
RowLayout
{
DroppableTextArea
{
anchors.fill
:
parent
anchors.fill
:
parent
Flickable
{
Layout.preferredHeight
:
parent
.
height
Layout.fillWidth
:
true
ScrollBar.vertical
:
ScrollBar
{
}
TextArea.flickable
:
TextArea
{
id
:
textArea
placeholderText
:
qsTr
(
'
newMessagePlaceholder
'
)
placeholderText
:
qsTr
(
'
newMessagePlaceholder
'
)
wrapMode
:
TextArea
.
Wrap
}
}
DropZone
{
Layout.preferredHeight
:
parent
.
height
-
newMessageArea
.
border
.
width
*
2
Layout.preferredWidth
:
40
}
}
}
}
}
}
}
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