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
58a4ccac
You need to sign in or sign up before continuing.
Commit
58a4ccac
authored
Oct 14, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): many code style changes
parent
3944fec6
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
56 additions
and
16 deletions
+56
-16
ConfirmDialog.qml
tests/ui/modules/Common/Dialog/ConfirmDialog.qml
+0
-2
ForceScrollBar.qml
tests/ui/modules/Common/ForceScrollBar.qml
+2
-0
AbstractTextButton.qml
tests/ui/modules/Common/Form/AbstractTextButton.qml
+6
-2
CheckBoxText.qml
tests/ui/modules/Common/Form/CheckBoxText.qml
+2
-2
ListForm.qml
tests/ui/modules/Common/Form/ListForm.qml
+6
-2
Menu.qml
tests/ui/modules/Common/Menu.qml
+8
-5
SearchBox.qml
tests/ui/modules/Common/SearchBox.qml
+14
-2
AbstractTextButtonStyle.qml
...ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
+2
-0
ActionBarStyle.qml
tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml
+2
-0
CheckBoxTextStyle.qml
tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
+2
-0
ExclusiveButtonsStyle.qml
...s/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
+2
-0
ListFormStyle.qml
tests/ui/modules/Common/Styles/Form/ListFormStyle.qml
+2
-0
SmallButtonStyle.qml
tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
+2
-0
TextButtonAStyle.qml
tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml
+2
-0
TextButtonBStyle.qml
tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml
+2
-0
TransparentComboBoxStyle.qml
...i/modules/Common/Styles/Form/TransparentComboBoxStyle.qml
+2
-0
MainWindow.qml
tests/ui/views/MainWindow/MainWindow.qml
+0
-1
No files found.
tests/ui/modules/Common/Dialog/ConfirmDialog.qml
View file @
58a4ccac
...
...
@@ -6,8 +6,6 @@ import Common.Styles 1.0
// ===================================================================
DialogPlus
{
id
:
dialog
buttons
:
[
TextButtonA
{
text
:
qsTr
(
'
cancel
'
)
...
...
tests/ui/modules/Common/ForceScrollBar.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick.Controls 2.0
import
Common
.
Styles
1.0
// ===================================================================
// A simple custom vertical scrollbar.
// ===================================================================
ScrollBar
{
...
...
tests/ui/modules/Common/Form/AbstractTextButton.qml
View file @
58a4ccac
...
...
@@ -35,8 +35,12 @@ Button {
?
textColorHovered
:
textColorNormal
)
font.bold
:
true
font.pointSize
:
AbstractTextButtonStyle
.
text
.
fontSize
font
{
bold
:
true
pointSize
:
AbstractTextButtonStyle
.
text
.
fontSize
}
horizontalAlignment
:
Text
.
AlignHCenter
text
:
button
.
text
verticalAlignment
:
Text
.
AlignVCenter
...
...
tests/ui/modules/Common/Form/CheckBoxText.qml
View file @
58a4ccac
...
...
@@ -47,8 +47,8 @@ CheckBox {
radius
:
CheckBoxTextStyle
.
radius
visible
:
checkBox
.
checked
width
:
parent
.
width
-
x
*
2
x
:
4
// Fixed, no
sty
le.
y
:
4
//
Fixed, no style
.
x
:
4
// Fixed, no
needed to use style fi
le.
y
:
4
//
Same thing
.
}
}
}
tests/ui/modules/Common/Form/ListForm.qml
View file @
58a4ccac
...
...
@@ -82,8 +82,12 @@ RowLayout {
Text
{
anchors.fill
:
textEdit
color
:
ListFormStyle
.
value
.
placeholder
.
color
font.italic
:
true
font.pointSize
:
ListFormStyle
.
value
.
placeholder
.
fontSize
font
{
italic
:
true
pointSize
:
ListFormStyle
.
value
.
placeholder
.
fontSize
}
padding
:
textEdit
.
padding
text
:
textEdit
.
text
.
length
===
0
&&
!
textEdit
.
activeFocus
?
listForm
.
placeholder
...
...
tests/ui/modules/Common/Menu.qml
View file @
58a4ccac
...
...
@@ -37,11 +37,14 @@ ColumnLayout {
width
:
menu
.
entryWidth
RowLayout
{
anchors.left
:
parent
.
left
anchors.leftMargin
:
MenuStyle
.
entry
.
leftMargin
anchors.right
:
parent
.
right
anchors.rightMargin
:
MenuStyle
.
entry
.
rightMargin
anchors.verticalCenter
:
parent
.
verticalCenter
anchors
{
left
:
parent
.
left
leftMargin
:
MenuStyle
.
entry
.
leftMargin
right
:
parent
.
right
rightMargin
:
MenuStyle
.
entry
.
rightMargin
verticalCenter
:
parent
.
verticalCenter
}
spacing
:
MenuStyle
.
entry
.
spacing
Icon
{
...
...
tests/ui/modules/Common/SearchBox.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,9 @@ import QtQuick.Controls 2.0
import
Common
.
Styles
1.0
// ===================================================================
// A reusable search input which display a entries model in a menu.
// Each entry can be filtered with the search input.
// ===================================================================
Item
{
...
...
@@ -11,12 +14,15 @@ Item {
property
alias
delegate
:
list
.
delegate
property
alias
entryHeight
:
menu
.
entryHeight
property
alias
maxMenuHeight
:
menu
.
maxMenuHeight
// This property must implement `setFilterFixedString` and/or
// `invalidate` functions.
property
alias
model
:
list
.
model
property
alias
placeholderText
:
searchField
.
placeholderText
signal
menuClosed
()
signal
menuOpened
()
signal
searchTextChanged
(
string
text
)
function
_hideMenu
()
{
menu
.
hide
()
...
...
@@ -48,7 +54,13 @@ Item {
Keys.onEscapePressed
:
_hideMenu
()
onActiveFocusChanged
:
activeFocus
&&
_showMenu
()
onTextChanged
:
searchTextChanged
(
text
)
onTextChanged
:
{
model
.
setFilterFixedString
(
text
)
if
(
model
.
invalidate
)
{
model
.
invalidate
()
}
}
}
DropDownMenu
{
...
...
tests/ui/modules/Common/Styles/Form/AbstractTextButtonStyle.qml
View file @
58a4ccac
pragma
Singleton
import
QtQuick
2.7
// ===================================================================
QtObject
{
property
QtObject
background
:
QtObject
{
property
int
height
:
30
...
...
tests/ui/modules/Common/Styles/Form/ActionBarStyle.qml
View file @
58a4ccac
pragma
Singleton
import
QtQuick
2.7
// ===================================================================
QtObject
{
property
int
spacing
:
8
}
tests/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
int
radius
:
3
property
int
size
:
18
...
...
tests/ui/modules/Common/Styles/Form/ExclusiveButtonsStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
int
buttonsSpacing
:
8
...
...
tests/ui/modules/Common/Styles/Form/ListFormStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
int
lineHeight
:
30
...
...
tests/ui/modules/Common/Styles/Form/SmallButtonStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
QtObject
background
:
QtObject
{
property
int
height
:
22
...
...
tests/ui/modules/Common/Styles/Form/TextButtonAStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
o
...
...
tests/ui/modules/Common/Styles/Form/TextButtonBStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
QtObject
backgroundColor
:
QtObject
{
property
color
hovered
:
Colors
.
p
...
...
tests/ui/modules/Common/Styles/Form/TransparentComboBoxStyle.qml
View file @
58a4ccac
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
Common
1.0
// ===================================================================
QtObject
{
property
QtObject
item
:
QtObject
{
property
QtObject
color
:
QtObject
{
...
...
tests/ui/views/MainWindow/MainWindow.qml
View file @
58a4ccac
...
...
@@ -100,7 +100,6 @@ ApplicationWindow {
ActionButton
{
icon
:
'
call
'
onClicked
:
CallsWindow
.
show
()
},
ActionButton
{
...
...
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