Changeset 89af8b5


Ignore:
Timestamp:
08/25/14 09:58:05 (4 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.3, releng/10.1
Children:
9ba02b00
Parents:
5f61d1e (diff), ab6074c (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:
5 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-installdialog/pc-installdialog.sh

    r0da2b92 rab6074c  
    88# Source our functions 
    99. /usr/local/share/pcbsd/scripts/functions.sh 
    10 . /root/functions.sh 
     10 
    1111 
    1212# Dialog menu title 
     
    368368get_sys_type() 
    369369{ 
     370  unset SYSTYPE 
     371 
    370372  # Determine if sys-type is TrueOS or PC-BSD 
    371373  if [ -e /usr/local/bin/startx ] ; then 
     
    375377    SYSTYPE="server" 
    376378  fi 
    377     if [ -z "$ANS" ] ; then 
     379  if [ -z "$SYSTYPE" ] ; then 
    378380     exit_err "Invalid system type" 
    379381  fi 
  • src-qt4/pc-mixer/MixerGUI.cpp

    r0d4dda3e r5f61d1e  
    2828  QHBoxLayout *layout = new QHBoxLayout; 
    2929  //Now Fill the UI with the devices 
    30   QString cdefault = settings->value("tray-device", "vol").toString(); 
     30  QString cdefault ="none"; 
     31  if(settings!=0){cdefault = settings->value("tray-device", "vol").toString(); } 
    3132  for(int i=0; i<devList.length(); i++){ 
    3233    //Get the individual pieces 
     
    5253  //re-connect combobox signal 
    5354  connect(ui->combo_default, SIGNAL(currentIndexChanged(QString)), this, SLOT(changeDefaultTrayDevice(QString)) ); 
     55  ui->group_tray->setVisible(settings!=0); 
     56  ui->actionClose_Mixer_and_Tray->setVisible(settings!=0); 
    5457} 
    5558 
    5659void MixerGUI::changeDefaultTrayDevice(QString device){ 
    57   settings->setValue("tray-device", device); 
     60  if(settings!=0){ settings->setValue("tray-device", device); } 
    5861  emit updateTray(); 
    5962} 
  • src-qt4/pc-mixer/MixerGUI.h

    r0d4dda3e r5f61d1e  
    2121        Q_OBJECT 
    2222public: 
    23         MixerGUI(QSettings*); 
     23        MixerGUI(QSettings* set = 0); 
    2424        ~MixerGUI(); 
    2525 
     
    3333private slots: 
    3434        void hideGUI(){ 
    35           this->hide(); 
     35          if(settings==0){ this->close(); } //no tray 
     36          else{ this->hide(); } //tray 
    3637        } 
    3738        void closeApplication(){ 
     
    4748        void itemChanged(QString device); //for individual device adjustments  
    4849 
     50        void slotSingleInstance(){ 
     51          updateGUI(); 
     52          this->show(); 
     53        } 
    4954protected: 
    5055        void closeEvent(QCloseEvent *event){ 
    51           if(!closing){ 
     56          if(!closing && settings!=0){ 
     57            //tray running - just hide it 
    5258            event->ignore(); 
    5359            hideGUI(); 
  • src-qt4/pc-mixer/MixerGUI.ui

    r0568342 r5f61d1e  
    1717   <layout class="QVBoxLayout" name="verticalLayout"> 
    1818    <item> 
    19      <layout class="QFormLayout" name="formLayout"> 
    20       <item row="0" column="0"> 
    21        <widget class="QLabel" name="label"> 
    22         <property name="font"> 
    23          <font> 
    24           <weight>75</weight> 
    25           <bold>true</bold> 
    26          </font> 
    27         </property> 
    28         <property name="text"> 
    29          <string>Default Tray Device:</string> 
    30         </property> 
    31        </widget> 
    32       </item> 
    33       <item row="0" column="1"> 
    34        <widget class="QComboBox" name="combo_default"/> 
    35       </item> 
    36      </layout> 
     19     <widget class="QGroupBox" name="group_tray"> 
     20      <property name="title"> 
     21       <string/> 
     22      </property> 
     23      <property name="flat"> 
     24       <bool>true</bool> 
     25      </property> 
     26      <layout class="QFormLayout" name="formLayout"> 
     27       <property name="margin"> 
     28        <number>0</number> 
     29       </property> 
     30       <item row="0" column="0"> 
     31        <widget class="QLabel" name="label"> 
     32         <property name="font"> 
     33          <font> 
     34           <weight>75</weight> 
     35           <bold>true</bold> 
     36          </font> 
     37         </property> 
     38         <property name="text"> 
     39          <string>Default Tray Device:</string> 
     40         </property> 
     41        </widget> 
     42       </item> 
     43       <item row="0" column="1"> 
     44        <widget class="QComboBox" name="combo_default"/> 
     45       </item> 
     46      </layout> 
     47     </widget> 
    3748    </item> 
    3849    <item> 
     
    4758         <y>0</y> 
    4859         <width>383</width> 
    49          <height>209</height> 
     60         <height>207</height> 
    5061        </rect> 
    5162       </property> 
  • src-qt4/pc-mixer/main.cpp

    rcaf88c8 r5f61d1e  
    88 
    99#include "MixerTray.h" 
     10#include "MixerGUI.h" 
     11 
    1012//#include "../config.h" 
    1113 
     
    3537    qDebug() << "Locale:" << langCode; 
    3638 
    37     MixerTray *w = new MixerTray();  
    38     w->show(); 
    39  
    40     QObject::connect( &a, SIGNAL( messageReceived(const QString &) ), w, SLOT( slotSingleInstance() ) ); 
     39    if(argc>1 && QString(argv[1])=="-notray"){ 
     40      //Start up the GUI (no system tray mode) 
     41      MixerGUI *w = new MixerGUI(); 
     42      w->updateGUI(); 
     43      w->show(); 
     44      QObject::connect( &a, SIGNAL( messageReceived(const QString &) ), w, SLOT( slotSingleInstance() ) ); 
     45    }else{ 
     46      //Start up the tray 
     47      MixerTray *w = new MixerTray();  
     48      w->show(); 
     49      QObject::connect( &a, SIGNAL( messageReceived(const QString &) ), w, SLOT( slotSingleInstance() ) ); 
     50    } 
     51     
    4152    int ret = a.exec(); 
    4253    return ret; 
Note: See TracChangeset for help on using the changeset viewer.