author | tille <tille> | 2002-11-16 16:43:02 (UTC) |
---|---|---|
committer | tille <tille> | 2002-11-16 16:43:02 (UTC) |
commit | 0633fb26123857509c9eb0e0a013b654667ca9ce (patch) (side-by-side diff) | |
tree | 9187213cc22830c65dcba1923be9a8355c673b5a /noncore | |
parent | 88435a3192f09453e035a7f1cf73bbc8c24245c9 (diff) | |
download | opie-0633fb26123857509c9eb0e0a013b654667ca9ce.zip opie-0633fb26123857509c9eb0e0a013b654667ca9ce.tar.gz opie-0633fb26123857509c9eb0e0a013b654667ca9ce.tar.bz2 |
usability:
made it a dialog that saves when exiting
clock now running
-rw-r--r-- | noncore/settings/netsystemtime/TODO | 3 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/main.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 36 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntp.h | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntpbase.cpp | 12 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntpbase.h | 9 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntpbase.ui | 2 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 116 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/settime.h | 8 |
9 files changed, 121 insertions, 69 deletions
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 @@ -5,5 +5,5 @@ int main( int argc, char ** argv ) { - printf("This is netsystemtime\n"); + printf("This is netsystemtime "); printf("$Id$\n"); 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 @@ -57,5 +57,4 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); - TabWidgetMain->insertTab( tabManualSetTime, tr( "Manual" ) ); TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); @@ -97,4 +96,7 @@ Ntp::~Ntp() { delete ntpProcess; +} + +void Ntp::saveConfig(){ int srvCount = ComboNtpSrv->count(); bool serversChanged = true; @@ -200,19 +202,9 @@ 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"); @@ -307,18 +299,20 @@ void Ntp::preditctTime() predictedTime = QDateTime::currentDateTime().addSecs(corr); TextLabelPredTime->setText(predictedTime.toString()); - TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); +// TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); } 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()) ); @@ -419,2 +413,14 @@ 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 @@ -21,4 +21,5 @@ public slots: void setDocument (const QString &); protected: + virtual void accept( ); QDateTime predictedTime; void makeChannel(); @@ -39,4 +40,5 @@ private: bool ntpDelayElapsed(); QString getNtpServer(); + void saveConfig(); private slots: void slotTimerRunNtp(); 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 @@ -2,5 +2,5 @@ ** 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) ** @@ -18,4 +18,5 @@ #include <qtable.h> #include <qtabwidget.h> +#include <qwidget.h> #include <qlayout.h> #include <qvariant.h> @@ -26,7 +27,10 @@ * 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 ) @@ -318,5 +322,5 @@ 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() ); 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 @@ -2,5 +2,5 @@ ** 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) ** @@ -11,5 +11,5 @@ #include <qvariant.h> -#include <qwidget.h> +#include <qdialog.h> class QVBoxLayout; class QHBoxLayout; @@ -24,11 +24,12 @@ 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(); 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 @@ -2,5 +2,5 @@ <class>NtpBase</class> <widget> - <class>QWidget</class> + <class>QDialog</class> <property stdset="1"> <name>name</name> 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 @@ -36,4 +36,5 @@ #endif +#include <qtimer.h> #include <qbuttongroup.h> #include <qcheckbox.h> @@ -53,14 +54,28 @@ 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 ); + + 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" ); @@ -74,20 +89,11 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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 ); - - 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" ); @@ -180,13 +186,11 @@ 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 ); - - ButtonSetTime = new QPushButton( FrameSystemTime ); - vb->addWidget( ButtonSetTime, 1, 0 ); +// hline = new QFrame( FrameSystemTime ); +// hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); +// vb->addWidget( hline ); +// +// ButtonSetTime = new QPushButton( FrameSystemTime ); +// vb->addWidget( ButtonSetTime, 1, 0 ); - QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()), - this, SLOT(commitTime())); QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), @@ -195,18 +199,16 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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(); - } @@ -277,5 +279,5 @@ void SetDateTime::setTime(QDateTime dt) } -void SetDateTime::updateSystem(int i) +void SetDateTime::updateSystem() { // really turn off the screensaver before doing anything @@ -285,5 +287,5 @@ void SetDateTime::updateSystem(int i) disableScreenSaver << 0 << 0 << 0; } - qDebug("SetDateTime::updateSystem(int %i)",i); + qDebug("SetDateTime::updateSystem()"); writeSettings(); @@ -343,9 +345,13 @@ 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 ); @@ -500,3 +506,29 @@ void SetTime::slotTzChange( const QString &tz ) } +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 @@ -42,4 +42,5 @@ public: QTime time() const; + void setTime( QDateTime ); public slots: @@ -48,4 +49,5 @@ public slots: protected slots: + void slotClockTick(); void hourChanged( int value ); void minuteChanged( int value ); @@ -57,4 +59,6 @@ protected: int minute; bool use12hourTime; + QDateTime _time; + QTimer *clock; QComboBox *ampm; QSpinBox *sbHour; @@ -75,5 +79,5 @@ protected slots: void tzChange( const QString &tz ); void formatChanged(int); - void updateSystem(int i=0); + void updateSystem(); protected: @@ -89,5 +93,5 @@ protected: QComboBox *clockAppletCombo; QPushButton *ButtonSetTime; - QLabel *TextLabelMainPredTime; + // QLabel *TextLabelMainPredTime; DateFormat date_formats[4]; |