Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
08748397
Commit
08748397
authored
Sep 03, 2019
by
Sébastien Blin
Committed by
Andreas Traczyk
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix build on linux
Change-Id: Ie802c7aebe23ef30a18c0765ac9878d3a57b913c
parent
f54419bd
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
160 additions
and
135 deletions
+160
-135
advancedsettingswidget.ui
advancedsettingswidget.ui
+1
-1
advancedsipsettingwidget.ui
advancedsipsettingwidget.ui
+1
-1
downloadmanager.cpp
downloadmanager.cpp
+2
-0
jami-qt.pro
jami-qt.pro
+132
-124
levelmeter.cpp
levelmeter.cpp
+1
-0
main.cpp
main.cpp
+1
-1
messagewebview.cpp
messagewebview.cpp
+2
-2
photoboothwidget.cpp
photoboothwidget.cpp
+2
-2
photoboothwidget.h
photoboothwidget.h
+1
-1
runguard.cpp
runguard.cpp
+2
-0
settingswidget.cpp
settingswidget.cpp
+10
-2
settingswidget.ui
settingswidget.ui
+1
-1
utils.cpp
utils.cpp
+4
-0
No files found.
advancedsettingswidget.ui
View file @
08748397
...
...
@@ -1421,7 +1421,7 @@
<customwidget>
<class>
ToggleSwitch
</class>
<extends>
QWidget
</extends>
<header>
ToggleS
witch.h
</header>
<header>
toggles
witch.h
</header>
<container>
1
</container>
</customwidget>
</customwidgets>
...
...
advancedsipsettingwidget.ui
View file @
08748397
...
...
@@ -1952,7 +1952,7 @@
<customwidget>
<class>
ToggleSwitch
</class>
<extends>
QWidget
</extends>
<header>
ToggleS
witch.h
</header>
<header>
toggles
witch.h
</header>
<container>
1
</container>
</customwidget>
</customwidgets>
...
...
downloadmanager.cpp
View file @
08748397
...
...
@@ -22,7 +22,9 @@
#include <QMessageBox>
#ifdef Q_OS_WIN
#include <windows.h>
#endif // !Q_OS_WIN
DownloadManager
::
DownloadManager
()
{}
...
...
jami-qt.pro
View file @
08748397
TEMPLATE
=
app
TARGET
=
jami
-
qt
QT
+=
widgets
xml
multimedia
multimediawidgets
network
webenginewidgets
CONFIG
+=
c
++
17
QT
+=
widgets
xml
multimedia
multimediawidgets
network
webenginewidgets
svg
isEmpty
(
LRC
)
{
LRC
=../../
install
/
lrc
/
...
...
@@ -14,128 +16,134 @@ LIBS += -L$${LRC}/lib -lringclient
LIBS
+=
-
lqrencode
#
Input
HEADERS
+=
.
/
pixbufmanipulator
.
h
\
.
/
ringthemeutils
.
h
\
.
/
runguard
.
h
\
.
/
settingskey
.
h
\
.
/
utils
.
h
\
.
/
version
.
h
\
.
/
webchathelpers
.
h
\
.
/
windowscontactbackend
.
h
\
.
/
aboutdialog
.
h
\
.
/
callwidget
.
h
\
.
/
accountlistmodel
.
h
\
.
/
accountitemdelegate
.
h
\
.
/
deleteaccountdialog
.
h
\
.
/
globalsystemtray
.
h
\
.
/
idlabel
.
h
\
.
/
mainwindow
.
h
\
.
/
navwidget
.
h
\
.
/
photoboothwidget
.
h
\
.
/
invitebuttonswidget
.
h
\
.
/
currentaccountcombobox
.
h
\
.
/
animationhelpers
.
h
\
.
/
advancedsettingswidget
.
h
\
.
/
avatargraphicsview
.
h
\
.
/
bannedlistmodel
.
h
\
.
/
linkdevicedialog
.
h
\
.
/
bezierconnectorwidget
.
h
\
.
/
lrcinstance
.
h
\
.
/
messagewebview
.
h
\
.
/
messagewebpage
.
h
\
.
/
passworddialog
.
h
\
.
/
newwizardwidget
.
h
\
.
/
advancedsipsettingwidget
.
h
\
.
/
iconbutton
.
h
\
.
/
deviceitemwidget
.
h
\
.
/
banneditemwidget
.
h
\
.
/
ringbutton
.
h
\
.
/
ringcontactlineedit
.
h
\
.
/
nameregistrationdialog
.
h
\
.
/
selectareadialog
.
h
\
.
/
smartlistview
.
h
\
.
/
conversationitemdelegate
.
h
\
.
/
smartlistmodel
.
h
\
.
/
conversationsfilterwidget
.
h
\
.
/
smartlistselectorbuttonnotifier
.
h
\
.
/
settingswidget
.
h
\
.
/
toggleswitch
.
h
\
.
/
videooverlay
.
h
\
.
/
videoview
.
h
\
.
/
videowidget
.
h
\
.
/
downloadbar
.
h
\
.
/
updateconfirmdialog
.
h
\
.
/
downloadmanger
.
h
SOURCES
+=
.
/
advancedsettingswidget
.
cpp
\
.
/
advancedsipsettingwidget
.
cpp
\
.
/
avatargraphicsview
.
cpp
\
.
/
banneditemwidget
.
cpp
\
.
/
bannedlistmodel
.
cpp
\
.
/
animationhelpers
.
cpp
\
.
/
currentaccountcombobox
.
cpp
\
.
/
aboutdialog
.
cpp
\
.
/
accountitemdelegate
.
cpp
\
.
/
accountlistmodel
.
cpp
\
.
/
callwidget
.
cpp
\
.
/
deleteaccountdialog
.
cpp
\
.
/
deviceitemwidget
.
cpp
\
.
/
globalsystemtray
.
cpp
\
.
/
iconbutton
.
cpp
\
.
/
idlabel
.
cpp
\
.
/
bezierconnectorwidget
.
cpp
\
.
/
invitebuttonswidget
.
cpp
\
.
/
linkdevicedialog
.
cpp
\
.
/
main
.
cpp
\
.
/
mainwindow
.
cpp
\
.
/
messagewebpage
.
cpp
\
.
/
messagewebview
.
cpp
\
.
/
navwidget
.
cpp
\
.
/
newwizardwidget
.
cpp
\
.
/
passworddialog
.
cpp
\
.
/
photoboothwidget
.
cpp
\
.
/
pixbufmanipulator
.
cpp
\
.
/
nameregistrationdialog
.
cpp
\
.
/
ringbutton
.
cpp
\
.
/
ringcontactlineedit
.
cpp
\
.
/
runguard
.
cpp
\
.
/
selectareadialog
.
cpp
\
.
/
conversationsfilterwidget
.
cpp
\
.
/
settingswidget
.
cpp
\
.
/
smartlistselectorbuttonnotifier
.
cpp
\
.
/
smartlistview
.
cpp
\
.
/
conversationitemdelegate
.
cpp
\
.
/
smartlistmodel
.
cpp
\
.
/
toggleswitch
.
cpp
\
.
/
utils
.
cpp
\
.
/
videooverlay
.
cpp
\
.
/
videoview
.
cpp
\
.
/
videowidget
.
cpp
\
.
/
webchathelpers
.
cpp
\
.
/
windowscontactbackend
.
cpp
\
.
/
downloadbar
.
cpp
\
.
/
updateconfirmdialog
.
cpp
\
.
/
downloadmanger
.
cpp
HEADERS
+=
.
/
aboutdialog
.
h
\
.
/
banneditemwidget
.
h
\
.
/
conversationsfilterwidget
.
h
\
.
/
idlabel
.
h
\
.
/
messagewebview
.
h
\
.
/
ringbutton
.
h
\
.
/
smartlistmodel
.
h
\
.
/
utils
.
h
\
.
/
accountitemdelegate
.
h
\
.
/
bannedlistmodel
.
h
\
.
/
currentaccountcombobox
.
h
\
.
/
invitebuttonswidget
.
h
\
.
/
nameregistrationdialog
.
h
\
.
/
ringcontactlineedit
.
h
\
.
/
smartlistselectorbuttonnotifier
.
h
\
.
/
version
.
h
\
.
/
accountlistmodel
.
h
\
.
/
bezierconnectorwidget
.
h
\
.
/
deleteaccountdialog
.
h
\
.
/
levelmeter
.
h
\
.
/
navwidget
.
h
\
.
/
ringthemeutils
.
h
\
.
/
smartlistview
.
h
\
.
/
videooverlay
.
h
\
.
/
advancedsettingswidget
.
h
\
.
/
callwidget
.
h
\
.
/
deviceitemwidget
.
h
\
.
/
linkdevicedialog
.
h
\
.
/
newwizardwidget
.
h
\
.
/
runguard
.
h
\
.
/
splashscreen
.
h
\
.
/
videoview
.
h
\
.
/
advancedsipsettingwidget
.
h
\
.
/
contactpicker
.
h
\
.
/
downloadmanager
.
h
\
.
/
lrcinstance
.
h
\
.
/
passworddialog
.
h
\
.
/
selectareadialog
.
h
\
.
/
toggleswitch
.
h
\
.
/
videowidget
.
h
\
.
/
animationhelpers
.
h
\
.
/
contactpickeritemdelegate
.
h
\
.
/
globalsystemtray
.
h
\
.
/
mainwindow
.
h
\
.
/
photoboothwidget
.
h
\
.
/
settingskey
.
h
\
.
/
updateconfirmdialog
.
h
\
.
/
webchathelpers
.
h
\
.
/
avatargraphicsview
.
h
\
.
/
conversationitemdelegate
.
h
\
.
/
iconbutton
.
h
\
.
/
messagewebpage
.
h
\
.
/
pixbufmanipulator
.
h
\
.
/
settingswidget
.
h
\
.
/
updatedownloaddialog
.
h
SOURCES
+=
.
/
aboutdialog
.
cpp
\
.
/
banneditemwidget
.
cpp
\
.
/
conversationsfilterwidget
.
cpp
\
.
/
idlabel
.
cpp
\
.
/
messagewebview
.
cpp
\
.
/
ringbutton
.
cpp
\
.
/
smartlistview
.
cpp
\
.
/
videoview
.
cpp
\
.
/
accountitemdelegate
.
cpp
\
.
/
bannedlistmodel
.
cpp
\
.
/
currentaccountcombobox
.
cpp
\
.
/
invitebuttonswidget
.
cpp
\
.
/
nameregistrationdialog
.
cpp
\
.
/
ringcontactlineedit
.
cpp
\
.
/
splashscreen
.
cpp
\
.
/
videowidget
.
cpp
\
.
/
accountlistmodel
.
cpp
\
.
/
bezierconnectorwidget
.
cpp
\
.
/
deleteaccountdialog
.
cpp
\
.
/
levelmeter
.
cpp
\
.
/
navwidget
.
cpp
\
.
/
runguard
.
cpp
\
.
/
toggleswitch
.
cpp
\
.
/
webchathelpers
.
cpp
\
.
/
advancedsettingswidget
.
cpp
\
.
/
callwidget
.
cpp
\
.
/
deviceitemwidget
.
cpp
\
.
/
linkdevicedialog
.
cpp
\
.
/
newwizardwidget
.
cpp
\
.
/
selectareadialog
.
cpp
\
.
/
updateconfirmdialog
.
cpp
\
.
/
advancedsipsettingwidget
.
cpp
\
.
/
contactpicker
.
cpp
\
.
/
downloadmanager
.
cpp
\
.
/
main
.
cpp
\
.
/
passworddialog
.
cpp
\
.
/
settingswidget
.
cpp
\
.
/
updatedownloaddialog
.
cpp
\
.
/
animationhelpers
.
cpp
\
.
/
contactpickeritemdelegate
.
cpp
\
.
/
globalsystemtray
.
cpp
\
.
/
mainwindow
.
cpp
\
.
/
photoboothwidget
.
cpp
\
.
/
smartlistmodel
.
cpp
\
.
/
utils
.
cpp
\
.
/
avatargraphicsview
.
cpp
\
.
/
conversationitemdelegate
.
cpp
\
.
/
iconbutton
.
cpp
\
.
/
messagewebpage
.
cpp
\
.
/
pixbufmanipulator
.
cpp
\
.
/
smartlistselectorbuttonnotifier
.
cpp
\
.
/
videooverlay
.
cpp
FORMS
+=
.
/
aboutdialog
.
ui
\
.
/
advancedsettings
widget
.
ui
\
.
/
advancedsipsetting
widget
.
ui
\
.
/
animatedoverlay
.
ui
\
.
/
banneditemwidget
.
ui
\
.
/
callwidget
.
ui
\
.
/
deleteaccountdialog
.
ui
\
.
/
deviceitemwidget
.
ui
\
.
/
invitebuttonswidget
.
ui
\
.
/
linkdevicedialog
.
ui
\
.
/
mainwindow
.
ui
\
.
/
nameregistrationdialog
.
ui
\
.
/
newwizardwidget
.
ui
\
.
/
passworddialog
.
ui
\
.
/
photoboothdialog
.
ui
\
.
/
photobooth
widget
.
ui
\
.
/
ringbutton
.
ui
\
.
/
settingswidget
.
ui
\
.
/
videooverlay
.
ui
\
.
/
videoview
.
ui
\
.
/
downloadbar
.
ui
\
.
/
updateconfirmdialog
.
ui
\
.
/
contactpicker
.
ui
.
/
advancedsipsetting
widget
.
ui
\
.
/
call
widget
.
ui
\
.
/
deviceitemwidget
.
ui
\
.
/
mainwindow
.
ui
\
.
/
passworddialog
.
ui
\
.
/
ringbutton
.
ui
\
.
/
updatedownloaddialog
.
ui
\
.
/
animatedoverlay
.
ui
\
.
/
contactpicker
.
ui
\
.
/
invitebuttonswidget
.
ui
\
.
/
nameregistrationdialog
.
ui
\
.
/
photoboothdialog
.
ui
\
.
/
settingswidget
.
ui
\
.
/
videooverlay
.
ui
\
.
/
advancedsettings
widget
.
ui
\
.
/
banneditemwidget
.
ui
\
.
/
deleteaccountdialog
.
ui
\
.
/
linkdevicedialog
.
ui
\
.
/
newwizardwidget
.
ui
\
.
/
photoboothwidget
.
ui
\
.
/
updateconfirmdialog
.
ui
\
.
/
videoview
.
ui
RESOURCES
+=
ressources
.
qrc
levelmeter.cpp
View file @
08748397
...
...
@@ -21,6 +21,7 @@
#include <QTimer>
#include <QDebug>
#include <algorithm>
#include <cmath>
#include <limits>
...
...
main.cpp
View file @
08748397
...
...
@@ -183,7 +183,7 @@ main(int argc, char* argv[])
GlobalInstances
::
setPixmapManipulator
(
std
::
make_unique
<
PixbufManipulator
>
());
SplashScreen
*
splash
=
new
SplashScreen
();
std
::
atomic_bool
isMigrating
=
false
;
std
::
atomic_bool
isMigrating
(
false
)
;
LRCInstance
::
init
(
[
&
splash
,
&
a
,
&
isMigrating
]
{
splash
->
setupUI
(
...
...
messagewebview.cpp
View file @
08748397
...
...
@@ -25,9 +25,9 @@
#include <QDebug>
#include <QDesktopServices>
#include <QFileDialog>
#include <QImage
r
eader>
#include <QImage
R
eader>
#include <QMenu>
#include <QMessage
b
ox>
#include <QMessage
B
ox>
#include <QMimeData>
#include <QMouseEvent>
#include <QScrollBar>
...
...
photoboothwidget.cpp
View file @
08748397
...
...
@@ -143,11 +143,11 @@ PhotoboothWidget::on_takePhotoButton_clicked()
}
void
PhotoboothWidget
::
setAvatarPixmap
(
const
QPixmap
&
avatarPixmap
,
bool
default
)
PhotoboothWidget
::
setAvatarPixmap
(
const
QPixmap
&
avatarPixmap
,
bool
_
default
)
{
ui
->
avatarLabel
->
setPixmap
(
avatarPixmap
);
stopBooth
();
if
(
default
)
{
if
(
_
default
)
{
ui
->
takePhotoButton
->
setIcon
(
QIcon
(
":/images/icons/round-add_a_photo-24px.svg"
));
}
}
...
...
photoboothwidget.h
View file @
08748397
...
...
@@ -37,7 +37,7 @@ public:
void
startBooth
();
void
stopBooth
();
void
setAvatarPixmap
(
const
QPixmap
&
avatarPixmap
,
bool
default
=
false
);
void
setAvatarPixmap
(
const
QPixmap
&
avatarPixmap
,
bool
_
default
=
false
);
const
QPixmap
&
getAvatarPixmap
();
bool
hasAvatar
();
...
...
runguard.cpp
View file @
08748397
...
...
@@ -74,6 +74,7 @@ bool RunGuard::isAnotherRunning()
bool
RunGuard
::
tryToRun
()
{
#ifdef Q_OS_WIN
if
(
isAnotherRunning
())
{
// This is a secondary instance,
// connect to the primary instance to trigger a restore
...
...
@@ -111,6 +112,7 @@ bool RunGuard::tryToRun()
this
,
&
RunGuard
::
tryRestorePrimaryInstance
);
#endif
return
true
;
}
...
...
settingswidget.cpp
View file @
08748397
...
...
@@ -1134,7 +1134,11 @@ void SettingsWidget::startAudioMeter(bool blocking)
LRCInstance
::
avModel
().
startAudioDevice
();
LRCInstance
::
avModel
().
setAudioMeterState
(
true
);
};
blocking
?
f
()
:
QtConcurrent
::
run
(
f
);
if
(
blocking
)
{
f
();
}
else
{
QtConcurrent
::
run
(
f
);
}
}
void
SettingsWidget
::
stopAudioMeter
(
bool
blocking
)
...
...
@@ -1145,5 +1149,9 @@ void SettingsWidget::stopAudioMeter(bool blocking)
LRCInstance
::
avModel
().
setAudioMeterState
(
false
);
ui
->
audioInputMeter
->
stop
();
auto
f
=
[
this
]
{
LRCInstance
::
avModel
().
stopAudioDevice
();
};
blocking
?
f
()
:
QtConcurrent
::
run
(
f
);
if
(
blocking
)
{
f
();
}
else
{
QtConcurrent
::
run
(
f
);
}
}
\ No newline at end of file
settingswidget.ui
View file @
08748397
...
...
@@ -4223,7 +4223,7 @@
<customwidget>
<class>
ToggleSwitch
</class>
<extends>
QWidget
</extends>
<header>
ToggleS
witch.h
</header>
<header>
toggles
witch.h
</header>
<container>
1
</container>
</customwidget>
<customwidget>
...
...
utils.cpp
View file @
08748397
...
...
@@ -289,12 +289,16 @@ void Utils::showSystemNotification(QWidget* widget,
QSize
Utils
::
getRealSize
(
QScreen
*
screen
)
{
#ifdef Q_OS_WIN
DEVMODE
dmThisScreen
;
ZeroMemory
(
&
dmThisScreen
,
sizeof
(
dmThisScreen
));
EnumDisplaySettings
((
const
wchar_t
*
)
screen
->
name
().
utf16
(),
ENUM_CURRENT_SETTINGS
,
(
DEVMODE
*
)
&
dmThisScreen
);
return
QSize
(
dmThisScreen
.
dmPelsWidth
,
dmThisScreen
.
dmPelsHeight
);
#else
return
{};
#endif
}
void
...
...
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