Changeset b71f93d


Ignore:
Timestamp:
11/14/13 10:18:38 (10 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
85ec342
Parents:
d9f2085 (diff), 029a2ba (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:
5 edited

Legend:

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

    r767280f r029a2ba  
    396396        if ( copyList.at(i).at(0) == workingDisk \ 
    397397          && copyList.at(i).at(1) == workingSlice \ 
    398           && (mounts.at(z) == startPart || mounts.at(z).contains(startPart + "(") ) ) { 
    399  
     398          && (mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) { 
    400399          // Check if we have any extra arguments to throw on the end 
    401400          XtraTmp=""; 
     
    413412            for (int ds = 0; ds < zDS.size(); ++ds) { 
    414413              //if ( zDS.at(ds) != "/" ) 
    415                // zDS.replace(ds, "/" + zDS.at(ds)); 
     414              // zDS.replace(ds, "/" + zDS.at(ds)); 
    416415              if ( zDS.at(ds).indexOf("(") != -1 ) { 
    417416                zTMP = zDS.at(ds); 
     
    590589        while (!in.atEnd()) { 
    591590           QString line = in.readLine(); 
    592            if ( line.indexOf('LoadModule: "nvidia"') != -1 ) { 
     591           if ( line.indexOf("NVIDIA") != -1 ) { 
    593592             selectedPkgs << "NVIDIA"; 
    594593             break; 
     
    11371136        if ( copyList.at(i).at(0) == workingDisk \ 
    11381137          && copyList.at(i).at(1) == workingSlice \ 
    1139           && mounts.at(z) == startPart ) { 
     1138          && ( mounts.at(z) == startPart || mounts.at(z).indexOf(startPart + "(") == 0 ) ) { 
    11401139 
    11411140          // Check if we have any extra arguments to throw on the end 
  • src-qt4/pc-softwaremanager/containers.h

    r74c359f rd9f2085  
    5454         
    5555  public: 
    56     QString name, category, remoteIcon, localIcon, author, website, license, appType, description; 
     56    QString name, category, remoteIcon, localIcon, author, website, license, appType, description, shortdescription,maintainer,dateadded; 
    5757    QStringList tags; 
    5858    QString latestVersion, latestDatetime, latestArch, latestSizeK, latestFilename; //newest version in the index 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r6763bdf rd9f2085  
    697697  apps.sort(); 
    698698  QVBoxLayout *applayout = new QVBoxLayout; 
    699   QStringList info; info << "name" << "description" << "icon"; 
     699  QStringList info; info << "name" << "shortdescription" << "icon"; 
    700700  for(int i=0; i<apps.length(); i++){ 
    701701    QStringList data = PBI->AppInfo(apps[i],info); 
  • src-qt4/pc-softwaremanager/pbiBackend.cpp

    rd44b108 rd9f2085  
    471471    else if(infoList[i]=="type"){ output << APPHASH[appID].appType; } 
    472472    else if(infoList[i]=="description"){ output << APPHASH[appID].description; } 
     473    else if(infoList[i]=="shortdescription"){ output << APPHASH[appID].shortdescription; } 
     474    else if(infoList[i]=="maintainer"){ output << APPHASH[appID].maintainer; } 
    473475    else if(infoList[i]=="category"){ output << APPHASH[appID].category; } 
    474476    else if(infoList[i]=="latestversion"){ output << APPHASH[appID].latestVersion; } 
     
    13181320         if(info[9]=="true"){ app.requiresroot=TRUE; } 
    13191321         else{ app.requiresroot=FALSE; } 
     1322         app.dateadded=info[10]; 
     1323         app.maintainer=info[11]; 
     1324         app.shortdescription=info[12]; 
    13201325         //Fix the website if needed 
    13211326         if(app.website.endsWith("/")){ app.website.chop(1); } 
  • src-qt4/pc-softwaremanager/pbiDBAccess.cpp

    r8bcbb15 rd9f2085  
    208208 
    209209QStringList PBIDBAccess::parseAppMetaLine(QString line){ 
    210   // line format 5/1/2013: [name,category,remoteIcon,author,website,license,apptype,tags,description,requiresroot] 
    211   QStringList output = line.split(";"); 
    212   if(output.length() < 10){ output.clear();} //invalid line 
    213   else if(output[9]=="YES"){ output[9]="true"; } //change to the same true/false syntax as elsewhere 
     210  // line format 11/14/2013 (10.x PBI format):  
     211  // [name,category,remoteIcon,author,website,license,apptype,tags,description,requiresroot,dateadded,maintainerEmail,shortDescription] 
     212  QStringList list = line.split(";"); 
     213  //Format the output list 
     214  QStringList output; 
     215  if(output.length() < 13){ return output;} //invalid line 
     216  output << list[0]; //NAME 
     217  output << list[1]; //CATEGORY 
     218  output << list[2]; //remoteIcon 
     219  output << list[3]; //AUTHOR 
     220  output << list[4]; //WEBSITE 
     221  output << list[5]; //LICENSE 
     222  output << list[6]; //APP-TYPE 
     223  output << list[7]; //TAGS 
     224  //Cleanup the description (try to format the text properly) 
     225  QStringList tmp = list[8].split("<br>"); 
     226  for(int i=1; i<tmp.length(); i++){ 
     227    tmp[i-1] = tmp[i-1].simplified(); 
     228    if(tmp[i=1].isEmpty() || tmp[i].isEmpty() ){continue;} 
     229    else if(tmp[i=1].endsWith(".") || tmp[i-1].endsWith(":") || tmp[i-1].endsWith(";") || tmp[i-1].endsWith("?") || tmp[i-1].endsWith("!") ){ continue; } 
     230    else if( tmp[i].startsWith("*") || tmp[i].startsWith("0") || tmp[i].startsWith("-") || tmp[i].startsWith("o ") ){ continue; } 
     231    else{ 
     232      //Bad line break, combine it with the previous line 
     233      tmp[i-1].append(" "+tmp[i]); 
     234      tmp.removeAt(i); 
     235      i--; 
     236    } 
     237  } 
     238  output << tmp.join("\n"); //DESCRIPTION 
     239  if(list[9]=="YES"){ list[9]="true"; } //change to the same true/false syntax as elsewhere 
     240  output << list[9]; //REQUIRESROOT 
     241  output << list[10]; //DATE ADDED (just a number - not human-readable) 
     242  output << list[11]; //MAINTAINER EMAIL 
     243  //Cleanup the short description (remove any line breaks) 
     244  tmp = list[12].split("<br>", QString::SkipEmptyParts); 
     245  list[12] = tmp.join(" ").simplified(); 
     246  output << list[12]; //SHORT DESCRIPTION 
    214247  return output; 
    215248} 
    216249 
    217250QStringList PBIDBAccess::parseCatMetaLine(QString line){ 
    218   // line format 5/1/2013: [name,remoteicon,description,?] 
     251  // line format 11/14/2013: [name,remoteicon,description] 
    219252  QStringList output = line.split(";"); 
    220253  if(output.length() < 3){output.clear(); } //incomplete line 
Note: See TracChangeset for help on using the changeset viewer.