summaryrefslogtreecommitdiffstats
path: root/kcontrol/krdb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-11 20:21:27 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-11 20:21:27 +0000
commit10e41144596fc9ced40fc349d9ecd099b1c2ea19 (patch)
tree88ab04e475ff5a4cd889cb082f5760b6e0bf5e4e /kcontrol/krdb
parent4aed2c8219774f5d797760606b8489a92ddc5163 (diff)
downloadtdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.tar.gz
tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.zip
Initial import of Trinity 3.5.11 to kdebase
Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes Will need to check for commit warnings and repair as encountered Also needs full compile test git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/krdb')
-rw-r--r--kcontrol/krdb/krdb.cpp4
-rw-r--r--kcontrol/krdb/themes/Plastik/Plastik.xml12
2 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 690dbce9a..cd8f08905 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -524,7 +524,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftHintStyle"))
{
- QString hintStyle = kglobals.readEntry("XftHintStyle", "hintmedium");
+ QString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull");
contents += "Xft.hinting: ";
if(hintStyle.isEmpty())
contents += "-1\n";
@@ -540,7 +540,7 @@ void runRdb( uint flags )
if (kglobals.hasKey("XftSubPixel"))
{
- QString subPixel = kglobals.readEntry("XftSubPixel");
+ QString subPixel = kglobals.readEntry("XftSubPixel", "none");
if(!subPixel.isEmpty())
contents += "Xft.rgba: " + subPixel + '\n';
}
diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml
index 4e317ed59..53b115550 100644
--- a/kcontrol/krdb/themes/Plastik/Plastik.xml
+++ b/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -113,12 +113,12 @@
</panel>
<widgets name="Plastik" />
<fonts>
- <font value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
- <fixed value="Courier New,10,-1,5,50,0,0,0,0,0" object="General" />
- <toolBarFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
- <menuFont value="Arial,12,-1,5,50,0,0,0,0,0" object="General" />
- <activeFont value="Arial,12,-1,5,75,0,0,0,0,0" object="WM" />
- <taskbarFont value="Arial,11,-1,5,50,0,0,0,0,0" object="General" />
+ <font value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+ <fixed value="Monospace,10,-1,5,50,0,0,0,0,0" object="General" />
+ <toolBarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+ <menuFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
+ <activeFont value="Sans Serif,10,-1,5,75,0,0,0,0,0" object="WM" />
+ <taskbarFont value="Sans Serif,10,-1,5,50,0,0,0,0,0" object="General" />
<StandardFont value="" object="FMSettings" />
</fonts>
</ktheme>