Changeset 6310240


Ignore:
Timestamp:
Feb 5, 2014 12:16:42 PM (2 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1
Children:
e1112df3
Parents:
ec61e8e (diff), 629cb4ce (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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbi-manager

    r3eb788d r4c008ce  
    70537053                        continue 
    70547054                fi 
     7055                touch ${PBI_STAGEDIRMNT}/${PBI_INS_GROUPSFILE} 
    70557056                grep -q "^$group:" ${PBI_STAGEDIRMNT}/${PBI_INS_GROUPSFILE} 
    70567057                if [ $? -ne 0 ] ; then 
     
    70747075                        continue 
    70757076                fi 
     7077                touch ${PBI_STAGEDIRMNT}/${PBI_INS_USERSFILE} 
    70767078                grep -q "^$user:" ${PBI_STAGEDIRMNT}/${PBI_INS_USERSFILE} 
    70777079                if [ $? -ne 0 ] ; then 
  • src-qt4/life-preserver/lp-gui/LPMain.cpp

    r862b615 rec61e8e  
    3030  connect(viewBasic, SIGNAL(toggled(bool)), this, SLOT(viewChanged()) ); 
    3131  //Now set the default view type 
    32   viewBasic->setChecked(true); //will automatically call the "viewChanged" function 
     32  settings = new QSettings(QSettings::UserScope, "PC-BSD", "Life-Preserver-GUI", this); 
     33  bool basicMode = settings->value("viewmode", true).toBool(); //basic by default 
     34  if(basicMode){ viewBasic->setChecked(true); } //will automatically call the "viewChanged" function 
     35  else{ viewAdvanced->setChecked(true); } //will automatically call the "viewChanged" function 
    3336  //Create the filesystem model and tie it to the treewidget 
    3437  fsModel = new QFileSystemModel(this); 
     
    144147    ui->combo_pools->addItem("No Managed Pools!"); 
    145148    ui->combo_pools->setCurrentIndex(0); 
     149    //Reset to Basic View 
     150    viewBasic->setChecked(true); 
    146151  } 
    147152  qDebug() << "[DEBUG] Update pool menu options"; 
     
    175180  ui->menuView->hide(); 
    176181  ui->menubar->clear(); 
     182  settings->setValue("viewmode", viewBasic->isChecked()); //save value for later 
    177183  if(viewBasic->isChecked()){ 
    178184    ui->menubar->addMenu(ui->menuFile); 
  • src-qt4/life-preserver/lp-gui/LPMain.h

    r862b615 rec61e8e  
    1616#include <QFileDialog> 
    1717#include <QFileSystemWatcher> 
     18#include <QSettings> 
    1819 
    1920#include "LPBackend.h" 
     
    4546        QFileSystemWatcher *watcher; 
    4647        QTimer *timer; 
     48        QSettings *settings; 
    4749 
    4850        void showErrorDialog(QString title, QString message, QString errors); 
Note: See TracChangeset for help on using the changeset viewer.