author | tille <tille> | 2002-11-16 16:43:02 (UTC) |
---|---|---|
committer | tille <tille> | 2002-11-16 16:43:02 (UTC) |
commit | 0633fb26123857509c9eb0e0a013b654667ca9ce (patch) (unidiff) | |
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 @@ | |||
1 | - handle hour > 24 in SetTime::slotClockTick | ||
2 | - improve tz setting | ||
3 | 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 | |||
@@ -3,9 +3,9 @@ | |||
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | 4 | ||
5 | int main( int argc, char ** argv ) | 5 | int main( int argc, char ** argv ) |
6 | { | 6 | { |
7 | printf("This is netsystemtime\n"); | 7 | printf("This is netsystemtime "); |
8 | printf("$Id$\n"); | 8 | printf("$Id$\n"); |
9 | 9 | ||
10 | QPEApplication a( argc, argv ); | 10 | QPEApplication a( argc, argv ); |
11 | 11 | ||
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 | |||
@@ -55,9 +55,8 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) | |||
55 | TabWidgetMain->removePage( tabPredict ); | 55 | TabWidgetMain->removePage( tabPredict ); |
56 | TabWidgetMain->removePage( tabNtp ); | 56 | TabWidgetMain->removePage( tabNtp ); |
57 | 57 | ||
58 | TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); | 58 | TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); |
59 | TabWidgetMain->insertTab( tabManualSetTime, tr( "Manual" ) ); | ||
60 | TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); | 59 | TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); |
61 | TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); | 60 | TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); |
62 | TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) ); | 61 | TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) ); |
63 | NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 ); | 62 | NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 ); |
@@ -95,8 +94,11 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) | |||
95 | 94 | ||
96 | Ntp::~Ntp() | 95 | Ntp::~Ntp() |
97 | { | 96 | { |
98 | delete ntpProcess; | 97 | delete ntpProcess; |
98 | } | ||
99 | |||
100 | void Ntp::saveConfig(){ | ||
99 | int srvCount = ComboNtpSrv->count(); | 101 | int srvCount = ComboNtpSrv->count(); |
100 | bool serversChanged = true; | 102 | bool serversChanged = true; |
101 | QString edit = ComboNtpSrv->currentText(); | 103 | QString edit = ComboNtpSrv->currentText(); |
102 | for (int i = 0; i < srvCount; i++){ | 104 | for (int i = 0; i < srvCount; i++){ |
@@ -198,23 +200,13 @@ void Ntp::ntpFinished(OProcess *p) | |||
198 | if (p->exitStatus()!=0 || !p->normalExit()) | 200 | if (p->exitStatus()!=0 || !p->normalExit()) |
199 | { | 201 | { |
200 | if ( isVisible() && _interactive ){ | 202 | if ( isVisible() && _interactive ){ |
201 | QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput ); | 203 | QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput ); |
202 | TabWidgetMain->showPage( tabManualSetTime ); | ||
203 | } | 204 | } |
204 | 205 | // slotCheckNtp(-1); | |
205 | return; | 206 | return; |
206 | } | 207 | } |
207 | 208 | ||
208 | Global::writeHWClock(); | ||
209 | // since time has changed quickly load in the datebookdb | ||
210 | // to allow the alarm server to get a better grip on itself | ||
211 | // (example re-trigger alarms for when we travel back in time) | ||
212 | DateBookDB db; | ||
213 | |||
214 | // QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" ); | ||
215 | // timeApplet << ""; | ||
216 | |||
217 | Config cfg("ntp",Config::User); | 209 | Config cfg("ntp",Config::User); |
218 | cfg.setGroup("lookups"); | 210 | cfg.setGroup("lookups"); |
219 | int lastLookup = cfg.readNumEntry("time",0); | 211 | int lastLookup = cfg.readNumEntry("time",0); |
220 | int lookupCount = cfg.readNumEntry("count",0); | 212 | int lookupCount = cfg.readNumEntry("count",0); |
@@ -305,22 +297,24 @@ void Ntp::preditctTime() | |||
305 | int corr = int((now - lastTime) * _shiftPerSec); | 297 | int corr = int((now - lastTime) * _shiftPerSec); |
306 | TextLabelEstimatedShift->setText(QString::number(corr)+tr(" seconds")); | 298 | TextLabelEstimatedShift->setText(QString::number(corr)+tr(" seconds")); |
307 | predictedTime = QDateTime::currentDateTime().addSecs(corr); | 299 | predictedTime = QDateTime::currentDateTime().addSecs(corr); |
308 | TextLabelPredTime->setText(predictedTime.toString()); | 300 | TextLabelPredTime->setText(predictedTime.toString()); |
309 | TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); | 301 | // TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>"); |
310 | } | 302 | } |
311 | 303 | ||
312 | void Ntp::setPredictTime() | 304 | void Ntp::setPredictTime() |
313 | { | 305 | { |
306 | qDebug("Ntp::setPredictTime"); | ||
314 | preditctTime(); | 307 | preditctTime(); |
315 | setTime( predictedTime ); | 308 | timeButton->setTime( predictedTime ); |
316 | } | 309 | } |
317 | 310 | ||
318 | void Ntp::slotCheckNtp(int i) | 311 | void Ntp::slotCheckNtp(int i) |
319 | { | 312 | { |
313 | qDebug(" Ntp::slotCheckNtp(%i)",i); | ||
320 | if (i == 0) | 314 | if (i == 0) |
321 | { | 315 | { |
322 | TextLabelMainPredTime->hide(); | 316 | // TextLabelMainPredTime->hide(); |
323 | ButtonSetTime->setText( tr("Get time from network") ); | 317 | ButtonSetTime->setText( tr("Get time from network") ); |
324 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) ); | 318 | connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) ); |
325 | if ( ntpDelayElapsed() ) | 319 | if ( ntpDelayElapsed() ) |
326 | { | 320 | { |
@@ -417,4 +411,16 @@ void Ntp::showAdvancedFeatures(bool advMode) | |||
417 | Line1->hide(); | 411 | Line1->hide(); |
418 | }; | 412 | }; |
419 | TabWidgetMain->show(); | 413 | TabWidgetMain->show(); |
420 | } | 414 | } |
415 | |||
416 | |||
417 | void Ntp::accept( ){ | ||
418 | qDebug("accepted"); | ||
419 | //SetTimeDate | ||
420 | commitTime(); | ||
421 | writeSettings(); | ||
422 | updateSystem(); | ||
423 | // Ntp | ||
424 | saveConfig(); | ||
425 | qApp->quit(); | ||
426 | } \ 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 | |||
@@ -19,8 +19,9 @@ public: | |||
19 | 19 | ||
20 | public slots: | 20 | public slots: |
21 | void setDocument (const QString &); | 21 | void setDocument (const QString &); |
22 | protected: | 22 | protected: |
23 | virtual void accept( ); | ||
23 | QDateTime predictedTime; | 24 | QDateTime predictedTime; |
24 | void makeChannel(); | 25 | void makeChannel(); |
25 | protected slots: | 26 | protected slots: |
26 | void receive(const QCString &msg, const QByteArray &arg); | 27 | void receive(const QCString &msg, const QByteArray &arg); |
@@ -37,8 +38,9 @@ private: | |||
37 | void readLookups(); | 38 | void readLookups(); |
38 | void ntpOutPut(QString); | 39 | void ntpOutPut(QString); |
39 | bool ntpDelayElapsed(); | 40 | bool ntpDelayElapsed(); |
40 | QString getNtpServer(); | 41 | QString getNtpServer(); |
42 | void saveConfig(); | ||
41 | private slots: | 43 | private slots: |
42 | void slotTimerRunNtp(); | 44 | void slotTimerRunNtp(); |
43 | void slotButtonRunNtp(); | 45 | void slotButtonRunNtp(); |
44 | void slotRunNtp(); | 46 | void slotRunNtp(); |
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,8 +1,8 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form implementation generated from reading ui file 'ntpbase.ui' | 2 | ** Form implementation generated from reading ui file 'ntpbase.ui' |
3 | ** | 3 | ** |
4 | ** Created: Sun Nov 10 17:59:14 2002 | 4 | ** Created: Sat Nov 16 15:49:54 2002 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
@@ -16,19 +16,23 @@ | |||
16 | #include <qpushbutton.h> | 16 | #include <qpushbutton.h> |
17 | #include <qspinbox.h> | 17 | #include <qspinbox.h> |
18 | #include <qtable.h> | 18 | #include <qtable.h> |
19 | #include <qtabwidget.h> | 19 | #include <qtabwidget.h> |
20 | #include <qwidget.h> | ||
20 | #include <qlayout.h> | 21 | #include <qlayout.h> |
21 | #include <qvariant.h> | 22 | #include <qvariant.h> |
22 | #include <qtooltip.h> | 23 | #include <qtooltip.h> |
23 | #include <qwhatsthis.h> | 24 | #include <qwhatsthis.h> |
24 | 25 | ||
25 | /* | 26 | /* |
26 | * Constructs a NtpBase which is a child of 'parent', with the | 27 | * Constructs a NtpBase which is a child of 'parent', with the |
27 | * name 'name' and widget flags set to 'f' | 28 | * name 'name' and widget flags set to 'f' |
29 | * | ||
30 | * The dialog will by default be modeless, unless you set 'modal' to | ||
31 | * TRUE to construct a modal dialog. | ||
28 | */ | 32 | */ |
29 | NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) | 33 | NtpBase::NtpBase( QWidget* parent, const char* name, bool modal, WFlags fl ) |
30 | : QWidget( parent, name, fl ) | 34 | : QDialog( parent, name, modal, fl ) |
31 | { | 35 | { |
32 | if ( !name ) | 36 | if ( !name ) |
33 | setName( "NtpBase" ); | 37 | setName( "NtpBase" ); |
34 | resize( 317, 411 ); | 38 | resize( 317, 411 ); |
@@ -316,9 +320,9 @@ NtpBase::~NtpBase() | |||
316 | * font changes | 320 | * font changes |
317 | */ | 321 | */ |
318 | bool NtpBase::event( QEvent* ev ) | 322 | bool NtpBase::event( QEvent* ev ) |
319 | { | 323 | { |
320 | bool ret = QWidget::event( ev ); | 324 | bool ret = QDialog::event( ev ); |
321 | if ( ev->type() == QEvent::ApplicationFontChange ) { | 325 | if ( ev->type() == QEvent::ApplicationFontChange ) { |
322 | QFont MultiLineEditntpOutPut_font( MultiLineEditntpOutPut->font() ); | 326 | QFont MultiLineEditntpOutPut_font( MultiLineEditntpOutPut->font() ); |
323 | MultiLineEditntpOutPut_font.setPointSize( 7 ); | 327 | MultiLineEditntpOutPut_font.setPointSize( 7 ); |
324 | MultiLineEditntpOutPut->setFont( MultiLineEditntpOutPut_font ); | 328 | MultiLineEditntpOutPut->setFont( 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 | |||
@@ -1,17 +1,17 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** Form interface generated from reading ui file 'ntpbase.ui' | 2 | ** Form interface generated from reading ui file 'ntpbase.ui' |
3 | ** | 3 | ** |
4 | ** Created: Sun Nov 10 17:58:48 2002 | 4 | ** Created: Sat Nov 16 15:49:32 2002 |
5 | ** by: The User Interface Compiler (uic) | 5 | ** by: The User Interface Compiler (uic) |
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #ifndef NTPBASE_H | 9 | #ifndef NTPBASE_H |
10 | #define NTPBASE_H | 10 | #define NTPBASE_H |
11 | 11 | ||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | #include <qwidget.h> | 13 | #include <qdialog.h> |
14 | class QVBoxLayout; | 14 | class QVBoxLayout; |
15 | class QHBoxLayout; | 15 | class QHBoxLayout; |
16 | class QGridLayout; | 16 | class QGridLayout; |
17 | class QCheckBox; | 17 | class QCheckBox; |
@@ -22,15 +22,16 @@ class QMultiLineEdit; | |||
22 | class QPushButton; | 22 | class QPushButton; |
23 | class QSpinBox; | 23 | class QSpinBox; |
24 | class QTabWidget; | 24 | class QTabWidget; |
25 | class QTable; | 25 | class QTable; |
26 | class QWidget; | ||
26 | 27 | ||
27 | class NtpBase : public QWidget | 28 | class NtpBase : public QDialog |
28 | { | 29 | { |
29 | Q_OBJECT | 30 | Q_OBJECT |
30 | 31 | ||
31 | public: | 32 | public: |
32 | NtpBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | NtpBase( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
33 | ~NtpBase(); | 34 | ~NtpBase(); |
34 | 35 | ||
35 | QTabWidget* TabWidgetMain; | 36 | QTabWidget* TabWidgetMain; |
36 | QWidget* tabMain; | 37 | QWidget* tabMain; |
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,8 +1,8 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>NtpBase</class> | 2 | <class>NtpBase</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QWidget</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>NtpBase</cstring> | 7 | <cstring>NtpBase</cstring> |
8 | </property> | 8 | </property> |
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 | |||
@@ -34,8 +34,9 @@ | |||
34 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 34 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
35 | #include <qpe/qcopenvelope_qws.h> | 35 | #include <qpe/qcopenvelope_qws.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | #include <qtimer.h> | ||
38 | #include <qbuttongroup.h> | 39 | #include <qbuttongroup.h> |
39 | #include <qcheckbox.h> | 40 | #include <qcheckbox.h> |
40 | #include <qlabel.h> | 41 | #include <qlabel.h> |
41 | #include <qlayout.h> | 42 | #include <qlayout.h> |
@@ -51,18 +52,32 @@ | |||
51 | #include <stdio.h> | 52 | #include <stdio.h> |
52 | 53 | ||
53 | 54 | ||
54 | SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) | 55 | SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) |
55 | : NtpBase( parent, name, f ) | 56 | : NtpBase( parent, name, true, f ) |
56 | { | 57 | { |
57 | // setCaption( tr("Set System Time") ); | 58 | setCaption( tr("System Time") ); |
58 | 59 | ||
59 | // QVBoxLayout *vb = new QVBoxLayout( this, 5 ); | ||
60 | QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); | 60 | QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); |
61 | QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 ); | ||
62 | 61 | ||
63 | TextLabelMainPredTime = new QLabel( FrameSystemTime ); | 62 | // TextLabelMainPredTime = new QLabel( FrameSystemTime ); |
64 | vb->addWidget( TextLabelMainPredTime, 1, 0 ); | 63 | // vb->addWidget( TextLabelMainPredTime, 1, 0 ); |
64 | |||
65 | timeButton = new SetTime( FrameSystemTime ); | ||
66 | vb->addWidget( timeButton ); | ||
67 | |||
68 | QHBoxLayout *db = new QHBoxLayout( vb ); | ||
69 | QLabel *dateLabel = new QLabel( tr("Date"), FrameSystemTime ); | ||
70 | db->addWidget( dateLabel, 1 ); | ||
71 | dateButton = new DateButton( TRUE, FrameSystemTime ); | ||
72 | db->addWidget( dateButton, 2 ); | ||
73 | |||
74 | ButtonSetTime = new QPushButton( FrameSystemTime ); | ||
75 | vb->addWidget( ButtonSetTime, 1, 0 ); | ||
76 | |||
77 | QFrame *hline = new QFrame( FrameSystemTime ); | ||
78 | hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); | ||
79 | vb->addWidget( hline ); | ||
65 | 80 | ||
66 | QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); | 81 | QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); |
67 | 82 | ||
68 | QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); | 83 | QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); |
@@ -72,24 +87,15 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) | |||
72 | tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" ); | 87 | tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" ); |
73 | tz->setMinimumSize( tz->sizeHint() ); | 88 | tz->setMinimumSize( tz->sizeHint() ); |
74 | hb->addWidget( tz ); | 89 | hb->addWidget( tz ); |
75 | 90 | ||
76 | timeButton = new SetTime( FrameSetTime ); | 91 | hline = new QFrame( FrameSystemTime ); |
77 | vb2->addWidget( timeButton ); | ||
78 | |||
79 | QHBoxLayout *db = new QHBoxLayout( vb2 ); | ||
80 | QLabel *dateLabel = new QLabel( tr("Date"), FrameSetTime ); | ||
81 | db->addWidget( dateLabel, 1 ); | ||
82 | dateButton = new DateButton( TRUE, FrameSetTime ); | ||
83 | db->addWidget( dateButton, 2 ); | ||
84 | |||
85 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
86 | vb2->addItem( spacer ); | ||
87 | |||
88 | QFrame *hline = new QFrame( FrameSystemTime ); | ||
89 | hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); | 92 | hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); |
90 | vb->addWidget( hline ); | 93 | vb->addWidget( hline ); |
91 | 94 | ||
95 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
96 | vb->addItem( spacer ); | ||
97 | |||
92 | Config config("qpe"); | 98 | Config config("qpe"); |
93 | config.setGroup( "Time" ); | 99 | config.setGroup( "Time" ); |
94 | 100 | ||
95 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); | 101 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); |
@@ -178,37 +184,33 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) | |||
178 | clockAppletCombo->setCurrentItem( clockApplet ); | 184 | clockAppletCombo->setCurrentItem( clockApplet ); |
179 | 185 | ||
180 | vb->addStretch( 0 ); | 186 | vb->addStretch( 0 ); |
181 | 187 | ||
182 | hline = new QFrame( FrameSystemTime ); | 188 | // hline = new QFrame( FrameSystemTime ); |
183 | hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); | 189 | // hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); |
184 | vb->addWidget( hline ); | 190 | // vb->addWidget( hline ); |
185 | 191 | // | |
186 | ButtonSetTime = new QPushButton( FrameSystemTime ); | 192 | // ButtonSetTime = new QPushButton( FrameSystemTime ); |
187 | vb->addWidget( ButtonSetTime, 1, 0 ); | 193 | // vb->addWidget( ButtonSetTime, 1, 0 ); |
188 | 194 | ||
189 | QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()), | ||
190 | this, SLOT(commitTime())); | ||
191 | 195 | ||
192 | QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), | 196 | QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), |
193 | timeButton, SLOT( slotTzChange( const QString& ) ) ); | 197 | timeButton, SLOT( slotTzChange( const QString& ) ) ); |
194 | QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), | 198 | QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), |
195 | SLOT( tzChange( const QString& ) ) ); | 199 | SLOT( tzChange( const QString& ) ) ); |
196 | 200 | ||
197 | QObject::connect( weekStartCombo, SIGNAL( activated ( int )), | 201 | // QObject::connect( weekStartCombo, SIGNAL( activated ( int )), |
198 | SLOT(updateSystem(int ) )); | 202 | // SLOT(updateSystem(int ) )); |
199 | QObject::connect( ampmCombo, SIGNAL( activated ( int )), | 203 | // QObject::connect( ampmCombo, SIGNAL( activated ( int )), |
200 | SLOT(updateSystem(int ) )); | 204 | // SLOT(updateSystem(int ) )); |
201 | QObject::connect( dateFormatCombo, SIGNAL( activated ( int )), | 205 | // QObject::connect( dateFormatCombo, SIGNAL( activated ( int )), |
202 | SLOT(updateSystem(int ) )); | 206 | // SLOT(updateSystem(int ) )); |
203 | QObject::connect( clockAppletCombo, SIGNAL( activated ( int )), | 207 | // QObject::connect( clockAppletCombo, SIGNAL( activated ( int )), |
204 | SLOT(updateSystem(int ) )); | 208 | // SLOT(updateSystem(int ) )); |
205 | } | 209 | } |
206 | 210 | ||
207 | SetDateTime::~SetDateTime() | 211 | SetDateTime::~SetDateTime() |
208 | { | 212 | { |
209 | writeSettings(); | ||
210 | |||
211 | } | 213 | } |
212 | 214 | ||
213 | void SetDateTime::writeSettings() | 215 | void SetDateTime::writeSettings() |
214 | { | 216 | { |
@@ -275,17 +277,17 @@ void SetDateTime::setTime(QDateTime dt) | |||
275 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | 277 | QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); |
276 | enableScreenSaver << -1 << -1 << -1; | 278 | enableScreenSaver << -1 << -1 << -1; |
277 | } | 279 | } |
278 | 280 | ||
279 | void SetDateTime::updateSystem(int i) | 281 | void SetDateTime::updateSystem() |
280 | { | 282 | { |
281 | // really turn off the screensaver before doing anything | 283 | // really turn off the screensaver before doing anything |
282 | { | 284 | { |
283 | // Needs to be encased in { } so that it deconstructs and sends | 285 | // Needs to be encased in { } so that it deconstructs and sends |
284 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); | 286 | QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); |
285 | disableScreenSaver << 0 << 0 << 0; | 287 | disableScreenSaver << 0 << 0 << 0; |
286 | } | 288 | } |
287 | qDebug("SetDateTime::updateSystem(int %i)",i); | 289 | qDebug("SetDateTime::updateSystem()"); |
288 | writeSettings(); | 290 | writeSettings(); |
289 | 291 | ||
290 | // set the timezone for everyone else... | 292 | // set the timezone for everyone else... |
291 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); | 293 | QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); |
@@ -341,13 +343,17 @@ static const int ValuePM = 1; | |||
341 | 343 | ||
342 | SetTime::SetTime( QWidget *parent, const char *name ) | 344 | SetTime::SetTime( QWidget *parent, const char *name ) |
343 | : QWidget( parent, name ) | 345 | : QWidget( parent, name ) |
344 | { | 346 | { |
347 | clock = new QTimer(this, "clock" ); | ||
348 | connect(clock, SIGNAL( timeout() ), SLOT(slotClockTick()) ); | ||
349 | clock->start( 1000 * 60 ); | ||
350 | |||
345 | use12hourTime = FALSE; | 351 | use12hourTime = FALSE; |
346 | 352 | ||
347 | QTime currTime = QTime::currentTime(); | 353 | _time = QDateTime::currentDateTime(); |
348 | hour = currTime.hour(); | 354 | hour = _time.time().hour(); |
349 | minute = currTime.minute(); | 355 | minute = _time.time().minute(); |
350 | 356 | ||
351 | QHBoxLayout *hb2 = new QHBoxLayout( this ); | 357 | QHBoxLayout *hb2 = new QHBoxLayout( this ); |
352 | hb2->setSpacing( 3 ); | 358 | hb2->setSpacing( 3 ); |
353 | 359 | ||
@@ -498,5 +504,31 @@ void SetTime::slotTzChange( const QString &tz ) | |||
498 | } | 504 | } |
499 | sbMin->setValue( t.minute() ); | 505 | sbMin->setValue( t.minute() ); |
500 | } | 506 | } |
501 | 507 | ||
508 | void SetTime::setTime( QDateTime dt ) | ||
509 | { | ||
510 | _time = dt; | ||
511 | QTime t = dt.time(); | ||
512 | // just set the spinboxes and let it propage through | ||
513 | if(use12hourTime) { | ||
514 | int show_hour = t.hour(); | ||
515 | if (t.hour() >= 12) { | ||
516 | show_hour -= 12; | ||
517 | ampm->setCurrentItem( ValuePM ); | ||
518 | } else { | ||
519 | ampm->setCurrentItem( ValueAM ); | ||
520 | } | ||
521 | if (show_hour == 0) | ||
522 | show_hour = 12; | ||
523 | sbHour->setValue( show_hour ); | ||
524 | } else { | ||
525 | sbHour->setValue( t.hour() ); | ||
526 | } | ||
527 | sbMin->setValue( t.minute() ); | ||
528 | } | ||
502 | 529 | ||
530 | void SetTime::slotClockTick() | ||
531 | { | ||
532 | setTime( _time.addSecs(60) ); | ||
533 | qDebug("SetTime::slotClockTick %s",_time.toString().latin1()); | ||
534 | } | ||
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 | |||
@@ -40,14 +40,16 @@ class SetTime : public QWidget | |||
40 | public: | 40 | public: |
41 | SetTime( QWidget *parent=0, const char *name=0 ); | 41 | SetTime( QWidget *parent=0, const char *name=0 ); |
42 | 42 | ||
43 | QTime time() const; | 43 | QTime time() const; |
44 | void setTime( QDateTime ); | ||
44 | 45 | ||
45 | public slots: | 46 | public slots: |
46 | void slotTzChange( const QString& tz ); | 47 | void slotTzChange( const QString& tz ); |
47 | void show12hourTime( int ); | 48 | void show12hourTime( int ); |
48 | 49 | ||
49 | protected slots: | 50 | protected slots: |
51 | void slotClockTick(); | ||
50 | void hourChanged( int value ); | 52 | void hourChanged( int value ); |
51 | void minuteChanged( int value ); | 53 | void minuteChanged( int value ); |
52 | 54 | ||
53 | void checkedPM( int ); | 55 | void checkedPM( int ); |
@@ -55,8 +57,10 @@ protected slots: | |||
55 | protected: | 57 | protected: |
56 | int hour; | 58 | int hour; |
57 | int minute; | 59 | int minute; |
58 | bool use12hourTime; | 60 | bool use12hourTime; |
61 | QDateTime _time; | ||
62 | QTimer *clock; | ||
59 | QComboBox *ampm; | 63 | QComboBox *ampm; |
60 | QSpinBox *sbHour; | 64 | QSpinBox *sbHour; |
61 | QSpinBox *sbMin; | 65 | QSpinBox *sbMin; |
62 | }; | 66 | }; |
@@ -73,9 +77,9 @@ public: | |||
73 | protected slots: | 77 | protected slots: |
74 | void commitTime(); | 78 | void commitTime(); |
75 | void tzChange( const QString &tz ); | 79 | void tzChange( const QString &tz ); |
76 | void formatChanged(int); | 80 | void formatChanged(int); |
77 | void updateSystem(int i=0); | 81 | void updateSystem(); |
78 | 82 | ||
79 | protected: | 83 | protected: |
80 | void setTime(QDateTime dt); | 84 | void setTime(QDateTime dt); |
81 | void writeSettings(); | 85 | void writeSettings(); |
@@ -87,9 +91,9 @@ protected: | |||
87 | QComboBox *ampmCombo; | 91 | QComboBox *ampmCombo; |
88 | QComboBox *dateFormatCombo; | 92 | QComboBox *dateFormatCombo; |
89 | QComboBox *clockAppletCombo; | 93 | QComboBox *clockAppletCombo; |
90 | QPushButton *ButtonSetTime; | 94 | QPushButton *ButtonSetTime; |
91 | QLabel *TextLabelMainPredTime; | 95 | // QLabel *TextLabelMainPredTime; |
92 | 96 | ||
93 | DateFormat date_formats[4]; | 97 | DateFormat date_formats[4]; |
94 | }; | 98 | }; |
95 | 99 | ||