Attachment #2271 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

Lines 74-80 Import/Export Link Here

(-)a/chalk/TODO (-1 / +1 lines)
74	User Interface	74	User Interface
75	* Add an explanatory textframe to the scaling filter combobox.	75	* Add an explanatory textframe to the scaling filter combobox.
76	* Add a good crosshair cursor and a crosshair cursor that extends to the rulers.	76	* Add a good crosshair cursor and a crosshair cursor that extends to the rulers.
77	* Add a cheatsheet widget that integrates with knewstuff to have tutorials that people	77	* Add a cheatsheet widget that integrates with tdenewstuff to have tutorials that people
78	can download and follow from Chalk.	78	can download and follow from Chalk.
79	* Add opacity widget (One that grows more white or transparent (showing those gray blocks) based on the	79	* Add opacity widget (One that grows more white or transparent (showing those gray blocks) based on the
80	input)	80	input)

Lines 58-64 Link Here

(-)a/doc/kexi/menus.docbook (-1 / +1 lines)
58	</menuchoice>	58	</menuchoice>
59	</term>	59	</term>
60	<listitem>	60	<listitem>
61	<para><action>Open the KNewStuff dialog</action> which	61	<para><action>Open the TDENewStuff dialog</action> which
62	allows you to download example databases via the	62	allows you to download example databases via the
63	Internet. This is currently not available for MS Windows.</para>	63	Internet. This is currently not available for MS Windows.</para>
64	</listitem>	64	</listitem>





dnl ======================================
dnl TDENewStuff Configuration
dnl ======================================
dnl
dnl Copyright (C) 2004 Josef Spillner <spillner@kde.org>
dnl This file is to be used within KDE's build system.
dnl It defines $(LIB_TDENEWSTUFF) if tdenewstuff has been found,
dnl and a HAVE_TDENEWSTUFF #define statement is added.
dnl

AC_MSG_CHECKING([for TDE library: tdenewstuff])

ac_tdenewstuff_includes=NO ac_tdenewstuff_libraries=NO
tdenewstuff_libraries=""
tdenewstuff_includes=""

AC_CACHE_VAL(ac_cv_have_tdenewstuff,
[
AC_FIND_FILE(tdenewstuff/downloaddialog.h, $kde_incdirs, tdenewstuff_incdir)
ac_tdenewstuff_includes="$tdenewstuff_incdir"

AC_FIND_FILE(libtdenewstuff.so, $kde_libdirs, tdenewstuff_libdir)
ac_tdenewstuff_libraries="$tdenewstuff_libdir"

if test "$ac_tdenewstuff_includes" = NO || test "$ac_tdenewstuff_libraries" = NO; then
  ac_cv_have_tdenewstuff="have_tdenewstuff=no"
  ac_tdenewstuff_notfound=""
else
  have_tdenewstuff="yes"
fi
])

eval "$ac_cv_have_tdenewstuff"

if test "$have_tdenewstuff" != yes; then
  AC_MSG_RESULT([$have_tdenewstuff])
else
  AC_MSG_RESULT([$have_tdenewstuff (libraries $ac_tdenewstuff_libraries, headers $ac_tdenewstuff_includes)])

dnl  AC_DEFINE_UNQUOTED(have_tdenewstuff, 1, [Add TDENewStuff functionality.])
  CXXFLAGS="$CXXFLAGS -Dhave_tdenewstuff"

  LIB_TDENEWSTUFF='-ltdenewstuff'
  AC_SUBST(LIB_TDENEWSTUFF)
fi

AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],

  use_kexifb="no"
  AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])

dnl  AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add TDENewStuff functionality.])
  CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""

  LIB_KFEEDBACK='-lkfeedbackwizard'




#include <kexicontexthelp.h>
#endif

#ifdef HAVE_TDENEWSTUFF
#include <tdenewstuff/downloaddialog.h>
#include "kexinewstuff.h"
#endif


	action->setToolTip(i18n("Open an existing project"));
	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));

#ifdef HAVE_TDENEWSTUFF
	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
		TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
	action->setToolTip(i18n("Download example databases from the Internet"));

/// TMP (until there's true template support)
void KexiMainWindowImpl::slotGetNewStuff()
{
#ifdef HAVE_TDENEWSTUFF
	if(!d->newStuff)
		d->newStuff = new KexiNewStuff(this);
	d->newStuff->download();

Lines 76-82 public: Link Here

(-)a/kexi/main/keximainwindowimpl_p.h (-2 / +2 lines)
76	dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd));	76	dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd));
77	#endif	77	#endif
78	maximizeFirstOpenedChildFrm = false;	78	maximizeFirstOpenedChildFrm = false;
79	#ifdef HAVE_KNEWSTUFF	79	#ifdef HAVE_TDENEWSTUFF
80	newStuff = 0;	80	newStuff = 0;
81	#endif	81	#endif
82	mdiModeToSwitchAfterRestart = (KMdi::MdiMode)0;	82	mdiModeToSwitchAfterRestart = (KMdi::MdiMode)0;
Lines 574-580 void updatePropEditorDockWidthInfo() { Link Here
574		574
575	bool navWasVisibleBeforeProjectClosing : 1;	575	bool navWasVisibleBeforeProjectClosing : 1;
576	bool saveSettingsForShowProjectNavigator : 1;	576	bool saveSettingsForShowProjectNavigator : 1;
577	#ifdef HAVE_KNEWSTUFF	577	#ifdef HAVE_TDENEWSTUFF
578	KexiNewStuff *newStuff;	578	KexiNewStuff *newStuff;
579	#endif	579	#endif
580		580




 * Boston, MA 02110-1301, USA.
*/

#ifdef HAVE_TDENEWSTUFF

#include <kdebug.h>
#include <ktar.h>

#include "kexinewstuff.h"

KexiNewStuff::KexiNewStuff(TQWidget *parent)
 : TDENewStuff( "kexi/template"
#if KDE_IS_VERSION(3,3,0)
	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
#endif

	// fails to download something, it still marks the thing as
	// successfully downloaded and therefore we arn't able to
	// download it again :-/
	TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
}

KexiNewStuff::~KexiNewStuff()




 * Boston, MA 02110-1301, USA.
*/

#ifdef HAVE_TDENEWSTUFF

#ifndef KEXINEWSTUFF_H
#define KEXINEWSTUFF_H

#include "tdenewstuff/knewstuff.h"

class KexiNewStuff : public TDENewStuff
{
	public:
		KexiNewStuff(TQWidget *parent);

		virtual bool install( const TQString &fileName );
		virtual bool createUploadFile( const TQString &fileName );

		//KNS::Engine*  customEngine() { return TDENewStuff::engine(); }
};

#endif

#endif //HAVE_TDENEWSTUFF




#include <tdetoolbar.h>

#if KDE_IS_VERSION(3, 4, 0)
  // The TDENewStuffSecure we use internaly for the GetHotNewStuff-functionality
  // was introduced with KDE 3.4.
  #define KROSS_SUPPORT_NEWSTUFF
#endif

#ifdef KROSS_SUPPORT_NEWSTUFF
  #include <tdenewstuff/provider.h>
  #include <tdenewstuff/engine.h>
  #include <tdenewstuff/downloaddialog.h>
  #include <tdenewstuff/knewstuffsecure.h>
#endif

#include "scriptguiclient.h"

namespace Kross { namespace Api {

#ifdef KROSS_SUPPORT_NEWSTUFF
class ScriptNewStuff : public TDENewStuffSecure
{
    public:
        ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)
            : TDENewStuffSecure(type, parentWidget)
            , m_scripguiclient(scripguiclient) {}
        virtual ~ScriptNewStuff() {}
    private:

    btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
    connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
#ifdef KROSS_SUPPORT_NEWSTUFF
    btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "tdenewstuff", TDEIcon::MainToolbar, 16 ));
    connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
#endif
/*

    toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
#ifdef KROSS_SUPPORT_NEWSTUFF
    toolBar->insertLineSeparator();
    toolBar->insertButton("tdenewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
    toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
#endif
*/


void WdgScriptsManager::slotResourceInstalled()
{
    // Delete TDENewStuff's configuration entries. These entries reflect what has
    // already been installed. As we cannot yet keep them in sync after uninstalling
    // scripts, we deactivate the check marks entirely.
    TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
}

}}

Return to bug 2127

Lines 1-48 Link Here

(-)a/kexi/main/configure.in.in (-25 / +25 lines)
1		1
2	dnl ======================================	2	dnl ======================================
3	dnl KNewStuff Configuration	3	dnl TDENewStuff Configuration
4	dnl ======================================	4	dnl ======================================
5	dnl	5	dnl
6	dnl Copyright (C) 2004 Josef Spillner <spillner@kde.org>	6	dnl Copyright (C) 2004 Josef Spillner <spillner@kde.org>
7	dnl This file is to be used within KDE's build system.	7	dnl This file is to be used within KDE's build system.
8	dnl It defines $(LIB_KNEWSTUFF) if knewstuff has been found,	8	dnl It defines $(LIB_TDENEWSTUFF) if tdenewstuff has been found,
9	dnl and a HAVE_KNEWSTUFF #define statement is added.	9	dnl and a HAVE_TDENEWSTUFF #define statement is added.
10	dnl	10	dnl
11		11
12	AC_MSG_CHECKING([for KDE library: knewstuff])	12	AC_MSG_CHECKING([for TDE library: tdenewstuff])
13		13
14	ac_knewstuff_includes=NO ac_knewstuff_libraries=NO	14	ac_tdenewstuff_includes=NO ac_tdenewstuff_libraries=NO
15	knewstuff_libraries=""	15	tdenewstuff_libraries=""
16	knewstuff_includes=""	16	tdenewstuff_includes=""
17		17
18	AC_CACHE_VAL(ac_cv_have_knewstuff,	18	AC_CACHE_VAL(ac_cv_have_tdenewstuff,
19	[	19	[
20	AC_FIND_FILE(knewstuff/downloaddialog.h, $kde_incdirs, knewstuff_incdir)	20	AC_FIND_FILE(tdenewstuff/downloaddialog.h, $kde_incdirs, tdenewstuff_incdir)
21	ac_knewstuff_includes="$knewstuff_incdir"	21	ac_tdenewstuff_includes="$tdenewstuff_incdir"
22		22
23	AC_FIND_FILE(libknewstuff.so, $kde_libdirs, knewstuff_libdir)	23	AC_FIND_FILE(libtdenewstuff.so, $kde_libdirs, tdenewstuff_libdir)
24	ac_knewstuff_libraries="$knewstuff_libdir"	24	ac_tdenewstuff_libraries="$tdenewstuff_libdir"
25		25
26	if test "$ac_knewstuff_includes" = NO \|\| test "$ac_knewstuff_libraries" = NO; then	26	if test "$ac_tdenewstuff_includes" = NO \|\| test "$ac_tdenewstuff_libraries" = NO; then
27	ac_cv_have_knewstuff="have_knewstuff=no"	27	ac_cv_have_tdenewstuff="have_tdenewstuff=no"
28	ac_knewstuff_notfound=""	28	ac_tdenewstuff_notfound=""
29	else	29	else
30	have_knewstuff="yes"	30	have_tdenewstuff="yes"
31	fi	31	fi
32	])	32	])
33		33
34	eval "$ac_cv_have_knewstuff"	34	eval "$ac_cv_have_tdenewstuff"
35		35
36	if test "$have_knewstuff" != yes; then	36	if test "$have_tdenewstuff" != yes; then
37	AC_MSG_RESULT([$have_knewstuff])	37	AC_MSG_RESULT([$have_tdenewstuff])
38	else	38	else
39	AC_MSG_RESULT([$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)])	39	AC_MSG_RESULT([$have_tdenewstuff (libraries $ac_tdenewstuff_libraries, headers $ac_tdenewstuff_includes)])
40		40
41	dnl AC_DEFINE_UNQUOTED(HAVE_KNEWSTUFF, 1, [Add KNewStuff functionality.])	41	dnl AC_DEFINE_UNQUOTED(have_tdenewstuff, 1, [Add TDENewStuff functionality.])
42	CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"	42	CXXFLAGS="$CXXFLAGS -Dhave_tdenewstuff"
43		43
44	LIB_KNEWSTUFF='-lknewstuff'	44	LIB_TDENEWSTUFF='-ltdenewstuff'
45	AC_SUBST(LIB_KNEWSTUFF)	45	AC_SUBST(LIB_TDENEWSTUFF)
46	fi	46	fi
47		47
48	AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],	48	AC_CHECK_FILE([kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp],
Lines 92-98 else Link Here
92	use_kexifb="no"	92	use_kexifb="no"
93	AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])	93	AC_MSG_RESULT([$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)])
94		94
95	dnl AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add KNewStuff functionality.])	95	dnl AC_DEFINE_UNQUOTED(HAVE_KFEEDBACK, 1, [Add TDENewStuff functionality.])
96	CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""	96	CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
97		97
98	LIB_KFEEDBACK='-lkfeedbackwizard'	98	LIB_KFEEDBACK='-lkfeedbackwizard'

Lines 118-125 Link Here

(-)a/kexi/main/keximainwindowimpl.cpp (-4 / +4 lines)
118	#include <kexicontexthelp.h>	118	#include <kexicontexthelp.h>
119	#endif	119	#endif
120		120
121	#ifdef HAVE_KNEWSTUFF	121	#ifdef HAVE_TDENEWSTUFF
122	#include <knewstuff/downloaddialog.h>	122	#include <tdenewstuff/downloaddialog.h>
123	#include "kexinewstuff.h"	123	#include "kexinewstuff.h"
124	#endif	124	#endif
125		125
Lines 533-539 void KexiMainWindowImpl::initActions() Link Here
533	action->setToolTip(i18n("Open an existing project"));	533	action->setToolTip(i18n("Open an existing project"));
534	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));	534	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));
535		535
536	#ifdef HAVE_KNEWSTUFF	536	#ifdef HAVE_TDENEWSTUFF
537	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),	537	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
538	TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");	538	TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
539	action->setToolTip(i18n("Download example databases from the Internet"));	539	action->setToolTip(i18n("Download example databases from the Internet"));
Lines 4612-4618 void KexiMainWindowImpl::addWindow( KMdiChildView* pView, int flags ) Link Here
4612	/// TMP (until there's true template support)	4612	/// TMP (until there's true template support)
4613	void KexiMainWindowImpl::slotGetNewStuff()	4613	void KexiMainWindowImpl::slotGetNewStuff()
4614	{	4614	{
4615	#ifdef HAVE_KNEWSTUFF	4615	#ifdef HAVE_TDENEWSTUFF
4616	if(!d->newStuff)	4616	if(!d->newStuff)
4617	d->newStuff = new KexiNewStuff(this);	4617	d->newStuff = new KexiNewStuff(this);
4618	d->newStuff->download();	4618	d->newStuff->download();

Lines 17-23 Link Here

(-)a/kexi/main/kexinewstuff.cpp (-3 / +3 lines)
17	* Boston, MA 02110-1301, USA.	17	* Boston, MA 02110-1301, USA.
18	*/	18	*/
19		19
20	#ifdef HAVE_KNEWSTUFF	20	#ifdef HAVE_TDENEWSTUFF
21		21
22	#include <kdebug.h>	22	#include <kdebug.h>
23	#include <ktar.h>	23	#include <ktar.h>
Lines 31-37 Link Here
31	#include "kexinewstuff.h"	31	#include "kexinewstuff.h"
32		32
33	KexiNewStuff::KexiNewStuff(TQWidget *parent)	33	KexiNewStuff::KexiNewStuff(TQWidget *parent)
34	: KNewStuff( "kexi/template"	34	: TDENewStuff( "kexi/template"
35	#if KDE_IS_VERSION(3,3,0)	35	#if KDE_IS_VERSION(3,3,0)
36	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"	36	, "http://download.kde.org/khotnewstuff/kexi-providers.xml"
37	#endif	37	#endif
Lines 41-47 KexiNewStuff::KexiNewStuff(TQWidget *parent) Link Here
41	// fails to download something, it still marks the thing as	41	// fails to download something, it still marks the thing as
42	// successfully downloaded and therefore we arn't able to	42	// successfully downloaded and therefore we arn't able to
43	// download it again :-/	43	// download it again :-/
44	TDEGlobal::config()->deleteGroup("KNewStuffStatus");	44	TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
45	}	45	}
46		46
47	KexiNewStuff::~KexiNewStuff()	47	KexiNewStuff::~KexiNewStuff()

Lines 17-30 Link Here

(-)a/kexi/main/kexinewstuff.h (-5 / +5 lines)
17	* Boston, MA 02110-1301, USA.	17	* Boston, MA 02110-1301, USA.
18	*/	18	*/
19		19
20	#ifdef HAVE_KNEWSTUFF	20	#ifdef HAVE_TDENEWSTUFF
21		21
22	#ifndef KEXINEWSTUFF_H	22	#ifndef KEXINEWSTUFF_H
23	#define KEXINEWSTUFF_H	23	#define KEXINEWSTUFF_H
24		24
25	#include "knewstuff/knewstuff.h"	25	#include "tdenewstuff/knewstuff.h"
26		26
27	class KexiNewStuff : public KNewStuff	27	class KexiNewStuff : public TDENewStuff
28	{	28	{
29	public:	29	public:
30	KexiNewStuff(TQWidget *parent);	30	KexiNewStuff(TQWidget *parent);
Lines 33-41 class KexiNewStuff : public KNewStuff Link Here
33	virtual bool install( const TQString &fileName );	33	virtual bool install( const TQString &fileName );
34	virtual bool createUploadFile( const TQString &fileName );	34	virtual bool createUploadFile( const TQString &fileName );
35		35
36	//KNS::Engine* customEngine() { return KNewStuff::engine(); }	36	//KNS::Engine* customEngine() { return TDENewStuff::engine(); }
37	};	37	};
38		38
39	#endif	39	#endif
40		40
41	#endif //HAVE_KNEWSTUFF	41	#endif //HAVE_TDENEWSTUFF

Lines 36-51 Link Here

(-)a/lib/kross/main/wdgscriptsmanager.cpp (-11 / +11 lines)
36	#include <tdetoolbar.h>	36	#include <tdetoolbar.h>
37		37
38	#if KDE_IS_VERSION(3, 4, 0)	38	#if KDE_IS_VERSION(3, 4, 0)
39	// The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality	39	// The TDENewStuffSecure we use internaly for the GetHotNewStuff-functionality
40	// was introduced with KDE 3.4.	40	// was introduced with KDE 3.4.
41	#define KROSS_SUPPORT_NEWSTUFF	41	#define KROSS_SUPPORT_NEWSTUFF
42	#endif	42	#endif
43		43
44	#ifdef KROSS_SUPPORT_NEWSTUFF	44	#ifdef KROSS_SUPPORT_NEWSTUFF
45	#include <knewstuff/provider.h>	45	#include <tdenewstuff/provider.h>
46	#include <knewstuff/engine.h>	46	#include <tdenewstuff/engine.h>
47	#include <knewstuff/downloaddialog.h>	47	#include <tdenewstuff/downloaddialog.h>
48	#include <knewstuff/knewstuffsecure.h>	48	#include <tdenewstuff/knewstuffsecure.h>
49	#endif	49	#endif
50		50
51	#include "scriptguiclient.h"	51	#include "scriptguiclient.h"
Lines 54-64 Link Here
54	namespace Kross { namespace Api {	54	namespace Kross { namespace Api {
55		55
56	#ifdef KROSS_SUPPORT_NEWSTUFF	56	#ifdef KROSS_SUPPORT_NEWSTUFF
57	class ScriptNewStuff : public KNewStuffSecure	57	class ScriptNewStuff : public TDENewStuffSecure
58	{	58	{
59	public:	59	public:
60	ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)	60	ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)
61	: KNewStuffSecure(type, parentWidget)	61	: TDENewStuffSecure(type, parentWidget)
62	, m_scripguiclient(scripguiclient) {}	62	, m_scripguiclient(scripguiclient) {}
63	virtual ~ScriptNewStuff() {}	63	virtual ~ScriptNewStuff() {}
64	private:	64	private:
Lines 148-154 WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con Link Here
148	btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));	148	btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", TDEIcon::MainToolbar, 16 ));
149	connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));	149	connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
150	#ifdef KROSS_SUPPORT_NEWSTUFF	150	#ifdef KROSS_SUPPORT_NEWSTUFF
151	btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 ));	151	btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "tdenewstuff", TDEIcon::MainToolbar, 16 ));
152	connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));	152	connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
153	#endif	153	#endif
154	/*	154	/*
Lines 168-174 WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con Link Here
168	toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));	168	toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
169	#ifdef KROSS_SUPPORT_NEWSTUFF	169	#ifdef KROSS_SUPPORT_NEWSTUFF
170	toolBar->insertLineSeparator();	170	toolBar->insertLineSeparator();
171	toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));	171	toolBar->insertButton("tdenewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts"));
172	toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));	172	toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
173	#endif	173	#endif
174	*/	174	*/
Lines 343-352 void WdgScriptsManager::slotGetNewScript() Link Here
343		343
344	void WdgScriptsManager::slotResourceInstalled()	344	void WdgScriptsManager::slotResourceInstalled()
345	{	345	{
346	// Delete KNewStuff's configuration entries. These entries reflect what has	346	// Delete TDENewStuff's configuration entries. These entries reflect what has
347	// already been installed. As we cannot yet keep them in sync after uninstalling	347	// already been installed. As we cannot yet keep them in sync after uninstalling
348	// scripts, we deactivate the check marks entirely.	348	// scripts, we deactivate the check marks entirely.
349	TDEGlobal::config()->deleteGroup("KNewStuffStatus");	349	TDEGlobal::config()->deleteGroup("TDENewStuffStatus");
350	}	350	}
351		351
352	}}	352	}}