Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
3a23e495
Commit
3a23e495
authored
Apr 29, 2015
by
Edric Milaret
Committed by
Guillaume Roguez
Apr 29, 2015
Browse files
windows: bring client to front on call
Refs #72073 Change-Id: Ic886056e8ac49646bbbb838d711d104868b7b747
parent
18e81848
Changes
2
Hide whitespace changes
Inline
Side-by-side
mainwindow.cpp
View file @
3a23e495
...
...
@@ -40,6 +40,9 @@ MainWindow::MainWindow(QWidget *parent) :
connect
(
&
sysIcon_
,
SIGNAL
(
activated
(
QSystemTrayIcon
::
ActivationReason
)),
this
,
SLOT
(
trayActivated
(
QSystemTrayIcon
::
ActivationReason
)));
connect
(
CallModel
::
instance
(),
SIGNAL
(
incomingCall
(
Call
*
)),
this
,
SLOT
(
onIncomingCall
(
Call
*
)));
navStack_
=
new
NavStack
(
ui
->
bar
,
ui
->
stackedWidgetView
,
this
);
ui
->
verticalLayout_2
->
addWidget
(
new
QSizeGrip
(
this
),
0
,
Qt
::
AlignBottom
|
Qt
::
AlignRight
);
...
...
@@ -71,3 +74,8 @@ MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason) {
if
(
reason
!=
QSystemTrayIcon
::
ActivationReason
::
Context
)
this
->
show
();
}
void
MainWindow
::
onIncomingCall
(
Call
*
call
)
{
Q_UNUSED
(
call
);
QWidget
::
showNormal
();
}
mainwindow.h
View file @
3a23e495
...
...
@@ -40,6 +40,7 @@ public:
private
slots
:
void
trayActivated
(
QSystemTrayIcon
::
ActivationReason
reason
);
void
onIncomingCall
(
Call
*
call
);
private:
Ui
::
MainWindow
*
ui
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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