Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
linphone-desktop
Commits
2850facd
Commit
2850facd
authored
Sep 26, 2016
by
Ronan
Browse files
feat(app): use Linphone module (1.0)!!!
parent
d373f9cd
Changes
53
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
69 additions
and
58 deletions
+69
-58
tests/resources.qrc
tests/resources.qrc
+41
-42
tests/src/main.cpp
tests/src/main.cpp
+1
-1
tests/ui/Linphone/Chat/Chat.qml
tests/ui/Linphone/Chat/Chat.qml
+1
-3
tests/ui/Linphone/Chat/Event.qml
tests/ui/Linphone/Chat/Event.qml
+0
-0
tests/ui/Linphone/Chat/IncomingMessage.qml
tests/ui/Linphone/Chat/IncomingMessage.qml
+1
-1
tests/ui/Linphone/Chat/Message.qml
tests/ui/Linphone/Chat/Message.qml
+0
-0
tests/ui/Linphone/Chat/OutgoingMessage.qml
tests/ui/Linphone/Chat/OutgoingMessage.qml
+1
-1
tests/ui/Linphone/Collapse/Collapse.qml
tests/ui/Linphone/Collapse/Collapse.qml
+2
-3
tests/ui/Linphone/Constants.qml
tests/ui/Linphone/Constants.qml
+16
-0
tests/ui/Linphone/Contact/Avatar.qml
tests/ui/Linphone/Contact/Avatar.qml
+0
-0
tests/ui/Linphone/Contact/Contact.qml
tests/ui/Linphone/Contact/Contact.qml
+1
-1
tests/ui/Linphone/Contact/ContactDescription.qml
tests/ui/Linphone/Contact/ContactDescription.qml
+0
-0
tests/ui/Linphone/Dialog/ConfirmDialog.qml
tests/ui/Linphone/Dialog/ConfirmDialog.qml
+2
-3
tests/ui/Linphone/Dialog/DialogDescription.qml
tests/ui/Linphone/Dialog/DialogDescription.qml
+1
-1
tests/ui/Linphone/Dialog/DialogPlus.qml
tests/ui/Linphone/Dialog/DialogPlus.qml
+1
-1
tests/ui/Linphone/Form/ActionBar.qml
tests/ui/Linphone/Form/ActionBar.qml
+0
-0
tests/ui/Linphone/Form/ActionButton.qml
tests/ui/Linphone/Form/ActionButton.qml
+1
-1
tests/ui/Linphone/Form/CheckBoxText.qml
tests/ui/Linphone/Form/CheckBoxText.qml
+0
-0
tests/ui/Linphone/Form/DarkButton.qml
tests/ui/Linphone/Form/DarkButton.qml
+0
-0
tests/ui/Linphone/Form/DropZone.qml
tests/ui/Linphone/Form/DropZone.qml
+0
-0
No files found.
tests/resources.qrc
View file @
2850facd
...
...
@@ -2,49 +2,7 @@
<qresource
prefix=
"/"
>
<file>
languages/fr.qm
</file>
<file>
languages/en.qm
</file>
<file>
ui/components/scrollBar/ForceScrollBar.qml
</file>
<file>
ui/components/searchBox/SearchBox.qml
</file>
<file>
ui/components/misc/MenuEntry.qml
</file>
<file>
ui/components/timeline/Timeline.qml
</file>
<file>
ui/components/image/Icon.qml
</file>
<file>
ui/components/select/SelectContact.qml
</file>
<file>
ui/components/collapse/Collapse.qml
</file>
<file>
ui/components/chat/IncomingMessage.qml
</file>
<file>
ui/components/chat/Chat.qml
</file>
<file>
ui/components/chat/OutgoingMessage.qml
</file>
<file>
ui/components/chat/Event.qml
</file>
<file>
ui/components/chat/Message.qml
</file>
<file>
ui/components/contact/Contact.qml
</file>
<file>
ui/components/contact/ContactDescription.qml
</file>
<file>
ui/components/contact/Avatar.qml
</file>
<file>
ui/components/popup/DropDownMenu.qml
</file>
<file>
ui/components/popup/PopupShadow.qml
</file>
<file>
ui/components/view/ScrollableListView.qml
</file>
<file>
ui/components/dialog/ConfirmDialog.qml
</file>
<file>
ui/components/dialog/DialogDescription.qml
</file>
<file>
ui/components/dialog/DialogPlus.qml
</file>
<file>
ui/components/form/CheckBoxText.qml
</file>
<file>
ui/components/form/DropZone.qml
</file>
<file>
ui/components/form/LightButton.qml
</file>
<file>
ui/components/form/ListForm.qml
</file>
<file>
ui/components/form/ExclusiveButtons.qml
</file>
<file>
ui/components/form/ActionBar.qml
</file>
<file>
ui/components/form/ActionButton.qml
</file>
<file>
ui/components/form/TransparentComboBox.qml
</file>
<file>
ui/components/form/SmallButton.qml
</file>
<file>
ui/components/form/DarkButton.qml
</file>
<file>
ui/components/invertedMouseArea/InvertedMouseArea.qml
</file>
<file>
ui/scripts/utils.js
</file>
<file>
ui/style/ComponentsStyle/qmldir
</file>
<file>
ui/style/ComponentsStyle/DialogStyle.qml
</file>
<file>
ui/style/ComponentsStyle/ScrollBarStyle.qml
</file>
<file>
ui/style/ComponentsStyle/TimelineStyle.qml
</file>
<file>
ui/style/ComponentsStyle/SearchBoxStyle.qml
</file>
<file>
ui/style/ComponentsStyle/CollapseStyle.qml
</file>
<file>
ui/style/ComponentsStyle/PopupStyle.qml
</file>
<file>
ui/style/AppStyle/qmldir
</file>
<file>
ui/style/AppStyle/Colors.qml
</file>
<file>
ui/style/AppStyle/Constants.qml
</file>
<file>
ui/views/newCall.qml
</file>
<file>
ui/views/manageAccounts.qml
</file>
<file>
ui/views/mainWindow/mainWindow.qml
</file>
...
...
@@ -52,6 +10,47 @@
<file>
ui/views/mainWindow/home.qml
</file>
<file>
ui/views/mainWindow/contact.qml
</file>
<file>
ui/views/mainWindow/conversation.qml
</file>
<file>
ui/Linphone/Popup/DropDownMenu.qml
</file>
<file>
ui/Linphone/Popup/PopupShadow.qml
</file>
<file>
ui/Linphone/qmldir
</file>
<file>
ui/Linphone/ScrollBar/ForceScrollBar.qml
</file>
<file>
ui/Linphone/Chat/IncomingMessage.qml
</file>
<file>
ui/Linphone/Chat/Chat.qml
</file>
<file>
ui/Linphone/Chat/OutgoingMessage.qml
</file>
<file>
ui/Linphone/Chat/Event.qml
</file>
<file>
ui/Linphone/Chat/Message.qml
</file>
<file>
ui/Linphone/SearchBox/SearchBox.qml
</file>
<file>
ui/Linphone/Form/CheckBoxText.qml
</file>
<file>
ui/Linphone/Form/DropZone.qml
</file>
<file>
ui/Linphone/Form/LightButton.qml
</file>
<file>
ui/Linphone/Form/ListForm.qml
</file>
<file>
ui/Linphone/Form/ExclusiveButtons.qml
</file>
<file>
ui/Linphone/Form/ActionBar.qml
</file>
<file>
ui/Linphone/Form/ActionButton.qml
</file>
<file>
ui/Linphone/Form/TransparentComboBox.qml
</file>
<file>
ui/Linphone/Form/SmallButton.qml
</file>
<file>
ui/Linphone/Form/DarkButton.qml
</file>
<file>
ui/Linphone/View/ScrollableListView.qml
</file>
<file>
ui/Linphone/Collapse/Collapse.qml
</file>
<file>
ui/Linphone/Styles/qmldir
</file>
<file>
ui/Linphone/Styles/DialogStyle.qml
</file>
<file>
ui/Linphone/Styles/ScrollBarStyle.qml
</file>
<file>
ui/Linphone/Styles/TimelineStyle.qml
</file>
<file>
ui/Linphone/Styles/SearchBoxStyle.qml
</file>
<file>
ui/Linphone/Styles/CollapseStyle.qml
</file>
<file>
ui/Linphone/Styles/PopupStyle.qml
</file>
<file>
ui/Linphone/Timeline/Timeline.qml
</file>
<file>
ui/Linphone/Misc/MenuEntry.qml
</file>
<file>
ui/Linphone/InvertedMouseArea/InvertedMouseArea.qml
</file>
<file>
ui/Linphone/Select/SelectContact.qml
</file>
<file>
ui/Linphone/Contact/Contact.qml
</file>
<file>
ui/Linphone/Contact/ContactDescription.qml
</file>
<file>
ui/Linphone/Contact/Avatar.qml
</file>
<file>
ui/Linphone/Constants.qml
</file>
<file>
ui/Linphone/Dialog/ConfirmDialog.qml
</file>
<file>
ui/Linphone/Dialog/DialogDescription.qml
</file>
<file>
ui/Linphone/Dialog/DialogPlus.qml
</file>
<file>
ui/Linphone/Image/Icon.qml
</file>
<file>
imgs/lost_outgoing_call.svg
</file>
<file>
imgs/led_disconnected.svg
</file>
<file>
imgs/valid.svg
</file>
...
...
tests/src/main.cpp
View file @
2850facd
...
...
@@ -56,7 +56,7 @@ int main (int argc, char *argv[]) {
selector
->
setExtraSelectors
(
QStringList
(
"custom"
));
// Set modules paths.
engine
.
addImportPath
(
":/ui/
style
"
);
engine
.
addImportPath
(
":/ui/"
);
engine
.
load
(
QUrl
(
"qrc:/ui/views/mainWindow/mainWindow.qml"
));
if
(
engine
.
rootObjects
().
isEmpty
())
...
...
tests/ui/
components/c
hat/Chat.qml
→
tests/ui/
Linphone/C
hat/Chat.qml
View file @
2850facd
...
...
@@ -2,9 +2,7 @@ import QtQuick 2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/form
'
import
'
qrc:/ui/components/image
'
import
'
qrc:/ui/components/view
'
import
Linphone
1.0
ScrollableListView
{
model
:
ListModel
{
...
...
tests/ui/
components/c
hat/Event.qml
→
tests/ui/
Linphone/C
hat/Event.qml
View file @
2850facd
File moved
tests/ui/
components/c
hat/IncomingMessage.qml
→
tests/ui/
Linphone/C
hat/IncomingMessage.qml
View file @
2850facd
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/contact
'
import
Linphone
1.0
// ===================================================================
...
...
tests/ui/
components/c
hat/Message.qml
→
tests/ui/
Linphone/C
hat/Message.qml
View file @
2850facd
File moved
tests/ui/
components/c
hat/OutgoingMessage.qml
→
tests/ui/
Linphone/C
hat/OutgoingMessage.qml
View file @
2850facd
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/image
'
import
Linphone
1.0
Message
{
backgroundColor
:
'
#E4E4E4
'
...
...
tests/ui/
components/c
ollapse/Collapse.qml
→
tests/ui/
Linphone/C
ollapse/Collapse.qml
View file @
2850facd
import
QtQuick
2.7
import
ComponentsStyle
1.0
import
'
qrc:/ui/components/form
'
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// A simple component to build collapsed item.
...
...
tests/ui/Linphone/Constants.qml
0 → 100644
View file @
2850facd
pragma
Singleton
import
QtQuick
2.7
QtObject
{
property
int
zPopup
:
999
property
int
zMax
:
999999
// TODO: Mutualize similar colors.
property
QtObject
colors
:
QtObject
{
property
string
a
:
'
#808080
'
property
string
b
:
'
#5E5E5F
'
property
string
c
:
'
#C5C5C5
'
property
string
d
:
'
#5A585B
'
property
string
e
:
'
#DEDEDE
'
}
}
tests/ui/
components/c
ontact/Avatar.qml
→
tests/ui/
Linphone/C
ontact/Avatar.qml
View file @
2850facd
File moved
tests/ui/
components/c
ontact/Contact.qml
→
tests/ui/
Linphone/C
ontact/Contact.qml
View file @
2850facd
import
QtQuick
2.7
import
QtQuick
.
Layouts
1.3
import
'
qrc:/ui/components/form
'
import
Linphone
1.0
// ===================================================================
...
...
tests/ui/
components/c
ontact/ContactDescription.qml
→
tests/ui/
Linphone/C
ontact/ContactDescription.qml
View file @
2850facd
File moved
tests/ui/
components/d
ialog/ConfirmDialog.qml
→
tests/ui/
Linphone/D
ialog/ConfirmDialog.qml
View file @
2850facd
import
QtQuick
2.7
import
ComponentsStyle
1.0
import
'
qrc:/ui/components/form
'
import
Linphone
1.0
import
Linphone
.
Styles
1.0
// ===================================================================
// A dialog with OK/Cancel buttons.
...
...
tests/ui/
components/d
ialog/DialogDescription.qml
→
tests/ui/
Linphone/D
ialog/DialogDescription.qml
View file @
2850facd
import
QtQuick
2.7
import
Components
Style
1.0
import
Linphone
.
Style
s
1.0
// ===================================================================
// Description content used by dialogs.
...
...
tests/ui/
components/d
ialog/DialogPlus.qml
→
tests/ui/
Linphone/D
ialog/DialogPlus.qml
View file @
2850facd
...
...
@@ -2,7 +2,7 @@ import QtQuick 2.7
import
QtQuick
.
Layouts
1.3
import
QtQuick
.
Window
2.2
import
Components
Style
1.0
import
Linphone
.
Style
s
1.0
// ===================================================================
// Helper to build quickly dialogs.
...
...
tests/ui/
components/f
orm/ActionBar.qml
→
tests/ui/
Linphone/F
orm/ActionBar.qml
View file @
2850facd
File moved
tests/ui/
components/f
orm/ActionButton.qml
→
tests/ui/
Linphone/F
orm/ActionButton.qml
View file @
2850facd
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
'
qrc:/ui/components/image
'
import
Linphone
1.0
// ===================================================================
// An animated small button with an image.
...
...
tests/ui/
components/f
orm/CheckBoxText.qml
→
tests/ui/
Linphone/F
orm/CheckBoxText.qml
View file @
2850facd
File moved
tests/ui/
components/f
orm/DarkButton.qml
→
tests/ui/
Linphone/F
orm/DarkButton.qml
View file @
2850facd
File moved
tests/ui/
components/f
orm/DropZone.qml
→
tests/ui/
Linphone/F
orm/DropZone.qml
View file @
2850facd
File moved
Prev
1
2
3
Next
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