From 546c4ec72435c25b5cd0bf927e98c08ec2c072ac Mon Sep 17 00:00:00 2001 From: deva Date: Sun, 30 Oct 2005 15:46:14 +0000 Subject: *** empty log message *** --- ChangeLog | 1 + pixmaps/Makefile.am | 9 ++++++--- pixmaps/mute.png | Bin 0 -> 34479 bytes pixmaps/unmute.png | Bin 0 -> 25026 bytes src/mainwindow.cc | 6 +++--- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 pixmaps/mute.png create mode 100644 pixmaps/unmute.png diff --git a/ChangeLog b/ChangeLog index e71c86a..78cb714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ New Features: - Mute/Unmute button added to the gui. - When muted, the audio signal is overwritten with a lowvolume 440Hz signal. - The number of thumbnails shown are now calculated (no longer fixed to 3) + - Added the mplex2 library as a dependency to the server. Bug Fixes: - Font size of name label adjusted in mainwindow. diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index ff276cc..eaadad6 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -14,7 +14,9 @@ EXTRA_DIST = \ info.png \ error.png \ question.png \ - backspace.png + backspace.png \ + unmute.png \ + mute.png pixmapdir = $(datadir)/pixmaps @@ -34,5 +36,6 @@ pixmap_DATA = \ info.png \ error.png \ question.png \ - backspace.png - + backspace.png \ + unmute.png \ + mute.png diff --git a/pixmaps/mute.png b/pixmaps/mute.png new file mode 100644 index 0000000..c18a0bd Binary files /dev/null and b/pixmaps/mute.png differ diff --git a/pixmaps/unmute.png b/pixmaps/unmute.png new file mode 100644 index 0000000..620a7bf Binary files /dev/null and b/pixmaps/unmute.png differ diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 9ea5285..279fab6 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -255,7 +255,7 @@ void MainWindow::createGui() g1->addWidget(btn_freeze, 3, 2); btn_mute = createButton(""); - btn_mute->setPixmap(*img_mute); + btn_mute->setPixmap(*img_unmute); QObject::connect( btn_mute, SIGNAL(clicked()), this, SLOT(mute_clicked()) ); g1->addWidget(btn_mute, 3, 3); @@ -557,8 +557,8 @@ void MainWindow::freeze_clicked() void MainWindow::mute_clicked() { muted = !muted; - if(muted) btn_mute->setPixmap(*img_unmute); - else btn_mute->setPixmap(*img_mute); + if(muted) btn_mute->setPixmap(*img_mute); + else btn_mute->setPixmap(*img_unmute); camera->setMute(muted); } -- cgit v1.2.3