usability improvments

1 files changed, 33 insertions, 5 deletions

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
@@ -47,4 +47,21 @@ 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 );
+  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);
@@ -113,5 +130,5 @@ QString Ntp::getNtpServer()
 void Ntp::slotRunNtp()
 {
-  if ( !ntpDelayElapsed() )
+  if ( !ntpDelayElapsed() && CheckBoxAdvSettings->isChecked() )
     {
       switch (
@@ -134,4 +151,6 @@ void Ntp::slotRunNtp()
   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"));
@@ -141,4 +160,5 @@ 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;
@@ -154,8 +174,14 @@ 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;
     }
@@ -308,4 +334,5 @@ void Ntp::slotNtpDelayChanged(int delay)
 void Ntp::ntpOutPut(QString out)
 {
+  
   MultiLineEditntpOutPut->append(out);
   MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
@@ -339,5 +366,5 @@ void Ntp::receive(const QCString &msg, const QByteArray &arg)
 void Ntp::setDocument(const QString &fileName)
 {
-
+  qDebug("Ntp::setDocument( %s )",fileName.latin1());
 }
 
@@ -345,4 +372,5 @@ void Ntp::showAdvancedFeatures(bool advMode)
 {
   if  (advMode) {
+    
     TabWidgetMain->addTab( tabPredict, tr( "Predict" ) );
     TabWidgetMain->addTab( tabNtp, tr( "NTP" ) );