summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-16 17:22:40 (UTC)
committer llornkcor <llornkcor>2002-06-16 17:22:40 (UTC)
commit0a92e4f6ac0f3f288dbd0b83489366eb0760975a (patch) (unidiff)
tree6487150faec5f13472606dfcd98fd58bcdb151a8
parentf63c4f952daeeda9787b8b700a9d50f20cdff88c (diff)
downloadopie-0a92e4f6ac0f3f288dbd0b83489366eb0760975a.zip
opie-0a92e4f6ac0f3f288dbd0b83489366eb0760975a.tar.gz
opie-0a92e4f6ac0f3f288dbd0b83489366eb0760975a.tar.bz2
default is now moot.. err rather mute d
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/volumeapplet/volume.cpp1
-rw-r--r--core/applets/volumeapplet/volumeappletimpl.cpp10
2 files changed, 7 insertions, 4 deletions
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index e8921f0..069f8ab 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -17,64 +17,65 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#include "volume.h" 22#include "volume.h"
23 23
24#include <qpe/resource.h> 24#include <qpe/resource.h>
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) 27#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
28#include <qpe/qcopenvelope_qws.h> 28#include <qpe/qcopenvelope_qws.h>
29#endif 29#endif
30 30
31#include <qpainter.h> 31#include <qpainter.h>
32#include <qcheckbox.h> 32#include <qcheckbox.h>
33#include <qslider.h> 33#include <qslider.h>
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qframe.h> 35#include <qframe.h>
36#include <qpixmap.h> 36#include <qpixmap.h>
37#include <qlabel.h> 37#include <qlabel.h>
38 38
39#include <qpushbutton.h> 39#include <qpushbutton.h>
40#include <qtimer.h> 40#include <qtimer.h>
41 41
42#define RATE_TIMER_INTERVAL 100 42#define RATE_TIMER_INTERVAL 100
43// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time 43// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time
44// results in "hanging" buttons on the iPAQ due to quite high CPU consumption. 44// results in "hanging" buttons on the iPAQ due to quite high CPU consumption.
45 45
46VolumeControl::VolumeControl( bool showMic, QWidget *parent, const char *name ) 46VolumeControl::VolumeControl( bool showMic, QWidget *parent, const char *name )
47 : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup ) 47 : QFrame( parent, name, WDestructiveClose | WStyle_StaysOnTop | WType_Popup )
48{ 48{
49 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
49 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 50 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
50 createView(showMic); 51 createView(showMic);
51} 52}
52 53
53void VolumeControl::createView(bool showMic) 54void VolumeControl::createView(bool showMic)
54{ 55{
55 Config cfg("qpe"); 56 Config cfg("qpe");
56 cfg.setGroup("Volume"); 57 cfg.setGroup("Volume");
57//showMic = TRUE; 58//showMic = TRUE;
58 QHBoxLayout *hboxLayout = new QHBoxLayout(this); 59 QHBoxLayout *hboxLayout = new QHBoxLayout(this);
59 hboxLayout->setMargin( 3 ); 60 hboxLayout->setMargin( 3 );
60 hboxLayout->setSpacing( 0); 61 hboxLayout->setSpacing( 0);
61 62
62 QVBoxLayout *vboxButtons = new QVBoxLayout(this); 63 QVBoxLayout *vboxButtons = new QVBoxLayout(this);
63 upButton = new QPushButton( this ); 64 upButton = new QPushButton( this );
64 upButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); 65 upButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
65 upButton->setPixmap( Resource::loadPixmap( "up" ) ); 66 upButton->setPixmap( Resource::loadPixmap( "up" ) );
66 downButton = new QPushButton( this ); 67 downButton = new QPushButton( this );
67 downButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) ); 68 downButton->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
68 downButton->setPixmap( Resource::loadPixmap( "down" ) ); 69 downButton->setPixmap( Resource::loadPixmap( "down" ) );
69 vboxButtons->setSpacing( 2 ); 70 vboxButtons->setSpacing( 2 );
70 71
71 upButton->setFixedHeight(26); 72 upButton->setFixedHeight(26);
72 downButton->setFixedHeight(26); 73 downButton->setFixedHeight(26);
73 74
74 vboxButtons->addWidget( upButton ); 75 vboxButtons->addWidget( upButton );
75 vboxButtons->addWidget( downButton ); 76 vboxButtons->addWidget( downButton );
76 77
77 QVBoxLayout *vbox = new QVBoxLayout( this ); 78 QVBoxLayout *vbox = new QVBoxLayout( this );
78 QHBoxLayout *hbox = NULL; 79 QHBoxLayout *hbox = NULL;
79 80
80 slider = new QSlider( this ); 81 slider = new QSlider( this );
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp
index 676ab61..fb2b79f 100644
--- a/core/applets/volumeapplet/volumeappletimpl.cpp
+++ b/core/applets/volumeapplet/volumeappletimpl.cpp
@@ -1,64 +1,66 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "volume.h" 20#include "volume.h"
21#include "volumeappletimpl.h" 21#include "volumeappletimpl.h"
22#include <qpe/qcopenvelope_qws.h>
22 23
23 24
24VolumeAppletImpl::VolumeAppletImpl() 25VolumeAppletImpl::VolumeAppletImpl()
25 : volume(0), ref(0) 26 : volume(0), ref(0)
26{ 27{
27} 28}
28 29
29VolumeAppletImpl::~VolumeAppletImpl() 30VolumeAppletImpl::~VolumeAppletImpl()
30{ 31{
31 delete volume; 32 delete volume;
32} 33}
33 34
34QWidget *VolumeAppletImpl::applet( QWidget *parent ) 35QWidget *VolumeAppletImpl::applet( QWidget *parent )
35{ 36{
36 if ( !volume ) 37 if ( !volume )
37 volume = new VolumeApplet( parent ); 38 volume = new VolumeApplet( parent );
39 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; //mute
38 return volume; 40 return volume;
39} 41}
40 42
41int VolumeAppletImpl::position() const 43int VolumeAppletImpl::position() const
42{ 44{
43 return 6; 45 return 6;
44} 46}
45 47
46QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 48QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
47{ 49{
48 *iface = 0; 50 *iface = 0;
49 if ( uuid == IID_QUnknown ) 51 if ( uuid == IID_QUnknown )
50 *iface = this; 52 *iface = this;
51 else if ( uuid == IID_TaskbarApplet ) 53 else if ( uuid == IID_TaskbarApplet )
52 *iface = this; 54 *iface = this;
53 55
54 if ( *iface ) 56 if ( *iface )
55 (*iface)->addRef(); 57 (*iface)->addRef();
56 return QS_OK; 58 return QS_OK;
57} 59}
58 60
59Q_EXPORT_INTERFACE() 61Q_EXPORT_INTERFACE()
60{ 62{
61 Q_CREATE_INSTANCE( VolumeAppletImpl ) 63 Q_CREATE_INSTANCE( VolumeAppletImpl )
62} 64}
63 65
64 66