|
|
|
@ -218,12 +218,12 @@ void ThemesDlg::getNewStuff()
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_KNEWSTUFF
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
config->setGroup("KNewStuff");
|
|
|
|
|
config->setGroup("TDENewStuff");
|
|
|
|
|
config->writePathEntry("ProvidersUrl",
|
|
|
|
|
TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
|
|
|
|
|
TQString::fromLatin1("https://www.trinitydesktop.org/ocs/karamba-providers.xml"));
|
|
|
|
|
config->sync();
|
|
|
|
|
m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
|
|
|
|
|
//This check is b/c KNewStuff will download, throw an error,
|
|
|
|
|
m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
|
|
|
|
|
//This check is b/c KNewStuff will download, throw an error,
|
|
|
|
|
//and still have the entry in the config that it was successful
|
|
|
|
|
configSanityCheck();
|
|
|
|
|
|
|
|
|
@ -302,7 +302,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_KNEWSTUFF
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
TQStringList keys = config->entryMap("KNewStuffStatus").keys();
|
|
|
|
|
TQStringList keys = config->entryMap("TDENewStuffStatus").keys();
|
|
|
|
|
|
|
|
|
|
for(TQStringList::Iterator it = m_newStuffStatus.begin();
|
|
|
|
|
it != m_newStuffStatus.end(); ++it)
|
|
|
|
@ -311,7 +311,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
|
|
|
|
|
}
|
|
|
|
|
if(!keys.isEmpty())
|
|
|
|
|
{
|
|
|
|
|
config->setGroup("KNewStuffNames");
|
|
|
|
|
config->setGroup("TDENewStuffNames");
|
|
|
|
|
config->writeEntry(file, keys[0]);
|
|
|
|
|
config->sync();
|
|
|
|
|
}
|
|
|
|
@ -322,8 +322,8 @@ void ThemesDlg::configSanityCheck()
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_KNEWSTUFF
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();
|
|
|
|
|
TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();
|
|
|
|
|
TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
|
|
|
|
|
TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
|
|
|
|
|
TQStringList removeList;
|
|
|
|
|
|
|
|
|
|
for(TQStringList::Iterator it = statusKeys.begin();
|
|
|
|
@ -331,7 +331,7 @@ void ThemesDlg::configSanityCheck()
|
|
|
|
|
{
|
|
|
|
|
TQString keyName(*it);
|
|
|
|
|
bool removeKey = true;
|
|
|
|
|
config->setGroup("KNewStuffNames");
|
|
|
|
|
config->setGroup("TDENewStuffNames");
|
|
|
|
|
for(TQStringList::Iterator it2 = nameKeys.begin();
|
|
|
|
|
it2 != nameKeys.end(); ++it2)
|
|
|
|
|
{
|
|
|
|
@ -345,7 +345,7 @@ void ThemesDlg::configSanityCheck()
|
|
|
|
|
if( removeKey )
|
|
|
|
|
{
|
|
|
|
|
kdDebug() << "sanityCheck() deleting entry " << keyName << endl;
|
|
|
|
|
config->setGroup("KNewStuffStatus");
|
|
|
|
|
config->setGroup("TDENewStuffStatus");
|
|
|
|
|
config->deleteEntry( keyName );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -428,7 +428,7 @@ bool ThemesDlg::isDownloaded( const TQString& path )
|
|
|
|
|
{
|
|
|
|
|
kdDebug() << "isDownloaded path: " << path << endl;
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
config->setGroup("KNewStuffNames");
|
|
|
|
|
config->setGroup("TDENewStuffNames");
|
|
|
|
|
return !config->readEntry(path).isEmpty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -479,14 +479,14 @@ void ThemesDlg::uninstall()
|
|
|
|
|
#ifdef HAVE_KNEWSTUFF
|
|
|
|
|
// Remove theme from KNewStuffStatus
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
config->setGroup("KNewStuffNames");
|
|
|
|
|
config->setGroup("TDENewStuffNames");
|
|
|
|
|
TQString name = config->readEntry(tempPath);
|
|
|
|
|
if(!name.isEmpty())
|
|
|
|
|
{
|
|
|
|
|
kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc"
|
|
|
|
|
<< endl;
|
|
|
|
|
kapp->config()->deleteEntry(tempPath);
|
|
|
|
|
config->setGroup("KNewStuffStatus");
|
|
|
|
|
config->setGroup("TDENewStuffStatus");
|
|
|
|
|
kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc"
|
|
|
|
|
<< endl;
|
|
|
|
|
kapp->config()->deleteEntry(name);
|
|
|
|
@ -509,13 +509,13 @@ void ThemesDlg::uninstall()
|
|
|
|
|
#ifdef HAVE_KNEWSTUFF
|
|
|
|
|
// Remove theme from KNewStuffStatus
|
|
|
|
|
TDEConfig* config = TDEGlobal::config();
|
|
|
|
|
config->setGroup("KNewStuffNames");
|
|
|
|
|
config->setGroup("TDENewStuffNames");
|
|
|
|
|
TQString name = config->readEntry(theme.path());
|
|
|
|
|
if(!name.isEmpty())
|
|
|
|
|
{
|
|
|
|
|
kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;
|
|
|
|
|
kapp->config()->deleteEntry(theme.path());
|
|
|
|
|
config->setGroup("KNewStuffStatus");
|
|
|
|
|
config->setGroup("TDENewStuffStatus");
|
|
|
|
|
kdDebug() << "removing " << name << " from superkarambarc" << endl;
|
|
|
|
|
kapp->config()->deleteEntry(name);
|
|
|
|
|
kapp->config()->sync();
|
|
|
|
|