Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: prepare for autostart changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-11-04 09:40:47 +02:00
parent 1a87bf0849
commit 361cdfb5f7
5 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dolphin/src/dolphinpart.cpp
View file

@ -27,7 +27,6 @@
#include <KActionCollection> #include <KActionCollection>
#include <KConfigGroup> #include <KConfigGroup>
#include <KDebug> #include <KDebug>
#include <KGlobalSettings>
#include <KIconLoader> #include <KIconLoader>
#include <KLocale> #include <KLocale>
#include <KMessageBox> #include <KMessageBox>
@ -196,9 +195,6 @@ void DolphinPart::createActions()
createGoAction("go_trash", "user-trash", createGoAction("go_trash", "user-trash",
i18nc("@action:inmenu Go", "Trash"), QString("trash:/"), i18nc("@action:inmenu Go", "Trash"), QString("trash:/"),
goActionGroup); goActionGroup);
createGoAction("go_autostart", "",
i18nc("@action:inmenu Go", "Autostart"), KGlobalSettings::autostartPath(),
goActionGroup);
// Tools menu // Tools menu
m_findFileAction = actionCollection()->addAction("find_file"); m_findFileAction = actionCollection()->addAction("find_file");

48
kcontrol/desktoppaths/globalpaths.cpp
View file

@ -84,13 +84,6 @@ DesktopPathConfig::DesktopPathConfig(QWidget *parent, const QVariantList &)
" folder if you want to, and the contents will move automatically" " folder if you want to, and the contents will move automatically"
" to the new location as well.")); " to the new location as well."));
urAutostart = addRow(lay, i18n("Autostart path:"),
i18n("This folder contains applications or"
" links to applications (shortcuts) that you want to have started"
" automatically whenever KDE starts. You can change the location of this"
" folder if you want to, and the contents will move automatically"
" to the new location as well."));
urDocument = addRow(lay, i18n("Documents path:"), urDocument = addRow(lay, i18n("Documents path:"),
i18n("This folder will be used by default to " i18n("This folder will be used by default to "
"load or save documents from or to.")); "load or save documents from or to."));
@ -127,7 +120,6 @@ void DesktopPathConfig::load()
{ {
// Desktop Paths // Desktop Paths
urDesktop->setUrl( KGlobalSettings::desktopPath() ); urDesktop->setUrl( KGlobalSettings::desktopPath() );
urAutostart->setUrl( KGlobalSettings::autostartPath() );
urDocument->setUrl( KGlobalSettings::documentPath() ); urDocument->setUrl( KGlobalSettings::documentPath() );
urDownload->setUrl( KGlobalSettings::downloadPath() ); urDownload->setUrl( KGlobalSettings::downloadPath() );
urMovie->setUrl( KGlobalSettings::videosPath() ); urMovie->setUrl( KGlobalSettings::videosPath() );
@ -140,7 +132,6 @@ void DesktopPathConfig::defaults()
{ {
// Desktop Paths - keep defaults in sync with kglobalsettings.cpp // Desktop Paths - keep defaults in sync with kglobalsettings.cpp
urDesktop->setUrl( QString(QDir::homePath() + "/Desktop") ); urDesktop->setUrl( QString(QDir::homePath() + "/Desktop") );
urAutostart->setUrl( QString(KGlobal::dirs()->localkdedir() + "Autostart/") );
urDocument->setUrl( QString(QDir::homePath() + "/Documents") ); urDocument->setUrl( QString(QDir::homePath() + "/Documents") );
urDownload->setUrl( QString(QDir::homePath() + "/Downloads") ); urDownload->setUrl( QString(QDir::homePath() + "/Downloads") );
urMovie->setUrl( QString(QDir::homePath() + "/Movies") ); urMovie->setUrl( QString(QDir::homePath() + "/Movies") );
@ -194,13 +185,9 @@ void DesktopPathConfig::save()
KConfigGroup configGroup( config, "Paths" ); KConfigGroup configGroup( config, "Paths" );
bool pathChanged = false; bool pathChanged = false;
bool autostartMoved = false;
KUrl desktopURL( KGlobalSettings::desktopPath() ); KUrl desktopURL( KGlobalSettings::desktopPath() );
KUrl autostartURL( KGlobalSettings::autostartPath() );
KUrl newAutostartURL = urAutostart->url();
if ( !urDesktop->url().equals( desktopURL, KUrl::CompareWithoutTrailingSlash ) ) if ( !urDesktop->url().equals( desktopURL, KUrl::CompareWithoutTrailingSlash ) )
{ {
// Test which other paths were inside this one (as it is by default) // Test which other paths were inside this one (as it is by default)
@ -213,30 +200,6 @@ void DesktopPathConfig::save()
if ( !urlDesktop.endsWith('/')) if ( !urlDesktop.endsWith('/'))
urlDesktop+='/'; urlDesktop+='/';
if ( desktopURL.isParentOf( autostartURL ) )
{
kDebug() << "Autostart is on the desktop";
// Either the Autostart field wasn't changed (-> need to update it)
if ( newAutostartURL.equals( autostartURL, KUrl::CompareWithoutTrailingSlash ) )
{
// Hack. It could be in a subdir inside desktop. Hmmm... Argl.
urAutostart->setUrl( QString(urlDesktop + "Autostart/") );
kDebug() << "Autostart is moved with the desktop";
autostartMoved = true;
}
// or it has been changed (->need to move it from here)
else
{
KUrl futureAutostartURL;
futureAutostartURL.setUrl( urlDesktop + "Autostart/" );
if ( newAutostartURL.equals( futureAutostartURL, KUrl::CompareWithoutTrailingSlash ) )
autostartMoved = true;
else
autostartMoved = moveDir( KUrl( KGlobalSettings::autostartPath() ), KUrl( urAutostart->url() ), i18n("Autostart") );
}
}
if ( moveDir( KUrl( KGlobalSettings::desktopPath() ), KUrl( urlDesktop ), i18n("Desktop") ) ) if ( moveDir( KUrl( KGlobalSettings::desktopPath() ), KUrl( urlDesktop ), i18n("Desktop") ) )
{ {
//save in XDG path //save in XDG path
@ -248,17 +211,6 @@ void DesktopPathConfig::save()
} }
} }
if ( !newAutostartURL.equals( autostartURL, KUrl::CompareWithoutTrailingSlash ) )
{
if (!autostartMoved)
autostartMoved = moveDir( KUrl( KGlobalSettings::autostartPath() ), KUrl( urAutostart->url() ), i18n("Autostart") );
if (autostartMoved)
{
configGroup.writePathEntry( "Autostart", urAutostart->url().toLocalFile(), KConfigBase::Normal | KConfigBase::Global );
pathChanged = true;
}
}
config->sync(); config->sync();
if (xdgSavePath(urDocument, KGlobalSettings::documentPath(), "XDG_DOCUMENTS_DIR", i18n("Documents"))) if (xdgSavePath(urDocument, KGlobalSettings::documentPath(), "XDG_DOCUMENTS_DIR", i18n("Documents")))

1
kcontrol/desktoppaths/globalpaths.h
View file

@ -64,7 +64,6 @@ private:
// Desktop Paths // Desktop Paths
KUrlRequester *urDesktop; KUrlRequester *urDesktop;
KUrlRequester *urAutostart;
KUrlRequester *urDocument; KUrlRequester *urDocument;
KUrlRequester *urDownload; KUrlRequester *urDownload;
KUrlRequester *urMovie; KUrlRequester *urMovie;

2
libs/plasmagenericshell/scripting/scriptengine.cpp
View file

@ -388,8 +388,6 @@ QScriptValue ScriptEngine::userDataPath(QScriptContext *context, QScriptEngine *
if (type.compare("desktop", Qt::CaseInsensitive) == 0) { if (type.compare("desktop", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::desktopPath(); return KGlobalSettings::desktopPath();
} else if (type.compare("autostart", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::autostartPath();
} else if (type.compare("documents", Qt::CaseInsensitive) == 0) { } else if (type.compare("documents", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::documentPath(); return KGlobalSettings::documentPath();
} else if (type.compare("music", Qt::CaseInsensitive) == 0) { } else if (type.compare("music", Qt::CaseInsensitive) == 0) {

2
plasma/scriptengine/common/extension_io.cpp
View file

@ -171,8 +171,6 @@ QScriptValue ScriptEnv::userDataPath(QScriptContext *context, QScriptEngine *eng
if (type.compare("desktop", Qt::CaseInsensitive) == 0) { if (type.compare("desktop", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::desktopPath(); return KGlobalSettings::desktopPath();
} else if (type.compare("autostart", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::autostartPath();
} else if (type.compare("documents", Qt::CaseInsensitive) == 0) { } else if (type.compare("documents", Qt::CaseInsensitive) == 0) {
return KGlobalSettings::documentPath(); return KGlobalSettings::documentPath();
} else if (type.compare("music", Qt::CaseInsensitive) == 0) { } else if (type.compare("music", Qt::CaseInsensitive) == 0) {