[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-01-04 11:21:29
Message-ID: 1231068089.472539.14141.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 905363 by ossi:

third, remove braindead relation between theming and styling.
CCMAIL: shafff@ukr.net


 M  +8 -8      kdm-gen.cpp  
 M  +1 -2      kdm-gen.h  


--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-gen.cpp #905362:905363
@@ -68,18 +68,19 @@
 	ml->setMargin( 0 );
 	ml->addItem( mlml );
 
-	box = new QGroupBox( i18n("&Use themed greeter"), this );
+	box = new QGroupBox( i18nc("@title:group", "Appearance"), this );
 	mlml->addWidget( box );
-	box->setWhatsThis( i18n(
-		"Enable this if you would like to use a themed Login Manager.") );
-	box->setCheckable( true );
-	useThemeCheck = box;
-	connect( useThemeCheck, SIGNAL(toggled( bool )), SLOT(slotUseThemeChanged()) );
 
 	fl = new QFormLayout( box );
 	fl->setSpacing( KDialog::spacingHint() );
 	fl->setMargin( KDialog::marginHint() );
 
+	useThemeCheck = new QCheckBox( i18n("&Use themed greeter"), box );
+	connect( useThemeCheck, SIGNAL(toggled( bool )), SLOT(slotUseThemeChanged()) );
+	useThemeCheck->setWhatsThis( i18n(
+		"Enable this if you would like to use a themed Login Manager.") );
+	fl->addRow( useThemeCheck );
+
 	guicombo = new KBackedComboBox( box );
 	guicombo->insertItem( "", i18n("<placeholder>default</placeholder>") );
 	loadGuiStyles( guicombo );
@@ -131,7 +132,7 @@
 		"If you check this box and your X-Server has the Xft extension, "
 		"fonts will be antialiased (smoothed) in the login dialog.") );
 	connect( aacb, SIGNAL(toggled( bool )), SIGNAL(changed()) );
-	fl->addWidget( aacb );
+	fl->addRow( aacb );
 
 	ml->addStretch( 1 );
 }
@@ -220,7 +221,6 @@
 	KConfigGroup configGrp = config->group( "X-*-Greeter" );
 
 	useThemeCheck->setChecked( configGrp.readEntry( "UseTheme", false ) );
-	slotUseThemeChanged(); // XXX why isn't it autocalled?
 
 	// Check the GUI type
 	guicombo->setCurrentId( configGrp.readEntry( "GUIStyle" ) );
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-gen.h #905362:905363
@@ -26,7 +26,6 @@
 class KFontRequester;
 class KLanguageButton;
 class QCheckBox;
-class QGroupBox;
 
 class KDMGeneralWidget : public QWidget {
 	Q_OBJECT
@@ -52,7 +51,7 @@
   private:
 	void set_def();
 
-	QGroupBox *useThemeCheck;
+	QCheckBox *useThemeCheck;
 	KBackedComboBox *guicombo;
 	KBackedComboBox *colcombo;
 	KLanguageButton *langcombo;
[prev in list] [next in list] [prev in thread] [next in thread]