Changeset 0c3d0cb


Ignore:
Timestamp:
07/24/13 12:54:18 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
c5a6d65, fd899c6
Parents:
faf5d5c
Message:

Enable the compression options on the "/" partition and fix some bugs
relating to how we display the summary

Location:
src-qt4/pc-installgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/installer.cpp

    rfe5d5c8 r0c3d0cb  
    368368        if ( copyList.at(i).at(0) == workingDisk \ 
    369369          && copyList.at(i).at(1) == workingSlice \ 
    370           && mounts.at(z) == startPart ) { 
     370          && (mounts.at(z) == startPart || mounts.at(z).contains(startPart + "(") ) ) { 
    371371 
    372372          // Check if we have any extra arguments to throw on the end 
     
    381381          summaryList << tr("Size:") + " " + copyList.at(i).at(4) + "MB "; 
    382382          if ( copyList.at(i).at(3) == "ZFS" ) { 
    383             QStringList zDS = copyList.at(i).at(2).split(",/"); 
     383            QStringList zDS = copyList.at(i).at(2).split(","); 
    384384            QString zTMP; 
    385385            for (int ds = 0; ds < zDS.size(); ++ds) { 
    386               if ( zDS.at(ds) != "/" ) 
    387                 zDS.replace(ds, "/" + zDS.at(ds)); 
     386              //if ( zDS.at(ds) != "/" ) 
     387               // zDS.replace(ds, "/" + zDS.at(ds)); 
    388388              if ( zDS.at(ds).indexOf("(") != -1 ) { 
    389389                zTMP = zDS.at(ds); 
  • src-qt4/pc-installgui/wizardDisk.cpp

    rfe5d5c8 r0c3d0cb  
    634634  popupCH->addAction( "off", this, SLOT(slotZChkOFF())); 
    635635 
    636   // Create compression sub-menu for non '/' devices 
    637   if ( treeMounts->currentItem()->text(1) != "/" ) { 
    638     popupCmp = popup->addMenu("compression"); 
    639     popupCmp->addAction( "off", this, SLOT(slotZCmpOFF())); 
    640     popupCmp->addAction( "lzjb", this, SLOT(slotZCmpLZJB())); 
    641     popupCmp->addAction( "gzip", this, SLOT(slotZCmpGZIP())); 
    642     popupCmp->addAction( "zle", this, SLOT(slotZCmpZLE())); 
    643   } 
     636  // Create compression sub-menu 
     637  popupCmp = popup->addMenu("compression"); 
     638  popupCmp->addAction( "off", this, SLOT(slotZCmpOFF())); 
     639  popupCmp->addAction( "on", this, SLOT(slotZCmpON())); 
     640  popupCmp->addAction( "lzjb", this, SLOT(slotZCmpLZJB())); 
     641  popupCmp->addAction( "gzip", this, SLOT(slotZCmpGZIP())); 
     642  popupCmp->addAction( "zle", this, SLOT(slotZCmpZLE())); 
    644643 
    645644  // Create dedup sub-menu 
     
    707706{ 
    708707  toggleZFSOpt(QString("compress=off")); 
     708} 
     709 
     710void wizardDisk::slotZCmpON() 
     711{ 
     712  toggleZFSOpt(QString("compress=on")); 
    709713} 
    710714 
  • src-qt4/pc-installgui/wizardDisk.h

    rfe5d5c8 r0c3d0cb  
    4646    void slotZDDON(); 
    4747    void slotZDDVERIFY(); 
     48    void slotZCmpON(); 
    4849    void slotZCmpOFF(); 
    4950    void slotZCmpLZJB(); 
Note: See TracChangeset for help on using the changeset viewer.