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
7c3ae4a6
Commit
7c3ae4a6
authored
Sep 09, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ComboBox): use TransparentCombobox in manageAccounts
parent
f41720a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
14 deletions
+30
-14
resources.qrc
tests/resources.qrc
+1
-1
DialogComboBox.qml
tests/ui/components/form/DialogComboBox.qml
+0
-9
TransparentComboBox.qml
tests/ui/components/form/TransparentComboBox.qml
+27
-0
mainWindow.qml
tests/ui/views/mainWindow.qml
+1
-2
manageAccounts.qml
tests/ui/views/manageAccounts.qml
+1
-2
No files found.
tests/resources.qrc
View file @
7c3ae4a6
...
@@ -9,9 +9,9 @@
...
@@ -9,9 +9,9 @@
<file>
ui/components/dialog/DialogPlus.qml
</file>
<file>
ui/components/dialog/DialogPlus.qml
</file>
<file>
ui/components/form/Collapse.qml
</file>
<file>
ui/components/form/Collapse.qml
</file>
<file>
ui/components/form/DialogButton.qml
</file>
<file>
ui/components/form/DialogButton.qml
</file>
<file>
ui/components/form/DialogComboBox.qml
</file>
<file>
ui/components/form/RoundButton.qml
</file>
<file>
ui/components/form/RoundButton.qml
</file>
<file>
ui/components/form/ToolBarButton.qml
</file>
<file>
ui/components/form/ToolBarButton.qml
</file>
<file>
ui/components/form/TransparentComboBox.qml
</file>
<file>
ui/views/mainWindow.qml
</file>
<file>
ui/views/mainWindow.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
...
...
tests/ui/components/form/DialogComboBox.qml
deleted
100644 → 0
View file @
f41720a1
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
ComboBox
{
background
:
Rectangle
{
color
:
'
transparent
'
}
id
:
comboBox
}
tests/ui/components/form/TransparentComboBox.qml
0 → 100644
View file @
7c3ae4a6
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
ComboBox
{
background
:
Rectangle
{
color
:
'
transparent
'
}
id
:
comboBox
delegate
:
ItemDelegate
{
background
:
Rectangle
{
color
:
delegate
.
down
?
'
#FE5E00
'
:
(
comboBox
.
currentIndex
===
index
?
'
#F0F0F0
'
:
'
#FFFFFF
'
)
opacity
:
enabled
?
1
:
0.3
}
font.weight
:
comboBox
.
currentIndex
===
index
?
Font
.
DemiBold
:
Font
.
Normal
id
:
delegate
text
:
key
||
modelData
width
:
comboBox
.
width
}
}
tests/ui/views/mainWindow.qml
View file @
7c3ae4a6
...
@@ -36,8 +36,7 @@ ApplicationWindow {
...
@@ -36,8 +36,7 @@ ApplicationWindow {
console
.
debug
(
'
Error:
'
+
component
.
errorString
())
console
.
debug
(
'
Error:
'
+
component
.
errorString
())
}
}
}
else
{
}
else
{
var
win
=
component
.
createObject
(
mainWindow
);
component
.
createObject
(
mainWindow
).
show
()
win
.
show
();
}
}
}
}
}
}
...
...
tests/ui/views/manageAccounts.qml
View file @
7c3ae4a6
...
@@ -17,7 +17,6 @@ DialogPlus {
...
@@ -17,7 +17,6 @@ DialogPlus {
text
:
qsTr
(
'
validate
'
)
text
:
qsTr
(
'
validate
'
)
}
}
// Accounts list.
Item
{
Item
{
id
:
listViewContainer
id
:
listViewContainer
anchors.fill
:
parent
anchors.fill
:
parent
...
@@ -136,7 +135,7 @@ DialogPlus {
...
@@ -136,7 +135,7 @@ DialogPlus {
Layout.fillHeight
:
parent
.
height
Layout.fillHeight
:
parent
.
height
Layout.preferredWidth
:
160
Layout.preferredWidth
:
160
Dialog
ComboBox
{
Transparent
ComboBox
{
anchors.fill
:
parent
anchors.fill
:
parent
model
:
ListModel
{
model
:
ListModel
{
ListElement
{
key
:
qsTr
(
'
onlinePresence
'
);
value
:
1
}
ListElement
{
key
:
qsTr
(
'
onlinePresence
'
);
value
:
1
}
...
...
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