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
20be2ca6
Commit
20be2ca6
authored
May 24, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/modules/Common/Form/Buttons/FileChooserButton): set icons
parent
da63972a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
107 additions
and
2 deletions
+107
-2
file_hovered.svg
linphone-desktop/assets/images/file_hovered.svg
+22
-0
file_normal.svg
linphone-desktop/assets/images/file_normal.svg
+16
-0
file_pressed.svg
linphone-desktop/assets/images/file_pressed.svg
+16
-0
folder_hovered.svg
linphone-desktop/assets/images/folder_hovered.svg
+12
-0
folder_normal.svg
linphone-desktop/assets/images/folder_normal.svg
+12
-0
folder_pressed.svg
linphone-desktop/assets/images/folder_pressed.svg
+12
-0
resources.qrc
linphone-desktop/resources.qrc
+6
-0
FileChooserButton.qml
...ktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
+10
-1
TextField.qml
linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
+1
-1
No files found.
linphone-desktop/assets/images/file_hovered.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"16px"
height=
"20px"
viewBox=
"0 0 16 20"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_file_1
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_file_1"
stroke=
"#6B7A86"
>
<g
id=
"Group-13"
>
<g
id=
"Group-12"
>
<rect
id=
"Rectangle-10-Copy"
transform=
"translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) "
x=
"-1.5"
y=
"2.5"
width=
"19"
height=
"15"
rx=
"3"
></rect>
<g
id=
"Group-9"
transform=
"translate(4.000000, 4.000000)"
stroke-linecap=
"round"
>
<path
d=
"M0.444444444,4.5 L7.55555556,4.5"
id=
"Line"
></path>
<path
d=
"M0.444444444,1.5 L7.55555556,1.5"
id=
"Line"
></path>
<path
d=
"M0.444444444,10.5 L7.55555556,10.5"
id=
"Line"
></path>
<path
d=
"M0.444444444,7.5 L7.55555556,7.5"
id=
"Line"
></path>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/file_normal.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"16px"
height=
"20px"
viewBox=
"0 0 16 20"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_file_3
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_file_3"
stroke=
"#96A5B1"
>
<rect
id=
"Rectangle-10-Copy"
transform=
"translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) "
x=
"-1.5"
y=
"2.5"
width=
"19"
height=
"15"
rx=
"3"
></rect>
<path
d=
"M4.44444444,8.5 L11.5555556,8.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,5.5 L11.5555556,5.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,14.5 L11.5555556,14.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,11.5 L11.5555556,11.5"
id=
"Line"
stroke-linecap=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/file_pressed.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"16px"
height=
"20px"
viewBox=
"0 0 16 20"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_file_2
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_file_2"
stroke=
"#FF5E00"
>
<rect
id=
"Rectangle-10-Copy"
transform=
"translate(8.000000, 10.000000) rotate(-270.000000) translate(-8.000000, -10.000000) "
x=
"-1.5"
y=
"2.5"
width=
"19"
height=
"15"
rx=
"3"
></rect>
<path
d=
"M4.44444444,8.5 L11.5555556,8.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,5.5 L11.5555556,5.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,14.5 L11.5555556,14.5"
id=
"Line"
stroke-linecap=
"round"
></path>
<path
d=
"M4.44444444,11.5 L11.5555556,11.5"
id=
"Line"
stroke-linecap=
"round"
></path>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/folder_hovered.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"21px"
height=
"18px"
viewBox=
"0 0 21 18"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_folder_1
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_folder_1"
stroke=
"#6B7A86"
>
<path
d=
"M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z"
id=
"Combined-Shape"
></path>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/folder_normal.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"21px"
height=
"18px"
viewBox=
"0 0 21 18"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_folder_3
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_folder_3"
stroke=
"#96A5B1"
>
<path
d=
"M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z"
id=
"Combined-Shape"
></path>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/assets/images/folder_pressed.svg
0 → 100644
View file @
20be2ca6
<?xml version="1.0" encoding="UTF-8"?>
<svg
width=
"21px"
height=
"18px"
viewBox=
"0 0 21 18"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
<title>
settings_folder_2
</title>
<desc>
Created with Sketch.
</desc>
<defs></defs>
<g
id=
"Symbols"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"settings_folder_2"
stroke=
"#FF5E00"
>
<path
d=
"M10.1717552,2.5 L10.5248326,2.5 L10.6429477,2.16726507 C10.9945521,1.17678114 11.9372463,0.5 13.0057983,0.5 L17.9942017,0.5 C19.3800816,0.5 20.5,1.61712484 20.5,3.00166547 L20.5,4.99833453 C20.4999993,5.00066969 20.4999993,5.00066969 20.4999958,5.00301806 C20.4999993,5.00713802 20.4999993,5.00713802 20.5,5.00947762 L20.5,14.9905224 C20.5,16.3770475 19.3776888,17.5 17.991212,17.5 L3.00878799,17.5 C1.61924805,17.5 0.5,16.3832597 0.5,14.9905224 L0.5,5.00947762 C0.5,3.62295255 1.62231116,2.5 3.00878799,2.5 L10.1717552,2.5 Z"
id=
"Combined-Shape"
></path>
</g>
</g>
</svg>
\ No newline at end of file
linphone-desktop/resources.qrc
View file @
20be2ca6
...
...
@@ -82,8 +82,14 @@
<file>
assets/images/edit_normal.svg
</file>
<file>
assets/images/edit_pressed.svg
</file>
<file>
assets/images/ended_call.svg
</file>
<file>
assets/images/file_hovered.svg
</file>
<file>
assets/images/file_normal.svg
</file>
<file>
assets/images/file_pressed.svg
</file>
<file>
assets/images/file_sign.svg
</file>
<file>
assets/images/filter.svg
</file>
<file>
assets/images/folder_hovered.svg
</file>
<file>
assets/images/folder_normal.svg
</file>
<file>
assets/images/folder_pressed.svg
</file>
<file>
assets/images/fullscreen_hovered.svg
</file>
<file>
assets/images/fullscreen_normal.svg
</file>
<file>
assets/images/fullscreen_pressed.svg
</file>
...
...
linphone-desktop/ui/modules/Common/Form/Buttons/FileChooserButton.qml
View file @
20be2ca6
...
...
@@ -50,7 +50,16 @@ TextField {
Icon
{
anchors.centerIn
:
parent
// TODO: Set icon file or folder.
icon
:
(
textField
.
selectFolder
?
'
folder
'
:
'
file
'
)
+
(
mouseArea
.
pressed
?
'
_pressed
'
:
(
mouseArea
.
containsMouse
?
'
_hovered
'
:
'
_normal
'
)
)
iconSize
:
FileChooserButtonStyle
.
tools
.
button
.
iconSize
}
}
...
...
linphone-desktop/ui/modules/Common/Form/Fields/TextField.qml
View file @
20be2ca6
...
...
@@ -13,8 +13,8 @@ Controls.TextField {
// ---------------------------------------------------------------------------
property
alias
icon
:
icon
.
icon
property
string
error
:
''
property
string
icon
:
''
property
var
tools
// ---------------------------------------------------------------------------
...
...
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