From 0633fb26123857509c9eb0e0a013b654667ca9ce Mon Sep 17 00:00:00 2001 From: tille Date: Sat, 16 Nov 2002 16:43:02 +0000 Subject: usability: made it a dialog that saves when exiting clock now running --- (limited to 'noncore/settings') diff --git a/noncore/settings/netsystemtime/TODO b/noncore/settings/netsystemtime/TODO new file mode 100644 index 0000000..fb003a2 --- a/dev/null +++ b/noncore/settings/netsystemtime/TODO @@ -0,0 +1,3 @@ +- handle hour > 24 in SetTime::slotClockTick +- improve tz setting + atm the tz gets written to the system as soon as changed... diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp index c6d5f9a..80fbcb8 100644 --- a/noncore/settings/netsystemtime/main.cpp +++ b/noncore/settings/netsystemtime/main.cpp @@ -4,7 +4,7 @@ int main( int argc, char ** argv ) { - printf("This is netsystemtime\n"); + printf("This is netsystemtime "); printf("$Id$\n"); QPEApplication a( argc, argv ); diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index c7e3b52..53dbe46 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -48,7 +48,7 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) ); //make tab order - + TabWidgetMain->removePage( tabMain ); TabWidgetMain->removePage( tabManualSetTime ); TabWidgetMain->removePage( TabSettings ); @@ -56,7 +56,6 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) TabWidgetMain->removePage( tabNtp ); TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); - TabWidgetMain->insertTab( tabManualSetTime, tr( "Manual" ) ); TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) ); @@ -96,6 +95,9 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) Ntp::~Ntp() { delete ntpProcess; +} + +void Ntp::saveConfig(){ int srvCount = ComboNtpSrv->count(); bool serversChanged = true; QString edit = ComboNtpSrv->currentText(); @@ -199,20 +201,10 @@ void Ntp::ntpFinished(OProcess *p) { if ( isVisible() && _interactive ){ QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput ); - TabWidgetMain->showPage( tabManualSetTime ); } - +// slotCheckNtp(-1); return; } - - Global::writeHWClock(); - // since time has changed quickly load in the datebookdb - // to allow the alarm server to get a better grip on itself - // (example re-trigger alarms for when we travel back in time) - DateBookDB db; - - // QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" ); - // timeApplet << ""; Config cfg("ntp",Config::User); cfg.setGroup("lookups"); @@ -306,32 +298,34 @@ void Ntp::preditctTime() TextLabelEstimatedShift->setText(QString::number(corr)+tr(" seconds")); predictedTime = QDateTime::currentDateTime().addSecs(corr); TextLabelPredTime->setText(predictedTime.toString()); - TextLabelMainPredTime->setText(tr("Predicted time:")+"
"+predictedTime.toString()+""); +// TextLabelMainPredTime->setText(tr("Predicted time:")+"
"+predictedTime.toString()+""); } void Ntp::setPredictTime() { + qDebug("Ntp::setPredictTime"); preditctTime(); - setTime( predictedTime ); + timeButton->setTime( predictedTime ); } void Ntp::slotCheckNtp(int i) { + qDebug(" Ntp::slotCheckNtp(%i)",i); if (i == 0) { - TextLabelMainPredTime->hide(); +// TextLabelMainPredTime->hide(); ButtonSetTime->setText( tr("Get time from network") ); connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) ); if ( ntpDelayElapsed() ) - { - slotRunNtp(); - disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); - connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) ); - }else{ - disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) ); - connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); - } - }else{ + { + slotRunNtp(); + disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) ); + connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) ); + }else{ + disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) ); + connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) ); + } + }else{ preditctTime(); ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() ); if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer()); @@ -418,3 +412,15 @@ void Ntp::showAdvancedFeatures(bool advMode) }; TabWidgetMain->show(); } + + +void Ntp::accept( ){ + qDebug("accepted"); + //SetTimeDate + commitTime(); + writeSettings(); + updateSystem(); + // Ntp + saveConfig(); + qApp->quit(); +} \ No newline at end of file diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h index 15cddbd..a4573f8 100644 --- a/noncore/settings/netsystemtime/ntp.h +++ b/noncore/settings/netsystemtime/ntp.h @@ -20,6 +20,7 @@ public: public slots: void setDocument (const QString &); protected: + virtual void accept( ); QDateTime predictedTime; void makeChannel(); protected slots: @@ -38,6 +39,7 @@ private: void ntpOutPut(QString); bool ntpDelayElapsed(); QString getNtpServer(); + void saveConfig(); private slots: void slotTimerRunNtp(); void slotButtonRunNtp(); diff --git a/noncore/settings/netsystemtime/ntpbase.cpp b/noncore/settings/netsystemtime/ntpbase.cpp index 0a7a57e..878c158 100644 --- a/noncore/settings/netsystemtime/ntpbase.cpp +++ b/noncore/settings/netsystemtime/ntpbase.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file 'ntpbase.ui' ** -** Created: Sun Nov 10 17:59:14 2002 +** Created: Sat Nov 16 15:49:54 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -25,9 +26,12 @@ /* * Constructs a NtpBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' + * + * The dialog will by default be modeless, unless you set 'modal' to + * TRUE to construct a modal dialog. */ -NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +NtpBase::NtpBase( QWidget* parent, const char* name, bool modal, WFlags fl ) + : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "NtpBase" ); @@ -317,7 +321,7 @@ NtpBase::~NtpBase() */ bool NtpBase::event( QEvent* ev ) { - bool ret = QWidget::event( ev ); + bool ret = QDialog::event( ev ); if ( ev->type() == QEvent::ApplicationFontChange ) { QFont MultiLineEditntpOutPut_font( MultiLineEditntpOutPut->font() ); MultiLineEditntpOutPut_font.setPointSize( 7 ); diff --git a/noncore/settings/netsystemtime/ntpbase.h b/noncore/settings/netsystemtime/ntpbase.h index 543cac1..68599c9 100644 --- a/noncore/settings/netsystemtime/ntpbase.h +++ b/noncore/settings/netsystemtime/ntpbase.h @@ -1,7 +1,7 @@ /**************************************************************************** ** Form interface generated from reading ui file 'ntpbase.ui' ** -** Created: Sun Nov 10 17:58:48 2002 +** Created: Sat Nov 16 15:49:32 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -10,7 +10,7 @@ #define NTPBASE_H #include -#include +#include class QVBoxLayout; class QHBoxLayout; class QGridLayout; @@ -23,13 +23,14 @@ class QPushButton; class QSpinBox; class QTabWidget; class QTable; +class QWidget; -class NtpBase : public QWidget +class NtpBase : public QDialog { Q_OBJECT public: - NtpBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + NtpBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~NtpBase(); QTabWidget* TabWidgetMain; diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui index 6c38588..8c106be 100644 --- a/noncore/settings/netsystemtime/ntpbase.ui +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -1,7 +1,7 @@ NtpBase - QWidget + QDialog name NtpBase diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 949fcb3..36166ae 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp @@ -35,6 +35,7 @@ #include #endif +#include #include #include #include @@ -52,42 +53,47 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) - : NtpBase( parent, name, f ) + : NtpBase( parent, name, true, f ) { - // setCaption( tr("Set System Time") ); + setCaption( tr("System Time") ); -// QVBoxLayout *vb = new QVBoxLayout( this, 5 ); QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); - QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 ); - TextLabelMainPredTime = new QLabel( FrameSystemTime ); - vb->addWidget( TextLabelMainPredTime, 1, 0 ); +// TextLabelMainPredTime = new QLabel( FrameSystemTime ); +// vb->addWidget( TextLabelMainPredTime, 1, 0 ); - QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); + timeButton = new SetTime( FrameSystemTime ); + vb->addWidget( timeButton ); + + QHBoxLayout *db = new QHBoxLayout( vb ); + QLabel *dateLabel = new QLabel( tr("Date"), FrameSystemTime ); + db->addWidget( dateLabel, 1 ); + dateButton = new DateButton( TRUE, FrameSystemTime ); + db->addWidget( dateButton, 2 ); + ButtonSetTime = new QPushButton( FrameSystemTime ); + vb->addWidget( ButtonSetTime, 1, 0 ); + + QFrame *hline = new QFrame( FrameSystemTime ); + hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + vb->addWidget( hline ); + + QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); + QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); lblZone->setMaximumSize( lblZone->sizeHint() ); hb->addWidget( lblZone ); tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" ); tz->setMinimumSize( tz->sizeHint() ); - hb->addWidget( tz ); - - timeButton = new SetTime( FrameSetTime ); - vb2->addWidget( timeButton ); - - QHBoxLayout *db = new QHBoxLayout( vb2 ); - QLabel *dateLabel = new QLabel( tr("Date"), FrameSetTime ); - db->addWidget( dateLabel, 1 ); - dateButton = new DateButton( TRUE, FrameSetTime ); - db->addWidget( dateButton, 2 ); - - QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - vb2->addItem( spacer ); + hb->addWidget( tz ); - QFrame *hline = new QFrame( FrameSystemTime ); + hline = new QFrame( FrameSystemTime ); hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); vb->addWidget( hline ); + + QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + vb->addItem( spacer ); Config config("qpe"); config.setGroup( "Time" ); @@ -179,35 +185,31 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) vb->addStretch( 0 ); - hline = new QFrame( FrameSystemTime ); - hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); - vb->addWidget( hline ); +// hline = new QFrame( FrameSystemTime ); +// hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); +// vb->addWidget( hline ); +// +// ButtonSetTime = new QPushButton( FrameSystemTime ); +// vb->addWidget( ButtonSetTime, 1, 0 ); - ButtonSetTime = new QPushButton( FrameSystemTime ); - vb->addWidget( ButtonSetTime, 1, 0 ); - - QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()), - this, SLOT(commitTime())); QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), timeButton, SLOT( slotTzChange( const QString& ) ) ); QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), SLOT( tzChange( const QString& ) ) ); - QObject::connect( weekStartCombo, SIGNAL( activated ( int )), - SLOT(updateSystem(int ) )); - QObject::connect( ampmCombo, SIGNAL( activated ( int )), - SLOT(updateSystem(int ) )); - QObject::connect( dateFormatCombo, SIGNAL( activated ( int )), - SLOT(updateSystem(int ) )); - QObject::connect( clockAppletCombo, SIGNAL( activated ( int )), - SLOT(updateSystem(int ) )); +// QObject::connect( weekStartCombo, SIGNAL( activated ( int )), +// SLOT(updateSystem(int ) )); +// QObject::connect( ampmCombo, SIGNAL( activated ( int )), +// SLOT(updateSystem(int ) )); +// QObject::connect( dateFormatCombo, SIGNAL( activated ( int )), +// SLOT(updateSystem(int ) )); +// QObject::connect( clockAppletCombo, SIGNAL( activated ( int )), +// SLOT(updateSystem(int ) )); } SetDateTime::~SetDateTime() { - writeSettings(); - } void SetDateTime::writeSettings() @@ -276,7 +278,7 @@ void SetDateTime::setTime(QDateTime dt) enableScreenSaver << -1 << -1 << -1; } -void SetDateTime::updateSystem(int i) +void SetDateTime::updateSystem() { // really turn off the screensaver before doing anything { @@ -284,7 +286,7 @@ void SetDateTime::updateSystem(int i) QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); disableScreenSaver << 0 << 0 << 0; } - qDebug("SetDateTime::updateSystem(int %i)",i); + qDebug("SetDateTime::updateSystem()"); writeSettings(); // set the timezone for everyone else... @@ -323,7 +325,7 @@ void SetDateTime::tzChange( const QString &tz ) QDate d = QDate::currentDate(); // reset the time. if ( !strSave.isNull() ) { - setenv( "TZ", strSave, 1 ); + setenv( "TZ", strSave, 1 ); } dateButton->setDate( d ); updateSystem(); @@ -342,11 +344,15 @@ static const int ValuePM = 1; SetTime::SetTime( QWidget *parent, const char *name ) : QWidget( parent, name ) { + clock = new QTimer(this, "clock" ); + connect(clock, SIGNAL( timeout() ), SLOT(slotClockTick()) ); + clock->start( 1000 * 60 ); + use12hourTime = FALSE; - QTime currTime = QTime::currentTime(); - hour = currTime.hour(); - minute = currTime.minute(); + _time = QDateTime::currentDateTime(); + hour = _time.time().hour(); + minute = _time.time().minute(); QHBoxLayout *hb2 = new QHBoxLayout( this ); hb2->setSpacing( 3 ); @@ -499,4 +505,30 @@ void SetTime::slotTzChange( const QString &tz ) sbMin->setValue( t.minute() ); } +void SetTime::setTime( QDateTime dt ) +{ + _time = dt; + QTime t = dt.time(); + // just set the spinboxes and let it propage through + if(use12hourTime) { + int show_hour = t.hour(); + if (t.hour() >= 12) { + show_hour -= 12; + ampm->setCurrentItem( ValuePM ); + } else { + ampm->setCurrentItem( ValueAM ); + } + if (show_hour == 0) + show_hour = 12; + sbHour->setValue( show_hour ); + } else { + sbHour->setValue( t.hour() ); + } + sbMin->setValue( t.minute() ); +} +void SetTime::slotClockTick() +{ + setTime( _time.addSecs(60) ); + qDebug("SetTime::slotClockTick %s",_time.toString().latin1()); +} diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h index 778cb9c..3c3a162 100644 --- a/noncore/settings/netsystemtime/settime.h +++ b/noncore/settings/netsystemtime/settime.h @@ -41,12 +41,14 @@ public: SetTime( QWidget *parent=0, const char *name=0 ); QTime time() const; + void setTime( QDateTime ); public slots: void slotTzChange( const QString& tz ); void show12hourTime( int ); protected slots: + void slotClockTick(); void hourChanged( int value ); void minuteChanged( int value ); @@ -56,6 +58,8 @@ protected: int hour; int minute; bool use12hourTime; + QDateTime _time; + QTimer *clock; QComboBox *ampm; QSpinBox *sbHour; QSpinBox *sbMin; @@ -74,7 +78,7 @@ protected slots: void commitTime(); void tzChange( const QString &tz ); void formatChanged(int); - void updateSystem(int i=0); + void updateSystem(); protected: void setTime(QDateTime dt); @@ -88,7 +92,7 @@ protected: QComboBox *dateFormatCombo; QComboBox *clockAppletCombo; QPushButton *ButtonSetTime; - QLabel *TextLabelMainPredTime; + // QLabel *TextLabelMainPredTime; DateFormat date_formats[4]; }; -- cgit v0.9.0.2