? kjofol-dockmode.patch
Index: kjloader.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/noatun/modules/kjofol-skin/kjloader.cpp,v
retrieving revision 1.72
diff -u -3 -p -r1.72 kjloader.cpp
--- kjloader.cpp 2002/05/24 13:26:44 1.72
+++ kjloader.cpp 2002/11/19 18:20:23
@@ -178,7 +178,7 @@ void KJLoader::addChild(KJWidget *c)
// this methode does all the hard work on loading these weird skins
void KJLoader::loadSkin(const QString &file)
{
- kdDebug(66666) << "" << endl;
+// kdDebug(66666) << "" << endl;
// kdDebug(66666) << " file = " << file.latin1() << endl;
if ( file == mCurrentSkin ) // we don't load the same skin again
@@ -386,7 +386,7 @@ void KJLoader::loadSkin(const QString &f
if (napp->player()->isPlaying())
newSong();
- kdDebug(66666) << "" << endl;
+// kdDebug(66666) << "" << endl;
}
void KJLoader::loadSeeker()
@@ -407,25 +407,25 @@ void KJLoader::unloadSkin()
// as some skins use the NumberFont for pitchtext
if ( mPitchFont && mPitchFont != mNumbers )
{
- kdDebug(66666) << " freeing mPitchFont" << endl;
+// kdDebug(66666) << " freeing mPitchFont" << endl;
delete mPitchFont;
}
if ( mText )
{
- kdDebug(66666) << " freeing mText" << endl;
+// kdDebug(66666) << " freeing mText" << endl;
delete mText;
}
if ( mNumbers )
{
- kdDebug(66666) << " freeing mNumbers" << endl;
+// kdDebug(66666) << " freeing mNumbers" << endl;
delete mNumbers;
}
if ( mVolumeFont )
{
- kdDebug(66666) << " freeing mVolumeFont" << endl;
+// kdDebug(66666) << " freeing mVolumeFont" << endl;
delete mVolumeFont;
}
@@ -516,7 +516,8 @@ void KJLoader::slotWindowActivate(WId wi
return;
// ensure we dock to the active window _except_ our own
- if ( win != winId() )
+ // and stick to the last window if the NEW current one is a desktop
+ if ( (win != winId()) && (KWin::info(win).windowType != NET::Desktop) )
mDockToWin = win;
if ( mDockToWin )
@@ -572,9 +573,10 @@ void KJLoader::slotWindowChange(WId win)
{
// kdDebug(66666) << "changed our window:" << win << endl;
KWin::Info info = KWin::info( mDockToWin );
- if (info.isIconified() || info.mappingState == NET::Withdrawn)
+ if (info.isIconified() || info.mappingState == NET::Withdrawn || info.windowType == NET::Desktop)
{
- // target-window has been iconified
+// kdDebug(66666) << "[KJLoader] changed our window:" << win << ". either iconified or desktop" << endl;
+ // target-window has been iconified or window is desktop
hide();
mDockToWin = 0L;
}
@@ -755,7 +757,7 @@ void KJLoader::playlistHidden(void)
void KJLoader::readConfig()
{
- kdDebug(66666) << "KJLoader::readConfig()" << endl;
+// kdDebug(66666) << "KJLoader::readConfig()" << endl;
for (KJWidget* i=subwidgets.first(); i!=0; i=subwidgets.next())
i->readConfig();
}
Index: kjprefs.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/noatun/modules/kjofol-skin/kjprefs.cpp,v
retrieving revision 1.32
diff -u -3 -p -r1.32 kjprefs.cpp
--- kjprefs.cpp 2002/07/02 11:06:16 1.32
+++ kjprefs.cpp 2002/11/19 18:20:23
@@ -68,7 +68,7 @@ KJPrefs::KJPrefs(QObject* parent)
void KJPrefs::reopen() // reload config and set stuff in dialog
{
- kdDebug(66666) << "[KJPrefs] reopen()" << endl;
+// kdDebug(66666) << "[KJPrefs] reopen()" << endl;
cfg->setGroup("KJofol-Skins");
@@ -162,7 +162,7 @@ void KJPrefs::reopen() // reload config
void KJPrefs::save()
{
- kdDebug(66666) << "[KJPrefs] save()" << endl;
+// kdDebug(66666) << "[KJPrefs] save()" << endl;
QString skin=::expand ( mSkinselectorWidget->mSkins->currentText() );
// first load skin and then save config to prevent
Index: kjseeker.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/noatun/modules/kjofol-skin/kjseeker.cpp,v
retrieving revision 1.9
diff -u -3 -p -r1.9 kjseeker.cpp
--- kjseeker.cpp 2002/01/28 21:21:25 1.9
+++ kjseeker.cpp 2002/11/19 18:20:23
@@ -38,7 +38,7 @@ KJSeeker::KJSeeker(const QStringList &i,
memset(barmode, 0, 256*sizeof(QPixmap*));
// Now do the pixel føking
- kdDebug(66666) << "creating Pixmaps for Seeker" << endl;
+// kdDebug(66666) << "creating Pixmaps for Seeker" << endl;
for (int iy=y;iyprefs()->minimumPitch() / 100.0;
mMaxPitch = KJLoader::kjofol->prefs()->maximumPitch() / 100.0;
Index: kjtextdisplay.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/noatun/modules/kjofol-skin/kjtextdisplay.cpp,v
retrieving revision 1.26
diff -u -3 -p -r1.26 kjtextdisplay.cpp
--- kjtextdisplay.cpp 2002/10/11 16:30:36 1.26
+++ kjtextdisplay.cpp 2002/11/19 18:20:23
@@ -132,7 +132,7 @@ void KJFilename::mouseRelease(const QPoi
void KJFilename::readConfig()
{
- kdDebug(66666) << "KJFilename::readConfig()" << endl;
+// kdDebug(66666) << "KJFilename::readConfig()" << endl;
mDistance = (int)( textFont().fontWidth() * KJLoader::kjofol->prefs()->titleMovingDistance() );
if ( mDistance <= 0 )
mDistance = 1;