TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Additional fixes for XDG folder support.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/127/head
Michele Calgaro 5 years ago committed by TDE Gitea
parent fddff79d21
commit 234e466e0e
2 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File

84
kcontrol/konq/rootopts.cpp
Unescape Escape View File

@ -18,6 +18,7 @@
#include <tqcombobox.h> #include <tqcombobox.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtimer.h>
#include <tqvgroupbox.h> #include <tqvgroupbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
@ -188,6 +189,9 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
// -- Bottom -- // -- Bottom --
Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above
loadTmr = new TQTimer(this);
connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone()));
load(); load();
} }
@ -208,14 +212,30 @@ void DesktopPathConfig::load( bool useDefaults )
urDesktop->setURL(xdguserconfig.readPathEntry("XDG_DESKTOP_DIR", TDEGlobalSettings::desktopPath()).remove("\"")); urDesktop->setURL(xdguserconfig.readPathEntry("XDG_DESKTOP_DIR", TDEGlobalSettings::desktopPath()).remove("\""));
urDocument->setURL(xdguserconfig.readPathEntry("XDG_DOCUMENTS_DIR", TDEGlobalSettings::documentPath()).remove("\"")); urDocument->setURL(xdguserconfig.readPathEntry("XDG_DOCUMENTS_DIR", TDEGlobalSettings::documentPath()).remove("\""));
urDownload->setURL(xdguserconfig.readPathEntry("XDG_DOWNLOAD_DIR" , TDEGlobalSettings::downloadPath()).remove("\"")); urDownload->setURL(xdguserconfig.readPathEntry("XDG_DOWNLOAD_DIR", TDEGlobalSettings::downloadPath()).remove("\""));
urMusic->setURL(xdguserconfig.readPathEntry("XDG_MUSIC_DIR" , TDEGlobalSettings::musicPath()).remove("\"")); urMusic->setURL(xdguserconfig.readPathEntry("XDG_MUSIC_DIR", TDEGlobalSettings::musicPath()).remove("\""));
urPictures->setURL(xdguserconfig.readPathEntry("XDG_PICTURES_DIR" , TDEGlobalSettings::picturesPath()).remove("\"")); urPictures->setURL(xdguserconfig.readPathEntry("XDG_PICTURES_DIR", TDEGlobalSettings::picturesPath()).remove("\""));
urPublicShare->setURL(xdguserconfig.readPathEntry("XDG_PUBLICSHARE_DIR" , TDEGlobalSettings::publicSharePath()).remove("\"")); urPublicShare->setURL(xdguserconfig.readPathEntry("XDG_PUBLICSHARE_DIR", TDEGlobalSettings::publicSharePath()).remove("\""));
urTemplates->setURL(xdguserconfig.readPathEntry("XDG_TEMPLATES_DIR" , TDEGlobalSettings::templatesPath()).remove("\"")); urTemplates->setURL(xdguserconfig.readPathEntry("XDG_TEMPLATES_DIR", TDEGlobalSettings::templatesPath()).remove("\""));
urVideos->setURL(xdguserconfig.readPathEntry("XDG_VIDEOS_DIR" , TDEGlobalSettings::videosPath()).remove("\"")); urVideos->setURL(xdguserconfig.readPathEntry("XDG_VIDEOS_DIR", TDEGlobalSettings::videosPath()).remove("\""));
emit changed( useDefaults ); emit changed(useDefaults);
// If any of the folder does not exists, enable the Apply button so that the folders can be created
if (!TQDir(urDesktop->url()).exists() || !TQDir(urDocument->url()).exists() ||
!TQDir(urDownload->url()).exists() || !TQDir(urMusic->url()).exists() ||
!TQDir(urPictures->url()).exists() || !TQDir(urPublicShare->url()).exists() ||
!TQDir(urTemplates->url()).exists() || !TQDir(urVideos->url()).exists() ||
!TQDir(urAutostart->url()).exists())
{
// Need to delay emitting the signal to give some time to the module to be added to the kcontrol GUI
loadTmr->start(1000, true);
}
}
void DesktopPathConfig::loadTimerDone()
{
emit changed(true);
} }
void DesktopPathConfig::defaults() void DesktopPathConfig::defaults()
@ -232,52 +252,52 @@ void DesktopPathConfig::save()
bool pathChanged = false; bool pathChanged = false;
bool autostartMoved = false; bool autostartMoved = false;
KURL desktopURL;
desktopURL.setPath( TDEGlobalSettings::desktopPath() );
KURL newDesktopURL;
newDesktopURL.setPath(urDesktop->url());
KURL autostartURL; KURL autostartURL;
autostartURL.setPath( TDEGlobalSettings::autostartPath() ); autostartURL.setPath(TDEGlobalSettings::autostartPath());
KURL newAutostartURL; KURL newAutostartURL;
newAutostartURL.setPath(urAutostart->url()); newAutostartURL.setPath(urAutostart->url());
KURL desktopURL;
desktopURL.setPath(TDEGlobalSettings::desktopPath());
KURL newDesktopURL;
newDesktopURL.setPath(urDesktop->url());
KURL documentURL; KURL documentURL;
documentURL.setPath( TDEGlobalSettings::documentPath() ); documentURL.setPath(TDEGlobalSettings::documentPath());
KURL newDocumentURL; KURL newDocumentURL;
newDocumentURL.setPath(urDocument->url()); newDocumentURL.setPath(urDocument->url());
KURL downloadURL; KURL downloadURL;
// downloadURL.setPath( TDEGlobalSettings::downloadPath() ); downloadURL.setPath(TDEGlobalSettings::downloadPath());
KURL newDownloadURL; KURL newDownloadURL;
newDownloadURL.setPath(urDownload->url()); newDownloadURL.setPath(urDownload->url());
KURL musicURL; KURL musicURL;
// musicURL.setPath( TDEGlobalSettings::musicPath() ); musicURL.setPath(TDEGlobalSettings::musicPath());
KURL newMusicURL; KURL newMusicURL;
newMusicURL.setPath(urMusic->url()); newMusicURL.setPath(urMusic->url());
KURL picturesURL; KURL picturesURL;
// picturesURL.setPath( TDEGlobalSettings::picturesPath() ); picturesURL.setPath(TDEGlobalSettings::picturesPath());
KURL newPicturesURL; KURL newPicturesURL;
newPicturesURL.setPath(urPictures->url()); newPicturesURL.setPath(urPictures->url());
KURL publicShareURL; KURL publicShareURL;
// publicShareURL.setPath( TDEGlobalSettings::publicSharePath() ); publicShareURL.setPath(TDEGlobalSettings::publicSharePath());
KURL newPublicShareURL; KURL newPublicShareURL;
newPublicShareURL.setPath(urPublicShare->url()); newPublicShareURL.setPath(urPublicShare->url());
KURL templatesURL; KURL templatesURL;
// templatesURL.setPath( TDEGlobalSettings::templatesPath() ); templatesURL.setPath(TDEGlobalSettings::templatesPath());
KURL newTemplatesURL; KURL newTemplatesURL;
newTemplatesURL.setPath(urTemplates->url()); newTemplatesURL.setPath(urTemplates->url());
KURL videosURL; KURL videosURL;
// videosURL.setPath( TDEGlobalSettings::videosPath() ); videosURL.setPath(TDEGlobalSettings::videosPath());
KURL newVideosURL; KURL newVideosURL;
newVideosURL.setPath(urVideos->url()); newVideosURL.setPath(urVideos->url());
if ( !newDesktopURL.equals( desktopURL, true ) ) if (!newDesktopURL.equals(desktopURL, true))
{ {
// 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)
// and for each, test where it should go. // and for each, test where it should go.
@ -319,8 +339,12 @@ void DesktopPathConfig::save()
pathChanged = true; pathChanged = true;
} }
} }
if (!xdgconfig->hasKey("XDG_DESKTOP_DIR"))
{
xdgconfig->writePathEntry("XDG_DESKTOP_DIR", '"'+ urDesktop->url() + '"', true, false, false, false );
}
if ( !newAutostartURL.equals( autostartURL, true ) ) if (!newAutostartURL.equals(autostartURL, true))
{ {
if (!autostartMoved) if (!autostartMoved)
autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") ); autostartMoved = moveDir( KURL( TDEGlobalSettings::autostartPath() ), KURL( urAutostart->url() ), i18n("Autostart") );
@ -331,7 +355,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newDocumentURL.equals( documentURL, true ) ) if (!newDocumentURL.equals(documentURL, true) || !TQDir(urDocument->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urDocument->url(); TQString path = urDocument->url();
@ -352,7 +376,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newDownloadURL.equals( downloadURL, true ) ) if (!newDownloadURL.equals(downloadURL, true) || !TQDir(urDownload->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urDownload->url(); TQString path = urDownload->url();
@ -373,7 +397,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newMusicURL.equals( musicURL, true ) ) if (!newMusicURL.equals(musicURL, true) || !TQDir(urMusic->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urMusic->url(); TQString path = urMusic->url();
@ -394,7 +418,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newPicturesURL.equals( picturesURL, true ) ) if (!newPicturesURL.equals(picturesURL, true) || !TQDir(urPictures->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urPictures->url(); TQString path = urPictures->url();
@ -415,7 +439,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newPublicShareURL.equals( publicShareURL, true ) ) if (!newPublicShareURL.equals(publicShareURL, true) || !TQDir(urPublicShare->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urPublicShare->url(); TQString path = urPublicShare->url();
@ -436,7 +460,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newTemplatesURL.equals( templatesURL, true ) ) if (!newTemplatesURL.equals(templatesURL, true) || !TQDir(urTemplates->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urTemplates->url(); TQString path = urTemplates->url();
@ -457,7 +481,7 @@ void DesktopPathConfig::save()
} }
} }
if ( !newVideosURL.equals( videosURL, true ) ) if (!newVideosURL.equals(videosURL, true) || !TQDir(urVideos->url()).exists())
{ {
bool pathOk = true; bool pathOk = true;
TQString path = urVideos->url(); TQString path = urVideos->url();

5
kcontrol/konq/rootopts.h
Unescape Escape View File

@ -44,7 +44,8 @@ public:
virtual void defaults(); virtual void defaults();
private slots: private slots:
void slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList& list); void slotEntries(TDEIO::Job * job, const TDEIO::UDSEntryList& list);
void loadTimerDone();
private: private:
// Desktop Paths // Desktop Paths
@ -63,6 +64,8 @@ private:
KURL m_copyToDest; // used when the destination directory already exists KURL m_copyToDest; // used when the destination directory already exists
KURL m_copyFromSrc; KURL m_copyFromSrc;
TQTimer *loadTmr;
private slots: private slots:
void slotResult( TDEIO::Job * job ); void slotResult( TDEIO::Job * job );
}; };

Write Preview
Loading…
Cancel
Save