On Thu, 27 May 2004 19:08, Thomas Zander wrote:
> On Thursday 27 May 2004 10:33, Brad Hards wrote:
> > Right now, slide transition sound effects only work if you also have a
> > visual effect enabled. Thats not very intuitive (three "WhatsThis"
> > entries of warning :-), and quite unnecessary.
> >
> > OK to apply?
>
> Here, when I set the visual effect to 'no-effect' the sound checkbox is
> disabled; that should also be de-coupled.
Yeah, I really only worked on the page effects. This version should handle
object effects too:

Index: effectdia.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/effectdia.cc,v
retrieving revision 1.59
diff -u -4 -p -r1.59 effectdia.cc
--- effectdia.cc        6 Mar 2004 15:29:52 -0000       1.59
+++ effectdia.cc        28 May 2004 12:05:51 -0000
@@ -147,12 +147,8 @@ EffectDia::EffectDia( QWidget* parent, c
     // setup the Sound Effect stuff
     appearSoundEffect = new QCheckBox( i18n( "Sound effect" ), grp1 );
     appearSoundEffect->setChecked( obj->getAppearSoundEffect() );
     upperRow->addWidget( appearSoundEffect, 4, 0 );
-    QWhatsThis::add( appearSoundEffect, i18n("If you use sound effect, please do not select 'No Effect'.") );
-
-    if ( static_cast<int>( obj->getEffect() ) == 0 )
-        appearSoundEffect->setEnabled( false );

     connect( appearSoundEffect, SIGNAL( clicked() ), this, SLOT( appearSoundEffectChanged() ) );

     lSoundEffect1 = new QLabel( i18n( "File name:" ), grp1 );
@@ -241,12 +237,9 @@ EffectDia::EffectDia( QWidget* parent, c
     // setup the Sound Effect stuff
     disappearSoundEffect = new QCheckBox( i18n( "Sound effect" ), grp2 );
     disappearSoundEffect->setChecked( obj->getDisappearSoundEffect() );
     lowerRow->addWidget( disappearSoundEffect, 3, 0 );
-    QWhatsThis::add( disappearSoundEffect, i18n("If you use sound effect, please do not select 'No Effect'.") );
-
-    if ( static_cast<int>( obj->getEffect3() ) == 0 )
-        disappearSoundEffect->setEnabled( false );
+    disappearSoundEffect->setEnabled( disappear->isChecked() );

     connect( disappearSoundEffect, SIGNAL( clicked() ), this, SLOT( disappearSoundEffectChanged() ) );

     lSoundEffect2 = new QLabel( i18n( "File name:" ), grp2 );
@@ -347,41 +340,21 @@ void EffectDia::resizeEvent( QResizeEven
 void EffectDia::disappearChanged()
 {
     cDisappear->setEnabled( disappear->isChecked() );
     eDisappearStep->setEnabled( disappear->isChecked() );
+    disappearSoundEffect->setEnabled( disappear->isChecked() );
+    disappearSoundEffectChanged();

     if ( !view->kPresenterDoc()->spManualSwitch() )
         timerOfDisappear->setEnabled( disappear->isChecked() );
 }

 void EffectDia::appearEffectChanged( int num )
 {
-    if ( num == 0 ) {
-        appearSoundEffect->setEnabled( false );
-        lSoundEffect1->setEnabled( false );
-        requester1->setEnabled( false );
-        buttonTestPlaySoundEffect1->setEnabled( false );
-        buttonTestStopSoundEffect1->setEnabled( false );
-    }
-    else {
-        appearSoundEffect->setEnabled( true );
-        appearSoundEffectChanged();
-    }
 }

 void EffectDia::disappearEffectChanged( int num )
 {
-    if ( num == 0 ) {
-        disappearSoundEffect->setEnabled( false );
-        lSoundEffect2->setEnabled( false );
-        requester2->setEnabled( false );
-        buttonTestPlaySoundEffect2->setEnabled( false );
-        buttonTestStopSoundEffect2->setEnabled( false );
-    }
-    else {
-        disappearSoundEffect->setEnabled( true );
-        disappearSoundEffectChanged();
-    }
 }

 void EffectDia::appearSoundEffectChanged()
 {
@@ -399,14 +372,14 @@ void EffectDia::appearSoundEffectChanged
 }

 void EffectDia::disappearSoundEffectChanged()
 {
-    lSoundEffect2->setEnabled( disappearSoundEffect->isChecked() );
-    requester2->setEnabled( disappearSoundEffect->isChecked() );
+    lSoundEffect2->setEnabled( disappear->isChecked() && disappearSoundEffect->isChecked() );
+    requester2->setEnabled( disappear->isChecked() && disappearSoundEffect->isChecked() );

     if ( !requester2->url().isEmpty() ) {
-        buttonTestPlaySoundEffect2->setEnabled( disappearSoundEffect->isChecked() );
-        buttonTestStopSoundEffect2->setEnabled( disappearSoundEffect->isChecked() );
+        buttonTestPlaySoundEffect2->setEnabled( disappear->isChecked() && disappearSoundEffect->isChecked() );
+        buttonTestStopSoundEffect2->setEnabled( disappear->isChecked() && disappearSoundEffect->isChecked() );
     }
     else {
         buttonTestPlaySoundEffect2->setEnabled( false );
         buttonTestStopSoundEffect2->setEnabled( false );
Index: effecthandler.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/effecthandler.cc,v
retrieving revision 1.2
diff -u -4 -p -r1.2 effecthandler.cc
--- effecthandler.cc    5 May 2004 13:46:26 -0000       1.2
+++ effecthandler.cc    28 May 2004 12:05:51 -0000
@@ -49,9 +49,9 @@ EffectHandler::EffectHandler( int step,
             || ( object->getType() == OT_TEXT
               && object->getEffect2() == EF2T_PARA ) ) )
         {
             m_appearEffectObjects.append( object );
-            if ( object->getEffect() != EF_NONE && object->getAppearSoundEffect() )
+            if ( object->getAppearSoundEffect() )
             {
                 m_soundEffect = object->getAppearSoundEffectFileName();
             }

@@ -62,9 +62,9 @@ EffectHandler::EffectHandler( int step,
         }
         else if ( object->getDisappear() && object->getDisappearStep() == m_step )
         {
             m_disappearEffectObjects.append( object );
-            if ( object->getEffect3() != EF3_NONE && object->getDisappearSoundEffect() )
+            if ( object->getDisappearSoundEffect() )
             {
                 m_soundEffect = object->getDisappearSoundEffectFileName();
             }

Index: kprcanvas.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprcanvas.cc,v
retrieving revision 1.407
diff -u -4 -p -r1.407 kprcanvas.cc
--- kprcanvas.cc        19 May 2004 08:08:40 -0000      1.407
+++ kprcanvas.cc        28 May 2004 12:05:55 -0000
@@ -3259,9 +3259,9 @@ bool KPrCanvas::pNext( bool )

         bool _soundEffect = backtmp->getPageSoundEffect();
         QString _soundFileName = backtmp->getPageSoundFileName();

-        if ( _pageEffect != PEF_NONE && _soundEffect && !_soundFileName.isEmpty() ) {
+        if ( _soundEffect && !_soundFileName.isEmpty() ) {
             stopSound();
             playSound( _soundFileName );
         }

Index: transeffectdia.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/transeffectdia.cc,v
retrieving revision 1.16
diff -u -4 -p -r1.16 transeffectdia.cc
--- transeffectdia.cc   23 May 2004 19:39:40 -0000      1.16
+++ transeffectdia.cc   28 May 2004 12:05:55 -0000
@@ -231,9 +231,8 @@ KPTransEffectDia::KPTransEffectDia( QWid
     soundEffect = pg->getPageSoundEffect();

     checkSoundEffect = new QCheckBox( i18n( "Sound effect" ), leftpart );
     checkSoundEffect->setChecked( soundEffect );
-    QWhatsThis::add( checkSoundEffect, i18n("If you use a sound effect, please do not select 'No Effect'.") );
     connect( checkSoundEffect, SIGNAL( clicked() ), this, SLOT( soundEffectChanged() ) );

     QWidget* soundgrp = new QWidget( leftpart );
     QBoxLayout* soundLayout = new QHBoxLayout( soundgrp, KDialog::marginHint(), KDialog::spacingHint() );
_______________________________________________
koffice-devel mailing list
koffice-devel@mail.kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel