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
fddd8213
Commit
fddd8213
authored
May 18, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(ui/views/App/Calls/ConferenceManager): in progress
parent
040015a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
ScrollableListViewField.qml
...ui/modules/Common/Form/Fields/ScrollableListViewField.qml
+21
-4
MainWindowMenuBar.qml
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+1
-1
No files found.
linphone-desktop/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
View file @
fddd8213
...
@@ -6,11 +6,28 @@ import Common.Styles 1.0
...
@@ -6,11 +6,28 @@ import Common.Styles 1.0
// =============================================================================
// =============================================================================
Rectangle
{
Rectangle
{
border
{
id
:
field
color
:
TextFieldStyle
.
background
.
border
.
color
.
normal
width
:
TextFieldStyle
.
background
.
border
.
width
default
property
alias
_content
:
content
.
data
}
color
:
TextFieldStyle
.
background
.
color
.
normal
color
:
TextFieldStyle
.
background
.
color
.
normal
radius
:
TextFieldStyle
.
background
.
radius
radius
:
TextFieldStyle
.
background
.
radius
Item
{
id
:
content
anchors.fill
:
parent
}
Rectangle
{
anchors.fill
:
parent
border
{
color
:
TextFieldStyle
.
background
.
border
.
color
.
normal
width
:
TextFieldStyle
.
background
.
border
.
width
}
color
:
'
transparent
'
radius
:
field
.
radius
}
}
}
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
View file @
fddd8213
...
@@ -19,7 +19,7 @@ Item {
...
@@ -19,7 +19,7 @@ Item {
Shortcut
{
Shortcut
{
id
:
settingsShortcut
id
:
settingsShortcut
sequence
:
"
Ctrl+P
"
sequence
:
'
Ctrl+P
'
onActivated
:
App
.
smartShowWindow
(
App
.
getSettingsWindow
())
onActivated
:
App
.
smartShowWindow
(
App
.
getSettingsWindow
())
}
}
...
...
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