Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Add new options to the pc-mixer GUI:
Browse files Browse the repository at this point in the history
Links to run pc-soundconfig, pavucontrol, paprefs.
Also add some icons.
  • Loading branch information
Ken Moore committed Mar 7, 2014
1 parent 31831cc commit 0d4dda3
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src-qt4/pc-mixer/DeviceWidget.cpp
Expand Up @@ -52,8 +52,10 @@ void DeviceWidget::updateButtons(){
//Update the button icons/text as necessary
if(islinked){
ui->tool_chain->setIcon(QIcon(":icons/link.png"));
ui->tool_chain->setAutoRaise(false);
}else{
ui->tool_chain->setIcon(QIcon(":icons/link_break.png"));
ui->tool_chain->setAutoRaise(true);
}
if(ismuted){
ui->push_mute->setIcon( QIcon(":icons/audio-volume-high.png") );
Expand Down
3 changes: 3 additions & 0 deletions src-qt4/pc-mixer/DeviceWidget.ui
Expand Up @@ -98,6 +98,9 @@
<iconset resource="pc-mixer.qrc">
<normaloff>:/icons/link.png</normaloff>:/icons/link.png</iconset>
</property>
<property name="autoRaise">
<bool>false</bool>
</property>
</widget>
</item>
<item>
Expand Down
1 change: 1 addition & 0 deletions src-qt4/pc-mixer/MixerGUI.cpp
Expand Up @@ -8,6 +8,7 @@ MixerGUI::MixerGUI(QSettings *set) : QMainWindow(), ui(new Ui::MixerGUI){
//connect the signals/slots
connect(ui->actionClose_Mixer, SIGNAL(triggered()), this, SLOT(hideGUI()) );
connect(ui->actionClose_Mixer_and_Tray, SIGNAL(triggered()), this, SLOT(closeApplication()) );
connect(ui->menuConfiguration, SIGNAL(triggered(QAction*)), this, SLOT(startExternalApp(QAction*)) );
}

MixerGUI::~MixerGUI(){
Expand Down
6 changes: 6 additions & 0 deletions src-qt4/pc-mixer/MixerGUI.h
Expand Up @@ -7,6 +7,8 @@
#include <QCoreApplication>
#include <QHBoxLayout>
#include <QScrollBar>
#include <QProcess>
#include <QAction>

#include "DeviceWidget.h"
#include "MixerBackend.h"
Expand Down Expand Up @@ -37,6 +39,10 @@ private slots:
this->close();
}

void startExternalApp(QAction *act){
QProcess::startDetached(act->whatsThis());
}

void changeDefaultTrayDevice(QString device);
void itemChanged(QString device); //for individual device adjustments

Expand Down
46 changes: 46 additions & 0 deletions src-qt4/pc-mixer/MixerGUI.ui
Expand Up @@ -71,7 +71,17 @@
<addaction name="separator"/>
<addaction name="actionClose_Mixer_and_Tray"/>
</widget>
<widget class="QMenu" name="menuConfiguration">
<property name="title">
<string>Configuration</string>
</property>
<addaction name="action_Change_Audio_Device"/>
<addaction name="separator"/>
<addaction name="action_PulseAudio_Mixer"/>
<addaction name="actionPulseAudio_Settings"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuConfiguration"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
<action name="actionClose_Mixer_and_Tray">
Expand All @@ -92,6 +102,42 @@
<string>Hide Mixer</string>
</property>
</action>
<action name="action_Change_Audio_Device">
<property name="icon">
<iconset resource="pc-mixer.qrc">
<normaloff>:/icons/audio-card.png</normaloff>:/icons/audio-card.png</iconset>
</property>
<property name="text">
<string>&amp;Change Audio Device</string>
</property>
<property name="whatsThis">
<string>pc-su pc-soundconfig</string>
</property>
</action>
<action name="action_PulseAudio_Mixer">
<property name="icon">
<iconset resource="pc-mixer.qrc">
<normaloff>:/icons/pulseaudio.png</normaloff>:/icons/pulseaudio.png</iconset>
</property>
<property name="text">
<string>&amp;PulseAudio Mixer</string>
</property>
<property name="whatsThis">
<string>pavucontrol</string>
</property>
</action>
<action name="actionPulseAudio_Settings">
<property name="icon">
<iconset resource="pc-mixer.qrc">
<normaloff>:/icons/pulseaudio-config.png</normaloff>:/icons/pulseaudio-config.png</iconset>
</property>
<property name="text">
<string>PulseAudio &amp;Settings</string>
</property>
<property name="whatsThis">
<string>paprefs</string>
</property>
</action>
</widget>
<resources>
<include location="pc-mixer.qrc"/>
Expand Down
Binary file added src-qt4/pc-mixer/icons/audio-card.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-qt4/pc-mixer/icons/link.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src-qt4/pc-mixer/icons/link_break.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src-qt4/pc-mixer/icons/pulseaudio-config.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src-qt4/pc-mixer/icons/pulseaudio.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src-qt4/pc-mixer/pc-mixer.qrc
@@ -1,5 +1,8 @@
<RCC>
<qresource>
<file>icons/audio-card.png</file>
<file>icons/pulseaudio-config.png</file>
<file>icons/pulseaudio.png</file>
<file>icons/window-close.png</file>
<file>icons/application-exit.png</file>
<file>icons/configure.png</file>
Expand Down

0 comments on commit 0d4dda3

Please sign in to comment.