Changeset 68b1db6


Ignore:
Timestamp:
03/05/14 09:44:59 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4f9718b, 29ca147
Parents:
f5ad808 (diff), 25ff000 (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:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-soundconfig/snddialog.cpp

    r1620346 r73f107f  
    7979  tmp.setNum(comboSound->currentIndex()); 
    8080  system("sysctl hw.snd.default_unit=" + tmp.toLatin1()); 
     81 
     82  // Try to set the default pulseaudio sink as well 
     83  QString username = QString::fromLocal8Bit(getenv("LOGNAME")); 
     84  system("su " + username.toLatin1() + " -c \"pactl set-default-sink " + tmp.toLatin1() + "\""); 
     85 
    8186  pcbsd::Utils::setConfFileValue( "/etc/sysctl.conf", "hw.snd.default_unit=", "hw.snd.default_unit=" + tmp ); 
    8287  refreshDevices(); 
  • src-qt4/xtrafiles/local/share/pcbsd/scripts/sound-dev-changed.sh

    r1620346 r25ff000  
    8282   sysctl hw.snd.default_unit=$mixerNum 
    8383 
     84   # Look for pulseaudio daemons to change audio sinks on 
     85   for user in `ps -auwwx | grep 'pulseaudio --start' | grep -v 'grep' | awk '{print $1}'` 
     86   do 
     87      su $user -c "pactl set-default-sink $mixerNum" 
     88   done 
     89 
    8490} 
    8591 
  • src-qt4/life-preserver/lp-gui/LPMain.cpp

    r65e10ad rf5ad808  
    240240    ui->combo_datasets->clear(); 
    241241    QStringList dslist = POOLDATA.subsets(); 
     242    dslist.sort(); 
     243    //Now move the home directories to the top of the list 
     244    int moved = 0; 
     245    for(int i=0; i<dslist.length(); i++){  //make sure it stays in alphabetical order 
     246      if(dslist[i].startsWith("/usr/home/")){ 
     247        dslist.move(i,moved); 
     248        moved++;  
     249        i--; //make sure to not miss any items from moving 
     250      } 
     251    } 
    242252    ui->combo_datasets->addItems(dslist); 
    243253    int dsin = dslist.indexOf(cds); 
     
    293303      ui->slider_snapshots->setMaximum(max); 
    294304      ui->slider_snapshots->setValue(max); //most recent snapshot 
     305      int interval = 1; //one tick per snapshot 
     306      if( max > 20 ){ interval = max / 20; } //show 20 ticks 
     307      ui->slider_snapshots->setTickInterval(interval); 
     308 
    295309      updateSnapshot(); 
    296310  }else{ 
Note: See TracChangeset for help on using the changeset viewer.