Attachment #2266 for bug #2127

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2127
Collapse All | Expand All




option( WITH_SNMP "Enable SNMP support" OFF )
option( WITH_SENSORS "Enable lm_sensors support" OFF )
option( WITH_XMMS "Enable xmms support" OFF )
option( WITH_TDENEWSTUFF "Enable tdenewstuff support" OFF )

# option( WITH_NV "Enable nv support" OFF )


# WITH_XMMS         affects superkaramba
# WITH_XMMS         description enables supercaramba applets to gain 
#                               information about now playing track etc.
# WITH_TDENEWSTUFF    affects superkaramba
# WITH_TDENEWSTUFF    description enebles support for downloadable content
#                               from kdelooks.
# FIXME: test if WITH_TDENEWSTUFF works in trinity or not

# NOTE: In addition to affects DPMS and XScreenSaver backend options for 
#       klaptopdaemon there is some XIdle code but it wasn't compleatly 

Lines 177-186 if ( BUILD_SUPERKARAMBA ) Link Here

(-)a/ConfigureChecks.cmake (-4 / +4 lines)
177	tde_message_fatal( "python is required, but was not found on your system" )	177	tde_message_fatal( "python is required, but was not found on your system" )
178	endif( NOT PYTHONLIBS_FOUND )	178	endif( NOT PYTHONLIBS_FOUND )
179		179
180	if( WITH_KNEWSTUFF )	180	if( WITH_TDENEWSTUFF )
181	set( HAVE_KNEWSTUFF 1 )	181	set( HAVE_TDENEWSTUFF 1 )
182	set( KNEWSTUFF_LIBRARIES knewstuff-shared )	182	set( TDENEWSTUFF_LIBRARIES tdenewstuff-shared )
183	endif( WITH_KNEWSTUFF )	183	endif( WITH_TDENEWSTUFF )
184		184
185	if( WITH_XMMS )	185	if( WITH_XMMS )
186	set( HAVE_XMMS 1 )	186	set( HAVE_XMMS 1 )

Lines 84-90 Link Here

(-)a/config.h.cmake (-1 / +1 lines)
84	// superkaramba	84	// superkaramba
85		85
86	#cmakedefine HAVE_XMMS	86	#cmakedefine HAVE_XMMS
87	#cmakedefine HAVE_KNEWSTUFF	87	#cmakedefine HAVE_TDENEWSTUFF
88		88
89	#if !defined( HAVE_SYS_TYPES_H )	89	#if !defined( HAVE_SYS_TYPES_H )
90	#cmakedefine HAVE_SYS_TYPES_H	90	#cmakedefine HAVE_SYS_TYPES_H

Lines 63-73 AC_SUBST(XMMS_LIBS) Link Here

(-)a/superkaramba/configure.in.in (-5 / +5 lines)
63	AC_SUBST(XMMS_LDFLAGS)	63	AC_SUBST(XMMS_LDFLAGS)
64	AC_SUBST(XMMS_INCLUDES)	64	AC_SUBST(XMMS_INCLUDES)
65		65
66	kde_have_knewstuff=yes	66	kde_have_tdenewstuff=yes
67	KDE_CHECK_LIB(knewstuff, main, [MY_LIBKNEWSTUFF="-lknewstuff"], kde_have_knewstuff=no)	67	KDE_CHECK_LIB(tdenewstuff, main, [MY_LIBTDENEWSTUFF="-ltdenewstuff"], kde_have_tdenewstuff=no)
68	if test "$kde_have_knewstuff" = "yes"; then	68	if test "$kde_have_tdenewstuff" = "yes"; then
69	AC_DEFINE(HAVE_KNEWSTUFF, 1, [Define if you have knewstuff])	69	AC_DEFINE(HAVE_TDENEWSTUFF, 1, [Define if you have tdenewstuff])
70	AC_SUBST(MY_LIBKNEWSTUFF)	70	AC_SUBST(MY_LIBTDENEWSTUFF)
71	fi	71	fi
72		72
73	AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])	73	AC_CHECK_LIB(kvm, main, [LIBKVM="-lkvm"])

Lines 55-61 tde_add_executable( superkaramba AUTOMOC Link Here

(-)a/superkaramba/src/CMakeLists.txt (-1 / +1 lines)
55	input.cpp sklineedit.cpp input_python.cpp	55	input.cpp sklineedit.cpp input_python.cpp
56	svcgrp_python.cpp	56	svcgrp_python.cpp
57	LINK tdeio-shared ${PYTHON_LIBRARIES}	57	LINK tdeio-shared ${PYTHON_LIBRARIES}
58	${KNEWSTUFF_LIBRARIES}	58	${TDENEWSTUFF_LIBRARIES}
59	DESTINATION ${BIN_INSTALL_DIR}	59	DESTINATION ${BIN_INSTALL_DIR}
60	)	60	)
61		61

Lines 41-48 superkaramba_SOURCES = main.cpp karamba.cpp meter.cpp bar.cpp sensor.cpp \ Link Here

(-)a/superkaramba/src/Makefile.am (-2 / +1 lines)
41	# kde_cfg_DATA = superkaramba.kcfg	41	# kde_cfg_DATA = superkaramba.kcfg
42		42
43	superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor	43	superkaramba_LDFLAGS = -Wl,-export-dynamic $(KDE_RPATH) $(all_libraries) $(PYTHONLIB) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
44	#superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)	44	superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBTDENEWSTUFF)
45	superkaramba_LDADD = -ltdeio $(LIB_TDEUI) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
46		45
47	# this is where the desktop file will go	46	# this is where the desktop file will go
48	shelldesktopdir = $(kde_appsdir)/Utilities	47	shelldesktopdir = $(kde_appsdir)/Utilities

Lines 2038-2044 void karamba::showMenuExtension() Link Here

(-)a/superkaramba/src/karamba.cpp (-1 / +1 lines)
2038	TQT_SLOT(slotToggleSystemTray()),	2038	TQT_SLOT(slotToggleSystemTray()),
2039	CTRL+Key_S);	2039	CTRL+Key_S);
2040		2040
2041	trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"),	2041	trayMenuThemeId = kglobal->insertItem(SmallIconSet("tdenewstuff"),
2042	i18n("&Manage Themes..."), this,	2042	i18n("&Manage Themes..."), this,
2043	TQT_SLOT(slotShowTheme()), CTRL+Key_M);	2043	TQT_SLOT(slotShowTheme()), CTRL+Key_M);
2044		2044

Lines 36-46 Link Here

(-)a/superkaramba/src/sknewstuff.cpp (-3 / +3 lines)
36		36
37	#include "karambaapp.h"	37	#include "karambaapp.h"
38	#include "themesdlg.h"	38	#include "themesdlg.h"
39	#ifdef HAVE_KNEWSTUFF	39	#ifdef HAVE_TDENEWSTUFF
40	#include "sknewstuff.h"	40	#include "sknewstuff.h"
41		41
42	SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :	42	SKNewStuff::SKNewStuff( ThemesDlg *dlg ) :
43	KNewStuff( "superkaramba/themes", dlg ),	43	TDENewStuff( "superkaramba/themes", dlg ),
44	mDlg( dlg )	44	mDlg( dlg )
45	{	45	{
46	}	46	}
Lines 137-140 TQString SKNewStuff::downloadDestination( KNS::Entry *entry ) Link Here
137	}	137	}
138	return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();	138	return TDEGlobal::dirs()->saveLocation( "tmp" ) + source.fileName();
139	}	139	}
140	#endif //HAVE_KNEWSTUFF	140	#endif //HAVE_TDENEWSTUFF




  #include <config.h>
#endif

#ifdef HAVE_TDENEWSTUFF
#include "tdenewstuff/knewstuff.h"
#include "tdenewstuff/entry.h"

class ThemesDlg;
class KArchiveDirectory;

class SKNewStuff : public TDENewStuff
{
  public:
    SKNewStuff( ThemesDlg * );

    KURL m_sourceLink;
};

#endif //HAVE_TDENEWSTUFF
#endif //SKNEWSTUFF_H




  #include <config.h>
#endif

#ifdef HAVE_TDENEWSTUFF
  #include "sknewstuff.h"
#endif


 : ThemesLayout(parent, name)
{
  populateListbox();
#ifdef HAVE_TDENEWSTUFF
  mNewStuff = 0;
#endif
}

{
  //kdDebug() << k_funcinfo << endl;
  saveUserAddedThemes();
#ifdef HAVE_TDENEWSTUFF
  if(mNewStuff)
  {
    delete mNewStuff;

  tableThemes->clear();

  item = new ThemeWidget;
  item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("tdenewstuff",
                        TDEIcon::NoGroup, TDEIcon::SizeHuge));
  item->setHeaderText(i18n("Get New Stuff"));
  item->setDescriptionText(i18n("Download new themes."));

  item->buttonGo->setText(i18n("New Stuff..."));
#ifdef HAVE_TDENEWSTUFF
  item->buttonGo->setEnabled(true);
  connect(item->buttonGo, TQT_SIGNAL(clicked()),
          this, TQT_SLOT(getNewStuff()));


void ThemesDlg::getNewStuff()
{
#ifdef HAVE_TDENEWSTUFF
  TDEConfig* config = TDEGlobal::config();
  config->setGroup("TDENewStuff");
  config->writePathEntry("ProvidersUrl",
      TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
  config->sync();
  m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
  //This check is b/c TDENewStuff will download, throw an error, 
  //and still have the entry in the config that it was successful
  configSanityCheck();



void ThemesDlg::writeNewStuffConfig(const TQString &file)
{
#ifdef HAVE_TDENEWSTUFF
  TDEConfig* config = TDEGlobal::config();
  TQStringList keys = config->entryMap("TDENewStuffStatus").keys();

  for(TQStringList::Iterator it = m_newStuffStatus.begin();
      it != m_newStuffStatus.end(); ++it)

  }
  if(!keys.isEmpty())
  {
    config->setGroup("TDENewStuffNames");
    config->writeEntry(file, keys[0]);
    config->sync();
  }


void ThemesDlg::configSanityCheck()
{
#ifdef HAVE_TDENEWSTUFF
  TDEConfig* config = TDEGlobal::config();
  TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
  TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
  TQStringList removeList;

  for(TQStringList::Iterator it = statusKeys.begin();

  {
    TQString keyName(*it);
    bool removeKey = true;
    config->setGroup("TDENewStuffNames");
    for(TQStringList::Iterator it2 = nameKeys.begin();
        it2 != nameKeys.end(); ++it2)
    {

    if( removeKey )
    {
      kdDebug() << "sanityCheck() deleting entry " << keyName << endl;
      config->setGroup("TDENewStuffStatus");
      config->deleteEntry( keyName );
    }
  }

{
  kdDebug() << "isDownloaded path: " << path << endl;
  TDEConfig* config = TDEGlobal::config();
  config->setGroup("TDENewStuffNames");
  return !config->readEntry(path).isEmpty();
}


      karambaApp->dcopIface()->closeTheme(twPtr->themeFile()->name());
      tableThemes->removeItem( twPtr );
    }
#ifdef HAVE_TDENEWSTUFF
    // Remove theme from TDENewStuffStatus
    TDEConfig* config = TDEGlobal::config();
    config->setGroup("TDENewStuffNames");
    TQString name = config->readEntry(tempPath);
    if(!name.isEmpty())
    {
      kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc" 
                << endl;
      kapp->config()->deleteEntry(tempPath);
      config->setGroup("TDENewStuffStatus");
      kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc" 
                << endl;
      kapp->config()->deleteEntry(name);
      kapp->config()->sync();

      TDEIO::move(remDir.path(), trash);
    }
    tableThemes->removeItem(w);
#ifdef HAVE_TDENEWSTUFF
    // Remove theme from TDENewStuffStatus
    TDEConfig* config = TDEGlobal::config();
    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("TDENewStuffStatus");
      kdDebug() << "removing " << name << " from superkarambarc" << endl;
      kapp->config()->deleteEntry(name);
      kapp->config()->sync();

Lines 31-37 Link Here

(-)a/superkaramba/src/themesdlg.h (-2 / +2 lines)
31	/**	31	/**
32	@author See README for the list of authors	32	@author See README for the list of authors
33	*/	33	*/
34	#ifdef HAVE_KNEWSTUFF	34	#ifdef HAVE_TDENEWSTUFF
35	class SKNewStuff;	35	class SKNewStuff;
36	#endif	36	#endif
37	class ThemeFile;	37	class ThemeFile;
Lines 71-77 class ThemesDlg : public ThemesLayout Link Here
71	int themeIndex(TQString file);	71	int themeIndex(TQString file);
72	TQStringList themes();	72	TQStringList themes();
73		73
74	#ifdef HAVE_KNEWSTUFF	74	#ifdef HAVE_TDENEWSTUFF
75	private:	75	private:
76	SKNewStuff *mNewStuff;	76	SKNewStuff *mNewStuff;
77	TQStringList m_newStuffStatus;	77	TQStringList m_newStuffStatus;

Return to bug 2127

Lines 29-35 Link Here

(-)a/superkaramba/src/themesdlg.cpp (-28 / +28 lines)
29	#include <config.h>	29	#include <config.h>
30	#endif	30	#endif
31		31
32	#ifdef HAVE_KNEWSTUFF	32	#ifdef HAVE_TDENEWSTUFF
33	#include "sknewstuff.h"	33	#include "sknewstuff.h"
34	#endif	34	#endif
35		35
Lines 55-61 ThemesDlg::ThemesDlg(TQWidget parent, const char name) Link Here
55	: ThemesLayout(parent, name)	55	: ThemesLayout(parent, name)
56	{	56	{
57	populateListbox();	57	populateListbox();
58	#ifdef HAVE_KNEWSTUFF	58	#ifdef HAVE_TDENEWSTUFF
59	mNewStuff = 0;	59	mNewStuff = 0;
60	#endif	60	#endif
61	}	61	}
Lines 64-70 ThemesDlg::~ThemesDlg() Link Here
64	{	64	{
65	//kdDebug() << k_funcinfo << endl;	65	//kdDebug() << k_funcinfo << endl;
66	saveUserAddedThemes();	66	saveUserAddedThemes();
67	#ifdef HAVE_KNEWSTUFF	67	#ifdef HAVE_TDENEWSTUFF
68	if(mNewStuff)	68	if(mNewStuff)
69	{	69	{
70	delete mNewStuff;	70	delete mNewStuff;
Lines 126-138 void ThemesDlg::populateListbox() Link Here
126	tableThemes->clear();	126	tableThemes->clear();
127		127
128	item = new ThemeWidget;	128	item = new ThemeWidget;
129	item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("knewstuff",	129	item->icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("tdenewstuff",
130	TDEIcon::NoGroup, TDEIcon::SizeHuge));	130	TDEIcon::NoGroup, TDEIcon::SizeHuge));
131	item->setHeaderText(i18n("Get New Stuff"));	131	item->setHeaderText(i18n("Get New Stuff"));
132	item->setDescriptionText(i18n("Download new themes."));	132	item->setDescriptionText(i18n("Download new themes."));
133		133
134	item->buttonGo->setText(i18n("New Stuff..."));	134	item->buttonGo->setText(i18n("New Stuff..."));
135	#ifdef HAVE_KNEWSTUFF	135	#ifdef HAVE_TDENEWSTUFF
136	item->buttonGo->setEnabled(true);	136	item->buttonGo->setEnabled(true);
137	connect(item->buttonGo, TQT_SIGNAL(clicked()),	137	connect(item->buttonGo, TQT_SIGNAL(clicked()),
138	this, TQT_SLOT(getNewStuff()));	138	this, TQT_SLOT(getNewStuff()));
Lines 216-229 void ThemesDlg::openLocalTheme() Link Here
216		216
217	void ThemesDlg::getNewStuff()	217	void ThemesDlg::getNewStuff()
218	{	218	{
219	#ifdef HAVE_KNEWSTUFF	219	#ifdef HAVE_TDENEWSTUFF
220	TDEConfig* config = TDEGlobal::config();	220	TDEConfig* config = TDEGlobal::config();
221	config->setGroup("KNewStuff");	221	config->setGroup("TDENewStuff");
222	config->writePathEntry("ProvidersUrl",	222	config->writePathEntry("ProvidersUrl",
223	TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));	223	TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
224	config->sync();	224	config->sync();
225	m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();	225	m_newStuffStatus = config->entryMap("TDENewStuffStatus").keys();
226	//This check is b/c KNewStuff will download, throw an error,	226	//This check is b/c TDENewStuff will download, throw an error,
227	//and still have the entry in the config that it was successful	227	//and still have the entry in the config that it was successful
228	configSanityCheck();	228	configSanityCheck();
229		229
Lines 300-308 void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir, Link Here
300		300
301	void ThemesDlg::writeNewStuffConfig(const TQString &file)	301	void ThemesDlg::writeNewStuffConfig(const TQString &file)
302	{	302	{
303	#ifdef HAVE_KNEWSTUFF	303	#ifdef HAVE_TDENEWSTUFF
304	TDEConfig* config = TDEGlobal::config();	304	TDEConfig* config = TDEGlobal::config();
305	TQStringList keys = config->entryMap("KNewStuffStatus").keys();	305	TQStringList keys = config->entryMap("TDENewStuffStatus").keys();
306		306
307	for(TQStringList::Iterator it = m_newStuffStatus.begin();	307	for(TQStringList::Iterator it = m_newStuffStatus.begin();
308	it != m_newStuffStatus.end(); ++it)	308	it != m_newStuffStatus.end(); ++it)
Lines 311-317 void ThemesDlg::writeNewStuffConfig(const TQString &file) Link Here
311	}	311	}
312	if(!keys.isEmpty())	312	if(!keys.isEmpty())
313	{	313	{
314	config->setGroup("KNewStuffNames");	314	config->setGroup("TDENewStuffNames");
315	config->writeEntry(file, keys[0]);	315	config->writeEntry(file, keys[0]);
316	config->sync();	316	config->sync();
317	}	317	}
Lines 320-329 void ThemesDlg::writeNewStuffConfig(const TQString &file) Link Here
320		320
321	void ThemesDlg::configSanityCheck()	321	void ThemesDlg::configSanityCheck()
322	{	322	{
323	#ifdef HAVE_KNEWSTUFF	323	#ifdef HAVE_TDENEWSTUFF
324	TDEConfig* config = TDEGlobal::config();	324	TDEConfig* config = TDEGlobal::config();
325	TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys();	325	TQStringList statusKeys = config->entryMap("TDENewStuffStatus").keys();
326	TQStringList nameKeys = config->entryMap("KNewStuffNames").keys();	326	TQStringList nameKeys = config->entryMap("TDENewStuffNames").keys();
327	TQStringList removeList;	327	TQStringList removeList;
328		328
329	for(TQStringList::Iterator it = statusKeys.begin();	329	for(TQStringList::Iterator it = statusKeys.begin();
Lines 331-337 void ThemesDlg::configSanityCheck() Link Here
331	{	331	{
332	TQString keyName(*it);	332	TQString keyName(*it);
333	bool removeKey = true;	333	bool removeKey = true;
334	config->setGroup("KNewStuffNames");	334	config->setGroup("TDENewStuffNames");
335	for(TQStringList::Iterator it2 = nameKeys.begin();	335	for(TQStringList::Iterator it2 = nameKeys.begin();
336	it2 != nameKeys.end(); ++it2)	336	it2 != nameKeys.end(); ++it2)
337	{	337	{
Lines 345-351 void ThemesDlg::configSanityCheck() Link Here
345	if( removeKey )	345	if( removeKey )
346	{	346	{
347	kdDebug() << "sanityCheck() deleting entry " << keyName << endl;	347	kdDebug() << "sanityCheck() deleting entry " << keyName << endl;
348	config->setGroup("KNewStuffStatus");	348	config->setGroup("TDENewStuffStatus");
349	config->deleteEntry( keyName );	349	config->deleteEntry( keyName );
350	}	350	}
351	}	351	}
Lines 428-434 bool ThemesDlg::isDownloaded( const TQString& path ) Link Here
428	{	428	{
429	kdDebug() << "isDownloaded path: " << path << endl;	429	kdDebug() << "isDownloaded path: " << path << endl;
430	TDEConfig* config = TDEGlobal::config();	430	TDEConfig* config = TDEGlobal::config();
431	config->setGroup("KNewStuffNames");	431	config->setGroup("TDENewStuffNames");
432	return !config->readEntry(path).isEmpty();	432	return !config->readEntry(path).isEmpty();
433	}	433	}
434		434
Lines 476-493 void ThemesDlg::uninstall() Link Here
476	karambaApp->dcopIface()->closeTheme(twPtr->themeFile()->name());	476	karambaApp->dcopIface()->closeTheme(twPtr->themeFile()->name());
477	tableThemes->removeItem( twPtr );	477	tableThemes->removeItem( twPtr );
478	}	478	}
479	#ifdef HAVE_KNEWSTUFF	479	#ifdef HAVE_TDENEWSTUFF
480	// Remove theme from KNewStuffStatus	480	// Remove theme from TDENewStuffStatus
481	TDEConfig* config = TDEGlobal::config();	481	TDEConfig* config = TDEGlobal::config();
482	config->setGroup("KNewStuffNames");	482	config->setGroup("TDENewStuffNames");
483	TQString name = config->readEntry(tempPath);	483	TQString name = config->readEntry(tempPath);
484	if(!name.isEmpty())	484	if(!name.isEmpty())
485	{	485	{
486	kdDebug() << "removing " << tempPath << " under KNewStuffNames from superkarambarc"	486	kdDebug() << "removing " << tempPath << " under TDENewStuffNames from superkarambarc"
487	<< endl;	487	<< endl;
488	kapp->config()->deleteEntry(tempPath);	488	kapp->config()->deleteEntry(tempPath);
489	config->setGroup("KNewStuffStatus");	489	config->setGroup("TDENewStuffStatus");
490	kdDebug() << "removing " << name << " under KNewStuffStatus from superkarambarc"	490	kdDebug() << "removing " << name << " under TDENewStuffStatus from superkarambarc"
491	<< endl;	491	<< endl;
492	kapp->config()->deleteEntry(name);	492	kapp->config()->deleteEntry(name);
493	kapp->config()->sync();	493	kapp->config()->sync();
Lines 506-521 void ThemesDlg::uninstall() Link Here
506	TDEIO::move(remDir.path(), trash);	506	TDEIO::move(remDir.path(), trash);
507	}	507	}
508	tableThemes->removeItem(w);	508	tableThemes->removeItem(w);
509	#ifdef HAVE_KNEWSTUFF	509	#ifdef HAVE_TDENEWSTUFF
510	// Remove theme from KNewStuffStatus	510	// Remove theme from TDENewStuffStatus
511	TDEConfig* config = TDEGlobal::config();	511	TDEConfig* config = TDEGlobal::config();
512	config->setGroup("KNewStuffNames");	512	config->setGroup("TDENewStuffNames");
513	TQString name = config->readEntry(theme.path());	513	TQString name = config->readEntry(theme.path());
514	if(!name.isEmpty())	514	if(!name.isEmpty())
515	{	515	{
516	kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;	516	kdDebug() << "removing " << theme.path() << " from superkarambarc" << endl;
517	kapp->config()->deleteEntry(theme.path());	517	kapp->config()->deleteEntry(theme.path());
518	config->setGroup("KNewStuffStatus");	518	config->setGroup("TDENewStuffStatus");
519	kdDebug() << "removing " << name << " from superkarambarc" << endl;	519	kdDebug() << "removing " << name << " from superkarambarc" << endl;
520	kapp->config()->deleteEntry(name);	520	kapp->config()->deleteEntry(name);
521	kapp->config()->sync();	521	kapp->config()->sync();

Lines 57-63 option( WITH_I8K "Enable dell laptop support" OFF ) Link Here

(-)a/CMakeLists.txt (-4 / +4 lines)
57	option( WITH_SNMP "Enable SNMP support" OFF )	57	option( WITH_SNMP "Enable SNMP support" OFF )
58	option( WITH_SENSORS "Enable lm_sensors support" OFF )	58	option( WITH_SENSORS "Enable lm_sensors support" OFF )
59	option( WITH_XMMS "Enable xmms support" OFF )	59	option( WITH_XMMS "Enable xmms support" OFF )
60	option( WITH_KNEWSTUFF "Enable knewstuff support" OFF )	60	option( WITH_TDENEWSTUFF "Enable tdenewstuff support" OFF )
61		61
62	# option( WITH_NV "Enable nv support" OFF )	62	# option( WITH_NV "Enable nv support" OFF )
63		63
Lines 85-94 option( WITH_KNEWSTUFF "Enable knewstuff support" OFF ) Link Here
85	# WITH_XMMS affects superkaramba	85	# WITH_XMMS affects superkaramba
86	# WITH_XMMS description enables supercaramba applets to gain	86	# WITH_XMMS description enables supercaramba applets to gain
87	# information about now playing track etc.	87	# information about now playing track etc.
88	# WITH_KNEWSTUFF affects superkaramba	88	# WITH_TDENEWSTUFF affects superkaramba
89	# WITH_KNEWSTUFF description enebles support for downloadable content	89	# WITH_TDENEWSTUFF description enebles support for downloadable content
90	# from kdelooks.	90	# from kdelooks.
91	# FIXME: test if WITH_KNEWSTUFF works in trinity or not	91	# FIXME: test if WITH_TDENEWSTUFF works in trinity or not
92		92
93	# NOTE: In addition to affects DPMS and XScreenSaver backend options for	93	# NOTE: In addition to affects DPMS and XScreenSaver backend options for
94	# klaptopdaemon there is some XIdle code but it wasn't compleatly	94	# klaptopdaemon there is some XIdle code but it wasn't compleatly

Lines 269-275 readThemeFile added to python api. Link Here

(-)a/superkaramba/ChangeLog (-3 / +3 lines)
269	------------------------------------------------------------------------	269	------------------------------------------------------------------------
270	r422675 \| nickell \| 2005-06-06 00:57:45 -0400 (Mon, 06 Jun 2005) \| 2 lines	270	r422675 \| nickell \| 2005-06-06 00:57:45 -0400 (Mon, 06 Jun 2005) \| 2 lines
271		271
272	Initial support for KNewStuff. Install code has not been completed yet.	272	Initial support for TDENewStuff. Install code has not been completed yet.
273		273
274	------------------------------------------------------------------------	274	------------------------------------------------------------------------
275	r422865 \| pdamsten \| 2005-06-06 14:54:37 -0400 (Mon, 06 Jun 2005) \| 1 line	275	r422865 \| pdamsten \| 2005-06-06 14:54:37 -0400 (Mon, 06 Jun 2005) \| 1 line
Lines 278-284 Add warning when running non local theme. Link Here
278	------------------------------------------------------------------------	278	------------------------------------------------------------------------
279	r422947 \| nickell \| 2005-06-06 20:14:17 -0400 (Mon, 06 Jun 2005) \| 4 lines	279	r422947 \| nickell \| 2005-06-06 20:14:17 -0400 (Mon, 06 Jun 2005) \| 4 lines
280		280
281	More knewstuff. Install is now working, but it's limited to non-zipped	281	More tdenewstuff. Install is now working, but it's limited to non-zipped
282	themes and they get installed into:	282	themes and they get installed into:
283	~/.kde/share/apps/superkaramba/themes/	283	~/.kde/share/apps/superkaramba/themes/
284		284
Lines 707-710 SuperKaramba v0.35 Link Here
707	* asyncronous image loading. karamba.setImagePath should now work with net files.	707	* asyncronous image loading. karamba.setImagePath should now work with net files.
708	* fixed bug in meterClicked()	708	* fixed bug in meterClicked()
709	* fixed bug in setRichTextWidth() / getRichTextSize()	709	* fixed bug in setRichTextWidth() / getRichTextSize()
710	* much more code cleanup, bug fixes, and internal documentation	710	* much more code cleanup, bug fixes, and internal documentation

Lines 28-41 Link Here

(-)a/superkaramba/src/sknewstuff.h (-5 / +5 lines)
28	#include <config.h>	28	#include <config.h>
29	#endif	29	#endif
30		30
31	#ifdef HAVE_KNEWSTUFF	31	#ifdef HAVE_TDENEWSTUFF
32	#include "knewstuff/knewstuff.h"	32	#include "tdenewstuff/knewstuff.h"
33	#include "knewstuff/entry.h"	33	#include "tdenewstuff/entry.h"
34		34
35	class ThemesDlg;	35	class ThemesDlg;
36	class KArchiveDirectory;	36	class KArchiveDirectory;
37		37
38	class SKNewStuff : public KNewStuff	38	class SKNewStuff : public TDENewStuff
39	{	39	{
40	public:	40	public:
41	SKNewStuff( ThemesDlg * );	41	SKNewStuff( ThemesDlg * );
Lines 49-53 class SKNewStuff : public KNewStuff Link Here
49	KURL m_sourceLink;	49	KURL m_sourceLink;
50	};	50	};
51		51
52	#endif //HAVE_KNEWSTUFF	52	#endif //HAVE_TDENEWSTUFF
53	#endif //SKNEWSTUFF_H	53	#endif //SKNEWSTUFF_H