summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp
index f82dc63..c153a78 100644
--- a/noncore/applets/volumeapplet2/volumeapplet.cpp
+++ b/noncore/applets/volumeapplet2/volumeapplet.cpp
@@ -51,13 +51,16 @@ using namespace Opie::Ui;
#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 );
+ _name->setFont( QFont( "Vera", 8 ) );
+ _volume = new QSlider( 0, 100, 10, mixer->volume( name ) & 0xff, QSlider::Vertical, this );
+ _volume->setTickmarks( QSlider::Both );
+ _volume->setTickInterval( 20 );
_mute = new OLedBox( green, this );
_mute->setFocusPolicy( QWidget::NoFocus );
_mute->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
_name->show();
_volume->show();
_mute->show();
@@ -71,12 +74,13 @@ 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 );
+ build();
}
void VolumeAppletControl::build()
{
OSoundSystem* sound = OSoundSystem::instance();
@@ -92,13 +96,13 @@ void VolumeAppletControl::build()
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 );
+ l->addWidget( new Channel( mixer, this, *it ), 0, x++, AlignCenter );
}
}
VolumeAppletControl::~VolumeAppletControl()
@@ -106,13 +110,12 @@ VolumeAppletControl::~VolumeAppletControl()
}
void VolumeAppletControl::showEvent( QShowEvent* e )
{
odebug << "showEvent" << oendl;
- build();
QWidget::showEvent( e );
}
void VolumeAppletControl::hideEvent( QHideEvent* e )
{
@@ -120,13 +123,13 @@ void VolumeAppletControl::hideEvent( QHideEvent* e )
QWidget::hideEvent( e );
}
QSize VolumeAppletControl::sizeHint() const
{
- return QFrame::sizeHint();
+ return QSize( 200, 200 ); //QFrame::sizeHint();
}
VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
:OTaskbarApplet( parent, name )
{