Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
43e897a5
Commit
43e897a5
authored
Oct 02, 2020
by
David Redondo
🏎
Browse files
Use kpackage instead of deprecated package
parent
180ebece
Changes
4
Hide whitespace changes
Inline
Side-by-side
shell/scripting/scriptengine.cpp
View file @
43e897a5
...
...
@@ -285,12 +285,12 @@ void ScriptEngine::exception(const QJSValue &value)
QStringList
ScriptEngine
::
pendingUpdateScripts
(
Plasma
::
Corona
*
corona
)
{
if
(
!
corona
->
p
ackage
().
metadata
().
isValid
())
{
if
(
!
corona
->
kP
ackage
().
isValid
())
{
qWarning
()
<<
"Warning: corona package invalid"
;
return
QStringList
();
}
const
QString
appName
=
corona
->
p
ackage
().
metadata
().
plugin
Name
();
const
QString
appName
=
corona
->
kP
ackage
().
metadata
().
plugin
Id
();
QStringList
scripts
;
const
QStringList
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
"plasma/shells/"
+
appName
+
QStringLiteral
(
"/contents/updates"
),
QStandardPaths
::
LocateDirectory
);
...
...
shell/scripting/scriptengine_v1.cpp
View file @
43e897a5
...
...
@@ -199,7 +199,8 @@ QJSValue ScriptEngine::V1::desktopForScreen(const QJSValue ¶m) const
}
const
uint
screen
=
param
.
toInt
();
return
m_engine
->
wrap
(
m_engine
->
m_corona
->
containmentForScreen
(
screen
));
const
auto
containments
=
m_engine
->
m_corona
->
containmentsForScreen
(
screen
);
return
m_engine
->
wrap
(
containments
.
empty
()
?
nullptr
:
containments
[
0
]);
}
QJSValue
ScriptEngine
::
V1
::
createActivity
(
const
QJSValue
&
nameParam
,
const
QString
&
pluginParam
)
...
...
@@ -231,7 +232,7 @@ QJSValue ScriptEngine::V1::createActivity(const QJSValue &nameParam, const QStri
sc
->
insertActivity
(
id
,
plugin
);
}
else
if
(
ac
)
{
if
(
plugin
.
isEmpty
()
||
plugin
==
QLatin1String
(
"undefined"
))
{
KConfigGroup
shellCfg
=
KConfigGroup
(
KSharedConfig
::
openConfig
(
m_engine
->
m_corona
->
p
ackage
().
filePath
(
"defaults"
)),
"Desktop"
);
KConfigGroup
shellCfg
=
KConfigGroup
(
KSharedConfig
::
openConfig
(
m_engine
->
m_corona
->
kP
ackage
().
filePath
(
"defaults"
)),
"Desktop"
);
plugin
=
shellCfg
.
readEntry
(
"Containment"
,
"org.kde.desktopcontainment"
);
}
ac
->
insertActivity
(
id
,
plugin
);
...
...
shell/shellcorona.cpp
View file @
43e897a5
...
...
@@ -130,7 +130,7 @@ ShellCorona::ShellCorona(QObject *parent)
m_reconsiderOutputsTimer
.
setInterval
(
1000
);
connect
(
&
m_reconsiderOutputsTimer
,
&
QTimer
::
timeout
,
this
,
&
ShellCorona
::
reconsiderOutputs
);
m_desktopDefaultsConfig
=
KConfigGroup
(
KSharedConfig
::
openConfig
(
p
ackage
().
filePath
(
"defaults"
)),
"Desktop"
);
m_desktopDefaultsConfig
=
KConfigGroup
(
KSharedConfig
::
openConfig
(
kP
ackage
().
filePath
(
"defaults"
)),
"Desktop"
);
m_lnfDefaultsConfig
=
KConfigGroup
(
KSharedConfig
::
openConfig
(
m_lookAndFeelPackage
.
filePath
(
"defaults"
)),
"Desktop"
);
m_lnfDefaultsConfig
=
KConfigGroup
(
&
m_lnfDefaultsConfig
,
QStringLiteral
(
"org.kde.plasma.desktop"
));
...
...
@@ -949,7 +949,7 @@ void ShellCorona::loadDefaultLayout()
script
=
m_lookAndFeelPackage
.
filePath
(
"layouts"
,
QString
(
shell
()
+
"-layout.js"
).
toLatin1
());
}
if
(
script
.
isEmpty
())
{
script
=
p
ackage
().
filePath
(
"defaultlayout"
);
script
=
kP
ackage
().
filePath
(
"defaultlayout"
);
}
QFile
file
(
script
);
...
...
shell/standaloneappcorona.cpp
View file @
43e897a5
...
...
@@ -121,7 +121,7 @@ void StandaloneAppCorona::load()
void
StandaloneAppCorona
::
loadDefaultLayout
()
{
const
QString
script
=
p
ackage
().
filePath
(
"defaultlayout"
);
const
QString
script
=
kP
ackage
().
filePath
(
"defaultlayout"
);
QFile
file
(
script
);
if
(
file
.
open
(
QIODevice
::
ReadOnly
|
QIODevice
::
Text
)
)
{
QString
code
=
file
.
readAll
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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