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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kdm
From:       Stephen Leaf <smileaf () smileaf ! org>
Date:       2007-07-31 12:45:38
Message-ID: 1185885938.718621.8820.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 694718 by smileaf:

And more EBN fixes that I forgot.
Anyone know why the krazy:exclude=i18ncheckarg didn't work?

 M  +1 -1      kbackedcombobox.h  
 M  +2 -2      kdm-conv.cpp  
 M  +5 -4      kdm-dlg.cpp  
 M  +4 -4      kdm-shut.cpp  
 M  +4 -3      kdm-shut.h  


--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kbackedcombobox.h #694717:694718
@@ -20,7 +20,7 @@
 #ifndef KBACKEDCOMBOBOX_H
 #define KBACKEDCOMBOBOX_H
 
-#include <kcombobox.h>
+#include <KComboBox>
 
 class KBackedComboBox : public KComboBox {
 
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-conv.cpp #694717:694718
@@ -45,8 +45,8 @@
 	QString wtstr;
 
 	QLabel *paranoia = new QLabel(
-		i18n("<qt><center><font color=red><big><b>Attention<br/>"
-		     "Read help</b></big></font></center></qt>"), this );
+		i18n("<big style='color:red;text-align:center;font-weight:bold;'>Attention<br/>"
+		     "Read help</big>"), this );
 
 	QSizePolicy vpref( QSizePolicy::Minimum, QSizePolicy::Fixed );
 
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-dlg.cpp #694717:694718
@@ -70,10 +70,11 @@
 	connect( greetstr_lined, SIGNAL(textChanged( const QString& )),
 	         SIGNAL(changed()) );
 	hlay->addWidget( greetstr_lined );
-	wtstr = i18n("This is the \"headline\" for KDM's login window. You may want to "
-	             "put some nice greeting or information about the operating system here.<p>"
-	             "KDM will substitute the following character pairs with the "
-	             "respective contents:<br/><ul>"
+	wtstr = i18n("<p>This is the \"headline\" for KDM's login window. You may want to "
+	             "put some nice greeting or information about the operating system here.</p>"
+	             "<p>KDM will substitute the following character pairs with the "
+	             "respective contents:</p>"
+	             "<ul>"
 	             "<li>%d -> current display</li>"
 	             "<li>%h -> host name, possibly with domain name</li>"
 	             "<li>%n -> node name, most probably the host name without domain name</li>"
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-shut.cpp #694717:694718
@@ -42,7 +42,7 @@
 
 	QGroupBox *group0 = new QGroupBox( i18n("Allow Shutdown"), this );
 
-	sdlcombo = new QComboBox( group0 );
+	sdlcombo = new KComboBox( group0 );
 	sdlcombo->setEditable( false );
 	sdllabel = new QLabel( i18n ("&Local:"), group0 );
 	sdllabel->setBuddy( sdlcombo );
@@ -50,7 +50,7 @@
 	sdlcombo->insertItem( SdRoot, i18n("Only Root") );
 	sdlcombo->insertItem( SdNone, i18n("Nobody") );
 	connect( sdlcombo, SIGNAL(activated( int )), SIGNAL(changed()) );
-	sdrcombo = new QComboBox( group0 );
+	sdrcombo = new KComboBox( group0 );
 	sdrcombo->setEditable( false );
 	sdrlabel = new QLabel( i18n ("&Remote:"), group0 );
 	sdrlabel->setBuddy( sdrcombo );
@@ -153,7 +153,7 @@
 	bm_combo->setEnabled( false );
 }
 
-void KDMSessionsWidget::writeSD( QComboBox *combo, KConfigGroup group )
+void KDMSessionsWidget::writeSD( KComboBox *combo, KConfigGroup group )
 {
 	QString what;
 	switch (combo->currentIndex()) {
@@ -177,7 +177,7 @@
 	configGrp.writeEntry( "BootManager", bm_combo->currentId() );
 }
 
-void KDMSessionsWidget::readSD( QComboBox *combo, const QString &def, KConfigGroup group )
+void KDMSessionsWidget::readSD( KComboBox *combo, const QString &def, KConfigGroup group )
 {
 	QString str = group.readEntry( "AllowShutdown", def );
 	SdModes sdMode;
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-shut.h #694717:694718
@@ -20,6 +20,7 @@
 #ifndef __KDMSHUT_H__
 #define __KDMSHUT_H__
 
+#include <KComboBox>
 #include <KConfigGroup>
 
 #include <QWidget>
@@ -46,10 +47,10 @@
 	void changed();
 
   private:
-	void readSD( QComboBox *, const QString &, KConfigGroup group );
-	void writeSD( QComboBox *, KConfigGroup group );
+	void readSD( KComboBox *, const QString &, KConfigGroup group );
+	void writeSD( KComboBox *, KConfigGroup group );
 
-	QComboBox *sdlcombo, *sdrcombo;
+	KComboBox *sdlcombo, *sdrcombo;
 	QLabel *sdllabel, *sdrlabel;
 	KUrlRequester *restart_lined, *shutdown_lined;
 	KBackedComboBox *bm_combo;
[prev in list] [next in list] [prev in thread] [next in thread]