[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/kcontrol
From: Pino Toscano <toscano.pino () tiscali ! it>
Date: 2007-04-05 14:56:27
Message-ID: 1175784987.636812.30162.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 650848 by pino:
less qt3_support
M +2 -2 crypto/crypto.cpp
M +0 -1 locale/CMakeLists.txt
M +13 -5 locale/klocalesample.cpp
M +5 -3 locale/localemon.cpp
M +8 -1 locale/localenum.cpp
M +1 -1 locale/localeother.cpp
M +13 -2 locale/localetime.cpp
--- trunk/KDE/kdebase/runtime/kcontrol/crypto/crypto.cpp #650847:650848
@@ -289,7 +289,7 @@
//
Q3GroupBox *cwbg = new Q3GroupBox(i18n("Cipher Wizard"), tabSSL);
cwbg->setOrientation(Qt::Horizontal);
- QVBoxLayout *laygroup2 = new QVBoxLayout(cwbg->layout());
+ QVBoxLayout *laygroup2 = new QVBoxLayout(cwbg);
laygroup2->setSpacing(KDialog::spacingHint());
QComboBox *cwcb = new QComboBox(cwbg);
laygroup2->addWidget( cwcb );
@@ -352,7 +352,7 @@
oInfo = new Q3GroupBox(i18n("Path to OpenSSL Shared Libraries"), tabOSSL);
oInfo->setOrientation(Qt::Vertical);
- QVBoxLayout *laygroup1 = new QVBoxLayout(oInfo->layout());
+ QVBoxLayout *laygroup1 = new QVBoxLayout(oInfo);
laygroup1->setSpacing(KDialog::spacingHint());
vbox->addWidget(oInfo);
oPath = new KUrlRequester(oInfo);
--- trunk/KDE/kdebase/runtime/kcontrol/locale/CMakeLists.txt #650847:650848
@@ -3,7 +3,6 @@
add_subdirectory( pics )
-add_definitions (-DQT3_SUPPORT)
########### next target ###############
--- trunk/KDE/kdebase/runtime/kcontrol/locale/klocalesample.cpp #650847:650848
@@ -40,47 +40,55 @@
m_locale(locale)
{
QGridLayout *lay = new QGridLayout(this);
- lay->setAutoAdd(true);
// Whatever the color scheme is, we want black text
- QColorGroup a = palette().active();
- a.setColor(QPalette::Foreground, Qt::black);
- QPalette pal(a, a, a);
+ QPalette pal = palette();
+ pal.setColor(QPalette::Disabled, QPalette::WindowText, Qt::black);
+ pal.setColor(QPalette::Active, QPalette::WindowText, Qt::black);
+ pal.setColor(QPalette::Inactive, QPalette::WindowText, Qt::black);
+ setPalette(pal);
m_labNumber = new QLabel(this);
+ lay->addWidget(m_labNumber);
m_labNumber->setObjectName( I18N_NOOP("Numbers:") );
m_labNumber->setPalette(pal);
m_numberSample = new QLabel(this);
m_numberSample->setPalette(pal);
m_labMoney = new QLabel(this);
+ lay->addWidget(m_labMoney);
m_labMoney->setObjectName( I18N_NOOP("Money:") );
m_labMoney->setPalette(pal);
m_moneySample = new QLabel(this);
m_moneySample->setPalette(pal);
m_labDate = new QLabel(this);
+ lay->addWidget(m_labDate);
m_labDate->setObjectName( I18N_NOOP("Date:") );
m_labDate->setPalette(pal);
m_dateSample = new QLabel(this);
m_dateSample->setPalette(pal);
m_labDateShort = new QLabel(this);
+ lay->addWidget(m_labDateShort);
m_labDateShort->setObjectName( I18N_NOOP("Short date:") );
m_labDateShort->setPalette(pal);
m_dateShortSample = new QLabel(this);
m_dateShortSample->setPalette(pal);
m_labTime = new QLabel(this);
+ lay->addWidget(m_labTime);
m_labTime->setObjectName( I18N_NOOP("Time:") );
m_labTime->setPalette(pal);
m_timeSample = new QLabel(this);
+ lay->addWidget(m_timeSample);
m_timeSample->setPalette(pal);
lay->setColumnStretch(0, 1);
lay->setColumnStretch(1, 3);
- QTimer *timer = new QTimer(this, "clock_timer");
+ QTimer *timer = new QTimer(this);
+ timer->setObjectName(QLatin1String("clock_timer"));
connect(timer, SIGNAL(timeout()), this, SLOT(slotUpdateTime()));
timer->start(1000);
}
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localemon.cpp #650847:650848
@@ -92,7 +92,8 @@
lay->addWidget(vbox, 4, 0, 1, 2 );
Q3GroupBox *vgrp;
vgrp = new Q3GroupBox( 1, Qt::Horizontal, vbox, I18N_NOOP("Positive") );
- m_chMonPosPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
+ m_chMonPosPreCurSym = new QCheckBox(vgrp);
+ m_chMonPosPreCurSym->setObjectName(I18N_NOOP("Prefix currency symbol"));
connect( m_chMonPosPreCurSym, SIGNAL( clicked() ),
SLOT( slotMonPosPreCurSymChanged() ) );
@@ -108,7 +109,8 @@
SLOT( slotMonPosMonSignPosChanged(int) ) );
vgrp = new Q3GroupBox( 1, Qt::Horizontal, vbox, I18N_NOOP("Negative") );
- m_chMonNegPreCurSym = new QCheckBox(vgrp, I18N_NOOP("Prefix currency symbol"));
+ m_chMonNegPreCurSym = new QCheckBox(vgrp);
+ m_chMonNegPreCurSym->setObjectName(I18N_NOOP("Prefix currency symbol"));
connect( m_chMonNegPreCurSym, SIGNAL( clicked() ),
SLOT( slotMonNegPreCurSymChanged() ) );
@@ -131,7 +133,7 @@
}
lay->setColumnStretch(1, 1);
- lay->addRowSpacing(5, 0);
+ lay->addItem(new QSpacerItem(0, 0), 5, 0);
adjustSize();
}
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localenum.cpp #650847:650848
@@ -43,32 +43,39 @@
QGridLayout *lay = new QGridLayout(this );
lay->setMargin( KDialog::marginHint() );
lay->setSpacing( KDialog::spacingHint());
- lay->setAutoAdd(true);
m_labDecSym = new QLabel(this);
+ lay->addWidget(m_labDecSym, 0, 0);
m_labDecSym->setObjectName( I18N_NOOP("&Decimal symbol:") );
m_edDecSym = new QLineEdit(this);
+ lay->addWidget(m_edDecSym, 0, 1);
connect( m_edDecSym, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotDecSymChanged(const QString &) ) );
m_labDecSym->setBuddy(m_edDecSym);
m_labThoSep = new QLabel(this);
+ lay->addWidget(m_labThoSep, 1, 0);
m_labThoSep->setObjectName( I18N_NOOP("Tho&usands separator:") );
m_edThoSep = new QLineEdit(this);
+ lay->addWidget(m_edThoSep, 1, 1);
connect( m_edThoSep, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotThoSepChanged(const QString &) ) );
m_labThoSep->setBuddy(m_edThoSep);
m_labMonPosSign = new QLabel(this);
+ lay->addWidget(m_labMonPosSign, 2, 0);
m_labMonPosSign->setObjectName( I18N_NOOP("Positive si&gn:") );
m_edMonPosSign = new QLineEdit(this);
+ lay->addWidget(m_edMonPosSign, 2, 1);
connect( m_edMonPosSign, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotMonPosSignChanged(const QString &) ) );
m_labMonPosSign->setBuddy(m_edMonPosSign);
m_labMonNegSign = new QLabel(this);
+ lay->addWidget(m_labMonNegSign, 3, 0);
m_labMonNegSign->setObjectName( I18N_NOOP("&Negative sign:") );
m_edMonNegSign = new QLineEdit(this);
+ lay->addWidget(m_edMonNegSign, 3, 1);
connect( m_edMonNegSign, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotMonNegSignChanged(const QString &) ) );
m_labMonNegSign->setBuddy(m_edMonNegSign);
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localeother.cpp #650847:650848
@@ -68,7 +68,7 @@
m_combMeasureSystem->addItem(QString());
lay->setColumnStretch(1, 1);
- lay->addRowSpacing(2, 0);
+ lay->addItem(new QSpacerItem(0, 0), 2, 0);
adjustSize();
}
--- trunk/KDE/kdebase/runtime/kcontrol/locale/localetime.cpp #650847:650848
@@ -203,11 +203,12 @@
QGridLayout *lay = new QGridLayout( this );
lay->setMargin( KDialog::marginHint() );
lay->setSpacing( KDialog::spacingHint());
- lay->setAutoAdd(true);
m_labCalendarSystem = new QLabel(this);
+ lay->addWidget(m_labCalendarSystem, 0, 0);
m_labCalendarSystem->setObjectName( I18N_NOOP("Calendar system:") );
m_comboCalendarSystem = new QComboBox(this);
+ lay->addWidget(m_comboCalendarSystem, 0, 1);
m_comboCalendarSystem->setEditable(false);
connect(m_comboCalendarSystem, SIGNAL(activated(int)),
this, SLOT(slotCalendarSystemChanged(int)));
@@ -216,8 +217,10 @@
m_comboCalendarSystem->addItems(tmpCalendars);
m_labTimeFmt = new QLabel(this);
+ lay->addWidget(m_labTimeFmt, 1, 0);
m_labTimeFmt->setObjectName( I18N_NOOP("Time format:") );
m_comboTimeFmt = new QComboBox(this);
+ lay->addWidget(m_comboTimeFmt, 1, 1);
m_comboTimeFmt->setEditable(true);
//m_edTimeFmt = m_comboTimeFmt->lineEdit();
//m_edTimeFmt = new QLineEdit(this);
@@ -225,29 +228,37 @@
this, SLOT( slotTimeFmtChanged(const QString &) ) );
m_labDateFmt = new QLabel(this);
+ lay->addWidget(m_labDateFmt, 2, 0);
m_labDateFmt->setObjectName( I18N_NOOP("Date format:") );
m_comboDateFmt = new QComboBox(this);
+ lay->addWidget(m_comboDateFmt, 2, 1);
m_comboDateFmt->setEditable(true);
connect( m_comboDateFmt, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotDateFmtChanged(const QString &) ) );
m_labDateFmtShort = new QLabel(this);
+ lay->addWidget(m_labDateFmtShort, 3, 0);
m_labDateFmtShort->setObjectName( I18N_NOOP("Short date format:") );
m_comboDateFmtShort = new QComboBox(this);
+ lay->addWidget(m_comboDateFmtShort, 3, 1);
m_comboDateFmtShort->setEditable(true);
connect( m_comboDateFmtShort, SIGNAL( textChanged(const QString &) ),
this, SLOT( slotDateFmtShortChanged(const QString &) ) );
m_labWeekStartDay = new QLabel(this);
+ lay->addWidget(m_labWeekStartDay, 4, 0);
m_labWeekStartDay->setObjectName( I18N_NOOP("First day of the week:") );
m_comboWeekStartDay = new QComboBox(this);
+ lay->addWidget(m_comboWeekStartDay, 4, 1);
m_comboWeekStartDay->setEditable(false);
connect (m_comboWeekStartDay, SIGNAL(activated(int)),
this, SLOT(slotWeekStartDayChanged(int)));
updateWeekDayNames();
- m_chDateMonthNamePossessive = new QCheckBox(this, I18N_NOOP("Use declined form of month name"));
+ m_chDateMonthNamePossessive = new QCheckBox(this);
+ m_chDateMonthNamePossessive->setObjectName(I18N_NOOP("Use declined form of month name"));
+ lay->addWidget(m_chDateMonthNamePossessive, 5, 0, 1, 2);
connect( m_chDateMonthNamePossessive, SIGNAL( clicked() ),
SLOT( slotDateMonthNamePossChanged() ) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic