only show popup if visible

1 files changed, 2 insertions, 1 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 111f7d4..6e74e32 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -83,198 +83,199 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
   slotProbeNtpServer();
 
   connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
 	    this, SLOT(getNtpOutput(OProcess*,char*,int)));
   connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
 	    this, SLOT(ntpFinished(OProcess*)));
   connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
   connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
   slotCheckNtp(-1);
   readLookups();
 }
 
 Ntp::~Ntp()
 {
   delete ntpProcess;
   Config ntpSrvs("/etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ComboNtpSrv->count();
   ntpSrvs.writeEntry("count", srvCount);
   for (int i = 0; i < srvCount; i++){
     ntpSrvs.setGroup(QString::number(i));
     ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i) );
   }
   Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", ComboNtpSrv->currentItem());
   cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
   cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
   cfg.writeEntry( "advancedFeatures", CheckBoxAdvSettings->isChecked() );
 }
 
 bool Ntp::ntpDelayElapsed()
 {
   Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
   if (_lookupDiff < 0) return true; 
   int i =_lookupDiff - (SpinBoxNtpDelay->value()*60);
   return i > -60;
 }
 
 QString Ntp::getNtpServer()
 {
   return ComboNtpSrv->currentText();
 }
 
 void Ntp::slotRunNtp()
 {
   if ( !ntpDelayElapsed() && CheckBoxAdvSettings->isChecked() )
     {
       switch (
 	      QMessageBox::warning(this, tr("Run NTP?"),
 				   tr("You asked for a delay of ")+SpinBoxNtpDelay->text()+tr(" minutes, but only ")+
 				   QString::number(_lookupDiff/60)+tr(" minutes elapsed since last lookup.")+
 				   "<br>"+tr("Rerun NTP?"),
 				   QMessageBox::Ok,QMessageBox::Cancel)
 	      ) {
       case QMessageBox::Ok:     break;
       case QMessageBox::Cancel: return;
       default: return;
       }
     }
   TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
   ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
  	
   ntpProcess->clearArguments();
   *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"));
   }
 }
 
 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);
   if (lineStr!=lineStrOld)
     {
       ntpOutPut(lineStr);
       _ntpOutput += lineStr;
     }
   lineStrOld = lineStr;
 }
 
 void  Ntp::ntpFinished(OProcess *p)
 {
   qDebug("p->exitStatus() %i",p->exitStatus());
   if (p->exitStatus()!=0 || !p->normalExit())
     {      
+      if ( isVisible() ) {
       QMessageBox::critical(this, tr("ntp error"),
 			    tr("Error while getting time form\n server")+ 
 			    getNtpServer()+"\n"+
 			    _ntpOutput );
-      //      TabWidgetMain->setCurrentPage( 1 );
       TabWidgetMain->showPage( tabManualSetTime );
+      }
       
       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");
   int lastLookup = cfg.readNumEntry("time",0);
   int lookupCount = cfg.readNumEntry("count",0);
   bool lastNtp = cfg.readBoolEntry("lastNtp",false);
   int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
   cfg.writeEntry("time", time);
  	
   float timeShift = getTimeShift();
   if (timeShift == 0.0) return;
   int secsSinceLast = time - lastLookup;
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
   TextLabelTimeShift->setText(QString::number(timeShift)+tr(" seconds"));
   if ( lastNtp && lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value())
     {
       cfg.setGroup("lookup_"+QString::number(lookupCount));
       lookupCount++;
       _shiftPerSec =  timeShift / secsSinceLast;
       qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
       cfg.writeEntry("secsSinceLast",secsSinceLast);
       cfg.writeEntry("timeShift",QString::number(timeShift));
       cfg.setGroup("lookups");
       cfg.writeEntry("count",lookupCount);
       cfg.writeEntry("lastNtp",true);
     }
 }
 
 
 float Ntp::getTimeShift()
 {
   QString _offset = "offset";
   QString _sec = "sec";
   QRegExp _reOffset = QRegExp(_offset);
   QRegExp _reEndOffset = QRegExp(_sec);
   int posOffset = _reOffset.match( _ntpOutput );
   int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
   posOffset += _offset.length() + 1;
   QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
   qDebug("%s", _ntpOutput.latin1());
   qDebug("diff = >%s<",diff.latin1());
   return diff.toFloat();
 }
 
 void Ntp::readLookups()
 {
   Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lookupCount = cfg.readNumEntry("count",0);
   float last, shift, shiftPerSec;
   qDebug("lookupCount = %i",lookupCount);
   TableLookups->setNumCols( 3 );
   TableLookups->setNumRows( lookupCount);
   TableLookups->horizontalHeader()->setLabel(1,tr("last [h]"));
   TableLookups->horizontalHeader()->setLabel(2,tr("offset [s]"));
   TableLookups->horizontalHeader()->setLabel(0,tr("shift [s/h]"));
   int cw = TableLookups->width()/4;
   qDebug("column width %i",cw);
   cw = 50;
   TableLookups->setColumnWidth( 0, cw+30 );
   TableLookups->setColumnWidth( 1, cw );
   TableLookups->setColumnWidth( 2, cw );
   TableLookups->sortColumn(0, false, true );
   // TableLookups->setSorting( true );
   _shiftPerSec = 0;
   for (int i=0; i < lookupCount; i++)
     {
       cfg.setGroup("lookup_"+QString::number(i));
       last = cfg.readEntry("secsSinceLast",0).toFloat();
       shift = QString(cfg.readEntry("timeShift",0)).toFloat();
       shiftPerSec =  shift / last;
       qDebug("%i shift %f",i,shiftPerSec);
       _shiftPerSec += shiftPerSec;
       TableLookups->setText( i,0,QString::number(shiftPerSec*60*60));
       TableLookups->setText( i,2,QString::number(shift));
       TableLookups->setText( i,1,QString::number(last/(60*60)));
     }
   _shiftPerSec /= lookupCount;
   TextLabelShift->setText(QString::number(_shiftPerSec*60*60)+tr(" s/h"));
 }
 
 void Ntp::preditctTime()
 {
   Config cfg("ntp",Config::User);