Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
129985f0
Commit
129985f0
authored
6 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
misc: fix file-picker filters
Change-Id: Ifa422aabbc2a593248f49c3c85ca4be18f42a11c
parent
a493d5bf
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
advancedsettingswidget.cpp
+1
-1
1 addition, 1 deletion
advancedsettingswidget.cpp
photoboothwidget.cpp
+1
-1
1 addition, 1 deletion
photoboothwidget.cpp
setavatardialog.cpp
+3
-1
3 additions, 1 deletion
setavatardialog.cpp
with
5 additions
and
3 deletions
advancedsettingswidget.cpp
+
1
−
1
View file @
129985f0
...
@@ -155,7 +155,7 @@ AdvancedSettingsWidget::openFileCustomRingtone()
...
@@ -155,7 +155,7 @@ AdvancedSettingsWidget::openFileCustomRingtone()
QString
fileUrl
;
QString
fileUrl
;
auto
oldPath
=
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtonePath
);
auto
oldPath
=
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtonePath
);
auto
openPath
=
oldPath
.
isEmpty
()
?
QDir
::
currentPath
()
+
QString
(
"/ringtones/"
)
:
QFileInfo
(
oldPath
).
absolutePath
();
auto
openPath
=
oldPath
.
isEmpty
()
?
QDir
::
currentPath
()
+
QString
(
"/ringtones/"
)
:
QFileInfo
(
oldPath
).
absolutePath
();
fileUrl
=
QFileDialog
::
getOpenFileName
(
this
,
QString
(
"Select a new ringtone"
),
openPath
,
tr
(
"Audio Files (*.wav
,
*.ogg
,
*.opus
,
*.mp3)"
));
fileUrl
=
QFileDialog
::
getOpenFileName
(
this
,
QString
(
"Select a new ringtone"
),
openPath
,
tr
(
"Audio Files (*.wav *.ogg *.opus *.mp3
*aiff *wma
)"
));
if
(
!
fileUrl
.
isEmpty
())
{
if
(
!
fileUrl
.
isEmpty
())
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
Ringtone
.
ringtonePath
=
fileUrl
.
toStdString
();
confProps
.
Ringtone
.
ringtonePath
=
fileUrl
.
toStdString
();
...
...
This diff is collapsed.
Click to expand it.
photoboothwidget.cpp
+
1
−
1
View file @
129985f0
...
@@ -90,7 +90,7 @@ PhotoboothWidget::on_importButton_clicked()
...
@@ -90,7 +90,7 @@ PhotoboothWidget::on_importButton_clicked()
auto
picturesDir
=
QStandardPaths
::
standardLocations
(
QStandardPaths
::
PicturesLocation
).
first
();
auto
picturesDir
=
QStandardPaths
::
standardLocations
(
QStandardPaths
::
PicturesLocation
).
first
();
fileName_
=
QFileDialog
::
getOpenFileName
(
this
,
tr
(
"Choose File"
),
fileName_
=
QFileDialog
::
getOpenFileName
(
this
,
tr
(
"Choose File"
),
picturesDir
,
picturesDir
,
tr
(
"Image Files (*.jpg
,
*.jpeg
,
*.png)"
));
tr
(
"Image Files (*.jpg *.jpeg *.png)"
));
if
(
fileName_
.
isEmpty
())
{
if
(
fileName_
.
isEmpty
())
{
Video
::
PreviewManager
::
instance
().
startPreview
();
Video
::
PreviewManager
::
instance
().
startPreview
();
return
;
return
;
...
...
This diff is collapsed.
Click to expand it.
setavatardialog.cpp
+
3
−
1
View file @
129985f0
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
#include
<QWindow>
#include
<QWindow>
#include
<QtMultimedia\QCameraImageCapture>
#include
<QtMultimedia\QCameraImageCapture>
#include
<QBuffer>
#include
<QBuffer>
#include
<QStandardPaths>
#include
"setavatardialog.h"
#include
"setavatardialog.h"
#include
"ui_setavatardialog.h"
#include
"ui_setavatardialog.h"
...
@@ -137,8 +138,9 @@ SetAvatarDialog::editMode()
...
@@ -137,8 +138,9 @@ SetAvatarDialog::editMode()
void
void
SetAvatarDialog
::
openFileManager
()
SetAvatarDialog
::
openFileManager
()
{
{
auto
picturesDir
=
QStandardPaths
::
standardLocations
(
QStandardPaths
::
PicturesLocation
).
first
();
rawPixmap_
.
load
(
QFileDialog
::
getOpenFileName
(
this
,
rawPixmap_
.
load
(
QFileDialog
::
getOpenFileName
(
this
,
tr
(
"Open Image"
),
""
,
tr
(
"Image Files (*.p
n
g *.jpg *.bmp)"
)));
tr
(
"Open Image"
),
picturesDir
,
tr
(
"Image Files (*.
j
pg *.jp
eg *.pn
g *.bmp)"
)));
editMode
();
editMode
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment