From 8394ee8e5fc0014605256b243909709864afdc9b Mon Sep 17 00:00:00 2001 From: tille Date: Sun, 10 Nov 2002 17:01:05 +0000 Subject: usability improvments --- (limited to 'noncore/settings/netsystemtime') diff --git a/noncore/settings/netsystemtime/netsystemtime.pro b/noncore/settings/netsystemtime/netsystemtime.pro index 898e400..a849431 100644 --- a/noncore/settings/netsystemtime/netsystemtime.pro +++ b/noncore/settings/netsystemtime/netsystemtime.pro @@ -1,12 +1,12 @@ TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = ntp.h settime.h ntpbase.h -SOURCES = main.cpp ntp.cpp settime.cpp ntpbase.cpp +HEADERS = ntp.h settime.h +SOURCES = main.cpp ntp.cpp settime.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie -INTERFACES = +INTERFACES = ntpbase.ui DESTDIR = $(OPIEDIR)/bin TARGET = systemtime diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index 40805a0..111f7d4 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -46,6 +46,23 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",1440) ); ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) ); + //make tab order + + TabWidgetMain->removePage( tabMain ); + TabWidgetMain->removePage( tabManualSetTime ); + TabWidgetMain->removePage( TabSettings ); + TabWidgetMain->removePage( tabPredict ); + 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" ) ); + NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 ); + + + bool advMode = cfg.readBoolEntry("advancedFeatures", false ); showAdvancedFeatures(advMode); CheckBoxAdvSettings->setChecked( advMode ); @@ -112,7 +129,7 @@ QString Ntp::getNtpServer() void Ntp::slotRunNtp() { - if ( !ntpDelayElapsed() ) + if ( !ntpDelayElapsed() && CheckBoxAdvSettings->isChecked() ) { switch ( QMessageBox::warning(this, tr("Run NTP?"), @@ -133,6 +150,8 @@ void Ntp::slotRunNtp() *ntpProcess << "ntpdate" << getNtpServer(); bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); if ( !ret ) { + QMessageBox::critical(this, tr("ntp error"), + tr("Error while getting time form network!")); qDebug("Error while executing ntpdate"); ntpOutPut( tr("Error while executing ntpdate")); } @@ -140,6 +159,7 @@ void Ntp::slotRunNtp() void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) { + if (! proc ) qDebug("Ntp::getNtpOutput OProcess is null"); QString lineStr, lineStrOld; lineStr = buffer; lineStr=lineStr.left(buflen); @@ -153,10 +173,16 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) void Ntp::ntpFinished(OProcess *p) { - // qDebug("p->exitStatus() %i",p->exitStatus()); + qDebug("p->exitStatus() %i",p->exitStatus()); if (p->exitStatus()!=0 || !p->normalExit()) - { - slotProbeNtpServer(); + { + QMessageBox::critical(this, tr("ntp error"), + tr("Error while getting time form\n server")+ + getNtpServer()+"\n"+ + _ntpOutput ); + // TabWidgetMain->setCurrentPage( 1 ); + TabWidgetMain->showPage( tabManualSetTime ); + return; } @@ -307,6 +333,7 @@ void Ntp::slotNtpDelayChanged(int delay) void Ntp::ntpOutPut(QString out) { + MultiLineEditntpOutPut->append(out); MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE); } @@ -338,12 +365,13 @@ void Ntp::receive(const QCString &msg, const QByteArray &arg) void Ntp::setDocument(const QString &fileName) { - + qDebug("Ntp::setDocument( %s )",fileName.latin1()); } void Ntp::showAdvancedFeatures(bool advMode) { if (advMode) { + TabWidgetMain->addTab( tabPredict, tr( "Predict" ) ); TabWidgetMain->addTab( tabNtp, tr( "NTP" ) ); TextLabel1_2_2->show(); diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h index fe0bae6..f6694c9 100644 --- a/noncore/settings/netsystemtime/ntp.h +++ b/noncore/settings/netsystemtime/ntp.h @@ -15,39 +15,39 @@ class Ntp : public SetDateTime public: Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~Ntp(); + ~Ntp(); public slots: - void setDocument (const QString &); + void setDocument (const QString &); protected: - QDateTime predictedTime; - void makeChannel(); + QDateTime predictedTime; + void makeChannel(); protected slots: - void receive(const QCString &msg, const QByteArray &arg); + void receive(const QCString &msg, const QByteArray &arg); private: - QString _ntpOutput; - float _shiftPerSec; - int _lookupDiff; - OProcess *ntpProcess; - QTimer *ntpTimer; - QSocket *ntpSock; - QCopChannel *channel; + QString _ntpOutput; + float _shiftPerSec; + int _lookupDiff; + OProcess *ntpProcess; + QTimer *ntpTimer; + QSocket *ntpSock; + QCopChannel *channel; - float getTimeShift(); - void readLookups(); - void ntpOutPut(QString); - bool ntpDelayElapsed(); - QString getNtpServer(); + float getTimeShift(); + void readLookups(); + void ntpOutPut(QString); + bool ntpDelayElapsed(); + QString getNtpServer(); private slots: - void slotRunNtp(); - void getNtpOutput(OProcess *proc, char *buffer, int buflen); - void ntpFinished(OProcess*); - void preditctTime(); - void slotCheckNtp(int); - void setPredictTime(); - void showAdvancedFeatures(bool); - void slotProbeNtpServer(); - void slotNtpDelayChanged(int); + void slotRunNtp(); + void getNtpOutput(OProcess *proc, char *buffer, int buflen); + void ntpFinished(OProcess*); + void preditctTime(); + void slotCheckNtp(int); + void setPredictTime(); + void showAdvancedFeatures(bool); + void slotProbeNtpServer(); + void slotNtpDelayChanged(int); }; #endif diff --git a/noncore/settings/netsystemtime/ntpbase.cpp b/noncore/settings/netsystemtime/ntpbase.cpp index 8d44f17..0a7a57e 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: Mon Oct 21 21:32:47 2002 +** Created: Sun Nov 10 17:59:14 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -31,7 +31,7 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) { if ( !name ) setName( "NtpBase" ); - resize( 320, 411 ); + resize( 317, 411 ); setCaption( tr( "Network Time" ) ); NtpBaseLayout = new QGridLayout( this ); NtpBaseLayout->setSpacing( 2 ); @@ -44,11 +44,10 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) tabMainLayout->setSpacing( 2 ); tabMainLayout->setMargin( 2 ); - FrameSystemTime = new QWidget( tabMain, "FrameSystemTime" ); - // FrameSystemTime->setFrameShape( QFrame::StyledPanel ); - //FrameSystemTime->setFrameShadow( QFrame::Raised ); + FrameSystemTime = new QFrame( tabMain, "FrameSystemTime" ); tabMainLayout->addWidget( FrameSystemTime, 0, 0 ); + TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); tabNtp = new QWidget( TabWidgetMain, "tabNtp" ); tabNtpLayout = new QGridLayout( tabNtp ); @@ -61,8 +60,6 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) tabNtpLayout->addWidget( runNtp, 1, 0 ); FrameNtp = new QWidget( tabNtp, "FrameNtp" ); - // FrameNtp->setFrameShape( QFrame::StyledPanel ); - // FrameNtp->setFrameShadow( QFrame::Raised ); FrameNtpLayout = new QGridLayout( FrameNtp ); FrameNtpLayout->setSpacing( 2 ); FrameNtpLayout->setMargin( 2 ); @@ -110,6 +107,7 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) FrameNtpLayout->addWidget( MultiLineEditntpOutPut, 1, 0 ); tabNtpLayout->addWidget( FrameNtp, 0, 0 ); + TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) ); tabPredict = new QWidget( TabWidgetMain, "tabPredict" ); tabPredictLayout = new QGridLayout( tabPredict ); @@ -174,6 +172,7 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) Layout11->addWidget( PushButtonPredict ); tabPredictLayout->addLayout( Layout11, 2, 0 ); + TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); TabSettings = new QWidget( TabWidgetMain, "TabSettings" ); TabSettingsLayout = new QGridLayout( TabSettings ); @@ -181,8 +180,6 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) TabSettingsLayout->setMargin( 2 ); FrameSettings = new QWidget( TabSettings, "FrameSettings" ); - // FrameSettings->setFrameShape( QFrame::StyledPanel ); - // FrameSettings->setFrameShadow( QFrame::Raised ); FrameSettingsLayout = new QVBoxLayout( FrameSettings ); FrameSettingsLayout->setSpacing( 6 ); FrameSettingsLayout->setMargin( 11 ); @@ -216,7 +213,7 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) FrameSettingsLayout->addItem( spacer_2 ); CheckBoxAdvSettings = new QCheckBox( FrameSettings, "CheckBoxAdvSettings" ); - CheckBoxAdvSettings->setText( tr( "Advanced features" ) ); + CheckBoxAdvSettings->setText( tr( "Advanced settings" ) ); FrameSettingsLayout->addWidget( CheckBoxAdvSettings ); QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); FrameSettingsLayout->addItem( spacer_3 ); @@ -285,27 +282,23 @@ NtpBase::NtpBase( QWidget* parent, const char* name, WFlags fl ) FrameSettingsLayout->addLayout( Layout7 ); TabSettingsLayout->addWidget( FrameSettings, 0, 0 ); + TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); tabManualSetTime = new QWidget( TabWidgetMain, "tabManualSetTime" ); tabManualSetTimeLayout = new QVBoxLayout( tabManualSetTime ); - tabManualSetTimeLayout->setSpacing( 2 ); - tabManualSetTimeLayout->setMargin( 2 ); + tabManualSetTimeLayout->setSpacing( 6 ); + tabManualSetTimeLayout->setMargin( 11 ); FrameSetTime = new QWidget( tabManualSetTime, "FrameSetTime" ); - // FrameSetTime->setFrameShape( QFrame::StyledPanel ); - // FrameSetTime->setFrameShadow( QFrame::Raised ); + FrameSetTime->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)3, FrameSetTime->sizePolicy().hasHeightForWidth() ) ); tabManualSetTimeLayout->addWidget( FrameSetTime ); PushButtonSetManualTime = new QPushButton( tabManualSetTime, "PushButtonSetManualTime" ); PushButtonSetManualTime->setText( tr( "Set time" ) ); tabManualSetTimeLayout->addWidget( PushButtonSetManualTime ); - - - TabWidgetMain->insertTab( tabMain, tr( "Main" ) ); + QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + tabManualSetTimeLayout->addItem( spacer_4 ); TabWidgetMain->insertTab( tabManualSetTime, tr( "Manual" ) ); - TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) ); - TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) ); - TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) ); NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 ); } diff --git a/noncore/settings/netsystemtime/ntpbase.h b/noncore/settings/netsystemtime/ntpbase.h index a443495..543cac1 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: Mon Oct 21 21:32:43 2002 +** Created: Sun Nov 10 17:58:48 2002 ** by: The User Interface Compiler (uic) ** ** WARNING! All changes made in this file will be lost! @@ -34,7 +34,7 @@ public: QTabWidget* TabWidgetMain; QWidget* tabMain; - QWidget* FrameSystemTime; + QFrame* FrameSystemTime; QWidget* tabNtp; QPushButton* runNtp; QWidget* FrameNtp; diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui index 465bba0..6c38588 100644 --- a/noncore/settings/netsystemtime/ntpbase.ui +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -11,7 +11,7 @@ 0 0 - 320 + 317 411 @@ -71,14 +71,6 @@ name FrameSystemTime - - frameShape - StyledPanel - - - frameShadow - Raised - @@ -118,14 +110,6 @@ name FrameNtp - - frameShape - StyledPanel - - - frameShadow - Raised - layoutMargin @@ -463,14 +447,6 @@ name FrameSettings - - frameShape - StyledPanel - - - frameShadow - Raised - layoutMargin @@ -802,11 +778,11 @@ margin - 2 + 11 spacing - 2 + 6 QWidget @@ -815,12 +791,11 @@ FrameSetTime - frameShape - StyledPanel - - - frameShadow - Raised + sizePolicy + + 5 + 3 + @@ -834,6 +809,27 @@ Set time + + + name + Spacer4_2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + -- cgit v0.9.0.2