Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Automate
Agent sessions
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This project is archived. Its data is
read-only
.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
625521e1
Commit
625521e1
authored
Dec 14, 2018
by
Isa
Committed by
Andreas Traczyk
Dec 19, 2018
Browse files
Options
Downloads
Patches
Plain Diff
ux: set default download folder if not user-selected
Change-Id: If48532c1293de43ffb78113f53dc5a0e0befb3ac
parent
62b08ac1
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mainwindow.cpp
+4
-2
4 additions, 2 deletions
mainwindow.cpp
messagewebview.cpp
+1
-3
1 addition, 3 deletions
messagewebview.cpp
with
5 additions
and
5 deletions
mainwindow.cpp
+
4
−
2
View file @
625521e1
...
@@ -287,8 +287,10 @@ MainWindow::readSettingsFromRegistry()
...
@@ -287,8 +287,10 @@ MainWindow::readSettingsFromRegistry()
QSettings
settings
;
QSettings
settings
;
restoreGeometry
(
settings
.
value
(
SettingsKey
::
geometry
).
toByteArray
());
restoreGeometry
(
settings
.
value
(
SettingsKey
::
geometry
).
toByteArray
());
restoreState
(
settings
.
value
(
SettingsKey
::
windowState
).
toByteArray
());
restoreState
(
settings
.
value
(
SettingsKey
::
windowState
).
toByteArray
());
LRCInstance
::
editableDataTransferModel
()
->
downloadDirectory
=
settings
.
value
(
SettingsKey
::
downloadPath
,
"Downloads"
).
toString
().
toStdString
()
+
"/"
;
LRCInstance
::
editableDataTransferModel
()
->
downloadDirectory
=
settings
.
value
(
SettingsKey
::
downloadPath
,
QStandardPaths
::
writableLocation
(
QStandardPaths
::
DownloadLocation
)).
toString
().
toStdString
()
+
"/"
;
if
(
not
settings
.
contains
(
SettingsKey
::
enableNotifications
))
{
if
(
not
settings
.
contains
(
SettingsKey
::
enableNotifications
))
{
settings
.
setValue
(
SettingsKey
::
enableNotifications
,
true
);
settings
.
setValue
(
SettingsKey
::
enableNotifications
,
true
);
}
}
...
...
This diff is collapsed.
Click to expand it.
messagewebview.cpp
+
1
−
3
View file @
625521e1
...
@@ -284,10 +284,8 @@ PrivateBridging::acceptFile(const QString& arg)
...
@@ -284,10 +284,8 @@ PrivateBridging::acceptFile(const QString& arg)
auto
convUid
=
LRCInstance
::
getSelectedConvUid
();
auto
convUid
=
LRCInstance
::
getSelectedConvUid
();
LRCInstance
::
getCurrentConversationModel
()
->
getTransferInfo
(
interactionUid
,
info
);
LRCInstance
::
getCurrentConversationModel
()
->
getTransferInfo
(
interactionUid
,
info
);
auto
downloadsFolder
=
QSettings
().
value
(
SettingsKey
::
downloadPath
,
"Downloads"
).
toString
().
toStdString
()
+
"/"
;
// get full path
// get full path
std
::
string
filename
=
downloadsFolder
.
c_str
();
std
::
string
filename
=
LRCInstance
::
dataTransferModel
().
downloadDirectory
.
c_str
();
if
(
!
filename
.
empty
()
&&
filename
.
back
()
!=
'/'
)
if
(
!
filename
.
empty
()
&&
filename
.
back
()
!=
'/'
)
filename
+=
"/"
;
filename
+=
"/"
;
auto
wantedFilename
=
filename
+
info
.
displayName
;
auto
wantedFilename
=
filename
+
info
.
displayName
;
...
...
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
sign in
to comment