Changeset ec6e81d


Ignore:
Timestamp:
Oct 11, 2013 3:15:25 PM (9 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
909e1d3
Parents:
ef5392a (diff), f75599e (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-qt4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    r7cc177e rf75599e  
    844844        } 
    845845    } 
    846    
    847      if ( lineDNS1->text() != "..."  && ! pcbsd::Utils::validateIPV4(lineDNS1->text() ) && groupDNS->isChecked()) { 
     846     
     847     if(groupDNS->isChecked()){ 
     848       if( lineDNS1->text() == "..." && lineDNS2->text() == "..." ){ return; } 
     849       if ( lineDNS1->text() != "..."  && ! pcbsd::Utils::validateIPV4(lineDNS1->text() ) ) { 
    848850         textGlobalError->setText(tr("Invalid DNS specified")); 
    849851         return; 
    850      } 
    851      
    852     if ( lineDNS2->text() != "..."  && ! pcbsd::Utils::validateIPV4(lineDNS2->text() ) && groupDNS->isChecked()) { 
     852       } 
     853       if ( lineDNS2->text() != "..."  && ! pcbsd::Utils::validateIPV4(lineDNS2->text() ) ) { 
    853854         textGlobalError->setText(tr("Invalid DNS specified")); 
    854855         return; 
     856       } 
    855857     } 
    856858     
  • src-qt4/pc-installgui/wizardDisk.cpp

    r1bfa1e0 ref5392a  
    2424 
    2525  //connect(pushClose, SIGNAL(clicked()), this, SLOT(slotClose())); 
     26  connect(checkGPT, SIGNAL(clicked()), this, SLOT(slotGPTClicked())); 
    2627  connect(pushSwapSize, SIGNAL(clicked()), this, SLOT(slotSwapSize())); 
    2728  connect(pushRemoveMount, SIGNAL(clicked()), this, SLOT(slotRemoveFS())); 
     
    10861087  restoreMode=true; 
    10871088} 
     1089 
     1090void wizardDisk::slotGPTClicked() 
     1091{ 
     1092   // Right now we can't do the dirty "gnop" trick on GPT 
     1093   // Mangles the partitions and fails to boot 
     1094   if ( checkGPT->isChecked() ) 
     1095   { 
     1096     checkForce4K->setChecked(false); 
     1097     checkForce4K->setEnabled(false); 
     1098   } else { 
     1099     checkForce4K->setEnabled(true); 
     1100   } 
     1101} 
  • src-qt4/pc-installgui/wizardDisk.h

    r93572be ref5392a  
    4040    void slotTerminal(); 
    4141    void slotSwapSize(); 
     42    void slotGPTClicked(); 
    4243  
    4344    // QMenu slots 
Note: See TracChangeset for help on using the changeset viewer.