Rename KAbout to avoid conflicts with KDE4

pull/16/head
Timothy Pearson 12 years ago
parent 5466d52073
commit 696e36a061

@ -26,13 +26,13 @@
#include <tqtextstream.h> #include <tqtextstream.h>
TQString TQString
KAboutPerson::name() const TDEAboutPerson::name() const
{ {
return TQString::fromUtf8(mName); return TQString::fromUtf8(mName);
} }
TQString TQString
KAboutPerson::task() const TDEAboutPerson::task() const
{ {
if (mTask && *mTask) if (mTask && *mTask)
return i18n(mTask); return i18n(mTask);
@ -41,32 +41,32 @@ KAboutPerson::task() const
} }
TQString TQString
KAboutPerson::emailAddress() const TDEAboutPerson::emailAddress() const
{ {
return TQString::fromUtf8(mEmailAddress); return TQString::fromUtf8(mEmailAddress);
} }
TQString TQString
KAboutPerson::webAddress() const TDEAboutPerson::webAddress() const
{ {
return TQString::fromUtf8(mWebAddress); return TQString::fromUtf8(mWebAddress);
} }
KAboutTranslator::KAboutTranslator(const TQString & name, TDEAboutTranslator::TDEAboutTranslator(const TQString & name,
const TQString & emailAddress) const TQString & emailAddress)
{ {
mName=name; mName=name;
mEmail=emailAddress; mEmail=emailAddress;
} }
TQString KAboutTranslator::name() const TQString TDEAboutTranslator::name() const
{ {
return mName; return mName;
} }
TQString KAboutTranslator::emailAddress() const TQString TDEAboutTranslator::emailAddress() const
{ {
return mEmail; return mEmail;
} }
@ -141,14 +141,14 @@ void
TDEAboutData::addAuthor( const char *name, const char *task, TDEAboutData::addAuthor( const char *name, const char *task,
const char *emailAddress, const char *webAddress ) const char *emailAddress, const char *webAddress )
{ {
mAuthorList.append(KAboutPerson(name,task,emailAddress,webAddress)); mAuthorList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
} }
void void
TDEAboutData::addCredit( const char *name, const char *task, TDEAboutData::addCredit( const char *name, const char *task,
const char *emailAddress, const char *webAddress ) const char *emailAddress, const char *webAddress )
{ {
mCreditList.append(KAboutPerson(name,task,emailAddress,webAddress)); mCreditList.append(TDEAboutPerson(name,task,emailAddress,webAddress));
} }
void void
@ -320,22 +320,22 @@ TDEAboutData::bugAddress() const
return TQString::fromLatin1(mBugEmailAddress); return TQString::fromLatin1(mBugEmailAddress);
} }
const TQValueList<KAboutPerson> const TQValueList<TDEAboutPerson>
TDEAboutData::authors() const TDEAboutData::authors() const
{ {
return mAuthorList; return mAuthorList;
} }
const TQValueList<KAboutPerson> const TQValueList<TDEAboutPerson>
TDEAboutData::credits() const TDEAboutData::credits() const
{ {
return mCreditList; return mCreditList;
} }
const TQValueList<KAboutTranslator> const TQValueList<TDEAboutTranslator>
TDEAboutData::translators() const TDEAboutData::translators() const
{ {
TQValueList<KAboutTranslator> personList; TQValueList<TDEAboutTranslator> personList;
if(d->translatorName == 0) if(d->translatorName == 0)
return personList; return personList;
@ -375,7 +375,7 @@ TDEAboutData::translators() const
TQString name=*nit; TQString name=*nit;
personList.append(KAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace())); personList.append(TDEAboutTranslator(name.stripWhiteSpace(), email.stripWhiteSpace()));
} }
return personList; return personList;

@ -27,7 +27,7 @@
#ifndef _KABOUTDATA_H_ #ifndef _KABOUTDATA_H_
#define _KABOUTDATA_H_ #define _KABOUTDATA_H_
class KAboutPersonPrivate; class TDEAboutPersonPrivate;
class TDEAboutDataPrivate; class TDEAboutDataPrivate;
/** /**
@ -51,7 +51,7 @@ class TDEAboutDataPrivate;
* TDECmdLineArgs::init(argc, argv, &about); * TDECmdLineArgs::init(argc, argv, &about);
* \endcode * \endcode
*/ */
class TDECORE_EXPORT KAboutPerson class TDECORE_EXPORT TDEAboutPerson
{ {
public: public:
/** /**
@ -67,7 +67,7 @@ public:
* *
* @param webAddress Home page of the person. * @param webAddress Home page of the person.
*/ */
KAboutPerson( const char *name, const char *task, TDEAboutPerson( const char *name, const char *task,
const char *emailAddress, const char *webAddress ) const char *emailAddress, const char *webAddress )
{ {
mName = name; mName = name;
@ -79,7 +79,7 @@ public:
* @internal * @internal
* Don't use. Required by QValueList * Don't use. Required by QValueList
*/ */
KAboutPerson() {} TDEAboutPerson() {}
/** /**
* The person's name * The person's name
@ -115,10 +115,10 @@ private:
const char *mEmailAddress; const char *mEmailAddress;
const char *mWebAddress; const char *mWebAddress;
KAboutPersonPrivate *d; TDEAboutPersonPrivate *d;
}; };
class KAboutTranslatorPrivate; class TDEAboutTranslatorPrivate;
/** /**
* This structure is used to store information about a translator. * This structure is used to store information about a translator.
* It can store the translator's name and an email address. * It can store the translator's name and an email address.
@ -126,12 +126,12 @@ class KAboutTranslatorPrivate;
* but it can be used elsewhere as well. * but it can be used elsewhere as well.
* Normally you should at least define the translator's name. * Normally you should at least define the translator's name.
* *
* It's not possible to use KAboutPerson for this, because * It's not possible to use TDEAboutPerson for this, because
* KAboutPerson stores internally only const char* pointers, but the * TDEAboutPerson stores internally only const char* pointers, but the
* translator information is generated dynamically from the translation * translator information is generated dynamically from the translation
* of a dummy string. * of a dummy string.
*/ */
class TDECORE_EXPORT KAboutTranslator class TDECORE_EXPORT TDEAboutTranslator
{ {
public: public:
/** /**
@ -141,7 +141,7 @@ public:
* *
* @param emailAddress The email address of the person. * @param emailAddress The email address of the person.
*/ */
KAboutTranslator(const TQString & name=TQString::null, TDEAboutTranslator(const TQString & name=TQString::null,
const TQString & emailAddress=TQString::null); const TQString & emailAddress=TQString::null);
/** /**
@ -161,7 +161,7 @@ public:
private: private:
TQString mName; TQString mName;
TQString mEmail; TQString mEmail;
KAboutTranslatorPrivate* d; TDEAboutTranslatorPrivate* d;
}; };
@ -169,10 +169,10 @@ private:
* This class is used to store information about a program. It can store * This class is used to store information about a program. It can store
* such values as version number, program name, home page, email address * such values as version number, program name, home page, email address
* for bug reporting, multiple authors and contributors * for bug reporting, multiple authors and contributors
* (using KAboutPerson), license and copyright information. * (using TDEAboutPerson), license and copyright information.
* *
* Currently, the values set here are shown by the "About" box * Currently, the values set here are shown by the "About" box
* (see KAboutDialog), used by the bug report dialog (see KBugReport), * (see TDEAboutDialog), used by the bug report dialog (see KBugReport),
* and by the help shown on command line (see TDECmdLineArgs). * and by the help shown on command line (see TDECmdLineArgs).
* *
* @short Holds information needed by the "About" box and other * @short Holds information needed by the "About" box and other
@ -318,7 +318,7 @@ class TDECORE_EXPORT TDEAboutData
* *
* @param name the name of the translator * @param name the name of the translator
* @param emailAddress the email address of the translator * @param emailAddress the email address of the translator
* @see KAboutTranslator * @see TDEAboutTranslator
*/ */
void setTranslator(const char* name, const char* emailAddress); void setTranslator(const char* name, const char* emailAddress);
@ -521,19 +521,19 @@ class TDECORE_EXPORT TDEAboutData
* Returns a list of authors. * Returns a list of authors.
* @return author information (list of persons). * @return author information (list of persons).
*/ */
const TQValueList<KAboutPerson> authors() const; const TQValueList<TDEAboutPerson> authors() const;
/** /**
* Returns a list of persons who contributed. * Returns a list of persons who contributed.
* @return credit information (list of persons). * @return credit information (list of persons).
*/ */
const TQValueList<KAboutPerson> credits() const; const TQValueList<TDEAboutPerson> credits() const;
/** /**
* Returns a list of translators. * Returns a list of translators.
* @return translators information (list of persons) * @return translators information (list of persons)
*/ */
const TQValueList<KAboutTranslator> translators() const; const TQValueList<TDEAboutTranslator> translators() const;
/** /**
* Returns a message about the translation team. * Returns a message about the translation team.
@ -618,8 +618,8 @@ class TDECORE_EXPORT TDEAboutData
const char *mOtherText; const char *mOtherText;
const char *mHomepageAddress; const char *mHomepageAddress;
const char *mBugEmailAddress; const char *mBugEmailAddress;
TQValueList<KAboutPerson> mAuthorList; TQValueList<TDEAboutPerson> mAuthorList;
TQValueList<KAboutPerson> mCreditList; TQValueList<TDEAboutPerson> mCreditList;
const char *mLicenseText; const char *mLicenseText;
static const char *defaultBugTracker; static const char *defaultBugTracker;

@ -607,10 +607,10 @@ TDECmdLineArgs::parseAllArgs()
} else if ( ::qstrcmp( option, "author") == 0 ) { } else if ( ::qstrcmp( option, "author") == 0 ) {
enable_i18n(); enable_i18n();
if ( about ) { if ( about ) {
const TQValueList<KAboutPerson> authors = about->authors(); const TQValueList<TDEAboutPerson> authors = about->authors();
if ( !authors.isEmpty() ) { if ( !authors.isEmpty() ) {
TQString authorlist; TQString authorlist;
for (TQValueList<KAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) { for (TQValueList<TDEAboutPerson>::ConstIterator it = authors.begin(); it != authors.end(); ++it ) {
TQString email; TQString email;
if ( !(*it).emailAddress().isEmpty() ) if ( !(*it).emailAddress().isEmpty() )
email = " <" + (*it).emailAddress() + ">"; email = " <" + (*it).emailAddress() + ">";

@ -37,7 +37,7 @@
281 tdeui (TDECModule) 281 tdeui (TDECModule)
282 tdeui (KDockWidget) 282 tdeui (KDockWidget)
290 tdeui (KPixmapIO) 290 tdeui (KPixmapIO)
291 tdeui (KAboutDialog) 291 tdeui (TDEAboutDialog)
292 tdeui (KComboBox) 292 tdeui (KComboBox)
293 tdeui (KLineEdit) 293 tdeui (KLineEdit)
294 tdeui (KEdit) 294 tdeui (KEdit)

@ -175,7 +175,7 @@ public:
/** /**
* The instance currently active (useful in a multi-instance * The instance currently active (useful in a multi-instance
* application, such as a KParts application). * application, such as a KParts application).
* Don't use this - it's mainly for KAboutDialog and KBugReport. * Don't use this - it's mainly for TDEAboutDialog and KBugReport.
* @internal * @internal
*/ */
static void setActiveInstance(TDEInstance *d); static void setActiveInstance(TDEInstance *d);

@ -253,7 +253,7 @@ signals:
protected: protected:
/** /**
* Changes the active instance when the active part changes. * Changes the active instance when the active part changes.
* The active instance is used by KBugReport and KAboutDialog. * The active instance is used by KBugReport and TDEAboutDialog.
* Override if you really need to - usually you don't need to. * Override if you really need to - usually you don't need to.
*/ */
virtual void setActiveInstance( TDEInstance * instance ); virtual void setActiveInstance( TDEInstance * instance );

@ -2,7 +2,7 @@ Dawit Alemayehu <adawit@earthlink.net>
KLineEdit, KComboBox KLineEdit, KComboBox
Espen Sand <espen@kde.org>: Espen Sand <espen@kde.org>:
KDialogBase, KAboutDialog (based on work by Mirko), KHelpMenu, KTextBrowser KDialogBase, TDEAboutDialog (based on work by Mirko), KHelpMenu, KTextBrowser
and various adjustments here and there. and various adjustments here and there.
Daniel M. Duley <mosfet@kde.org> Daniel M. Duley <mosfet@kde.org>

@ -33,9 +33,9 @@
#include <kactivelabel.h> #include <kactivelabel.h>
#include "ktextedit.h" #include "ktextedit.h"
KAboutApplication::KAboutApplication( TQWidget *parent, const char *name, TDEAboutApplication::TDEAboutApplication( TQWidget *parent, const char *name,
bool modal ) bool modal )
:KAboutDialog( AbtTabbed|AbtProduct, :TDEAboutDialog( AbtTabbed|AbtProduct,
kapp ? kapp->caption() : TQString::null, kapp ? kapp->caption() : TQString::null,
Close, Close, Close, Close,
parent, name, modal ) parent, name, modal )
@ -43,15 +43,15 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name,
buildDialog(TDEGlobal::instance()->aboutData()); buildDialog(TDEGlobal::instance()->aboutData());
} }
KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent, TDEAboutApplication::TDEAboutApplication( const TDEAboutData *aboutData, TQWidget *parent,
const char *name, bool modal ) const char *name, bool modal )
:KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close, :TDEAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close,
parent, name, modal ) parent, name, modal )
{ {
buildDialog(aboutData); buildDialog(aboutData);
} }
void KAboutApplication::buildDialog( const TDEAboutData *aboutData ) void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
{ {
if( !aboutData ) if( !aboutData )
{ {
@ -61,7 +61,7 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
//i18n "??" is displayed as (pseudo-)version when no data is known about the application //i18n "??" is displayed as (pseudo-)version when no data is known about the application
setProduct( kapp ? kapp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null ); setProduct( kapp ? kapp->caption() : TQString::null, i18n("??"), TQString::null, TQString::null );
KAboutContainer *appPage = addContainerPage( i18n("&About")); TDEAboutContainer *appPage = addContainerPage( i18n("&About"));
TQString appPageText = TQString appPageText =
i18n("No information available.\n" i18n("No information available.\n"
@ -85,7 +85,7 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
if (!aboutData->copyrightStatement().isEmpty()) if (!aboutData->copyrightStatement().isEmpty())
appPageText += "\n" + aboutData->copyrightStatement()+"\n"; appPageText += "\n" + aboutData->copyrightStatement()+"\n";
KAboutContainer *appPage = addContainerPage( i18n("&About")); TDEAboutContainer *appPage = addContainerPage( i18n("&About"));
TQLabel *appPageLabel = new TQLabel( appPageText, 0 ); TQLabel *appPageLabel = new TQLabel( appPageText, 0 );
appPage->addWidget( appPageLabel ); appPage->addWidget( appPageLabel );
@ -105,7 +105,7 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
{ {
TQString authorPageTitle = authorCount == 1 ? TQString authorPageTitle = authorCount == 1 ?
i18n("A&uthor") : i18n("A&uthors"); i18n("A&uthor") : i18n("A&uthors");
KAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle ); TDEAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle );
if (!aboutData->customAuthorTextEnabled() || !aboutData->customAuthorRichText().isEmpty ()) if (!aboutData->customAuthorTextEnabled() || !aboutData->customAuthorRichText().isEmpty ())
{ {
@ -133,7 +133,7 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
authorPage->addWidget( activeLabel ); authorPage->addWidget( activeLabel );
} }
TQValueList<KAboutPerson>::ConstIterator it; TQValueList<TDEAboutPerson>::ConstIterator it;
for (it = aboutData->authors().begin(); for (it = aboutData->authors().begin();
it != aboutData->authors().end(); ++it) it != aboutData->authors().end(); ++it)
{ {
@ -145,9 +145,9 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
int creditsCount = aboutData->credits().count(); int creditsCount = aboutData->credits().count();
if (creditsCount) if (creditsCount)
{ {
KAboutContainer *creditsPage = TDEAboutContainer *creditsPage =
addScrolledContainerPage( i18n("&Thanks To") ); addScrolledContainerPage( i18n("&Thanks To") );
TQValueList<KAboutPerson>::ConstIterator it; TQValueList<TDEAboutPerson>::ConstIterator it;
for (it = aboutData->credits().begin(); for (it = aboutData->credits().begin();
it != aboutData->credits().end(); ++it) it != aboutData->credits().end(); ++it)
{ {
@ -156,13 +156,13 @@ void KAboutApplication::buildDialog( const TDEAboutData *aboutData )
} }
} }
const TQValueList<KAboutTranslator> translatorList = aboutData->translators(); const TQValueList<TDEAboutTranslator> translatorList = aboutData->translators();
if(translatorList.count() > 0) if(translatorList.count() > 0)
{ {
TQString text = "<qt>"; TQString text = "<qt>";
TQValueList<KAboutTranslator>::ConstIterator it; TQValueList<TDEAboutTranslator>::ConstIterator it;
for(it = translatorList.begin(); it != translatorList.end(); ++it) for(it = translatorList.begin(); it != translatorList.end(); ++it)
{ {
text += TQString("<p>%1<br>&nbsp;&nbsp;&nbsp;" text += TQString("<p>%1<br>&nbsp;&nbsp;&nbsp;"

@ -41,7 +41,7 @@
* @author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org) * @author Waldo Bastian (bastian@kde.org) and Espen Sand (espen@kde.org)
*/ */
class TDEUI_EXPORT KAboutApplication : public KAboutDialog class TDEUI_EXPORT TDEAboutApplication : public TDEAboutDialog
{ {
public: public:
/** /**
@ -57,7 +57,7 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
* made visible using TQWidget::show(). Otherwise it will be * made visible using TQWidget::show(). Otherwise it will be
* modal and must be made visible using TQWidget::exec(). * modal and must be made visible using TQWidget::exec().
*/ */
KAboutApplication( TQWidget *parent=0, const char *name=0, bool modal=true ); TDEAboutApplication( TQWidget *parent=0, const char *name=0, bool modal=true );
/** /**
* Constructor. Mostly does the same stuff as the previous constructor, except * Constructor. Mostly does the same stuff as the previous constructor, except
@ -76,12 +76,12 @@ class TDEUI_EXPORT KAboutApplication : public KAboutDialog
* made visible using TQWidget::show(). Otherwise it will be * made visible using TQWidget::show(). Otherwise it will be
* modal and must be made visible using TQWidget::exec(). * modal and must be made visible using TQWidget::exec().
*/ */
KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true ); TDEAboutApplication( const TDEAboutData *aboutData, TQWidget *parent=0, const char *name=0, bool modal=true );
/* /*
FIXME: The two constructors should be replaced with the following after the lib freeze: FIXME: The two constructors should be replaced with the following after the lib freeze:
KAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true ); TDEAboutApplication( const TDEAboutData *aboutData=0, TQWidget *parent=0, const char *name=0, bool modal=true );
This will make buildDialog() obsolete as well (Frerich). This will make buildDialog() obsolete as well (Frerich).
*/ */

@ -42,7 +42,7 @@
#include <kdebug.h> #include <kdebug.h>
//MOC_SKIP_BEGIN //MOC_SKIP_BEGIN
template class TQPtrList<KAboutContributor>; template class TQPtrList<TDEAboutContributor>;
//MOC_SKIP_END //MOC_SKIP_END
#define WORKTEXT_IDENTATION 16 #define WORKTEXT_IDENTATION 16
@ -54,10 +54,10 @@ template class TQPtrList<KAboutContributor>;
#include "kaboutdialog_private.moc" #include "kaboutdialog_private.moc"
// ############################################################## // ##############################################################
class KAboutTabWidget : public TQTabWidget class TDEAboutTabWidget : public TQTabWidget
{ {
public: public:
KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} TDEAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
TQSize sizeHint() const { TQSize sizeHint() const {
return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
} }
@ -66,7 +66,7 @@ public:
KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname, TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname,
const TQString &_name,const TQString &_email, const TQString &_name,const TQString &_email,
const TQString &_url, const TQString &_work, const TQString &_url, const TQString &_work,
bool showHeader, bool showFrame, bool showHeader, bool showFrame,
@ -113,7 +113,7 @@ KAboutContributor::KAboutContributor( TQWidget *_parent, const char *wname,
} }
void KAboutContributor::setName( const TQString &_text, const TQString &_header, void TDEAboutContributor::setName( const TQString &_text, const TQString &_header,
bool _update ) bool _update )
{ {
mLabel[0]->setText(_header); mLabel[0]->setText(_header);
@ -122,7 +122,7 @@ void KAboutContributor::setName( const TQString &_text, const TQString &_header,
} }
void KAboutContributor::setEmail( const TQString &_text, const TQString &_header, void TDEAboutContributor::setEmail( const TQString &_text, const TQString &_header,
bool _update ) bool _update )
{ {
mLabel[1]->setText(_header); mLabel[1]->setText(_header);
@ -133,7 +133,7 @@ void KAboutContributor::setEmail( const TQString &_text, const TQString &_header
} }
void KAboutContributor::setURL( const TQString &_text, const TQString &_header, void TDEAboutContributor::setURL( const TQString &_text, const TQString &_header,
bool _update ) bool _update )
{ {
mLabel[2]->setText(_header); mLabel[2]->setText(_header);
@ -144,7 +144,7 @@ void KAboutContributor::setURL( const TQString &_text, const TQString &_header,
} }
void KAboutContributor::setWork( const TQString &_text, const TQString &_header, void TDEAboutContributor::setWork( const TQString &_text, const TQString &_header,
bool _update ) bool _update )
{ {
mLabel[3]->setText(_header); mLabel[3]->setText(_header);
@ -153,32 +153,32 @@ void KAboutContributor::setWork( const TQString &_text, const TQString &_header,
} }
TQString KAboutContributor::getName( void ) const TQString TDEAboutContributor::getName( void ) const
{ {
return mText[0]->text(); return mText[0]->text();
} }
TQString KAboutContributor::getEmail( void ) const TQString TDEAboutContributor::getEmail( void ) const
{ {
return mText[1]->text(); return mText[1]->text();
} }
TQString KAboutContributor::getURL( void ) const TQString TDEAboutContributor::getURL( void ) const
{ {
return mText[2]->text(); return mText[2]->text();
} }
TQString KAboutContributor::getWork( void ) const TQString TDEAboutContributor::getWork( void ) const
{ {
return mText[3]->text(); return mText[3]->text();
} }
void KAboutContributor::updateLayout( void ) void TDEAboutContributor::updateLayout( void )
{ {
delete layout(); delete layout();
@ -260,7 +260,7 @@ void KAboutContributor::updateLayout( void )
} }
void KAboutContributor::fontChange( const TQFont &/*oldFont*/ ) void TDEAboutContributor::fontChange( const TQFont &/*oldFont*/ )
{ {
if( mShowBold ) if( mShowBold )
{ {
@ -272,28 +272,28 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ )
} }
TQSize KAboutContributor::sizeHint( void ) const TQSize TDEAboutContributor::sizeHint( void ) const
{ {
return minimumSizeHint(); return minimumSizeHint();
} }
void KAboutContributor::urlClickedSlot( const TQString &u ) void TDEAboutContributor::urlClickedSlot( const TQString &u )
{ {
emit openURL(u); emit openURL(u);
} }
void KAboutContributor::emailClickedSlot( const TQString &e ) void TDEAboutContributor::emailClickedSlot( const TQString &e )
{ {
emit sendEmail( mText[0]->text(), e ) ; emit sendEmail( mText[0]->text(), e ) ;
} }
// //
// Internal widget for the KAboutDialog class. // Internal widget for the TDEAboutDialog class.
// //
KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent, TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent,
char *_name ) char *_name )
: TQWidget( _parent, _name ), : TQWidget( _parent, _name ),
mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0), mImageLabel(0), mTitleLabel(0), mIconLabel(0),mVersionLabel(0),
@ -369,7 +369,7 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
if( layoutType & AbtTabbed ) if( layoutType & AbtTabbed )
{ {
mPageTab = new KAboutTabWidget( this ); mPageTab = new TDEAboutTabWidget( this );
if( !mPageTab ) { return; } if( !mPageTab ) { return; }
hbox->addWidget( mPageTab, 10 ); hbox->addWidget( mPageTab, 10 );
} }
@ -422,17 +422,17 @@ KAboutContainerBase::KAboutContainerBase( int layoutType, TQWidget *_parent,
} }
void KAboutContainerBase::show( void ) void TDEAboutContainerBase::show( void )
{ {
TQWidget::show(); TQWidget::show();
} }
TQSize KAboutContainerBase::sizeHint( void ) const TQSize TDEAboutContainerBase::sizeHint( void ) const
{ {
return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
} }
void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) void TDEAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
{ {
if( mTitleLabel ) if( mTitleLabel )
{ {
@ -457,7 +457,7 @@ void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
update(); update();
} }
TQFrame *KAboutContainerBase::addTextPage( const TQString &title, TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title,
const TQString &text, const TQString &text,
bool richText, int numLines ) bool richText, int numLines )
{ {
@ -492,7 +492,7 @@ TQFrame *KAboutContainerBase::addTextPage( const TQString &title,
return page; return page;
} }
TQFrame *KAboutContainerBase::addLicensePage( const TQString &title, TQFrame *TDEAboutContainerBase::addLicensePage( const TQString &title,
const TQString &text, int numLines) const TQString &text, int numLines)
{ {
TQFrame* const page = addEmptyPage( title ); TQFrame* const page = addEmptyPage( title );
@ -512,7 +512,7 @@ TQFrame *KAboutContainerBase::addLicensePage( const TQString &title,
} }
KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title, TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &title,
int childAlignment, int childAlignment,
int innerAlignment ) int innerAlignment )
{ {
@ -522,7 +522,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
return 0; return 0;
} }
KAboutContainer* const container = new KAboutContainer( mPageTab, "container", TDEAboutContainer* const container = new TDEAboutContainer( mPageTab, "container",
KDialog::spacingHint(), KDialog::spacingHint(), childAlignment, KDialog::spacingHint(), KDialog::spacingHint(), childAlignment,
innerAlignment ); innerAlignment );
mPageTab->addTab( container, title ); mPageTab->addTab( container, title );
@ -536,7 +536,7 @@ KAboutContainer *KAboutContainerBase::addContainerPage( const TQString &title,
} }
KAboutContainer *KAboutContainerBase::addScrolledContainerPage( TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage(
const TQString &title, const TQString &title,
int childAlignment, int childAlignment,
int innerAlignment ) int innerAlignment )
@ -553,7 +553,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
scrollView->viewport()->setBackgroundMode( PaletteBackground ); scrollView->viewport()->setBackgroundMode( PaletteBackground );
vbox->addWidget( scrollView ); vbox->addWidget( scrollView );
KAboutContainer* const container = new KAboutContainer( scrollView, "container", TDEAboutContainer* const container = new TDEAboutContainer( scrollView, "container",
KDialog::spacingHint(), KDialog::spacingHint(), childAlignment, KDialog::spacingHint(), KDialog::spacingHint(), childAlignment,
innerAlignment ); innerAlignment );
scrollView->addChild( container ); scrollView->addChild( container );
@ -568,7 +568,7 @@ KAboutContainer *KAboutContainerBase::addScrolledContainerPage(
} }
TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title ) TQFrame *TDEAboutContainerBase::addEmptyPage( const TQString &title )
{ {
if( !mPageTab ) if( !mPageTab )
{ {
@ -584,10 +584,10 @@ TQFrame *KAboutContainerBase::addEmptyPage( const TQString &title )
} }
KAboutContainer *KAboutContainerBase::addContainer( int childAlignment, TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment,
int innerAlignment ) int innerAlignment )
{ {
KAboutContainer* const container = new KAboutContainer( this, "container", TDEAboutContainer* const container = new TDEAboutContainer( this, "container",
0, KDialog::spacingHint(), childAlignment, innerAlignment ); 0, KDialog::spacingHint(), childAlignment, innerAlignment );
mTopLayout->addWidget( container, 0, childAlignment ); mTopLayout->addWidget( container, 0, childAlignment );
@ -601,7 +601,7 @@ KAboutContainer *KAboutContainerBase::addContainer( int childAlignment,
void KAboutContainerBase::setTitle( const TQString &title ) void TDEAboutContainerBase::setTitle( const TQString &title )
{ {
if( !mTitleLabel ) if( !mTitleLabel )
{ {
@ -612,7 +612,7 @@ void KAboutContainerBase::setTitle( const TQString &title )
} }
void KAboutContainerBase::setImage( const TQString &fileName ) void TDEAboutContainerBase::setImage( const TQString &fileName )
{ {
if( !mImageLabel ) if( !mImageLabel )
{ {
@ -631,7 +631,7 @@ void KAboutContainerBase::setImage( const TQString &fileName )
mImageFrame->layout()->activate(); mImageFrame->layout()->activate();
} }
void KAboutContainerBase::setProgramLogo( const TQString &fileName ) void TDEAboutContainerBase::setProgramLogo( const TQString &fileName )
{ {
if( fileName.isNull() ) if( fileName.isNull() )
{ {
@ -642,7 +642,7 @@ void KAboutContainerBase::setProgramLogo( const TQString &fileName )
setProgramLogo( logo ); setProgramLogo( logo );
} }
void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap ) void TDEAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
{ {
if( !mIconLabel ) if( !mIconLabel )
{ {
@ -655,7 +655,7 @@ void KAboutContainerBase::setProgramLogo( const TQPixmap &pixmap )
} }
} }
void KAboutContainerBase::setImageBackgroundColor( const TQColor &color ) void TDEAboutContainerBase::setImageBackgroundColor( const TQColor &color )
{ {
if( mImageFrame ) if( mImageFrame )
{ {
@ -664,7 +664,7 @@ void KAboutContainerBase::setImageBackgroundColor( const TQColor &color )
} }
void KAboutContainerBase::setImageFrame( bool state ) void TDEAboutContainerBase::setImageFrame( bool state )
{ {
if( mImageFrame ) if( mImageFrame )
{ {
@ -682,7 +682,7 @@ void KAboutContainerBase::setImageFrame( bool state )
} }
void KAboutContainerBase::setProduct( const TQString &appName, void TDEAboutContainerBase::setProduct( const TQString &appName,
const TQString &version, const TQString &version,
const TQString &author, const TQString &author,
const TQString &year ) const TQString &year )
@ -720,18 +720,18 @@ void KAboutContainerBase::setProduct( const TQString &appName,
} }
void KAboutContainerBase::slotMouseTrack( int mode, const TQMouseEvent *e ) void TDEAboutContainerBase::slotMouseTrack( int mode, const TQMouseEvent *e )
{ {
emit mouseTrack( mode, e ); emit mouseTrack( mode, e );
} }
void KAboutContainerBase::slotUrlClick( const TQString &url ) void TDEAboutContainerBase::slotUrlClick( const TQString &url )
{ {
emit urlClick( url ); emit urlClick( url );
} }
void KAboutContainerBase::slotMailClick( const TQString &_name, void TDEAboutContainerBase::slotMailClick( const TQString &_name,
const TQString &_address ) const TQString &_address )
{ {
emit mailClick( _name, _address ); emit mailClick( _name, _address );
@ -739,7 +739,7 @@ void KAboutContainerBase::slotMailClick( const TQString &_name,
KAboutContainer::KAboutContainer( TQWidget *_parent, const char *_name, TDEAboutContainer::TDEAboutContainer( TQWidget *_parent, const char *_name,
int _margin, int _spacing, int _margin, int _spacing,
int childAlignment, int innerAlignment ) int childAlignment, int innerAlignment )
: TQFrame( _parent, _name ), d(0) : TQFrame( _parent, _name ), d(0)
@ -781,7 +781,7 @@ KAboutContainer::KAboutContainer( TQWidget *_parent, const char *_name,
} }
void KAboutContainer::childEvent( TQChildEvent *e ) void TDEAboutContainer::childEvent( TQChildEvent *e )
{ {
if( !e->inserted() || !e->child()->isWidgetType() ) if( !e->inserted() || !e->child()->isWidgetType() )
{ {
@ -806,7 +806,7 @@ void KAboutContainer::childEvent( TQChildEvent *e )
} }
TQSize KAboutContainer::sizeHint( void ) const TQSize TDEAboutContainer::sizeHint( void ) const
{ {
// //
// The size is computed by adding the sizeHint().height() of all // The size is computed by adding the sizeHint().height() of all
@ -864,24 +864,24 @@ TQSize KAboutContainer::sizeHint( void ) const
} }
TQSize KAboutContainer::minimumSizeHint( void ) const TQSize TDEAboutContainer::minimumSizeHint( void ) const
{ {
return sizeHint(); return sizeHint();
} }
void KAboutContainer::addWidget( TQWidget *widget ) void TDEAboutContainer::addWidget( TQWidget *widget )
{ {
widget->reparent( this, 0, TQPoint(0,0) ); widget->reparent( this, 0, TQPoint(0,0) );
} }
void KAboutContainer::addPerson( const TQString &_name, const TQString &_email, void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_task, const TQString &_url, const TQString &_task,
bool showHeader, bool showFrame,bool showBold) bool showHeader, bool showFrame,bool showBold)
{ {
KAboutContributor* const cont = new KAboutContributor( this, "pers", TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers",
_name, _email, _url, _task, showHeader, showFrame, showBold ); _name, _email, _url, _task, showHeader, showFrame, showBold );
connect( cont, TQT_SIGNAL( openURL(const TQString&)), connect( cont, TQT_SIGNAL( openURL(const TQString&)),
this, TQT_SIGNAL( urlClick(const TQString &))); this, TQT_SIGNAL( urlClick(const TQString &)));
@ -890,7 +890,7 @@ void KAboutContainer::addPerson( const TQString &_name, const TQString &_email,
} }
void KAboutContainer::addTitle( const TQString &title, int alignment, void TDEAboutContainer::addTitle( const TQString &title, int alignment,
bool showFrame, bool showBold ) bool showFrame, bool showBold )
{ {
@ -909,7 +909,7 @@ void KAboutContainer::addTitle( const TQString &title, int alignment,
} }
void KAboutContainer::addImage( const TQString &fileName, int alignment ) void TDEAboutContainer::addImage( const TQString &fileName, int alignment )
{ {
if( fileName.isNull() ) if( fileName.isNull() )
{ {
@ -930,19 +930,19 @@ void KAboutContainer::addImage( const TQString &fileName, int alignment )
#if 0 #if 0
//MOC_SKIP_BEGIN //MOC_SKIP_BEGIN
/** Every person displayed is stored in a KAboutContributor object. /** Every person displayed is stored in a TDEAboutContributor object.
* Every contributor, the author and/or the maintainer of the application are * Every contributor, the author and/or the maintainer of the application are
* stored in objects of this local class. Every single field may be empty. * stored in objects of this local class. Every single field may be empty.
* To add a contributor, create a KAboutContributor object as a child of your * To add a contributor, create a TDEAboutContributor object as a child of your
* @ref KAboutDialog, set its contents and add it using add addContributor. */ * @ref TDEAboutDialog, set its contents and add it using add addContributor. */
class KAboutContributor : public QFrame class TDEAboutContributor : public QFrame
{ {
// ############################################################################ // ############################################################################
Q_OBJECT Q_OBJECT
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
public: public:
/** The Qt constructor. */ /** The Qt constructor. */
KAboutContributor(TQWidget* parent=0, const char* name=0); TDEAboutContributor(TQWidget* parent=0, const char* name=0);
/** Set the name (a literal string). */ /** Set the name (a literal string). */
void setName(const TQString&); void setName(const TQString&);
/** Get the name. */ /** Get the name. */
@ -958,7 +958,7 @@ public:
/** The tasks the person worked on (a literal string). More than one line is /** The tasks the person worked on (a literal string). More than one line is
* possible, but very long texts might look ugly. */ * possible, but very long texts might look ugly. */
void setWork(const TQString&); void setWork(const TQString&);
/** The size hint. Very important here, since KAboutWidget relies on it for /** The size hint. Very important here, since TDEAboutWidget relies on it for
* geometry management. */ * geometry management. */
TQSize sizeHint(); TQSize sizeHint();
TQSize minimumSizeHint(void); TQSize minimumSizeHint(void);
@ -997,7 +997,7 @@ signals:
KAboutContributor::KAboutContributor(TQWidget* parent, const char* n) TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n)
: TQFrame(parent, n), : TQFrame(parent, n),
name(new TQLabel(this)), name(new TQLabel(this)),
email(new KURLLabel(this)), email(new KURLLabel(this)),
@ -1006,7 +1006,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
// ############################################################ // ############################################################
if(name==0 || email==0) if(name==0 || email==0)
{ // this will nearly never happen (out of memory in about box?) { // this will nearly never happen (out of memory in about box?)
kdDebug() << "KAboutContributor::KAboutContributor: Out of memory." << endl; kdDebug() << "TDEAboutContributor::TDEAboutContributor: Out of memory." << endl;
tqApp->quit(); tqApp->quit();
} }
setFrameStyle(TQFrame::Panel | TQFrame::Raised); setFrameStyle(TQFrame::Panel | TQFrame::Raised);
@ -1019,7 +1019,7 @@ KAboutContributor::KAboutContributor(TQWidget* parent, const char* n)
} }
void void
KAboutContributor::setName(const TQString& n) TDEAboutContributor::setName(const TQString& n)
{ {
// ############################################################ // ############################################################
name->setText(n); name->setText(n);
@ -1027,14 +1027,14 @@ KAboutContributor::setName(const TQString& n)
} }
QString QString
KAboutContributor::getName() TDEAboutContributor::getName()
{ {
// ########################################################### // ###########################################################
return name->text(); return name->text();
// ########################################################### // ###########################################################
} }
void void
KAboutContributor::setURL(const TQString& u) TDEAboutContributor::setURL(const TQString& u)
{ {
// ########################################################### // ###########################################################
url->setText(u); url->setText(u);
@ -1042,7 +1042,7 @@ KAboutContributor::setURL(const TQString& u)
} }
QString QString
KAboutContributor::getURL() TDEAboutContributor::getURL()
{ {
// ########################################################### // ###########################################################
return url->text(); return url->text();
@ -1050,7 +1050,7 @@ KAboutContributor::getURL()
} }
void void
KAboutContributor::setEmail(const TQString& e) TDEAboutContributor::setEmail(const TQString& e)
{ {
// ########################################################### // ###########################################################
email->setText(e); email->setText(e);
@ -1058,7 +1058,7 @@ KAboutContributor::setEmail(const TQString& e)
} }
QString QString
KAboutContributor::getEmail() TDEAboutContributor::getEmail()
{ {
// ########################################################### // ###########################################################
return email->text(); return email->text();
@ -1066,25 +1066,25 @@ KAboutContributor::getEmail()
} }
void void
KAboutContributor::emailClickedSlot(const TQString& e) TDEAboutContributor::emailClickedSlot(const TQString& e)
{ {
// ########################################################### // ###########################################################
kdDebug() << "KAboutContributor::emailClickedSlot: called." << endl; kdDebug() << "TDEAboutContributor::emailClickedSlot: called." << endl;
emit(sendEmail(name->text(), e)); emit(sendEmail(name->text(), e));
// ########################################################### // ###########################################################
} }
void void
KAboutContributor::urlClickedSlot(const TQString& u) TDEAboutContributor::urlClickedSlot(const TQString& u)
{ {
// ########################################################### // ###########################################################
kdDebug() << "KAboutContributor::urlClickedSlot: called." << endl; kdDebug() << "TDEAboutContributor::urlClickedSlot: called." << endl;
emit(openURL(u)); emit(openURL(u));
// ########################################################### // ###########################################################
} }
void void
KAboutContributor::setWork(const TQString& w) TDEAboutContributor::setWork(const TQString& w)
{ {
// ########################################################### // ###########################################################
work=w; work=w;
@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w)
#if 0 #if 0
QSize QSize
KAboutContributor::sizeHint() TDEAboutContributor::sizeHint()
{ {
// ############################################################################ // ############################################################################
const int FrameWidth=frameWidth(); const int FrameWidth=frameWidth();
@ -1128,13 +1128,13 @@ KAboutContributor::sizeHint()
// ############################################################################ // ############################################################################
} }
TQSize KAboutContributor::minimumSizeHint(void) TQSize TDEAboutContributor::minimumSizeHint(void)
{ {
return( sizeHint() ); return( sizeHint() );
} }
void KAboutContributor::show( void ) void TDEAboutContributor::show( void )
{ {
TQFrame::show(); TQFrame::show();
setMinimumSize( sizeHint() ); setMinimumSize( sizeHint() );
@ -1143,7 +1143,7 @@ void KAboutContributor::show( void )
void void
KAboutContributor::resizeEvent(TQResizeEvent*) TDEAboutContributor::resizeEvent(TQResizeEvent*)
{ // the widgets are simply aligned from top to bottom, since the parent is { // the widgets are simply aligned from top to bottom, since the parent is
// expected to respect the size hint // expected to respect the size hint
// ############################################################################ // ############################################################################
@ -1166,7 +1166,7 @@ KAboutContributor::resizeEvent(TQResizeEvent*)
void void
KAboutContributor::paintEvent(TQPaintEvent* e) TDEAboutContributor::paintEvent(TQPaintEvent* e)
{ // the widgets are simply aligned from top to bottom, since the parent is { // the widgets are simply aligned from top to bottom, since the parent is
// expected to respect the size hint (the widget is only used locally by now) // expected to respect the size hint (the widget is only used locally by now)
// ############################################################################ // ############################################################################
@ -1186,7 +1186,7 @@ KAboutContributor::paintEvent(TQPaintEvent* e)
#if 0 #if 0
TQSize KAboutContributor::sizeHint( void ) TQSize TDEAboutContributor::sizeHint( void )
{ {
int s = KDialog::spacingHint(); int s = KDialog::spacingHint();
int h = fontMetrics().lineSpacing()*3 + 2*s; int h = fontMetrics().lineSpacing()*3 + 2*s;
@ -1239,7 +1239,7 @@ TQSize KAboutContributor::sizeHint( void )
// The widgets are simply aligned from top to bottom, since the parent is // The widgets are simply aligned from top to bottom, since the parent is
// expected to respect the size hint // expected to respect the size hint
// //
void KAboutContributor::resizeEvent(TQResizeEvent*) void TDEAboutContributor::resizeEvent(TQResizeEvent*)
{ {
int x = frameWidth(); int x = frameWidth();
int s = KDialog::spacingHint(); int s = KDialog::spacingHint();
@ -1273,7 +1273,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*)
void KAboutContributor::paintEvent( TQPaintEvent *e ) void TDEAboutContributor::paintEvent( TQPaintEvent *e )
{ {
TQFrame::paintEvent(e); TQFrame::paintEvent(e);
if(work.isEmpty()) return; if(work.isEmpty()) return;
@ -1305,13 +1305,13 @@ void KAboutContributor::paintEvent( TQPaintEvent *e )
KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name) TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name)
: TQWidget(_parent, _name), : TQWidget(_parent, _name),
version(new TQLabel(this)), version(new TQLabel(this)),
cont(new TQLabel(this)), cont(new TQLabel(this)),
logo(new TQLabel(this)), logo(new TQLabel(this)),
author(new KAboutContributor(this)), author(new TDEAboutContributor(this)),
maintainer(new KAboutContributor(this)), maintainer(new TDEAboutContributor(this)),
showMaintainer(false), showMaintainer(false),
d(0) d(0)
{ {
@ -1319,7 +1319,7 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
if( !version || !cont || !logo || !author || !maintainer ) if( !version || !cont || !logo || !author || !maintainer )
{ {
// this will nearly never happen (out of memory in about box?) // this will nearly never happen (out of memory in about box?)
kdDebug() << "KAboutWidget::KAboutWidget: Out of memory." << endl; kdDebug() << "TDEAboutWidget::TDEAboutWidget: Out of memory." << endl;
tqApp->quit(); tqApp->quit();
} }
// ----- // -----
@ -1341,7 +1341,7 @@ KAboutWidget::KAboutWidget(TQWidget *_parent, const char *_name)
void void
KAboutWidget::adjust() TDEAboutWidget::adjust()
{ {
// ################################################################# // #################################################################
int cx, cy, tempx; int cx, cy, tempx;
@ -1371,8 +1371,8 @@ KAboutWidget::adjust()
{ {
cx=QMAX(cx, cont->sizeHint().width()); cx=QMAX(cx, cont->sizeHint().width());
cy+=cont->sizeHint().height()+Grid; cy+=cont->sizeHint().height()+Grid;
TQPtrListIterator<KAboutContributor> _pos(contributors); TQPtrListIterator<TDEAboutContributor> _pos(contributors);
KAboutContributor* currEntry; TDEAboutContributor* currEntry;
while ( (currEntry = _pos.current()) ) while ( (currEntry = _pos.current()) )
{ {
++_pos; ++_pos;
@ -1385,25 +1385,25 @@ KAboutWidget::adjust()
} }
void void
KAboutWidget::setLogo(const TQPixmap& i) TDEAboutWidget::setLogo(const TQPixmap& i)
{ {
// ############################################################################ // ############################################################################
logo->setPixmap(i); logo->setPixmap(i);
// ############################################################################ // ############################################################################
} }
void KAboutWidget::sendEmailSlot(const TQString &_name, const TQString &_email) void TDEAboutWidget::sendEmailSlot(const TQString &_name, const TQString &_email)
{ {
emit(sendEmail(_name, _email)); emit(sendEmail(_name, _email));
} }
void KAboutWidget::openURLSlot(const TQString& _url) void TDEAboutWidget::openURLSlot(const TQString& _url)
{ {
emit(openURL(_url)); emit(openURL(_url));
} }
void void
KAboutWidget::setAuthor(const TQString &_name, const TQString &_email, TDEAboutWidget::setAuthor(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_w) const TQString &_url, const TQString &_w)
{ {
// ############################################################################ // ############################################################################
@ -1415,7 +1415,7 @@ KAboutWidget::setAuthor(const TQString &_name, const TQString &_email,
} }
void void
KAboutWidget::setMaintainer(const TQString &_name, const TQString &_email, TDEAboutWidget::setMaintainer(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_w) const TQString &_url, const TQString &_w)
{ {
// ############################################################################ // ############################################################################
@ -1428,11 +1428,11 @@ KAboutWidget::setMaintainer(const TQString &_name, const TQString &_email,
} }
void void
KAboutWidget::addContributor(const TQString &_name, const TQString &_email, TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_w) const TQString &_url, const TQString &_w)
{ {
// ############################################################################ // ############################################################################
KAboutContributor* const c=new KAboutContributor(this); TDEAboutContributor* const c=new TDEAboutContributor(this);
// ----- // -----
c->setName(_name); c->setName(_name);
c->setEmail(_email); c->setEmail(_email);
@ -1446,7 +1446,7 @@ KAboutWidget::addContributor(const TQString &_name, const TQString &_email,
} }
void void
KAboutWidget::setVersion(const TQString &_name) TDEAboutWidget::setVersion(const TQString &_name)
{ {
// ############################################################################ // ############################################################################
version->setText(_name); version->setText(_name);
@ -1454,7 +1454,7 @@ KAboutWidget::setVersion(const TQString &_name)
} }
void void
KAboutWidget::resizeEvent(TQResizeEvent*) TDEAboutWidget::resizeEvent(TQResizeEvent*)
{ {
// ############################################################################ // ############################################################################
int _x=0, _y, cx, tempx, tempy; int _x=0, _y, cx, tempx, tempy;
@ -1484,8 +1484,8 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
} else { } else {
cont->hide(); cont->hide();
} }
TQPtrListIterator<KAboutContributor> _pos(contributors); TQPtrListIterator<TDEAboutContributor> _pos(contributors);
KAboutContributor* currEntry; TDEAboutContributor* currEntry;
while( (currEntry = _pos.current()) ) while( (currEntry = _pos.current()) )
{ {
++_pos; ++_pos;
@ -1503,15 +1503,15 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
// ############################################################################ // ############################################################################
} }
KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal) TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal)
: KDialogBase(_parent, _name, modal, TQString::null, Ok, Ok ), : KDialogBase(_parent, _name, modal, TQString::null, Ok, Ok ),
about(new KAboutWidget(this)), mContainerBase(0), d(0) about(new TDEAboutWidget(this)), mContainerBase(0), d(0)
{ {
// ################################################################# // #################################################################
if(!about) if(!about)
{ {
// this will nearly never happen (out of memory in about box?) // this will nearly never happen (out of memory in about box?)
kdDebug() << "KAboutDialog::KAboutDialog: Out of memory." << endl; kdDebug() << "TDEAboutDialog::TDEAboutDialog: Out of memory." << endl;
tqApp->quit(); tqApp->quit();
} }
setMainWidget(about); setMainWidget(about);
@ -1523,7 +1523,7 @@ KAboutDialog::KAboutDialog(TQWidget *_parent, const char *_name, bool modal)
} }
KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption, TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption,
int buttonMask, ButtonCode defaultButton, int buttonMask, ButtonCode defaultButton,
TQWidget *_parent, const char *_name, bool modal, TQWidget *_parent, const char *_name, bool modal,
bool separator, const TQString &user1, bool separator, const TQString &user1,
@ -1534,7 +1534,7 @@ KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
{ {
setPlainCaption( i18n("About %1").arg(_caption) ); setPlainCaption( i18n("About %1").arg(_caption) );
mContainerBase = new KAboutContainerBase( layoutType, this ); mContainerBase = new TDEAboutContainerBase( layoutType, this );
setMainWidget(mContainerBase); setMainWidget(mContainerBase);
connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)), connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)),
@ -1546,7 +1546,7 @@ KAboutDialog::KAboutDialog( int layoutType, const TQString &_caption,
} }
void KAboutDialog::show( void ) void TDEAboutDialog::show( void )
{ {
adjust(); adjust();
if( mContainerBase ) { mContainerBase->show(); } if( mContainerBase ) { mContainerBase->show(); }
@ -1554,7 +1554,7 @@ void KAboutDialog::show( void )
} }
void KAboutDialog::show( TQWidget * /*centerParent*/ ) void TDEAboutDialog::show( TQWidget * /*centerParent*/ )
{ {
adjust(); adjust();
if( mContainerBase ) { mContainerBase->show(); } if( mContainerBase ) { mContainerBase->show(); }
@ -1562,7 +1562,7 @@ void KAboutDialog::show( TQWidget * /*centerParent*/ )
} }
void KAboutDialog::adjust() void TDEAboutDialog::adjust()
{ {
if( !about ) { return; } if( !about ) { return; }
about->adjust(); about->adjust();
@ -1571,14 +1571,14 @@ void KAboutDialog::adjust()
} }
void KAboutDialog::setLogo(const TQPixmap& i) void TDEAboutDialog::setLogo(const TQPixmap& i)
{ {
if( !about ) { return; } if( !about ) { return; }
about->setLogo(i); about->setLogo(i);
} }
void KAboutDialog::setMaintainer(const TQString &_name, const TQString &_email, void TDEAboutDialog::setMaintainer(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_w) const TQString &_url, const TQString &_w)
{ {
// ################################################################# // #################################################################
@ -1587,7 +1587,7 @@ void KAboutDialog::setMaintainer(const TQString &_name, const TQString &_email,
// ################################################################# // #################################################################
} }
void KAboutDialog::setAuthor(const TQString &_name, const TQString &_email, void TDEAboutDialog::setAuthor(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_work) const TQString &_url, const TQString &_work)
{ {
// ################################################################# // #################################################################
@ -1596,7 +1596,7 @@ void KAboutDialog::setAuthor(const TQString &_name, const TQString &_email,
// ################################################################# // #################################################################
} }
void KAboutDialog::addContributor(const TQString &_name, const TQString &_email, void TDEAboutDialog::addContributor(const TQString &_name, const TQString &_email,
const TQString &_url, const TQString &_w) const TQString &_url, const TQString &_w)
{ {
// ################################################################# // #################################################################
@ -1605,7 +1605,7 @@ void KAboutDialog::addContributor(const TQString &_name, const TQString &_email,
// ################################################################# // #################################################################
} }
void KAboutDialog::setVersion(const TQString &_name) void TDEAboutDialog::setVersion(const TQString &_name)
{ {
// ################################################################# // #################################################################
if( !about ) { return; } if( !about ) { return; }
@ -1613,40 +1613,40 @@ void KAboutDialog::setVersion(const TQString &_name)
// ################################################################# // #################################################################
} }
void KAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email) void TDEAboutDialog::sendEmailSlot(const TQString& /*name*/, const TQString& email)
{ {
if ( kapp ) if ( kapp )
kapp->invokeMailer( email, TQString::null ); kapp->invokeMailer( email, TQString::null );
/* /*
kdDebug() << "KAboutDialog::sendEmailSlot: request to send an email to " kdDebug() << "TDEAboutDialog::sendEmailSlot: request to send an email to "
<< name << ", " << email << endl; << name << ", " << email << endl;
emit(sendEmail(name, email)); emit(sendEmail(name, email));
*/ */
} }
void KAboutDialog::openURLSlot(const TQString& url) void TDEAboutDialog::openURLSlot(const TQString& url)
{ {
if ( kapp ) if ( kapp )
kapp->invokeBrowser( url ); kapp->invokeBrowser( url );
//kdDebug() << "KAboutDialog::openURLSlot: request to open URL " << url << endl; //kdDebug() << "TDEAboutDialog::openURLSlot: request to open URL " << url << endl;
//emit(openURL(url)); //emit(openURL(url));
} }
void KAboutDialog::mouseTrackSlot( int /*mode*/, const TQMouseEvent * /*e*/ ) void TDEAboutDialog::mouseTrackSlot( int /*mode*/, const TQMouseEvent * /*e*/ )
{ {
// By default we do nothing. This method must be reimplemented. // By default we do nothing. This method must be reimplemented.
} }
TQFrame *KAboutDialog::addTextPage( const TQString &title, const TQString &text, TQFrame *TDEAboutDialog::addTextPage( const TQString &title, const TQString &text,
bool richText, int numLines ) bool richText, int numLines )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
return mContainerBase->addTextPage( title, text, richText, numLines ); return mContainerBase->addTextPage( title, text, richText, numLines );
} }
TQFrame *KAboutDialog::addLicensePage( const TQString &title, const TQString &text, TQFrame *TDEAboutDialog::addLicensePage( const TQString &title, const TQString &text,
int numLines ) int numLines )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
@ -1654,7 +1654,7 @@ TQFrame *KAboutDialog::addLicensePage( const TQString &title, const TQString &te
} }
KAboutContainer *KAboutDialog::addContainerPage( const TQString &title, TDEAboutContainer *TDEAboutDialog::addContainerPage( const TQString &title,
int childAlignment, int innerAlignment ) int childAlignment, int innerAlignment )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
@ -1663,7 +1663,7 @@ KAboutContainer *KAboutDialog::addContainerPage( const TQString &title,
} }
KAboutContainer *KAboutDialog::addScrolledContainerPage( const TQString &title, TDEAboutContainer *TDEAboutDialog::addScrolledContainerPage( const TQString &title,
int childAlignment, int innerAlignment ) int childAlignment, int innerAlignment )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
@ -1673,14 +1673,14 @@ KAboutContainer *KAboutDialog::addScrolledContainerPage( const TQString &title,
TQFrame *KAboutDialog::addPage( const TQString &title ) TQFrame *TDEAboutDialog::addPage( const TQString &title )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
return mContainerBase->addEmptyPage( title ); return mContainerBase->addEmptyPage( title );
} }
KAboutContainer *KAboutDialog::addContainer( int childAlignment, TDEAboutContainer *TDEAboutDialog::addContainer( int childAlignment,
int innerAlignment ) int innerAlignment )
{ {
if( !mContainerBase ) { return 0; } if( !mContainerBase ) { return 0; }
@ -1688,53 +1688,53 @@ KAboutContainer *KAboutDialog::addContainer( int childAlignment,
} }
void KAboutDialog::setTitle( const TQString &title ) void TDEAboutDialog::setTitle( const TQString &title )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setTitle( title ); mContainerBase->setTitle( title );
} }
void KAboutDialog::setImage( const TQString &fileName ) void TDEAboutDialog::setImage( const TQString &fileName )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setImage( fileName ); mContainerBase->setImage( fileName );
} }
// KDE4: remove // KDE4: remove
void KAboutDialog::setIcon( const TQString &fileName ) void TDEAboutDialog::setIcon( const TQString &fileName )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setProgramLogo( fileName ); mContainerBase->setProgramLogo( fileName );
} }
void KAboutDialog::setProgramLogo( const TQString &fileName ) void TDEAboutDialog::setProgramLogo( const TQString &fileName )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setProgramLogo( fileName ); mContainerBase->setProgramLogo( fileName );
} }
void KAboutDialog::setProgramLogo( const TQPixmap &pixmap ) void TDEAboutDialog::setProgramLogo( const TQPixmap &pixmap )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setProgramLogo( pixmap ); mContainerBase->setProgramLogo( pixmap );
} }
void KAboutDialog::setImageBackgroundColor( const TQColor &color ) void TDEAboutDialog::setImageBackgroundColor( const TQColor &color )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setImageBackgroundColor( color ); mContainerBase->setImageBackgroundColor( color );
} }
void KAboutDialog::setImageFrame( bool state ) void TDEAboutDialog::setImageFrame( bool state )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
mContainerBase->setImageFrame( state ); mContainerBase->setImageFrame( state );
} }
void KAboutDialog::setProduct( const TQString &appName, const TQString &version, void TDEAboutDialog::setProduct( const TQString &appName, const TQString &version,
const TQString &author, const TQString &year ) const TQString &author, const TQString &year )
{ {
if( !mContainerBase ) { return; } if( !mContainerBase ) { return; }
@ -1743,16 +1743,16 @@ void KAboutDialog::setProduct( const TQString &appName, const TQString &version,
void KAboutDialog::imageURL( TQWidget *_parent, const TQString &_caption, void TDEAboutDialog::imageURL( TQWidget *_parent, const TQString &_caption,
const TQString &_path, const TQColor &_imageColor, const TQString &_path, const TQColor &_imageColor,
const TQString &_url ) const TQString &_url )
{ {
KAboutDialog a( AbtImageOnly, TQString::null, Close, Close, _parent, "image", true ); TDEAboutDialog a( AbtImageOnly, TQString::null, Close, Close, _parent, "image", true );
a.setPlainCaption( _caption ); a.setPlainCaption( _caption );
a.setImage( _path ); a.setImage( _path );
a.setImageBackgroundColor( _imageColor ); a.setImageBackgroundColor( _imageColor );
KAboutContainer* const c = a.addContainer( AlignCenter, AlignCenter ); TDEAboutContainer* const c = a.addContainer( AlignCenter, AlignCenter );
if( c ) if( c )
{ {
c->addPerson( TQString::null, TQString::null, _url, TQString::null ); c->addPerson( TQString::null, TQString::null, _url, TQString::null );
@ -1792,6 +1792,6 @@ void KImageTrackLabel::mouseMoveEvent ( TQMouseEvent *e )
emit mouseTrack( MouseDoubleClick, e ); emit mouseTrack( MouseDoubleClick, e );
} }
void KAboutDialog::virtual_hook( int id, void* data ) void TDEAboutDialog::virtual_hook( int id, void* data )
{ KDialogBase::virtual_hook( id, data ); } { KDialogBase::virtual_hook( id, data ); }

@ -38,21 +38,21 @@ class TQLabel;
class TQVBoxLayout; class TQVBoxLayout;
class TQTabWidget; class TQTabWidget;
class KURLLabel; class KURLLabel;
class KAboutContainer; class TDEAboutContainer;
class KAboutContainerBase; class TDEAboutContainerBase;
class KAboutWidgetPrivate; class TDEAboutWidgetPrivate;
class KAboutContainerPrivate; class TDEAboutContainerPrivate;
/** /**
* KAboutContainer can be used to make a application specific AboutDialog. * TDEAboutContainer can be used to make a application specific AboutDialog.
*/ */
class TDEUI_EXPORT KAboutContainer : public TQFrame class TDEUI_EXPORT TDEAboutContainer : public TQFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
KAboutContainer( TQWidget *parent=0, const char *name=0, TDEAboutContainer( TQWidget *parent=0, const char *name=0,
int margin=0, int spacing=0, int margin=0, int spacing=0,
int childAlignment = AlignCenter, int childAlignment = AlignCenter,
int innerAlignment = AlignCenter ); int innerAlignment = AlignCenter );
@ -80,21 +80,21 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame
private: private:
TQVBoxLayout *mVbox; TQVBoxLayout *mVbox;
int mAlignment; int mAlignment;
KAboutContainerPrivate* const d; TDEAboutContainerPrivate* const d;
}; };
class KAboutContributorPrivate; class TDEAboutContributorPrivate;
/** /**
* Used internally by KAboutWidget * Used internally by TDEAboutWidget
* @internal * @internal
*/ */
class TDEUI_EXPORT KAboutContributor : public TQFrame class TDEUI_EXPORT TDEAboutContributor : public TQFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
KAboutContributor( TQWidget *parent=0, const char *name=0, TDEAboutContributor( TQWidget *parent=0, const char *name=0,
const TQString &username=TQString::null, const TQString &username=TQString::null,
const TQString &email=TQString::null, const TQString &email=TQString::null,
const TQString &url=TQString::null, const TQString &url=TQString::null,
@ -137,17 +137,17 @@ class TDEUI_EXPORT KAboutContributor : public TQFrame
bool mShowHeader; bool mShowHeader;
bool mShowBold; bool mShowBold;
KAboutContributorPrivate* const d; TDEAboutContributorPrivate* const d;
virtual void setName(const char *_name) { TQFrame::setName(_name); } virtual void setName(const char *_name) { TQFrame::setName(_name); }
}; };
/** /**
* KAboutWidget is the main widget for KAboutDialog. * TDEAboutWidget is the main widget for TDEAboutDialog.
* *
* It has a minimum size set. * It has a minimum size set.
*/ */
class TDEUI_EXPORT KAboutWidget : public TQWidget class TDEUI_EXPORT TDEAboutWidget : public TQWidget
{ {
Q_OBJECT Q_OBJECT
@ -156,7 +156,7 @@ public:
/** /**
* The Qt constructor. * The Qt constructor.
*/ */
KAboutWidget(TQWidget* parent=0, const char* name=0 ); TDEAboutWidget(TQWidget* parent=0, const char* name=0 );
/** /**
* Adjust the minimum size (after setting the properties of the image and * Adjust the minimum size (after setting the properties of the image and
@ -229,11 +229,11 @@ protected:
/** /**
* The application developer. * The application developer.
*/ */
KAboutContributor *author; TDEAboutContributor *author;
/** /**
* The application maintainer. * The application maintainer.
*/ */
KAboutContributor *maintainer; TDEAboutContributor *maintainer;
/** /**
* Show the maintainer? * Show the maintainer?
*/ */
@ -241,21 +241,21 @@ protected:
/** /**
* A set of people who contributed to the application. * A set of people who contributed to the application.
*/ */
TQPtrList<KAboutContributor> contributors; TQPtrList<TDEAboutContributor> contributors;
// ######################################################################### // #########################################################################
// //
private: private:
KAboutWidgetPrivate* const d; TDEAboutWidgetPrivate* const d;
}; };
class KAboutDialogPrivate; class TDEAboutDialogPrivate;
/** /**
* A KDialogBase with predefined main widget. * A KDialogBase with predefined main widget.
* *
* As a KDialogBase it uses your application wide settings * As a KDialogBase it uses your application wide settings
* for KDialogBase * for KDialogBase
* objects (base frame tiles, main frame tiles etc). * objects (base frame tiles, main frame tiles etc).
* To use it, simply create a KAboutDialog object, set all (or some) of its * To use it, simply create a TDEAboutDialog object, set all (or some) of its
* properties and show it. Do not derive it to create your own about dialog * properties and show it. Do not derive it to create your own about dialog
* until you need some cool features that are unsupported and you have * until you need some cool features that are unsupported and you have
* contacted me to add them. * contacted me to add them.
@ -280,7 +280,7 @@ class KAboutDialogPrivate;
* @author Mirko Boehm (mirko@kde.org) and Espen Sand (espensa@online.no) * @author Mirko Boehm (mirko@kde.org) and Espen Sand (espensa@online.no)
* @see KDialogBase * @see KDialogBase
*/ */
class TDEUI_EXPORT KAboutDialog : public KDialogBase class TDEUI_EXPORT TDEAboutDialog : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
@ -311,7 +311,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* addContributor(), or setVersion(). * addContributor(), or setVersion().
* The dialog will be laid out automatically. * The dialog will be laid out automatically.
*/ */
KAboutDialog( TQWidget *parent=0, const char *name=0, bool modal=true ); TDEAboutDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
/** /**
* The extended constructor. (Constructor II). * The extended constructor. (Constructor II).
@ -338,7 +338,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* @param user3 User button3 text. * @param user3 User button3 text.
* *
*/ */
KAboutDialog( int dialogLayout, const TQString &caption, int buttonMask, TDEAboutDialog( int dialogLayout, const TQString &caption, int buttonMask,
ButtonCode defaultButton, TQWidget *parent=0, ButtonCode defaultButton, TQWidget *parent=0,
const char *name=0, bool modal=false, bool separator = false, const char *name=0, bool modal=false, bool separator = false,
const TQString &user1 = TQString::null, const TQString &user1 = TQString::null,
@ -394,7 +394,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* (Constructor II only) * (Constructor II only)
* Define the program logo to be shown in the dialog. Use this to override the * Define the program logo to be shown in the dialog. Use this to override the
* default program logo. For example, use this function if the * default program logo. For example, use this function if the
* KAboutDialog is for a panel applet and you want to override the * TDEAboutDialog is for a panel applet and you want to override the
* appletproxy logo with your own pixmap. * appletproxy logo with your own pixmap.
* *
* @param fileName Path to file containing logo data in a format that * @param fileName Path to file containing logo data in a format that
@ -415,7 +415,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* (Constructor II only) * (Constructor II only)
* Define the program logo to be shown in the dialog. Use this to override the * Define the program logo to be shown in the dialog. Use this to override the
* default program logo. For example, use this function if the * default program logo. For example, use this function if the
* KAboutDialog is for a panel applet and you want to override the * TDEAboutDialog is for a panel applet and you want to override the
* appletproxy logo with your own pixmap. * appletproxy logo with your own pixmap.
* *
* @param pixmap The logo pixmap. * @param pixmap The logo pixmap.
@ -497,7 +497,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* respect to each other. * respect to each other.
* @return The new container. * @return The new container.
*/ */
KAboutContainer *addContainerPage( const TQString &title, TDEAboutContainer *addContainerPage( const TQString &title,
int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
/** /**
@ -512,7 +512,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* respect to each other. * respect to each other.
* @return The new container. * @return The new container.
*/ */
KAboutContainer *addScrolledContainerPage( const TQString &title, TDEAboutContainer *addScrolledContainerPage( const TQString &title,
int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
/** /**
@ -525,7 +525,7 @@ class TDEUI_EXPORT KAboutDialog : public KDialogBase
* respect to each other. * respect to each other.
* @return The new container. * @return The new container.
*/ */
KAboutContainer *addContainer( int childAlignment, int innerAlignment ); TDEAboutContainer *addContainer( int childAlignment, int innerAlignment );
/** /**
* (Constructor II only) * (Constructor II only)
@ -596,12 +596,12 @@ protected:
/** /**
* The main widget (Constructor I) * The main widget (Constructor I)
*/ */
KAboutWidget * about; TDEAboutWidget * about;
/** /**
* The main widget (Constructor II) * The main widget (Constructor II)
*/ */
KAboutContainerBase *mContainerBase; TDEAboutContainerBase *mContainerBase;
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
protected slots: protected slots:
@ -627,7 +627,7 @@ protected slots:
protected: protected:
virtual void virtual_hook( int id, void* data ); virtual void virtual_hook( int id, void* data );
private: private:
KAboutDialogPrivate* const d; TDEAboutDialogPrivate* const d;
}; };
#endif // defined KABOUTDIALOG_H #endif // defined KABOUTDIALOG_H

@ -29,7 +29,7 @@ class TQTabWidget;
class TQVBoxLayout; class TQVBoxLayout;
/** /**
* Used internally by KAboutContainerBase * Used internally by TDEAboutContainerBase
* @internal * @internal
*/ */
class KImageTrackLabel : public TQLabel class KImageTrackLabel : public TQLabel
@ -58,15 +58,15 @@ class KImageTrackLabel : public TQLabel
virtual void mouseMoveEvent ( TQMouseEvent *e ); virtual void mouseMoveEvent ( TQMouseEvent *e );
}; };
class KAboutContainer; class TDEAboutContainer;
class KAboutContainerBasePrivate; class TDEAboutContainerBasePrivate;
/** /**
* Used internally by KAboutDialog * Used internally by TDEAboutDialog
* @internal * @internal
*/ */
class KAboutContainerBase : public TQWidget class TDEAboutContainerBase : public TQWidget
{ {
Q_OBJECT Q_OBJECT
@ -86,7 +86,7 @@ class KAboutContainerBase : public TQWidget
}; };
public: public:
KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); TDEAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 );
virtual void show( void ); virtual void show( void );
virtual TQSize sizeHint( void ) const; virtual TQSize sizeHint( void ) const;
@ -103,14 +103,14 @@ class KAboutContainerBase : public TQWidget
bool richText=false, int numLines=10 ); bool richText=false, int numLines=10 );
TQFrame *addLicensePage( const TQString &title, const TQString &text, TQFrame *addLicensePage( const TQString &title, const TQString &text,
int numLines=10 ); int numLines=10 );
KAboutContainer *addContainerPage( const TQString &title, TDEAboutContainer *addContainerPage( const TQString &title,
int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
KAboutContainer *addScrolledContainerPage( const TQString &title, TDEAboutContainer *addScrolledContainerPage( const TQString &title,
int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); int childAlignment = AlignCenter, int innerAlignment = AlignCenter );
TQFrame *addEmptyPage( const TQString &title ); TQFrame *addEmptyPage( const TQString &title );
KAboutContainer *addContainer( int childAlignment, int innerAlignment ); TDEAboutContainer *addContainer( int childAlignment, int innerAlignment );
public slots: public slots:
virtual void slotMouseTrack( int mode, const TQMouseEvent *e ); virtual void slotMouseTrack( int mode, const TQMouseEvent *e );
@ -136,7 +136,7 @@ class KAboutContainerBase : public TQWidget
TQTabWidget *mPageTab; TQTabWidget *mPageTab;
TQFrame *mPlainSpace; TQFrame *mPlainSpace;
KAboutContainerBasePrivate* const d; TDEAboutContainerBasePrivate* const d;
}; };

@ -26,8 +26,8 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal ) TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal )
:KAboutDialog( KAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"), :TDEAboutDialog( TDEAboutDialog::AbtKDEStandard, TQString::fromLatin1("TDE"),
KDialogBase::Help|KDialogBase::Close, KDialogBase::Close, KDialogBase::Help|KDialogBase::Close, KDialogBase::Close,
parent, name, modal ) parent, name, modal )
{ {

@ -37,7 +37,7 @@
* @author Espen Sand (espen@kde.org) * @author Espen Sand (espen@kde.org)
*/ */
class TDEUI_EXPORT KAboutKDE : public KAboutDialog class TDEUI_EXPORT TDEAboutKDE : public TDEAboutDialog
{ {
public: public:
/** /**
@ -53,7 +53,7 @@ class TDEUI_EXPORT KAboutKDE : public KAboutDialog
* made visible using TQWidget::show(). Otherwise it will be * made visible using TQWidget::show(). Otherwise it will be
* modal and must be made visible using TQWidget::exec() * modal and must be made visible using TQWidget::exec()
*/ */
KAboutKDE( TQWidget *parent=0, const char *name=0, bool modal=true ); TDEAboutKDE( TQWidget *parent=0, const char *name=0, bool modal=true );
}; };

@ -196,7 +196,7 @@ void KHelpMenu::aboutApplication()
{ {
if( !mAboutApp ) if( !mAboutApp )
{ {
mAboutApp = new KAboutApplication( d->mAboutData, mParent, "about", false ); mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false );
connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
} }
mAboutApp->show(); mAboutApp->show();
@ -238,7 +238,7 @@ void KHelpMenu::aboutKDE()
{ {
if( !mAboutKDE ) if( !mAboutKDE )
{ {
mAboutKDE = new KAboutKDE( mParent, "aboutkde", false ); mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false );
connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
} }
mAboutKDE->show(); mAboutKDE->show();

@ -32,7 +32,7 @@ class TDEPopupMenu;
class TQWidget; class TQWidget;
class TDEAboutData; class TDEAboutData;
class KAboutKDE; class TDEAboutKDE;
class KBugReport; class KBugReport;
class KDialogBase; class KDialogBase;
class KHelpMenuPrivate; class KHelpMenuPrivate;
@ -263,7 +263,7 @@ class TDEUI_EXPORT KHelpMenu : public TQObject
private: private:
TDEPopupMenu *mMenu; TDEPopupMenu *mMenu;
KDialogBase *mAboutApp; KDialogBase *mAboutApp;
KAboutKDE *mAboutKDE; TDEAboutKDE *mAboutKDE;
KBugReport *mBugReport; KBugReport *mBugReport;
TQString mAboutAppText; TQString mAboutAppText;

@ -16,11 +16,11 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
(void)new TDEApplication(argc, argv, "KAboutDialogTest"); (void)new TDEApplication(argc, argv, "TDEAboutDialogTest");
TQImage logo; TQImage logo;
TQImage bg; TQImage bg;
TQPixmap pix; TQPixmap pix;
KAboutDialog about; TDEAboutDialog about;
// ----- // -----
// kimgioRegister(); // kimgioRegister();
if(logo.load("RayTracedGear.png")) if(logo.load("RayTracedGear.png"))
@ -45,8 +45,8 @@ int main(int argc, char** argv)
// ("Cl&ose", "Close this dialog.", // ("Cl&ose", "Close this dialog.",
// "<b>Close</b> the dialog<br>" // "<b>Close</b> the dialog<br>"
// "<i>(there are no settings to save).</i>"); // "<i>(there are no settings to save).</i>");
about.setCaption("KAboutDialog example"); about.setCaption("TDEAboutDialog example");
about.setVersion("KAboutDialog, Draft Study"); about.setVersion("TDEAboutDialog, Draft Study");
about.setHelp("kdehelp/intro.html", "intro"); about.setHelp("kdehelp/intro.html", "intro");
// ----- set the application author: // ----- set the application author:
about.setAuthor about.setAuthor

Loading…
Cancel
Save