diff options
author | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-11-10 18:04:39 -0500 |
commit | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch) | |
tree | 2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/core/tdebase/make-wallpapers-hideable.diff | |
parent | 8667643bff14a60d8571c599efd3e48bed3e3b12 (diff) | |
download | tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip |
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/core/tdebase/make-wallpapers-hideable.diff')
-rw-r--r-- | opensuse/core/tdebase/make-wallpapers-hideable.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/make-wallpapers-hideable.diff b/opensuse/core/tdebase/make-wallpapers-hideable.diff new file mode 100644 index 000000000..d59494940 --- /dev/null +++ b/opensuse/core/tdebase/make-wallpapers-hideable.diff @@ -0,0 +1,48 @@ +Index: kcontrol/background/bgdialog.cpp +=================================================================== +--- kcontrol/background/bgdialog.cpp.orig ++++ kcontrol/background/bgdialog.cpp +@@ -477,14 +477,23 @@ void BGDialog::loadWallpaperFilesList() + //search for .desktop files before searching for images without .desktop files + QStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); + QStringList files; ++ QStringList hiddenfiles; + for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + { + KSimpleConfig fileConfig(*it); + fileConfig.setGroup("Wallpaper"); + ++ int slash = (*it).findRev('/') + 1; ++ QString directory = (*it).left(slash); ++ + QString imageCaption = fileConfig.readEntry("Name"); + QString fileName = fileConfig.readEntry("File"); + ++ if (fileConfig.readBoolEntry("Hidden",false)) { ++ hiddenfiles.append(directory + fileName); ++ continue; ++ } ++ + if (imageCaption.isEmpty()) + { + imageCaption = fileName; +@@ -500,9 +509,8 @@ void BGDialog::loadWallpaperFilesList() + rs = imageCaption + " (" + QString::number(n) + ')'; + lrs = rs.lower(); + } +- int slash = (*it).findRev('/') + 1; +- QString directory = (*it).left(slash); + bool canLoadScaleable = false; ++ + #ifdef HAVE_LIBART + canLoadScaleable = true; + #endif +@@ -516,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() + lst = m_pDirs->findAllResources("wallpaper", "*", false, true); + for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) + { +- if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() ) { ++ if ( !(*it).endsWith(".desktop") && files.grep(*it).empty() && hiddenfiles.grep(*it).empty() ) { + // First try to see if we have a comment describing the image. If we do + // just use the first line of said comment. + KFileMetaInfo metaInfo(*it); |