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
System
Dolphin
Commits
275d7b53
Commit
275d7b53
authored
Jul 05, 2020
by
Elvis Angelaccio
Browse files
Merge branch 'release/20.04'
parents
bbae04bc
7a6956da
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/settings/general/confirmationssettingspage.cpp
View file @
275d7b53
...
...
@@ -137,7 +137,7 @@ void ConfirmationsSettingsPage::applySettings()
scriptExecutionGroup
.
writeEntry
(
"behaviourOnLaunch"
,
"alwaysAsk"
);
break
;
case
ScriptExecution
::
Open
:
scriptExecutionGroup
.
writeEntry
(
"behaviourOnLaunch"
,
"
dontAsk
"
);
scriptExecutionGroup
.
writeEntry
(
"behaviourOnLaunch"
,
"
open
"
);
break
;
case
ScriptExecution
::
Execute
:
scriptExecutionGroup
.
writeEntry
(
"behaviourOnLaunch"
,
"execute"
);
...
...
@@ -178,12 +178,12 @@ void ConfirmationsSettingsPage::loadSettings()
const
KConfigGroup
scriptExecutionGroup
(
KSharedConfig
::
openConfig
(
QStringLiteral
(
"kiorc"
)),
"Executable scripts"
);
const
QString
value
=
scriptExecutionGroup
.
readEntry
(
"behaviourOnLaunch"
,
"alwaysAsk"
);
if
(
value
==
QLatin1String
(
"
dont
Ask"
))
{
m_confirmScriptExecution
->
setCurrentIndex
(
ScriptExecution
::
Open
);
if
(
value
==
QLatin1String
(
"
always
Ask"
))
{
m_confirmScriptExecution
->
setCurrentIndex
(
ScriptExecution
::
AlwaysAsk
);
}
else
if
(
value
==
QLatin1String
(
"execute"
))
{
m_confirmScriptExecution
->
setCurrentIndex
(
ScriptExecution
::
Execute
);
}
else
/* if (value == QLatin1String("
alwaysAsk
"))*/
{
m_confirmScriptExecution
->
setCurrentIndex
(
ScriptExecution
::
AlwaysAsk
);
}
else
/* if (value == QLatin1String("
open
"))*/
{
m_confirmScriptExecution
->
setCurrentIndex
(
ScriptExecution
::
Open
);
}
m_confirmClosingMultipleTabs
->
setChecked
(
GeneralSettings
::
confirmClosingMultipleTabs
());
...
...
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