yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better key names for titlebutton colors.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=33480
This commit is contained in:
Daniel M. Duley 1999-11-11 01:16:41 +00:00
parent 24b197fd10
commit fc3407aa16
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
options.cpp
View file

@ -61,13 +61,13 @@ void Options::reload()
colors[Handle] = QColor( 140, 140, 140 ); colors[Handle] = QColor( 140, 140, 140 );
colors[Handle] = config->readColorEntry("handle", &colors[Handle]); colors[Handle] = config->readColorEntry("handle", &colors[Handle]);
colors[ButtonBg] = colors[Frame]; colors[ButtonBg] = colors[Frame];
colors[ButtonBg] = config->readColorEntry("buttonBackgroundDown", colors[ButtonBg] = config->readColorEntry("activeTitleBtnBg",
&colors[Frame]); &colors[Frame]);
if(QPixmap::defaultDepth() < 15) if(QPixmap::defaultDepth() < 15)
colors[ButtonBlend] = colors[ ButtonBg ]; colors[ButtonBlend] = colors[ ButtonBg ];
else else
colors[ButtonBlend] = colors[ ButtonBg ].dark(150); colors[ButtonBlend] = colors[ ButtonBg ].dark(150);
colors[ButtonBlend] = config->readColorEntry("buttonBlendDown", colors[ButtonBlend] = config->readColorEntry("activeTitleBtnBlend",
&colors[ButtonBlend]); &colors[ButtonBlend]);
colors[TitleBar] = Qt::darkBlue; colors[TitleBar] = Qt::darkBlue;
colors[TitleBar] = config->readColorEntry("activeBackground", colors[TitleBar] = config->readColorEntry("activeBackground",
@ -82,7 +82,7 @@ void Options::reload()
colors[Font] = Qt::white; colors[Font] = Qt::white;
colors[Font] = config->readColorEntry("activeForeground", &colors[Font]); colors[Font] = config->readColorEntry("activeForeground", &colors[Font]);
colors[ButtonFg] = Qt::darkGray; colors[ButtonFg] = Qt::darkGray;
colors[ButtonFg] = config->readColorEntry("buttonForegroundDown", colors[ButtonFg] = config->readColorEntry("activeTitleBtnFg",
&colors[ButtonFg]); &colors[ButtonFg]);
// inactive // inactive
@ -101,7 +101,7 @@ void Options::reload()
colors[ButtonBg+KWINCOLORS] = colors[Frame+KWINCOLORS]; colors[ButtonBg+KWINCOLORS] = colors[Frame+KWINCOLORS];
colors[ButtonBg+KWINCOLORS] = colors[ButtonBg+KWINCOLORS] =
config->readColorEntry("buttonBackground", config->readColorEntry("inactiveTitleBtnBg",
&colors[ButtonBg]); &colors[ButtonBg]);
if(QPixmap::defaultDepth() < 15) if(QPixmap::defaultDepth() < 15)
@ -109,10 +109,11 @@ void Options::reload()
else else
colors[ButtonBlend+KWINCOLORS] = colors[ ButtonBg+KWINCOLORS ].dark(150); colors[ButtonBlend+KWINCOLORS] = colors[ ButtonBg+KWINCOLORS ].dark(150);
colors[ButtonBlend+KWINCOLORS] = colors[ButtonBlend+KWINCOLORS] =
config->readColorEntry("buttonBlend", &colors[ButtonBlend+KWINCOLORS]); config->readColorEntry("inactiveTitleBtnBlend",
&colors[ButtonBlend+KWINCOLORS]);
colors[ButtonFg+KWINCOLORS] = config-> colors[ButtonFg+KWINCOLORS] = config->
readColorEntry("buttonForeground", &colors[ButtonFg]); readColorEntry("inactiveTitleBtnFg", &colors[ButtonFg]);
colors[Handle+KWINCOLORS] = colors[Frame]; colors[Handle+KWINCOLORS] = colors[Frame];
config->readColorEntry("inactiveHandle", &colors[Handle]); config->readColorEntry("inactiveHandle", &colors[Handle]);