diff options
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/background/bgdialog.cpp | 14 | ||||
| -rw-r--r-- | kcontrol/input/xcursor/themepage.cpp | 11 | ||||
| -rw-r--r-- | kcontrol/kicker/menutab_impl.h | 3 | ||||
| -rw-r--r-- | kcontrol/spellchecking/spellchecking.cpp | 2 |
4 files changed, 24 insertions, 6 deletions
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index ae76b701a..8294f53a3 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -504,14 +504,23 @@ void BGDialog::loadWallpaperFilesList() { //search for .desktop files before searching for images without .desktop files TQStringList lst = m_pDirs->findAllResources("wallpaper", "*desktop", false, true); TQStringList files; + TQStringList hiddenfiles; for (TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { KSimpleConfig fileConfig(*it); fileConfig.setGroup("Wallpaper"); + int slash = (*it).findRev('/') + 1; + TQString directory = (*it).left(slash); + TQString imageCaption = fileConfig.readEntry("Name"); TQString fileName = fileConfig.readEntry("File"); + if (fileConfig.readBoolEntry("Hidden",false)) { + hiddenfiles.append(directory + fileName); + continue; + } + if (imageCaption.isEmpty()) { imageCaption = fileName; @@ -527,9 +536,8 @@ void BGDialog::loadWallpaperFilesList() { rs = imageCaption + " (" + TQString::number(n) + ')'; lrs = rs.lower(); } - int slash = (*it).findRev('/') + 1; - TQString directory = (*it).left(slash); bool canLoadScaleable = false; + #ifdef HAVE_LIBART canLoadScaleable = true; #endif @@ -543,7 +551,7 @@ void BGDialog::loadWallpaperFilesList() { lst = m_pDirs->findAllResources("wallpaper", "*", false, true); for (TQStringList::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); diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 4fb8b8a69..7caf18c3f 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -73,6 +73,13 @@ struct ThemeInfo { }; +static TQString defaultThemeDescription( const TQString& theme ) +{ + if( theme == "redglass" || theme == "whiteglass" || theme == "pseudocore" || theme == "handhelds" ) + return i18n( "XFree theme %1 - incomplete for KDE" ).arg( theme ); + return i18n( "No description available" );; +} + ThemePage::ThemePage( TQWidget* parent, const char* name ) : TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL ) { @@ -333,7 +340,7 @@ void ThemePage::insertTheme( const TQString &path ) // Defaults in case there's no name or comment field. TQString name = dirName; - TQString desc = i18n( "No description available" ); + TQString desc = defaultThemeDescription( name ); TQString sample = "left_ptr"; KSimpleConfig c( path + "/index.theme", true ); // Open read-only @@ -480,7 +487,7 @@ void ThemePage::insertThemes() // Defaults in case there's no index.theme file or it lacks // a name and a comment field. TQString name = *it; - TQString desc = i18n( "No description available" ); + TQString desc = defaultThemeDescription( name ); TQString sample = "left_ptr"; // Parse the index.theme file if the theme has one. diff --git a/kcontrol/kicker/menutab_impl.h b/kcontrol/kicker/menutab_impl.h index 3d0e09748..877e47ffe 100644 --- a/kcontrol/kicker/menutab_impl.h +++ b/kcontrol/kicker/menutab_impl.h @@ -19,6 +19,9 @@ #define __menutab_impl_h__ #include <tqlistview.h> +#include <stdlib.h> + +#include <kpushbutton.h> #include "menutab.h" diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 6416f9e9c..a7ed79b46 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -67,7 +67,7 @@ void KSpellCheckingConfig::defaults() spellConfig->setRunTogether(0); spellConfig->setDictionary(""); spellConfig->setDictFromList(FALSE); - spellConfig->setEncoding (KS_E_ASCII); + spellConfig->setEncoding (KS_E_UTF8); spellConfig->setClient (KS_CLIENT_ISPELL); } |