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
Grantlee Editor
Commits
fcc86bb2
Commit
fcc86bb2
authored
Jul 15, 2021
by
Laurent Montel
😁
Browse files
Make sure that we don't cancel dialog
parent
d954d015
Pipeline
#70673
skipped
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
contactprintthemeeditor/themeeditorpage.cpp
View file @
fcc86bb2
...
...
@@ -202,14 +202,17 @@ void ThemeEditorPage::createZip(const QString &themeName, KZip *zip)
void
ThemeEditorPage
::
addExtraPage
()
{
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
));
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
bool
ok
=
false
;
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
),
{},
{},
&
ok
);
if
(
ok
)
{
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
}
...
...
contactthemeeditor/contacteditorpage.cpp
View file @
fcc86bb2
...
...
@@ -205,14 +205,17 @@ void ContactEditorPage::createZip(const QString &themeName, KZip *zip)
void
ContactEditorPage
::
addExtraPage
()
{
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
));
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
bool
ok
=
false
;
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
),
{},
{},
&
ok
);
if
(
ok
)
{
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
}
...
...
headerthemeeditor/themeeditorpage.cpp
View file @
fcc86bb2
...
...
@@ -227,14 +227,17 @@ void ThemeEditorPage::createZip(const QString &themeName, KZip *zip)
void
ThemeEditorPage
::
addExtraPage
()
{
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
));
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
bool
ok
=
false
;
QString
filename
=
QInputDialog
::
getText
(
this
,
i18n
(
"Filename of extra page"
),
i18n
(
"Filename:"
),
{},
{},
&
ok
);
if
(
ok
)
{
if
(
!
filename
.
trimmed
().
isEmpty
())
{
if
(
!
filename
.
endsWith
(
QLatin1String
(
".html"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".css"
))
&&
!
filename
.
endsWith
(
QLatin1String
(
".js"
)))
{
filename
+=
QLatin1String
(
".html"
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
createExtraPage
(
filename
);
mThemeSession
->
addExtraPage
(
filename
);
setChanged
(
true
);
}
}
...
...
Write
Preview
Supports
Markdown
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