Changeset 24cce1d5


Ignore:
Timestamp:
08/27/13 12:59:07 (16 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, releng/10.1
Children:
dd95361
Parents:
b103b6c (diff), d27a0c6 (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-pkgmanager/mainWin.cpp

    r426313b r358972f  
    3939  connect(pushPkgApply, SIGNAL( clicked() ), this, SLOT( slotApplyClicked() ) ); 
    4040  connect(action_Quit, SIGNAL( triggered(bool) ), this, SLOT( slotCloseClicked() ) ); 
    41   connect(action_Basic, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    42   connect(action_Advanced, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    4341  connect(tool_search, SIGNAL( clicked() ), this, SLOT( slotSearchPackages() ) ); 
    4442 
     
    6462  { 
    6563     stackedPkgView->setCurrentIndex(1); 
     64     action_Basic->setChecked(false); 
     65     action_Basic->setEnabled(false); 
    6666     action_Advanced->setChecked(true); 
    67      menu_View->setEnabled(false); 
    68      menu_View->setVisible(false); 
     67     action_Advanced->setEnabled(false); 
     68  } else { 
     69    // Connect our view modes only when not running via in a chroot 
     70    connect(action_Basic, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
     71    connect(action_Advanced, SIGNAL( triggered(bool) ), this, SLOT( slotViewChanged() ) ); 
    6972  } 
    7073 
  • src-qt4/pc-mounttray/devCheck.cpp

    r03aedf0 rb103b6c  
    55DevCheck::DevCheck(){ 
    66  //Initialize the lists of valid device types 
    7   validDevs << "da" << "ad" << "mmcsd" << "cd" << "acd" << "md"; 
    8   validDevTypes << "USB" << "SATA" << "SD" << "CD9660" << "CD9660" << "ISO"; 
     7  validDevs << "da" << "ad" << "mmcsd" << "cd" << "acd" << "md" << "da"; 
     8  validDevTypes << "USB" << "SATA" << "SD" << "CD9660" << "CD9660" << "ISO" << "SCSI"; 
    99  for(int i=0; i<validDevs.length(); i++){ 
    1010    devFilter << validDevs[i]+"*"; 
     
    102102    } 
    103103  } 
    104    
     104  if(detType == "USB" && QFile::exists(fullDev)){ 
     105    //make sure that it is not a SCSI device 
     106    QString camctl = "camcontrol identify "+node; 
     107    camctl = pcbsd::Utils::runShellCommand( camctl ).join(" "); 
     108    if(camctl.contains(" SCSI ")){ detType = "SCSI"; } //USB devices do not have any output 
     109  } 
    105110  //Make sure we quit before running commands on any invalid device nodes 
    106111  if(detType.isEmpty() || !QFile::exists(fullDev) ){return FALSE;} 
     
    122127    if( !tmp.filter("partition ").isEmpty() ){ 
    123128      //Check for actual sub-devices (*s[#][a/b/c/....]) 
    124       if( devChildren(node).length() > 1 ){ hasPartitions = TRUE; } //the main device will always make it length 1 
     129      if( devChildren(node).length() > 0 ){ hasPartitions = TRUE; } 
    125130    } 
    126131    if( !tmp.filter("last mounted on /").isEmpty() && (detType == "SATA")){ 
  • src-qt4/pc-mounttray/menuItem.cpp

    r22f21be rb103b6c  
    4949  else if(devType == "CD9660"){ devIcon->setPixmap(QPixmap(":icons/dvd.png")); } 
    5050  else if(devType == "ISO"){devIcon->setPixmap(QPixmap(":icons/dvd.png")); } 
     51  else if(devType == "SCSI"){devIcon->setPixmap(QPixmap(":icons/harddrive.png")); } 
    5152  //Start the automount procedure if necessary 
    5253  if(checkAutomount->isChecked() || devType=="ISO"){ 
Note: See TracChangeset for help on using the changeset viewer.