From 8969986251820364c115e488317fb901963291aa Mon Sep 17 00:00:00 2001
From: mlaurent <mlaurent@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 8 Jul 2006 20:30:58 +0000
Subject: [PATCH] Test was already done => compile it

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@559989 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kscreensaver/kdesavers/CMakeLists.txt | 11 +++++------
 kscreensaver/kdesavers/science.cpp    | 14 ++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt
index e7781987..f10ac9dd 100644
--- a/kscreensaver/kdesavers/CMakeLists.txt
+++ b/kscreensaver/kdesavers/CMakeLists.txt
@@ -100,16 +100,15 @@ install(TARGETS kvm.kss  DESTINATION ${BIN_INSTALL_DIR} )
 
 ########### next target ###############
 
-# X11 savers Make tests
-#set(kscience.kss_SRCS science.cpp )
+set(kscience.kss_SRCS science.cpp )
 
-#kde4_automoc(${kscience.kss_SRCS})
+kde4_automoc(${kscience.kss_SRCS})
 
-#kde4_add_executable(kscience.kss ${kscience.kss_SRCS})
+kde4_add_executable(kscience.kss ${kscience.kss_SRCS})
 
-#target_link_libraries(kscience.kss  ${KDE4_KDECORE_LIBS} )
+target_link_libraries(kscience.kss  ${KDE4_KDEUI_LIBS} kscreensaver )
 
-#install(TARGETS kscience.kss DESTINATION ${BIN_INSTALL_DIR} )
+install(TARGETS kscience.kss DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp
index 71286b22..acdca206 100644
--- a/kscreensaver/kdesavers/science.cpp
+++ b/kscreensaver/kdesavers/science.cpp
@@ -861,13 +861,19 @@ void KScienceSaver::applyLens32bpp(int xs, int ys, int xd, int yd, int w, int h)
 //-----------------------------------------------------------------------------
 
 KScienceSetup::KScienceSetup(  QWidget *parent, const char *name )
-	: KDialog( parent, name, true, i18n( "Setup Science Screen Saver" ),
-	  Ok|Cancel|Help, Ok, true ), saver( 0 )
+	: KDialog( parent)
+	  , saver( 0 )
 {
+	setCaption(i18n( "Setup Science Screen Saver" ));
+	setModal(true);
+	setButtons(Ok|Cancel|Help);
+	setDefaultButton(Ok);
+	showButtonSeparator(true);
 	readSettings();
 	initModeInfo();
 
-	QWidget *main = makeMainWidget();
+	QWidget *main = new QWidget(this);
+	setMainWidget(main);
 
 	QHBoxLayout *lt  = new QHBoxLayout( main, 0, spacingHint());
 	QVBoxLayout *ltm = new QVBoxLayout;
@@ -985,7 +991,7 @@ KScienceSetup::KScienceSetup(  QWidget *parent, const char *name )
 	// preview
 	preview = new KPreviewWidget( main );
 	preview->setFixedSize( 220, 170 );
-	QPixmap p( locate("data", "kscreensaver/pics/kscience.png") );
+	QPixmap p( KStandardDirs::locate("data", "kscreensaver/pics/kscience.png") );
 	if( p.isNull() )
 		preview->setBackgroundColor( Qt::black );
 	else
-- 
2.11.4.GIT