diff --git a/doc/khangman/index.docbook b/doc/khangman/index.docbook index 4a9e3efc..05791780 100644 --- a/doc/khangman/index.docbook +++ b/doc/khangman/index.docbook @@ -455,7 +455,7 @@ Some languages also have hints to help you guess the word. The hint is shown by Game Get Words in New Language... -Display the KNewStuff dialog which lists all the data available in the different languages. +Display the TDENewStuff dialog which lists all the data available in the different languages. @@ -713,7 +713,7 @@ install, depending on your installation. Instead of committing your files, please sent them to &Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail; tarred and gzipped. As there are -now twenty three languages, a wizard (KNewStuff) is now included in &khangman; +now twenty three languages, a wizard (TDENewStuff) is now included in &khangman; to easily download and install new languages that are placed on the website. This is done to reduce the size of the tdeedu module and it will also be done in &klettres;, &kstars; and maybe &ktouch;. @@ -737,7 +737,7 @@ The provider name (i.e. the address of the website where to download the new lan The English language (default) and the user language from his i18n package(s) (if available) are stored in $TDEDIR/share/apps/khangman. -In the configuration file, stored for each user in his ~/.trinity/share/config/khangmanrc are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the KNewStuff dialog. +In the configuration file, stored for each user in his ~/.trinity/share/config/khangmanrc are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the TDENewStuff dialog. diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp index 84a0743d..7293775d 100644 --- a/kanagram/src/newstuff.cpp +++ b/kanagram/src/newstuff.cpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include #include "kanagramsettings.h" diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index 572ec03b..ac8d1d70 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -1,7 +1,7 @@ #include "newstuffdialog.h" -#include -#include +#include +#include #include #include #include @@ -9,7 +9,7 @@ #include "kanagramsettings.h" -NewStuffDialog::NewStuffDialog() : KNewStuff("kanagram/vocabulary", "http://kde-edu.org/kanagram/" + KanagramSettings::dataLanguage() + ".xml") +NewStuffDialog::NewStuffDialog() : TDENewStuff("kanagram", "https://www.trinitydesktop.org/ocs/providers.xml") { } diff --git a/kanagram/src/newstuffdialog.h b/kanagram/src/newstuffdialog.h index 7c61f12e..07d727eb 100644 --- a/kanagram/src/newstuffdialog.h +++ b/kanagram/src/newstuffdialog.h @@ -1,9 +1,9 @@ #ifndef NEWSTUFFDIALOG_H #define NEWSTUFFDIALOG_H -#include +#include -class NewStuffDialog : public KNewStuff +class NewStuffDialog : public TDENewStuff { public: NewStuffDialog(); diff --git a/keduca/TODO b/keduca/TODO index 887e103a..bfb77670 100644 --- a/keduca/TODO +++ b/keduca/TODO @@ -4,7 +4,7 @@ KEduca TODOs: -> "Explain" feature Things that NEED to be done before KDE 3.4: - -> Use KNewStuff + -> Use TDENewStuff -> Go through all reports in b.k.o and fix what can be fixed Things that would be nice to have done for KDE 3.4: diff --git a/khangman/README.languages b/khangman/README.languages index 0528405a..fd73ee5f 100644 --- a/khangman/README.languages +++ b/khangman/README.languages @@ -66,11 +66,11 @@ Note that you must use UTF-8 encoding when editing the files. If your editor can khangman -7. Instead of committing your files, please sent them to me tarred and gzipped. As there are now twenty two languages, a wizard (KNewStuff) is now included in KHangMan to easily download and install new languages that are placed on the website. This is done to reduce the size of the tdeedu module and it will also be done in KLettres, KStars and maybe KTouch. +7. Instead of committing your files, please sent them to me tarred and gzipped. As there are now twenty two languages, a wizard (TDENewStuff) is now included in KHangMan to easily download and install new languages that are placed on the website. This is done to reduce the size of the tdeedu module and it will also be done in KLettres, KStars and maybe KTouch. Please contact me by email (annemarie.mahfouf AT free DOT fr) if you need further information. When you send me the files, please don't forget to mention any special characters used in your language (put them in a text file, one per line and add this file in the tarball) and please mention any other specificity. Please never commit files in a BRANCH as it might break the game. Good luck and thanks! -Last update: October 23rd 2004 \ No newline at end of file +Last update: October 23rd 2004 diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am index fbbd51d6..50652ad6 100644 --- a/khangman/khangman/Makefile.am +++ b/khangman/khangman/Makefile.am @@ -1,7 +1,7 @@ ####### tdevelop will overwrite this part!!! (begin)########## bin_PROGRAMS = khangman khangman_SOURCES = khangman.cpp main.cpp khangmanview.cpp prefs.kcfgc khnewstuff.cpp normal.ui advanced.ui timerdlg.ui timer.cpp fontchecker.cpp -khangman_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la -lknewstuff +khangman_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDENEWSTUFF) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la SUBDIRS = data pics sounds icons fonts diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 8d7d2b20..7c4d7039 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -224,7 +224,7 @@ void KHangMan::setLanguages() // Write the present languages in config so they cannot be downloaded. TDEConfig *config=kapp->config(); - config->setGroup("KNewStuffStatus"); + config->setGroup("TDENewStuffStatus"); for (uint i=0; ireadEntry(tmp)) diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h index 2ec8dfc0..9edca427 100644 --- a/khangman/khangman/khangman.h +++ b/khangman/khangman/khangman.h @@ -129,7 +129,7 @@ private slots: ///In Settings menu, Configure KHangMan... menu item void optionsPreferences(); - ///access the KNewStuff class to install new data + ///access the TDENewStuff class to install new data void slotDownloadNewStuff(); ///update settings after Settings->Configure KHangMan dialog is closed void updateSettings(); diff --git a/khangman/khangman/khangman.kcfg b/khangman/khangman/khangman.kcfg index ff16a334..9916b5ed 100644 --- a/khangman/khangman/khangman.kcfg +++ b/khangman/khangman/khangman.kcfg @@ -93,10 +93,10 @@ - + - "http://edu.kde.org/khangman/downloads/providers.xml" + "https://www.trinitydesktop.org/ocs/providers.xml" diff --git a/khangman/khangman/khangmanrc b/khangman/khangman/khangmanrc index 54e188d1..0585097f 100644 --- a/khangman/khangman/khangmanrc +++ b/khangman/khangman/khangmanrc @@ -1,2 +1,2 @@ -[KNewStuff] -ProvidersUrl=http://edu.kde.org/khangman/downloads/providers.xml +[TDENewStuff] +ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp index 94ce24e5..a3719a9a 100644 --- a/khangman/khangman/khnewstuff.cpp +++ b/khangman/khangman/khnewstuff.cpp @@ -33,7 +33,7 @@ #include "khnewstuff.h" KHNewStuff::KHNewStuff( KHangManView *view ) : - KNewStuff( "khangman", view ), + TDENewStuff( "khangman", view ), m_view( view ) { } diff --git a/khangman/khangman/khnewstuff.h b/khangman/khangman/khnewstuff.h index a80652ed..388bf2e3 100644 --- a/khangman/khangman/khnewstuff.h +++ b/khangman/khangman/khnewstuff.h @@ -24,12 +24,12 @@ #ifndef KHNEWSTUFF_H #define KHNEWSTUFF_H -#include "knewstuff/knewstuff.h" +#include "tdenewstuff/knewstuff.h" #include "khangman.h" class KHangMan; -class KHNewStuff : public KNewStuff +class KHNewStuff : public TDENewStuff { public: KHNewStuff( KHangManView * ); diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am index 4bf8aa60..168efc4e 100644 --- a/klettres/klettres/Makefile.am +++ b/klettres/klettres/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = klettres ## INCLUDES were found outside tdevelop specific part klettres_SOURCES = fontsdlg.ui klettres.cpp klnewstuff.cpp main.cpp klettresview.cpp soundfactory.cpp prefs.kcfgc timerdlg.ui timer.cpp -klettres_LDADD = $(LIB_TDEUI) -lknewstuff +klettres_LDADD = $(LIB_TDEUI) $(LIB_TDENEWSTUFF) SUBDIRS = pics data icons diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index 9c635795..e899be00 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -122,7 +122,7 @@ void KLettres::findLanguages() m_languages.sort(); //write the present languages in config so they cannot be downloaded TDEConfig *config=kapp->config(); - config->setGroup("KNewStuffStatus"); + config->setGroup("TDENewStuffStatus"); for (uint i=0; i= 3.2.90, because - *earlier versions of KDE did not have KNewStuff. + *earlier versions of KDE did not have TDENewStuff. *@author Jason Harris *@version 1.0 */ @@ -36,12 +36,12 @@ #include #include -#include +#include class KDirWatch; class KStars; -class KSNewStuff : public TQObject, public KNewStuff +class KSNewStuff : public TQObject, public TDENewStuff { Q_OBJECT @@ -55,7 +55,7 @@ class KSNewStuff : public TQObject, public KNewStuff /** *Install new application data *@p fileName the name of the file to be installed - *@note overloaded from KNewStuff + *@note overloaded from TDENewStuff */ bool install( const TQString &fileName ); diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 038483cc..51b55cf1 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -465,7 +465,7 @@ class KStars : public TDEMainWindow, virtual public KStarsInterface void slotWizard(); /** - * action slot: open KNewStuff window to download extra data. + * action slot: open TDENewStuff window to download extra data. */ void slotDownload(); diff --git a/kstars/kstars/kstarsrc b/kstars/kstars/kstarsrc index 0fc7026a..0585097f 100644 --- a/kstars/kstars/kstarsrc +++ b/kstars/kstars/kstarsrc @@ -1,2 +1,2 @@ -[KNewStuff] -ProvidersUrl=http://edu.kde.org/kstars/downloads/providers.xml +[TDENewStuff] +ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml diff --git a/kturtle/TODO b/kturtle/TODO index f2c8b3a9..30e5189d 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -6,7 +6,7 @@ for KDE 3.5 - add the fractals examples from http://www.stber-koenig.de/markus/kturtle/ in the examples folder -> problem when adding examples for translations -- implement KNewStuff to share logo files via kde-files.org per language with png associated on the website +- implement TDENewStuff to share logo files via opendesktop.org per language with png associated on the website CHECKLIST FOR KTURTLE IN KDE 3.4: @@ -180,7 +180,7 @@ Preview in konqueror: (from IRC discussion about the preview thing a mimetype an we could but what is the use of it? will it help to fulfill kturtles objectives? -Translating data in the knewstuff.xml file: how would the translators access the file which is on the server? +Translating data in the tdenewstuff.xml file: how would the translators access the file which is on the server? - i dunno what's ment by this.. annma? diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am index 236a4cfd..24aa6427 100644 --- a/kvoctrain/kvoctrain/Makefile.am +++ b/kvoctrain/kvoctrain/Makefile.am @@ -13,7 +13,7 @@ spotlight2kvtml_LDADD = $(LIB_TDECORE) kvoctrain_LDADD = ./docprop-dialogs/libdocpropdlg.la \ ./entry-dialogs/libentrydlg.la ./kvt-core/libkvoctraincore.la ./kvt-core/kvt-xml/libkvtxml.la \ ./query-dialogs/libquerydlg.la ./statistik-dialogs/libstatdlg.la ./common-dialogs/libcommondlg.la \ - -lknewstuff $(LIB_TDEPRINT) + $(LIB_TDENEWSTUFF) $(LIB_TDEPRINT) EXTRA_DIST = kvoctrainui.rc diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index 2eef8ebd..dd8732a5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -246,10 +246,10 @@ 10368000 - + - "http://edu.kde.org/kvoctrain/providers.xml" + "https://www.trinitydesktop.org/ocs/providers.xml" diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index 2d11c055..f227b4ac 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "kvoctrain.h" #include "UsageManager.h" diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index 60e30731..689ab22d 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -291,7 +291,7 @@ private: // correct_0_times, we simply reuse random_expr1. vector correct_1_times, correct_2_times, correct_3_times; QuerySelection queryList; - //KNewStuff *m_GHNS; + //TDENewStuff *m_GHNS; TQTimer *btimer; int random_query_nr; bool querymode; diff --git a/kvoctrain/kvoctrain/kvoctrainrc b/kvoctrain/kvoctrain/kvoctrainrc index f9839cc4..0585097f 100644 --- a/kvoctrain/kvoctrain/kvoctrainrc +++ b/kvoctrain/kvoctrain/kvoctrainrc @@ -1,2 +1,2 @@ -[KNewStuff] -ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml +[TDENewStuff] +ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index 38338e43..ee680f9c 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -16,13 +16,13 @@ #include #include #include -#include +#include #include "kvoctrain.h" #include "kvtnewstuff.h" #include "prefs.h" -KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), KNewStuff("tdeedu/vocabulary", parent) +KVTNewStuff::KVTNewStuff(TQWidget *parent, const char * /*name*/) : TQObject(), TDENewStuff("kwordquiz", parent) { m_app = (kvoctrainApp*) parent; } @@ -53,7 +53,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry) TQString file; if (path.isEmpty()) - file = KNewStuff::downloadDestination(entry); //fall back on a temp file, should never happen + file = TDENewStuff::downloadDestination(entry); //fall back on a temp file, should never happen else { file = TQDir::home().path() + "/" + path + "/"; diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h index 4d901c00..fc7348ab 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.h +++ b/kvoctrain/kvoctrain/kvtnewstuff.h @@ -12,14 +12,14 @@ #ifndef KVTNEWSTUFF_H #define KVTNEWSTUFF_H -#include +#include class kvoctrainApp; /** @author Peter Hedlund */ -class KVTNewStuff : public TQObject, public KNewStuff +class KVTNewStuff : public TQObject, public TDENewStuff { Q_OBJECT @@ -36,7 +36,7 @@ public: /** Creates a file suitable for upload. - Note that this method always fails, since using KNewStuffGeneric + Note that this method always fails, since using TDENewStuffGeneric means that the provided file must already be in a usable format. @param fileName the name of the file to upload after its creation diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am index ade96b7e..131e89a7 100644 --- a/kwordquiz/src/Makefile.am +++ b/kwordquiz/src/Makefile.am @@ -12,7 +12,7 @@ kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \ prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \ prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \ - $(LIBSOCKET) $(LIB_TDEPRINT) -lknewstuff + $(LIBSOCKET) $(LIB_TDEPRINT) $(LIB_TDENEWSTUFF) EXTRA_DIST = main.cpp kwordquiz.cpp kwordquiz.h kwordquizdoc.cpp kwordquizdoc.h kwordquizview.cpp kwordquizview.h kwordquizui.rc kwordquizprefs.cpp kwordquizprefs.h diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg index 18554adc..3eacdf76 100644 --- a/kwordquiz/src/kwordquiz.kcfg +++ b/kwordquiz/src/kwordquiz.kcfg @@ -101,10 +101,10 @@ Qt::blue - + - "http://edu.kde.org/kvoctrain/providers.xml" + "https://www.trinitydesktop.org/ocs/providers.xml" @@ -115,4 +115,4 @@ Vocabularies - \ No newline at end of file + diff --git a/kwordquiz/src/kwordquizrc b/kwordquiz/src/kwordquizrc index 64f970aa..0585097f 100644 --- a/kwordquiz/src/kwordquizrc +++ b/kwordquiz/src/kwordquizrc @@ -1,2 +1,2 @@ -[KNewStuff] -ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml \ No newline at end of file +[TDENewStuff] +ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index c8bd08e1..2b547053 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - Implementation of KNewStuff + Implementation of TDENewStuff ------------------- begin : Thu Jun 02 13:12:30 PDT 2002 copyright : (C) 2005 by Peter Hedlund @@ -21,13 +21,13 @@ #include #include #include -#include +#include #include "kwordquiz.h" #include "kwqnewstuff.h" #include "prefs.h" -KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), KNewStuff("tdeedu/vocabulary", parent) +KWQNewStuff::KWQNewStuff(TQWidget *parent, const char *name) : TQObject(), TDENewStuff("kwordquiz", parent) { m_app = (KWordQuizApp *) parent; } @@ -57,7 +57,7 @@ TQString KWQNewStuff::destinationPath(KNS::Entry * entry) TQString file; if (path.isEmpty()) - file = KNewStuff::downloadDestination(entry); //fall back on a temp file, should never happen + file = TDENewStuff::downloadDestination(entry); //fall back on a temp file, should never happen else { file = TQDir::home().path() + "/" + path + "/"; diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index 7bf9074f..a740459f 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -1,5 +1,5 @@ /*************************************************************************** - Implementation of KNewStuff + Implementation of TDENewStuff ------------------- begin : Thu Jun 02 13:12:30 PDT 2002 copyright : (C) 2005 by Peter Hedlund @@ -18,14 +18,14 @@ #ifndef KWTQNEWSTUFF_H #define KWTQNEWSTUFF_H -#include +#include class KWordQuizApp; /** @author Peter Hedlund */ -class KWQNewStuff : public TQObject, public KNewStuff +class KWQNewStuff : public TQObject, public TDENewStuff { Q_OBJECT @@ -42,7 +42,7 @@ public: /** Creates a file suitable for upload. - Note that this method always fails, since using KNewStuffGeneric + Note that this method always fails, since using TDENewStuffGeneric means that the provided file must already be in a usable format. @param fileName the name of the file to upload after its creation