Update for recent TDENewStuff changes

pull/1/head
François Andriot 8 years ago committed by Slávek Banko
parent fc067bc74a
commit 9a79f045fc
  1. 6
      doc/khangman/index.docbook
  2. 4
      kanagram/src/newstuff.cpp
  3. 6
      kanagram/src/newstuffdialog.cpp
  4. 4
      kanagram/src/newstuffdialog.h
  5. 2
      keduca/TODO
  6. 4
      khangman/README.languages
  7. 2
      khangman/khangman/Makefile.am
  8. 2
      khangman/khangman/khangman.cpp
  9. 2
      khangman/khangman/khangman.h
  10. 4
      khangman/khangman/khangman.kcfg
  11. 4
      khangman/khangman/khangmanrc
  12. 2
      khangman/khangman/khnewstuff.cpp
  13. 4
      khangman/khangman/khnewstuff.h
  14. 2
      klettres/klettres/Makefile.am
  15. 2
      klettres/klettres/klettres.cpp
  16. 2
      klettres/klettres/klettres.h
  17. 4
      klettres/klettres/klettresrc
  18. 2
      klettres/klettres/klnewstuff.cpp
  19. 4
      klettres/klettres/klnewstuff.h
  20. 2
      kstars/kstars/Makefile.am
  21. 2
      kstars/kstars/ksnewstuff.cpp
  22. 10
      kstars/kstars/ksnewstuff.h
  23. 2
      kstars/kstars/kstars.h
  24. 4
      kstars/kstars/kstarsrc
  25. 4
      kturtle/TODO
  26. 2
      kvoctrain/kvoctrain/Makefile.am
  27. 4
      kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg
  28. 2
      kvoctrain/kvoctrain/kva_io.cpp
  29. 2
      kvoctrain/kvoctrain/kvoctrain.h
  30. 4
      kvoctrain/kvoctrain/kvoctrainrc
  31. 6
      kvoctrain/kvoctrain/kvtnewstuff.cpp
  32. 6
      kvoctrain/kvoctrain/kvtnewstuff.h
  33. 2
      kwordquiz/src/Makefile.am
  34. 6
      kwordquiz/src/kwordquiz.kcfg
  35. 4
      kwordquiz/src/kwordquizrc
  36. 8
      kwordquiz/src/kwqnewstuff.cpp
  37. 8
      kwordquiz/src/kwqnewstuff.h

@ -455,7 +455,7 @@ Some languages also have hints to help you guess the word. The hint is shown by
<guimenu>Game</guimenu>
<guimenuitem>Get Words in New Language...</guimenuitem>
</menuchoice></term>
<listitem><para><action>Display</action> the KNewStuff dialog which lists all the data available in the different languages. </para></listitem>
<listitem><para><action>Display</action> the TDENewStuff dialog which lists all the data available in the different languages. </para></listitem>
</varlistentry>
<varlistentry>
<term><menuchoice>
@ -713,7 +713,7 @@ install</command>, depending on your installation.</para>
</step>
<step><para>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 <filename class="directory">$TDEDIR/share/apps/khangman</filename>.
</para>
<para>
In the configuration file, stored for each user in his <filename>~/.trinity/share/config/khangmanrc</filename> 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 <filename>~/.trinity/share/config/khangmanrc</filename> are saved all the game settings such as the background, last level played, ... plus the files that were downloaded from the TDENewStuff dialog.
</para>
</sect1>
<sect1 id="planned-features">

@ -4,8 +4,8 @@
#include <tqpushbutton.h>
#include <kdebug.h>
#include <knewstuff/downloaddialog.h>
#include <knewstuff/knewstuff.h>
#include <tdenewstuff/downloaddialog.h>
#include <tdenewstuff/knewstuff.h>
#include <tdelocale.h>
#include "kanagramsettings.h"

@ -1,7 +1,7 @@
#include "newstuffdialog.h"
#include <knewstuff/knewstuff.h>
#include <knewstuff/entry.h>
#include <tdenewstuff/knewstuff.h>
#include <tdenewstuff/entry.h>
#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
@ -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")
{
}

@ -1,9 +1,9 @@
#ifndef NEWSTUFFDIALOG_H
#define NEWSTUFFDIALOG_H
#include <knewstuff/knewstuff.h>
#include <tdenewstuff/knewstuff.h>
class NewStuffDialog : public KNewStuff
class NewStuffDialog : public TDENewStuff
{
public:
NewStuffDialog();

@ -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:

@ -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
Last update: October 23rd 2004

@ -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

@ -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; i<m_languages.count(); i++) {
TQString tmp = m_languages[i];
if (!config->readEntry(tmp))

@ -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();

@ -93,10 +93,10 @@
</entry>
</group>
<group name="KNewStuff">
<group name="TDENewStuff">
<entry name="ProvidersUrl" type="Path">
<label>The Providers path for KHangMan</label>
<default code="true">"http://edu.kde.org/khangman/downloads/providers.xml"</default>
<default code="true">"https://www.trinitydesktop.org/ocs/providers.xml"</default>
</entry>
</group>
</kcfg>

@ -1,2 +1,2 @@
[KNewStuff]
ProvidersUrl=http://edu.kde.org/khangman/downloads/providers.xml
[TDENewStuff]
ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml

@ -33,7 +33,7 @@
#include "khnewstuff.h"
KHNewStuff::KHNewStuff( KHangManView *view ) :
KNewStuff( "khangman", view ),
TDENewStuff( "khangman", view ),
m_view( view )
{
}

@ -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 * );

@ -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

@ -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<m_languages.count(); i++)
{
TQString tmp = m_languages[i];

@ -119,7 +119,7 @@ protected:
* @param id The id of the new level
*/
void updateLevMenu(int id);
///Create a KNewStuff instance
///Create a TDENewStuff instance
KLNewStuff *mNewStuff;
///Set the correct buttons on the second toolbar according to the language
void loadLangToolBar();

@ -1,3 +1,3 @@
[KNewStuff]
ProvidersUrl=http://edu.kde.org/klettres/downloads/providers.xml
[TDENewStuff]
ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml

@ -26,7 +26,7 @@
#include "prefs.h"
KLNewStuff::KLNewStuff( KLettresView *view ) :
KNewStuff( "klettres", view ),
TDENewStuff( "klettres", view ),
m_view( view )
{
}

@ -19,12 +19,12 @@
#ifndef KLNEWSTUFF_H
#define KLNEWSTUFF_H
#include "knewstuff/knewstuff.h"
#include "tdenewstuff/knewstuff.h"
#include "klettres.h"
class KLettres;
class KLNewStuff : public KNewStuff
class KLNewStuff : public TDENewStuff
{
public:
KLNewStuff( KLettresView * );

@ -28,7 +28,7 @@ kstars_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
kde_kcfg_DATA = kstars.kcfg
kde_conf_DATA = kstarsrc
kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libtdeedu/tdeeduplot/libtdeeduplot.la $(top_builddir)/libtdeedu/tdeeduui/libtdeeduui.la $(top_builddir)/libtdeedu/extdate/libextdate.la -ltdeprint -lknewstuff -lm -lz
kstars_LDADD = indi/liblilxml.a indi/libindicom.a tools/libkstarstools.a $(top_builddir)/libtdeedu/tdeeduplot/libtdeeduplot.la $(top_builddir)/libtdeedu/tdeeduui/libtdeeduui.la $(top_builddir)/libtdeedu/extdate/libextdate.la $(LIB_TDEPRINT) $(LIB_TDENEWSTUFF) -lm -lz
SUBDIRS = indi tools . data icons

@ -38,7 +38,7 @@
#include "skymap.h"
KSNewStuff::KSNewStuff( TQWidget *parent ) :
TQObject(), KNewStuff( "kstars", parent ), NGCUpdated( false )
TQObject(), TDENewStuff( "kstars data", parent ), NGCUpdated( false )
{
ks = (KStars*)parent;
kdw = new KDirWatch( this );

@ -17,12 +17,12 @@
/**
*@class KSNewStuff
*Subclass of KNewStuff, which provides a GUI for downloading extra
*Subclass of TDENewStuff, which provides a GUI for downloading extra
*application data from the internet. The KStars version is cutomized to
*parse the newly downloaded data and incorporate it immediately into
*the program.
*@note This class is only compiled if the user has KDE >= 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 <kdebug.h>
#include <tqobject.h>
#include <knewstuff/knewstuff.h>
#include <tdenewstuff/knewstuff.h>
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 );

@ -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();

@ -1,2 +1,2 @@
[KNewStuff]
ProvidersUrl=http://edu.kde.org/kstars/downloads/providers.xml
[TDENewStuff]
ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml

@ -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
<cies> 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?

@ -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

@ -246,10 +246,10 @@
<default param="7">10368000</default>
</entry>
</group>
<group name="KNewStuff">
<group name="TDENewStuff">
<entry name="ProvidersUrl" type="Path">
<label>The Providers path for KVocTrain</label>
<default>"http://edu.kde.org/kvoctrain/providers.xml"</default>
<default>"https://www.trinitydesktop.org/ocs/providers.xml"</default>
</entry>
<entry name="InstallationCommand" type="String">
<label>The command used to start a downloaded vocabulary</label>

@ -35,7 +35,7 @@
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <knewstuff/downloaddialog.h>
#include <tdenewstuff/downloaddialog.h>
#include "kvoctrain.h"
#include "UsageManager.h"

@ -291,7 +291,7 @@ private:
// correct_0_times, we simply reuse random_expr1.
vector<QueryEntryRef> 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;

@ -1,2 +1,2 @@
[KNewStuff]
ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml
[TDENewStuff]
ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml

@ -16,13 +16,13 @@
#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdemessagebox.h>
#include <knewstuff/entry.h>
#include <tdenewstuff/entry.h>
#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 + "/";

@ -12,14 +12,14 @@
#ifndef KVTNEWSTUFF_H
#define KVTNEWSTUFF_H
#include <knewstuff/knewstuff.h>
#include <tdenewstuff/knewstuff.h>
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

@ -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

@ -101,10 +101,10 @@
<default code="true">Qt::blue</default>
</entry>
</group>
<group name="KNewStuff">
<group name="TDENewStuff">
<entry name="ProvidersUrl" type="Path">
<label>The Providers path for KWordQuiz</label>
<default code="true">"http://edu.kde.org/kvoctrain/providers.xml"</default>
<default code="true">"https://www.trinitydesktop.org/ocs/providers.xml"</default>
</entry>
<entry name="InstallationCommand" type="String">
<label>The command used to start a downloaded vocabulary</label>
@ -115,4 +115,4 @@
<default>Vocabularies</default>
</entry>
</group>
</kcfg>
</kcfg>

@ -1,2 +1,2 @@
[KNewStuff]
ProvidersUrl=http://edu.kde.org/contrib/kvtml/providers.xml
[TDENewStuff]
ProvidersUrl=https://www.trinitydesktop.org/ocs/providers.xml

@ -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 <tdelocale.h>
#include <kstandarddirs.h>
#include <tdemessagebox.h>
#include <knewstuff/entry.h>
#include <tdenewstuff/entry.h>
#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 + "/";

@ -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 <knewstuff/knewstuff.h>
#include <tdenewstuff/knewstuff.h>
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

Loading…
Cancel
Save