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
ab21a4e5
Commit
ab21a4e5
authored
Sep 23, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(app): try to extract style from component (unstable)
parent
6fceeeb1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
5 deletions
+14
-5
linphone.pro
tests/linphone.pro
+1
-0
resources.qrc
tests/resources.qrc
+2
-0
main.cpp
tests/src/main.cpp
+8
-1
Collapse.qml
tests/ui/components/collapse/Collapse.qml
+3
-3
InvertedMouseArea.qml
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
+0
-1
No files found.
tests/linphone.pro
View file @
ab21a4e5
...
...
@@ -33,6 +33,7 @@ lupdate_only{
ui/components/scrollBar
/*
.qml \
ui/components/select
/*
.qml \
ui/components/timeline
/*
.qml \
ui/style/collapse
/*
.qml \
ui/views
/*
.qml \
ui/views/mainWindow
/*
.qml
}
...
...
tests/resources.qrc
View file @
ab21a4e5
...
...
@@ -33,6 +33,8 @@
<file>
ui/components/form/DarkButton.qml
</file>
<file>
ui/components/invertedMouseArea/InvertedMouseArea.qml
</file>
<file>
ui/scripts/utils.js
</file>
<file>
ui/style/qmldir
</file>
<file>
ui/style/collapse/Style.qml
</file>
<file>
ui/views/newCall.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/mainWindow/mainWindow.qml
</file>
...
...
tests/src/main.cpp
View file @
ab21a4e5
#include <cstdlib>
#include <QQmlFileSelector>
#include <QMenu>
#include <QQmlApplicationEngine>
#include <QQmlContext>
...
...
@@ -46,9 +47,15 @@ void setTrayIcon (QQmlApplicationEngine &engine) {
}
int
main
(
int
argc
,
char
*
argv
[])
{
QGuiApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
);
App
app
(
argc
,
argv
);
QQmlApplicationEngine
engine
(
QUrl
(
"qrc:/ui/views/mainWindow/mainWindow.qml"
))
;
QQmlApplicationEngine
engine
;
// Provide `+custom` folders for custom components.
QQmlFileSelector
*
selector
=
new
QQmlFileSelector
(
&
engine
);
selector
->
setExtraSelectors
(
QStringList
(
"custom"
));
engine
.
load
(
QUrl
(
"qrc:/ui/views/mainWindow/mainWindow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
return
EXIT_FAILURE
;
...
...
tests/ui/components/collapse/Collapse.qml
View file @
ab21a4e5
...
...
@@ -3,6 +3,8 @@ import QtQuick 2.7
import
'
qrc:/ui/components/form
'
import
'
qrc:/ui/components/image
'
import
'
qrc:/ui/style
'
as
Style
// ===================================================================
Item
{
...
...
@@ -18,9 +20,7 @@ Item {
ActionButton
{
anchors.centerIn
:
parent
background
:
Rectangle
{
color
:
'
transparent
'
}
background
:
Style
.
CollapseStyle
.
background
icon
:
'
collapse
'
iconSize
:
32
id
:
button
...
...
tests/ui/components/invertedMouseArea/InvertedMouseArea.qml
View file @
ab21a4e5
...
...
@@ -17,7 +17,6 @@ Item {
}
_mouseArea
.
parent
=
(
function
()
{
// Search root.
var
root
=
item
while
(
root
.
parent
!=
null
)
{
...
...
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