Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Kate
Commits
edefa277
Commit
edefa277
authored
May 11, 2021
by
Méven Car
Committed by
Christoph Cullmann
May 13, 2021
Browse files
Prevent storing diff files in recent files history
BUG: 436906
parent
4a527646
Changes
4
Hide whitespace changes
Inline
Side-by-side
kate/katemainwindow.cpp
View file @
edefa277
...
...
@@ -1176,6 +1176,9 @@ void KateMainWindow::queueModifiedOnDisc(KTextEditor::Document *doc)
s_modOnHdDialog
=
new
KateMwModOnHdDialog
(
list
,
this
);
m_modignore
=
true
;
KWindowSystem
::
setOnAllDesktops
(
s_modOnHdDialog
->
winId
(),
true
);
connect
(
s_modOnHdDialog
,
&
KateMwModOnHdDialog
::
requesOpenDiffDocumment
,
this
,
[
this
](
const
QUrl
&
url
)
{
viewManager
()
->
openUrl
(
url
,
QString
(),
true
,
true
);
});
s_modOnHdDialog
->
exec
();
delete
s_modOnHdDialog
;
// s_modOnHdDialog is set to 0 in destructor of KateMwModOnHdDialog (jowenn!!!)
m_modignore
=
false
;
...
...
kate/katemwmodonhddialog.cpp
View file @
edefa277
...
...
@@ -344,11 +344,7 @@ void KateMwModOnHdDialog::slotPDone()
delete
m_diffFile
;
m_diffFile
=
nullptr
;
// OpenUrlJob will delete the temp. file
auto
*
job
=
new
KIO
::
OpenUrlJob
(
url
,
QStringLiteral
(
"text/x-patch"
));
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
this
));
job
->
setDeleteTemporaryFile
(
true
);
job
->
start
();
Q_EMIT
requesOpenDiffDocumment
(
url
);
}
void
KateMwModOnHdDialog
::
addDocument
(
KTextEditor
::
Document
*
doc
)
...
...
kate/katemwmodonhddialog.h
View file @
edefa277
...
...
@@ -32,6 +32,9 @@ public:
~
KateMwModOnHdDialog
()
override
;
void
addDocument
(
KTextEditor
::
Document
*
doc
);
Q_SIGNALS:
void
requesOpenDiffDocumment
(
const
QUrl
&
documentUrl
);
private
Q_SLOTS
:
void
slotIgnore
();
void
slotOverwrite
();
...
...
kate/kateviewmanager.cpp
View file @
edefa277
...
...
@@ -24,7 +24,6 @@
#include <KConfigGroup>
#include <KLocalizedString>
#include <KMessageBox>
#include <KRecentFilesAction>
#include <KToolBar>
#include <KXMLGUIFactory>
...
...
@@ -282,7 +281,9 @@ KTextEditor::Document *KateViewManager::openUrl(const QUrl &url, const QString &
{
KTextEditor
::
Document
*
doc
=
KateApp
::
self
()
->
documentManager
()
->
openUrl
(
url
,
encoding
,
isTempFile
,
docInfo
);
m_mainWindow
->
addRecentOpenedFile
(
doc
->
url
());
if
(
!
isTempFile
)
{
m_mainWindow
->
addRecentOpenedFile
(
doc
->
url
());
}
if
(
activate
)
{
activateView
(
doc
);
...
...
@@ -295,8 +296,10 @@ KTextEditor::Document *KateViewManager::openUrls(const QList<QUrl> &urls, const
{
const
QList
<
KTextEditor
::
Document
*>
docs
=
KateApp
::
self
()
->
documentManager
()
->
openUrls
(
urls
,
encoding
,
isTempFile
,
docInfo
);
for
(
const
KTextEditor
::
Document
*
doc
:
docs
)
{
m_mainWindow
->
addRecentOpenedFile
(
doc
->
url
());
if
(
!
isTempFile
)
{
for
(
const
KTextEditor
::
Document
*
doc
:
docs
)
{
m_mainWindow
->
addRecentOpenedFile
(
doc
->
url
());
}
}
return
docs
.
isEmpty
()
?
nullptr
:
docs
.
last
();
...
...
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