diff options
| author | Timothy Pearson <[email protected]> | 2012-12-10 03:03:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-12-10 03:03:12 -0600 |
| commit | 1cac8a5e1d6b6971193c78de22ba539911dcf406 (patch) | |
| tree | 058899e4f66c2019c6daeb68642bb0f1fb587ab7 /tdm | |
| parent | cee306586f6b4ad23f8422eb1bd3041e0ba56274 (diff) | |
| download | tdebase-1cac8a5e1d6b6971193c78de22ba539911dcf406.tar.gz tdebase-1cac8a5e1d6b6971193c78de22ba539911dcf406.zip | |
Fix kompmgr shadow support
Add kompmgr settings reload method to twin DCOP
Fix up kompmgr kcontrol module
Make default TDM login screen appearance more like the rest of the TDE login system
Diffstat (limited to 'tdm')
| -rw-r--r-- | tdm/config.def | 10 | ||||
| -rw-r--r-- | tdm/kfrontend/kgreeter.cpp | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/tdm/config.def b/tdm/config.def index 936147eb1..b1045b6db 100644 --- a/tdm/config.def +++ b/tdm/config.def @@ -2045,9 +2045,9 @@ Type: enum None/LOGO_NONE: nothing Logo/LOGO_LOGO: the image specified by <option>LogoPixmap</option> Clock/LOGO_CLOCK: a neat analog clock -Default: Clock +Default: None User: greeter -Instance: */Logo +Instance: */None Comment: What should be shown in the greeter's logo are: Description: @@ -2153,10 +2153,10 @@ Description: Key: GreetFont Type: string -Default: "Sans Serif,22,5,0,50,0" -CDefault: "Serif,20,bold" +Default: "Sans Serif,10,-1,5,75,0,0,0,0,0" +CDefault: "Serif,10,bold" User: greeter:font -Instance: #*/"Sans Serif,22,5,0,50,0" +Instance: #*/"Sans Serif,10,-1,5,75,0,0,0,0,0" Comment: & Description: The font for the greeter headline. diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 97c6f2588..77b827ff2 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <ksimpleconfig.h> #include <kstringhandler.h> #include <kdebug.h> +#include <kdialog.h> #undef Unsorted // x headers suck - make tqdir.h work with --enable-final #include <tqdir.h> @@ -908,11 +909,21 @@ KStdGreeter::KStdGreeter() complainLabel->setPaletteForegroundColor( Qt::red ); inner_box->addWidget( complainLabel ); } + if (_logoArea == LOGO_NONE) { + KSMModalDialogHeader *theader = new KSMModalDialogHeader(this); + inner_box->addWidget( theader, AlignCenter ); + } if (!_greetString.isEmpty()) { TQLabel *welcomeLabel = new TQLabel( _greetString, this ); welcomeLabel->setAlignment( AlignCenter ); welcomeLabel->setFont( _greetFont ); inner_box->addWidget( welcomeLabel ); + if (_logoArea == LOGO_NONE) { + // Match caps lock warning font size + TQLabel *spacerLabel = new TQLabel( " ", this ); + spacerLabel->setFont( _failFont ); + inner_box->addWidget( spacerLabel, AlignCenter ); + } } switch (_logoArea) { |