Changeset 839838f


Ignore:
Timestamp:
Jun 12, 2014 10:18:58 AM (4 weeks ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.2
Children:
0ce9dfb
Parents:
65ea581
Message:

Fix bugs in the Life-Preserver main GUI.

Correct issue passing invalid number to hourly replications

Fix install time strip error

Added support for "manual" replication times

Location:
src-qt4/life-preserver/lp-gui
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/life-preserver/lp-gui/LPBackend.cpp

    r7b6669b r839838f  
    196196bool LPBackend::setupReplication(QString dataset, QString remotehost, QString user, int port, QString remotedataset, int time){ 
    197197  QString stime = "sync"; //synchronize on snapshot creation (default) 
    198   if(time >= 0 && time < 24){ stime = QString::number(time); } //daily at a particular hour (24 hour notation) 
     198  if(time >= 0 && time < 24){ 
     199     stime = QString::number(time); 
     200     // Needs 0 in front of single digits 
     201     if ( stime.length() == 1) 
     202        stime = "0" + stime; 
     203  } //daily at a particular hour (24 hour notation) 
    199204  else if(time == -60){ stime = "hour"; } 
    200205  else if(time == -30){ stime = "30min"; } 
    201206  else if(time == -10){ stime = "10min"; } 
     207  else if(time == -2){ stime = "manual"; } 
    202208   
    203209   
     
    229235      QString synchro = data.section("Time:",1,1).simplified(); 
    230236        if(synchro == "sync"){ time = -1; } 
     237        else if(synchro =="manual"){ time = -2; } 
    231238        else if(synchro =="hour"){ time = -60; } 
    232239        else if(synchro == "30min"){ time = -30; } 
  • src-qt4/life-preserver/lp-gui/LPConfig.cpp

    ra710d85f r839838f  
    8484  }else if(remoteFreq == -10){ 
    8585    ui->combo_remote_schedule->setCurrentIndex(4); // 10 minutes 
     86  }else if(remoteFreq == -2){ 
     87    ui->combo_remote_schedule->setCurrentIndex(5); // Manual mode 
    8688  }else{ 
    8789    remoteFreq = -999; //just to make sure it is the "other" case 
     
    135137  if(nFreq == 0){ 
    136138    nFreq = -999; //Sync 
     139  }else if(nFreq==5){ 
     140    nFreq = -2; // Manual mode 
    137141  }else if(nFreq==1){ 
    138142    nFreq = ui->time_replicate->time().hour(); //Daily @ 
  • src-qt4/life-preserver/lp-gui/LPConfig.ui

    ra710b3ba r839838f  
    4242    <widget class="QTabWidget" name="tabWidget"> 
    4343     <property name="currentIndex"> 
    44       <number>1</number> 
     44      <number>0</number> 
    4545     </property> 
    4646     <widget class="QWidget" name="tab_local"> 
     
    364364                  </property> 
    365365                 </item> 
     366                 <item> 
     367                  <property name="text"> 
     368                   <string>Manual</string> 
     369                  </property> 
     370                 </item> 
    366371                </widget> 
    367372               </item> 
  • src-qt4/life-preserver/lp-gui/lp-gui.pro

    r109c737 r839838f  
    3232 
    3333scripts.path=/usr/local/share/lifePreserver/scripts 
    34 scripts.files=scripts/setup-ssh-keys.sh 
     34scripts.extra=cp scripts/setup-ssh-keys.sh /usr/local/share/lifePreserver/scripts/ && chmod 755 /usr/local/share/lifePreserver/scripts/setup-ssh-keys.sh 
    3535 
    3636dotrans.path=/usr/local/share/lifePreserver/i18n/ 
Note: See TracChangeset for help on using the changeset viewer.