Changeset 55145db


Ignore:
Timestamp:
12/23/14 06:42:24 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
091dd28
Parents:
01204f2 (diff), 456a1e2 (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

Location:
src-qt5
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/about-gui/mainwindow.cpp

    r3667cdb rbe7d9ca  
    7474 
    7575const char* const PCBSD_UTILS_PACKAGE = "pcbsd-utils"; 
    76 const char* const PCBSD_UTILS_QT_PACKAGE = "pcbsd-utils-qt4"; 
     76const char* const PCBSD_UTILS_QT_PACKAGE = "pcbsd-utils-qt5"; 
    7777 
    7878//////////////////////////////////////////////////////////////////////////// 
  • src-qt5/pc-bootconfig/mainUI.cpp

    r3667cdb r5d7a8f1  
    380380    //Update GRUB config 
    381381    if(ok){  
     382      beadmActivate( ui->tree_BE->currentItem()->text(0) ); //for other bootloaders 
    382383      on_action_rebuildGRUBmenu_triggered(); //For GRUB bootloader 
    383       beadmActivate( ui->tree_BE->currentItem()->text(0) ); //for other bootloaders 
    384384    } 
    385385    //Update GUI 
  • src-qt5/pc-sysmanager/pbsystemtab.cpp

    r1ce6c84 rbe7d9ca  
    7878  label_pcbsdutils->setText(utils); 
    7979  //Get pcbsd-utils-qt4 version 
    80   QString utilsqt4 = pcbsd::Utils::runShellCommand("pkg info -f pcbsd-utils-qt4").filter("Version").join("").section(":",1,1).simplified(); 
     80  QString utilsqt4 = pcbsd::Utils::runShellCommand("pkg info -f pcbsd-utils-qt5").filter("Version").join("").section(":",1,1).simplified(); 
    8181  if(utilsqt4.isEmpty()){ utilsqt4 ="UNKNOWN"; } 
    8282  label_pcbsdgutils->setText(utilsqt4); 
  • src-qt5/life-preserver/lp-gui/LPBackend.cpp

    r3667cdb r01204f2  
    120120  QString freq; 
    121121  if(time == -60){ freq = "hourly"; } 
    122   if(time == -30){ freq = "30min"; } 
     122  else if(time == -30){ freq = "30min"; } 
    123123  else if(time == -10){ freq = "10min"; } 
    124124  else if(time == -5){ freq = "5min"; } 
     
    129129  QString cmd = "lpreserver cronsnap "+dataset+" start "+freq; 
    130130  if(freq != "auto"){ cmd.append(" "+QString::number(numToKeep) ); } //also add the number to keep 
     131  //qDebug() << "Lpreserver Command:" << cmd; 
    131132  int ret = LPBackend::runCmd(cmd); 
    132133    
  • src-qt5/life-preserver/lp-gui/LPConfig.cpp

    r3667cdb r01204f2  
    118118  if(nSchedule != localSchedule){localChanged = true; localSchedule = nSchedule; } 
    119119  if(nTotSnaps != localSnapshots){ localChanged = true; localSnapshots = nTotSnaps; } 
    120    
     120 
    121121  //Replication Settings 
    122122  bool updateSSHKey = false; 
  • src-qt5/life-preserver/lp-gui/LPMain.cpp

    r3667cdb r01204f2  
    418418  if(CFG.localChanged){ 
    419419    ui->statusbar->showMessage(QString(tr("Configuring dataset: %1")).arg(ds),0); 
    420     qDebug() << "Settings up local snapshots:" << ds << "Frequency:" << CFG.localSchedule; 
     420    qDebug() << "Settings up local snapshots:" << ds << "Frequency:" << CFG.localSchedule << "Total Snaps:" << CFG.localSnapshots; 
    421421    LPBackend::setupDataset(ds, CFG.localSchedule, CFG.localSnapshots); 
    422422    ui->statusbar->clearMessage(); 
Note: See TracChangeset for help on using the changeset viewer.