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

List:       kde-commits
Subject:    KDE/kdeartwork/kscreensaver/kxsconfig
From:       Laurent Montel <montel () kde ! org>
Date:       2006-05-19 10:04:49
Message-ID: 1148033089.627594.31128.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 542426 by mlaurent:

Try to fix it


 M  +13 -13    kxscontrol.cpp  
 M  +1 -1      kxsitem.cpp  


--- trunk/KDE/kdeartwork/kscreensaver/kxsconfig/kxscontrol.cpp #542425:542426
@@ -54,7 +54,7 @@
     if (attr.value("type") == "spinbutton" ) {
 	QHBoxLayout *hb = new QHBoxLayout(this);
 	if (!mLabel.isEmpty()) {
-	    QLabel *l = new QLabel(i18n(mLabel), this);
+	    QLabel *l = new QLabel(mLabel, this);
 	    hb->add(l);
 	}
 	mSpinBox = new QSpinBox(mMinimum, mMaximum, 1, this);
@@ -66,19 +66,19 @@
 	QString highLabel = attr.value("_high-label");
 	QVBoxLayout *vb = new QVBoxLayout(this);
 	if (!mLabel.isEmpty()) {
-	    QLabel *l = new QLabel(i18n(mLabel), this);
+	    QLabel *l = new QLabel(mLabel, this);
 	    vb->add(l);
 	}
 	QHBoxLayout *hb = new QHBoxLayout(vb);
 	if (!lowLabel.isEmpty()) {
-	    QLabel *l = new QLabel(i18n(lowLabel), this);
+	    QLabel *l = new QLabel(lowLabel, this);
 	    hb->addWidget(l);
 	}
 	mSlider = new QSlider(mMinimum, mMaximum, 10, mValue, Qt::Horizontal, this);
 	connect(mSlider, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
 	hb->add(mSlider);
 	if (!highLabel.isEmpty()){
-	    QLabel *l = new QLabel(i18n(highLabel), this);
+	    QLabel *l = new QLabel(highLabel, this);
 	    hb->addWidget(l);
 	}
     }
@@ -123,12 +123,12 @@
     QString highLabel = attr.value("_high-label");
     QVBoxLayout *vb = new QVBoxLayout(this);
     if (!mLabel.isEmpty()) {
-	QLabel *l = new QLabel(i18n(mLabel), this);
+	QLabel *l = new QLabel(mLabel, this);
 	vb->add(l);
     }
     QHBoxLayout *hb = new QHBoxLayout(vb);
     if (!lowLabel.isEmpty()) {
-	QLabel *l = new QLabel(i18n(lowLabel), this);
+	QLabel *l = new QLabel(lowLabel, this);
 	hb->addWidget(l);
     }
     int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
@@ -136,7 +136,7 @@
     connect(mSlider, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
     hb->add(mSlider);
     if (!highLabel.isEmpty()){
-	QLabel *l = new QLabel(i18n(highLabel), this);
+	QLabel *l = new QLabel(highLabel, this);
 	hb->addWidget(l);
     }
 }
@@ -168,7 +168,7 @@
                                       const QXmlAttributes &attr)
   : QCheckBox(parent), KXSBoolItem(name, attr)
 {
-  setText(i18n(mLabel));
+  setText(mLabel);
   setChecked(mValue);
   connect(this, SIGNAL(toggled(bool)), SLOT(slotToggled(bool)));
 }
@@ -195,7 +195,7 @@
   l->add(label);
   mCombo = new QComboBox(this);
   for(uint i=0; i < mOptions.count(); i++)
-      mCombo->insertItem( i18n(mOptions[i]) );
+      mCombo->insertItem( mOptions[i] );
   mCombo->setCurrentItem(mValue);
   connect(mCombo, SIGNAL(activated(int)), SLOT(slotActivated(int)));
   l->add(mCombo);
@@ -206,7 +206,7 @@
   : QWidget(parent), KXSSelectItem(name, attr)
 {
   QVBoxLayout *l = new QVBoxLayout(this);
-  QLabel *label = new QLabel(i18n(mLabel), this);
+  QLabel *label = new QLabel(mLabel, this);
   l->add(label);
   mCombo = new QComboBox(this);
   connect(mCombo, SIGNAL(activated(int)), SLOT(slotActivated(int)));
@@ -216,7 +216,7 @@
 void KXSDropListControl::addOption(const QXmlAttributes &attr)
 {
     KXSSelectItem::addOption( attr );
-    mCombo->insertItem( i18n(mOptions[mOptions.count()-1]) );
+    mCombo->insertItem( mOptions[mOptions.count()-1] );
     if ( (unsigned)mValue == mOptions.count()-1 )
 	mCombo->setCurrentItem(mOptions.count()-1);
 }
@@ -251,7 +251,7 @@
   : QWidget(parent), KXSStringItem(name, attr)
 {
   QVBoxLayout *l = new QVBoxLayout(this);
-  QLabel *label = new QLabel(i18n(mLabel), this);
+  QLabel *label = new QLabel(mLabel, this);
   l->add(label);
   mEdit = new QLineEdit(this);
   connect(mEdit, SIGNAL(textChanged(const QString &)), SLOT(textChanged(const QString &)));
@@ -288,7 +288,7 @@
   : QWidget(parent), KXSStringItem(name, attr)
 {
   QVBoxLayout *l = new QVBoxLayout(this);
-  QLabel *label = new QLabel(i18n(mLabel), this);
+  QLabel *label = new QLabel(mLabel, this);
   l->add(label);
   QHBoxLayout *hb = new QHBoxLayout(l);
   mEdit = new QLineEdit(this);
--- trunk/KDE/kdeartwork/kscreensaver/kxsconfig/kxsitem.cpp #542425:542426
@@ -28,7 +28,7 @@
   : mName(name)
 {
   config.setGroup(name);
-  mLabel = i18n(config.readEntry("Label"));
+  mLabel = config.readEntry("Label");
 }
 
 KXSConfigItem::KXSConfigItem(const QString &name, const QXmlAttributes &attr )
[prev in list] [next in list] [prev in thread] [next in thread]