summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show 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;
51#include <assert.h> 51#include <assert.h>
52 52
53Channel::Channel( OMixerInterface* mixer, QWidget* parent, const char* name ) 53Channel::Channel( OMixerInterface* mixer, QWidget* parent, const char* name )
54 :QVBox( parent, name ) 54 :QVBox( parent, name )
55{ 55{
56 _name = new QLabel( name, this ); 56 _name = new QLabel( name, this );
57 _volume = new QSlider( 0, 100, 10, mixer->volume( name ), QSlider::Vertical, this ); 57 _name->setFont( QFont( "Vera", 8 ) );
58 _volume = new QSlider( 0, 100, 10, mixer->volume( name ) & 0xff, QSlider::Vertical, this );
59 _volume->setTickmarks( QSlider::Both );
60 _volume->setTickInterval( 20 );
58 _mute = new OLedBox( green, this ); 61 _mute = new OLedBox( green, this );
59 _mute->setFocusPolicy( QWidget::NoFocus ); 62 _mute->setFocusPolicy( QWidget::NoFocus );
60 _mute->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); 63 _mute->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
61 _name->show(); 64 _name->show();
62 _volume->show(); 65 _volume->show();
63 _mute->show(); 66 _mute->show();
@@ -71,12 +74,13 @@ Channel::~Channel()
71 74
72VolumeAppletControl::VolumeAppletControl( OTaskbarApplet* parent, const char* name ) 75VolumeAppletControl::VolumeAppletControl( OTaskbarApplet* parent, const char* name )
73 :QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), l(0) 76 :QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), l(0)
74{ 77{
75 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 78 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
76 l = new QGridLayout( this ); 79 l = new QGridLayout( this );
80 build();
77} 81}
78 82
79 83
80void VolumeAppletControl::build() 84void VolumeAppletControl::build()
81{ 85{
82 OSoundSystem* sound = OSoundSystem::instance(); 86 OSoundSystem* sound = OSoundSystem::instance();
@@ -92,13 +96,13 @@ void VolumeAppletControl::build()
92 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) 96 for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it )
93 { 97 {
94 odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl; 98 odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl;
95 odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) 99 odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff )
96 << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; 100 << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl;
97 101
98 l->addWidget( new Channel( mixer, this, *it ), x++, y ); 102 l->addWidget( new Channel( mixer, this, *it ), 0, x++, AlignCenter );
99 } 103 }
100 104
101} 105}
102 106
103 107
104VolumeAppletControl::~VolumeAppletControl() 108VolumeAppletControl::~VolumeAppletControl()
@@ -106,13 +110,12 @@ VolumeAppletControl::~VolumeAppletControl()
106} 110}
107 111
108 112
109void VolumeAppletControl::showEvent( QShowEvent* e ) 113void VolumeAppletControl::showEvent( QShowEvent* e )
110{ 114{
111 odebug << "showEvent" << oendl; 115 odebug << "showEvent" << oendl;
112 build();
113 QWidget::showEvent( e ); 116 QWidget::showEvent( e );
114} 117}
115 118
116 119
117void VolumeAppletControl::hideEvent( QHideEvent* e ) 120void VolumeAppletControl::hideEvent( QHideEvent* e )
118{ 121{
@@ -120,13 +123,13 @@ void VolumeAppletControl::hideEvent( QHideEvent* e )
120 QWidget::hideEvent( e ); 123 QWidget::hideEvent( e );
121} 124}
122 125
123 126
124QSize VolumeAppletControl::sizeHint() const 127QSize VolumeAppletControl::sizeHint() const
125{ 128{
126 return QFrame::sizeHint(); 129 return QSize( 200, 200 ); //QFrame::sizeHint();
127} 130}
128 131
129 132
130VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) 133VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
131 :OTaskbarApplet( parent, name ) 134 :OTaskbarApplet( parent, name )
132{ 135{