From 10e41144596fc9ced40fc349d9ecd099b1c2ea19 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 20:21:27 +0000
Subject: 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
---
 kcontrol/kdm/kdm-appear.cpp | 4 ++--
 kcontrol/kdm/kdm-font.cpp   | 4 ++--
 kcontrol/kdm/kdm-shut.cpp   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kcontrol/kdm')

diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 684371d74..7d1d034ca 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -442,7 +442,7 @@ void KDMAppearanceWidget::load()
   config->setGroup("X-*-Greeter");
 
   // Read the greeting string
-  greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n")));
+  greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Kubuntu at %n")));
 
   // Regular logo or clock
   QString logoArea = config->readEntry("LogoArea", "Logo" );
@@ -485,7 +485,7 @@ void KDMAppearanceWidget::load()
 
 void KDMAppearanceWidget::defaults()
 {
-  greetstr_lined->setText( i18n("Welcome to %s at %n") );
+  greetstr_lined->setText( i18n("Welcome to Kubuntu at %n") );
   logoRadio->setChecked( true );
   slotAreaRadioClicked( KdmLogo );
   setLogo( "" );
diff --git a/kcontrol/kdm/kdm-font.cpp b/kcontrol/kdm/kdm-font.cpp
index da67e5eaa..456573b4d 100644
--- a/kcontrol/kdm/kdm-font.cpp
+++ b/kcontrol/kdm/kdm-font.cpp
@@ -92,7 +92,7 @@ void KDMFontWidget::set_def()
 {
   stdFontChooser->setFont(QFont("Sans Serif", 10));
   failFontChooser->setFont(QFont("Sans Serif", 10, QFont::Bold));
-  greetingFontChooser->setFont(QFont("Serif", 20));
+  greetingFontChooser->setFont(QFont("Sans Serif", 22));
 }
 
 void KDMFontWidget::save()
@@ -128,7 +128,7 @@ void KDMFontWidget::load()
 void KDMFontWidget::defaults()
 {
   set_def();
-  aacb->setChecked(false);
+  aacb->setChecked(true);
 }
 
 #include "kdm-font.moc"
diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp
index c958e1464..2eb88ac51 100644
--- a/kcontrol/kdm/kdm-shut.cpp
+++ b/kcontrol/kdm/kdm-shut.cpp
@@ -200,7 +200,7 @@ void KDMSessionsWidget::load()
 
   config->setGroup("Shutdown");
   restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt"));
+  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
 
   bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
 }
@@ -210,7 +210,7 @@ void KDMSessionsWidget::load()
 void KDMSessionsWidget::defaults()
 {
   restart_lined->setURL("/sbin/reboot");
-  shutdown_lined->setURL("/sbin/halt");
+  shutdown_lined->setURL("/sbin/poweroff");
 
   sdlcombo->setCurrentItem(SdAll);
   sdrcombo->setCurrentItem(SdRoot);
-- 
cgit v1.2.1