-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 10 | ||||
-rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 14 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irdaappletimpl.h | 2 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.h | 2 | ||||
-rw-r--r-- | core/applets/volumeapplet/volume.cpp | 2 |
6 files changed, 23 insertions, 9 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 078ce8d..15eb762 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -1,166 +1,170 @@ | |||
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 "battery.h" | 20 | #include "battery.h" |
21 | #include "batterystatus.h" | 21 | #include "batterystatus.h" |
22 | 22 | ||
23 | #include <qpe/applnk.h> | 23 | #include <qpe/applnk.h> |
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qpe/power.h> | 25 | #include <qpe/power.h> |
26 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
27 | 27 | ||
28 | #include <qpainter.h> | 28 | #include <qpainter.h> |
29 | #include <qtimer.h> | 29 | #include <qtimer.h> |
30 | 30 | ||
31 | 31 | ||
32 | BatteryMeter::BatteryMeter( QWidget *parent ) | 32 | BatteryMeter::BatteryMeter( QWidget *parent ) |
33 | : QWidget( parent ), charging(false) | 33 | : QWidget( parent ), charging(false) |
34 | { | 34 | { |
35 | ps = new PowerStatus; | 35 | ps = new PowerStatus; |
36 | startTimer( 10000 ); | 36 | startTimer( 10000 ); |
37 | |||
38 | setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); | ||
37 | setFixedHeight( AppLnk::smallIconSize() ); | 39 | setFixedHeight( AppLnk::smallIconSize() ); |
40 | |||
38 | chargeTimer = new QTimer( this ); | 41 | chargeTimer = new QTimer( this ); |
39 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); | 42 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); |
40 | timerEvent(0); | 43 | timerEvent(0); |
41 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); | 44 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); |
42 | Config c( "qpe" ); | 45 | Config c( "qpe" ); |
43 | c.setGroup( "Battery" ); | 46 | c.setGroup( "Battery" ); |
44 | style = c.readNumEntry( "Style", 0 ); | 47 | style = c.readNumEntry( "Style", 0 ); |
45 | } | 48 | } |
46 | 49 | ||
47 | BatteryMeter::~BatteryMeter() | 50 | BatteryMeter::~BatteryMeter() |
48 | { | 51 | { |
49 | delete ps; | 52 | delete ps; |
50 | } | 53 | } |
51 | 54 | ||
52 | QSize BatteryMeter::sizeHint() const | 55 | QSize BatteryMeter::sizeHint() const |
53 | { | 56 | { |
54 | return QSize(10, height() ); | 57 | return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() ); |
55 | } | 58 | } |
56 | 59 | ||
57 | void BatteryMeter::mousePressEvent( QMouseEvent* e ) | 60 | void BatteryMeter::mousePressEvent( QMouseEvent* e ) |
58 | { | 61 | { |
59 | if ( e->button() == RightButton ) | 62 | if ( e->button() == RightButton ) |
60 | { | 63 | { |
61 | style = 1-style; | 64 | style = 1-style; |
62 | Config c( "qpe" ); | 65 | Config c( "qpe" ); |
63 | c.setGroup( "Battery" ); | 66 | c.setGroup( "Battery" ); |
64 | c.writeEntry( "Style", style ); | 67 | c.writeEntry( "Style", style ); |
65 | repaint( true ); | 68 | repaint( true ); |
66 | } | 69 | } |
67 | QWidget::mousePressEvent( e ); | 70 | QWidget::mousePressEvent( e ); |
68 | } | 71 | } |
69 | 72 | ||
70 | void BatteryMeter::mouseReleaseEvent( QMouseEvent* e) | 73 | void BatteryMeter::mouseReleaseEvent( QMouseEvent* e) |
71 | { | 74 | { |
72 | if ( batteryView && batteryView->isVisible() ) { | 75 | if ( batteryView && batteryView->isVisible() ) { |
73 | delete (QWidget *) batteryView; | 76 | delete (QWidget *) batteryView; |
74 | } else { | 77 | } else { |
75 | if ( !batteryView ) batteryView = new BatteryStatus( ps ); | 78 | if ( !batteryView ) batteryView = new BatteryStatus( ps ); |
76 | batteryView->showMaximized(); | 79 | batteryView->showMaximized(); |
77 | batteryView->raise(); | 80 | batteryView->raise(); |
78 | batteryView->show(); | 81 | batteryView->show(); |
79 | } | 82 | } |
80 | } | 83 | } |
81 | 84 | ||
82 | void BatteryMeter::timerEvent( QTimerEvent * ) | 85 | void BatteryMeter::timerEvent( QTimerEvent * ) |
83 | { | 86 | { |
84 | PowerStatus prev = *ps; | 87 | PowerStatus prev = *ps; |
85 | 88 | ||
86 | *ps = PowerStatusManager::readStatus(); | 89 | *ps = PowerStatusManager::readStatus(); |
87 | 90 | ||
88 | if ( prev != *ps ) { | 91 | if ( prev != *ps ) { |
89 | percent = ps->batteryPercentRemaining(); | 92 | percent = ps->batteryPercentRemaining(); |
90 | if ( !charging && ps->batteryStatus() == PowerStatus::Charging && percent < 0 ) { | 93 | if ( !charging && ps->batteryStatus() == PowerStatus::Charging && percent < 0 ) { |
91 | percent = 0; | 94 | percent = 0; |
92 | charging = true; | 95 | charging = true; |
93 | chargeTimer->start( 500 ); | 96 | chargeTimer->start( 500 ); |
94 | } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) { | 97 | } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) { |
95 | charging = false; | 98 | charging = false; |
96 | chargeTimer->stop(); | 99 | chargeTimer->stop(); |
97 | if ( batteryView ) | 100 | if ( batteryView ) |
98 | batteryView->updatePercent( percent ); | 101 | batteryView->updatePercent( percent ); |
99 | } | 102 | } |
100 | repaint( style != 0 ); | 103 | repaint( style != 0 ); |
101 | if ( batteryView ) | 104 | if ( batteryView ) |
102 | batteryView->repaint(); | 105 | batteryView->repaint(); |
103 | } | 106 | } |
104 | } | 107 | } |
105 | 108 | ||
106 | void BatteryMeter::chargeTimeout() | 109 | void BatteryMeter::chargeTimeout() |
107 | { | 110 | { |
108 | percent += 20; | 111 | percent += 20; |
109 | if ( percent > 100 ) | 112 | if ( percent > 100 ) |
110 | percent = 0; | 113 | percent = 0; |
111 | 114 | ||
112 | repaint(FALSE); | 115 | repaint(FALSE); |
113 | if ( batteryView ) | 116 | if ( batteryView ) |
114 | batteryView->updatePercent( percent ); | 117 | batteryView->updatePercent( percent ); |
115 | } | 118 | } |
116 | 119 | ||
117 | void BatteryMeter::paintEvent( QPaintEvent* ) | 120 | void BatteryMeter::paintEvent( QPaintEvent* ) |
118 | { | 121 | { |
122 | qWarning("paint"); | ||
119 | if ( style == 1 ) | 123 | if ( style == 1 ) |
120 | { | 124 | { |
121 | QPainter p(this); | 125 | QPainter p(this); |
122 | QFont f( "Fixed", AppLnk::smallIconSize()/2 ); | 126 | QFont f( "Fixed", AppLnk::smallIconSize()/2 ); |
123 | QFontMetrics fm( f ); | 127 | QFontMetrics fm( f ); |
124 | p.setFont( f ); | 128 | p.setFont( f ); |
125 | p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) ); | 129 | p.drawText( 0, height()/2, QString::number( percent ) ); |
126 | p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" ); | 130 | p.drawText( width()/4, height(), "%" ); |
127 | return; | 131 | return; |
128 | } | 132 | } |
129 | 133 | ||
130 | QPainter p(this); | 134 | QPainter p(this); |
131 | QColor color; | 135 | QColor color; |
132 | QColor g = gray.light( 160 ); | 136 | QColor g = gray.light( 160 ); |
133 | switch ( ps->acStatus() ) | 137 | switch ( ps->acStatus() ) |
134 | { | 138 | { |
135 | case PowerStatus::Offline: color = blue.light( 150 ); break; | 139 | case PowerStatus::Offline: color = blue.light( 150 ); break; |
136 | case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break; | 140 | case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break; |
137 | default: color = red.light( 160 ); | 141 | default: color = red.light( 160 ); |
138 | } | 142 | } |
139 | 143 | ||
140 | int w = height() / 2; | 144 | int w = height() / 2; |
141 | if ( !(w%2) ) w--; // should have an odd value to get a real middle line | 145 | if ( !(w%2) ) w--; // should have an odd value to get a real middle line |
142 | int h = height() - 4; | 146 | int h = height() - 4; |
143 | int pix = (percent * h) / 100; | 147 | int pix = (percent * h) / 100; |
144 | int y2 = height() -2; | 148 | int y2 = height() -2; |
145 | int y = y2 - pix; | 149 | int y = y2 - pix; |
146 | int x1 = (width() - w ) / 2; | 150 | int x1 = (width() - w ) / 2; |
147 | 151 | ||
148 | p.setPen(QColor(80,80,80)); | 152 | p.setPen(QColor(80,80,80)); |
149 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header | 153 | p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header |
150 | p.drawRect(x1,1,w,height()-1); // corpus | 154 | p.drawRect(x1,1,w,height()-1); // corpus |
151 | p.setBrush(color); | 155 | p.setBrush(color); |
152 | 156 | ||
153 | int extra = ((percent * h) % 100)/(100/4); | 157 | int extra = ((percent * h) % 100)/(100/4); |
154 | 158 | ||
155 | int middle = w/2; | 159 | int middle = w/2; |
156 | for ( int i = 0; i < middle; i++ ) | 160 | for ( int i = 0; i < middle; i++ ) |
157 | { | 161 | { |
158 | p.setPen( gray.dark( 100+i*20 ) ); | 162 | p.setPen( gray.dark( 100+i*20 ) ); |
159 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); | 163 | p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 ); |
160 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); | 164 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); |
161 | p.setPen( color.dark( 100+i*20 ) ); | 165 | p.setPen( color.dark( 100+i*20 ) ); |
162 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); | 166 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); |
163 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); | 167 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); |
164 | } | 168 | } |
165 | } | 169 | } |
166 | 170 | ||
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 21b68e3..bb0db9b 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -1,172 +1,178 @@ | |||
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 | 20 | ||
21 | #include "clipboard.h" | 21 | #include "clipboard.h" |
22 | 22 | ||
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
25 | 25 | ||
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qpopupmenu.h> | 27 | #include <qpopupmenu.h> |
28 | #include <qwindowsystem_qws.h> | 28 | #include <qwindowsystem_qws.h> |
29 | #include <qapplication.h> | 29 | #include <qapplication.h> |
30 | #include <qclipboard.h> | 30 | #include <qclipboard.h> |
31 | #include <qtimer.h> | 31 | #include <qtimer.h> |
32 | 32 | ||
33 | //=========================================================================== | 33 | //=========================================================================== |
34 | 34 | ||
35 | 35 | ||
36 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 36 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
37 | { | 37 | { |
38 | setFixedWidth ( AppLnk::smallIconSize() ); | 38 | setFixedWidth ( AppLnk::smallIconSize() ); |
39 | setFixedHeight ( AppLnk::smallIconSize() ); | 39 | setFixedHeight ( AppLnk::smallIconSize() ); |
40 | m_clipboardPixmap = QPixmap ( Resource::loadPixmap( "paste" ) ); | 40 | |
41 | QImage img = Resource::loadImage( "paste"); | ||
42 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | ||
43 | |||
44 | m_clipboardPixmap.convertFromImage( img ); | ||
41 | 45 | ||
42 | m_timer = new QTimer ( this ); | 46 | m_timer = new QTimer ( this ); |
43 | 47 | ||
44 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); | 48 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); |
45 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); | 49 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); |
46 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); | 50 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); |
47 | 51 | ||
48 | m_menu = 0; | 52 | m_menu = 0; |
49 | m_dirty = true; | 53 | m_dirty = true; |
50 | m_lasttext = QString::null; | 54 | m_lasttext = QString::null; |
51 | 55 | ||
52 | m_timer-> start ( 0, true ); | 56 | m_timer-> start ( 0, true ); |
53 | } | 57 | } |
54 | 58 | ||
55 | ClipboardApplet::~ClipboardApplet ( ) | 59 | ClipboardApplet::~ClipboardApplet ( ) |
56 | { | 60 | { |
57 | } | 61 | } |
58 | 62 | ||
59 | void ClipboardApplet::shutdown ( ) | 63 | void ClipboardApplet::shutdown ( ) |
60 | { | 64 | { |
61 | // the timer has to be stopped, or Qt/E will hang on quit() | 65 | // the timer has to be stopped, or Qt/E will hang on quit() |
62 | // see launcher/desktop.cpp | 66 | // see launcher/desktop.cpp |
63 | 67 | ||
64 | m_timer-> stop ( ); | 68 | m_timer-> stop ( ); |
65 | } | 69 | } |
66 | 70 | ||
67 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) | 71 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) |
68 | { | 72 | { |
69 | if ( m_dirty ) { | 73 | if ( m_dirty ) { |
70 | delete m_menu; | 74 | delete m_menu; |
71 | 75 | ||
72 | m_menu = new QPopupMenu ( this ); | 76 | m_menu = new QPopupMenu ( this ); |
73 | m_menu-> setCheckable ( true ); | 77 | m_menu-> setCheckable ( true ); |
74 | 78 | ||
75 | if ( m_history. count ( )) { | 79 | if ( m_history. count ( )) { |
76 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { | 80 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { |
77 | QString str = m_history [i]; | 81 | QString str = m_history [i]; |
78 | 82 | ||
79 | if ( str. length ( ) > 20 ) | 83 | if ( str. length ( ) > 20 ) |
80 | str = str. left ( 20 ) + "..."; | 84 | str = str. left ( 20 ) + "..."; |
81 | 85 | ||
82 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); | 86 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); |
83 | m_menu-> setItemChecked ( i, false ); | 87 | m_menu-> setItemChecked ( i, false ); |
84 | } | 88 | } |
85 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); | 89 | m_menu-> setItemChecked ( m_history. count ( ) - 1, true ); |
86 | m_menu-> insertSeparator ( ); | 90 | m_menu-> insertSeparator ( ); |
87 | } | 91 | } |
88 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); | 92 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 ); |
89 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); | 93 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 ); |
90 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); | 94 | m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 ); |
91 | 95 | ||
92 | connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int ))); | 96 | connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int ))); |
93 | 97 | ||
94 | m_dirty = false; | 98 | m_dirty = false; |
95 | } | 99 | } |
96 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); | 100 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); |
97 | QSize s = m_menu-> sizeHint ( ); | 101 | QSize s = m_menu-> sizeHint ( ); |
98 | 102 | ||
99 | m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); | 103 | m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ))); |
100 | } | 104 | } |
101 | 105 | ||
102 | void ClipboardApplet::action(int id) | 106 | void ClipboardApplet::action(int id) |
103 | { | 107 | { |
104 | ushort unicode = 0; | 108 | ushort unicode = 0; |
105 | int scan = 0; | 109 | int scan = 0; |
106 | 110 | ||
107 | switch ( id ) { | 111 | switch ( id ) { |
108 | case 100: | 112 | case 100: |
109 | unicode = 'X' - '@'; | 113 | unicode = 'X' - '@'; |
110 | scan = Key_X; // Cut | 114 | scan = Key_X; // Cut |
111 | break; | 115 | break; |
112 | case 101: | 116 | case 101: |
113 | unicode = 'C' - '@'; | 117 | unicode = 'C' - '@'; |
114 | scan = Key_C; // Copy | 118 | scan = Key_C; // Copy |
115 | break; | 119 | break; |
116 | case 102: | 120 | case 102: |
117 | unicode = 'V' - '@'; | 121 | unicode = 'V' - '@'; |
118 | scan = Key_V; // Paste | 122 | scan = Key_V; // Paste |
119 | break; | 123 | break; |
120 | 124 | ||
121 | default: | 125 | default: |
122 | if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) { | 126 | if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) { |
123 | QApplication::clipboard ( )-> setText ( m_history [id] ); | 127 | QApplication::clipboard ( )-> setText ( m_history [id] ); |
124 | 128 | ||
125 | for ( uint i = 0; i < m_history. count ( ); i++ ) | 129 | for ( uint i = 0; i < m_history. count ( ); i++ ) |
126 | m_menu-> setItemChecked ( i, i == uint( id )); | 130 | m_menu-> setItemChecked ( i, i == uint( id )); |
127 | 131 | ||
128 | unicode = 'V' - '@'; | 132 | unicode = 'V' - '@'; |
129 | scan = Key_V; | 133 | scan = Key_V; |
130 | } | 134 | } |
131 | break; | 135 | break; |
132 | } | 136 | } |
133 | 137 | ||
134 | if ( scan ) { | 138 | if ( scan ) { |
135 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); | 139 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false ); |
136 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false ); | 140 | qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false ); |
137 | } | 141 | } |
138 | } | 142 | } |
139 | 143 | ||
140 | void ClipboardApplet::paintEvent ( QPaintEvent* ) | 144 | void ClipboardApplet::paintEvent ( QPaintEvent* ) |
141 | { | 145 | { |
142 | QPainter p ( this ); | 146 | QPainter p ( this ); |
143 | p. drawPixmap( 0, 1, m_clipboardPixmap ); | 147 | /* center the height but our pixmap is as big as the height ;)*/ |
148 | p. drawPixmap( 0, 0, | ||
149 | m_clipboardPixmap ); | ||
144 | } | 150 | } |
145 | 151 | ||
146 | void ClipboardApplet::newData ( ) | 152 | void ClipboardApplet::newData ( ) |
147 | { | 153 | { |
148 | static bool excllock = false; | 154 | static bool excllock = false; |
149 | 155 | ||
150 | if ( excllock ) | 156 | if ( excllock ) |
151 | return; | 157 | return; |
152 | else | 158 | else |
153 | excllock = true; | 159 | excllock = true; |
154 | 160 | ||
155 | m_timer-> stop ( ); | 161 | m_timer-> stop ( ); |
156 | 162 | ||
157 | QCString type = "plain"; | 163 | QCString type = "plain"; |
158 | QString txt = QApplication::clipboard ( )-> text ( type ); | 164 | QString txt = QApplication::clipboard ( )-> text ( type ); |
159 | 165 | ||
160 | if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { | 166 | if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { |
161 | m_history. append ( txt ); | 167 | m_history. append ( txt ); |
162 | 168 | ||
163 | if ( m_history. count ( ) > 5 ) | 169 | if ( m_history. count ( ) > 5 ) |
164 | m_history. remove ( m_history. begin ( )); | 170 | m_history. remove ( m_history. begin ( )); |
165 | 171 | ||
166 | m_dirty = true; | 172 | m_dirty = true; |
167 | } | 173 | } |
168 | 174 | ||
169 | m_timer-> start ( 1500, true ); | 175 | m_timer-> start ( 1500, true ); |
170 | 176 | ||
171 | excllock = false; | 177 | excllock = false; |
172 | } | 178 | } |
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 51c2ebf..f850424 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -126,232 +126,232 @@ bool IrdaApplet::setIrdaStatus ( bool b ) | |||
126 | } | 126 | } |
127 | else { | 127 | else { |
128 | setIrdaDiscoveryStatus ( 0 ); | 128 | setIrdaDiscoveryStatus ( 0 ); |
129 | setIrdaReceiveStatus ( 0 ); | 129 | setIrdaReceiveStatus ( 0 ); |
130 | ifr. ifr_flags &= ~IFF_UP; | 130 | ifr. ifr_flags &= ~IFF_UP; |
131 | } | 131 | } |
132 | 132 | ||
133 | if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 ) | 133 | if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 ) |
134 | return false; | 134 | return false; |
135 | 135 | ||
136 | return true; | 136 | return true; |
137 | } | 137 | } |
138 | 138 | ||
139 | bool IrdaApplet::checkIrdaDiscoveryStatus ( ) | 139 | bool IrdaApplet::checkIrdaDiscoveryStatus ( ) |
140 | { | 140 | { |
141 | QFile discovery ( "/proc/sys/net/irda/discovery" ); | 141 | QFile discovery ( "/proc/sys/net/irda/discovery" ); |
142 | 142 | ||
143 | QString streamIn = "0"; | 143 | QString streamIn = "0"; |
144 | 144 | ||
145 | if ( discovery. open ( IO_ReadOnly )) { | 145 | if ( discovery. open ( IO_ReadOnly )) { |
146 | QTextStream stream ( &discovery ); | 146 | QTextStream stream ( &discovery ); |
147 | streamIn = stream. read ( ); | 147 | streamIn = stream. read ( ); |
148 | } | 148 | } |
149 | 149 | ||
150 | return streamIn. toInt ( ) > 0; | 150 | return streamIn. toInt ( ) > 0; |
151 | } | 151 | } |
152 | 152 | ||
153 | 153 | ||
154 | bool IrdaApplet::setIrdaDiscoveryStatus ( bool d ) | 154 | bool IrdaApplet::setIrdaDiscoveryStatus ( bool d ) |
155 | { | 155 | { |
156 | QFile discovery ( "/proc/sys/net/irda/discovery" ); | 156 | QFile discovery ( "/proc/sys/net/irda/discovery" ); |
157 | 157 | ||
158 | if ( discovery. open ( IO_WriteOnly | IO_Raw )) { | 158 | if ( discovery. open ( IO_WriteOnly | IO_Raw )) { |
159 | discovery.putch ( d ? '1' : '0' ); | 159 | discovery.putch ( d ? '1' : '0' ); |
160 | return true; | 160 | return true; |
161 | } | 161 | } |
162 | return false; | 162 | return false; |
163 | } | 163 | } |
164 | 164 | ||
165 | 165 | ||
166 | bool IrdaApplet::setIrdaReceiveStatus ( bool d ) | 166 | bool IrdaApplet::setIrdaReceiveStatus ( bool d ) |
167 | { | 167 | { |
168 | QCopEnvelope e ( "QPE/Obex", "receive(int)" ); | 168 | QCopEnvelope e ( "QPE/Obex", "receive(int)" ); |
169 | e << ( d ? 1 : 0 ); | 169 | e << ( d ? 1 : 0 ); |
170 | 170 | ||
171 | m_receive_active = d; | 171 | m_receive_active = d; |
172 | m_receive_state_changed = true; | 172 | m_receive_state_changed = true; |
173 | 173 | ||
174 | return true; | 174 | return true; |
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
178 | void IrdaApplet::showDiscovered ( ) | 178 | void IrdaApplet::showDiscovered ( ) |
179 | { | 179 | { |
180 | //static Sound snd_found ( "irdaapplet/irdaon" ); | 180 | //static Sound snd_found ( "irdaapplet/irdaon" ); |
181 | //static Sound snd_lost ( "irdaapplet/irdaoff" ); | 181 | //static Sound snd_lost ( "irdaapplet/irdaoff" ); |
182 | 182 | ||
183 | QFile discovery ( "/proc/net/irda/discovery" ); | 183 | QFile discovery ( "/proc/net/irda/discovery" ); |
184 | 184 | ||
185 | if ( discovery. open ( IO_ReadOnly )) { | 185 | if ( discovery. open ( IO_ReadOnly )) { |
186 | bool qcopsend = false; | 186 | bool qcopsend = false; |
187 | 187 | ||
188 | QString discoveredDevice; | 188 | QString discoveredDevice; |
189 | QString deviceAddr; | 189 | QString deviceAddr; |
190 | 190 | ||
191 | // since it is /proc we _must_ use QTextStream | 191 | // since it is /proc we _must_ use QTextStream |
192 | QStringList list = QStringList::split ( "\n", QTextStream ( &discovery ). read ( )); | 192 | QStringList list = QStringList::split ( "\n", QTextStream ( &discovery ). read ( )); |
193 | 193 | ||
194 | QMap <QString, QString>::Iterator it; | 194 | QMap <QString, QString>::Iterator it; |
195 | 195 | ||
196 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) | 196 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) |
197 | it. data ( ). prepend ( "+++" ); | 197 | it. data ( ). prepend ( "+++" ); |
198 | 198 | ||
199 | for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) { | 199 | for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) { |
200 | const QString &line = *lit; | 200 | const QString &line = *lit; |
201 | 201 | ||
202 | if ( line. startsWith ( "nickname:" )) { | 202 | if ( line. startsWith ( "nickname:" )) { |
203 | discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 ); | 203 | discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 ); |
204 | deviceAddr = line. mid ( line. find ( "daddr:" ) + 9, 8 ); | 204 | deviceAddr = line. mid ( line. find ( "daddr:" ) + 9, 8 ); |
205 | 205 | ||
206 | // qDebug(discoveredDevice + "(" + deviceAddr + ")"); | 206 | // qDebug(discoveredDevice + "(" + deviceAddr + ")"); |
207 | 207 | ||
208 | if ( !m_devices. contains ( deviceAddr )) { | 208 | if ( !m_devices. contains ( deviceAddr )) { |
209 | popup ( tr( "Found:" ) + " " + discoveredDevice ); | 209 | popup ( tr( "Found:" ) + " " + discoveredDevice ); |
210 | //snd_found. play ( ); | 210 | //snd_found. play ( ); |
211 | qcopsend = true; | 211 | qcopsend = true; |
212 | } | 212 | } |
213 | m_devices. replace ( deviceAddr, discoveredDevice ); | 213 | m_devices. replace ( deviceAddr, discoveredDevice ); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||
217 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) { | 217 | for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) { |
218 | // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); | 218 | // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?"); |
219 | 219 | ||
220 | if ( it. data ( ). left ( 3 ) == "+++" ) { | 220 | if ( it. data ( ). left ( 3 ) == "+++" ) { |
221 | popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 )); | 221 | popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 )); |
222 | //snd_lost. play ( ); | 222 | //snd_lost. play ( ); |
223 | 223 | ||
224 | QMap <QString, QString>::Iterator tmp = it; | 224 | QMap <QString, QString>::Iterator tmp = it; |
225 | tmp++; | 225 | tmp++; |
226 | m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator | 226 | m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator |
227 | it = tmp; | 227 | it = tmp; |
228 | 228 | ||
229 | qcopsend = true; | 229 | qcopsend = true; |
230 | } | 230 | } |
231 | else | 231 | else |
232 | it++; | 232 | it++; |
233 | } | 233 | } |
234 | // XXX if( qcopsend ) { | 234 | // XXX if( qcopsend ) { |
235 | QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" ); | 235 | QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" ); |
236 | e << ( m_devices. count ( ) > 0 ); | 236 | e << ( m_devices. count ( ) > 0 ); |
237 | // } | 237 | // } |
238 | } | 238 | } |
239 | } | 239 | } |
240 | 240 | ||
241 | void IrdaApplet::mousePressEvent ( QMouseEvent * ) | 241 | void IrdaApplet::mousePressEvent ( QMouseEvent * ) |
242 | { | 242 | { |
243 | QPopupMenu *menu = new QPopupMenu ( this ); | 243 | QPopupMenu *menu = new QPopupMenu ( this ); |
244 | QString cmd; | 244 | QString cmd; |
245 | 245 | ||
246 | /* Refresh active state */ | 246 | /* Refresh active state */ |
247 | timerEvent ( 0 ); | 247 | timerEvent ( 0 ); |
248 | 248 | ||
249 | //menu->insertItem( tr("More..."), 4 ); | 249 | //menu->insertItem( tr("More..."), 4 ); |
250 | 250 | ||
251 | if ( m_irda_active && !m_devices. isEmpty ( )) { | 251 | if ( m_irda_active && !m_devices. isEmpty ( )) { |
252 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); | 252 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); |
253 | 253 | ||
254 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) | 254 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) |
255 | menu-> insertItem ( *it ); | 255 | menu-> insertItem ( *it ); |
256 | 256 | ||
257 | menu-> insertSeparator ( ); | 257 | menu-> insertSeparator ( ); |
258 | } | 258 | } |
259 | 259 | ||
260 | menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 ); | 260 | menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 ); |
261 | 261 | ||
262 | if ( m_irda_active ) { | 262 | if ( m_irda_active ) { |
263 | menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 ); | 263 | menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 ); |
264 | menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); | 264 | menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); |
265 | } | 265 | } |
266 | 266 | ||
267 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); | 267 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); |
268 | QSize s = menu-> sizeHint ( ); | 268 | QSize s = menu-> sizeHint ( ); |
269 | 269 | ||
270 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); | 270 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); |
271 | 271 | ||
272 | switch ( menu-> exec ( p )) { | 272 | switch ( menu-> exec ( p )) { |
273 | case 0: | 273 | case 0: |
274 | setIrdaStatus ( !m_irda_active ); | 274 | setIrdaStatus ( !m_irda_active ); |
275 | timerEvent ( 0 ); | 275 | timerEvent ( 0 ); |
276 | break; | 276 | break; |
277 | case 1: | 277 | case 1: |
278 | setIrdaDiscoveryStatus ( !m_irda_discovery_active ); | 278 | setIrdaDiscoveryStatus ( !m_irda_discovery_active ); |
279 | timerEvent ( 0 ); | 279 | timerEvent ( 0 ); |
280 | break; | 280 | break; |
281 | case 2: | 281 | case 2: |
282 | setIrdaReceiveStatus ( !m_receive_active ); | 282 | setIrdaReceiveStatus ( !m_receive_active ); |
283 | timerEvent( 0 ); | 283 | timerEvent( 0 ); |
284 | break; | 284 | break; |
285 | } | 285 | } |
286 | 286 | ||
287 | delete menu; | 287 | delete menu; |
288 | } | 288 | } |
289 | 289 | ||
290 | void IrdaApplet::timerEvent ( QTimerEvent * ) | 290 | void IrdaApplet::timerEvent ( QTimerEvent * ) |
291 | { | 291 | { |
292 | bool oldactive = m_irda_active; | 292 | bool oldactive = m_irda_active; |
293 | bool olddiscovery = m_irda_discovery_active; | 293 | bool olddiscovery = m_irda_discovery_active; |
294 | bool receiveUpdate = false; | 294 | bool receiveUpdate = false; |
295 | 295 | ||
296 | if ( m_receive_state_changed ) { | 296 | if ( m_receive_state_changed ) { |
297 | receiveUpdate = true; | 297 | receiveUpdate = true; |
298 | m_receive_state_changed = false; | 298 | m_receive_state_changed = false; |
299 | } | 299 | } |
300 | 300 | ||
301 | m_irda_active = checkIrdaStatus ( ); | 301 | m_irda_active = checkIrdaStatus ( ); |
302 | m_irda_discovery_active = checkIrdaDiscoveryStatus ( ); | 302 | m_irda_discovery_active = checkIrdaDiscoveryStatus ( ); |
303 | 303 | ||
304 | if ( m_irda_discovery_active ) | 304 | if ( m_irda_discovery_active ) |
305 | showDiscovered ( ); | 305 | showDiscovered ( ); |
306 | 306 | ||
307 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) | 307 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) |
308 | update ( ); | 308 | update ( ); |
309 | } | 309 | } |
310 | 310 | ||
311 | void IrdaApplet::paintEvent ( QPaintEvent * ) | 311 | void IrdaApplet::paintEvent ( QPaintEvent * ) |
312 | { | 312 | { |
313 | QPainter p ( this ); | 313 | QPainter p ( this ); |
314 | 314 | ||
315 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); | 315 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); |
316 | 316 | ||
317 | if ( m_irda_discovery_active ) | 317 | if ( m_irda_discovery_active ) |
318 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); | 318 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); |
319 | 319 | ||
320 | if ( m_receive_active ) | 320 | if ( m_receive_active ) |
321 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); | 321 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); |
322 | } | 322 | } |
323 | /* | 323 | /* |
324 | * We know 3 calls | 324 | * We know 3 calls |
325 | * a) enable | 325 | * a) enable |
326 | * b) disable | 326 | * b) disable |
327 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on | 327 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on |
328 | * c) listDevices: We will return a list of known devices | 328 | * c) listDevices: We will return a list of known devices |
329 | */ | 329 | */ |
330 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | 330 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { |
331 | if ( str == "enableIrda()") { | 331 | if ( str == "enableIrda()") { |
332 | m_wasOn = checkIrdaStatus(); | 332 | m_wasOn = checkIrdaStatus(); |
333 | m_wasDiscover = checkIrdaDiscoveryStatus(); | 333 | m_wasDiscover = checkIrdaDiscoveryStatus(); |
334 | if (!m_wasOn) { | 334 | if (!m_wasOn) { |
335 | setIrdaStatus( true ); | 335 | setIrdaStatus( true ); |
336 | } | 336 | } |
337 | if ( !m_wasDiscover ) { | 337 | if ( !m_wasDiscover ) { |
338 | setIrdaDiscoveryStatus ( true ); | 338 | setIrdaDiscoveryStatus ( true ); |
339 | } | 339 | } |
340 | } else if ( str == "disableIrda()") { | 340 | } else if ( str == "disableIrda()") { |
341 | if (!m_wasOn) { | 341 | if (!m_wasOn) { |
342 | setIrdaStatus( false ); | 342 | setIrdaStatus( false ); |
343 | } | 343 | } |
344 | if ( !m_wasDiscover ) { | 344 | if ( !m_wasDiscover ) { |
345 | setIrdaDiscoveryStatus ( false ); | 345 | setIrdaDiscoveryStatus ( false ); |
346 | } | 346 | } |
347 | } else if ( str == "listDevices()") { | 347 | } else if ( str == "listDevices()") { |
348 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 348 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
349 | 349 | ||
350 | QStringList list; | 350 | QStringList list; |
351 | QMap<QString, QString>::Iterator it; | 351 | QMap<QString, QString>::Iterator it; |
352 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 352 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
353 | list << (*it); | 353 | list << (*it); |
354 | 354 | ||
355 | e << list; | 355 | e << list; |
356 | } | 356 | } |
357 | } | 357 | } |
diff --git a/core/applets/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h index ef0c5a6..f9e855a 100644 --- a/core/applets/irdaapplet/irdaappletimpl.h +++ b/core/applets/irdaapplet/irdaappletimpl.h | |||
@@ -1,44 +1,46 @@ | |||
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 | #ifndef IRDAAPPLETIMPL_H | 20 | #ifndef IRDAAPPLETIMPL_H |
21 | #define IRDAAPPLETIMPL_H | 21 | #define IRDAAPPLETIMPL_H |
22 | 22 | ||
23 | #include <qwidget.h> | ||
24 | |||
23 | #include <qpe/taskbarappletinterface.h> | 25 | #include <qpe/taskbarappletinterface.h> |
24 | 26 | ||
25 | class IrdaApplet; | 27 | class IrdaApplet; |
26 | 28 | ||
27 | class IrdaAppletImpl : public TaskbarAppletInterface | 29 | class IrdaAppletImpl : public TaskbarAppletInterface |
28 | { | 30 | { |
29 | public: | 31 | public: |
30 | IrdaAppletImpl(); | 32 | IrdaAppletImpl(); |
31 | virtual ~IrdaAppletImpl(); | 33 | virtual ~IrdaAppletImpl(); |
32 | 34 | ||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
34 | Q_REFCOUNT | 36 | Q_REFCOUNT |
35 | 37 | ||
36 | virtual QWidget *applet( QWidget *parent ); | 38 | virtual QWidget *applet( QWidget *parent ); |
37 | virtual int position() const; | 39 | virtual int position() const; |
38 | 40 | ||
39 | private: | 41 | private: |
40 | IrdaApplet *irda; | 42 | IrdaApplet *irda; |
41 | ulong ref; | 43 | ulong ref; |
42 | }; | 44 | }; |
43 | 45 | ||
44 | #endif | 46 | #endif |
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h index 5ac7768..de2a707 100644 --- a/core/applets/rotateapplet/rotate.h +++ b/core/applets/rotateapplet/rotate.h | |||
@@ -1,69 +1,71 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org> | 3 | .=l. Copyright (c) 2003 Maximilian Reiss <harlekin@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <_, > . <= redistribute it and/or modify it under | 6 | .> <_, > . <= redistribute it and/or modify it under |
7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%+i> _;_. | 11 | .%+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-= this library; see the file COPYING.LIB. | 22 | -- :-= this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | 30 | ||
31 | #ifndef __OPIE_ROTATE_APPLET_H__ | 31 | #ifndef __OPIE_ROTATE_APPLET_H__ |
32 | #define __OPIE_ROTATE_APPLET_H__ | 32 | #define __OPIE_ROTATE_APPLET_H__ |
33 | 33 | ||
34 | #include <qpe/menuappletinterface.h> | 34 | #include <qpe/menuappletinterface.h> |
35 | #include <qobject.h> | 35 | #include <qobject.h> |
36 | 36 | ||
37 | #include <qobject.h> | ||
38 | |||
37 | class RotateApplet : public QObject, public MenuAppletInterface | 39 | class RotateApplet : public QObject, public MenuAppletInterface |
38 | { | 40 | { |
39 | 41 | ||
40 | Q_OBJECT | 42 | Q_OBJECT |
41 | 43 | ||
42 | public: | 44 | public: |
43 | RotateApplet ( ); | 45 | RotateApplet ( ); |
44 | virtual ~RotateApplet ( ); | 46 | virtual ~RotateApplet ( ); |
45 | 47 | ||
46 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 48 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
47 | Q_REFCOUNT | 49 | Q_REFCOUNT |
48 | 50 | ||
49 | virtual int position() const; | 51 | virtual int position() const; |
50 | 52 | ||
51 | virtual QString name ( ) const; | 53 | virtual QString name ( ) const; |
52 | virtual QIconSet icon ( ) const; | 54 | virtual QIconSet icon ( ) const; |
53 | virtual QString text ( ) const; | 55 | virtual QString text ( ) const; |
54 | /* virtual QString tr( const char* ) const; | 56 | /* virtual QString tr( const char* ) const; |
55 | virtual QString tr( const char*, const char* ) const; | 57 | virtual QString tr( const char*, const char* ) const; |
56 | */ | 58 | */ |
57 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 59 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
58 | virtual void activated ( ); | 60 | virtual void activated ( ); |
59 | 61 | ||
60 | private slots: | 62 | private slots: |
61 | void channelReceived( const QCString &msg, const QByteArray & data ); | 63 | void channelReceived( const QCString &msg, const QByteArray & data ); |
62 | 64 | ||
63 | private: | 65 | private: |
64 | ulong ref; | 66 | ulong ref; |
65 | bool m_flipped; | 67 | bool m_flipped; |
66 | 68 | ||
67 | }; | 69 | }; |
68 | 70 | ||
69 | #endif | 71 | #endif |
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index b129be3..38f827e 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -574,210 +574,210 @@ void VolumeControl::readConfig ( bool force ) | |||
574 | tapBox-> setChecked ( m_snd_touch ); | 574 | tapBox-> setChecked ( m_snd_touch ); |
575 | if ( force || ( m_snd_alarm != old_sa )) | 575 | if ( force || ( m_snd_alarm != old_sa )) |
576 | alarmBox-> setChecked ( m_snd_alarm ); | 576 | alarmBox-> setChecked ( m_snd_alarm ); |
577 | } | 577 | } |
578 | 578 | ||
579 | 579 | ||
580 | void VolumeControl::volumeChanged ( bool /*nowMuted*/ ) | 580 | void VolumeControl::volumeChanged ( bool /*nowMuted*/ ) |
581 | { | 581 | { |
582 | int prevVol = m_vol_percent; | 582 | int prevVol = m_vol_percent; |
583 | bool prevMute = m_vol_muted; | 583 | bool prevMute = m_vol_muted; |
584 | 584 | ||
585 | readConfig ( ); | 585 | readConfig ( ); |
586 | 586 | ||
587 | // Handle case where muting it toggled | 587 | // Handle case where muting it toggled |
588 | if ( m_vol_muted != prevMute ) | 588 | if ( m_vol_muted != prevMute ) |
589 | m_icon-> redraw ( true ); | 589 | m_icon-> redraw ( true ); |
590 | else if ( prevVol != m_vol_percent ) // Avoid over repainting | 590 | else if ( prevVol != m_vol_percent ) // Avoid over repainting |
591 | m_icon-> redraw ( false ); | 591 | m_icon-> redraw ( false ); |
592 | } | 592 | } |
593 | 593 | ||
594 | void VolumeControl::micChanged ( bool nowMuted ) | 594 | void VolumeControl::micChanged ( bool nowMuted ) |
595 | { | 595 | { |
596 | if ( !nowMuted ) | 596 | if ( !nowMuted ) |
597 | readConfig ( ); | 597 | readConfig ( ); |
598 | m_mic_muted = nowMuted; | 598 | m_mic_muted = nowMuted; |
599 | } | 599 | } |
600 | 600 | ||
601 | void VolumeControl::screenTapToggled ( bool b ) | 601 | void VolumeControl::screenTapToggled ( bool b ) |
602 | { | 602 | { |
603 | m_snd_touch = b; | 603 | m_snd_touch = b; |
604 | writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol ); | 604 | writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol ); |
605 | } | 605 | } |
606 | 606 | ||
607 | void VolumeControl::keyClickToggled ( bool b ) | 607 | void VolumeControl::keyClickToggled ( bool b ) |
608 | { | 608 | { |
609 | m_snd_key = b; | 609 | m_snd_key = b; |
610 | writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol ); | 610 | writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol ); |
611 | } | 611 | } |
612 | 612 | ||
613 | void VolumeControl::alarmSoundToggled ( bool b ) | 613 | void VolumeControl::alarmSoundToggled ( bool b ) |
614 | { | 614 | { |
615 | m_snd_alarm = b; | 615 | m_snd_alarm = b; |
616 | writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol ); | 616 | writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol ); |
617 | } | 617 | } |
618 | 618 | ||
619 | void VolumeControl::volMuteToggled ( bool b ) | 619 | void VolumeControl::volMuteToggled ( bool b ) |
620 | { | 620 | { |
621 | m_vol_muted = !b; | 621 | m_vol_muted = !b; |
622 | 622 | ||
623 | m_icon-> redraw ( true ); | 623 | m_icon-> redraw ( true ); |
624 | 624 | ||
625 | writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol ); | 625 | writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol ); |
626 | } | 626 | } |
627 | 627 | ||
628 | void VolumeControl::micMuteToggled ( bool b ) | 628 | void VolumeControl::micMuteToggled ( bool b ) |
629 | { | 629 | { |
630 | m_mic_muted = !b; | 630 | m_mic_muted = !b; |
631 | writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic ); | 631 | writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic ); |
632 | } | 632 | } |
633 | 633 | ||
634 | 634 | ||
635 | void VolumeControl::volMoved ( int percent ) | 635 | void VolumeControl::volMoved ( int percent ) |
636 | { | 636 | { |
637 | m_vol_percent = 100 - percent; | 637 | m_vol_percent = 100 - percent; |
638 | 638 | ||
639 | // clamp volume percent to be between 0 and 100 | 639 | // clamp volume percent to be between 0 and 100 |
640 | m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent ); | 640 | m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent ); |
641 | // repaint just the little volume rectangle | 641 | // repaint just the little volume rectangle |
642 | m_icon-> redraw ( false ); | 642 | m_icon-> redraw ( false ); |
643 | 643 | ||
644 | writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol ); | 644 | writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol ); |
645 | } | 645 | } |
646 | 646 | ||
647 | void VolumeControl::micMoved ( int percent ) | 647 | void VolumeControl::micMoved ( int percent ) |
648 | { | 648 | { |
649 | m_mic_percent = 100 - percent; | 649 | m_mic_percent = 100 - percent; |
650 | 650 | ||
651 | // clamp volume percent to be between 0 and 100 | 651 | // clamp volume percent to be between 0 and 100 |
652 | m_mic_percent = ( m_mic_percent < 0 ) ? 0 : (( m_mic_percent > 100 ) ? 100 : m_mic_percent ); | 652 | m_mic_percent = ( m_mic_percent < 0 ) ? 0 : (( m_mic_percent > 100 ) ? 100 : m_mic_percent ); |
653 | 653 | ||
654 | writeConfigEntry ( "Mic", m_mic_percent, UPD_Mic ); | 654 | writeConfigEntry ( "Mic", m_mic_percent, UPD_Mic ); |
655 | } | 655 | } |
656 | 656 | ||
657 | void VolumeControl::alarmMoved ( int percent ) | 657 | void VolumeControl::alarmMoved ( int percent ) |
658 | { | 658 | { |
659 | m_alarm_percent = 100 - percent; | 659 | m_alarm_percent = 100 - percent; |
660 | 660 | ||
661 | // clamp volume percent to be between 0 and 100 | 661 | // clamp volume percent to be between 0 and 100 |
662 | m_alarm_percent = ( m_alarm_percent < 0 ) ? 0 : (( m_alarm_percent > 100 ) ? 100 : m_alarm_percent ); | 662 | m_alarm_percent = ( m_alarm_percent < 0 ) ? 0 : (( m_alarm_percent > 100 ) ? 100 : m_alarm_percent ); |
663 | 663 | ||
664 | writeConfigEntry ( "AlarmPercent", m_alarm_percent, UPD_None ); | 664 | writeConfigEntry ( "AlarmPercent", m_alarm_percent, UPD_None ); |
665 | } | 665 | } |
666 | 666 | ||
667 | 667 | ||
668 | void VolumeControl::bassMoved ( int percent ) | 668 | void VolumeControl::bassMoved ( int percent ) |
669 | { | 669 | { |
670 | m_bass_percent = 100 - percent; | 670 | m_bass_percent = 100 - percent; |
671 | 671 | ||
672 | // clamp bass percent to be between 0 and 100 | 672 | // clamp bass percent to be between 0 and 100 |
673 | m_bass_percent = ( m_bass_percent < 0 ) ? 0 : (( m_bass_percent > 100 ) ? 100 : m_bass_percent ); | 673 | m_bass_percent = ( m_bass_percent < 0 ) ? 0 : (( m_bass_percent > 100 ) ? 100 : m_bass_percent ); |
674 | 674 | ||
675 | writeConfigEntry ( "BassPercent", m_bass_percent, UPD_Bass ); | 675 | writeConfigEntry ( "BassPercent", m_bass_percent, UPD_Bass ); |
676 | } | 676 | } |
677 | 677 | ||
678 | 678 | ||
679 | 679 | ||
680 | void VolumeControl::trebleMoved ( int percent ) | 680 | void VolumeControl::trebleMoved ( int percent ) |
681 | { | 681 | { |
682 | m_treble_percent = 100 - percent; | 682 | m_treble_percent = 100 - percent; |
683 | 683 | ||
684 | // clamp treble percent to be between 0 and 100 | 684 | // clamp treble percent to be between 0 and 100 |
685 | m_treble_percent = ( m_treble_percent < 0 ) ? 0 : (( m_treble_percent > 100 ) ? 100 : m_treble_percent ); | 685 | m_treble_percent = ( m_treble_percent < 0 ) ? 0 : (( m_treble_percent > 100 ) ? 100 : m_treble_percent ); |
686 | 686 | ||
687 | writeConfigEntry ( "TreblePercent", m_treble_percent, UPD_Treble ); | 687 | writeConfigEntry ( "TreblePercent", m_treble_percent, UPD_Treble ); |
688 | } | 688 | } |
689 | 689 | ||
690 | 690 | ||
691 | 691 | ||
692 | void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd ) | 692 | void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd ) |
693 | { | 693 | { |
694 | Config cfg ( "qpe" ); | 694 | Config cfg ( "qpe" ); |
695 | cfg. setGroup ( "Volume" ); | 695 | cfg. setGroup ( "Volume" ); |
696 | cfg. writeEntry ( entry, val ); | 696 | cfg. writeEntry ( entry, val ); |
697 | // cfg. write ( ); | 697 | // cfg. write ( ); |
698 | 698 | ||
699 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 699 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) |
700 | switch ( upd ) { | 700 | switch ( upd ) { |
701 | case UPD_Vol: { | 701 | case UPD_Vol: { |
702 | QCopEnvelope ( "QPE/System", "volumeChange(bool)" ) << m_vol_muted; | 702 | QCopEnvelope ( "QPE/System", "volumeChange(bool)" ) << m_vol_muted; |
703 | break; | 703 | break; |
704 | } | 704 | } |
705 | case UPD_Mic: { | 705 | case UPD_Mic: { |
706 | QCopEnvelope ( "QPE/System", "micChange(bool)" ) << m_mic_muted; | 706 | QCopEnvelope ( "QPE/System", "micChange(bool)" ) << m_mic_muted; |
707 | break; | 707 | break; |
708 | } | 708 | } |
709 | case UPD_Bass: { | 709 | case UPD_Bass: { |
710 | QCopEnvelope ( "QPE/System", "bassChange(bool)" ) << true; | 710 | QCopEnvelope ( "QPE/System", "bassChange(bool)" ) << true; |
711 | break; | 711 | break; |
712 | } | 712 | } |
713 | case UPD_Treble: { | 713 | case UPD_Treble: { |
714 | QCopEnvelope ( "QPE/System", "trebleChange(bool)" ) << true; | 714 | QCopEnvelope ( "QPE/System", "trebleChange(bool)" ) << true; |
715 | break; | 715 | break; |
716 | } | 716 | } |
717 | 717 | ||
718 | case UPD_None: | 718 | case UPD_None: |
719 | break; | 719 | break; |
720 | } | 720 | } |
721 | #endif | 721 | #endif |
722 | } | 722 | } |
723 | 723 | ||
724 | //=========================================================================== | 724 | //=========================================================================== |
725 | 725 | ||
726 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) | 726 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) |
727 | : QWidget( parent, name ) | 727 | : QWidget( parent, name ) |
728 | { | 728 | { |
729 | setFixedWidth ( AppLnk::smallIconSize() ); | 729 | setFixedWidth ( AppLnk::smallIconSize() ); |
730 | setFixedHeight ( AppLnk::smallIconSize()+4 ); | 730 | setFixedHeight ( AppLnk::smallIconSize()+4 ); |
731 | 731 | ||
732 | m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" )); | 732 | m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" )); |
733 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); | 733 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); |
734 | 734 | ||
735 | connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool ))); | 735 | connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool ))); |
736 | connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool ))); | 736 | connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool ))); |
737 | } | 737 | } |
738 | 738 | ||
739 | VolumeApplet::~VolumeApplet() | 739 | VolumeApplet::~VolumeApplet() |
740 | { | 740 | { |
741 | delete m_pixmap; | 741 | delete m_pixmap; |
742 | } | 742 | } |
743 | 743 | ||
744 | 744 | ||
745 | void VolumeApplet::mousePressEvent ( QMouseEvent * ) | 745 | void VolumeApplet::mousePressEvent ( QMouseEvent * ) |
746 | { | 746 | { |
747 | if ( m_dialog-> isVisible ( )) | 747 | if ( m_dialog-> isVisible ( )) |
748 | m_dialog-> hide ( ); | 748 | m_dialog-> hide ( ); |
749 | else | 749 | else |
750 | m_dialog-> show ( true ); | 750 | m_dialog-> show ( true ); |
751 | } | 751 | } |
752 | 752 | ||
753 | void VolumeApplet::redraw ( bool all ) | 753 | void VolumeApplet::redraw ( bool all ) |
754 | { | 754 | { |
755 | if ( all ) | 755 | if ( all ) |
756 | repaint ( true ); | 756 | repaint ( true ); |
757 | else | 757 | else |
758 | repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false ); | 758 | repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false ); |
759 | } | 759 | } |
760 | 760 | ||
761 | 761 | ||
762 | void VolumeApplet::paintEvent ( QPaintEvent * ) | 762 | void VolumeApplet::paintEvent ( QPaintEvent * ) |
763 | { | 763 | { |
764 | QPainter p ( this ); | 764 | QPainter p ( this ); |
765 | 765 | ||
766 | p. drawPixmap ( 0, 1, *m_pixmap ); | 766 | p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap ); |
767 | p. setPen ( darkGray ); | 767 | p. setPen ( darkGray ); |
768 | p. drawRect ( 1, height() - 4, width() - 2, 4 ); | 768 | p. drawRect ( 1, height() - 4, width() - 2, 4 ); |
769 | 769 | ||
770 | int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100; | 770 | int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100; |
771 | p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); | 771 | p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); |
772 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); | 772 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); |
773 | 773 | ||
774 | if ( m_dialog-> volMuted ( )) { | 774 | if ( m_dialog-> volMuted ( )) { |
775 | p. setPen ( red ); | 775 | p. setPen ( red ); |
776 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); | 776 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); |
777 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); | 777 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); |
778 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); | 778 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); |
779 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); | 779 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); |
780 | } | 780 | } |
781 | } | 781 | } |
782 | 782 | ||
783 | 783 | ||