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
PIM
PIM MailCommon
Commits
7a3efeae
Commit
7a3efeae
authored
Dec 28, 2021
by
Laurent Montel
😁
Browse files
Allow to open dialog as not modal
parent
8ab10256
Pipeline
#119585
skipped
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/snippets/snippetsmanager.cpp
View file @
7a3efeae
...
...
@@ -162,7 +162,11 @@ void SnippetsManager::SnippetsManagerPrivate::createSnippet(const QString &text)
dlg
->
setGroupIndex
(
currentGroupIndex
());
dlg
->
setText
(
text
);
if
(
dlg
->
exec
())
{
q
->
connect
(
dlg
,
&
SnippetDialog
::
rejected
,
q
,
[
dlg
]()
{
delete
dlg
;
});
q
->
connect
(
dlg
,
&
SnippetDialog
::
accepted
,
q
,
[
dlg
,
this
]()
{
const
QModelIndex
groupIndex
=
dlg
->
groupIndex
();
if
(
!
mModel
->
insertRow
(
mModel
->
rowCount
(
groupIndex
),
groupIndex
))
{
...
...
@@ -192,8 +196,9 @@ void SnippetsManager::SnippetsManagerPrivate::createSnippet(const QString &text)
dlg
->
attachment
());
mDirty
=
true
;
save
();
}
delete
dlg
;
delete
dlg
;
});
dlg
->
show
();
}
void
SnippetsManager
::
SnippetsManagerPrivate
::
slotAddNewDndSnippset
(
const
QString
&
text
)
...
...
@@ -230,26 +235,29 @@ void SnippetsManager::SnippetsManagerPrivate::editSnippet()
dlg
->
setBcc
(
index
.
data
(
SnippetsModel
::
BccRole
).
toString
());
dlg
->
setAttachment
(
index
.
data
(
SnippetsModel
::
AttachmentRole
).
toString
());
dlg
->
setKeySequence
(
QKeySequence
::
fromString
(
index
.
data
(
SnippetsModel
::
KeySequenceRole
).
toString
()));
q
->
connect
(
dlg
,
&
SnippetDialog
::
rejected
,
q
,
[
dlg
]()
{
delete
dlg
;
});
if
(
dlg
->
exec
()
)
{
q
->
connect
(
dlg
,
&
SnippetDialog
::
accepted
,
q
,
[
dlg
,
this
,
oldGroupIndex
,
index
,
oldSnippetName
](
)
{
const
QModelIndex
newGroupIndex
=
dlg
->
groupIndex
();
QModelIndex
oldIndex
=
index
;
if
(
oldGroupIndex
!=
newGroupIndex
)
{
mModel
->
removeRow
(
index
.
row
(),
oldGroupIndex
);
mModel
->
insertRow
(
mModel
->
rowCount
(
newGroupIndex
),
newGroupIndex
);
i
ndex
=
mModel
->
index
(
mModel
->
rowCount
(
newGroupIndex
)
-
1
,
0
,
newGroupIndex
);
oldI
ndex
=
mModel
->
index
(
mModel
->
rowCount
(
newGroupIndex
)
-
1
,
0
,
newGroupIndex
);
}
mModel
->
setData
(
i
ndex
,
dlg
->
name
(),
SnippetsModel
::
NameRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
text
(),
SnippetsModel
::
TextRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
keySequence
().
toString
(),
SnippetsModel
::
KeySequenceRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
keyword
(),
SnippetsModel
::
KeywordRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
subject
(),
SnippetsModel
::
SubjectRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
to
(),
SnippetsModel
::
ToRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
cc
(),
SnippetsModel
::
CcRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
bcc
(),
SnippetsModel
::
BccRole
);
mModel
->
setData
(
i
ndex
,
dlg
->
attachment
(),
SnippetsModel
::
AttachmentRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
name
(),
SnippetsModel
::
NameRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
text
(),
SnippetsModel
::
TextRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
keySequence
().
toString
(),
SnippetsModel
::
KeySequenceRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
keyword
(),
SnippetsModel
::
KeywordRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
subject
(),
SnippetsModel
::
SubjectRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
to
(),
SnippetsModel
::
ToRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
cc
(),
SnippetsModel
::
CcRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
bcc
(),
SnippetsModel
::
BccRole
);
mModel
->
setData
(
oldI
ndex
,
dlg
->
attachment
(),
SnippetsModel
::
AttachmentRole
);
Q_EMIT
mModel
->
updateActionCollection
(
oldSnippetName
,
dlg
->
name
(),
...
...
@@ -262,8 +270,9 @@ void SnippetsManager::SnippetsManagerPrivate::editSnippet()
dlg
->
attachment
());
mDirty
=
true
;
save
();
}
delete
dlg
;
delete
dlg
;
});
dlg
->
show
();
}
void
SnippetsManager
::
SnippetsManagerPrivate
::
deleteSnippet
()
...
...
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