diff -r -u --exclude '*~' apps/kdepasswd/kcm.orig/chfacedlg.cpp apps/kdepasswd/kcm/chfacedlg.cpp --- apps/kdepasswd/kcm.orig/chfacedlg.cpp 2008-11-12 14:37:09.000000000 -0200 +++ apps/kdepasswd/kcm/chfacedlg.cpp 2009-02-25 14:29:21.000000000 -0300 @@ -82,7 +82,7 @@ { const QStringList picslist = facesDir.entryList( QDir::Files ); for ( QStringList::const_iterator it = picslist.constBegin(); it != picslist.constEnd(); ++it ) - new QListWidgetItem( QIcon( picsdir + *it ), (*it).section(".",0,0), ui.m_FacesWidget ); + new QListWidgetItem( QIcon( picsdir + *it ), (*it).section(".",0,0), ui.m_FacesWidget ); } facesDir.setPath( KCFGUserAccount::userFaceDir() ); if ( facesDir.exists() ) diff -r -u --exclude '*~' apps/kdepasswd/kcm.orig/kcm_useraccount.kcfg apps/kdepasswd/kcm/kcm_useraccount.kcfg --- apps/kdepasswd/kcm.orig/kcm_useraccount.kcfg 2008-10-22 21:03:30.000000000 -0200 +++ apps/kdepasswd/kcm/kcm_useraccount.kcfg 2009-02-25 11:56:17.000000000 -0300 @@ -9,7 +9,7 @@ <group name="X-*-Greeter"> <entry name="faceDir" type="Path"> <default code="true"> - KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" + '/' + "/usr/share/faces" + '/' </default> </entry> <entry name="UserFaceDir" type="Path"> @@ -22,11 +22,11 @@ but this is a nifty way of handling default values ;-) --> <entry name = "FaceSize" type="Int"> <label>The size of login images</label> - <default>64</default> + <default>48</default> </entry> <entry name = "DefaultFile" type="Path"> <label>The default image file</label> - <default>.default.face.icon</default> + <default>default</default> </entry> <entry name="CustomFaceFile" type="Path"> <label>The filename of the user's custom image file</label> Somente em apps/kdepasswd/kcm.orig/: .kcm_useraccount.kcfg.swp diff -r -u --exclude '*~' apps/kdepasswd/kcm.orig/main.cpp apps/kdepasswd/kcm/main.cpp --- apps/kdepasswd/kcm.orig/main.cpp 2008-10-22 21:03:30.000000000 -0200 +++ apps/kdepasswd/kcm/main.cpp 2009-02-25 14:28:17.000000000 -0300 @@ -144,8 +144,9 @@ _mw->leOrganization->setText( _kes->getSetting( KEMailSettings::Organization )); _mw->leSMTP->setText( _kes->getSetting( KEMailSettings::OutServer )); - QString _userPicsDir = KCFGUserAccount::faceDir() + - KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; + QString _userPicsDir = KCFGUserAccount::faceDir(); + //QString _userPicsDir = KCFGUserAccount::faceDir() + + // KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; QString fs = KCFGUserAccount::faceSource(); if (fs == QLatin1String("UserOnly")) @@ -159,9 +160,12 @@ if ( _facePerm == adminFirst ) { // If the administrator's choice takes preference - _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); + _facePixmap = QPixmap( _userPicsDir + _ku->loginName() ); if ( _facePixmap.isNull() ) + _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); + + if ( _facePixmap.isNull() ) _facePerm = userFirst; else _mw->btnChangeFace->setIcon( KIcon(_facePixmap) ); @@ -174,6 +178,9 @@ // The user has no face, should we check for the admin's setting? if ( _facePixmap.isNull() && _facePerm == userFirst ) + _facePixmap = QPixmap( _userPicsDir + _ku->loginName() ); + + if ( _facePixmap.isNull() ) _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); if ( _facePixmap.isNull() ) @@ -184,8 +191,11 @@ else if ( _facePerm <= adminOnly ) { // Admin only - _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); + _facePixmap = QPixmap( _userPicsDir + _ku->loginName() ); if ( _facePixmap.isNull() ) + _facePixmap = QPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); + + if ( _facePixmap.isNull() ) _facePixmap = QPixmap( _userPicsDir + KCFGUserAccount::defaultFile() ); _mw->btnChangeFace->setIcon( KIcon(_facePixmap) ); } @@ -273,9 +283,11 @@ return; } - ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() + - "/kdm/pics/users/", this ); + //ChFaceDlg* pDlg = new ChFaceDlg( KGlobal::dirs()->resourceDirs("data").last() + +// "/kdm/pics/users/", this ); + ChFaceDlg* pDlg = new ChFaceDlg( "/usr/share/faces/", this ); + if ( pDlg->exec() == QDialog::Accepted && !pDlg->getFaceImage().isNull() ) changeFace( pDlg->getFaceImage() );