Version: 1.5.0 (using KDE 3.5.2, Debian Package 4:3.5.2-2 (testing/unstable)) Compiler: Target: i486-linux-gnu OS: Linux (i686) release 2.6.15-1-686 ATM, when you set the background of a slide to "Use slide master background", the preview panel still shows the settings that would be there if slide master background wasn't used. This should get changed to one of the following: a) if slide master background use is enabled, preview shows background of master, or b) if slide master background use is enabled, preview makes clear that there is no preview (e.g. cross the panel out)
Hello Eckhart, just for clarification you are talking about the preview in the dialog? Thorsten
Created an attachment (id=15591) [details] Affected area Yes.
SVN commit 529546 by zachmann: o Fix Bug 125424: When setting slide background to "Use slide master background", preview is not shown correctly. Now we show the background of the master in the preview when "Use slide master background" is selected. Thanks for reporting this bug. BUG: 125424 M +26 -17 KPrBackDia.cpp M +2 -1 KPrBackDia.h --- branches/koffice/1.5/koffice/kpresenter/KPrBackDia.cpp #529545:529546 @@ -70,10 +70,10 @@ const QColor &backColor2, BCType _bcType, const KoPicture &backPic, BackView backPicView, bool _unbalanced, - int _xfactor, int _yfactor, KPrPage *m_page ) + int _xfactor, int _yfactor, KPrPage *_page ) : KDialogBase( parent, name, true, "",KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| KDialogBase::User1|KDialogBase::User2 ), - m_useMasterBackground( 0 ), m_picture(backPic),m_oldpicture(backPic) + m_useMasterBackground( 0 ), m_picture(backPic),m_oldpicture(backPic), m_page( _page ) { lockUpdate = true; @@ -309,24 +309,33 @@ color2Choose->setEnabled( true ); } - picChanged = (getBackType() == BT_PICTURE); - preview->backGround()->setBackType( getBackType() ); - preview->backGround()->setBackView( getBackView() ); - preview->backGround()->setBackColor1( getBackColor1() ); - preview->backGround()->setBackColor2( getBackColor2() ); - preview->backGround()->setBackColorType( getBackColorType() ); - preview->backGround()->setBackUnbalanced( getBackUnbalanced() ); - preview->backGround()->setBackXFactor( getBackXFactor() ); - preview->backGround()->setBackYFactor( getBackYFactor() ); - if ( !m_picture.isNull() && picChanged ) - preview->backGround()->setBackPicture( m_picture ); - preview->backGround()->setBackType( getBackType() ); - if ( preview->isVisible() && isVisible() ) { - preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly. + if ( m_useMasterBackground && m_useMasterBackground->isChecked() ) + { + kdDebug(33001) << "set backgound to master" << endl; + preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() ); preview->repaint( true ); } + else + { + picChanged = (getBackType() == BT_PICTURE); + preview->backGround()->setBackType( getBackType() ); + preview->backGround()->setBackView( getBackView() ); + preview->backGround()->setBackColor1( getBackColor1() ); + preview->backGround()->setBackColor2( getBackColor2() ); + preview->backGround()->setBackColorType( getBackColorType() ); + preview->backGround()->setBackUnbalanced( getBackUnbalanced() ); + preview->backGround()->setBackXFactor( getBackXFactor() ); + preview->backGround()->setBackYFactor( getBackYFactor() ); + if ( !m_picture.isNull() && picChanged ) + preview->backGround()->setBackPicture( m_picture ); + preview->backGround()->setBackType( getBackType() ); + if ( preview->isVisible() && isVisible() ) { + preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly. + preview->repaint( true ); + } - picChanged = false; + picChanged = false; + } } BackType KPrBackDialog::getBackType() const --- branches/koffice/1.5/koffice/kpresenter/KPrBackDia.h #529545:529546 @@ -72,7 +72,7 @@ const QColor &backColor2, BCType _bcType, const KoPicture &backPic, BackView backPicView, bool _unbalanced, - int _xfactor, int _yfactor, KPrPage *m_page ); + int _xfactor, int _yfactor, KPrPage *_page ); KPrBackGround::Settings getBackGround() const; bool useMasterBackground() const; @@ -113,6 +113,7 @@ int oldYFactor; KoPicture m_picture, m_oldpicture; + KPrPage *m_page; private slots: void aboutToSelectPic();
You need to log in before you can comment on or make changes to this bug.