diff options
Diffstat (limited to 'ksplashml/themeengine/standard')
-rw-r--r-- | ksplashml/themeengine/standard/CMakeLists.txt | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | ksplashml/themeengine/standard/Preview.png | bin | 248581 -> 316842 bytes | |||
-rw-r--r-- | ksplashml/themeengine/standard/Theme.rc | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | ksplashml/themeengine/standard/pics/Preview.png | bin | 49291 -> 67148 bytes | |||
-rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 4 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/themestandard.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.cpp | 8 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndicon.h | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.cpp | 2 | ||||
-rw-r--r-- | ksplashml/themeengine/standard/wndstatus.h | 2 |
10 files changed, 19 insertions, 11 deletions
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/Preview.png b/ksplashml/themeengine/standard/Preview.png Binary files differindex b2ce44163..9545b9eac 100644..100755 --- a/ksplashml/themeengine/standard/Preview.png +++ b/ksplashml/themeengine/standard/Preview.png 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/pics/Preview.png b/ksplashml/themeengine/standard/pics/Preview.png Binary files differindex 4fb01119e..ec936a18c 100644..100755 --- a/ksplashml/themeengine/standard/pics/Preview.png +++ b/ksplashml/themeengine/standard/pics/Preview.png diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index 8fd950eb5..c0fdff594 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -15,7 +15,7 @@ #include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tqdesktopwidget.h> @@ -75,7 +75,7 @@ void ThemeStandard::_initUi() resize( 0, 0 ); } - const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() ); + const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() ); // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here. move( rect.x() + (rect.width() - size().width())/2, 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..9f12a5aed 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -65,12 +65,12 @@ WndIcon::WndIcon( TQPoint p = determinePosition(); mGroundX = mPosX = p.x(); mGroundY = mPosY = p.y(); - move( p + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() ); + move( p + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() ); 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 ); } } @@ -98,7 +98,7 @@ TQPoint WndIcon::determinePosition() int DW, DH, SBH, wid, X, Y, x, y, nSlot, topshift, bottomshift; bottomshift = topshift = 0; - const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen ); + const TQRect srect = tdeApp->desktop()->screenGeometry( mXineramaScreen ); // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here. DW = srect.width(); DH = srect.height(); @@ -301,7 +301,7 @@ void WndIcon::slotJump() mPosY = (int)((float)mPosY - mVelocity ); break; } - move( TQPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() ); + move( TQPoint( mPosX, mPosY ) + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() ); } void WndIcon::slotStopJumping() 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.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index db397a055..9567a1028 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -46,7 +46,7 @@ WndStatus::WndStatus( TQPalette /*pal*/, setCursor( KCursor::blankCursor() ); setSpacing( 5 ); - const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen ); + const TQRect rect = tdeApp->desktop()->screenGeometry( xineramaScreen ); // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here. TQLabel *pix = new TQLabel( this ); 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 |