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
fc8b20e5
Commit
fc8b20e5
authored
Oct 14, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(DroppableTextArea): use style file
parent
f8e4d72f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
resources.qrc
tests/resources.qrc
+1
-0
DroppableTextArea.qml
tests/ui/modules/Common/DroppableTextArea.qml
+12
-7
qmldir
tests/ui/modules/Common/Styles/qmldir
+2
-0
No files found.
tests/resources.qrc
View file @
fc8b20e5
...
...
@@ -56,6 +56,7 @@
<file>
ui/modules/Common/SearchBox.qml
</file>
<file>
ui/modules/Common/Styles/CollapseStyle.qml
</file>
<file>
ui/modules/Common/Styles/DialogStyle.qml
</file>
<file>
ui/modules/Common/Styles/DroppableTextAreaStyle.qml
</file>
<file>
ui/modules/Common/Styles/ForceScrollBarStyle.qml
</file>
<file>
ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
</file>
<file>
ui/modules/Common/Styles/Form/ActionBarStyle.qml
</file>
...
...
tests/ui/modules/Common/DroppableTextArea.qml
View file @
fc8b20e5
...
...
@@ -4,6 +4,8 @@ import QtQuick.Dialogs 1.2
import
Common
.
Styles
1.0
// ===================================================================
Item
{
signal
dropped
(
var
files
)
...
...
@@ -34,7 +36,9 @@ Item {
TextArea.flickable
:
TextArea
{
id
:
textArea
rightPadding
:
fileChooserButton
.
width
+
fileChooserButton
.
anchors
.
rightMargin
+
6
rightPadding
:
fileChooserButton
.
width
+
fileChooserButton
.
anchors
.
rightMargin
+
DroppableTextAreaStyle
.
fileChooserButton
.
margins
wrapMode
:
TextArea
.
Wrap
}
anchors.fill
:
parent
...
...
@@ -46,11 +50,12 @@ Item {
anchors
{
right
:
parent
.
right
rightMargin
:
scrollBar
.
width
+
6
rightMargin
:
scrollBar
.
width
+
DroppableTextAreaStyle
.
fileChooserButton
.
margins
}
height
:
parent
.
height
width
:
40
width
:
DroppableTextAreaStyle
.
fileChooserButton
.
width
onClicked
:
fileDialog
.
open
()
...
...
@@ -75,14 +80,14 @@ Item {
id
:
hoverContent
anchors.fill
:
parent
color
:
'
#FFFFFF
'
color
:
DroppableTextAreaStyle
.
hoverContent
.
backgroundColor
visible
:
false
Text
{
anchors.centerIn
:
parent
color
:
'
#FE5E00
'
font.pointSize
:
11
text
:
qsTr
(
'
DROP YOUR ATTACHMENT
'
)
color
:
DroppableTextAreaStyle
.
hoverContent
.
text
.
color
font.pointSize
:
DroppableTextAreaStyle
.
hoverContent
.
text
.
fontSize
text
:
qsTr
(
'
dropYourAttachment
'
)
}
}
...
...
tests/ui/modules/Common/Styles/qmldir
View file @
fc8b20e5
...
...
@@ -5,6 +5,8 @@ module Common.Styles
# Components styles.
singleton CollapseStyle 1.0 CollapseStyle.qml
singleton DialogStyle 1.0 DialogStyle.qml
singleton DroppableTextAreaStyle 1.0 DroppableTextAreaStyle.qml
singleton ForceScrollBarStyle 1.0 ForceScrollBarStyle.qml
singleton MenuStyle 1.0 MenuStyle.qml
singleton PanedStyle 1.0 PanedStyle.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