vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Okay, we now just store theme pixmaps in the appdata+"/pics", then use locate... 

I have no idea why I didn't do this in the first place - must of been drunk or something ;-)

svn path=/trunk/kdebase/kwin/; revision=74577
icc-effect-5.14.5
Daniel M. Duley 2000-12-12 17:40:56 +00:00
parent 8b422dbe29
commit 507a315eb2
2 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/kwmtheme/cli_installer/main.cpp
View File

@ -60,7 +60,7 @@ int main(int argc, char **argv)
if(localDirStr.isEmpty()){ if(localDirStr.isEmpty()){
localDirStr = KGlobal::dirs()->saveLocation("data", "kwin"); localDirStr = KGlobal::dirs()->saveLocation("data", "kwin");
} }
localDirStr += "/kwmtheme/"; localDirStr += "/pics/";
if(!QFile::exists(localDirStr)) if(!QFile::exists(localDirStr))
QDir().mkdir(localDirStr); QDir().mkdir(localDirStr);
@ -73,7 +73,7 @@ int main(int argc, char **argv)
tmpStr = input.readEntry("shapePixmapTop"); tmpStr = input.readEntry("shapePixmapTop");
if(!tmpStr.isEmpty()){ if(!tmpStr.isEmpty()){
copy(srcStr+tmpStr, localDirStr); copy(srcStr+tmpStr, localDirStr+tmpStr);
} }
output->writeEntry("wm_top", tmpStr, true, true); output->writeEntry("wm_top", tmpStr, true, true);
tmpStr = input.readEntry("shapePixmapBottom"); tmpStr = input.readEntry("shapePixmapBottom");

67
clients/kwmtheme/kwmthemeclient.cpp
View File

@ -55,17 +55,13 @@ static void init_theme()
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
config->setGroup("General"); config->setGroup("General");
QString tmpStr;
int i; int i;
QStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin");
QString baseDir=*(appDirs.begin());
QString localBaseDir=*(appDirs.end());
for(i=0; i < 8; ++i){ for(i=0; i < 8; ++i){
framePixmaps[i] = new QPixmap(localBaseDir + "/kwmtheme/" + framePixmaps[i] = new QPixmap(locate("appdata",
config->readEntry(keys[i], " ")); "pics/"+config->readEntry(keys[i], " ")));
if(framePixmaps[i]->isNull()) if(framePixmaps[i]->isNull())
qWarning("Unable to load frame pixmap for %s", keys[i]); qWarning("Unable to load frame pixmap for %s", keys[i]);
else else
qWarning("Loaded pixmap %d", i+1); qWarning("Loaded pixmap %d", i+1);
@ -78,41 +74,36 @@ static void init_theme()
if(framePixmaps[FrameRight]->width() > maxExtent) if(framePixmaps[FrameRight]->width() > maxExtent)
maxExtent = framePixmaps[FrameRight]->width(); maxExtent = framePixmaps[FrameRight]->width();
menuPix = new QPixmap(localBaseDir + "/kwmtheme/" + menuPix = new QPixmap(locate("appdata",
config->readEntry("menu", " ")); "pics/"+config->readEntry("menu", " ")));
iconifyPix = new QPixmap(localBaseDir + "/kwmtheme/" + iconifyPix = new QPixmap(locate("appdata",
config->readEntry("iconify", " ")); "pics/"+config->readEntry("iconify", " ")));
maxPix = new QPixmap(localBaseDir + "/kwmtheme/" + maxPix = new QPixmap(locate("appdata",
config->readEntry("maximize", " ")); "pics/"+config->readEntry("maximize", " ")));
minmaxPix = new QPixmap(localBaseDir + "/kwmtheme/" + minmaxPix = new QPixmap(locate("appdata",
config->readEntry("maximizedown", " ")); "pics/"+config->readEntry("maximizedown", " ")));
closePix = new QPixmap(localBaseDir + "/kwmtheme/" + closePix = new QPixmap(locate("appdata",
config->readEntry("close", " ")); "pics/"+config->readEntry("close", " ")));
pinupPix = new QPixmap(localBaseDir + "/kwmtheme/" + pinupPix = new QPixmap(locate("appdata",
config->readEntry("pinup", " ")); "pics/"+config->readEntry("pinup", " ")));
pindownPix = new QPixmap(localBaseDir + "/kwmtheme/" + pindownPix = new QPixmap(locate("appdata",
config->readEntry("pindown", " ")); "pics/"+config->readEntry("pindown", " ")));
if(menuPix->isNull()) if(menuPix->isNull())
menuPix->load(baseDir + "/pics/menu.png"); menuPix->load(locate("appdata", "pics/menu.png"));
if(iconifyPix->isNull()) if(iconifyPix->isNull())
iconifyPix-> iconifyPix->load(locate("appdata", "pics/iconify.png"));
load(baseDir + "/pics/iconify.png");
if(maxPix->isNull()) if(maxPix->isNull())
maxPix-> maxPix->load(locate("appdata", "pics/maximize.png"));
load(baseDir +"/pics/maximize.png");
if(minmaxPix->isNull()) if(minmaxPix->isNull())
minmaxPix-> minmaxPix->load(locate("appdata", "pics/maximizedown.png"));
load(baseDir + "/pics/maximizedown.png");
if(closePix->isNull()) if(closePix->isNull())
closePix->load(baseDir + "/pics/close.png"); closePix->load(locate("appdata", "pics/close.png"));
if(pinupPix->isNull()) if(pinupPix->isNull())
pinupPix->load(baseDir + "/pics/pinup.png"); pinupPix->load(locate("appdata", "pics/pinup.png"));
if(pindownPix->isNull()) if(pindownPix->isNull())
pindownPix-> pindownPix->load(locate("appdata", "pics/pindown.png"));
load(baseDir + "/pics/pindown.png");
tmpStr = config->readEntry("TitleAlignment");
QString tmpStr = config->readEntry("TitleAlignment");
if(tmpStr == "right") if(tmpStr == "right")
titleAlign = Qt::AlignRight | Qt::AlignVCenter; titleAlign = Qt::AlignRight | Qt::AlignVCenter;
else if(tmpStr == "middle") else if(tmpStr == "middle")
@ -159,14 +150,14 @@ static void init_theme()
tmpStr = config->readEntry("TitlebarPixmapActive", ""); tmpStr = config->readEntry("TitlebarPixmapActive", "");
if(!tmpStr.isEmpty()){ if(!tmpStr.isEmpty()){
aTitlePix = new KPixmap; aTitlePix = new KPixmap;
aTitlePix->load(localBaseDir + "/kwmtheme/" + tmpStr); aTitlePix->load(locate("appdata", "pics/" + tmpStr));
} }
else else
aTitlePix = NULL; aTitlePix = NULL;
tmpStr = config->readEntry("TitlebarPixmapInactive", ""); tmpStr = config->readEntry("TitlebarPixmapInactive", "");
if(!tmpStr.isEmpty()){ if(!tmpStr.isEmpty()){
iTitlePix = new KPixmap; iTitlePix = new KPixmap;
iTitlePix->load(localBaseDir + "/kwmtheme/" + tmpStr); iTitlePix->load(locate("appdata", "pics/" + tmpStr));
} }
else else
iTitlePix = NULL; iTitlePix = NULL;