Changeset dfdc6de


Ignore:
Timestamp:
07/29/13 12:54:52 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4f9718b, eb2e9cc
Parents:
9959e70 (diff), 84f77ef (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:
4 edited

Legend:

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

    r261f12e r84f77ef  
    428428  QList<QStringList> metaPkgs; 
    429429  found=false; 
     430  bool onDisk; 
     431  onDisk=true;  
    430432  QString tmp, mName, mDesc, mIcon, mParent, mDesktop, mPkgFileList; 
    431433  QStringList package; 
     
    471473                // Now add this meta-pkg to the string list 
    472474                package.clear(); 
    473                 //qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
    474                 package << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
    475                 metaPkgs.append(package); 
     475 
     476                // If this package is marked "dl-only" we won't show it 
     477                if ( ! QFile::exists("/usr/local/share/pcbsd/metaset/" + pkgset + "/" + mName + "/dl-only" ) ) { 
     478                  //qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
     479                  package << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList; 
     480                  metaPkgs.append(package); 
     481                } 
    476482                found = true; 
    477483                mName=""; mDesc=""; mIcon=""; mParent=""; mDesktop=""; mPkgFileList=""; 
  • src-qt4/EasyPBI/config.cpp

    re177abf rc407101  
    279279      else{ qDebug() << "invalid setvalue requested:" << var; }      
    280280    } 
    281  
     281  checkStructures(); 
    282282} 
    283283 
     
    353353    if(detStruct[3].isEmpty()){ TFstruct[1] = FALSE; } 
    354354    else{ valueStruct[3] = detStruct[3]; TFstruct[1]=TRUE; } 
    355   } 
     355  }else if( QFile::exists(valueStruct[3]+"/COPYRIGHT") ){  
     356    TFstruct[1]=TRUE;  
     357  } 
     358   
    356359  // -- Icon dir 
    357360  if( valueStruct[4].isEmpty() ){ valueStruct[4] = defaultSettings[7]; } 
  • src-qt4/EasyPBI/mainGUI.cpp

    rcc7dbf3 r9959e70  
    389389  //make the dialog modal and wait for it to close 
    390390  dlg.exec();  
     391  //Re-check for system commands 
     392  settings->scanForExternalUtilities(); 
    391393  //Now reload the saved settings 
    392394  settings->loadSettingsFile(); 
     
    394396  refreshGUI("all"); 
    395397} 
     398 
    396399void MainGUI::on_actionPackage_Module_triggered(){ 
    397400   currentModule->compressModule(); 
     
    13981401  QMessageBox verify(this); 
    13991402  verify.setText(tr("Are you sure you wish to start the PBI build?")); 
    1400   verify.setInformativeText(tr("This requires an active internet connection and root permissions. The time required to build a PBI varies depending upon system specifications and ports to be compiled.")); 
     1403  verify.setInformativeText(tr("This requires an active internet connection and administrator privileges. The time required to build a PBI varies depending upon system specifications and ports to be compiled.")); 
    14011404  verify.setStandardButtons(QMessageBox::Yes | QMessageBox::No); 
    14021405  verify.setDefaultButton(QMessageBox::Yes); 
  • src-qt4/EasyPBI/mainGUI.ui

    re177abf r9959e70  
    5555         <x>0</x> 
    5656         <y>0</y> 
    57          <width>276</width> 
    58          <height>149</height> 
     57         <width>600</width> 
     58         <height>474</height> 
    5959        </rect> 
    6060       </property> 
     
    134134           <widget class="QPushButton" name="push_build_start"> 
    135135            <property name="statusTip"> 
    136              <string>Start building a PBI from the current module (requires root permissions)</string> 
     136             <string>Start building a PBI from the current module (requires administrator privileges)</string> 
    137137            </property> 
    138138            <property name="text"> 
Note: See TracChangeset for help on using the changeset viewer.