Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kate
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
Kate
Commits
2bac3af1
Commit
2bac3af1
authored
May 09, 2020
by
Christoph Cullmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'vejnar/kate-master'
parents
ba23be52
4306330e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
kate/kateviewmanager.cpp
kate/kateviewmanager.cpp
+7
-1
kwrite/kwrite.cpp
kwrite/kwrite.cpp
+7
-1
No files found.
kate/kateviewmanager.cpp
View file @
2bac3af1
...
...
@@ -229,7 +229,13 @@ void KateViewManager::slotDocumentOpen()
}
else
{
startUrl
=
m_lastOpenDialogUrl
;
}
const
QList
<
QUrl
>
urls
=
QFileDialog
::
getOpenFileUrls
(
m_mainWindow
,
i18n
(
"Open File"
),
startUrl
);
// if file is not local, then remove filename from url
QList
<
QUrl
>
urls
;
if
(
startUrl
.
isLocalFile
())
{
urls
=
QFileDialog
::
getOpenFileUrls
(
m_mainWindow
,
i18n
(
"Open File"
),
startUrl
);
}
else
{
urls
=
QFileDialog
::
getOpenFileUrls
(
m_mainWindow
,
i18n
(
"Open File"
),
startUrl
.
adjusted
(
QUrl
::
RemoveFilename
));
}
/**
* emit size warning, for local files
...
...
kwrite/kwrite.cpp
View file @
2bac3af1
...
...
@@ -236,7 +236,13 @@ void KWrite::slotNew()
void
KWrite
::
slotOpen
()
{
const
QList
<
QUrl
>
urls
=
QFileDialog
::
getOpenFileUrls
(
this
,
i18n
(
"Open File"
),
m_view
->
document
()
->
url
());
// if file is not local, then remove filename from url
QList
<
QUrl
>
urls
;
if
(
m_view
->
document
()
->
url
().
isLocalFile
())
{
urls
=
QFileDialog
::
getOpenFileUrls
(
this
,
i18n
(
"Open File"
),
m_view
->
document
()
->
url
());
}
else
{
urls
=
QFileDialog
::
getOpenFileUrls
(
this
,
i18n
(
"Open File"
),
m_view
->
document
()
->
url
().
adjusted
(
QUrl
::
RemoveFilename
));
}
for
(
const
QUrl
&
url
:
urls
)
{
slotOpen
(
url
);
}
...
...
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