author | drw <drw> | 2005-02-23 16:14:09 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-23 16:14:09 (UTC) |
commit | e5b1e010c321ba1edac704f9d668df75b22fd074 (patch) (unidiff) | |
tree | c76221c7d8292f66ef05040721edf816a04fbeba /noncore/settings | |
parent | 30857db6ca3f355aa3d50b59f03a13c82f265af2 (diff) | |
download | opie-e5b1e010c321ba1edac704f9d668df75b22fd074.zip opie-e5b1e010c321ba1edac704f9d668df75b22fd074.tar.gz opie-e5b1e010c321ba1edac704f9d668df75b22fd074.tar.bz2 |
Fix UI to prevent error dialog from displaying when it shouldn't
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 61 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntptabwidget.cpp | 53 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/ntptabwidget.h | 46 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/timetabwidget.cpp | 55 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/timetabwidget.h | 47 |
5 files changed, 147 insertions, 115 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 385d355..486257f 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | =. | 3 | =. |
4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> | 4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
@@ -48,13 +48,13 @@ | |||
48 | #include <qstring.h> | 48 | #include <qstring.h> |
49 | #include <qtimer.h> | 49 | #include <qtimer.h> |
50 | 50 | ||
51 | using namespace Opie::Ui; | 51 | using namespace Opie::Ui; |
52 | using namespace Opie::Core; | 52 | using namespace Opie::Core; |
53 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) | 53 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
54 | : QDialog( 0x0, 0x0, TRUE, 0 ) | 54 | : QDialog( parent, name, modal, f ) |
55 | { | 55 | { |
56 | setCaption( tr( "SystemTime" ) ); | 56 | setCaption( tr( "SystemTime" ) ); |
57 | 57 | ||
58 | QVBoxLayout *layout = new QVBoxLayout( this ); | 58 | QVBoxLayout *layout = new QVBoxLayout( this ); |
59 | layout->setMargin( 2 ); | 59 | layout->setMargin( 2 ); |
60 | layout->setSpacing( 4 ); | 60 | layout->setSpacing( 4 ); |
@@ -184,12 +184,17 @@ void MainWindow::runNTP() | |||
184 | ntpTab->setStartTime( QDateTime::currentDateTime().toString() ); | 184 | ntpTab->setStartTime( QDateTime::currentDateTime().toString() ); |
185 | QString output = tr( "Running:\nntpdate " ); | 185 | QString output = tr( "Running:\nntpdate " ); |
186 | output.append( srv ); | 186 | output.append( srv ); |
187 | ntpTab->addNtpOutput( output ); | 187 | ntpTab->addNtpOutput( output ); |
188 | } | 188 | } |
189 | 189 | ||
190 | // Disable set time buttons & change app caption to indicate time update is happening | ||
191 | ntpTab->setNTPBtnEnabled( false ); | ||
192 | timeTab->setNTPBtnEnabled( false ); | ||
193 | setCaption( tr( "Retrieving time from network..." ) ); | ||
194 | |||
190 | if ( !ntpProcess ) | 195 | if ( !ntpProcess ) |
191 | { | 196 | { |
192 | ntpProcess = new OProcess(); | 197 | ntpProcess = new OProcess(); |
193 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 198 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
194 | this, SLOT(slotNtpOutput(Opie::Core::OProcess*,char*,int)) ); | 199 | this, SLOT(slotNtpOutput(Opie::Core::OProcess*,char*,int)) ); |
195 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), | 200 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), |
@@ -203,12 +208,17 @@ void MainWindow::runNTP() | |||
203 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); | 208 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); |
204 | if ( !ret ) | 209 | if ( !ret ) |
205 | { | 210 | { |
206 | QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); | 211 | QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); |
207 | if ( ntpTabEnabled ) | 212 | if ( ntpTabEnabled ) |
208 | ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) ); | 213 | ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) ); |
214 | |||
215 | // Re-enable set time buttons & change app caption to indicate time update is happening | ||
216 | ntpTab->setNTPBtnEnabled( true ); | ||
217 | timeTab->setNTPBtnEnabled( true ); | ||
218 | setCaption( tr( "SystemTime" ) ); | ||
209 | } | 219 | } |
210 | } | 220 | } |
211 | 221 | ||
212 | bool MainWindow::ntpDelayElapsed() | 222 | bool MainWindow::ntpDelayElapsed() |
213 | { | 223 | { |
214 | // Determine if time elapsed is greater than time delay | 224 | // Determine if time elapsed is greater than time delay |
@@ -295,12 +305,17 @@ void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) | |||
295 | 305 | ||
296 | void MainWindow::slotNtpFinished( OProcess *p ) | 306 | void MainWindow::slotNtpFinished( OProcess *p ) |
297 | { | 307 | { |
298 | QString output; | 308 | QString output; |
299 | QDateTime dt = QDateTime::currentDateTime(); | 309 | QDateTime dt = QDateTime::currentDateTime(); |
300 | 310 | ||
311 | // Re-enable set time buttons & change app caption to indicate time update is happening | ||
312 | ntpTab->setNTPBtnEnabled( true ); | ||
313 | timeTab->setNTPBtnEnabled( true ); | ||
314 | setCaption( tr( "SystemTime" ) ); | ||
315 | |||
301 | // Verify run was successful | 316 | // Verify run was successful |
302 | if ( p->exitStatus() != 0 || !p->normalExit() ) | 317 | if ( p->exitStatus() != 0 || !p->normalExit() ) |
303 | { | 318 | { |
304 | if ( isVisible() && ntpInteractive ) | 319 | if ( isVisible() && ntpInteractive ) |
305 | { | 320 | { |
306 | output = tr( "Error while getting time from\n server: " ); | 321 | output = tr( "Error while getting time from\n server: " ); |
@@ -348,13 +363,13 @@ void MainWindow::slotNtpFinished( OProcess *p ) | |||
348 | 363 | ||
349 | if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay ) | 364 | if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay ) |
350 | { | 365 | { |
351 | QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) ); | 366 | QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) ); |
352 | config.setGroup( grpname ); | 367 | config.setGroup( grpname ); |
353 | lookupCount++; | 368 | lookupCount++; |
354 | predictTab->setShiftPerSec( timeShift / secsSinceLast ); | 369 | predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) ); |
355 | config.writeEntry( "secsSinceLast", secsSinceLast ); | 370 | config.writeEntry( "secsSinceLast", secsSinceLast ); |
356 | config.writeEntry( "timeShift", QString::number( timeShift ) ); | 371 | config.writeEntry( "timeShift", QString::number( timeShift ) ); |
357 | config.setGroup( "lookups" ); | 372 | config.setGroup( "lookups" ); |
358 | config.writeEntry( "count", lookupCount ); | 373 | config.writeEntry( "count", lookupCount ); |
359 | config.writeEntry( "lastNtp", TRUE ); | 374 | config.writeEntry( "lastNtp", TRUE ); |
360 | } | 375 | } |
diff --git a/noncore/settings/netsystemtime/ntptabwidget.cpp b/noncore/settings/netsystemtime/ntptabwidget.cpp index d71c230..616bc22 100644 --- a/noncore/settings/netsystemtime/ntptabwidget.cpp +++ b/noncore/settings/netsystemtime/ntptabwidget.cpp | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | =. | 3 | =. |
4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> | 4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "ntptabwidget.h" | 29 | #include "ntptabwidget.h" |
@@ -72,16 +72,16 @@ NTPTabWidget::NTPTabWidget( QWidget *parent ) | |||
72 | font.setPointSize( 7 ); | 72 | font.setPointSize( 7 ); |
73 | mleNtpOutput->setFont( font ); | 73 | mleNtpOutput->setFont( font ); |
74 | mleNtpOutput->setWordWrap( QMultiLineEdit::WidgetWidth ); | 74 | mleNtpOutput->setWordWrap( QMultiLineEdit::WidgetWidth ); |
75 | layout->addMultiCellWidget( mleNtpOutput, 3, 3, 0, 1 ); | 75 | layout->addMultiCellWidget( mleNtpOutput, 3, 3, 0, 1 ); |
76 | 76 | ||
77 | // Set NTP time button | 77 | // Set NTP time button |
78 | QPushButton *pb = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ), | 78 | m_ntpBtn = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ), |
79 | tr( "Get time from the network" ), container ); | 79 | tr( "Get time from the network" ), container ); |
80 | connect( pb, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); | 80 | connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); |
81 | layout->addMultiCellWidget( pb, 4, 4, 0, 1 ); | 81 | layout->addMultiCellWidget( m_ntpBtn, 4, 4, 0, 1 ); |
82 | } | 82 | } |
83 | 83 | ||
84 | NTPTabWidget::~NTPTabWidget() | 84 | NTPTabWidget::~NTPTabWidget() |
85 | { | 85 | { |
86 | } | 86 | } |
87 | 87 | ||
@@ -102,6 +102,11 @@ void NTPTabWidget::setNewTime( const QString &str ) | |||
102 | 102 | ||
103 | void NTPTabWidget::addNtpOutput( const QString &str ) | 103 | void NTPTabWidget::addNtpOutput( const QString &str ) |
104 | { | 104 | { |
105 | mleNtpOutput->append( str ); | 105 | mleNtpOutput->append( str ); |
106 | mleNtpOutput->setCursorPosition( mleNtpOutput->numLines() + 1, 0, FALSE ); | 106 | mleNtpOutput->setCursorPosition( mleNtpOutput->numLines() + 1, 0, FALSE ); |
107 | } | 107 | } |
108 | |||
109 | void NTPTabWidget::setNTPBtnEnabled( bool enabled ) | ||
110 | { | ||
111 | m_ntpBtn->setEnabled( enabled ); | ||
112 | } | ||
diff --git a/noncore/settings/netsystemtime/ntptabwidget.h b/noncore/settings/netsystemtime/ntptabwidget.h index 811c57e..f05482e 100644 --- a/noncore/settings/netsystemtime/ntptabwidget.h +++ b/noncore/settings/netsystemtime/ntptabwidget.h | |||
@@ -1,41 +1,42 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | =. | 3 | =. |
4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> | 4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef NTPTABWIDGET_H | 29 | #ifndef NTPTABWIDGET_H |
30 | #define NTPTABWIDGET_H | 30 | #define NTPTABWIDGET_H |
31 | 31 | ||
32 | #include <qwidget.h> | 32 | #include <qwidget.h> |
33 | 33 | ||
34 | class QLabel; | 34 | class QLabel; |
35 | class QMultiLineEdit; | 35 | class QMultiLineEdit; |
36 | class QPushButton; | ||
36 | 37 | ||
37 | class NTPTabWidget : public QWidget | 38 | class NTPTabWidget : public QWidget |
38 | { | 39 | { |
39 | Q_OBJECT | 40 | Q_OBJECT |
40 | 41 | ||
41 | public: | 42 | public: |
@@ -43,18 +44,21 @@ public: | |||
43 | ~NTPTabWidget(); | 44 | ~NTPTabWidget(); |
44 | 45 | ||
45 | void setStartTime( const QString & ); | 46 | void setStartTime( const QString & ); |
46 | void setTimeShift( const QString & ); | 47 | void setTimeShift( const QString & ); |
47 | void setNewTime( const QString & ); | 48 | void setNewTime( const QString & ); |
48 | void addNtpOutput( const QString & ); | 49 | void addNtpOutput( const QString & ); |
50 | void setNTPBtnEnabled( bool enabled ); | ||
49 | 51 | ||
50 | private: | 52 | private: |
51 | QLabel *lblStartTime; | 53 | QLabel *lblStartTime; |
52 | QLabel *lblTimeShift; | 54 | QLabel *lblTimeShift; |
53 | QLabel *lblNewTime; | 55 | QLabel *lblNewTime; |
54 | QMultiLineEdit *mleNtpOutput; | 56 | QMultiLineEdit *mleNtpOutput; |
57 | QPushButton *m_ntpBtn; | ||
58 | |||
55 | 59 | ||
56 | signals: | 60 | signals: |
57 | void getNTPTime(); | 61 | void getNTPTime(); |
58 | }; | 62 | }; |
59 | 63 | ||
60 | #endif | 64 | #endif |
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp index 3cc127d..905461f 100644 --- a/noncore/settings/netsystemtime/timetabwidget.cpp +++ b/noncore/settings/netsystemtime/timetabwidget.cpp | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | =. | 3 | =. |
4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> | 4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "timetabwidget.h" | 29 | #include "timetabwidget.h" |
@@ -106,19 +106,19 @@ TimeTabWidget::TimeTabWidget( QWidget *parent ) | |||
106 | layout->addMultiCellWidget( selTimeZone, 6, 6, 2, 5 ); | 106 | layout->addMultiCellWidget( selTimeZone, 6, 6, 2, 5 ); |
107 | 107 | ||
108 | // Space filler | 108 | // Space filler |
109 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 7, 0 ); | 109 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 7, 0 ); |
110 | 110 | ||
111 | // Set NTP time button | 111 | // Set NTP time button |
112 | QPushButton *pb = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ), | 112 | m_ntpBtn = new QPushButton( Resource::loadPixmap( "netsystemtime/ntptab" ), |
113 | tr( "Get time from the network" ), container ); | 113 | tr( "Get time from the network" ), container ); |
114 | connect( pb, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); | 114 | connect( m_ntpBtn, SIGNAL(clicked()), this, SIGNAL(getNTPTime()) ); |
115 | layout->addMultiCellWidget( pb, 8, 8, 0, 5 ); | 115 | layout->addMultiCellWidget( m_ntpBtn, 8, 8, 0, 5 ); |
116 | 116 | ||
117 | // Set predicted time button | 117 | // Set predicted time button |
118 | pb = new QPushButton( Resource::loadPixmap( "netsystemtime/predicttab" ), tr( "Set predicted time" ), | 118 | QPushButton *pb = new QPushButton( Resource::loadPixmap( "netsystemtime/predicttab" ), tr( "Set predicted time" ), |
119 | container ); | 119 | container ); |
120 | connect( pb, SIGNAL(clicked()), this, SIGNAL(getPredictedTime()) ); | 120 | connect( pb, SIGNAL(clicked()), this, SIGNAL(getPredictedTime()) ); |
121 | layout->addMultiCellWidget( pb, 9, 9, 0, 5 ); | 121 | layout->addMultiCellWidget( pb, 9, 9, 0, 5 ); |
122 | 122 | ||
123 | // Space filler at bottom of widget | 123 | // Space filler at bottom of widget |
124 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 0 ); | 124 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ), 10, 0 ); |
@@ -189,12 +189,17 @@ void TimeTabWidget::setDateTime( const QDateTime &dt ) | |||
189 | sbMin->setValue( t.minute() ); | 189 | sbMin->setValue( t.minute() ); |
190 | 190 | ||
191 | // Set date | 191 | // Set date |
192 | btnDate->setDate( dt.date() ); | 192 | btnDate->setDate( dt.date() ); |
193 | } | 193 | } |
194 | 194 | ||
195 | void TimeTabWidget::setNTPBtnEnabled( bool enabled ) | ||
196 | { | ||
197 | m_ntpBtn->setEnabled( enabled ); | ||
198 | } | ||
199 | |||
195 | void TimeTabWidget::setSystemTime( const QDateTime &dt ) | 200 | void TimeTabWidget::setSystemTime( const QDateTime &dt ) |
196 | { | 201 | { |
197 | // Set system clock | 202 | // Set system clock |
198 | if ( dt.isValid() ) | 203 | if ( dt.isValid() ) |
199 | { | 204 | { |
200 | struct timeval myTv; | 205 | struct timeval myTv; |
diff --git a/noncore/settings/netsystemtime/timetabwidget.h b/noncore/settings/netsystemtime/timetabwidget.h index f44a1da..949535d 100644 --- a/noncore/settings/netsystemtime/timetabwidget.h +++ b/noncore/settings/netsystemtime/timetabwidget.h | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | This file is part of the OPIE Project |
3 | =. | 3 | =. |
4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> | 4 | .=l. Copyright (c) 2002 OPIE team <opie@handhelds.org?> |
5 | .>+-= | 5 | .>+-= |
6 | _;:, .> :=|. This file is free software; you can | 6 | _;:, .> :=|. This file is free software; you can |
7 | .> <`_, > . <= redistribute it and/or modify it under | 7 | .> <`_, > . <= redistribute it and/or modify it under |
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; either version 2 of the License, |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : or (at your option) any later version. |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This file is distributed in the hope that | 13 | .i_,=:_. -<s. This file is distributed in the hope that |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
15 | : .. .:, . . . without even the implied warranty of | 15 | : .. .:, . . . without even the implied warranty of |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
18 | ..}^=.= = ; Public License for more details. | 18 | ..}^=.= = ; Public License for more details. |
19 | ++= -. .` .: | 19 | ++= -. .` .: |
20 | : = ...= . :.=- You should have received a copy of the GNU | 20 | : = ...= . :.=- You should have received a copy of the GNU |
21 | -. .:....=;==+<; General Public License along with this file; | 21 | -. .:....=;==+<; General Public License along with this file; |
22 | -_. . . )=. = see the file COPYING. If not, write to the | 22 | -_. . . )=. = see the file COPYING. If not, write to the |
23 | -- :-=` Free Software Foundation, Inc., | 23 | -- :-=` Free Software Foundation, Inc., |
24 | 59 Temple Place - Suite 330, | 24 | 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef TIMETABWIDGET_H | 29 | #ifndef TIMETABWIDGET_H |
@@ -32,32 +32,35 @@ | |||
32 | #include <qwidget.h> | 32 | #include <qwidget.h> |
33 | 33 | ||
34 | class DateButton; | 34 | class DateButton; |
35 | class DateFormat; | 35 | class DateFormat; |
36 | class QComboBox; | 36 | class QComboBox; |
37 | class QDateTime; | 37 | class QDateTime; |
38 | class QPushButton; | ||
38 | class QSpinBox; | 39 | class QSpinBox; |
39 | class TimeZoneSelector; | 40 | class TimeZoneSelector; |
40 | 41 | ||
41 | class TimeTabWidget : public QWidget | 42 | class TimeTabWidget : public QWidget |
42 | { | 43 | { |
43 | Q_OBJECT | 44 | Q_OBJECT |
44 | 45 | ||
45 | public: | 46 | public: |
46 | TimeTabWidget( QWidget * = 0x0 ); | 47 | TimeTabWidget( QWidget * = 0l ); |
47 | ~TimeTabWidget(); | 48 | ~TimeTabWidget(); |
48 | 49 | ||
49 | void saveSettings( bool ); | 50 | void saveSettings( bool ); |
50 | void setDateTime( const QDateTime & ); | 51 | void setDateTime( const QDateTime & ); |
52 | void setNTPBtnEnabled( bool enabled ); | ||
51 | 53 | ||
52 | private: | 54 | private: |
53 | QSpinBox *sbHour; | 55 | QSpinBox *sbHour; |
54 | QSpinBox *sbMin; | 56 | QSpinBox *sbMin; |
55 | QComboBox *cbAmpm; | 57 | QComboBox *cbAmpm; |
56 | DateButton *btnDate; | 58 | DateButton *btnDate; |
57 | TimeZoneSelector *selTimeZone; | 59 | TimeZoneSelector *selTimeZone; |
60 | QPushButton *m_ntpBtn; | ||
58 | 61 | ||
59 | bool use12HourTime; | 62 | bool use12HourTime; |
60 | 63 | ||
61 | void setSystemTime( const QDateTime & ); | 64 | void setSystemTime( const QDateTime & ); |
62 | 65 | ||
63 | signals: | 66 | signals: |