diff -ur /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshow.cpp /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshow.cpp --- /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshow.cpp 2003-05-02 00:09:23.000000000 +0200 +++ /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshow.cpp 2003-06-10 17:45:26.000000000 +0200 @@ -2,6 +2,7 @@ * (C) 1999 Stefan Taferner * (C) 2001 Martin R. Jones * (C) 2003 Chris Howells + * (C) 2003 Sven Leiber * * This code is under GPL * @@ -10,7 +11,6 @@ #include -#include #include #include #include @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include #include @@ -41,12 +43,18 @@ #include "slideshow.moc" #include "slideshowcfg.h" + +#define SLIDESHOW_VERSION "2.3.0" +static const char *version = SLIDESHOW_VERSION; +static const char *description = I18N_NOOP("KSlideshow"); + + // libkscreensaver interface extern "C" { const char *kss_applicationName = "kslideshow.kss"; const char *kss_description = I18N_NOOP( "KSlideshow" ); - const char *kss_version = "2.2.0"; + const char *kss_version = SLIDESHOW_VERSION; KScreenSaver *kss_create( WId id ) { @@ -128,6 +136,7 @@ mDirectory = config->readEntry("Directory", QDir::homeDirPath()); mDelay = config->readNumEntry("Delay", 10) * 1000; mSubdirectory = config->readBoolEntry("SubDirectory", false); + mRandomPosition = config->readBoolEntry("RandomPosition", false); loadDirectory(); } @@ -745,11 +754,37 @@ } else { - x = (ww - iw) >> 1; - y = (wh - ih) >> 1; + if(iw > ww || ih > wh) + { + fx = (double)ww / iw; + fy = (double)wh / ih; + if (fx > fy) fx = fy; + if (fx > 2) fx = 2; + iw = (int)(iw * fx); + ih = (int)(ih * fx); + QImage scaledImg = mImage.smoothScale(iw, ih); + + x = (ww - iw) >> 1; + y = (wh - ih) >> 1; + + p.drawImage(x, y, scaledImg); + } + else + { + if(mRandomPosition) + { + x = rand() % (ww - iw); + y = rand() % (wh - ih); + } + else + { + x = (ww - iw) >> 1; + y = (wh - ih) >> 1; + } - // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false); - p.drawImage(x, y, mImage); + // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false); + p.drawImage(x, y, mImage); + } } if (mPrintName) @@ -871,11 +906,7 @@ mSaver = NULL; - connect(mCbxZoom, SIGNAL(clicked()), SLOT(writeSettings())); - - connect(mCbxRandom, SIGNAL(clicked()), SLOT(writeSettings())); - - connect(mCbxShowName, SIGNAL(clicked()), SLOT(writeSettings())); + connect(mCbxZoom, SIGNAL(clicked()), SLOT(slotZoom())); mPreview->setFixedSize(220, 170); mPreview->setBackgroundColor(black); @@ -886,8 +917,6 @@ connect(mDirChooser, SIGNAL(returnPressed(const QString &)), SLOT(slotDirSelected(const QString &))); connect(mDirChooser, SIGNAL(urlSelected(const QString &)), SLOT(slotDirSelected(const QString &))); - connect(mCbxSubdirectory, SIGNAL(clicked()), SLOT(writeSettings())); - connect(about, SIGNAL(clicked()), SLOT(slotAbout())); connect(ok, SIGNAL(clicked()), SLOT(slotOkPressed())); @@ -910,6 +939,7 @@ mDelay->setValue(config->readNumEntry("Delay", 20)); mDirChooser->setURL(config->readEntry("Directory")); mCbxSubdirectory->setChecked(config->readBoolEntry("SubDirectory", false)); + mCbxRandomPosition->setChecked(config->readBoolEntry("RandomPosition", false)); } @@ -925,6 +955,7 @@ config->writeEntry("Delay", mDelay->value()); config->writeEntry("Directory", mDirChooser->url()); config->writeEntry("SubDirectory", mCbxSubdirectory->isChecked()); + config->writeEntry("RandomPosition", mCbxRandomPosition->isChecked()); config->sync(); @@ -952,13 +983,25 @@ //----------------------------------------------------------------------------- -void kSlideShowSetup::slotAbout() +void kSlideShowSetup::slotZoom() { - KMessageBox::about(this, - i18n("SlideShow Version 1.2\n\n" - "Copyright (c) 1999 by\n" - "Stefan Taferner \n" - "Copyright (c) 2003 by\n" - "Chris Howells isChecked()) + mCbxRandomPosition->setEnabled(false); + else + mCbxRandomPosition->setEnabled(true); } + +//----------------------------------------------------------------------------- +void kSlideShowSetup::slotAbout() +{ + KAboutData aboutData( "kslideshow.kss", I18N_NOOP("SlideShow"), + version, description, KAboutData::License_GPL, + "(c) 1999-2003, The KDE Team" ); + aboutData.addAuthor("Stefan Taferner", 0, "taferner@kde.org"); + aboutData.addAuthor("Chris Howells", 0, "howells@kde.org"); + aboutData.addAuthor("Sven Leiber", 0, "s.leiber@web.de"); + + KAboutApplication mAbout(&aboutData, this, 0); + mAbout.exec(); +} diff -ur /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshow.h /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshow.h --- /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshow.h 2003-05-02 00:09:23.000000000 +0200 +++ /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshow.h 2003-06-10 00:58:54.000000000 +0200 @@ -1,5 +1,6 @@ /* Slide Show Screen Saver * (C) 1999 Stefan Taferner + * (C) 2003 Sven Leiber */ @@ -15,7 +16,9 @@ #include #include #include + #include +#include #include "slideshowcfg.h" @@ -104,6 +107,7 @@ bool mZoomImages; bool mPrintName; bool mSubdirectory; + bool mRandomPosition; int mDelay; QString mDirectory; @@ -128,6 +132,7 @@ protected slots: void slotOkPressed(); void slotAbout(); + void slotZoom(); void writeSettings(); void slotDirSelected(const QString &where); diff -ur /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshowcfg.ui /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshowcfg.ui --- /home/sven/backup/kdeartwork-backup/kscreensaver/kdesavers/slideshowcfg.ui 2003-04-20 21:19:47.000000000 +0200 +++ /home/sven/backup/kdeartwork/kscreensaver/kdesavers/slideshowcfg.ui 2003-06-09 23:12:08.000000000 +0200 @@ -1,4 +1,4 @@ - + SlideshowCfg @@ -8,8 +8,8 @@ 0 0 - 414 - 266 + 429 + 290 @@ -19,6 +19,12 @@ unnamed + + 5 + + + 2 + layout12 @@ -80,57 +86,23 @@ - + - layout2 + spacer11 - - - unnamed - - - - about - - - &About - - - - - spacer1 - - - Horizontal - - - Expanding - - - - 71 - 20 - - - - - - ok - - - &OK - - - - - cancel - - - &Cancel - - - - + + Vertical + + + Expanding + + + + 20 + 16 + + + mPreview @@ -150,26 +122,9 @@ Plain - - - spacer11 - - - Vertical - - - Expanding - - - - 20 - 31 - - - - layout7 + layout11 @@ -199,6 +154,14 @@ Show names + + + mCbxRandomPosition + + + Random position + + layout6 @@ -239,12 +202,72 @@ + + + layout11 + + + + unnamed + + + + about + + + &About + + + Alt+A + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 165 + 20 + + + + + + ok + + + &OK + + + Alt+O + + + + + cancel + + + &Cancel + + + Alt+C + + + + + + - kurlrequester.h klineedit.h - kpushbutton.h