Author: arekm Date: Thu Sep 7 14:59:55 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdebase-branch.diff (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SOURCES/kdebase-branch.diff
diff -u SOURCES/kdebase-branch.diff:1.32 SOURCES/kdebase-branch.diff:1.33
--- SOURCES/kdebase-branch.diff:1.32 Tue Aug 8 08:09:00 2006
+++ SOURCES/kdebase-branch.diff Thu Sep 7 16:59:49 2006
@@ -1,8 +1,288 @@
+Index: ksmserver/shutdown.cpp
+===================================================================
+--- ksmserver/shutdown.cpp (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ ksmserver/shutdown.cpp (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -359,6 +359,16 @@
+ state = Idle;
+ }
+
++void KSMServer::startProtection()
++{
++ protectionTimer.start( 10000, true );
++}
++
++void KSMServer::endProtection()
++{
++ protectionTimer.stop();
++}
++
+ /*
+ Internal protection slot, invoked when clients do not react during
+ shutdown.
+@@ -445,7 +455,7 @@
+ for ( KSMClient* c = clients.first(); c; c = clients.next() ) {
+ if( isWM( c )) {
+ kdDebug( 1218 ) << "Killing WM: " << c->program() << "(" <<
c->clientId() << ")" << endl;
+- QTimer::singleShot( 1000, this, SLOT( timeoutWMQuit()));
++ QTimer::singleShot( 2000, this, SLOT( timeoutWMQuit()));
+ SmsDie( c->connection());
+ return;
+ }
+@@ -467,7 +477,7 @@
+ kdDebug( 1218 ) << " We killed all clients. We have now clients.count()="
<<
+ clients.count() << endl;
+ completeKilling();
+- QTimer::singleShot( 4000, this, SLOT( timeoutQuit() ) );
++ QTimer::singleShot( 10000, this, SLOT( timeoutQuit() ) );
+ }
+
+ void KSMServer::completeKilling()
+Index: ksmserver/server.h
+===================================================================
+--- ksmserver/server.h (.../tags/KDE/3.5.4/kdebase) (revision 581794)
++++ ksmserver/server.h (.../branches/KDE/3.5/kdebase) (revision 581794)
+@@ -126,8 +126,8 @@
+ void discardSession();
+ void storeSession();
+
+- void startProtection() { protectionTimer.start( 8000, TRUE ); }
+- void endProtection() { protectionTimer.stop(); }
++ void startProtection();
++ void endProtection();
+
+ void startApplication( QStringList command,
+ const QString& clientMachine = QString::null,
+Index: kate/app/kateconsole.cpp
+===================================================================
+--- kate/app/kateconsole.cpp (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kate/app/kateconsole.cpp (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -67,6 +67,8 @@
+
+ if (!m_part) return;
+
++ setFocusProxy(m_part->widget());
++
+ KGlobal::locale()->insertCatalogue("konsole");
+
+ m_part->widget()->show();
+Index: kate/app/kategrepdialog.cpp
+===================================================================
+--- kate/app/kategrepdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kate/app/kategrepdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -66,7 +66,7 @@
+
+
+ GrepTool::GrepTool(QWidget *parent, const char *name)
+- : QWidget(parent, name/*, false*/), childproc(0)
++ : QWidget(parent, name/*, false*/), m_fixFocus(true), childproc(0)
+ {
+ setCaption(i18n("Find in Files"));
+ config = KGlobal::config();
+@@ -527,4 +527,19 @@
+ return QWidget::eventFilter( o, e );
+ }
+
++void GrepTool::focusInEvent ( QFocusEvent * ev )
++{
++ QWidget::focusInEvent(ev);
++ if (m_fixFocus) {
++ m_fixFocus = false;
++ cmbPattern->setFocus();
++ }
++}
++
++void GrepTool::showEvent( QShowEvent * ev )
++{
++ QWidget::showEvent(ev);
++ m_fixFocus = true;
++}
++
+ #include "kategrepdialog.moc"
+Index: kate/app/katemainwindow.cpp
+===================================================================
+--- kate/app/katemainwindow.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kate/app/katemainwindow.cpp (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -482,8 +482,11 @@
+
+ QListViewItem * item = filelist->firstChild();
+ while( item ) {
++ // would it be saner to use the screen width as a limit that some random
number??
++ QString name = KStringHandler::rsqueeze( ((KateFileListItem
*)item)->document()->docName(), 150 );
++ Kate::Document* doc = ((KateFileListItem *)item)->document();
+ documentMenu->insertItem (
+- KStringHandler::rsqueeze( ((KateFileListItem
*)item)->document()->docName(), 150 ), // would it be saner to use the screen
width as a limit that some random number??
++ doc->isModified() ? i18n("'document name [*]', [*] means modified",
"%1 [*]").arg(name) : name,
+ m_viewManager, SLOT (activateView (int)), 0,
+ ((KateFileListItem *)item)->documentNumber () );
+
+Index: kate/app/katemwmodonhddialog.cpp
+===================================================================
+--- kate/app/katemwmodonhddialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kate/app/katemwmodonhddialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -215,7 +215,7 @@
+ // Start a KProcess that creates a diff
+ KProcIO *p = new KProcIO();
+ p->setComm( KProcess::All );
+- *p << "diff" << "-ub" << "-" << doc->url().path();
++ *p << "diff" << "-u" << "-" << doc->url().path();
+ connect( p, SIGNAL(processExited(KProcess*)), this,
SLOT(slotPDone(KProcess*)) );
+ connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(slotPRead(KProcIO*)) );
+
+@@ -237,15 +237,29 @@
+ m_tmpfile = new KTempFile();
+ // put all the data we have in it
+ QString stmp;
+- while ( p->readln( stmp, false ) > -1 )
++ bool dataRead = false;
++ while ( p->readln( stmp, false ) > -1 ) {
+ *m_tmpfile->textStream() << stmp << endl;
++ dataRead = true;
++ }
+
+- p->ackRead();
++ if (dataRead)
++ p->ackRead();
+ }
+
+ void KateMwModOnHdDialog::slotPDone( KProcess *p )
+ {
+ setCursor( ArrowCursor );
++ if( ! m_tmpfile )
++ {
++ // dominik: there were only whitespace changes, so that the diff returned
by
++ // diff(1) has 0 bytes. So slotPRead() is never called, as there is
++ // no data, so that m_tmpfile was never created and thus is NULL.
++ // NOTE: would be nice, if we could produce a fake-diff, so that kompare
++ // tells us "The files are identical". Right now, we get an ugly
++ // "Could not parse diff output".
++ m_tmpfile = new KTempFile();
++ }
+ m_tmpfile->close();
+
+ if ( ! p->normalExit() /*|| p->exitStatus()*/ )
+Index: kate/app/kategrepdialog.h
+===================================================================
+--- kate/app/kategrepdialog.h (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kate/app/kategrepdialog.h (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -57,6 +57,9 @@
+
+ protected:
+ bool eventFilter( QObject *, QEvent * );
++ void focusInEvent ( QFocusEvent * );
++ void showEvent( QShowEvent * );
++ bool m_fixFocus;
+
+ private slots:
+ void templateActivated(int index);
+Index: kate/app/katesession.cpp
+===================================================================
+--- kate/app/katesession.cpp (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kate/app/katesession.cpp (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -48,6 +48,11 @@
+ #include <unistd.h>
+ #include <time.h>
+
++bool operator<( const KateSession::Ptr& a, const KateSession::Ptr& b )
++{
++ return a->sessionName().lower() < b->sessionName().lower();
++}
++
+ KateSession::KateSession (KateSessionManager *manager, const QString
&fileName, const QString &name)
+ : m_sessionFileRel (fileName)
+ , m_sessionName (name)
+@@ -245,6 +250,8 @@
+ // add default session, if not there
+ if (!foundDefault)
+ m_sessionList.append (new KateSession (this, "default.katesession",
i18n("Default Session")));
++
++ qHeapSort(m_sessionList);
+ }
+
+ void KateSessionManager::activateSession (KateSession::Ptr session, bool
closeLast, bool saveLast, bool loadNew)
+Index: kate/data/kateplugin.desktop
+===================================================================
+--- kate/data/kateplugin.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kate/data/kateplugin.desktop (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -22,7 +22,7 @@
+ Comment[es]=Plugin de Kate
+ Comment[et]=Kate plugin
+ Comment[eu]=Kate plugina
+-Comment[fa]=Ů
تؾ٠ڊŮŮŘŻŮâŰ ÚŠŰŘŞ
++Comment[fa]=Ůؾ٠شدŮŰ Kate
+ Comment[fi]=Kate-liitännäinen
+ Comment[fo]=Kate-Ăstingur
+ Comment[fr]=Module de Kate
+Index: kate/data/kate.desktop
+===================================================================
+--- kate/data/kate.desktop (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kate/data/kate.desktop (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -18,7 +18,7 @@
+ GenericName[es]=Editor de texto avanzado
+ GenericName[et]=VĂľimas tekstiredaktor
+ GenericName[eu]=Testu editore aurreratua
+-GenericName[fa]=ŮŰعاŰŘ´ÚŻŘą Ů
ŘŞŮ ŮžŰŘ´ŘąŮŘŞŮ
++GenericName[fa]=ŮŰعاستاع Ů
ŘŞŮ ŮžŰŘ´ŘąŮŘŞŮ
+ GenericName[fi]=Kehittynyt tekstieditori
+ GenericName[fr]=Ăditeur de texte avancĂŠ
+ GenericName[fy]=avansearre tekstbewurker
+@@ -70,7 +70,6 @@
+ Name[ar]=ŮŮŘŞ
+ Name[bn]=ŕŚŕ§ŕŚ
+ Name[eo]=Kodredaktilo
+-Name[fa]=ÚŠŮŰŘŞ
+ Name[hi]=ŕ¤ŕĽ-ŕ¤ŕ¤ŕĽŕ¤
+ Name[ko]=ěš´í
+ Name[mk]=ĐĐ°ŃĐľ
+Index: kate/data/kwrite.desktop
+===================================================================
+--- kate/data/kwrite.desktop (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kate/data/kwrite.desktop (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -19,7 +19,7 @@
+ GenericName[es]=Editor de texto
+ GenericName[et]=Tekstiredaktor
+ GenericName[eu]=Testu editorea
+-GenericName[fa]=ŮŰعاŰŘ´ÚŻŘą Ů
ŘŞŮ
++GenericName[fa]=ŮŰعاستاع Ů
ŘŞŮ
+ GenericName[fi]=Tekstieditori
+ GenericName[fo]=Tekstritil
+ GenericName[fr]=Ăditeur de texte
+@@ -81,7 +81,6 @@
+ Name[ar]=Ůاتب ŮŮŘŻŮ
+ Name[bn]=ŕŚŕ§-রাŕŚŕŚ
+ Name[eo]=Malnova simpla kodredaktilo
+-Name[fa]=ŮŮشتاع K
+ Name[fo]=KSkriva
+ Name[hi]=ŕ¤ŕĽ-रञŕ¤ŕ¤
+ Name[lo]=Kwrite
Index: kdepasswd/kcm/kcm_useraccount.desktop
===================================================================
---- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 570934)
-+++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase)
(revision 570934)
-@@ -153,7 +153,7 @@
+--- kdepasswd/kcm/kcm_useraccount.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kdepasswd/kcm/kcm_useraccount.desktop (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -23,6 +23,7 @@
+ Name[es]=ContraseĂąa y cuenta de usuario
+ Name[et]=Parool ja kasutaja konto
+ Name[eu]=Pasahitza eta erabiltzaile kontua
++Name[fa]=اسŮ
ŘąŮ
ز Ů Řساب ڊاعبعŰ
+ Name[fi]=Salasanat ja käyttäjätilit
+ Name[fr]=Compte utilisateur et mot de passe
+ Name[fy]=Wachtwurd en brĂťkersbehear
+@@ -80,6 +81,7 @@
+ Keywords[es]=contraseĂąa;correo electrĂłnico;nombre;organizaciĂłn;nombre
real;imagen de acceso;cara;modo de eco
+ Keywords[et]=parool;email;nimi;organisatsioon;pärisnimi;kasutaja pilt;nägu;
echo reĹžiim
+ Keywords[eu]=pasahitza;helb-elek;izena;erakundea;benetako izena;sarrerako
irudia,aurpegia,echo modua
++Keywords[fa]=اسŮ
ŘąŮ
Ř˛Ř ŘąŘ§ŰاŮاŮ
ŮŘ ŮاŮ
Ř ŘłŘ§Ř˛Ů
اŮŘ
ŮاŮ
ŮاŮŘšŰŘ ŘŞŘľŮŰŘą ŮŘąŮŘŻŘ ÚŮŘąŮŘ ŘاŮŘŞ ŮžÚŮاڊ
+ Keywords[fi]=salasana,sähkÜposti,nimi,organisaatio,oikea
nimi,kirjautumiskuva,naama,kaiutustilanus,kaiutustapa
+ Keywords[fr]=mot de passe,email,courrier ĂŠlectronique,adresse
ĂŠlectronique,organisation,non complet,image d'identification,mode
d'affichage,face
+
Keywords[fy]=wachtwoord,wachtwurd,e-mail,e-post,organisatie,organisaasje,naam,namme,login,aanmelden,oanmelde,afbeelding,Ă´fbyldings,gezicht,echo,asterisk
+@@ -130,6 +132,7 @@
+ Comment[es]=InformaciĂłn del usuario como la contraseĂąa, el nombre o el
correo electrĂłnico
+ Comment[et]=Kasutajainfo, nt. parool, nimi ja e-posti aadress
+ Comment[eu]=Erabiltzaileari buruzko informazioa; pasahitza, izena eta
posta-helbidea, adibidez.
++Comment[fa]=استŮاد٠از اءŮŘ§ŘšŘ§ŘŞŰ ŮظŰŘą اسŮ
ŘąŮ
زŘ
ŮاŮ
٠عاŰاŮاŮ
Ů
+ Comment[fi]=Käyttäjien tiedot, kuten salasanat, nimet ja sähkÜpostiosoite
+ Comment[fr]=Informations sur l'utilisateur, comme le mot de passe, le nom, et
l'adresse ĂŠlectronique
+ Comment[fy]=BrĂťkersynformaasje sa as wachtwurd, namme en e-adres
+@@ -153,7 +156,7 @@
Comment[nn]=Brukarinformasjon som passord, namn og e-postadresse
Comment[pa]=ŕ¨ŕ¨Şŕ¨ŕŠŕ¨ŕŠ ŕ¨ŕ¨žŕ¨Łŕ¨ŕ¨žŕ¨°ŕŠ ŕ¨ŕ¨żŕ¨ľŕŠŕ¨ ŕ¨ŕ¨ż
ŕ¨ŕŠŕ¨Şŕ¨¤-ŕ¨ŕŠŕ¨Ą, ਨਞਠŕ¨
ਤ੠ŕ¨-ਪੱਤਰ
Comment[pl]=Informacje o koncie uĹźytkownika: hasĹo, imiÄ i nazwisko,
e-mail itd.
@@ -11,11 +291,82 @@
Comment[pt_BR]=Informaçþes do usuårio tais como senha, nome e e-mail
Comment[ro]=InformaĹŁii despre utilizator, precum parola, numele Ĺi adresa
de e-mail
Comment[ru]=ĐĄĐ˛ĐľĐ´ĐľĐ˝Đ¸Ń Đž пОНŃСОваŃоНо, Ńакио как
паŃОНŃ, Đ¸ĐźŃ Đ¸ e-mail
+Index: kdepasswd/kdepasswd.desktop
+===================================================================
+--- kdepasswd/kdepasswd.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kdepasswd/kdepasswd.desktop (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -23,6 +23,7 @@
+ Name[es]=Cambiar contraseĂąa
+ Name[et]=Parooli muutmine
+ Name[eu]=Aldatu pasahitza
++Name[fa]=ŘŞŘşŰŰŘą اسŮ
ŘąŮ
ز
+ Name[fi]=Vaihda salasanaa
+ Name[fr]=Modifier le mot de passe
+ Name[fy]=Wachtwurd wizigje
+Index: kpersonalizer/ksysinfo.cpp
+===================================================================
+--- kpersonalizer/ksysinfo.cpp (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kpersonalizer/ksysinfo.cpp (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -73,6 +73,7 @@
+ if (!extension.compare("RENDER"))
+ m_xrender=true;
+ }
++ XFreeExtensionList(extensions);
+ XCloseDisplay (dpy);
+ }
+
+Index: kpersonalizer/kpersonalizer.desktop
+===================================================================
+--- kpersonalizer/kpersonalizer.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kpersonalizer/kpersonalizer.desktop (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -24,7 +24,7 @@
+ Name[es]=Asistente para las preferencias del escritorio
+ Name[et]=TÜÜlaua seadistuste abimees
+ Name[eu]=Mahaigaineko ezarpenetarako morroia
+-Name[fa]= ŘŞŮظŰŮ
؏ادŮÚŻŘą Ů
Űزڊاع
++Name[fa]=؏ادŮÚŻŘą ŘŞŮظŰŮ
ات ŘąŮŮ
ŰزŰ
+ Name[fi]=TyÜpÜydän ohjattu asettaminen
+ Name[fr]=KPersonalizer
+ Name[fy]=KDE's Ynstellings Assistent
+Index: kfind/kfindpart.desktop
+===================================================================
+--- kfind/kfindpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kfind/kfindpart.desktop (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -19,7 +19,7 @@
+ Name[es]=Buscar parte
+ Name[et]=Failide otsimise komponent
+ Name[eu]=Bilatu partea
+-Name[fa]=ŮŘłŮ
ŘŞ عا ŮžŰدا ÚŠŮ
++Name[fa]=ŰاŮت٠؏زإ
+ Name[fi]=Etsi osa
+ Name[fr]=Composant de recherche
+ Name[fy]=In diel sykje
+Index: kfind/findpart.desktop
+===================================================================
+--- kfind/findpart.desktop (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kfind/findpart.desktop (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -21,7 +21,7 @@
+ Name[es]=Buscar parte
+ Name[et]=Failide otsimise komponent
+ Name[eu]=Bilatu partea
+-Name[fa]=ŮŘłŮ
ŘŞ عا ŮžŰدا ÚŠŮ
++Name[fa]=ŰاŮت٠؏زإ
+ Name[fi]=Etsi osa
+ Name[fr]=Composant de recherche
+ Name[fy]=In diel sykje
Index: kfind/Kfind.desktop
===================================================================
---- kfind/Kfind.desktop (.../tags/KDE/3.5.4/kdebase) (revision
570934)
-+++ kfind/Kfind.desktop (.../branches/KDE/3.5/kdebase) (revision
570934)
-@@ -35,7 +35,7 @@
+--- kfind/Kfind.desktop (.../tags/KDE/3.5.4/kdebase) (revision
581794)
++++ kfind/Kfind.desktop (.../branches/KDE/3.5/kdebase) (revision
581794)
+@@ -20,6 +20,7 @@
+ Name[es]=Buscar archivos/carpetas
+ Name[et]=Failide/kataloogide otsimine
+ Name[eu]=Bilatu fitxategiak/karpetak
++Name[fa]=ŰاŮت٠ٞعŮŮŘŻŮâŮا/ŮžŮŘ´ŮâŮا
+ Name[fi]=Etsi tiedostoja ja kansioita
+ Name[fr]=Recherche de fichiers/dossiers
+ Name[fy]=Triemmen/mappen sykje
+@@ -35,7 +36,7 @@
Name[lt]=Rasti bylas/aplankus
Name[lv]=MeklÄt Failus/Mapes
Name[mk]=ĐŃОнаŃди Đ´Đ°ŃĐžŃоки/папки
@@ -24,11 +375,854 @@
Name[nb]=Finn filer/mapper
Name[nds]=Dateien/Ornern sĂśken
Name[nl]=Bestanden/mappen zoeken
+Index: kcontrol/background/background.desktop
+===================================================================
+--- kcontrol/background/background.desktop (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/background.desktop (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -29,7 +29,7 @@
+ Name[es]=Fondo
+ Name[et]=Taust
+ Name[eu]=Atzeko planoa
+-Name[fa]=ٞسâزŮ
ŰŮŮ
++Name[fa]=زŮ
ŰŮŮ
+ Name[fi]=Tausta
+ Name[fr]=Fond d'ĂŠcran
+ Name[fy]=EftergrĂťn
+@@ -104,7 +104,7 @@
+ Comment[es]=ModificaciĂłn de las preferencias del fondo
+ Comment[et]=TÜÜlaua tausta seaded
+ Comment[eu]=Aldatu atzeko planoaren ezarpenak
+-Comment[fa]=ŘŞŘşŰŰŘą ŘŞŮظŰŮ
ات ٞسâزŮ
ŰŮŮ
++Comment[fa]=ŘŞŘşŰŰŘą ŘŞŮظŰŮ
ات زŮ
ŰŮŮ
+ Comment[fi]=Muuta taustan asetuksia
+ Comment[fr]=Configuration du fond d'ĂŠcran
+ Comment[fy]=EftergrĂťnynstellings wizigje
+@@ -173,7 +173,7 @@
+
Keywords[es]=fondo,escritorios,colores,imĂĄgenes,tapices,mezcla,equilibrio,cachĂŠ,tapices
mĂşltiples,mapa de pixels,pixmap
+
Keywords[et]=taust,tÜÜlaud,tÜÜlauad,värvid,pildid,taustapildid,ßleminek,tasakaal,vahemälu,pikselrastrid
+ Keywords[eu]=atzeko
planoa,mahaigainak,kolorea,koloreak,irudiak,hormapaperak,nahasketa,
oreka,katxea,hormapaper anitz,pixel mapa
+-Keywords[fa]=background,desktops,colors,colours,images,wallpapers,blending,balance,cache,multiple
wallpapers,pixmap,ٞسâزŮ
ŰŮŮ,ڊاغذدŰŮاعŰ
++Keywords[fa]= زŮ
ŰŮŮ Ř ŘąŮŮ
ŰزŰŮŘ§Ř ŘąŮÚŻŮŘ§Ř ŘąŮÚŻŮاŘ
تؾاŮŰŘąŘ ÚŠŘ§ŘşŘ°ŮŘ§Ű ŘŻŰŮاعŰŘ Ů
ŘŽŮŮŘˇŘ ŘŞŮاز٠Ř
ŮŮا٠گاŮŘ ÚŠŘ§ŘşŘ°ŘŻŰŮاعŰŮŘ§Ű Ů
تؚدد Ř Ůگاشت بŰŘŞ
+
Keywords[fi]=tausta,tyÜpÜydät,värit,kuvat,taustakuvat,sekoitus,välimuisti,useat
taustakuvat,kuvakartat
+ Keywords[fr]=fond d'ĂŠcran,fond,bureau,couleur,image,papier peint,image de
fond,dĂŠgradĂŠ,cache,papiers peints multiples
+
Keywords[fy]=eftergrĂťn,buroblĂŞden,kleur,kleuren,Ă´fbyldingen,behang,ferminge,
balâns,lyts Ýnthâld,meardere ôfbyldingen,pixmap,grafysk
+Index: kcontrol/background/bgdialog.cpp
+===================================================================
+--- kcontrol/background/bgdialog.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/bgdialog.cpp (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -288,8 +288,9 @@
+ m_buttonGetNew->setEnabled( false );
+ }
+
+-void BGDialog::load()
++void BGDialog::load( bool useDefaults )
+ {
++ m_pGlobals->getConfig()->setReadDefaults( useDefaults );
+ m_pGlobals->readSettings();
+ m_eDesk = m_pGlobals->commonDeskBackground() ? 0 : m_desk;
+ getEScreen();
+@@ -321,7 +322,7 @@
+ m_wallpaperPos = KBackgroundSettings::Centred; // Default
+
+ updateUI();
+- emit changed(false);
++ emit changed(useDefaults);
+ }
+
+ void BGDialog::save()
+@@ -358,51 +359,7 @@
+
+ void BGDialog::defaults()
+ {
+- m_pGlobals->setCommonScreenBackground(_defCommonScreen);
+- m_pGlobals->setCommonDeskBackground(_defCommonDesk);
+- m_pGlobals->setLimitCache(_defLimitCache);
+- m_pGlobals->setCacheSize(_defCacheSize);
+- m_comboWallpaperPos->setCurrentItem( 0 );
+- m_eDesk = _defCommonDesk ? 0 : m_desk;
+- getEScreen();
+-
+- for ( unsigned i = 0; i < m_numDesks; ++i )
+- m_pGlobals->setDrawBackgroundPerScreen( i, false );
+-
+- KBackgroundRenderer *r = eRenderer();
+-
+- if (r->isActive())
+- r->stop();
+-
+- if (QPixmap::defaultDepth() > 8)
+- {
+- r->setBackgroundMode(_defBackgroundMode);
+- }
+- else
+- {
+- r->setBackgroundMode(KBackgroundSettings::Flat);
+- }
+-
+- r->setColorA(_defColorA);
+- r->setColorB(_defColorB);
+- r->setWallpaperMode(_defWallpaperMode);
+- r->setMultiWallpaperMode(_defMultiMode);
+-
+- m_slideShowRandom = _defMultiMode;
+- if (m_slideShowRandom == KBackgroundSettings::NoMultiRandom)
+- m_slideShowRandom = KBackgroundSettings::Random;
+- if (m_slideShowRandom == KBackgroundSettings::NoMulti)
+- m_slideShowRandom = KBackgroundSettings::InOrder;
+-
+- r->setBlendMode(_defBlendMode);
+- r->setBlendBalance(_defBlendBalance);
+- r->setReverseBlending(_defReverseBlending);
+-
+- updateUI();
+-
+- m_copyAllDesktops = true;
+- m_copyAllScreens = true;
+- emit changed(true);
++ load( true );
+ }
+
+ QString BGDialog::quickHelp() const
+@@ -1218,6 +1175,13 @@
+ m_previewUpdates = true;
+ return;
+ }
++
++ r->setBackgroundMode(dlg.backgroundMode());
++ if (dlg.backgroundMode() == KBackgroundSettings::Program)
++ {
++ r->setProgram(dlg.backgroundProgram());
++ }
++
+ int cacheSize = dlg.cacheSize();
+ if (cacheSize)
+ {
+Index: kcontrol/background/bgdialog.h
+===================================================================
+--- kcontrol/background/bgdialog.h (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/bgdialog.h (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -39,7 +39,7 @@
+ BGDialog(QWidget* parent, KConfig* _config, bool _multidesktop = true);
+ ~BGDialog();
+
+- void load();
++ void load( bool useDefaults );
+ void save();
+ void defaults();
+
+Index: kcontrol/background/bgsettings.h
+===================================================================
+--- kcontrol/background/bgsettings.h (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/bgsettings.h (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -347,6 +347,7 @@
+
+ void readSettings();
+ void writeSettings();
++ KConfig* getConfig() { return m_pConfig; }
+
+ private:
+ bool dirty;
+Index: kcontrol/background/bgadvanced.cpp
+===================================================================
+--- kcontrol/background/bgadvanced.cpp (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/bgadvanced.cpp (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -122,7 +122,7 @@
+ connect( dlg->m_cbProgram, SIGNAL(toggled(bool)),
+ SLOT(slotEnableProgram(bool)));
+
+- m_oldBackgroundMode = r->backgroundMode();
++ m_backgroundMode = m_oldBackgroundMode = r->backgroundMode();
+ if (m_oldBackgroundMode == KBackgroundSettings::Program)
+ m_oldBackgroundMode = KBackgroundSettings::Flat;
+
+@@ -351,16 +351,10 @@
+
+ void BGAdvancedDialog::slotProgramChanged()
+ {
+-// r->stop();
+-
+- r->setProgram(m_selectedProgram);
+ if (dlg->m_cbProgram->isChecked() && !m_selectedProgram.isEmpty())
+- r->setBackgroundMode(KBackgroundSettings::Program);
++ m_backgroundMode = KBackgroundSettings::Program;
+ else
+- r->setBackgroundMode(m_oldBackgroundMode);
+-
+-// We have no preview, no need to start the renderer
+-// r->start();
++ m_backgroundMode = m_oldBackgroundMode;
+ }
+
+ void BGAdvancedDialog::slotEnableProgram(bool b)
+@@ -381,6 +375,16 @@
+ }
+ }
+
++QString BGAdvancedDialog::backgroundProgram() const
++{
++ return m_selectedProgram;
++}
++
++int BGAdvancedDialog::backgroundMode() const
++{
++ return m_backgroundMode;
++}
++
+ /**** KProgramEditDialog ****/
+
+ KProgramEditDialog::KProgramEditDialog(const QString &program, QWidget
*parent, char *name)
+Index: kcontrol/background/bgadvanced.h
+===================================================================
+--- kcontrol/background/bgadvanced.h (.../tags/KDE/3.5.4/kdebase)
(revision 581794)
++++ kcontrol/background/bgadvanced.h (.../branches/KDE/3.5/kdebase)
(revision 581794)
+@@ -59,6 +59,9 @@
+
+ void makeReadOnly();
+
++ QString backgroundProgram() const;
++ int backgroundMode() const;
++
+ public slots:
+ void slotAdd();
+ void slotRemove();
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdebase-branch.diff?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
