| -rw-r--r-- | noncore/applets/volumeapplet2/.cvsignore | 9 | ||||
| -rw-r--r-- | noncore/applets/volumeapplet2/config.in | 6 | ||||
| -rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.cpp | 170 | ||||
| -rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet.h | 103 | ||||
| -rw-r--r-- | noncore/applets/volumeapplet2/volumeapplet2.pro | 12 | ||||
| -rw-r--r-- | packages | 1 |
6 files changed, 301 insertions, 0 deletions
diff --git a/noncore/applets/volumeapplet2/.cvsignore b/noncore/applets/volumeapplet2/.cvsignore new file mode 100644 index 0000000..d704947 --- a/dev/null +++ b/noncore/applets/volumeapplet2/.cvsignore @@ -0,0 +1,9 @@ +*moc +*.~ +Makefile* +moc_* +opieobj +obj +moc_ +.moc +.obj diff --git a/noncore/applets/volumeapplet2/config.in b/noncore/applets/volumeapplet2/config.in new file mode 100644 index 0000000..e91969a --- a/dev/null +++ b/noncore/applets/volumeapplet2/config.in @@ -0,0 +1,6 @@ + config VOLUMEAPPLET2 + boolean "opie-volumeapplet2 (control mixer volume on-the-fly)" + default "n" + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2MM + comment "Volume applet needs a libqpe and libopie2 (core, ui, mm)" + depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2MM) diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp new file mode 100644 index 0000000..f82dc63 --- a/dev/null +++ b/noncore/applets/volumeapplet2/volumeapplet.cpp @@ -0,0 +1,170 @@ +/* + This file is part of the Opie Project + + =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> + .=l. + .>+-= + _;:, .> :=|. This program is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU Library General Public +.="- .-=="i, .._ License as published by the Free Software + - . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This program is distributed in the hope that + + . -:. = it will be useful, but WITHOUT ANY WARRANTY; + : .. .:, . . . without even the implied warranty of + =_ + =;=|` MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= = ; Library General Public License for more +++= -. .` .: details. + : = ...= . :.=- + -. .:....=;==+<; You should have received a copy of the GNU + -_. . . )=. = Library General Public License along with + -- :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + +*/ + +#include "volumeapplet.h" + +/* OPIE */ +#include <opie2/odebug.h> +#include <opie2/otaskbarapplet.h> +#include <opie2/osoundsystem.h> +#include <opie2/oledbox.h> +#include <qpe/applnk.h> +#include <qpe/resource.h> +using namespace Opie::Core; +using namespace Opie::MM; +using namespace Opie::Ui; + +/* QT */ +#include <qpainter.h> +#include <qlabel.h> +#include <qlayout.h> +#include <qslider.h> + +/* STD */ +#include <assert.h> + +Channel::Channel( OMixerInterface* mixer, QWidget* parent, const char* name ) + :QVBox( parent, name ) +{ + _name = new QLabel( name, this ); + _volume = new QSlider( 0, 100, 10, mixer->volume( name ), QSlider::Vertical, this ); + _mute = new OLedBox( green, this ); + _mute->setFocusPolicy( QWidget::NoFocus ); + _mute->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); + _name->show(); + _volume->show(); + _mute->show(); +} + + +Channel::~Channel() +{ +} + + +VolumeAppletControl::VolumeAppletControl( OTaskbarApplet* parent, const char* name ) + :QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), l(0) +{ + setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); + l = new QGridLayout( this ); +} + + +void VolumeAppletControl::build() +{ + OSoundSystem* sound = OSoundSystem::instance(); + OSoundSystem::CardIterator it = sound->iterator(); + + OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); + + QStringList channels = mixer->allChannels(); + + int x = 0; + int y = 0; + + for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) + { + odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl; + odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) + << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; + + l->addWidget( new Channel( mixer, this, *it ), x++, y ); + } + +} + + +VolumeAppletControl::~VolumeAppletControl() +{ +} + + +void VolumeAppletControl::showEvent( QShowEvent* e ) +{ + odebug << "showEvent" << oendl; + build(); + QWidget::showEvent( e ); +} + + +void VolumeAppletControl::hideEvent( QHideEvent* e ) +{ + odebug << "hideEvent" << oendl; + QWidget::hideEvent( e ); +} + + +QSize VolumeAppletControl::sizeHint() const +{ + return QFrame::sizeHint(); +} + + +VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) + :OTaskbarApplet( parent, name ) +{ + setFixedHeight( AppLnk::smallIconSize() ); + setFixedWidth( AppLnk::smallIconSize() ); + _pixmap.convertFromImage( Resource::loadImage( "volumeapplet/volume" ).smoothScale( height(), width() ) ); + _control = new VolumeAppletControl( this, "control" ); +} + + +VolumeApplet::~VolumeApplet() +{ +} + + +int VolumeApplet::position() +{ + return 4; +} + + +void VolumeApplet::paintEvent( QPaintEvent* ) +{ + QPainter p(this); + p.drawPixmap(0, 2, _pixmap ); +} + + +void VolumeApplet::mousePressEvent( QMouseEvent* ) +{ + if ( !_control->isVisible() ) + { + popup( _control ); + } + else + { + _control->hide(); + } +} + +EXPORT_OPIE_APPLET_v1( VolumeApplet ) diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h new file mode 100644 index 0000000..c1f1a3a --- a/dev/null +++ b/noncore/applets/volumeapplet2/volumeapplet.h @@ -0,0 +1,103 @@ +/* + This file is part of the Opie Project + + =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> + .=l. + .>+-= + _;:, .> :=|. This program is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU Library General Public +.="- .-=="i, .._ License as published by the Free Software + - . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This program is distributed in the hope that + + . -:. = it will be useful, but WITHOUT ANY WARRANTY; + : .. .:, . . . without even the implied warranty of + =_ + =;=|` MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= = ; Library General Public License for more +++= -. .` .: details. + : = ...= . :.=- + -. .:....=;==+<; You should have received a copy of the GNU + -_. . . )=. = Library General Public License along with + -- :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + +*/ + +#ifndef VOLUMEAPPLET_H +#define VOLUMEAPPLET_H + +#include <opie2/otaskbarapplet.h> +#include <qframe.h> +#include <qstring.h> +#include <qvbox.h> +#include <qpixmap.h> + +namespace Opie +{ + namespace Ui { class OLedBox; } + namespace MM { class OMixerInterface; } +} +class QLabel; +class QSlider; +class QShowEvent; +class QHideEvent; +class QGridLayout; + +class Channel : public QVBox +{ + public: + Channel( Opie::MM::OMixerInterface* mixer, QWidget* parent, const char* name ); + virtual ~Channel(); + + // public slots: + // virtual void clicked(); + + private: + QLabel* _name; + QSlider* _volume; + Opie::Ui::OLedBox* _mute; + Opie::MM::OMixerInterface* _mixer; +}; + +class VolumeAppletControl : public QFrame +{ + public: + VolumeAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); + ~VolumeAppletControl(); + + virtual QSize sizeHint() const; + + protected: + virtual void showEvent( QShowEvent* ); + virtual void hideEvent( QHideEvent* ); + void build(); + + private: + QGridLayout* l; + +}; + + +class VolumeApplet : public Opie::Ui::OTaskbarApplet +{ + public: + VolumeApplet( QWidget* parent = 0, const char* name = 0 ); + ~VolumeApplet(); + + static int position(); + protected: + virtual void paintEvent( QPaintEvent* ); + virtual void mousePressEvent( QMouseEvent* ); + + private: + VolumeAppletControl* _control; + QPixmap _pixmap; +}; + +#endif + diff --git a/noncore/applets/volumeapplet2/volumeapplet2.pro b/noncore/applets/volumeapplet2/volumeapplet2.pro new file mode 100644 index 0000000..9a4eb3b --- a/dev/null +++ b/noncore/applets/volumeapplet2/volumeapplet2.pro @@ -0,0 +1,12 @@ +TEMPLATE = lib +CONFIG += qt plugin warn_on +HEADERS = volumeapplet.h +SOURCES = volumeapplet.cpp +TARGET = volumeapplet2 +DESTDIR = $(OPIEDIR)/plugins/applets +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -lqpe -lopiecore2 -lopieui2 -lopiemm2 +VERSION = 0.1.0 + +include( $(OPIEDIR)/include.pro ) @@ -136,108 +136,109 @@ CONFIG_NS2PROFILE noncore/settings/networksettings2/profile profile.pro CONFIG_NS2USB noncore/settings/networksettings2/usb usb.pro CONFIG_NS2VPN noncore/settings/networksettings2/vpn vpn.pro CONFIG_NS2WLAN noncore/settings/networksettings2/wlan wlan.pro CONFIG_OAPP core/apps/oapp oapp.pro CONFIG_OBEX core/obex obex.pro CONFIG_ODICT noncore/apps/odict odict.pro CONFIG_OIPKG noncore/unsupported/oipkg oipkg.pro CONFIG_OPIEALARM core/opiealarm opiealarm.pro CONFIG_OPIE-CONSOLE noncore/apps/opie-console opie-console.pro CONFIG_OPIE_EYE noncore/graphics/opie-eye phunk_view.pro CONFIG_OPIE_EYE_SLAVE noncore/graphics/opie-eye/slave slave.pro CONFIG_OPIEFTP noncore/net/opieftp opieftp.pro CONFIG_OPIEIRC noncore/net/opieirc opieirc.pro CONFIG_OPIE-LOGIN core/opie-login opie-login.pro CONFIG_OPIEMAIL2 noncore/unsupported/mail2 mail.pro CONFIG_OPIEPLAYER2 noncore/multimedia/opieplayer2 opieplayer2.pro CONFIG_OPIEPLAYER core/multimedia/opieplayer opieplayer.pro CONFIG_OPIE-RDESKTOP noncore/net/opierdesktop opierdesktop.pro CONFIG_OPIE-READER noncore/apps/opie-reader opie-reader.pro CONFIG_OPIEREC noncore/multimedia/opierec opierec.pro CONFIG_OPIE-SHEET noncore/apps/opie-sheet opie-sheet.pro CONFIG_OPIE-SH noncore/tools/opie-sh opie-sh.pro CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/applet applet.pro CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/manager manager.pro CONFIG_OPIE-WRITE noncore/apps/opie-write opie-write.pro CONFIG_OSEARCH core/pim/osearch osearch.pro CONFIG_OXYGEN noncore/apps/oxygen oxygen.pro CONFIG_PACKAGEMANAGER noncore/settings/packagemanager packagemanager.pro CONFIG_PARASHOOT noncore/games/parashoot parashoot.pro CONFIG_PHASE noncore/styles/phase phase.pro CONFIG_PICKBOARD inputmethods/pickboard pickboard.pro CONFIG_PIMCONVERTER noncore/tools/pimconverter converter.pro CONFIG_POWERCHORD noncore/multimedia/powerchord powerchord.pro CONFIG_PPP noncore/settings/networksettings/ppp ppp.pro CONFIG_PYQUICKLAUNCH-APPLET noncore/applets/pyquicklaunch pyquicklaunch.pro CONFIG_PYQUICKLAUNCHER noncore/tools/pyquicklauncher pyquicklauncher.pro CONFIG_PYTHON-EXAMPLES examples/python bla.pro CONFIG_QASHMONEY noncore/unsupported/qashmoney qashmoney.pro CONFIG_QASTEROIDS noncore/games/qasteroids qasteroids.pro CONFIG_QCOP core/apps/qcop qcop.pro CONFIG_QPDF noncore/unsupported/qpdf qpdf.pro CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro CONFIG_QWS core/qws qws.pro CONFIG_REMOTE noncore/tools/remote remote.pro CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro CONFIG_RESTARTAPPLET core/applets/restartapplet restartapplet.pro CONFIG_ROTATEAPPLET core/applets/rotateapplet rotateapplet.pro CONFIG_ROTATION noncore/settings/rotation rotation.pro CONFIG_RUNAPPLET core/applets/runapplet runapplet.pro CONFIG_SCREENSHOTAPPLET core/applets/screenshotapplet screenshotapplet.pro CONFIG_SECURITY core/settings/security security.pro CONFIG_MULTIAUTH_DEMO core/settings/security/demo multiauth.pro CONFIG_SFCAVE noncore/games/sfcave sfcave.pro CONFIG_SFCAVE-SDL noncore/games/sfcave-sdl sfcave-sdl.pro CONFIG_SHOWIMG noncore/multimedia/showimg showimg.pro CONFIG_SIMPLE_EXAMPLE examples/simple example.pro CONFIG_SIMPLE_ICON examples/simple-icon example.pro CONFIG_SIMPLE_MAIN examples/simple-main example.pro CONFIG_SIMPLE noncore/tools/calc2/simple simple.pro CONFIG_SIMPLE_PIM examples/simple-pim example.pro CONFIG_SINGLE single single.pro CONFIG_SNAKE noncore/games/snake snake.pro CONFIG_SOLITAIRE noncore/games/solitaire solitaire.pro CONFIG_SOUND noncore/settings/sound sound.pro CONFIG_SSHKEYS noncore/settings/sshkeys sshkeys.pro CONFIG_SUSPENDAPPLET core/applets/suspendapplet suspendapplet.pro CONFIG_SYMLINKER core/symlinker symlinker.pro CONFIG_SYSINFO noncore/settings/sysinfo sysinfo.pro CONFIG_TABLEVIEWER noncore/apps/tableviewer tableviewer.pro CONFIG_TABMANAGER noncore/settings/tabmanager tabmanager.pro CONFIG_TABOAPP core/apps/taboapp taboapp.pro CONFIG_TEST libsql/test test.pro CONFIG_TEST noncore/apps/opie-console/test test.pro CONFIG_TETRIX noncore/games/tetrix tetrix.pro CONFIG_TEXTEDIT core/apps/textedit textedit.pro CONFIG_THEME noncore/styles/theme theme.pro CONFIG_TICTAC noncore/games/tictac tictac.pro CONFIG_TINYKATE noncore/apps/tinykate tinykate.pro CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro CONFIG_TODAY core/pim/today today.pro CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebook datebook.pro CONFIG_TODAY_EXAMPLE examples/todayplugin example.pro CONFIG_TODAY_FORTUNE noncore/todayplugins/fortune fortune.pro CONFIG_TODAY_MAIL core/pim/today/plugins/mail mail.pro CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlib stocktickerlib.pro CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stockticker stockticker.pro CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolist todolist.pro CONFIG_TODAY_WEATHER noncore/todayplugins/weather weather.pro CONFIG_TODO core/pim/todo todo.pro CONFIG_TONLEITER noncore/multimedia/tonleiter tonleiter.pro CONFIG_TRACKER noncore/multimedia/tracker tracker.pro CONFIG_UBROWSER noncore/unsupported/ubrowser ubrowser.pro CONFIG_UNIKEYBOARD inputmethods/unikeyboard unikeyboard.pro CONFIG_USERMANAGER noncore/settings/usermanager usermanager.pro CONFIG_VMEMO core/applets/vmemo vmemo.pro CONFIG_VOLUMEAPPLET core/applets/volumeapplet volumeapplet.pro +CONFIG_VOLUMEAPPLET2 noncore/applets/volumeapplet2 volumeapplet2.pro CONFIG_VTAPPLET core/applets/vtapplet vtapplet.pro CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavplugin wavplugin.pro CONFIG_WEBSTYLE noncore/styles/web web.pro CONFIG_WELLENREITER noncore/net/wellenreiter wellenreiter.pro CONFIG_WIRELESSAPPLET noncore/applets/wirelessapplet wirelessapplet.pro CONFIG_WLAN noncore/settings/networksettings/wlan wlan.pro CONFIG_WORDGAME noncore/games/wordgame wordgame.pro CONFIG_YATZEE noncore/games/oyatzee oyatzee.pro CONFIG_ZKBAPPLET noncore/applets/zkbapplet zkbapplet.pro CONFIG_ZLINES noncore/games/zlines zlines.pro CONFIG_ZSAFE noncore/apps/zsafe zsafe.pro CONFIG_ZSAME noncore/games/zsame zsame.pro |