[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE_3_1_BRANCH: kdebase/kdm/kfrontend
From: Oswald Buddenhagen <ossi () kde ! org>
Date: 2003-05-11 22:50:47
[Download RAW message or body]
CVS commit by ossi:
empty string in GUIStyle/ColorScheme means "use KDE's built-in default"
M +5 -6 genkdmconf.c 1.43.2.5
M +3 -3 kdm_config.c 1.31.2.1
M +7 -3 kdmconfig.cpp 1.33.2.3
--- kdebase/kdm/kfrontend/genkdmconf.c #1.43.2.4:1.43.2.5
@@ -1893,10 +1893,9 @@ static Ent entsGreeter[] = {
"# Note, that the meaning of this value is entirely up to your Session program.\n" },
{ "GUIStyle", 0, upd_guistyle,
-"# Widget Style of the greeter:\n"
-"# Default, Windows, Platinum, Motif, MotifPlus, CDE, SGI, and any styles you\n"
-"# may have installed, e.g., HighColor; Default is \"Default\"\n" },
+"# Widget style of the greeter. \"\" means the built-in default which currently\n"
+"# is \"Keramik\". Default is \"\"\n" },
{ "ColorScheme", 0, 0,
-"# Widget Colors of the greeter:\n"
-"# Default, and any color schemes you may have installed. Default is \"Default\"\n" },
+"# Widget color scheme of the greeter. \"\" means the built-in default which\n"
+"# currently is quite greyish. Default is \"\"\n" },
{ "LogoArea", 0, upd_logoarea,
"# What should be shown righthand of the input lines:\n"
--- kdebase/kdm/kfrontend/kdm_config.c #1.31:1.31.2.1
@@ -531,6 +531,6 @@ Ent entsCore[] = {
Ent entsGreeter[] = {
{ "SessionTypes", C_SessionTypes, 0, "default,failsafe" },
-{ "GUIStyle", C_GUIStyle, 0, "KDE" },
-{ "ColorScheme", C_ColorScheme, 0, "Default" },
+{ "GUIStyle", C_GUIStyle, 0, "" },
+{ "ColorScheme", C_ColorScheme, 0, "" },
{ "LogoArea", C_LogoArea | C_ENUM, logoarea, "Logo" },
{ "LogoPixmap", C_LogoPixmap, 0, "" },
--- kdebase/kdm/kfrontend/kdmconfig.cpp #1.33.2.2:1.33.2.3
@@ -138,6 +138,10 @@ KDMConfig::KDMConfig()
_greeterScreen = GetCfgInt (C_GreeterScreen);
- kapp->setStyle (GetCfgStr (C_GUIStyle));
- kapp->setPalette (Str2Palette (GetCfgStr (C_ColorScheme)));
+ QString tmp = GetCfgStr (C_GUIStyle);
+ if (!tmp.isEmpty())
+ kapp->setStyle (tmp);
+ tmp = GetCfgStr (C_ColorScheme);
+ if (!tmp.isEmpty())
+ kapp->setPalette (Str2Palette (tmp));
_logoArea = GetCfgInt (C_LogoArea);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic