Changeset 3a00741


Ignore:
Timestamp:
03/05/14 10:02:51 (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
4f9718b
Parents:
ad36b59 (diff), 68b1db6 (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 added
2 edited

Legend:

Unmodified
Added
Removed
  • 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{ 
  • src-qt4/port-files/pkg-plist

    rd429f4f r2761d27  
    5252share/pcbsd/xstartup/life-preserver.sh 
    5353share/pcbsd/xstartup/screensaver.sh 
     54share/pcbsd/xstartup/startpulseaudio.sh 
    5455share/pcbsd/xstartup/vkeyboard.sh 
    5556share/pcbsd/xstartup/setmix.sh 
Note: See TracChangeset for help on using the changeset viewer.