author | llornkcor <llornkcor> | 2005-08-11 10:13:34 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-08-11 10:13:34 (UTC) |
commit | 6542c453a070319be133ca2a7313ef054f60460c (patch) (side-by-side diff) | |
tree | fb3914cde357b4e693713aa2cff5bb5e04b063dd | |
parent | 6040d26c56a95d9f5bd09688e22009fc5b5e124d (diff) | |
download | opie-6542c453a070319be133ca2a7313ef054f60460c.zip opie-6542c453a070319be133ca2a7313ef054f60460c.tar.gz opie-6542c453a070319be133ca2a7313ef054f60460c.tar.bz2 |
revert
-rw-r--r-- | noncore/settings/netsystemtime/formattabwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/formattabwidget.cpp b/noncore/settings/netsystemtime/formattabwidget.cpp index a037881..7d01bff 100644 --- a/noncore/settings/netsystemtime/formattabwidget.cpp +++ b/noncore/settings/netsystemtime/formattabwidget.cpp @@ -49,55 +49,55 @@ FormatTabWidget::FormatTabWidget( QWidget *parent ) QScrollView *sv = new QScrollView( this ); tmpvb->addWidget( sv, 0, 0 ); sv->setResizePolicy( QScrollView::AutoOneFit ); sv->setFrameStyle( QFrame::NoFrame ); QWidget *container = new QWidget( sv->viewport() ); sv->addChild( container ); QGridLayout *layout = new QGridLayout( container ); layout->setMargin( 2 ); layout->setSpacing( 4 ); // Time format selector layout->addWidget( new QLabel( tr( "Time format" ), container ), 0, 0 ); cbAppletFormat = new QComboBox( container ); cbAppletFormat->insertItem( tr( "hh:mm" ), 0 ); cbAppletFormat->insertItem( tr( "D/M hh:mm" ), 1 ); cbAppletFormat->insertItem( tr( "M/D hh:mm" ), 2 ); layout->addWidget( cbAppletFormat, 0, 1 ); // 12/24 hour selector layout->addWidget( new QLabel( tr( "12/24 hour" ), container ), 1, 0 ); cbAmpm = new QComboBox( container ); cbAmpm->insertItem( tr( "24 hour" ), 0 ); cbAmpm->insertItem( tr( "12 hour" ), 1 ); - connect( cbAmpm, SIGNAL(activated( int)), this, SIGNAL(show12HourTime( int)) ); + connect( cbAmpm, SIGNAL(activated(int)), this, SIGNAL(show12HourTime(int)) ); layout->addWidget( cbAmpm, 1, 1 ); // Date format selector layout->addWidget( new QLabel( tr( "Date format" ), container ), 2, 0 ); cbDateFormat = new QComboBox( container ); - connect( cbDateFormat, SIGNAL(activated( int)), this, SLOT(slotDateFormatChanged( int)) ); + connect( cbDateFormat, SIGNAL(activated(int)), this, SLOT(slotDateFormatChanged(int)) ); layout->addWidget( cbDateFormat, 2, 1 ); // Week starts on selector layout->addWidget( new QLabel( tr( "Weeks start on" ), container ), 3, 0 ); cbWeekStart = new QComboBox( container ); cbWeekStart->insertItem( tr( "Sunday" ), 0 ); cbWeekStart->insertItem( tr( "Monday" ), 1 ); connect( cbWeekStart, SIGNAL(activated(int)), this, SIGNAL(weekStartChanged(int)) ); layout->addWidget( cbWeekStart, 3, 1 ); // Initialize values Config config( "qpe" ); config.setGroup( "Date" ); cbAppletFormat->setCurrentItem( config.readNumEntry( "ClockApplet", 0 ) ); DateFormat df(QChar(config.readEntry("Separator", "/")[0]), (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear), (DateFormat::Order)config.readNumEntry("LongOrder", DateFormat::DayMonthYear)); int currentdf = 0; date_formats[0] = DateFormat( '/', DateFormat::MonthDayYear ); cbDateFormat->insertItem( tr( date_formats[0].toNumberString() ) ); date_formats[1] = DateFormat( '.', DateFormat::DayMonthYear ); if ( df == date_formats[1] ) |