diff options
Diffstat (limited to 'ksplashml/themeengine')
20 files changed, 55 insertions, 39 deletions
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 0e1242120..1c311ed8b 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi if( mIconsFlashing ) { mFlashTimer = new TQTimer( this ); - connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) ); + connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) ); mFlashPixmap1 = new TQPixmap(); mFlashPixmap2 = new TQPixmap(); @@ -120,19 +120,19 @@ void ThemeDefault::_initUi() if (mActivePixmap->isNull()) { mActivePixmap->resize(200,100); - mActivePixmap->fill(Qt::blue); + mActivePixmap->fill(TQt::blue); } if (mInactivePixmap->isNull()) { mInactivePixmap->resize(200,100); - mInactivePixmap->fill(Qt::black); + mInactivePixmap->fill(TQt::black); } TQPixmap tlimage( _findPicture(TQString("splash_top.png")) ); if (tlimage.isNull()) { tlimage.resize(200,100); - tlimage.fill(Qt::blue); + tlimage.fill(TQt::blue); } TQLabel *top_label = new TQLabel( vbox ); top_label->setPixmap( tlimage ); @@ -147,7 +147,7 @@ void ThemeDefault::_initUi() if (blimage.isNull()) { blimage.resize(200,100); - blimage.fill(Qt::black); + blimage.fill(TQt::black); } TQLabel *bottom_label = new TQLabel( vbox ); bottom_label->setPaletteBackgroundPixmap( blimage ); @@ -212,7 +212,7 @@ void ThemeDefault::_readSettings() cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) ); mIconsFlashing = cfg->readBoolEntry( "Icons Flashing", true ); - TQColor df(Qt::white); + TQColor df(TQt::white); mLabelForeground = cfg->readColorEntry( "Label Foreground", &df ); TQValueList<int> io_list=cfg->readIntListEntry("Icon Offsets"); if (io_list.size() == MAX_ICONS) diff --git a/ksplashml/themeengine/default/themelegacy.h b/ksplashml/themeengine/default/themelegacy.h index 1f56d05b0..35aa414eb 100644 --- a/ksplashml/themeengine/default/themelegacy.h +++ b/ksplashml/themeengine/default/themelegacy.h @@ -29,7 +29,7 @@ class TQCheckBox; class DefaultConfig: public ThemeEngineConfig { - Q_OBJECT + TQ_OBJECT public: DefaultConfig( TQWidget *, TDEConfig * ); void save(); @@ -41,9 +41,9 @@ protected: * @short Traditional Trinity splash screen. */ class ObjKsTheme; -class KDE_EXPORT ThemeDefault : public ThemeEngine +class TDE_EXPORT ThemeDefault : public ThemeEngine { - Q_OBJECT + TQ_OBJECT public: ThemeDefault( TQWidget *, const char *, const TQStringList& ); virtual ~ThemeDefault(); diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9de990099..609956592 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -118,7 +118,7 @@ bool ObjKsTheme::loadTDEConfig( TDEConfig *cfg, const TQString& activeTheme, boo m_icons.append( cfg->readEntry( "Icon1", "filetypes" ) ); m_icons.append( cfg->readEntry( "Icon2", "application-x-executable" ) ); m_icons.append( cfg->readEntry( "Icon3", "key_bindings" ) ); - m_icons.append( cfg->readEntry( "Icon4", "window_list" ) ); + m_icons.append( cfg->readEntry( "Icon4", "window_duplicate" ) ); m_icons.append( cfg->readEntry( "Icon5", "desktop" ) ); m_icons.append( cfg->readEntry( "Icon6", "style" ) ); m_icons.append( cfg->readEntry( "Icon7", "preferences-system" ) ); diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 8959c5537..7702371f3 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -26,9 +26,9 @@ class TDEConfig; * of KSplash completely, and offers a friendlier way * of installing custom splash screens. */ -class KDE_EXPORT ObjKsTheme : public QObject +class TDE_EXPORT ObjKsTheme : public TQObject { - Q_OBJECT + TQ_OBJECT public: explicit ObjKsTheme( const TQString& ); virtual ~ObjKsTheme(); diff --git a/ksplashml/themeengine/redmond/CMakeLists.txt b/ksplashml/themeengine/redmond/CMakeLists.txt index 52bc35732..7284c40be 100644 --- a/ksplashml/themeengine/redmond/CMakeLists.txt +++ b/ksplashml/themeengine/redmond/CMakeLists.txt @@ -25,7 +25,12 @@ link_directories( ##### other data ################################ -install( FILES Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Redmond ) +tde_create_translated_desktop( + SOURCE Theme.rc + DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Redmond + PO_DIR ksplash-themes +) + tde_create_translated_desktop( SOURCE ksplashredmond.desktop DESTINATION ${SERVICES_INSTALL_DIR} diff --git a/ksplashml/themeengine/redmond/Theme.rc b/ksplashml/themeengine/redmond/Theme.rc index 3c5b0687e..a87deedc5 100644 --- a/ksplashml/themeengine/redmond/Theme.rc +++ b/ksplashml/themeengine/redmond/Theme.rc @@ -1,2 +1,5 @@ [KSplash Theme: Redmond] +Name = Redmond Splash Screen +Description = KSplash theme inspired by the Microsoft Windows startup screen. + Engine=Redmond diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp index 29bfa4b66..5f759686c 100644 --- a/ksplashml/themeengine/redmond/previewredmond.cpp +++ b/ksplashml/themeengine/redmond/previewredmond.cpp @@ -33,10 +33,10 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent ) m_userFont (TQFont( "Arial", 16 )), m_statusFont (TQFont( "Arial", 12, TQFont::Bold )), - m_welcomeColor (Qt::white), - m_welcomeShadowColor (Qt::darkGray), - m_userColor (Qt::darkGray), - m_statusColor (Qt::white), + m_welcomeColor (TQt::white), + m_welcomeShadowColor (TQt::darkGray), + m_userColor (TQt::darkGray), + m_statusColor (TQt::white), m_icon (DesktopIcon("kmenu")), @@ -71,7 +71,7 @@ void PreviewRedmond::_updateCache() TQPainter p; p.begin( &m_cache ); - p.fillRect( rect(), Qt::gray ); + p.fillRect( rect(), TQt::gray ); m_welcomeFont.setItalic( true ); p.setFont( m_welcomeFont ); diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h index 5fc5558c2..fdaf6418e 100644 --- a/ksplashml/themeengine/redmond/previewredmond.h +++ b/ksplashml/themeengine/redmond/previewredmond.h @@ -27,7 +27,7 @@ */ class PreviewRedmond: public TQWidget { - Q_OBJECT + TQ_OBJECT public: PreviewRedmond( TQWidget* ); diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index b0e81ba72..3792d6057 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -52,7 +52,7 @@ CfgRedmond::CfgRedmond( TQWidget *p, TDEConfig *c ) TQFont defaultUsernameFont( "Arial", 16, TQFont::Bold ); TQFont defaultActionFont( "Arial", 12, TQFont::Bold ); TQColor defaultDarkColor( 3, 47, 156 ); - TQColor defaultWhiteColor( Qt::white ); + TQColor defaultWhiteColor( TQt::white ); TQHBox *hbox = new TQHBox( vbox ); hbox->setFrameStyle( TQFrame::WinPanel ); @@ -356,7 +356,7 @@ void ThemeRedmond::_readSettings() mActionFont = cfg->readFontEntry( "Action Font", &defaultActionFont ); TQColor defaultDarkColor( 3, 47, 156 ); - TQColor defaultWhiteColor( Qt::white ); + TQColor defaultWhiteColor( TQt::white ); mWelcomeTextColor = cfg->readColorEntry( "Welcome Text Color", &defaultWhiteColor ); mWelcomeTextShadowColor = cfg->readColorEntry( "Welcome Shadow Color", &defaultDarkColor ); diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index d68e004da..1fbb7c57a 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -23,7 +23,7 @@ class TQCheckBox; class CfgRedmond: public ThemeEngineConfig { - Q_OBJECT + TQ_OBJECT public: CfgRedmond( TQWidget *, TDEConfig * ); @@ -39,7 +39,7 @@ protected: class ObjKsTheme; class ThemeRedmond: public ThemeEngine { - Q_OBJECT + TQ_OBJECT public: ThemeRedmond( TQWidget *, const char *, const TQStringList& ); diff --git a/ksplashml/themeengine/standard/CMakeLists.txt b/ksplashml/themeengine/standard/CMakeLists.txt index 8aca3a57e..a2119c5e3 100644 --- a/ksplashml/themeengine/standard/CMakeLists.txt +++ b/ksplashml/themeengine/standard/CMakeLists.txt @@ -26,7 +26,12 @@ link_directories( ##### other data ################################ -install( FILES Theme.rc DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Standard ) +tde_create_translated_desktop( + SOURCE Theme.rc + DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/Standard + PO_DIR ksplash-themes +) + tde_create_translated_desktop( SOURCE ksplashstandard.desktop DESTINATION ${SERVICES_INSTALL_DIR} diff --git a/ksplashml/themeengine/standard/Theme.rc b/ksplashml/themeengine/standard/Theme.rc index 2ae13af53..d4e4e5bd7 100644 --- a/ksplashml/themeengine/standard/Theme.rc +++ b/ksplashml/themeengine/standard/Theme.rc @@ -1,2 +1,5 @@ [KSplash Theme: Standard] +Name = Standard Splash Screen +Description = Standard TDE KSplash theme. + Engine=Standard diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h index a1fb61ccf..3e9aabc63 100644 --- a/ksplashml/themeengine/standard/themestandard.h +++ b/ksplashml/themeengine/standard/themestandard.h @@ -42,7 +42,7 @@ */ class ThemeStandard: public ThemeEngine { - Q_OBJECT + TQ_OBJECT public: ThemeStandard( TQWidget *, const char*, const TQStringList& ); //inline const ThemeEngineConfig *config( TQWidget *p, TDEConfig *kc ) { return 0L; } diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 856547895..c6c16170c 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -70,7 +70,7 @@ WndIcon::WndIcon( if( mIconJumping ) { TQTimer *t = new TQTimer( this ); - connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump())); + connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(slotJump())); t->start( 50, false ); } } diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h index 5338835a4..62f7d16ab 100644 --- a/ksplashml/themeengine/standard/wndicon.h +++ b/ksplashml/themeengine/standard/wndicon.h @@ -28,7 +28,7 @@ class WndIcon: public TQHBox { - Q_OBJECT + TQ_OBJECT public: enum Position diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h index bc908779d..795181a09 100644 --- a/ksplashml/themeengine/standard/wndstatus.h +++ b/ksplashml/themeengine/standard/wndstatus.h @@ -27,7 +27,7 @@ class KProgress; class WndStatus: public TQHBox { - Q_OBJECT + TQ_OBJECT public: WndStatus( TQPalette, int, // Xinerama screen diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 9a7d3aba5..7458abefd 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -77,7 +77,7 @@ ThemeEngine::~ThemeEngine() bool ThemeEngine::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Show && o->isWidgetType()) - addSplashWindow( TQT_TQWIDGET( o )); + addSplashWindow( static_cast<TQWidget*>( o )); return false; } @@ -101,13 +101,13 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) XChangeWindowAttributes( tqt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs ); } d->mSplashWindows.prepend( w->winId()); - connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* ))); + connect( w, TQ_SIGNAL( destroyed( TQObject* )), TQ_SLOT( splashWindowDestroyed( TQObject* ))); w->raise(); } void ThemeEngine::splashWindowDestroyed( TQObject* obj ) { - d->mSplashWindows.remove( TQT_TQWIDGET( obj )->winId()); + d->mSplashWindows.remove( static_cast<TQWidget*>( obj )->winId()); } bool ThemeEngine::x11Event( XEvent* e ) diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index fa2f15a65..202adc1ce 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -25,9 +25,9 @@ class TQMouseEvent; /** * @short The base for the ThemeEngine's configuration widget. */ -class KDE_EXPORT ThemeEngineConfig: public TQVBox +class TDE_EXPORT ThemeEngineConfig: public TQVBox { - Q_OBJECT + TQ_OBJECT public: ThemeEngineConfig( TQWidget *p, TDEConfig *c ) @@ -48,9 +48,9 @@ protected: * @short Base class for all theme engines. Member functions need to be * overridden by derived classes in order to provide actual functionality. */ -class KDE_EXPORT ThemeEngine: public TQVBox +class TDE_EXPORT ThemeEngine: public TQVBox { - Q_OBJECT + TQ_OBJECT public: ThemeEngine( TQWidget *parent, const char *name, const TQStringList &args ); virtual ~ThemeEngine() = 0; diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 0a2eb6343..e0ba8fb9e 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -97,7 +97,7 @@ void ThemeUnified::_readSettings() cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) ); - TQColor df(Qt::white); + TQColor df(TQt::white); mLabelForeground = cfg->readColorEntry( "Label Foreground", &df ); } diff --git a/ksplashml/themeengine/unified/themeunified.h b/ksplashml/themeengine/unified/themeunified.h index cd6a1d1ca..d002af4b0 100644 --- a/ksplashml/themeengine/unified/themeunified.h +++ b/ksplashml/themeengine/unified/themeunified.h @@ -28,7 +28,7 @@ class TQCheckBox; class UnifiedConfig: public ThemeEngineConfig { - Q_OBJECT + TQ_OBJECT public: UnifiedConfig( TQWidget *, TDEConfig * ); void save(); @@ -40,9 +40,9 @@ protected: * @short Traditional Trinity splash screen. */ class ObjKsTheme; -class KDE_EXPORT ThemeUnified : public ThemeEngine +class TDE_EXPORT ThemeUnified : public ThemeEngine { - Q_OBJECT + TQ_OBJECT public: ThemeUnified( TQWidget *, const char *, const TQStringList& ); virtual ~ThemeUnified(); |