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
4ce2c6f9
Commit
4ce2c6f9
authored
Feb 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Main/MainWindow): handle correcty window visibility
parent
93371b87
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
Logger.hpp
linphone-desktop/src/app/Logger.hpp
+1
-1
NotificationReceivedFileMessage.qml
...inphone/Notifications/NotificationReceivedFileMessage.qml
+1
-1
NotificationReceivedMessage.qml
...es/Linphone/Notifications/NotificationReceivedMessage.qml
+1
-1
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+7
-1
No files found.
linphone-desktop/src/app/Logger.hpp
View file @
4ce2c6f9
...
...
@@ -30,7 +30,7 @@
class
Logger
{
public:
static
void
init
();
static
Logger
*
instance
()
{
return
m_instance
;
};
static
Logger
*
instance
()
{
return
m_instance
;
};
bool
isVerbose
()
const
{
return
m_verbose
;
};
void
setVerbose
(
bool
verbose
)
{
m_verbose
=
verbose
;
};
...
...
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
View file @
4ce2c6f9
...
...
@@ -13,7 +13,7 @@ Notification {
// ---------------------------------------------------------------------------
property
string
_fileUri
:
notificationData
?
notificationData
.
fileUri
:
''
property
string
_fileUri
:
notificationData
&&
notificationData
.
fileUri
||
''
// ---------------------------------------------------------------------------
...
...
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file @
4ce2c6f9
...
...
@@ -12,7 +12,7 @@ Notification {
// ---------------------------------------------------------------------------
property
string
_sipAddress
:
notificationData
?
notificationData
.
sipAddress
:
''
property
string
_sipAddress
:
notificationData
&&
notificationData
.
sipAddress
||
''
property
var
_contact
:
_contactObserver
.
contact
property
var
_contactObserver
:
SipAddressesModel
.
getContactObserver
(
_sipAddress
)
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
4ce2c6f9
import
QtQuick
2.7
import
QtQuick
.
Controls
2.0
import
QtQuick
.
Layouts
1.3
import
QtQuick
.
Window
2.2
// Explicit import to support Toolbar.
import
QtQuick
.
Controls
1.4
as
Controls1
...
...
@@ -65,7 +66,12 @@ Controls1.ApplicationWindow {
}
function
_setView
(
view
,
props
)
{
window
.
show
()
if
(
window
.
visibility
===
Window
.
Minimized
)
{
window
.
visibility
=
Window
.
AutomaticVisibility
}
else
{
window
.
setVisible
(
true
)
}
window
.
requestActivate
()
collapse
.
setCollapsed
(
true
)
...
...
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