Changeset 0d4dda3e


Ignore:
Timestamp:
03/07/14 11:34:44 (6 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
0568342
Parents:
31831cc
Message:

Add new options to the pc-mixer GUI:
Links to run pc-soundconfig, pavucontrol, paprefs.
Also add some icons.

Location:
src-qt4/pc-mixer
Files:
3 added
8 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mixer/DeviceWidget.cpp

    r0c784d0 r0d4dda3e  
    5353  if(islinked){ 
    5454    ui->tool_chain->setIcon(QIcon(":icons/link.png")); 
     55    ui->tool_chain->setAutoRaise(false); 
    5556  }else{ 
    5657    ui->tool_chain->setIcon(QIcon(":icons/link_break.png")); 
     58    ui->tool_chain->setAutoRaise(true); 
    5759  } 
    5860  if(ismuted){ 
  • src-qt4/pc-mixer/DeviceWidget.ui

    r0c784d0 r0d4dda3e  
    9999              <normaloff>:/icons/link.png</normaloff>:/icons/link.png</iconset> 
    100100            </property> 
     101            <property name="autoRaise"> 
     102             <bool>false</bool> 
     103            </property> 
    101104           </widget> 
    102105          </item> 
  • src-qt4/pc-mixer/MixerGUI.cpp

    r0c784d0 r0d4dda3e  
    99  connect(ui->actionClose_Mixer, SIGNAL(triggered()), this, SLOT(hideGUI()) ); 
    1010  connect(ui->actionClose_Mixer_and_Tray, SIGNAL(triggered()), this, SLOT(closeApplication()) ); 
     11  connect(ui->menuConfiguration, SIGNAL(triggered(QAction*)), this, SLOT(startExternalApp(QAction*)) ); 
    1112} 
    1213 
  • src-qt4/pc-mixer/MixerGUI.h

    r0c784d0 r0d4dda3e  
    88#include <QHBoxLayout> 
    99#include <QScrollBar> 
     10#include <QProcess> 
     11#include <QAction> 
    1012 
    1113#include "DeviceWidget.h" 
     
    3840        } 
    3941         
     42        void startExternalApp(QAction *act){ 
     43          QProcess::startDetached(act->whatsThis()); 
     44        } 
     45         
    4046        void changeDefaultTrayDevice(QString device); 
    4147        void itemChanged(QString device); //for individual device adjustments  
  • src-qt4/pc-mixer/MixerGUI.ui

    r0c784d0 r0d4dda3e  
    7272    <addaction name="actionClose_Mixer_and_Tray"/> 
    7373   </widget> 
     74   <widget class="QMenu" name="menuConfiguration"> 
     75    <property name="title"> 
     76     <string>Configuration</string> 
     77    </property> 
     78    <addaction name="action_Change_Audio_Device"/> 
     79    <addaction name="separator"/> 
     80    <addaction name="action_PulseAudio_Mixer"/> 
     81    <addaction name="actionPulseAudio_Settings"/> 
     82   </widget> 
    7483   <addaction name="menuFile"/> 
     84   <addaction name="menuConfiguration"/> 
    7585  </widget> 
    7686  <widget class="QStatusBar" name="statusbar"/> 
     
    93103   </property> 
    94104  </action> 
     105  <action name="action_Change_Audio_Device"> 
     106   <property name="icon"> 
     107    <iconset resource="pc-mixer.qrc"> 
     108     <normaloff>:/icons/audio-card.png</normaloff>:/icons/audio-card.png</iconset> 
     109   </property> 
     110   <property name="text"> 
     111    <string>&amp;Change Audio Device</string> 
     112   </property> 
     113   <property name="whatsThis"> 
     114    <string>pc-su pc-soundconfig</string> 
     115   </property> 
     116  </action> 
     117  <action name="action_PulseAudio_Mixer"> 
     118   <property name="icon"> 
     119    <iconset resource="pc-mixer.qrc"> 
     120     <normaloff>:/icons/pulseaudio.png</normaloff>:/icons/pulseaudio.png</iconset> 
     121   </property> 
     122   <property name="text"> 
     123    <string>&amp;PulseAudio Mixer</string> 
     124   </property> 
     125   <property name="whatsThis"> 
     126    <string>pavucontrol</string> 
     127   </property> 
     128  </action> 
     129  <action name="actionPulseAudio_Settings"> 
     130   <property name="icon"> 
     131    <iconset resource="pc-mixer.qrc"> 
     132     <normaloff>:/icons/pulseaudio-config.png</normaloff>:/icons/pulseaudio-config.png</iconset> 
     133   </property> 
     134   <property name="text"> 
     135    <string>PulseAudio &amp;Settings</string> 
     136   </property> 
     137   <property name="whatsThis"> 
     138    <string>paprefs</string> 
     139   </property> 
     140  </action> 
    95141 </widget> 
    96142 <resources> 
  • src-qt4/pc-mixer/pc-mixer.qrc

    r0c784d0 r0d4dda3e  
    11<RCC> 
    22  <qresource> 
     3    <file>icons/audio-card.png</file> 
     4    <file>icons/pulseaudio-config.png</file> 
     5    <file>icons/pulseaudio.png</file> 
    36    <file>icons/window-close.png</file> 
    47    <file>icons/application-exit.png</file> 
Note: See TracChangeset for help on using the changeset viewer.