Attachment #1250 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All

Lines 44-49 Link Here

(-)./kcontrol/background/bgadvanced.cpp.ORI (-1 / +2 lines)
44	#include "bgadvanced.h"	44	#include "bgadvanced.h"
45	#include "bgadvanced_ui.h"	45	#include "bgadvanced_ui.h"
46		46
		47	#include "KCrossBGRender.h"
47	#include <X11/Xlib.h>	48	#include <X11/Xlib.h>
48		49
49	/** BGAdvancedDialog **/	50	/** BGAdvancedDialog **/
Lines 63-69 Link Here
63	}	64	}
64		65
65		66
66	BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r,	67	BGAdvancedDialog::BGAdvancedDialog(KCrossBGRender *_r,
67	TQWidget *parent,	68	TQWidget *parent,
68	bool m_multidesktop)	69	bool m_multidesktop)
69	: KDialogBase(parent, "BGAdvancedDialog",	70	: KDialogBase(parent, "BGAdvancedDialog",




#include "bgwallpaper.h"
#include "bgadvanced.h"
#include "bgdialog.h"
#include "KCrossBGRender.h"

#define NR_PREDEF_PATTERNS 6


         int eDesk = i>0 ? i-1 : 0;
         
         // Setup the merged-screen renderer
         KCrossBGRender * r = new KCrossBGRender(eDesk, 0, false, _config);
         m_renderer[i].insert( 0, r );
         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
         
         // Setup the common-screen renderer
         r = new KCrossBGRender(eDesk, 0, true, _config);
         m_renderer[i].insert( 1, r );
         connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
         
         // Setup the remaining renderers for each screen
         for (unsigned j=0; j < m_numScreens; ++j )
         {
            r = new KCrossBGRender(eDesk, j, true, _config);
            m_renderer[i].insert( j+2, r );
            connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
         }

      }
      
      // set up the common desktop renderer
      KCrossBGRender * r = new KCrossBGRender(0, 0, false, _config);
      m_renderer[0].insert(0, r);
      connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));

      // set up all the other desktop renderers
      for (unsigned i = 0; i < m_numDesks; ++i)
      {
         r = new KCrossBGRender(i, 0, false, _config);
         m_renderer[i+1].insert(0, r);
         connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
      }

   delete m_pGlobals;
}

KCrossBGRender * BGDialog::eRenderer()
{
   return m_renderer[m_eDesk][m_eScreen];
}


void BGDialog::updateUI()
{
   KCrossBGRender *r = eRenderer();
   m_comboDesktop->setCurrentItem(m_eDesk);
   m_comboScreen->setCurrentItem(m_eScreen);


   if (!m_previewUpdates)
      return;

   KCrossBGRender * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];

   if (r->image().isNull())
      return;


void BGDialog::slotWallpaperTypeChanged(int i)
{
   KCrossBGRender *r = eRenderer();
   r->stop();

   // No picture


void BGDialog::slotWallpaperPos(int mode)
{
   KCrossBGRender *r = eRenderer();

   mode++;
   m_wallpaperPos = mode;


void BGDialog::slotSetupMulti()
{
    KCrossBGRender *r = eRenderer();

    BGMultiWallpaperDialog dlg(r, topLevelWidget());
    if (dlg.exec() == TQDialog::Accepted) {


void BGDialog::slotPrimaryColor(const TQColor &color)
{
   KCrossBGRender *r = eRenderer();

   if (color == r->colorA())
      return;


void BGDialog::slotSecondaryColor(const TQColor &color)
{
   KCrossBGRender *r = eRenderer();

   if (color == r->colorB())
      return;


void BGDialog::slotPattern(int pattern)
{
   KCrossBGRender *r = eRenderer();
   r->stop();
   bool bSecondaryEnabled = true;
   if (pattern < NR_PREDEF_PATTERNS)

      // Copy stuff
      for (unsigned desk = 0; desk < m_numDesks+1; ++desk )
      {
         KCrossBGRender *master = m_renderer[desk][1];
         for (unsigned screen = 0; screen < m_numScreens; ++screen)
         {
            m_renderer[desk][screen+2]->copyConfig(master);

      // Copy stuff
      for (unsigned screen = 0; screen < m_renderer[0].size(); ++screen )
      {
         KCrossBGRender *master = m_renderer[0][screen];
         for (unsigned desk = 0; desk < m_numDesks; ++desk )
         {
            m_renderer[desk+1][screen]->copyConfig(master);


void BGDialog::slotAdvanced()
{
    KCrossBGRender *r = eRenderer();

    m_previewUpdates = false;
    BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);

   {
      for (unsigned j = 0; j < m_renderer[i].size(); ++j )
      {
         KCrossBGRender * r = m_renderer[i][j];
         if( r->isActive())
             r->stop();
         r->desktopResized();




class TQSpinBox;

class BGAdvancedBase;
class KCrossBGRender;
class KBackgroundProgram;

class BGAdvancedDialog : public KDialogBase
{
   Q_OBJECT
public:
   BGAdvancedDialog(KCrossBGRender *_r, TQWidget *parent, bool m_multidesktop);

   void setCacheSize(int s);
   int cacheSize();

   void slotEnableProgram(bool b);

private:
   KCrossBGRender *r;

   BGAdvancedBase *dlg;





#include "bgrender.h"
#include "bgsettings.h"
#include "bgdefaults.h"
#include "KCrossBGRender.h"

class BGMonitorArrangement;
class KStandardDirs;

protected:
   void initUI();
   void updateUI();
   KCrossBGRender * eRenderer();

   void setWallpaper(const TQString &);


   int m_screen;
   int m_eDesk;
   int m_eScreen;
   TQValueVector< TQPtrVector<KCrossBGRender> > m_renderer; // m_renderer[desk][screen]
   TQMap<TQString,int> m_wallpaper;
   TQStringList m_patterns;
   int m_slideShowRandom; // Remembers last Slide Show setting




#include <tqstringlist.h>

#include <kdialogbase.h>
#include <kdebug.h>

class BGMultiWallpaperBase;
class KBackgroundSettings;

   void slotMoveDown();
   void slotOk();
   void slotItemSelected( TQListBoxItem * );
   void slotCheckScheduled(bool);
   void slotChangedXML(const TQString&);

private:
   void setEnabledMoveButtons();

   KBackgroundSettings *m_pSettings;

   BGMultiWallpaperBase *dlg;
   TQString lastXml;
};

#endif

Lines 26-37 Link Here

(-)./kcontrol/background/bgwallpaper.cpp.ORI (-4 / +60 lines)
26	#include <tqevent.h>	26	#include <tqevent.h>
27	#include <tqpushbutton.h>	27	#include <tqpushbutton.h>
28	#include <tqspinbox.h>	28	#include <tqspinbox.h>
		29	#include <tqgroupbox.h>
29		30
30	#include <kfiledialog.h>	31	#include <kfiledialog.h>
31	#include <kimageio.h>	32	#include <kimageio.h>
32	#include <klocale.h>	33	#include <klocale.h>
33	#include <kstandarddirs.h>	34	#include <kstandarddirs.h>
34	#include <kurldrag.h>	35	#include <kurldrag.h>
		36	#include <kurlrequester.h>
35		37
36	#include "bgsettings.h"	38	#include "bgsettings.h"
37	#include "bgwallpaper.h"	39	#include "bgwallpaper.h"
Lines 119-128 Link Here
119	connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));	121	connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
120	connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));	122	connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
121	connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));	123	connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *)));
		124	connect(dlg->chkScheduled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckScheduled(bool)));
		125	connect(dlg->kurlXmlFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChangedXML(const TQString &)));
		126
122	dlg->m_buttonRemove->setEnabled( false );	127	dlg->m_buttonRemove->setEnabled( false );
123	dlg->m_buttonMoveUp->setEnabled( false );	128	dlg->m_buttonMoveUp->setEnabled( false );
124	dlg->m_buttonMoveDown->setEnabled( false );	129	dlg->m_buttonMoveDown->setEnabled( false );
125		130
		131	// XML Stuffs
		132	dlg->kurlXmlFile->setFilter("*.xml");
		133	if (m_pSettings->wallpaperList()[0].endsWith("xml",false)) {
		134	dlg->kurlXmlFile->setURL(m_pSettings->wallpaperList()[0]);
		135	dlg->chkScheduled->setChecked(true);
		136	dlg->m_listImages->removeItem(0);
		137	lastXml = m_pSettings->wallpaperList()[0];
		138	} else {
		139	dlg->kurlXmlFile->setURL("/usr/share/mdk/backgrounds/Mandriva.xml");
		140	dlg->chkScheduled->setChecked(false);
		141	slotCheckScheduled(false);
		142	}
		143	}
		144
		145	void BGMultiWallpaperDialog::slotCheckScheduled(bool state)
		146	{
		147	if ( state == true ) {
		148	dlg->grpNormalShow->setEnabled(false);
		149	dlg->kurlXmlFile->setEnabled(true);
		150	} else {
		151	dlg->grpNormalShow->setEnabled(true);
		152	dlg->kurlXmlFile->setEnabled(false);
		153	}
		154	}
		155
		156	void BGMultiWallpaperDialog::slotChangedXML(const TQString & file)
		157	{
		158	lastXml = file;
126	}	159	}
127		160
128	void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * )	161	void BGMultiWallpaperDialog::slotItemSelected( TQListBoxItem * )
Lines 222-236 Link Here
222		255
223	void BGMultiWallpaperDialog::slotOk()	256	void BGMultiWallpaperDialog::slotOk()
224	{	257	{
		258	bool useXml = false;
		259	// Looking to XML
		260	if (dlg->chkScheduled->isChecked() && lastXml.endsWith("xml",false)) {
		261	useXml = true;
		262	kdDebug() << "Adding XML" << lastXml;
		263	dlg->m_listImages->insertItem(lastXml,0);
		264	}
		265
		266	kdDebug() << dlg->m_listImages << endl;
		267
225	TQStringList lst;	268	TQStringList lst;
226	for (unsigned i=0; i < dlg->m_listImages->count(); i++)	269	for (unsigned i=0; i < dlg->m_listImages->count(); i++) {
227	lst.append(dlg->m_listImages->text(i));	270	lst.append(dlg->m_listImages->text(i));
		271	}
228	m_pSettings->setWallpaperList(lst);	272	m_pSettings->setWallpaperList(lst);
229	m_pSettings->setWallpaperChangeInterval(dlg->m_spinInterval->value());	273	m_pSettings->setWallpaperChangeInterval(dlg->m_spinInterval->value());
230	if (dlg->m_cbRandom->isChecked())	274	if (dlg->m_cbRandom->isChecked()) {
231	m_pSettings->setMultiWallpaperMode(KBackgroundSettings::Random);	275	m_pSettings->setMultiWallpaperMode(KBackgroundSettings::Random);
232	else	276	} else {
233	m_pSettings->setMultiWallpaperMode(KBackgroundSettings::InOrder);	277	m_pSettings->setMultiWallpaperMode(KBackgroundSettings::InOrder);
		278	}
		279
		280	if(useXml) {
		281	m_pSettings->changeWallpaper();
		282	m_pSettings->setWallpaper(lastXml);
		283	m_pSettings->changeWallpaper();
		284	} else {
		285	m_pSettings->changeWallpaper();
		286	m_pSettings->setWallpaper(lst[0]);
		287	m_pSettings->changeWallpaper();
		288	}
		289
234	accept();	290	accept();
235	}	291	}
236		292




<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>BGMultiWallpaperBase</class>
<widget class="TQWidget">
    <property name="name">

        <rect>
            <x>0</x>
            <y>0</y>
            <width>499</width>
            <height>526</height>
        </rect>
    </property>
    <property name="caption">
        <string>BGMultiWallPaperBase</string>
    </property>
    <vbox>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <property name="margin">
            <number>0</number>
        </property>
        <widget class="TQLayoutWidget">
            <property name="name">
                <cstring>textLabel2</cstring>
            </property>
            <property name="text">
                <string>Show the following pictures:</string>
            </property>
        </widget>
        <widget class="TQCheckBox" row="1" column="0">
            <property name="name">
                <cstring>m_cbRandom</cstring>
            </property>
            <property name="text">
                <string>&amp;Show pictures in random order</string>
            </property>
        </widget>
        <widget class="TQLayoutWidget" row="0" column="0">
            <property name="name">
                <cstring>layout8</cstring>
            </property>
            <hbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>chkScheduled</cstring>
                    </property>
                    <property name="text">
                        <string>Scheduled Slide Show</string>
                    </property>
                    <property name="buddy" stdset="0">
                        <cstring>m_spinInterval</cstring>
                    </property>
                </widget>
                <widget class="KURLRequester">
                    <property name="name">
                        <cstring>kurlXmlFile</cstring>
                    </property>
                </widget>
                <spacer>
                    <property name="name">
                        <cstring>spacer4</cstring>
                    </property>
                    <property name="orientation">
                        <enum>Horizontal</enum>
                    </property>
                    <property name="sizeType">
                        <enum>Expanding</enum>
                    </property>
                    <property name="sizeHint">
                        <size>
                            <width>20</width>
                            <height>20</height>
                        </size>
                    </property>
                </spacer>
            </hbox>
        </widget>
        <widget class="QGroupBox">
            <property name="name">
                <cstring>grpNormalShow</cstring>
            </property>
            <property name="title">
                <string></string>
            </property>
            <vbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQLayoutWidget">
                    <property name="name">
                        <cstring>layout3</cstring>
                    </property>
                    <property name="sizePolicy">
                        <sizepolicy>
                            <hsizetype>3</hsizetype>
                            <vsizetype>3</vsizetype>
                            <horstretch>0</horstretch>
                            <verstretch>0</verstretch>
                        </sizepolicy>
                    </property>
                    <property name="minimumSize">
                        <size>
                            <width>300</width>
                            <height>100</height>
                        </size>
                    </property>
                    <hbox>
                        <property name="name">
                            <cstring>unnamed</cstring>
                        </property>
                        <widget class="TQLabel">
                            <property name="name">
                                <cstring>textLabel1_2</cstring>
                            </property>
                            <property name="text">
                                <string>Change &amp;picture after:</string>
                            </property>
                            <property name="buddy" stdset="0">
                                <cstring>m_spinInterval</cstring>
                            </property>
                        </widget>
                        <widget class="TQSpinBox">
                            <property name="name">
                                <cstring>m_spinInterval</cstring>
                            </property>
                        </widget>
                        <spacer>
                            <property name="name">
                                <cstring>spacer4</cstring>
                            </property>
                            <property name="orientation">
                                <enum>Horizontal</enum>
                            </property>
                            <property name="sizeType">
                                <enum>Expanding</enum>
                            </property>
                            <property name="sizeHint">
                                <size>
                                    <width>20</width>
                                    <height>20</height>
                                </size>
                            </property>
                        </spacer>
                    </hbox>
                </widget>
                <widget class="TQCheckBox">
                    <property name="name">
                        <cstring>m_cbRandom</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Show pictures in random order</string>
                    </property>
                </widget>
                <spacer row="4" column="1">
                    <property name="name">
                        <cstring>spacer5</cstring>
                    </property>
                    <property name="orientation">
                        <enum>Vertical</enum>
                    </property>
                    <property name="sizeType">
                        <enum>Expanding</enum>
                    </property>
                    <property name="accel">
                        <string>Alt+S</string>
                            <width>20</width>
                            <height>20</height>
                        </size>
                    </property>
                </spacer>
                <widget class="TQPushButton" row="1" column="1">
                    <property name="name">
                        <cstring>m_buttonRemove</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Remove</string>
                    </property>
                </widget>
                <widget class="TQLabel">
                    <property name="name">
                        <cstring>textLabel2</cstring>
                    </property>
                    <property name="text">
                        <string>Show the following pictures:</string>
                    </property>
                </widget>
                <widget class="TQLayoutWidget">
                    <property name="name">
                        <cstring>layout4</cstring>
                    </property>
                    <property name="text">
                        <string>Move &amp;Up</string>
                    </property>
                    <grid>
                        <property name="name">
                            <cstring>unnamed</cstring>
                        </property>
                        <widget class="BGMultiWallpaperList" row="0" column="0" rowspan="5" colspan="1">
                            <property name="name">
                                <cstring>m_listImages</cstring>
                            </property>
                            <property name="sizePolicy">
                                <sizepolicy>
                                    <hsizetype>3</hsizetype>
                                    <vsizetype>3</vsizetype>
                                    <horstretch>0</horstretch>
                                    <verstretch>0</verstretch>
                                </sizepolicy>
                            </property>
                            <property name="minimumSize">
                                <size>
                                    <width>300</width>
                                    <height>100</height>
                                </size>
                            </property>
                        </widget>
                        <widget class="TQPushButton" row="0" column="1">
                            <property name="name">
                                <cstring>m_buttonAdd</cstring>
                            </property>
                            <property name="text">
                                <string>&amp;Add...</string>
                            </property>
                            <property name="accel">
                                <string>Alt+A</string>
                            </property>
                        </widget>
                        <spacer row="4" column="1">
                            <property name="name">
                                <cstring>spacer5</cstring>
                            </property>
                            <property name="orientation">
                                <enum>Vertical</enum>
                            </property>
                            <property name="sizeType">
                                <enum>Expanding</enum>
                            </property>
                            <property name="sizeHint">
                                <size>
                                    <width>20</width>
                                    <height>20</height>
                                </size>
                            </property>
                        </spacer>
                        <widget class="TQPushButton" row="1" column="1">
                            <property name="name">
                                <cstring>m_buttonRemove</cstring>
                            </property>
                            <property name="text">
                                <string>&amp;Remove</string>
                            </property>
                            <property name="accel">
                                <string>Alt+R</string>
                            </property>
                        </widget>
                        <widget class="TQPushButton" row="3" column="1">
                            <property name="name">
                                <cstring>m_buttonMoveDown</cstring>
                            </property>
                            <property name="text">
                                <string>Move &amp;Down</string>
                            </property>
                            <property name="accel">
                                <string>Alt+D</string>
                            </property>
                        </widget>
                        <widget class="TQPushButton" row="2" column="1">
                            <property name="name">
                                <cstring>m_buttonMoveUp</cstring>
                            </property>
                            <property name="text">
                                <string>Move &amp;Up</string>
                            </property>
                            <property name="accel">
                                <string>Alt+U</string>
                            </property>
                        </widget>
                    </grid>
                </widget>
            </vbox>
        </widget>
    </vbox>
</widget>
<includes>
    <include location="local" impldecl="in declaration">bgwallpaper.h</include>

</includes>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
    <includehint>kurlrequester.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
</includehints>
</UI>

Return to bug 1499

Lines 63-68 Link Here

(-)./kcontrol/background/bgdialog.cpp.ORI (-18 / +19 lines)
63	#include "bgwallpaper.h"	63	#include "bgwallpaper.h"
64	#include "bgadvanced.h"	64	#include "bgadvanced.h"
65	#include "bgdialog.h"	65	#include "bgdialog.h"
		66	#include "KCrossBGRender.h"
66		67
67	#define NR_PREDEF_PATTERNS 6	68	#define NR_PREDEF_PATTERNS 6
68		69
Lines 194-212 Link Here
194	int eDesk = i>0 ? i-1 : 0;	195	int eDesk = i>0 ? i-1 : 0;
195		196
196	// Setup the merged-screen renderer	197	// Setup the merged-screen renderer
197	KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config);	198	KCrossBGRender * r = new KCrossBGRender(eDesk, 0, false, _config);
198	m_renderer[i].insert( 0, r );	199	m_renderer[i].insert( 0, r );
199	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );	200	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
200		201
201	// Setup the common-screen renderer	202	// Setup the common-screen renderer
202	r = new KBackgroundRenderer(eDesk, 0, true, _config);	203	r = new KCrossBGRender(eDesk, 0, true, _config);
203	m_renderer[i].insert( 1, r );	204	m_renderer[i].insert( 1, r );
204	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );	205	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
205		206
206	// Setup the remaining renderers for each screen	207	// Setup the remaining renderers for each screen
207	for (unsigned j=0; j < m_numScreens; ++j )	208	for (unsigned j=0; j < m_numScreens; ++j )
208	{	209	{
209	r = new KBackgroundRenderer(eDesk, j, true, _config);	210	r = new KCrossBGRender(eDesk, j, true, _config);
210	m_renderer[i].insert( j+2, r );	211	m_renderer[i].insert( j+2, r );
211	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );	212	connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) );
212	}	213	}
Lines 221-234 Link Here
221	}	222	}
222		223
223	// set up the common desktop renderer	224	// set up the common desktop renderer
224	KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config);	225	KCrossBGRender * r = new KCrossBGRender(0, 0, false, _config);
225	m_renderer[0].insert(0, r);	226	m_renderer[0].insert(0, r);
226	connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));	227	connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
227		228
228	// set up all the other desktop renderers	229	// set up all the other desktop renderers
229	for (unsigned i = 0; i < m_numDesks; ++i)	230	for (unsigned i = 0; i < m_numDesks; ++i)
230	{	231	{
231	r = new KBackgroundRenderer(i, 0, false, _config);	232	r = new KCrossBGRender(i, 0, false, _config);
232	m_renderer[i+1].insert(0, r);	233	m_renderer[i+1].insert(0, r);
233	connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));	234	connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)));
234	}	235	}
Lines 266-272 Link Here
266	delete m_pGlobals;	267	delete m_pGlobals;
267	}	268	}
268		269
269	KBackgroundRenderer * BGDialog::eRenderer()	270	KCrossBGRender * BGDialog::eRenderer()
270	{	271	{
271	return m_renderer[m_eDesk][m_eScreen];	272	return m_renderer[m_eDesk][m_eScreen];
272	}	273	}
Lines 681-687 Link Here
681		682
682	void BGDialog::updateUI()	683	void BGDialog::updateUI()
683	{	684	{
684	KBackgroundRenderer *r = eRenderer();	685	KCrossBGRender *r = eRenderer();
685	m_comboDesktop->setCurrentItem(m_eDesk);	686	m_comboDesktop->setCurrentItem(m_eDesk);
686	m_comboScreen->setCurrentItem(m_eScreen);	687	m_comboScreen->setCurrentItem(m_eScreen);
687		688
Lines 819-825 Link Here
819	if (!m_previewUpdates)	820	if (!m_previewUpdates)
820	return;	821	return;
821		822
822	KBackgroundRenderer * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];	823	KCrossBGRender * r = m_renderer[m_eDesk][(m_eScreen>1) ? (screen_done+2) : m_eScreen];
823		824
824	if (r->image().isNull())	825	if (r->image().isNull())
825	return;	826	return;
Lines 858-864 Link Here
858		859
859	void BGDialog::slotWallpaperTypeChanged(int i)	860	void BGDialog::slotWallpaperTypeChanged(int i)
860	{	861	{
861	KBackgroundRenderer *r = eRenderer();	862	KCrossBGRender *r = eRenderer();
862	r->stop();	863	r->stop();
863		864
864	// No picture	865	// No picture
Lines 984-990 Link Here
984		985
985	void BGDialog::slotWallpaperPos(int mode)	986	void BGDialog::slotWallpaperPos(int mode)
986	{	987	{
987	KBackgroundRenderer *r = eRenderer();	988	KCrossBGRender *r = eRenderer();
988		989
989	mode++;	990	mode++;
990	m_wallpaperPos = mode;	991	m_wallpaperPos = mode;
Lines 1002-1008 Link Here
1002		1003
1003	void BGDialog::slotSetupMulti()	1004	void BGDialog::slotSetupMulti()
1004	{	1005	{
1005	KBackgroundRenderer *r = eRenderer();	1006	KCrossBGRender *r = eRenderer();
1006		1007
1007	BGMultiWallpaperDialog dlg(r, topLevelWidget());	1008	BGMultiWallpaperDialog dlg(r, topLevelWidget());
1008	if (dlg.exec() == TQDialog::Accepted) {	1009	if (dlg.exec() == TQDialog::Accepted) {
Lines 1018-1024 Link Here
1018		1019
1019	void BGDialog::slotPrimaryColor(const TQColor &color)	1020	void BGDialog::slotPrimaryColor(const TQColor &color)
1020	{	1021	{
1021	KBackgroundRenderer *r = eRenderer();	1022	KCrossBGRender *r = eRenderer();
1022		1023
1023	if (color == r->colorA())	1024	if (color == r->colorA())
1024	return;	1025	return;
Lines 1033-1039 Link Here
1033		1034
1034	void BGDialog::slotSecondaryColor(const TQColor &color)	1035	void BGDialog::slotSecondaryColor(const TQColor &color)
1035	{	1036	{
1036	KBackgroundRenderer *r = eRenderer();	1037	KCrossBGRender *r = eRenderer();
1037		1038
1038	if (color == r->colorB())	1039	if (color == r->colorB())
1039	return;	1040	return;
Lines 1048-1054 Link Here
1048		1049
1049	void BGDialog::slotPattern(int pattern)	1050	void BGDialog::slotPattern(int pattern)
1050	{	1051	{
1051	KBackgroundRenderer *r = eRenderer();	1052	KCrossBGRender *r = eRenderer();
1052	r->stop();	1053	r->stop();
1053	bool bSecondaryEnabled = true;	1054	bool bSecondaryEnabled = true;
1054	if (pattern < NR_PREDEF_PATTERNS)	1055	if (pattern < NR_PREDEF_PATTERNS)
Lines 1085-1091 Link Here
1085	// Copy stuff	1086	// Copy stuff
1086	for (unsigned desk = 0; desk < m_numDesks+1; ++desk )	1087	for (unsigned desk = 0; desk < m_numDesks+1; ++desk )
1087	{	1088	{
1088	KBackgroundRenderer *master = m_renderer[desk][1];	1089	KCrossBGRender *master = m_renderer[desk][1];
1089	for (unsigned screen = 0; screen < m_numScreens; ++screen)	1090	for (unsigned screen = 0; screen < m_numScreens; ++screen)
1090	{	1091	{
1091	m_renderer[desk][screen+2]->copyConfig(master);	1092	m_renderer[desk][screen+2]->copyConfig(master);
Lines 1140-1146 Link Here
1140	// Copy stuff	1141	// Copy stuff
1141	for (unsigned screen = 0; screen < m_renderer[0].size(); ++screen )	1142	for (unsigned screen = 0; screen < m_renderer[0].size(); ++screen )
1142	{	1143	{
1143	KBackgroundRenderer *master = m_renderer[0][screen];	1144	KCrossBGRender *master = m_renderer[0][screen];
1144	for (unsigned desk = 0; desk < m_numDesks; ++desk )	1145	for (unsigned desk = 0; desk < m_numDesks; ++desk )
1145	{	1146	{
1146	m_renderer[desk+1][screen]->copyConfig(master);	1147	m_renderer[desk+1][screen]->copyConfig(master);
Lines 1179-1185 Link Here
1179		1180
1180	void BGDialog::slotAdvanced()	1181	void BGDialog::slotAdvanced()
1181	{	1182	{
1182	KBackgroundRenderer *r = eRenderer();	1183	KCrossBGRender *r = eRenderer();
1183		1184
1184	m_previewUpdates = false;	1185	m_previewUpdates = false;
1185	BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);	1186	BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
Lines 1301-1307 Link Here
1301	{	1302	{
1302	for (unsigned j = 0; j < m_renderer[i].size(); ++j )	1303	for (unsigned j = 0; j < m_renderer[i].size(); ++j )
1303	{	1304	{
1304	KBackgroundRenderer * r = m_renderer[i][j];	1305	KCrossBGRender * r = m_renderer[i][j];
1305	if( r->isActive())	1306	if( r->isActive())
1306	r->stop();	1307	r->stop();
1307	r->desktopResized();	1308	r->desktopResized();

Lines 33-46 Link Here

(-)./kcontrol/background/bgadvanced.h.ori (-3 / +3 lines)
33	class TQSpinBox;	33	class TQSpinBox;
34		34
35	class BGAdvancedBase;	35	class BGAdvancedBase;
36	class KBackgroundRenderer;	36	class KCrossBGRender;
37	class KBackgroundProgram;	37	class KBackgroundProgram;
38		38
39	class BGAdvancedDialog : public KDialogBase	39	class BGAdvancedDialog : public KDialogBase
40	{	40	{
41	Q_OBJECT	41	Q_OBJECT
42	public:	42	public:
43	BGAdvancedDialog(KBackgroundRenderer _r, TQWidget parent, bool m_multidesktop);	43	BGAdvancedDialog(KCrossBGRender _r, TQWidget parent, bool m_multidesktop);
44		44
45	void setCacheSize(int s);	45	void setCacheSize(int s);
46	int cacheSize();	46	int cacheSize();
Lines 79-85 Link Here
79	void slotEnableProgram(bool b);	79	void slotEnableProgram(bool b);
80		80
81	private:	81	private:
82	KBackgroundRenderer *r;	82	KCrossBGRender *r;
83		83
84	BGAdvancedBase *dlg;	84	BGAdvancedBase *dlg;
85		85

Lines 28-33 Link Here

(-)./kcontrol/background/bgdialog.h.ORI (-2 / +3 lines)
28	#include "bgrender.h"	28	#include "bgrender.h"
29	#include "bgsettings.h"	29	#include "bgsettings.h"
30	#include "bgdefaults.h"	30	#include "bgdefaults.h"
		31	#include "KCrossBGRender.h"
31		32
32	class BGMonitorArrangement;	33	class BGMonitorArrangement;
33	class KStandardDirs;	34	class KStandardDirs;
Lines 53-59 Link Here
53	protected:	54	protected:
54	void initUI();	55	void initUI();
55	void updateUI();	56	void updateUI();
56	KBackgroundRenderer * eRenderer();	57	KCrossBGRender * eRenderer();
57		58
58	void setWallpaper(const TQString &);	59	void setWallpaper(const TQString &);
59		60
Lines 95-101 Link Here
95	int m_screen;	96	int m_screen;
96	int m_eDesk;	97	int m_eDesk;
97	int m_eScreen;	98	int m_eScreen;
98	TQValueVector< TQPtrVector<KBackgroundRenderer> > m_renderer; // m_renderer[desk][screen]	99	TQValueVector< TQPtrVector<KCrossBGRender> > m_renderer; // m_renderer[desk][screen]
99	TQMap<TQString,int> m_wallpaper;	100	TQMap<TQString,int> m_wallpaper;
100	TQStringList m_patterns;	101	TQStringList m_patterns;
101	int m_slideShowRandom; // Remembers last Slide Show setting	102	int m_slideShowRandom; // Remembers last Slide Show setting

Lines 27-32 Link Here

(-)./kcontrol/background/bgwallpaper.h.ORI (+5 lines)
27	#include <tqstringlist.h>	27	#include <tqstringlist.h>
28		28
29	#include <kdialogbase.h>	29	#include <kdialogbase.h>
		30	#include <kdebug.h>
30		31
31	class BGMultiWallpaperBase;	32	class BGMultiWallpaperBase;
32	class KBackgroundSettings;	33	class KBackgroundSettings;
Lines 55-66 Link Here
55	void slotMoveDown();	56	void slotMoveDown();
56	void slotOk();	57	void slotOk();
57	void slotItemSelected( TQListBoxItem * );	58	void slotItemSelected( TQListBoxItem * );
		59	void slotCheckScheduled(bool);
		60	void slotChangedXML(const TQString&);
		61
58	private:	62	private:
59	void setEnabledMoveButtons();	63	void setEnabledMoveButtons();
60		64
61	KBackgroundSettings *m_pSettings;	65	KBackgroundSettings *m_pSettings;
62		66
63	BGMultiWallpaperBase *dlg;	67	BGMultiWallpaperBase *dlg;
		68	TQString lastXml;
64	};	69	};
65		70
66	#endif	71	#endif

Lines 1-4 Link Here

(-)kdebase-3.5.9/kcontrol/background/bgwallpaper_ui.ui.kbg_trans (-103 / +162 lines)
1	<!DOCTYPE UI><UI version="3.1" stdsetdef="1">	1	<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
2	<class>BGMultiWallpaperBase</class>	2	<class>BGMultiWallpaperBase</class>
3	<widget class="TQWidget">	3	<widget class="TQWidget">
4	<property name="name">	4	<property name="name">
Lines 8-162 Link Here
8	<rect>	8	<rect>
9	<x>0</x>	9	<x>0</x>
10	<y>0</y>	10	<y>0</y>
11	<width>410</width>	11	<width>499</width>
12	<height>196</height>	12	<height>526</height>
13	</rect>	13	</rect>
14	</property>	14	</property>
15	<grid>	15	<property name="caption">
		16	<string>BGMultiWallPaperBase</string>
		17	</property>
		18	<vbox>
16	<property name="name">	19	<property name="name">
17	<cstring>unnamed</cstring>	20	<cstring>unnamed</cstring>
18	</property>	21	</property>
19	<property name="margin">	22	<property name="margin">
20	<number>0</number>	23	<number>0</number>
21	</property>	24	</property>
22	<widget class="TQLabel" row="2" column="0">	25	<widget class="TQLayoutWidget">
23	<property name="name">
24	<cstring>textLabel2</cstring>
25	</property>
26	<property name="text">
27	<string>Show the following pictures:</string>
28	</property>
29	</widget>
30	<widget class="TQCheckBox" row="1" column="0">
31	<property name="name">
32	<cstring>m_cbRandom</cstring>
33	</property>
34	<property name="text">
35	<string>&Show pictures in random order</string>
36	</property>
37	</widget>
38	<widget class="TQLayoutWidget" row="0" column="0">
39	<property name="name">	26	<property name="name">
40	<cstring>layout3</cstring>	27	<cstring>layout8</cstring>
41	</property>	28	</property>
42	<hbox>	29	<hbox>
43	<property name="name">	30	<property name="name">
44	<cstring>unnamed</cstring>	31	<cstring>unnamed</cstring>
45	</property>	32	</property>
46	<widget class="TQLabel">	33	<widget class="TQCheckBox">
47	<property name="name">	34	<property name="name">
48	<cstring>textLabel1</cstring>	35	<cstring>chkScheduled</cstring>
49	</property>	36	</property>
50	<property name="text">	37	<property name="text">
51	<string>Change &picture after:</string>	38	<string>Scheduled Slide Show</string>
52	</property>
53	<property name="buddy" stdset="0">
54	<cstring>m_spinInterval</cstring>
55	</property>	39	</property>
56	</widget>	40	</widget>
57	<widget class="TQSpinBox">	41	<widget class="KURLRequester">
58	<property name="name">	42	<property name="name">
59	<cstring>m_spinInterval</cstring>	43	<cstring>kurlXmlFile</cstring>
60	</property>	44	</property>
61	</widget>	45	</widget>
62	<spacer>
63	<property name="name">
64	<cstring>spacer4</cstring>
65	</property>
66	<property name="orientation">
67	<enum>Horizontal</enum>
68	</property>
69	<property name="sizeType">
70	<enum>Expanding</enum>
71	</property>
72	<property name="sizeHint">
73	<size>
74	<width>20</width>
75	<height>20</height>
76	</size>
77	</property>
78	</spacer>
79	</hbox>	46	</hbox>
80	</widget>	47	</widget>
81	<widget class="TQLayoutWidget" row="3" column="0">	48	<widget class="QGroupBox">
82	<property name="name">	49	<property name="name">
83	<cstring>layout4</cstring>	50	<cstring>grpNormalShow</cstring>
84	</property>	51	</property>
85	<grid>	52	<property name="title">
		53	<string></string>
		54	</property>
		55	<vbox>
86	<property name="name">	56	<property name="name">
87	<cstring>unnamed</cstring>	57	<cstring>unnamed</cstring>
88	</property>	58	</property>
89	<widget class="BGMultiWallpaperList" row="0" column="0" rowspan="5" colspan="1">	59	<widget class="TQLayoutWidget">
90	<property name="name">	60	<property name="name">
91	<cstring>m_listImages</cstring>	61	<cstring>layout3</cstring>
92	</property>
93	<property name="sizePolicy">
94	<sizepolicy>
95	<hsizetype>3</hsizetype>
96	<vsizetype>3</vsizetype>
97	<horstretch>0</horstretch>
98	<verstretch>0</verstretch>
99	</sizepolicy>
100	</property>
101	<property name="minimumSize">
102	<size>
103	<width>300</width>
104	<height>100</height>
105	</size>
106	</property>	62	</property>
		63	<hbox>
		64	<property name="name">
		65	<cstring>unnamed</cstring>
		66	</property>
		67	<widget class="TQLabel">
		68	<property name="name">
		69	<cstring>textLabel1_2</cstring>
		70	</property>
		71	<property name="text">
		72	<string>Change &picture after:</string>
		73	</property>
		74	<property name="buddy" stdset="0">
		75	<cstring>m_spinInterval</cstring>
		76	</property>
		77	</widget>
		78	<widget class="TQSpinBox">
		79	<property name="name">
		80	<cstring>m_spinInterval</cstring>
		81	</property>
		82	</widget>
		83	<spacer>
		84	<property name="name">
		85	<cstring>spacer4</cstring>
		86	</property>
		87	<property name="orientation">
		88	<enum>Horizontal</enum>
		89	</property>
		90	<property name="sizeType">
		91	<enum>Expanding</enum>
		92	</property>
		93	<property name="sizeHint">
		94	<size>
		95	<width>20</width>
		96	<height>20</height>
		97	</size>
		98	</property>
		99	</spacer>
		100	</hbox>
107	</widget>	101	</widget>
108	<widget class="TQPushButton" row="0" column="1">	102	<widget class="TQCheckBox">
109	<property name="name">	103	<property name="name">
110	<cstring>m_buttonAdd</cstring>	104	<cstring>m_cbRandom</cstring>
111	</property>	105	</property>
112	<property name="text">	106	<property name="text">
113	<string>&Add...</string>	107	<string>&Show pictures in random order</string>
114	</property>
115	</widget>
116	<spacer row="4" column="1">
117	<property name="name">
118	<cstring>spacer5</cstring>
119	</property>
120	<property name="orientation">
121	<enum>Vertical</enum>
122	</property>
123	<property name="sizeType">
124	<enum>Expanding</enum>
125	</property>	108	</property>
126	<property name="sizeHint">	109	<property name="accel">
127	<size>	110	<string>Alt+S</string>
128	<width>20</width>
129	<height>20</height>
130	</size>
131	</property>
132	</spacer>
133	<widget class="TQPushButton" row="1" column="1">
134	<property name="name">
135	<cstring>m_buttonRemove</cstring>
136	</property>
137	<property name="text">
138	<string>&Remove</string>
139	</property>	111	</property>
140	</widget>	112	</widget>
141	<widget class="TQPushButton" row="3" column="1">	113	<widget class="TQLabel">
142	<property name="name">	114	<property name="name">
143	<cstring>m_buttonMoveDown</cstring>	115	<cstring>textLabel2</cstring>
144	</property>	116	</property>
145	<property name="text">	117	<property name="text">
146	<string>Move &Down</string>	118	<string>Show the following pictures:</string>
147	</property>	119	</property>
148	</widget>	120	</widget>
149	<widget class="TQPushButton" row="2" column="1">	121	<widget class="TQLayoutWidget">
150	<property name="name">	122	<property name="name">
151	<cstring>m_buttonMoveUp</cstring>	123	<cstring>layout4</cstring>
152	</property>
153	<property name="text">
154	<string>Move &Up</string>
155	</property>	124	</property>
		125	<grid>
		126	<property name="name">
		127	<cstring>unnamed</cstring>
		128	</property>
		129	<widget class="BGMultiWallpaperList" row="0" column="0" rowspan="5" colspan="1">
		130	<property name="name">
		131	<cstring>m_listImages</cstring>
		132	</property>
		133	<property name="sizePolicy">
		134	<sizepolicy>
		135	<hsizetype>3</hsizetype>
		136	<vsizetype>3</vsizetype>
		137	<horstretch>0</horstretch>
		138	<verstretch>0</verstretch>
		139	</sizepolicy>
		140	</property>
		141	<property name="minimumSize">
		142	<size>
		143	<width>300</width>
		144	<height>100</height>
		145	</size>
		146	</property>
		147	</widget>
		148	<widget class="TQPushButton" row="0" column="1">
		149	<property name="name">
		150	<cstring>m_buttonAdd</cstring>
		151	</property>
		152	<property name="text">
		153	<string>&Add...</string>
		154	</property>
		155	<property name="accel">
		156	<string>Alt+A</string>
		157	</property>
		158	</widget>
		159	<spacer row="4" column="1">
		160	<property name="name">
		161	<cstring>spacer5</cstring>
		162	</property>
		163	<property name="orientation">
		164	<enum>Vertical</enum>
		165	</property>
		166	<property name="sizeType">
		167	<enum>Expanding</enum>
		168	</property>
		169	<property name="sizeHint">
		170	<size>
		171	<width>20</width>
		172	<height>20</height>
		173	</size>
		174	</property>
		175	</spacer>
		176	<widget class="TQPushButton" row="1" column="1">
		177	<property name="name">
		178	<cstring>m_buttonRemove</cstring>
		179	</property>
		180	<property name="text">
		181	<string>&Remove</string>
		182	</property>
		183	<property name="accel">
		184	<string>Alt+R</string>
		185	</property>
		186	</widget>
		187	<widget class="TQPushButton" row="3" column="1">
		188	<property name="name">
189	<cstring>m_buttonMoveDown</cstring>
190	</property>
191	<property name="text">
192	<string>Move &Down</string>
193	</property>
194	<property name="accel">
195	<string>Alt+D</string>
196	</property>
197	</widget>
198	<widget class="TQPushButton" row="2" column="1">
199	<property name="name">
200	<cstring>m_buttonMoveUp</cstring>
201	</property>
202	<property name="text">
203	<string>Move &Up</string>
204	</property>
205	<property name="accel">
206	<string>Alt+U</string>
207	</property>
208	</widget>
209	</grid>
156	</widget>	210	</widget>
157	</grid>	211	</vbox>
158	</widget>	212	</widget>
159	</grid>	213	</vbox>
160	</widget>	214	</widget>
161	<includes>	215	<includes>
162	<include location="local" impldecl="in declaration">bgwallpaper.h</include>	216	<include location="local" impldecl="in declaration">bgwallpaper.h</include>
Lines 164-167 Link Here
164	</includes>	218	</includes>
165	<layoutdefaults spacing="3" margin="6"/>	219	<layoutdefaults spacing="3" margin="6"/>
166	<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>	220	<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
		221	<includehints>
		222	<includehint>kurlrequester.h</includehint>
		223	<includehint>klineedit.h</includehint>
		224	<includehint>kpushbutton.h</includehint>
		225	</includehints>
167	</UI>	226	</UI>