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
b04ab273
Commit
b04ab273
authored
Mar 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Calls/Incall): open fullscreen correctly
parent
231f4144
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
14 deletions
+4
-14
resources.qrc
linphone-desktop/resources.qrc
+1
-2
Window.js
linphone-desktop/ui/modules/Common/Window/Window.js
+2
-2
Incall.js
linphone-desktop/ui/views/App/Calls/Incall.js
+1
-1
IncallFullscreenWindow.qml
...one-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml
+0
-0
qmldir
linphone-desktop/ui/views/App/qmldir
+0
-9
No files found.
linphone-desktop/resources.qrc
View file @
b04ab273
...
@@ -312,11 +312,11 @@
...
@@ -312,11 +312,11 @@
<file>
ui/scripts/Utils/utils.js
</file>
<file>
ui/scripts/Utils/utils.js
</file>
<file>
ui/views/App/Calls/AbstractStartingCall.qml
</file>
<file>
ui/views/App/Calls/AbstractStartingCall.qml
</file>
<file>
ui/views/App/Calls/CallsWindow.qml
</file>
<file>
ui/views/App/Calls/CallsWindow.qml
</file>
<file>
ui/views/App/Calls/IncallFullscreenWindow.qml
</file>
<file>
ui/views/App/Calls/Incall.js
</file>
<file>
ui/views/App/Calls/Incall.js
</file>
<file>
ui/views/App/Calls/Incall.qml
</file>
<file>
ui/views/App/Calls/Incall.qml
</file>
<file>
ui/views/App/Calls/IncomingCall.qml
</file>
<file>
ui/views/App/Calls/IncomingCall.qml
</file>
<file>
ui/views/App/Calls/OutgoingCall.qml
</file>
<file>
ui/views/App/Calls/OutgoingCall.qml
</file>
<file>
ui/views/App/IncallFullscreenWindow.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantAbstractView.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantAbstractView.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantCreateLinphoneSipAccount.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml
</file>
<file>
ui/views/App/Main/Assistant/AssistantFetchRemoteConfiguration.qml
</file>
...
@@ -335,7 +335,6 @@
...
@@ -335,7 +335,6 @@
<file>
ui/views/App/Main/MainWindowMenuBar.qml
</file>
<file>
ui/views/App/Main/MainWindowMenuBar.qml
</file>
<file>
ui/views/App/Main/MainWindow.qml
</file>
<file>
ui/views/App/Main/MainWindow.qml
</file>
<file>
ui/views/App/Main/ManageAccounts.qml
</file>
<file>
ui/views/App/Main/ManageAccounts.qml
</file>
<file>
ui/views/App/qmldir
</file>
<file>
ui/views/App/Settings/SettingsAudio.qml
</file>
<file>
ui/views/App/Settings/SettingsAudio.qml
</file>
<file>
ui/views/App/Settings/SettingsCallsChat.qml
</file>
<file>
ui/views/App/Settings/SettingsCallsChat.qml
</file>
<file>
ui/views/App/Settings/SettingsNetwork.qml
</file>
<file>
ui/views/App/Settings/SettingsNetwork.qml
</file>
...
...
linphone-desktop/ui/modules/Common/Window/Window.js
View file @
b04ab273
...
@@ -11,12 +11,12 @@
...
@@ -11,12 +11,12 @@
// at item destruction.
// at item destruction.
//
//
// The exit status handler is optional.
// The exit status handler is optional.
function
attachVirtualWindow
(
objec
t
,
properties
,
exitStatusHandler
)
{
function
attachVirtualWindow
(
componen
t
,
properties
,
exitStatusHandler
)
{
if
(
virtualWindow
.
visible
)
{
if
(
virtualWindow
.
visible
)
{
return
return
}
}
var
object
=
Utils
.
createObject
(
objec
t
,
null
,
{
var
object
=
Utils
.
createObject
(
componen
t
,
null
,
{
properties
:
properties
properties
:
properties
})
})
...
...
linphone-desktop/ui/views/App/Calls/Incall.js
View file @
b04ab273
...
@@ -66,7 +66,7 @@ function showFullscreen () {
...
@@ -66,7 +66,7 @@ function showFullscreen () {
return
return
}
}
incall
.
_fullscreen
=
Utils
.
openWindow
(
'
IncallFullscreenWindow
'
,
incall
,
{
incall
.
_fullscreen
=
Utils
.
openWindow
(
Qt
.
resolvedUrl
(
'
IncallFullscreenWindow.qml
'
)
,
incall
,
{
properties
:
{
properties
:
{
call
:
incall
.
call
,
call
:
incall
.
call
,
callsWindow
:
incall
callsWindow
:
incall
...
...
linphone-desktop/ui/views/App/IncallFullscreenWindow.qml
→
linphone-desktop/ui/views/App/
Calls/
IncallFullscreenWindow.qml
View file @
b04ab273
File moved
linphone-desktop/ui/views/App/qmldir
deleted
100644 → 0
View file @
231f4144
# ==============================================================================
# Linphone's views.
# ==============================================================================
module App
# Views ------------------------------------------------------------------------
IncallFullscreenWindow 1.0 IncallFullscreenWindow.qml
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