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
386f1130
Commit
386f1130
authored
Mar 09, 2018
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(App): register FileExtractor
parent
5c05229f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
16 deletions
+18
-16
App.cpp
src/app/App.cpp
+17
-16
Components.hpp
src/components/Components.hpp
+1
-0
No files found.
src/app/App.cpp
View file @
386f1130
...
...
@@ -298,12 +298,12 @@ QQuickWindow *App::getSettingsWindow () {
if
(
!
mSettingsWindow
)
{
mSettingsWindow
=
::
createSubWindow
(
mEngine
,
cQmlViewSettingsWindow
);
QObject
::
connect
(
mSettingsWindow
,
&
QWindow
::
visibilityChanged
,
this
,
[](
QWindow
::
Visibility
visibility
)
{
if
(
visibility
==
QWindow
::
Hidden
)
{
qInfo
()
<<
QStringLiteral
(
"Update nat policy."
);
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
core
->
setNatPolicy
(
core
->
getNatPolicy
());
}
});
if
(
visibility
==
QWindow
::
Hidden
)
{
qInfo
()
<<
QStringLiteral
(
"Update nat policy."
);
shared_ptr
<
linphone
::
Core
>
core
=
CoreManager
::
getInstance
()
->
getCore
();
core
->
setNatPolicy
(
core
->
getNatPolicy
());
}
});
}
return
mSettingsWindow
;
...
...
@@ -377,8 +377,8 @@ void registerType (const char *name) {
template
<
class
T
>
void
registerToolType
(
const
char
*
name
)
{
qmlRegisterSingletonType
<
T
>
(
name
,
1
,
0
,
name
,
[](
QQmlEngine
*
engine
,
QJSEngine
*
)
->
QObject
*
{
return
new
T
(
engine
);
});
return
new
T
(
engine
);
});
}
#define registerSharedToolType(TYPE, NAME, METHOD) qmlRegisterSingletonType<TYPE>( \
...
...
@@ -405,6 +405,7 @@ void App::registerTypes () {
registerType
<
ConferenceHelperModel
>
(
"ConferenceHelperModel"
);
registerType
<
ConferenceModel
>
(
"ConferenceModel"
);
registerType
<
ContactsListProxyModel
>
(
"ContactsListProxyModel"
);
registerType
<
FileExtractor
>
(
"FileExtractor"
);
registerType
<
SipAddressesProxyModel
>
(
"SipAddressesProxyModel"
);
registerType
<
SoundPlayer
>
(
"SoundPlayer"
);
registerType
<
TelephoneNumbersModel
>
(
"TelephoneNumbersModel"
);
...
...
@@ -472,15 +473,15 @@ void App::setTrayIcon () {
// trayIcon: Left click actions.
QMenu
*
menu
=
new
QMenu
();
root
->
connect
(
systemTrayIcon
,
&
QSystemTrayIcon
::
activated
,
[
root
](
QSystemTrayIcon
::
ActivationReason
reason
)
{
if
(
reason
==
QSystemTrayIcon
::
Trigger
)
{
if
(
root
->
visibility
()
==
QWindow
::
Hidden
)
smartShowWindow
(
root
);
else
root
->
hide
();
QSystemTrayIcon
::
ActivationReason
reason
)
{
if
(
reason
==
QSystemTrayIcon
::
Trigger
)
{
if
(
root
->
visibility
()
==
QWindow
::
Hidden
)
smartShowWindow
(
root
);
else
root
->
hide
();
}
});
});
// Build trayIcon menu.
menu
->
addAction
(
restoreAction
);
...
...
src/components/Components.hpp
View file @
386f1130
...
...
@@ -36,6 +36,7 @@
#include "conference/ConferenceModel.hpp"
#include "contacts/ContactsListProxyModel.hpp"
#include "core/CoreManager.hpp"
#include "file/FileExtractor.hpp"
#include "presence/OwnPresenceModel.hpp"
#include "settings/AccountSettingsModel.hpp"
#include "sip-addresses/SipAddressesProxyModel.hpp"
...
...
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