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
5d575b4b
Commit
5d575b4b
authored
8 years ago
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unstable
parent
c8a7651b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
45 additions
and
23 deletions
+45
-23
resources.qrc
tests/resources.qrc
+1
-0
ContactModel.hpp
tests/src/components/contacts/ContactModel.hpp
+1
-0
ContactsListModel.cpp
tests/src/components/contacts/ContactsListModel.cpp
+1
-0
ContactsListModel.hpp
tests/src/components/contacts/ContactsListModel.hpp
+0
-1
SmartSearchBarModel.cpp
...s/src/components/smart-search-bar/SmartSearchBarModel.cpp
+1
-0
SmartSearchBarModel.hpp
...s/src/components/smart-search-bar/SmartSearchBarModel.hpp
+9
-0
SmartSearchBar.qml
tests/ui/modules/Linphone/SmartSearchBar.qml
+25
-0
qmldir
tests/ui/modules/Linphone/qmldir
+3
-0
MainWindow.qml
tests/ui/views/App/MainWindow/MainWindow.qml
+4
-22
No files found.
tests/resources.qrc
View file @
5d575b4b
...
...
@@ -127,6 +127,7 @@
<file>
ui/modules/Linphone/Presence/PresenceString.qml
</file>
<file>
ui/modules/Linphone/qmldir
</file>
<file>
ui/modules/Linphone/Select/SelectContact.qml
</file>
<file>
ui/modules/Linphone/SmartSearchBar.qml
</file>
<file>
ui/modules/Linphone/Styles/Account/AccountStatusStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/ChatStyle.qml
</file>
<file>
ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
</file>
...
...
This diff is collapsed.
Click to expand it.
tests/src/components/contacts/ContactModel.hpp
View file @
5d575b4b
...
...
@@ -10,6 +10,7 @@
// ===================================================================
class
ContactModel
:
public
QObject
{
friend
class
ContactsListModel
;
friend
class
ContactsListProxyModel
;
Q_OBJECT
;
...
...
This diff is collapsed.
Click to expand it.
tests/src/components/contacts/ContactsListModel.cpp
View file @
5d575b4b
...
...
@@ -59,6 +59,7 @@ bool ContactsListModel::removeRows (int row, int count, const QModelIndex &paren
ContactModel
*
contact
=
m_list
[
row
];
m_list
.
removeAt
(
row
);
m_linphone_friends
->
removeFriend
(
contact
->
m_linphone_friend
);
contact
->
deleteLater
();
}
...
...
This diff is collapsed.
Click to expand it.
tests/src/components/contacts/ContactsListModel.hpp
View file @
5d575b4b
...
...
@@ -25,7 +25,6 @@ public:
bool
removeRow
(
int
row
,
const
QModelIndex
&
parent
=
QModelIndex
());
bool
removeRows
(
int
row
,
int
count
,
const
QModelIndex
&
parent
=
QModelIndex
());
public
slots
:
// See: http://doc.qt.io/qt-5/qtqml-cppintegration-data.html#data-ownership
// The returned value must have a explicit parent or a QQmlEngine::CppOwnership.
...
...
This diff is collapsed.
Click to expand it.
tests/src/components/smart-search-bar/SmartSearchBarModel.cpp
0 → 100644
View file @
5d575b4b
#include "SmartSearchBarModel.hpp"
This diff is collapsed.
Click to expand it.
tests/src/components/smart-search-bar/SmartSearchBarModel.hpp
0 → 100644
View file @
5d575b4b
#ifndef SMART_SEARCH_BAR_MODEL_H_
#define SMART_SEARCH_BAR_MODEL_H_
class
SmartSearchBarModel
{
};
#endif
This diff is collapsed.
Click to expand it.
tests/ui/modules/Linphone/SmartSearchBar.qml
0 → 100644
View file @
5d575b4b
import
Common
1.0
import
Linphone
1.0
// ===================================================================
SearchBox
{
id
:
searchBox
delegate
:
Contact
{
contact
:
$contact
width
:
parent
.
width
actions
:
[
ActionButton
{
icon
:
'
call
'
onClicked
:
CallsWindow
.
show
()
},
ActionButton
{
icon
:
'
video_call
'
onClicked
:
CallsWindow
.
show
()
}
]
}
}
This diff is collapsed.
Click to expand it.
tests/ui/modules/Linphone/qmldir
View file @
5d575b4b
...
...
@@ -27,5 +27,8 @@ PresenceString 1.0 Presence/PresenceString.qml
# Select
SelectContact 1.0 Select/SelectContact.qml
# SmartSearchBar
SmartSearchBar 1.0 SmartSearchBar.qml
# Timeline
Timeline 1.0 Timeline.qml
This diff is collapsed.
Click to expand it.
tests/ui/views/App/MainWindow/MainWindow.qml
View file @
5d575b4b
...
...
@@ -28,7 +28,7 @@ ApplicationWindow {
visible
:
true
onActiveFocusItemChanged
:
activeFocusItem
==
null
&&
s
earchBox
.
hideMenu
()
s
martSearchBar
.
hideMenu
()
// -----------------------------------------------------------------
// Toolbar properties.
...
...
@@ -82,32 +82,14 @@ ApplicationWindow {
}
}
S
earchBox
{
id
:
s
earchBox
S
martSearchBar
{
id
:
s
martSearchBar
Layout.fillWidth
:
true
entryHeight
:
MainWindowStyle
.
searchBox
.
entryHeight
maxMenuHeight
:
MainWindowStyle
.
searchBox
.
maxHeight
placeholderText
:
qsTr
(
'
mainSearchBarPlaceholder
'
)
model
:
ContactsListProxyModel
{}
delegate
:
Contact
{
contact
:
$contact
width
:
parent
.
width
actions
:
[
ActionButton
{
icon
:
'
call
'
onClicked
:
CallsWindow
.
show
()
},
ActionButton
{
icon
:
'
video_call
'
onClicked
:
CallsWindow
.
show
()
}
]
}
placeholderText
:
qsTr
(
'
mainSearchBarPlaceholder
'
)
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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