author | paule <paule> | 2007-01-14 03:02:55 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-14 03:02:55 (UTC) |
commit | ca67251af3f46d685afac8dc6bfe452799c2546e (patch) (side-by-side diff) | |
tree | 3e7ae7ed8d06e97c5556b52c5cf3826426cedd9b | |
parent | 81de0baf254bd2d935d0fdf035143e5510354fa7 (diff) | |
download | opie-ca67251af3f46d685afac8dc6bfe452799c2546e.zip opie-ca67251af3f46d685afac8dc6bfe452799c2546e.tar.gz opie-ca67251af3f46d685afac8dc6bfe452799c2546e.tar.bz2 |
When selecting a time zone, warn the user if the time zone file in /usr/share/zoneinfo for the selected time zone is missing
-rw-r--r-- | noncore/settings/netsystemtime/timetabwidget.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp index bcfbdf7..895514b 100644 --- a/noncore/settings/netsystemtime/timetabwidget.cpp +++ b/noncore/settings/netsystemtime/timetabwidget.cpp @@ -41,24 +41,26 @@ #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) #include <qpe/qcopenvelope_qws.h> #endif #include <qcombobox.h> #include <qdatetime.h> #include <qframe.h> #include <qlabel.h> #include <qlayout.h> #include <qpushbutton.h> #include <qscrollview.h> #include <qspinbox.h> +#include <qmessagebox.h> +#include <qfile.h> #include <stdlib.h> #include <sys/time.h> static const int ValueAM = 0; static const int ValuePM = 1; TimeTabWidget::TimeTabWidget( QWidget *parent ) : QWidget( parent, 0x0, 0 ) { // Synchronize HW clock to systemtime // This app will update systemtime @@ -268,24 +270,30 @@ void TimeTabWidget::slotUse12HourTime( int i ) void TimeTabWidget::slotDateFormatChanged( const DateFormat &df ) { btnDate->setDateFormat( df ); } void TimeTabWidget::slotWeekStartChanged( int monday ) { btnDate->setWeekStartsMonday( monday ); } void TimeTabWidget::slotTZChanged( const QString &newtz ) { + // Check timezone has a valid file in /usr/share/zoneinfo + if(!QFile::exists("/usr/share/zoneinfo/" + newtz)) { + QMessageBox::warning(this, tr("Time zone file missing"), + (tr("There is no time zone file for the\nselected time zone (%1).\nYou will need to install it before the\nsystem time zone can be set correctly.")).arg(newtz)); + } + else { // If controls have a valid date & time, update systemtime int hour = sbHour->value(); if ( use12HourTime && cbAmpm->currentItem() == ValuePM ) hour += 12; QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) ); setSystemTime( dt ); QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); setTimeZone << newtz; // Set system timezone QString currtz = getenv( "TZ" ); setenv( "TZ", newtz, 1 ); @@ -298,12 +306,13 @@ void TimeTabWidget::slotTZChanged( const QString &newtz ) // Reset system timezone if ( !currtz.isNull() ) { setenv( "TZ", currtz, 1 ); } // Set controls to new time setDateTime( dt ); emit tzChanged( newtz ); } +} |