itdominator
/
pavucontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the kill menu item now we have a dedicated button

This commit is contained in:
Colin Guthrie 2009-03-16 20:31:45 +00:00
parent ee855937cc
commit 255defb371
4 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sinkinputwidget.cc
View File

@ -31,7 +31,6 @@
SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
StreamWidget(cobject, x), StreamWidget(cobject, x),
titleMenuItem(_("_Move Stream..."), true), titleMenuItem(_("_Move Stream..."), true),
killMenuItem(_("_Terminate Stream"), true),
mpMainWindow(NULL) { mpMainWindow(NULL) {
directionLabel->set_label(_("<i>Playing on </i> ")); directionLabel->set_label(_("<i>Playing on </i> "));
@ -40,9 +39,6 @@ SinkInputWidget::SinkInputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gno
menu.append(titleMenuItem); menu.append(titleMenuItem);
titleMenuItem.set_submenu(submenu); titleMenuItem.set_submenu(submenu);
menu.append(killMenuItem);
killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SinkInputWidget::onKill));
} }
void SinkInputWidget::init(MainWindow* mainWindow) { void SinkInputWidget::init(MainWindow* mainWindow) {

2
src/sinkinputwidget.h
View File

@ -45,7 +45,7 @@ public:
virtual void prepareMenu(); virtual void prepareMenu();
Gtk::Menu submenu; Gtk::Menu submenu;
Gtk::MenuItem titleMenuItem, killMenuItem; Gtk::MenuItem titleMenuItem;
struct SinkMenuItem { struct SinkMenuItem {
SinkMenuItem(SinkInputWidget *w, const char *label, uint32_t i, bool active) : SinkMenuItem(SinkInputWidget *w, const char *label, uint32_t i, bool active) :

4
src/sourceoutputwidget.cc
View File

@ -31,7 +31,6 @@
SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) : SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& x) :
StreamWidget(cobject, x), StreamWidget(cobject, x),
titleMenuItem(_("_Move Stream..."), true), titleMenuItem(_("_Move Stream..."), true),
killMenuItem(_("_Terminate Stream"), true),
mpMainWindow(NULL) { mpMainWindow(NULL) {
directionLabel->set_label(_("<i>Recording from </i> ")); directionLabel->set_label(_("<i>Recording from </i> "));
@ -40,9 +39,6 @@ SourceOutputWidget::SourceOutputWidget(BaseObjectType* cobject, const Glib::RefP
menu.append(titleMenuItem); menu.append(titleMenuItem);
titleMenuItem.set_submenu(submenu); titleMenuItem.set_submenu(submenu);
menu.append(killMenuItem);
killMenuItem.signal_activate().connect(sigc::mem_fun(*this, &SourceOutputWidget::onKill));
} }
void SourceOutputWidget::init(MainWindow* mainWindow) { void SourceOutputWidget::init(MainWindow* mainWindow) {

2
src/sourceoutputwidget.h
View File

@ -42,7 +42,7 @@ public:
virtual void onKill(); virtual void onKill();
Gtk::Menu submenu; Gtk::Menu submenu;
Gtk::MenuItem titleMenuItem, killMenuItem; Gtk::MenuItem titleMenuItem;
struct SourceMenuItem { struct SourceMenuItem {
SourceMenuItem(SourceOutputWidget *w, const char *label, uint32_t i, bool active) : SourceMenuItem(SourceOutputWidget *w, const char *label, uint32_t i, bool active) :