Attachment #2272 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 2087-2093 if test $kde_qtver = 3; then Link Here

(-)a/acinclude.m4 (-1 / +1 lines)
2087	AC_SUBST(LIB_TDEUTILS, "-ltdeutils")	2087	AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
2088	AC_SUBST(LIB_TDEPIM, "-ltdepim")	2088	AC_SUBST(LIB_TDEPIM, "-ltdepim")
2089	AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")	2089	AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
2090	AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")	2090	AC_SUBST(LIB_TDENEWSTUFF, "-ltdenewstuff")
2091	AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")	2091	AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
2092	AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")	2092	AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
2093	# these are for backward compatibility	2093	# these are for backward compatibility

Lines 479-485 void ConfigDialog::setupTemplatePage() { Link Here

(-)a/src/configdialog.cpp (-2 / +2 lines)
479	TQWhatsThis::add(b1, whats);	479	TQWhatsThis::add(b1, whats);
480		480
481	KPushButton* b2 = new KPushButton(i18n("Download..."), box1);	481	KPushButton* b2 = new KPushButton(i18n("Download..."), box1);
482	b2->setIconSet(SmallIconSet(TQString::fromLatin1("knewstuff")));	482	b2->setIconSet(SmallIconSet(TQString::fromLatin1("tdenewstuff")));
483	connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownloadTemplate()));	483	connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownloadTemplate()));
484	whats = i18n("Click to download additional templates via the Internet.");	484	whats = i18n("Click to download additional templates via the Internet.");
485	TQWhatsThis::add(b2, whats);	485	TQWhatsThis::add(b2, whats);
Lines 535-541 void ConfigDialog::setupFetchPage() { Link Here
535	m_removeSourceBtn->setIconSet(SmallIconSet(TQString::fromLatin1("remove")));	535	m_removeSourceBtn->setIconSet(SmallIconSet(TQString::fromLatin1("remove")));
536	TQWhatsThis::add(m_removeSourceBtn, i18n("Click to delete the selected data source."));	536	TQWhatsThis::add(m_removeSourceBtn, i18n("Click to delete the selected data source."));
537	m_newStuffBtn = new KPushButton(i18n("Download..."), frame);	537	m_newStuffBtn = new KPushButton(i18n("Download..."), frame);
538	m_newStuffBtn->setIconSet(SmallIconSet(TQString::fromLatin1("knewstuff")));	538	m_newStuffBtn->setIconSet(SmallIconSet(TQString::fromLatin1("tdenewstuff")));
539	TQWhatsThis::add(m_newStuffBtn, i18n("Click to download additional data sources via the Internet."));	539	TQWhatsThis::add(m_newStuffBtn, i18n("Click to download additional data sources via the Internet."));
540		540
541	#if !KDE_IS_VERSION(3,3,90)	541	#if !KDE_IS_VERSION(3,3,90)




#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tdeaccelmanager.h>
#include <tdenewstuff/entry.h>
#include <tdenewstuff/provider.h>
#include <tdetempfile.h>

#include <tqlabel.h>

  TQWhatsThis::add(m_infoLabel, i18n("The author of the selected item"));

  m_install = new KPushButton(i18n("Install"), widget);
  m_install->setIconSet(SmallIconSet(TQString::fromLatin1("tdenewstuff")));
  m_install->setEnabled(false);
  connect(m_install, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));


  m_install->polish();
  int maxWidth = m_install->sizeHint().width();
  int maxHeight = m_install->sizeHint().height();
  m_install->setGuiItem(KGuiItem(i18n("Update"), SmallIconSet(TQString::fromLatin1("tdenewstuff"))));
  maxWidth = TQMAX(maxWidth, m_install->sizeHint().width());
  maxHeight = TQMAX(maxHeight, m_install->sizeHint().height());
  m_install->setMinimumWidth(maxWidth);

  connect(loader, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long)));
  connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError()));

  TDEConfigGroup config(TDEGlobal::config(), "TDENewStuff");
  TQString prov = config.readEntry("ProvidersUrl");
  if(prov.isEmpty()) {
    if(m_type == EntryTemplate) {

    return;
  }

  TQDomElement tdenewstuff = dom.documentElement();

  for(TQDomNode pn = tdenewstuff.firstChild(); !pn.isNull(); pn = pn.nextSibling()) {
    TQDomElement stuff = pn.toElement();
    if(stuff.isNull()) {
      continue;




#include <tdeio/job.h>
#include <tdefileitem.h>
#include <tdeversion.h>
#include <tdenewstuff/entry.h>
#include <kstandarddirs.h>

#include <tqfileinfo.h>

  } else {
    // remove ".xsl"
    xslFile.truncate(xslFile.length()-4);
    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
    config.writeEntry(xslFile, allFiles);
    m_urlNameMap.insert(url_, xslFile);
  }

}

bool Manager::removeTemplate(const TQString& name_) {
  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
  TQStringList files = fileGroup.readListEntry(name_);
  // at least, delete xsl file
  if(files.isEmpty()) {


  // remove config entries even if unsuccessful
  fileGroup.deleteEntry(name_);
  TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
  TQString entryName = statusGroup.readEntry(name_);
  statusGroup.deleteEntry(name_);
  statusGroup.deleteEntry(entryName);

  }

  {
    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
    config.writeEntry(info->sourceName, archiveFiles(archiveDir));
    m_urlNameMap.insert(url_, info->sourceName);
  }

}

bool Manager::removeScript(const TQString& name_) {
  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
  TQStringList files = fileGroup.readListEntry(name_);

  bool success = true;


  // remove config entries even if unsuccessful
  fileGroup.deleteEntry(name_);
  TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
  TQString entryName = statusGroup.readEntry(name_);
  statusGroup.deleteEntry(name_);
  statusGroup.deleteEntry(entryName);

}

Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) {
  TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
  TQString datestring = config.readEntry(entry_->name());
  if(datestring.isEmpty()) {
    return NotInstalled;

  }

  // also check that executable files exists
  TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
  TQStringList files = fileGroup.readListEntry(entry_->name());
  TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/"));
  for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {

  if(newScript && newScript->successfulInstall()) {
    const TQString name = m_urlNameMap[newScript->url()];
    KNS::Entry* entry = m_scriptEntryMap[newScript];
    TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
    // have to keep a config entry that maps the name of the file to the name
    // of the newstuff entry, so we can track which entries are installed
    // name and entry-name() are probably the same for scripts, but not a problem

Lines 22-28 using Tellico::NewStuff::NewScript; Link Here

(-)a/src/newstuff/newscript.cpp (-3 / +3 lines)
22		22
23	NewScript::NewScript(Manager* manager_, TQWidget* parentWidget_)	23	NewScript::NewScript(Manager* manager_, TQWidget* parentWidget_)
24	#if KDE_IS_VERSION(3,3,90)	24	#if KDE_IS_VERSION(3,3,90)
25	: KNewStuffSecure(TQString::fromLatin1("tellico/data-source"), parentWidget_)	25	: TDENewStuffSecure(TQString::fromLatin1("tellico/data-source"), parentWidget_)
26	#else	26	#else
27	: TQObject(parentWidget_)	27	: TQObject(parentWidget_)
28	#endif	28	#endif
Lines 38-45 void NewScript::installResource() { Link Here
38	}	38	}
39		39
40	#if KDE_IS_VERSION(3,3,90)	40	#if KDE_IS_VERSION(3,3,90)
41	#include <knewstuff/knewstuffsecure.h>	41	#include <tdenewstuff/knewstuffsecure.h>
42	#define SUPERCLASS KNewStuffSecure	42	#define SUPERCLASS TDENewStuffSecure
43	#else	43	#else
44	#define SUPERCLASS TQObject	44	#define SUPERCLASS TQObject
45	#endif	45	#endif

Lines 18-25 Link Here

(-)a/src/newstuff/newscript.h (-3 / +3 lines)
18	#include <kurl.h>	18	#include <kurl.h>
19		19
20	#if KDE_IS_VERSION(3,3,90)	20	#if KDE_IS_VERSION(3,3,90)
21	#include <knewstuff/knewstuffsecure.h>	21	#include <tdenewstuff/knewstuffsecure.h>
22	#define SUPERCLASS KNewStuffSecure	22	#define SUPERCLASS TDENewStuffSecure
23	#else	23	#else
24	#define SUPERCLASS TQObject	24	#define SUPERCLASS TQObject
25	#endif	25	#endif
Lines 47-53 private: Link Here
47		47
48	Manager* m_manager;	48	Manager* m_manager;
49	#if !KDE_IS_VERSION(3,3,90)	49	#if !KDE_IS_VERSION(3,3,90)
50	// KNewStuffSecure has a protected variable	50	// TDENewStuffSecure has a protected variable
51	TQString m_tarName;	51	TQString m_tarName;
52	#endif	52	#endif
53	KURL m_url;	53	KURL m_url;

Lines 11-17 Link Here

(-)a/src/newstuff/providerloader.cpp (-2 / +2 lines)
11	* *	11	* *
12	***************************************************************************/	12	***************************************************************************/
13		13
14	// this class is largely copied from tdelibs/knewstuff/provider.cpp	14	// this class is largely copied from tdelibs/tdenewstuff/provider.cpp
15	// which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>	15	// which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
16	// and licensed under GPL v2, just like Tellico	16	// and licensed under GPL v2, just like Tellico
17		17
Lines 20-26 Link Here
20	#include "../latin1literal.h"	20	#include "../latin1literal.h"
21		21
22	#include <tdeio/job.h>	22	#include <tdeio/job.h>
23	#include <knewstuff/provider.h>	23	#include <tdenewstuff/provider.h>
24	#include <tdeglobal.h>	24	#include <tdeglobal.h>
25	#include <tdeconfig.h>	25	#include <tdeconfig.h>
26	#include <tdemessagebox.h>	26	#include <tdemessagebox.h>

Lines 11-17 Link Here

(-)a/src/newstuff/providerloader.h (-1 / +1 lines)
11	* *	11	* *
12	***************************************************************************/	12	***************************************************************************/
13		13
14	// this class is largely copied from tdelibs/knewstuff/provider.h	14	// this class is largely copied from tdelibs/tdenewstuff/provider.h
15	// which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>	15	// which is Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
16	// and licensed under GPL v2, just like Tellico	16	// and licensed under GPL v2, just like Tellico
17	//	17	//

Return to bug 2127

Lines 26-33 Link Here

(-)a/src/newstuff/dialog.cpp (-7 / +7 lines)
26	#include <tdeio/job.h>	26	#include <tdeio/job.h>
27	#include <tdeio/netaccess.h>	27	#include <tdeio/netaccess.h>
28	#include <tdeaccelmanager.h>	28	#include <tdeaccelmanager.h>
29	#include <knewstuff/entry.h>	29	#include <tdenewstuff/entry.h>
30	#include <knewstuff/provider.h>	30	#include <tdenewstuff/provider.h>
31	#include <tdetempfile.h>	31	#include <tdetempfile.h>
32		32
33	#include <tqlabel.h>	33	#include <tqlabel.h>
Lines 140-146 Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) Link Here
140	TQWhatsThis::add(m_infoLabel, i18n("The author of the selected item"));	140	TQWhatsThis::add(m_infoLabel, i18n("The author of the selected item"));
141		141
142	m_install = new KPushButton(i18n("Install"), widget);	142	m_install = new KPushButton(i18n("Install"), widget);
143	m_install->setIconSet(SmallIconSet(TQString::fromLatin1("knewstuff")));	143	m_install->setIconSet(SmallIconSet(TQString::fromLatin1("tdenewstuff")));
144	m_install->setEnabled(false);	144	m_install->setEnabled(false);
145	connect(m_install, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));	145	connect(m_install, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));
146		146
Lines 149-155 Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) Link Here
149	m_install->polish();	149	m_install->polish();
150	int maxWidth = m_install->sizeHint().width();	150	int maxWidth = m_install->sizeHint().width();
151	int maxHeight = m_install->sizeHint().height();	151	int maxHeight = m_install->sizeHint().height();
152	m_install->setGuiItem(KGuiItem(i18n("Update"), SmallIconSet(TQString::fromLatin1("knewstuff"))));	152	m_install->setGuiItem(KGuiItem(i18n("Update"), SmallIconSet(TQString::fromLatin1("tdenewstuff"))));
153	maxWidth = TQMAX(maxWidth, m_install->sizeHint().width());	153	maxWidth = TQMAX(maxWidth, m_install->sizeHint().width());
154	maxHeight = TQMAX(maxHeight, m_install->sizeHint().height());	154	maxHeight = TQMAX(maxHeight, m_install->sizeHint().height());
155	m_install->setMinimumWidth(maxWidth);	155	m_install->setMinimumWidth(maxWidth);
Lines 228-234 Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) Link Here
228	connect(loader, TQT_SIGNAL(percent(TDEIO::Job, unsigned long)), TQT_SLOT(slotShowPercent(TDEIO::Job, unsigned long)));	228	connect(loader, TQT_SIGNAL(percent(TDEIO::Job, unsigned long)), TQT_SLOT(slotShowPercent(TDEIO::Job, unsigned long)));
229	connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError()));	229	connect(loader, TQT_SIGNAL(error()), TQT_SLOT(slotProviderError()));
230		230
231	TDEConfigGroup config(TDEGlobal::config(), "KNewStuff");	231	TDEConfigGroup config(TDEGlobal::config(), "TDENewStuff");
232	TQString prov = config.readEntry("ProvidersUrl");	232	TQString prov = config.readEntry("ProvidersUrl");
233	if(prov.isEmpty()) {	233	if(prov.isEmpty()) {
234	if(m_type == EntryTemplate) {	234	if(m_type == EntryTemplate) {
Lines 301-309 void Dialog::slotResult(TDEIO::Job* job_) { Link Here
301	return;	301	return;
302	}	302	}
303		303
304	TQDomElement knewstuff = dom.documentElement();	304	TQDomElement tdenewstuff = dom.documentElement();
305		305
306	for(TQDomNode pn = knewstuff.firstChild(); !pn.isNull(); pn = pn.nextSibling()) {	306	for(TQDomNode pn = tdenewstuff.firstChild(); !pn.isNull(); pn = pn.nextSibling()) {
307	TQDomElement stuff = pn.toElement();	307	TQDomElement stuff = pn.toElement();
308	if(stuff.isNull()) {	308	if(stuff.isNull()) {
309	continue;	309	continue;

Lines 28-34 Link Here

(-)a/src/newstuff/manager.cpp (-10 / +10 lines)
28	#include <tdeio/job.h>	28	#include <tdeio/job.h>
29	#include <tdefileitem.h>	29	#include <tdefileitem.h>
30	#include <tdeversion.h>	30	#include <tdeversion.h>
31	#include <knewstuff/entry.h>	31	#include <tdenewstuff/entry.h>
32	#include <kstandarddirs.h>	32	#include <kstandarddirs.h>
33		33
34	#include <tqfileinfo.h>	34	#include <tqfileinfo.h>
Lines 94-100 bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { Link Here
94	} else {	94	} else {
95	// remove ".xsl"	95	// remove ".xsl"
96	xslFile.truncate(xslFile.length()-4);	96	xslFile.truncate(xslFile.length()-4);
97	TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles");	97	TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
98	config.writeEntry(xslFile, allFiles);	98	config.writeEntry(xslFile, allFiles);
99	m_urlNameMap.insert(url_, xslFile);	99	m_urlNameMap.insert(url_, xslFile);
100	}	100	}
Lines 106-112 bool Manager::installTemplate(const KURL& url_, const TQString& entryName_) { Link Here
106	}	106	}
107		107
108	bool Manager::removeTemplate(const TQString& name_) {	108	bool Manager::removeTemplate(const TQString& name_) {
109	TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");	109	TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
110	TQStringList files = fileGroup.readListEntry(name_);	110	TQStringList files = fileGroup.readListEntry(name_);
111	// at least, delete xsl file	111	// at least, delete xsl file
112	if(files.isEmpty()) {	112	if(files.isEmpty()) {
Lines 130-136 bool Manager::removeTemplate(const TQString& name_) { Link Here
130		130
131	// remove config entries even if unsuccessful	131	// remove config entries even if unsuccessful
132	fileGroup.deleteEntry(name_);	132	fileGroup.deleteEntry(name_);
133	TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus");	133	TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
134	TQString entryName = statusGroup.readEntry(name_);	134	TQString entryName = statusGroup.readEntry(name_);
135	statusGroup.deleteEntry(name_);	135	statusGroup.deleteEntry(name_);
136	statusGroup.deleteEntry(entryName);	136	statusGroup.deleteEntry(entryName);
Lines 209-215 bool Manager::installScript(const KURL& url_) { Link Here
209	}	209	}
210		210
211	{	211	{
212	TDEConfigGroup config(TDEGlobal::config(), "KNewStuffFiles");	212	TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffFiles");
213	config.writeEntry(info->sourceName, archiveFiles(archiveDir));	213	config.writeEntry(info->sourceName, archiveFiles(archiveDir));
214	m_urlNameMap.insert(url_, info->sourceName);	214	m_urlNameMap.insert(url_, info->sourceName);
215	}	215	}
Lines 225-231 bool Manager::installScript(const KURL& url_) { Link Here
225	}	225	}
226		226
227	bool Manager::removeScript(const TQString& name_) {	227	bool Manager::removeScript(const TQString& name_) {
228	TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");	228	TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
229	TQStringList files = fileGroup.readListEntry(name_);	229	TQStringList files = fileGroup.readListEntry(name_);
230		230
231	bool success = true;	231	bool success = true;
Lines 244-250 bool Manager::removeScript(const TQString& name_) { Link Here
244		244
245	// remove config entries even if unsuccessful	245	// remove config entries even if unsuccessful
246	fileGroup.deleteEntry(name_);	246	fileGroup.deleteEntry(name_);
247	TDEConfigGroup statusGroup(TDEGlobal::config(), "KNewStuffStatus");	247	TDEConfigGroup statusGroup(TDEGlobal::config(), "TDENewStuffStatus");
248	TQString entryName = statusGroup.readEntry(name_);	248	TQString entryName = statusGroup.readEntry(name_);
249	statusGroup.deleteEntry(name_);	249	statusGroup.deleteEntry(name_);
250	statusGroup.deleteEntry(entryName);	250	statusGroup.deleteEntry(entryName);
Lines 253-259 bool Manager::removeScript(const TQString& name_) { Link Here
253	}	253	}
254		254
255	Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) {	255	Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) {
256	TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus");	256	TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
257	TQString datestring = config.readEntry(entry_->name());	257	TQString datestring = config.readEntry(entry_->name());
258	if(datestring.isEmpty()) {	258	if(datestring.isEmpty()) {
259	return NotInstalled;	259	return NotInstalled;
Lines 268-274 Tellico::NewStuff::InstallStatus Manager::installStatus(KNS::Entry* entry_) { Link Here
268	}	268	}
269		269
270	// also check that executable files exists	270	// also check that executable files exists
271	TDEConfigGroup fileGroup(TDEGlobal::config(), "KNewStuffFiles");	271	TDEConfigGroup fileGroup(TDEGlobal::config(), "TDENewStuffFiles");
272	TQStringList files = fileGroup.readListEntry(entry_->name());	272	TQStringList files = fileGroup.readListEntry(entry_->name());
273	TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/"));	273	TQString path = Tellico::saveLocation(TQString::fromLatin1("data-sources/"));
274	for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {	274	for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
Lines 394-400 void Manager::slotInstallFinished() { Link Here
394	if(newScript && newScript->successfulInstall()) {	394	if(newScript && newScript->successfulInstall()) {
395	const TQString name = m_urlNameMap[newScript->url()];	395	const TQString name = m_urlNameMap[newScript->url()];
396	KNS::Entry* entry = m_scriptEntryMap[newScript];	396	KNS::Entry* entry = m_scriptEntryMap[newScript];
397	TDEConfigGroup config(TDEGlobal::config(), "KNewStuffStatus");	397	TDEConfigGroup config(TDEGlobal::config(), "TDENewStuffStatus");
398	// have to keep a config entry that maps the name of the file to the name	398	// have to keep a config entry that maps the name of the file to the name
399	// of the newstuff entry, so we can track which entries are installed	399	// of the newstuff entry, so we can track which entries are installed
400	// name and entry-name() are probably the same for scripts, but not a problem	400	// name and entry-name() are probably the same for scripts, but not a problem