Changeset 621f1df


Ignore:
Timestamp:
12/16/13 13:39:22 (15 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
a44fbab
Parents:
18af43e
Message:

Finish cleaning up the mainGUI PBI build tab. It is now all set for final testing once we have packages available again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/EasyPBI-devel/mainGUI.cpp

    r18af43e r621f1df  
    161161        QMessageBox::warning(this, tr("Resources Unavailable"), tr("Some external resources could not be found, so the EasyPBI services that use these resources have been deactivated.")+"\n"+tr("Please open up the EasyPBI settings to correct this deficiency.") ); 
    162162    } 
    163     //Pop up a warning about a missing ports tree 
    164     //if( !settings->check("isPortsAvailable") ){ 
    165         //QMessageBox::warning(this, tr("FreeBSD Ports Missing"), tr("The FreeBSD ports tree is missing from your system.")+"\n"+tr("Please open up the EasyPBI settings to correct this deficiency.") ); 
    166     //} 
    167163    //Set a couple more internal flags 
    168164    PBI_BUILDING_NOW.clear(); 
     
    344340    if(PBI_BUILDING_NOW.isEmpty()){ 
    345341      //only change things if there is nothing building at the moment 
     342      ui->push_build_stop->setEnabled(false); 
    346343      if(ui->text_build_log->toPlainText().isEmpty()){ ui->push_build_save->setEnabled(FALSE); } 
    347344      else{ ui->push_build_save->setEnabled(TRUE); } 
    348     } 
     345    }else{ 
     346      ui->push_build_stop->setEnabled(true); 
     347    } 
     348     
    349349    ui->push_build_start->setFocus();//make sure the focus starts out on the build button 
    350350  } 
     
    12361236  if( settings->check("usesignature") && QFile::exists(settings->value("sigfile")) ){ sigFile = settings->value("sigfile"); } 
    12371237  QString cmd = ModuleUtils::generatePbiBuildCmd(MODULE.basepath(), outdir, sigFile); 
    1238   /*// -- PBI from ports 
    1239     //Check that the ports tree is available 
    1240     if( !settings->check("isportsavailable") ){  
    1241       qDebug() << "Cannot build a PBI from ports without the FreeBSD ports tree available"; 
    1242       return; 
    1243     } 
    1244     //Setup the pbi_makeport command from GUI settings 
    1245     cmd = settings->value("pbi_makeport"); 
    1246     if(ui->check_build_32->isChecked()){ cmd += " -32"; } 
    1247     cmd += " -c " + modDir; 
    1248     if(settings->value("portsdir") != "/usr/ports"){ cmd += " -d " + settings->value("portsdir"); } 
    1249     cmd += " -o " + outdir; 
    1250     cmd += " --delbuild"; 
    1251     if( settings->check("usetmpfs") ){ cmd += " --tmpfs"; } 
    1252     if( settings->check("usecache") ){  
    1253       cmd += " --pkgdir " + settings->value("cachedir"); 
    1254       //Remove known "bad" packages (ones that routinely cause failures) 
    1255       QDir cDir( settings->value("cachedir") ); 
    1256       QStringList filters = settings->list("skippkgs"); 
    1257       if(!filters.isEmpty()){ 
    1258         QStringList badFiles = cDir.entryList(filters, QDir::Files | QDir:: NoDotAndDotDot); 
    1259         for(int i=0; i<badFiles.length(); i++){ cDir.remove(badFiles[i]); } 
    1260       } 
    1261     } 
    1262     if( settings->check("usesignature") && QFile::exists(settings->value("sigfile")) ){ cmd += " --sign " + settings->value("sigfile"); } 
    1263   */ 
    12641238  //Display the command created in hte terminal 
    12651239  qDebug() << "Build PBI command created:"<<cmd; 
     
    12831257  ui->push_build_stop->setEnabled(TRUE); 
    12841258  ui->push_build_save->setEnabled(FALSE); 
    1285   //ui->check_build_32->setEnabled(FALSE); 
    12861259  ui->push_build_start->setEnabled(FALSE); //disable the button so they do not start more than 1 build at a time 
    12871260  ui->text_build_log->clear(); //clear the display in case this is not the first run 
     
    13021275  //Start the Process 
    13031276  qDebug() << "Starting the PBI build process..."; 
    1304   //ui->toolBox->setItemText(0,tr("PBI Builder (Working)")); 
     1277  ui->tabWidget->setTabText(0,tr("Build PBI (Running)")); 
    13051278  p->start(cmd); 
    13061279} 
     
    13611334  ui->push_build_save->setEnabled(TRUE); 
    13621335  ui->push_build_stop->setEnabled(FALSE); 
    1363   //ui->check_build_32->setEnabled(TRUE); 
    13641336  p->close(); 
    13651337  PBI_BUILDING_NOW.clear(); 
    13661338  PBI_BUILD_TERMINATED=FALSE; 
    1367   //ui->toolBox->setItemText(0,tr("PBI Builder (Finished)")); 
     1339  ui->tabWidget->setTabText(0,tr("Build PBI (Done)")); 
    13681340  delete p; 
    13691341} 
Note: See TracChangeset for help on using the changeset viewer.