Changeset 1b87cd2


Ignore:
Timestamp:
02/28/14 13:53:43 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
536797a, fa4f55f
Parents:
194a5d3 (diff), c2b5aad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
9 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    r58035e0 rc2b5aad  
    12771277src-qt4/pc-mounttray/i18n/MountTray_zh_TW.qm 
    12781278src-qt4/pc-mounttray/i18n/MountTray_zu.qm 
     1279src-qt4/life-preserver/lp-tray/Makefile 
     1280src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_af.qm 
     1281src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ar.qm 
     1282src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_az.qm 
     1283src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bg.qm 
     1284src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bn.qm 
     1285src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_bs.qm 
     1286src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ca.qm 
     1287src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cs.qm 
     1288src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_cy.qm 
     1289src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_da.qm 
     1290src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_de.qm 
     1291src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_el.qm 
     1292src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_GB.qm 
     1293src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_US.qm 
     1294src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_en_ZA.qm 
     1295src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_es.qm 
     1296src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_et.qm 
     1297src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_eu.qm 
     1298src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fa.qm 
     1299src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fi.qm 
     1300src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr.qm 
     1301src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fr_CA.qm 
     1302src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_fur.qm 
     1303src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_gl.qm 
     1304src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_he.qm 
     1305src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hi.qm 
     1306src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hr.qm 
     1307src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_hu.qm 
     1308src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_id.qm 
     1309src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_is.qm 
     1310src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_it.qm 
     1311src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ja.qm 
     1312src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ka.qm 
     1313src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ko.qm 
     1314src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lt.qm 
     1315src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_lv.qm 
     1316src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mk.qm 
     1317src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mn.qm 
     1318src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ms.qm 
     1319src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_mt.qm 
     1320src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nb.qm 
     1321src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ne.qm 
     1322src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_nl.qm 
     1323src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pa.qm 
     1324src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pl.qm 
     1325src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt.qm 
     1326src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_pt_BR.qm 
     1327src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ro.qm 
     1328src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ru.qm 
     1329src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sa.qm 
     1330src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sk.qm 
     1331src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sl.qm 
     1332src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sr.qm 
     1333src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sv.qm 
     1334src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_sw.qm 
     1335src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_ta.qm 
     1336src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tg.qm 
     1337src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_th.qm 
     1338src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_tr.qm 
     1339src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uk.qm 
     1340src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_uz.qm 
     1341src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_vi.qm 
     1342src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_CN.qm 
     1343src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_HK.qm 
     1344src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zh_TW.qm 
     1345src-qt4/life-preserver/lp-tray/i18n/LifePreserverTray_zu.qm 
     1346src-qt4/life-preserver/lp-tray/life-preserver-tray 
     1347src-sh/lpreserver/install 
     1348src-sh/pbi-manager/pbifs/pbifs 
  • src-sh/warden/scripts/backend/functions.sh

    r13a6b08 rc2b5aad  
    791791  local outfile="${2}" 
    792792 
    793   local release="$(uname -r | cut -d '-' -f 1-2)" 
     793  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     794     echo "Missing /bin/freebsd-version in jail.." 
     795     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     796     return 1 
     797  fi 
     798 
     799  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    794800  local arch="$(uname -m)" 
    795801 
     
    838844  local outfile="${2}" 
    839845 
    840   local release="$(uname -r | cut -d '-' -f 1-2)" 
     846  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     847     echo "Missing /bin/freebsd-version in jail.." 
     848     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     849     return 0 
     850  fi 
     851 
     852  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    841853  local arch="$(uname -m)" 
    842854 
     
    911923    jailtype="standard" 
    912924  fi 
    913   local release="$(uname -r | cut -d '-' -f 1-2)" 
     925 
     926  if [ ! -e "${jaildir}/bin/freebsd-version" ] ; then 
     927     echo "Missing /bin/freebsd-version in jail.." 
     928     echo "PKG bootstrap can only be done on 10.0 and higher, skipping..." 
     929     return 1 
     930  fi 
     931 
     932  local release="`${jaildir}/bin/freebsd-version | cut -d '-' -f 1-2`" 
    914933  local arch="$(uname -m)" 
    915934 
     
    923942 
    924943  mkdir -p ${jaildir}/usr/local/etc 
    925   pubcert="/usr/local/etc/pkg-pubkey.cert" 
    926  
    927   cp "${pubcert}" ${jaildir}/usr/local/etc 
    928   install_pc_extractoverlay "${jaildir}" 
     944 
    929945 
    930946  ${ffunc} "${jaildir}" "${jaildir}/bootstrap-pkgng" 
  • src-qt4/life-preserver/lp-gui/LPBackend.cpp

    r0ecb8f7 r194a5d3  
    114114  //Configure inputs 
    115115  QString freq; 
     116  if(time == -60){ freq = "hourly"; } 
    116117  if(time == -30){ freq = "30min"; } 
    117118  else if(time == -10){ freq = "10min"; } 
    118119  else if(time == -5){ freq = "5min"; } 
    119120  else if(time >= 0 && time < 24){ freq = "daily@"+QString::number(time); } 
    120   else{ freq = "hourly"; } 
     121  else{ freq = "auto"; } 
    121122   
    122123  //Create the command 
    123   QString cmd = "lpreserver cronsnap "+dataset+" start "+freq+" "+QString::number(numToKeep); 
     124  QString cmd = "lpreserver cronsnap "+dataset+" start "+freq; 
     125  if(freq != "auto"){ cmd.append(" "+QString::number(numToKeep) ); } //also add the number to keep 
    124126  int ret = LPBackend::runCmd(cmd); 
    125127    
     
    147149      else if(sch=="10min"){time = -10;} 
    148150      else if(sch=="30min"){time = -30;} 
    149       else{ time = -60; } //hourly 
     151      else if(sch=="hourly"){ time = -60; } //hourly 
     152      else{ time = -999; } //auto 
    150153      //Get total snapshots 
    151154      numToKeep = out[i].section("- total:",1,1).simplified().toInt(); 
     
    191194  QString stime = "sync"; //synchronize on snapshot creation (default) 
    192195  if(time >= 0 && time < 24){ stime = QString::number(time); } //daily at a particular hour (24 hour notation) 
     196  else if(time == -60){ stime = "hour"; } 
     197  else if(time == -30){ stime = "30min"; } 
     198  else if(time == -10){ stime = "10min"; } 
    193199   
    194200   
     
    220226      QString synchro = data.section("Time:",1,1).simplified(); 
    221227        if(synchro == "sync"){ time = -1; } 
     228        else if(synchro =="hour"){ time = -60; } 
     229        else if(synchro == "30min"){ time = -30; } 
     230        else if(synchro == "10min"){ time = -10; } 
    222231        else{ time = synchro.toInt(); } 
    223232      ok = true; 
  • src-qt4/life-preserver/lp-gui/LPConfig.cpp

    rb22b3a5 r194a5d3  
    5353  // - local settings 
    5454  if(localSchedule == -5){ //5 minutes 
    55     ui->combo_local_schedule->setCurrentIndex(4);          
     55    ui->combo_local_schedule->setCurrentIndex(5);          
    5656  }else if(localSchedule == -10){ //10 minutes 
    57     ui->combo_local_schedule->setCurrentIndex(3);        
     57    ui->combo_local_schedule->setCurrentIndex(4);        
    5858  }else if(localSchedule == -30){ //30 minutes 
    59     ui->combo_local_schedule->setCurrentIndex(2);          
     59    ui->combo_local_schedule->setCurrentIndex(3);          
     60  }else if(localSchedule == -60){ //assume hourly 
     61    ui->combo_local_schedule->setCurrentIndex(2);         
    6062  }else if(localSchedule > 0 && localSchedule < 24){ //daily @ hour 
     63    ui->combo_local_schedule->setCurrentIndex(1); 
     64    ui->time_local_daily->setTime( QTime(localSchedule, 0) ); 
     65  }else{ //assume auto 
     66    localSchedule = -999; //just to make sure it does not match anything else 
    6167    ui->combo_local_schedule->setCurrentIndex(0); 
    62     ui->time_local_daily->setTime( QTime(localSchedule, 0) ); 
    63   }else{ //assume hourly 
    64     localSchedule = -60; 
    65     ui->combo_local_schedule->setCurrentIndex(1);          
    6668  } 
    6769  setLocalKeepNumber(); 
     
    7476  ui->spinPort->setValue(remotePort); 
    7577  if(remoteFreq >=0 && remoteFreq < 24){ 
    76     ui->radioRepTime->setChecked(true); 
     78    ui->combo_remote_schedule->setCurrentIndex(1); //Daily @ 
    7779    ui->time_replicate->setTime( QTime(remoteFreq,0) ); 
     80  }else if(remoteFreq == -60){ 
     81    ui->combo_remote_schedule->setCurrentIndex(2); //Hourly 
     82  }else if(remoteFreq == -30){ 
     83    ui->combo_remote_schedule->setCurrentIndex(3); // 30 minutes 
     84  }else if(remoteFreq == -10){ 
     85    ui->combo_remote_schedule->setCurrentIndex(4); // 10 minutes 
    7886  }else{ 
    79     ui->radioSYNC->setChecked(true); 
    80   } 
    81    
     87    remoteFreq = -999; //just to make sure it is the "other" case 
     88    ui->combo_remote_schedule->setCurrentIndex(0); // Sync 
     89  } 
     90  //Now update the visibility of items appropriately 
     91  on_combo_local_schedule_currentIndexChanged(ui->combo_local_schedule->currentIndex()); 
     92  on_combo_remote_schedule_currentIndexChanged(ui->combo_remote_schedule->currentIndex()); 
    8293} 
    8394 
     
    90101  int nSchedule; 
    91102  int schint = ui->combo_local_schedule->currentIndex(); 
    92   if(schint == 0){ nSchedule = ui->time_local_daily->time().hour(); } //daily @ hour 
    93   else if(schint == 1){ nSchedule = -60; } //hourly 
    94   else if(schint == 2){ nSchedule = -30; } //30 min 
    95   else if(schint == 3){ nSchedule = -10; } //10 min 
     103  if(schint == 0){ nSchedule = -999; } //Auto 
     104  if(schint == 1){ nSchedule = ui->time_local_daily->time().hour(); } //daily @ hour 
     105  else if(schint == 2){ nSchedule = -60; } //hourly 
     106  else if(schint == 3){ nSchedule = -30; } //30 min 
     107  else if(schint == 4){ nSchedule = -10; } //10 min 
    96108  else{ nSchedule = -5; } //5 min 
    97109  int nTotSnaps; 
    98   if( ui->combo_local_keepunits->currentIndex() == 0 && (schint != 0) ){ //days 
     110  if( ui->combo_local_keepunits->currentIndex() == 0 && (schint != 1) ){ //days 
    99111    int numperday = 1440/(-nSchedule); 
    100112    nTotSnaps = numperday * ui->spin_local_numkeep->value(); 
     
    119131  if( tmp != remoteDataset ){ remoteChanged = true; remoteDataset = tmp; } 
    120132  if( ui->spinPort->value() != remotePort){ remoteChanged = true; remotePort = ui->spinPort->value(); updateSSHKey=true;} 
    121   int nFreq = -1; 
    122   if(ui->radioRepTime->isChecked()){ 
    123     nFreq = ui->time_replicate->time().hour(); 
    124   } 
    125   if(nFreq < 0){ 
    126     if( remoteFreq >= 0 && remoteFreq < 24){remoteChanged = true; remoteFreq = nFreq;} 
     133   
     134  int nFreq = ui->combo_remote_schedule->currentIndex(); 
     135  if(nFreq == 0){ 
     136    nFreq = -999; //Sync 
     137  }else if(nFreq==1){ 
     138    nFreq = ui->time_replicate->time().hour(); //Daily @ 
     139  }else if(nFreq==2){ 
     140    nFreq = -60; //Hourly 
     141  }else if(nFreq==3){ 
     142    nFreq = -30; //30 minutes 
    127143  }else{ 
    128     if( nFreq != remoteFreq ){ remoteChanged = true; remoteFreq = nFreq; } 
    129   } 
     144    nFreq = -10; //10 minutes 
     145  } 
     146  if( nFreq != remoteFreq ){ remoteChanged = true; remoteFreq = nFreq; } 
     147 
    130148  if(updateSSHKey){ 
    131149    //Prompt for the SSH key generation 
     
    169187void LPConfig::on_combo_local_schedule_currentIndexChanged(int index){ 
    170188  //Adjust whether the daily time box is visible 
    171   ui->time_local_daily->setVisible( (index == 0) ); 
     189  ui->time_local_daily->setVisible( (index == 1) ); 
     190  //Show the Number to keep options if applicable 
     191  ui->spin_local_numkeep->setVisible( (index!=0) ); 
     192  ui->label_local_keep->setVisible( (index!=0) ); 
     193  ui->combo_local_keepunits->setVisible( (index!=0) ); 
     194} 
     195 
     196void LPConfig::on_combo_remote_schedule_currentIndexChanged(int index){ 
     197  //Adjust whether the daily time box is visible 
     198  ui->time_replicate->setVisible( (index == 1) ); 
    172199} 
    173200 
  • src-qt4/life-preserver/lp-gui/LPConfig.h

    rb22b3a5 r194a5d3  
    3838        void slotCancelConfig(); 
    3939        void on_combo_local_schedule_currentIndexChanged(int); 
     40        void on_combo_remote_schedule_currentIndexChanged(int index); 
    4041        void autoDetectReplicationTargets(); 
    4142}; 
  • src-qt4/life-preserver/lp-gui/LPConfig.ui

    rb22b3a5 r194a5d3  
    88    <y>0</y> 
    99    <width>372</width> 
    10     <height>353</height> 
     10    <height>357</height> 
    1111   </rect> 
    1212  </property> 
     
    6666         <item> 
    6767          <widget class="QComboBox" name="combo_local_schedule"> 
     68           <item> 
     69            <property name="text"> 
     70             <string>Automatic</string> 
     71            </property> 
     72           </item> 
    6873           <item> 
    6974            <property name="text"> 
     
    145150       </item> 
    146151       <item row="1" column="0"> 
    147         <widget class="QLabel" name="label_4"> 
     152        <widget class="QLabel" name="label_local_keep"> 
    148153         <property name="font"> 
    149154          <font> 
     
    322327            <layout class="QGridLayout" name="gridLayout_3"> 
    323328             <item row="0" column="0"> 
    324               <widget class="QRadioButton" name="radioSYNC"> 
    325                <property name="text"> 
    326                 <string>With snapshot creation (Best for daily snapshots)</string> 
    327                </property> 
    328                <property name="checked"> 
    329                 <bool>true</bool> 
    330                </property> 
    331               </widget> 
    332              </item> 
    333              <item row="1" column="0"> 
    334329              <layout class="QHBoxLayout" name="horizontalLayout_6"> 
    335330               <item> 
    336                 <widget class="QRadioButton" name="radioRepTime"> 
    337                  <property name="text"> 
    338                   <string>Daily at:</string> 
    339                  </property> 
     331                <widget class="QComboBox" name="combo_remote_schedule"> 
     332                 <property name="sizePolicy"> 
     333                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> 
     334                   <horstretch>0</horstretch> 
     335                   <verstretch>0</verstretch> 
     336                  </sizepolicy> 
     337                 </property> 
     338                 <property name="sizeAdjustPolicy"> 
     339                  <enum>QComboBox::AdjustToContents</enum> 
     340                 </property> 
     341                 <item> 
     342                  <property name="text"> 
     343                   <string>Sync with snapshots</string> 
     344                  </property> 
     345                 </item> 
     346                 <item> 
     347                  <property name="text"> 
     348                   <string>Daily</string> 
     349                  </property> 
     350                 </item> 
     351                 <item> 
     352                  <property name="text"> 
     353                   <string>Hourly</string> 
     354                  </property> 
     355                 </item> 
     356                 <item> 
     357                  <property name="text"> 
     358                   <string>30 Minutes</string> 
     359                  </property> 
     360                 </item> 
     361                 <item> 
     362                  <property name="text"> 
     363                   <string>10 Minutes</string> 
     364                  </property> 
     365                 </item> 
    340366                </widget> 
    341367               </item> 
     
    343369                <widget class="QTimeEdit" name="time_replicate"> 
    344370                 <property name="displayFormat"> 
    345                   <string>h AP</string> 
     371                  <string>@ h AP</string> 
    346372                 </property> 
    347373                </widget> 
    348374               </item> 
    349375               <item> 
    350                 <spacer name="horizontalSpacer_9"> 
     376                <spacer name="horizontalSpacer_6"> 
    351377                 <property name="orientation"> 
    352378                  <enum>Qt::Horizontal</enum> 
    353379                 </property> 
     380                 <property name="sizeType"> 
     381                  <enum>QSizePolicy::Preferred</enum> 
     382                 </property> 
    354383                 <property name="sizeHint" stdset="0"> 
    355384                  <size> 
    356                    <width>40</width> 
     385                   <width>20</width> 
    357386                   <height>20</height> 
    358387                  </size> 
  • src-qt4/life-preserver/lp-gui/LPWizard.cpp

    rf15ae5d r194a5d3  
    2626  if(enableReplication){ 
    2727    remotePort = ui->spinPort->value(); 
    28     if(ui->radioSYNC->isChecked()){  
    29       remoteTime = -1; 
    30     }else{ 
    31       remoteTime = ui->time_replicate->time().hour(); 
    32     } 
     28    int remoteTime = ui->combo_remote_freq->currentIndex(); 
     29    if(remoteTime==0){ remoteTime = -999; } //Sync 
     30    else if(remoteTime==1){ remoteTime =  ui->time_replicate->time().hour(); } //Daily @ 
     31    else if(remoteTime==2){ remoteTime = -60; } //hourly 
     32    else if(remoteTime==3){ remoteTime = -30; } //30min 
     33    else{ remoteTime = -10; } //10min 
    3334    remoteHost = ui->lineHostName->text(); 
    3435    remoteUser = ui->lineUserName->text(); 
     
    3738    LPBackend::setupSSHKey(remoteHost, remoteUser, remotePort); 
    3839  } 
     40  if(ui->radio_automatic->isChecked()){ localTime = -999; } 
    3941  if(ui->radioDaily->isChecked()){ localTime = ui->timeEdit->time().hour(); } 
    4042  else if( ui->radio10Min->isChecked()){ localTime = -10; } 
     
    8284  } 
    8385} 
     86 
     87void LPWizard::on_combo_remote_freq_itemChanged(int index){ 
     88  //Adjust the visibility of the replication time selector 
     89  ui->time_replicate->setVisible( (index == 1) ); 
     90} 
     91 
     92int LPWizard::nextId() const{ 
     93        int cpg = currentId(); 
     94        if(cpg == 1 && ui->radio_automatic->isChecked() ){ 
     95          //Automatic snapshot schedule - skip the snapshot pruning page (not needed) 
     96          return 3; 
     97        }else if(cpg==4){ //last page 
     98          return -1; 
     99        }else{ 
     100          return (cpg+1); //go to the next page 
     101        } 
     102} 
  • src-qt4/life-preserver/lp-gui/LPWizard.h

    rf15ae5d r194a5d3  
    2828        QString remoteHost, remoteUser, remoteDataset; 
    2929 
     30        virtual int nextId() const; //override the standard page order sometimes 
     31 
    3032private: 
    3133        Ui::LPWizard *ui; 
     
    3537        void slotCancelled(); 
    3638        void scanNetwork(); 
     39        void on_combo_remote_freq_itemChanged(int index); 
    3740}; 
    3841 
  • src-qt4/life-preserver/lp-gui/LPWizard.ui

    rf15ae5d r194a5d3  
    2424   <set>QWizard::IndependentPages</set> 
    2525  </property> 
    26   <widget class="QWizardPage" name="wizardPage1"> 
     26  <widget class="QWizardPage" name="wizardPage_start"> 
    2727   <layout class="QVBoxLayout" name="verticalLayout"> 
    2828    <item> 
     
    9696   </layout> 
    9797  </widget> 
    98   <widget class="QWizardPage" name="wizardPage"> 
     98  <widget class="QWizardPage" name="wizardPage_snapSchedule"> 
    9999   <property name="title"> 
    100100    <string/> 
     
    122122       <item> 
    123123        <layout class="QGridLayout" name="gridLayout_4"> 
    124          <item row="1" column="0"> 
     124         <item row="2" column="0"> 
    125125          <widget class="QRadioButton" name="radioHourly"> 
    126126           <property name="sizePolicy"> 
     
    135135          </widget> 
    136136         </item> 
    137          <item row="0" column="0"> 
     137         <item row="1" column="0"> 
    138138          <layout class="QHBoxLayout" name="horizontalLayout_11"> 
    139139           <item> 
     
    149149             </property> 
    150150             <property name="checked"> 
    151               <bool>true</bool> 
     151              <bool>false</bool> 
    152152             </property> 
    153153            </widget> 
     
    199199          </layout> 
    200200         </item> 
    201          <item row="2" column="0"> 
     201         <item row="3" column="0"> 
    202202          <widget class="QRadioButton" name="radio30Min"> 
    203203           <property name="text"> 
     
    206206          </widget> 
    207207         </item> 
    208          <item row="3" column="0"> 
     208         <item row="4" column="0"> 
    209209          <widget class="QRadioButton" name="radio10Min"> 
    210210           <property name="text"> 
     
    213213          </widget> 
    214214         </item> 
    215          <item row="4" column="0"> 
     215         <item row="5" column="0"> 
    216216          <widget class="QRadioButton" name="radio5Min"> 
    217217           <property name="text"> 
     
    220220          </widget> 
    221221         </item> 
    222          <item row="5" column="0"> 
     222         <item row="6" column="0"> 
    223223          <spacer name="verticalSpacer_3"> 
    224224           <property name="orientation"> 
     
    233233          </spacer> 
    234234         </item> 
     235         <item row="0" column="0"> 
     236          <widget class="QRadioButton" name="radio_automatic"> 
     237           <property name="text"> 
     238            <string>Automatic</string> 
     239           </property> 
     240           <property name="checked"> 
     241            <bool>true</bool> 
     242           </property> 
     243          </widget> 
     244         </item> 
    235245        </layout> 
    236246       </item> 
     
    240250   </layout> 
    241251  </widget> 
    242   <widget class="QWizardPage" name="wizardPage_5"> 
     252  <widget class="QWizardPage" name="wizardPage_snapPrune"> 
    243253   <layout class="QGridLayout" name="gridLayout_11"> 
    244254    <item row="0" column="0"> 
     
    386396   </layout> 
    387397  </widget> 
    388   <widget class="QWizardPage" name="wizardPage_3"> 
     398  <widget class="QWizardPage" name="wizardPage_replicate"> 
    389399   <layout class="QGridLayout" name="gridLayout_10"> 
    390400    <item row="0" column="0"> 
     
    470480            <layout class="QVBoxLayout" name="verticalLayout_5"> 
    471481             <item> 
    472               <widget class="QRadioButton" name="radioSYNC"> 
    473                <property name="text"> 
    474                 <string>With snapshot creation (Best for daily snapshots)</string> 
    475                </property> 
    476                <property name="checked"> 
    477                 <bool>true</bool> 
    478                </property> 
    479               </widget> 
    480              </item> 
    481              <item> 
    482482              <layout class="QHBoxLayout" name="horizontalLayout_3"> 
    483483               <item> 
    484                 <widget class="QRadioButton" name="radioRepTime"> 
    485                  <property name="text"> 
    486                   <string>Daily at:</string> 
    487                  </property> 
     484                <widget class="QComboBox" name="combo_remote_freq"> 
     485                 <item> 
     486                  <property name="text"> 
     487                   <string>Sync with snapshots</string> 
     488                  </property> 
     489                 </item> 
     490                 <item> 
     491                  <property name="text"> 
     492                   <string>Daily</string> 
     493                  </property> 
     494                 </item> 
     495                 <item> 
     496                  <property name="text"> 
     497                   <string>Hourly</string> 
     498                  </property> 
     499                 </item> 
     500                 <item> 
     501                  <property name="text"> 
     502                   <string>30 Minutes</string> 
     503                  </property> 
     504                 </item> 
     505                 <item> 
     506                  <property name="text"> 
     507                   <string>10 Minutes</string> 
     508                  </property> 
     509                 </item> 
    488510                </widget> 
    489511               </item> 
     
    515537                 </property> 
    516538                 <property name="displayFormat"> 
    517                   <string>h AP</string> 
     539                  <string>@ h AP</string> 
    518540                 </property> 
    519541                </widget> 
     
    643665   </layout> 
    644666  </widget> 
    645   <widget class="QWizardPage" name="wizardPage_4"> 
     667  <widget class="QWizardPage" name="wizardPage_finished"> 
    646668   <layout class="QGridLayout" name="gridLayout_2"> 
    647669    <item row="0" column="0"> 
Note: See TracChangeset for help on using the changeset viewer.