30 files changed, 104 insertions, 685 deletions
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index bb0db9b..34d151e 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -1,86 +1,92 @@ | |||
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 <opie2/otaskbarapplet.h> | ||
23 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
24 | #include <qpe/applnk.h> | 25 | #include <qpe/applnk.h> |
25 | 26 | ||
26 | #include <qpainter.h> | 27 | #include <qpainter.h> |
27 | #include <qpopupmenu.h> | 28 | #include <qpopupmenu.h> |
28 | #include <qwindowsystem_qws.h> | 29 | #include <qwindowsystem_qws.h> |
29 | #include <qapplication.h> | 30 | #include <qapplication.h> |
30 | #include <qclipboard.h> | 31 | #include <qclipboard.h> |
31 | #include <qtimer.h> | 32 | #include <qtimer.h> |
32 | 33 | ||
33 | //=========================================================================== | 34 | //=========================================================================== |
34 | 35 | ||
35 | 36 | ||
36 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 37 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
37 | { | 38 | { |
38 | setFixedWidth ( AppLnk::smallIconSize() ); | 39 | setFixedWidth ( AppLnk::smallIconSize() ); |
39 | setFixedHeight ( AppLnk::smallIconSize() ); | 40 | setFixedHeight ( AppLnk::smallIconSize() ); |
40 | 41 | ||
41 | QImage img = Resource::loadImage( "paste"); | 42 | QImage img = Resource::loadImage( "paste"); |
42 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 43 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
43 | 44 | ||
44 | m_clipboardPixmap.convertFromImage( img ); | 45 | m_clipboardPixmap.convertFromImage( img ); |
45 | 46 | ||
46 | m_timer = new QTimer ( this ); | 47 | m_timer = new QTimer ( this ); |
47 | 48 | ||
48 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); | 49 | connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( ))); |
49 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); | 50 | connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( ))); |
50 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); | 51 | connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( ))); |
51 | 52 | ||
52 | m_menu = 0; | 53 | m_menu = 0; |
53 | m_dirty = true; | 54 | m_dirty = true; |
54 | m_lasttext = QString::null; | 55 | m_lasttext = QString::null; |
55 | 56 | ||
56 | m_timer-> start ( 0, true ); | 57 | m_timer-> start ( 0, true ); |
57 | } | 58 | } |
58 | 59 | ||
59 | ClipboardApplet::~ClipboardApplet ( ) | 60 | ClipboardApplet::~ClipboardApplet ( ) |
60 | { | 61 | { |
61 | } | 62 | } |
62 | 63 | ||
64 | int ClipboardApplet::position() | ||
65 | { | ||
66 | return 6; | ||
67 | } | ||
68 | |||
63 | void ClipboardApplet::shutdown ( ) | 69 | void ClipboardApplet::shutdown ( ) |
64 | { | 70 | { |
65 | // the timer has to be stopped, or Qt/E will hang on quit() | 71 | // the timer has to be stopped, or Qt/E will hang on quit() |
66 | // see launcher/desktop.cpp | 72 | // see launcher/desktop.cpp |
67 | 73 | ||
68 | m_timer-> stop ( ); | 74 | m_timer-> stop ( ); |
69 | } | 75 | } |
70 | 76 | ||
71 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) | 77 | void ClipboardApplet::mousePressEvent ( QMouseEvent *) |
72 | { | 78 | { |
73 | if ( m_dirty ) { | 79 | if ( m_dirty ) { |
74 | delete m_menu; | 80 | delete m_menu; |
75 | 81 | ||
76 | m_menu = new QPopupMenu ( this ); | 82 | m_menu = new QPopupMenu ( this ); |
77 | m_menu-> setCheckable ( true ); | 83 | m_menu-> setCheckable ( true ); |
78 | 84 | ||
79 | if ( m_history. count ( )) { | 85 | if ( m_history. count ( )) { |
80 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { | 86 | for ( unsigned int i = 0; i < m_history. count ( ); i++ ) { |
81 | QString str = m_history [i]; | 87 | QString str = m_history [i]; |
82 | 88 | ||
83 | if ( str. length ( ) > 20 ) | 89 | if ( str. length ( ) > 20 ) |
84 | str = str. left ( 20 ) + "..."; | 90 | str = str. left ( 20 ) + "..."; |
85 | 91 | ||
86 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); | 92 | m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i ); |
@@ -155,24 +161,29 @@ void ClipboardApplet::newData ( ) | |||
155 | 161 | ||
156 | if ( excllock ) | 162 | if ( excllock ) |
157 | return; | 163 | return; |
158 | else | 164 | else |
159 | excllock = true; | 165 | excllock = true; |
160 | 166 | ||
161 | m_timer-> stop ( ); | 167 | m_timer-> stop ( ); |
162 | 168 | ||
163 | QCString type = "plain"; | 169 | QCString type = "plain"; |
164 | QString txt = QApplication::clipboard ( )-> text ( type ); | 170 | QString txt = QApplication::clipboard ( )-> text ( type ); |
165 | 171 | ||
166 | if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { | 172 | if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) { |
167 | m_history. append ( txt ); | 173 | m_history. append ( txt ); |
168 | 174 | ||
169 | if ( m_history. count ( ) > 5 ) | 175 | if ( m_history. count ( ) > 5 ) |
170 | m_history. remove ( m_history. begin ( )); | 176 | m_history. remove ( m_history. begin ( )); |
171 | 177 | ||
172 | m_dirty = true; | 178 | m_dirty = true; |
173 | } | 179 | } |
174 | 180 | ||
175 | m_timer-> start ( 1500, true ); | 181 | m_timer-> start ( 1500, true ); |
176 | 182 | ||
177 | excllock = false; | 183 | excllock = false; |
178 | } | 184 | } |
185 | |||
186 | Q_EXPORT_INTERFACE() | ||
187 | { | ||
188 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> ); | ||
189 | } | ||
diff --git a/core/applets/clipboardapplet/clipboard.h b/core/applets/clipboardapplet/clipboard.h index ec87d39..bbda0ff 100644 --- a/core/applets/clipboardapplet/clipboard.h +++ b/core/applets/clipboardapplet/clipboard.h | |||
@@ -11,47 +11,48 @@ | |||
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 __CLIPBOARD_APPLET_H__ | 20 | #ifndef __CLIPBOARD_APPLET_H__ |
21 | #define __CLIPBOARD_APPLET_H__ | 21 | #define __CLIPBOARD_APPLET_H__ |
22 | 22 | ||
23 | #include <qwidget.h> | 23 | #include <qwidget.h> |
24 | #include <qpixmap.h> | 24 | #include <qpixmap.h> |
25 | #include <qstringlist.h> | 25 | #include <qstringlist.h> |
26 | 26 | ||
27 | class QTimer; | 27 | class QTimer; |
28 | 28 | ||
29 | class ClipboardApplet : public QWidget | 29 | class ClipboardApplet : public QWidget |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
33 | ClipboardApplet ( QWidget *parent = 0, const char *name=0 ); | 33 | ClipboardApplet ( QWidget *parent = 0, const char *name=0 ); |
34 | ~ClipboardApplet ( ); | 34 | ~ClipboardApplet ( ); |
35 | static int position(); | ||
35 | 36 | ||
36 | protected: | 37 | protected: |
37 | void mousePressEvent ( QMouseEvent *); | 38 | void mousePressEvent ( QMouseEvent *); |
38 | void paintEvent ( QPaintEvent* ); | 39 | void paintEvent ( QPaintEvent* ); |
39 | 40 | ||
40 | private slots: | 41 | private slots: |
41 | void action ( int ); | 42 | void action ( int ); |
42 | void newData ( ); | 43 | void newData ( ); |
43 | void shutdown ( ); | 44 | void shutdown ( ); |
44 | 45 | ||
45 | private: | 46 | private: |
46 | QPopupMenu * m_menu; | 47 | QPopupMenu * m_menu; |
47 | QStringList m_history; | 48 | QStringList m_history; |
48 | bool m_dirty; | 49 | bool m_dirty; |
49 | QString m_lasttext; | 50 | QString m_lasttext; |
50 | QTimer * m_timer; | 51 | QTimer * m_timer; |
51 | 52 | ||
52 | QPixmap m_clipboardPixmap; | 53 | QPixmap m_clipboardPixmap; |
53 | }; | 54 | }; |
54 | 55 | ||
55 | 56 | ||
56 | #endif // __CLIPBOARD_APPLET_H__ | 57 | #endif // __CLIPBOARD_APPLET_H__ |
57 | 58 | ||
diff --git a/core/applets/clipboardapplet/clipboardapplet.pro b/core/applets/clipboardapplet/clipboardapplet.pro index f6842a2..74cf48c 100644 --- a/core/applets/clipboardapplet/clipboardapplet.pro +++ b/core/applets/clipboardapplet/clipboardapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= clipboard.h clipboardappletimpl.h | 3 | HEADERS = clipboard.h |
4 | SOURCES= clipboard.cpp clipboardappletimpl.cpp | 4 | SOURCES = clipboard.cpp |
5 | TARGET = clipboardapplet | 5 | TARGET = clipboardapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.cpp b/core/applets/clipboardapplet/clipboardappletimpl.cpp deleted file mode 100644 index f454529..0000000 --- a/core/applets/clipboardapplet/clipboardappletimpl.cpp +++ b/dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #include "clipboard.h" | ||
21 | #include "clipboardappletimpl.h" | ||
22 | |||
23 | |||
24 | ClipboardAppletImpl::ClipboardAppletImpl() | ||
25 | : clipboard(0) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | ClipboardAppletImpl::~ClipboardAppletImpl() | ||
30 | { | ||
31 | delete clipboard; | ||
32 | } | ||
33 | |||
34 | QWidget *ClipboardAppletImpl::applet( QWidget *parent ) | ||
35 | { | ||
36 | if ( !clipboard ) | ||
37 | clipboard = new ClipboardApplet( parent ); | ||
38 | return clipboard; | ||
39 | } | ||
40 | |||
41 | int ClipboardAppletImpl::position() const | ||
42 | { | ||
43 | return 6; | ||
44 | } | ||
45 | |||
46 | QRESULT ClipboardAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
47 | { | ||
48 | *iface = 0; | ||
49 | if ( uuid == IID_QUnknown ) | ||
50 | *iface = this; | ||
51 | else if ( uuid == IID_TaskbarApplet ) | ||
52 | *iface = this; | ||
53 | else | ||
54 | return QS_FALSE; | ||
55 | |||
56 | if ( *iface ) | ||
57 | (*iface)->addRef(); | ||
58 | return QS_OK; | ||
59 | } | ||
60 | |||
61 | Q_EXPORT_INTERFACE() | ||
62 | { | ||
63 | Q_CREATE_INSTANCE( ClipboardAppletImpl ) | ||
64 | } | ||
65 | |||
66 | |||
diff --git a/core/applets/clipboardapplet/clipboardappletimpl.h b/core/applets/clipboardapplet/clipboardappletimpl.h deleted file mode 100644 index 497360c..0000000 --- a/core/applets/clipboardapplet/clipboardappletimpl.h +++ b/dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #ifndef CLIPBOARDAPPLETIMPL_H | ||
21 | #define CLIPBOARDAPPLETIMPL_H | ||
22 | |||
23 | #include <qpe/taskbarappletinterface.h> | ||
24 | |||
25 | class ClipboardApplet; | ||
26 | |||
27 | class ClipboardAppletImpl : public TaskbarAppletInterface | ||
28 | { | ||
29 | public: | ||
30 | ClipboardAppletImpl(); | ||
31 | virtual ~ClipboardAppletImpl(); | ||
32 | |||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
34 | Q_REFCOUNT | ||
35 | |||
36 | virtual QWidget *applet( QWidget *parent ); | ||
37 | virtual int position() const; | ||
38 | |||
39 | private: | ||
40 | ClipboardApplet *clipboard; | ||
41 | }; | ||
42 | |||
43 | #endif | ||
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index aadd9b6..9fead03 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp | |||
@@ -1,64 +1,70 @@ | |||
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 "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <opie2/otaskbarapplet.h> | ||
23 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
26 | 27 | ||
27 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 28 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) |
28 | { | 29 | { |
29 | // If you want a sunken border around the clock do this: | 30 | // If you want a sunken border around the clock do this: |
30 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 31 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
31 | //setFont( QFont( "Helvetica", , QFont::Normal ) ); | 32 | //setFont( QFont( "Helvetica", , QFont::Normal ) ); |
32 | connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) ); | 33 | connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) ); |
33 | connect( qApp, SIGNAL( clockChanged( bool ) ), | 34 | connect( qApp, SIGNAL( clockChanged( bool ) ), |
34 | this, SLOT( slotClockChanged( bool ) ) ); | 35 | this, SLOT( slotClockChanged( bool ) ) ); |
35 | readConfig(); | 36 | readConfig(); |
36 | timerId = 0; | 37 | timerId = 0; |
37 | timerEvent( 0 ); | 38 | timerEvent( 0 ); |
38 | show(); | 39 | show(); |
39 | } | 40 | } |
40 | 41 | ||
42 | int LauncherClock::position() | ||
43 | { | ||
44 | return 10; | ||
45 | } | ||
46 | |||
41 | void LauncherClock::readConfig() { | 47 | void LauncherClock::readConfig() { |
42 | Config config( "qpe" ); | 48 | Config config( "qpe" ); |
43 | config.setGroup( "Time" ); | 49 | config.setGroup( "Time" ); |
44 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); | 50 | ampmFormat = config.readBoolEntry( "AMPM", TRUE ); |
45 | config.setGroup( "Date" ); | 51 | config.setGroup( "Date" ); |
46 | format = config.readNumEntry("ClockApplet",0); | 52 | format = config.readNumEntry("ClockApplet",0); |
47 | } | 53 | } |
48 | 54 | ||
49 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) | 55 | void LauncherClock::mouseReleaseEvent( QMouseEvent * ) |
50 | { | 56 | { |
51 | QCString setTimeApp; | 57 | QCString setTimeApp; |
52 | setTimeApp="systemtime"; | 58 | setTimeApp="systemtime"; |
53 | QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()"); | 59 | QCopEnvelope e("QPE/Application/"+setTimeApp, "raise()"); |
54 | } | 60 | } |
55 | 61 | ||
56 | 62 | ||
57 | void LauncherClock::timerEvent( QTimerEvent *e ) | 63 | void LauncherClock::timerEvent( QTimerEvent *e ) |
58 | { | 64 | { |
59 | if ( !e || e->timerId() == timerId ) { | 65 | if ( !e || e->timerId() == timerId ) { |
60 | killTimer( timerId ); | 66 | killTimer( timerId ); |
61 | changeTime(); | 67 | changeTime(); |
62 | QTime t = QTime::currentTime(); | 68 | QTime t = QTime::currentTime(); |
63 | int ms = (60 - t.second())*1000 - t.msec(); | 69 | int ms = (60 - t.second())*1000 - t.msec(); |
64 | timerId = startTimer( ms ); | 70 | timerId = startTimer( ms ); |
@@ -86,24 +92,30 @@ void LauncherClock::changeTime( void ) | |||
86 | (tm.hour() >= 12) ? "PM" : "AM" ); | 92 | (tm.hour() >= 12) ? "PM" : "AM" ); |
87 | } else | 93 | } else |
88 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); | 94 | s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); |
89 | 95 | ||
90 | if (format==1) { | 96 | if (format==1) { |
91 | QDate dm = QDate::currentDate(); | 97 | QDate dm = QDate::currentDate(); |
92 | QString d; | 98 | QString d; |
93 | d.sprintf("%d/%d ", dm.day(), dm.month()); | 99 | d.sprintf("%d/%d ", dm.day(), dm.month()); |
94 | setText( d+s ); | 100 | setText( d+s ); |
95 | } else if (format==2) { | 101 | } else if (format==2) { |
96 | QDate dm = QDate::currentDate(); | 102 | QDate dm = QDate::currentDate(); |
97 | QString d; | 103 | QString d; |
98 | d.sprintf("%d/%d ", dm.month(), dm.day()); | 104 | d.sprintf("%d/%d ", dm.month(), dm.day()); |
99 | setText( d+s ); | 105 | setText( d+s ); |
100 | } else { | 106 | } else { |
101 | setText( s ); | 107 | setText( s ); |
102 | } | 108 | } |
103 | } | 109 | } |
104 | 110 | ||
105 | void LauncherClock::slotClockChanged( bool pm ) | 111 | void LauncherClock::slotClockChanged( bool pm ) |
106 | { | 112 | { |
107 | readConfig(); | 113 | readConfig(); |
108 | updateTime(); | 114 | updateTime(); |
109 | } | 115 | } |
116 | |||
117 | Q_EXPORT_INTERFACE() | ||
118 | { | ||
119 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> ); | ||
120 | } | ||
121 | |||
diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h index caa0c5f..996fb56 100644 --- a/core/applets/clockapplet/clock.h +++ b/core/applets/clockapplet/clock.h | |||
@@ -8,41 +8,42 @@ | |||
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 __LAUNCHER_CLOCK_H__ | 20 | #ifndef __LAUNCHER_CLOCK_H__ |
21 | #define __LAUNCHER_CLOCK_H__ | 21 | #define __LAUNCHER_CLOCK_H__ |
22 | 22 | ||
23 | 23 | ||
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qdatetime.h> | 25 | #include <qdatetime.h> |
26 | 26 | ||
27 | class LauncherClock : public QLabel | 27 | class LauncherClock : public QLabel |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | LauncherClock( QWidget *parent ); | 31 | LauncherClock( QWidget *parent ); |
32 | static int position(); | ||
32 | 33 | ||
33 | protected slots: | 34 | protected slots: |
34 | void updateTime( void ); | 35 | void updateTime( void ); |
35 | void slotClockChanged( bool pm ); | 36 | void slotClockChanged( bool pm ); |
36 | 37 | ||
37 | protected: | 38 | protected: |
38 | void mouseReleaseEvent( QMouseEvent * ); | 39 | void mouseReleaseEvent( QMouseEvent * ); |
39 | void timerEvent( QTimerEvent * ); | 40 | void timerEvent( QTimerEvent * ); |
40 | void changeTime( void ); | 41 | void changeTime( void ); |
41 | void readConfig(); | 42 | void readConfig(); |
42 | bool ampmFormat; | 43 | bool ampmFormat; |
43 | int timerId; | 44 | int timerId; |
44 | int format; | 45 | int format; |
45 | }; | 46 | }; |
46 | 47 | ||
47 | 48 | ||
48 | #endif // __LAUNCHER_CLOCK_H__ | 49 | #endif // __LAUNCHER_CLOCK_H__ |
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro index 057e332..8ce3f6f 100644 --- a/core/applets/clockapplet/clockapplet.pro +++ b/core/applets/clockapplet/clockapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= clock.h clockappletimpl.h | 3 | HEADERS = clock.h |
4 | SOURCES= clock.cpp clockappletimpl.cpp | 4 | SOURCES = clock.cpp |
5 | TARGET = clockapplet | 5 | TARGET = clockapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp deleted file mode 100644 index 7481f19..0000000 --- a/core/applets/clockapplet/clockappletimpl.cpp +++ b/dev/null | |||
@@ -1,67 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #include "clock.h" | ||
21 | #include "clockappletimpl.h" | ||
22 | |||
23 | |||
24 | ClockAppletImpl::ClockAppletImpl() | ||
25 | : clock(0) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | ClockAppletImpl::~ClockAppletImpl() | ||
30 | { | ||
31 | delete clock; | ||
32 | } | ||
33 | |||
34 | QWidget *ClockAppletImpl::applet( QWidget *parent ) | ||
35 | { | ||
36 | if ( !clock ) | ||
37 | clock = new LauncherClock( parent ); | ||
38 | return clock; | ||
39 | } | ||
40 | |||
41 | int ClockAppletImpl::position() const | ||
42 | { | ||
43 | return 10; | ||
44 | } | ||
45 | |||
46 | #ifndef QT_NO_COMPONENT | ||
47 | QRESULT ClockAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
48 | { | ||
49 | *iface = 0; | ||
50 | if ( uuid == IID_QUnknown ) | ||
51 | *iface = this; | ||
52 | else if ( uuid == IID_TaskbarApplet ) | ||
53 | *iface = this; | ||
54 | else | ||
55 | return QS_FALSE; | ||
56 | |||
57 | if ( *iface ) | ||
58 | (*iface)->addRef(); | ||
59 | return QS_OK; | ||
60 | } | ||
61 | |||
62 | Q_EXPORT_INTERFACE() | ||
63 | { | ||
64 | Q_CREATE_INSTANCE( ClockAppletImpl ) | ||
65 | } | ||
66 | #endif | ||
67 | |||
diff --git a/core/applets/clockapplet/clockappletimpl.h b/core/applets/clockapplet/clockappletimpl.h deleted file mode 100644 index 1f9c8f0..0000000 --- a/core/applets/clockapplet/clockappletimpl.h +++ b/dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #ifndef CLOCKAPPLETIMPL_H | ||
21 | #define CLOCKAPPLETIMPL_H | ||
22 | |||
23 | #include <qpe/taskbarappletinterface.h> | ||
24 | |||
25 | class LauncherClock; | ||
26 | |||
27 | class ClockAppletImpl : public TaskbarAppletInterface | ||
28 | { | ||
29 | public: | ||
30 | ClockAppletImpl(); | ||
31 | virtual ~ClockAppletImpl(); | ||
32 | |||
33 | #ifndef QT_NO_COMPONENT | ||
34 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
35 | Q_REFCOUNT | ||
36 | #endif | ||
37 | |||
38 | virtual QWidget *applet( QWidget *parent ); | ||
39 | virtual int position() const; | ||
40 | |||
41 | private: | ||
42 | LauncherClock *clock; | ||
43 | }; | ||
44 | |||
45 | #endif | ||
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index a47f33d..afc0592 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -1,86 +1,94 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org> | 2 | ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org> |
3 | ** Max Reiss <harlekin@handhelds.org> [trivial stuff] | 3 | ** Max Reiss <harlekin@handhelds.org> [trivial stuff] |
4 | ** Robert Griebl <sandman@handhelds.org> | 4 | ** Robert Griebl <sandman@handhelds.org> |
5 | ** Holger Freyther <zecke@handhelds.org> QCOP Interface | 5 | ** Holger Freyther <zecke@handhelds.org> QCOP Interface |
6 | ** | 6 | ** |
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | **********************************************************************/ | 15 | **********************************************************************/ |
16 | 16 | ||
17 | #include "irda.h" | ||
17 | 18 | ||
19 | /* OPIE */ | ||
20 | #include <opie2/otaskbarapplet.h> | ||
18 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
20 | 23 | ||
24 | /* QT */ | ||
21 | #include <qpainter.h> | 25 | #include <qpainter.h> |
22 | #include <qfile.h> | 26 | #include <qfile.h> |
23 | #include <qtimer.h> | 27 | #include <qtimer.h> |
24 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
25 | 29 | ||
30 | /* STD */ | ||
26 | #include <unistd.h> | 31 | #include <unistd.h> |
27 | #include <net/if.h> | 32 | #include <net/if.h> |
28 | #include <netinet/in.h> | 33 | #include <netinet/in.h> |
29 | #include <sys/types.h> | 34 | #include <sys/types.h> |
30 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |
31 | #include <sys/ioctl.h> | 36 | #include <sys/ioctl.h> |
32 | 37 | ||
33 | #include "irda.h" | ||
34 | |||
35 | //=========================================================================== | 38 | //=========================================================================== |
36 | 39 | ||
37 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 40 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) |
38 | : QWidget ( parent, name ) | 41 | : QWidget ( parent, name ) |
39 | { | 42 | { |
40 | setFixedHeight ( 18 ); | 43 | setFixedHeight ( 18 ); |
41 | setFixedWidth ( 14 ); | 44 | setFixedWidth ( 14 ); |
42 | 45 | ||
43 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); | 46 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); |
44 | 47 | ||
45 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); | 48 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); |
46 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); | 49 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); |
47 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); | 50 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); |
48 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); | 51 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); |
49 | 52 | ||
50 | m_irda_active = false; | 53 | m_irda_active = false; |
51 | m_irda_discovery_active = false; | 54 | m_irda_discovery_active = false; |
52 | m_receive_active = false; | 55 | m_receive_active = false; |
53 | m_receive_state_changed = false; | 56 | m_receive_state_changed = false; |
54 | m_popup = 0; | 57 | m_popup = 0; |
55 | m_wasOn = false; | 58 | m_wasOn = false; |
56 | m_wasDiscover = false; | 59 | m_wasDiscover = false; |
57 | 60 | ||
58 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); | 61 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); |
59 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), | 62 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), |
60 | this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) ); | 63 | this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) ); |
61 | } | 64 | } |
62 | 65 | ||
66 | int IrdaApplet::position() | ||
67 | { | ||
68 | return 6; | ||
69 | } | ||
70 | |||
63 | void IrdaApplet::show() | 71 | void IrdaApplet::show() |
64 | { | 72 | { |
65 | QWidget::show ( ); | 73 | QWidget::show ( ); |
66 | startTimer ( 2000 ); | 74 | startTimer ( 2000 ); |
67 | } | 75 | } |
68 | 76 | ||
69 | IrdaApplet::~IrdaApplet() | 77 | IrdaApplet::~IrdaApplet() |
70 | { | 78 | { |
71 | if ( m_sockfd >= 0 ) | 79 | if ( m_sockfd >= 0 ) |
72 | ::close ( m_sockfd ); | 80 | ::close ( m_sockfd ); |
73 | } | 81 | } |
74 | 82 | ||
75 | void IrdaApplet::popup ( QString message, QString icon ) | 83 | void IrdaApplet::popup ( QString message, QString icon ) |
76 | { | 84 | { |
77 | if ( !m_popup ) | 85 | if ( !m_popup ) |
78 | m_popup = new QPopupMenu ( this ); | 86 | m_popup = new QPopupMenu ( this ); |
79 | 87 | ||
80 | m_popup-> clear ( ); | 88 | m_popup-> clear ( ); |
81 | 89 | ||
82 | if ( icon. isEmpty ( )) | 90 | if ( icon. isEmpty ( )) |
83 | m_popup-> insertItem ( message, 0 ); | 91 | m_popup-> insertItem ( message, 0 ); |
84 | else | 92 | else |
85 | m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); | 93 | m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); |
86 | 94 | ||
@@ -329,24 +337,29 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | |||
329 | if (!m_wasOn) { | 337 | if (!m_wasOn) { |
330 | setIrdaStatus( true ); | 338 | setIrdaStatus( true ); |
331 | } | 339 | } |
332 | if ( !m_wasDiscover ) { | 340 | if ( !m_wasDiscover ) { |
333 | setIrdaDiscoveryStatus ( true ); | 341 | setIrdaDiscoveryStatus ( true ); |
334 | } | 342 | } |
335 | } else if ( str == "disableIrda()") { | 343 | } else if ( str == "disableIrda()") { |
336 | if (!m_wasOn) { | 344 | if (!m_wasOn) { |
337 | setIrdaStatus( false ); | 345 | setIrdaStatus( false ); |
338 | } | 346 | } |
339 | if ( !m_wasDiscover ) { | 347 | if ( !m_wasDiscover ) { |
340 | setIrdaDiscoveryStatus ( false ); | 348 | setIrdaDiscoveryStatus ( false ); |
341 | } | 349 | } |
342 | } else if ( str == "listDevices()") { | 350 | } else if ( str == "listDevices()") { |
343 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 351 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
344 | 352 | ||
345 | QStringList list; | 353 | QStringList list; |
346 | QMap<QString, QString>::Iterator it; | 354 | QMap<QString, QString>::Iterator it; |
347 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 355 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
348 | list << (*it); | 356 | list << (*it); |
349 | 357 | ||
350 | e << list; | 358 | e << list; |
351 | } | 359 | } |
352 | } | 360 | } |
361 | |||
362 | Q_EXPORT_INTERFACE() | ||
363 | { | ||
364 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> ); | ||
365 | } | ||
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index ec1d32c..f713bbe 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h | |||
@@ -7,48 +7,49 @@ | |||
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 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef __OPIE_IRDA_APPLET_H__ | 16 | #ifndef __OPIE_IRDA_APPLET_H__ |
17 | #define __OPIE_IRDA_APPLET_H__ | 17 | #define __OPIE_IRDA_APPLET_H__ |
18 | 18 | ||
19 | #include <qwidget.h> | 19 | #include <qwidget.h> |
20 | #include <qpixmap.h> | 20 | #include <qpixmap.h> |
21 | #include <qpopupmenu.h> | 21 | #include <qpopupmenu.h> |
22 | #include <qmap.h> | 22 | #include <qmap.h> |
23 | 23 | ||
24 | class IrdaApplet : public QWidget | 24 | class IrdaApplet : public QWidget |
25 | { | 25 | { |
26 | Q_OBJECT | 26 | Q_OBJECT |
27 | 27 | ||
28 | public: | 28 | public: |
29 | IrdaApplet( QWidget *parent = 0, const char *name = 0 ); | 29 | IrdaApplet( QWidget *parent = 0, const char *name = 0 ); |
30 | ~IrdaApplet(); | 30 | ~IrdaApplet(); |
31 | static int position(); | ||
31 | 32 | ||
32 | virtual void show ( ); | 33 | virtual void show ( ); |
33 | 34 | ||
34 | protected: | 35 | protected: |
35 | virtual void timerEvent ( QTimerEvent * ); | 36 | virtual void timerEvent ( QTimerEvent * ); |
36 | virtual void mousePressEvent ( QMouseEvent * ); | 37 | virtual void mousePressEvent ( QMouseEvent * ); |
37 | virtual void paintEvent ( QPaintEvent* ); | 38 | virtual void paintEvent ( QPaintEvent* ); |
38 | 39 | ||
39 | private slots: | 40 | private slots: |
40 | void popupTimeout ( ); | 41 | void popupTimeout ( ); |
41 | void slotMessage( const QCString& , const QByteArray& ); | 42 | void slotMessage( const QCString& , const QByteArray& ); |
42 | 43 | ||
43 | private: | 44 | private: |
44 | void popup( QString message, QString icon = QString::null ); | 45 | void popup( QString message, QString icon = QString::null ); |
45 | 46 | ||
46 | bool checkIrdaStatus ( ); | 47 | bool checkIrdaStatus ( ); |
47 | bool setIrdaStatus ( bool ); | 48 | bool setIrdaStatus ( bool ); |
48 | bool checkIrdaDiscoveryStatus (); | 49 | bool checkIrdaDiscoveryStatus (); |
49 | bool setIrdaDiscoveryStatus ( bool ); | 50 | bool setIrdaDiscoveryStatus ( bool ); |
50 | bool setIrdaReceiveStatus ( bool ); | 51 | bool setIrdaReceiveStatus ( bool ); |
51 | 52 | ||
52 | void showDiscovered(); | 53 | void showDiscovered(); |
53 | 54 | ||
54 | private: | 55 | private: |
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro index 4e94dfb..31e8691 100644 --- a/core/applets/irdaapplet/irdaapplet.pro +++ b/core/applets/irdaapplet/irdaapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = irda.h irdaappletimpl.h | 3 | HEADERS = irda.h |
4 | SOURCES = irda.cpp irdaappletimpl.cpp | 4 | SOURCES = irda.cpp |
5 | TARGET = irdaapplet | 5 | TARGET = irdaapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/irdaapplet/irdaappletimpl.cpp b/core/applets/irdaapplet/irdaappletimpl.cpp deleted file mode 100644 index 33d98af..0000000 --- a/core/applets/irdaapplet/irdaappletimpl.cpp +++ b/dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #include "irda.h" | ||
21 | #include "irdaappletimpl.h" | ||
22 | |||
23 | |||
24 | IrdaAppletImpl::IrdaAppletImpl() | ||
25 | : irda(0) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | IrdaAppletImpl::~IrdaAppletImpl() | ||
30 | { | ||
31 | delete irda; | ||
32 | } | ||
33 | |||
34 | QWidget *IrdaAppletImpl::applet( QWidget *parent ) | ||
35 | { | ||
36 | if ( !irda ) | ||
37 | irda = new IrdaApplet( parent ); | ||
38 | return irda; | ||
39 | } | ||
40 | |||
41 | int IrdaAppletImpl::position() const | ||
42 | { | ||
43 | return 6; | ||
44 | } | ||
45 | |||
46 | QRESULT IrdaAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
47 | { | ||
48 | *iface = 0; | ||
49 | if ( uuid == IID_QUnknown ) | ||
50 | *iface = this; | ||
51 | else if ( uuid == IID_TaskbarApplet ) | ||
52 | *iface = this; | ||
53 | else | ||
54 | return QS_FALSE; | ||
55 | |||
56 | if ( *iface ) | ||
57 | (*iface)->addRef(); | ||
58 | return QS_OK; | ||
59 | } | ||
60 | |||
61 | Q_EXPORT_INTERFACE() | ||
62 | { | ||
63 | Q_CREATE_INSTANCE( IrdaAppletImpl ) | ||
64 | } | ||
65 | |||
66 | |||
diff --git a/core/applets/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h deleted file mode 100644 index 024cc06..0000000 --- a/core/applets/irdaapplet/irdaappletimpl.h +++ b/dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #ifndef IRDAAPPLETIMPL_H | ||
21 | #define IRDAAPPLETIMPL_H | ||
22 | |||
23 | #include <qwidget.h> | ||
24 | |||
25 | #include <qpe/taskbarappletinterface.h> | ||
26 | |||
27 | class IrdaApplet; | ||
28 | |||
29 | class IrdaAppletImpl : public TaskbarAppletInterface | ||
30 | { | ||
31 | public: | ||
32 | IrdaAppletImpl(); | ||
33 | virtual ~IrdaAppletImpl(); | ||
34 | |||
35 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
36 | Q_REFCOUNT | ||
37 | |||
38 | virtual QWidget *applet( QWidget *parent ); | ||
39 | virtual int position() const; | ||
40 | |||
41 | private: | ||
42 | IrdaApplet *irda; | ||
43 | }; | ||
44 | |||
45 | #endif | ||
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 56a031c..5d6bce4 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp | |||
@@ -1,60 +1,63 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com | 2 | ** Copyright (C) 2002 L.J. Potter ljp@llornkcor.com |
3 | ** All rights reserved. | 3 | ** All rights reserved. |
4 | ** | 4 | ** |
5 | ** This file may be distributed and/or modified under the terms of the | 5 | ** This file may be distributed and/or modified under the terms of the |
6 | ** GNU General Public License version 2 as published by the Free Software | 6 | ** GNU General Public License version 2 as published by the Free Software |
7 | ** Foundation and appearing in the file LICENSE.GPL included in the | 7 | ** Foundation and appearing in the file LICENSE.GPL included in the |
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | **********************************************************************/ | 13 | **********************************************************************/ |
14 | 14 | ||
15 | #include "screenshot.h" | 15 | #include "screenshot.h" |
16 | #include "inputDialog.h" | 16 | #include "inputDialog.h" |
17 | 17 | ||
18 | #include <stdlib.h> | 18 | /* OPIE */ |
19 | #include <sys/socket.h> | 19 | #include <opie2/otaskbarapplet.h> |
20 | #include <netinet/in.h> | ||
21 | #include <netdb.h> | ||
22 | #include <unistd.h> | ||
23 | |||
24 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/applnk.h> | 21 | #include <qpe/applnk.h> |
26 | 22 | ||
23 | /* QT */ | ||
27 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
28 | #include <qdir.h> | 25 | #include <qdir.h> |
29 | #include <qlabel.h> | 26 | #include <qlabel.h> |
30 | #include <qpushbutton.h> | 27 | #include <qpushbutton.h> |
31 | #include <qpainter.h> | 28 | #include <qpainter.h> |
32 | #include <qspinbox.h> | 29 | #include <qspinbox.h> |
33 | #include <qlayout.h> | 30 | #include <qlayout.h> |
34 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
35 | #include <qmessagebox.h> | 32 | #include <qmessagebox.h> |
36 | 33 | ||
34 | /* STD */ | ||
35 | #include <stdlib.h> | ||
36 | #include <sys/socket.h> | ||
37 | #include <netinet/in.h> | ||
38 | #include <netdb.h> | ||
39 | #include <unistd.h> | ||
37 | 40 | ||
38 | /* XPM */ | 41 | /* XPM */ |
39 | static char * snapshot_xpm[] = { | 42 | static char * snapshot_xpm[] = { |
40 | "32 32 177 2", | 43 | "32 32 177 2", |
41 | " c None", | 44 | " c None", |
42 | ". c #042045", | 45 | ". c #042045", |
43 | "+ c #0D2B47", | 46 | "+ c #0D2B47", |
44 | "@ c #0E325E", | 47 | "@ c #0E325E", |
45 | "# c #0D2E50", | 48 | "# c #0D2E50", |
46 | "$ c #0A1C32", | 49 | "$ c #0A1C32", |
47 | "% c #0F3A69", | 50 | "% c #0F3A69", |
48 | "& c #164680", | 51 | "& c #164680", |
49 | "* c #165EAE", | 52 | "* c #165EAE", |
50 | "= c #134D89", | 53 | "= c #134D89", |
51 | "- c #0A3A6E", | 54 | "- c #0A3A6E", |
52 | "; c #031024", | 55 | "; c #031024", |
53 | "> c #031B36", | 56 | "> c #031B36", |
54 | ", c #1A5EA3", | 57 | ", c #1A5EA3", |
55 | "' c #1862B1", | 58 | "' c #1862B1", |
56 | ") c #1866B9", | 59 | ") c #1866B9", |
57 | "! c #0F5AAC", | 60 | "! c #0F5AAC", |
58 | "~ c #0F56A8", | 61 | "~ c #0F56A8", |
59 | "{ c #0C4C96", | 62 | "{ c #0C4C96", |
60 | "] c #030918", | 63 | "] c #030918", |
@@ -476,55 +479,65 @@ void ScreenshotControl::performGrab() | |||
476 | QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable.")); | 479 | QMessageBox::warning( 0, tr( "Error" ),tr("Please set <b>QWS_DISPLAY</b> environmental variable.")); |
477 | } | 480 | } |
478 | } | 481 | } |
479 | 482 | ||
480 | } | 483 | } |
481 | 484 | ||
482 | 485 | ||
483 | 486 | ||
484 | //=========================================================================== | 487 | //=========================================================================== |
485 | 488 | ||
486 | ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) | 489 | ScreenshotApplet::ScreenshotApplet( QWidget *parent, const char *name ) |
487 | : QWidget( parent, name ) | 490 | : QWidget( parent, name ) |
488 | { | 491 | { |
489 | setFixedWidth( AppLnk::smallIconSize()); | 492 | setFixedWidth( AppLnk::smallIconSize()); |
490 | 493 | ||
491 | QImage img = (const char **)snapshot_xpm; | 494 | QImage img = (const char **)snapshot_xpm; |
492 | img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 495 | img = img.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); |
493 | m_icon.convertFromImage(img); | 496 | m_icon.convertFromImage(img); |
494 | } | 497 | } |
495 | 498 | ||
496 | ScreenshotApplet::~ScreenshotApplet() | 499 | ScreenshotApplet::~ScreenshotApplet() |
497 | { | 500 | { |
498 | } | 501 | } |
499 | 502 | ||
503 | int ScreenshotApplet::position() | ||
504 | { | ||
505 | return 6; | ||
506 | } | ||
507 | |||
500 | void ScreenshotApplet::mousePressEvent( QMouseEvent *) | 508 | void ScreenshotApplet::mousePressEvent( QMouseEvent *) |
501 | { | 509 | { |
502 | ScreenshotControl *sc = new ScreenshotControl ( ); | 510 | ScreenshotControl *sc = new ScreenshotControl ( ); |
503 | QPoint curPos = mapToGlobal ( QPoint ( 0, 0 )); | 511 | QPoint curPos = mapToGlobal ( QPoint ( 0, 0 )); |
504 | 512 | ||
505 | // windowPosX is the windows position centered above the applets icon. | 513 | // windowPosX is the windows position centered above the applets icon. |
506 | // If the icon is near the edge of the screen, the window would leave the visible area | 514 | // If the icon is near the edge of the screen, the window would leave the visible area |
507 | // so we check the position against the screen width and correct the difference if needed | 515 | // so we check the position against the screen width and correct the difference if needed |
508 | 516 | ||
509 | int screenWidth = qApp->desktop()->width(); | 517 | int screenWidth = qApp->desktop()->width(); |
510 | int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ; | 518 | int windowPosX = curPos. x ( ) - ( sc-> sizeHint ( ). width ( ) - width ( )) / 2 ; |
511 | int ZwindowPosX, XwindowPosX; | 519 | int ZwindowPosX, XwindowPosX; |
512 | 520 | ||
513 | // the window would be placed beyond the screen wich doesn't look tooo good | 521 | // the window would be placed beyond the screen wich doesn't look tooo good |
514 | if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) { | 522 | if ( (windowPosX + sc-> sizeHint ( ). width ( )) > screenWidth ) { |
515 | XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth; | 523 | XwindowPosX = windowPosX + sc-> sizeHint ( ). width ( ) - screenWidth; |
516 | ZwindowPosX = windowPosX - XwindowPosX - 1; | 524 | ZwindowPosX = windowPosX - XwindowPosX - 1; |
517 | } else { | 525 | } else { |
518 | ZwindowPosX = windowPosX; | 526 | ZwindowPosX = windowPosX; |
519 | } | 527 | } |
520 | 528 | ||
521 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); | 529 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); |
522 | sc-> show ( ); | 530 | sc-> show ( ); |
523 | } | 531 | } |
524 | 532 | ||
525 | void ScreenshotApplet::paintEvent( QPaintEvent* ) | 533 | void ScreenshotApplet::paintEvent( QPaintEvent* ) |
526 | { | 534 | { |
527 | QPainter p ( this ); | 535 | QPainter p ( this ); |
528 | p.drawPixmap( 0,0, m_icon ); | 536 | p.drawPixmap( 0,0, m_icon ); |
529 | } | 537 | } |
530 | 538 | ||
539 | Q_EXPORT_INTERFACE() | ||
540 | { | ||
541 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> ); | ||
542 | } | ||
543 | |||
diff --git a/core/applets/screenshotapplet/screenshot.h b/core/applets/screenshotapplet/screenshot.h index 74cc5e6..b753583 100644 --- a/core/applets/screenshotapplet/screenshot.h +++ b/core/applets/screenshotapplet/screenshot.h | |||
@@ -35,36 +35,37 @@ class ScreenshotControl : public QFrame | |||
35 | public: | 35 | public: |
36 | ScreenshotControl( QWidget *parent=0, const char *name=0 ); | 36 | ScreenshotControl( QWidget *parent=0, const char *name=0 ); |
37 | 37 | ||
38 | private: | 38 | private: |
39 | QPushButton *grabItButton, *scapButton; | 39 | QPushButton *grabItButton, *scapButton; |
40 | QPixmap snapshot; | 40 | QPixmap snapshot; |
41 | QTimer* grabTimer; | 41 | QTimer* grabTimer; |
42 | QCheckBox *saveNamedCheck; | 42 | QCheckBox *saveNamedCheck; |
43 | QString FileNamePath; | 43 | QString FileNamePath; |
44 | bool setFileName; | 44 | bool setFileName; |
45 | QSpinBox *delaySpin; | 45 | QSpinBox *delaySpin; |
46 | int buttonPushed; | 46 | int buttonPushed; |
47 | 47 | ||
48 | private slots: | 48 | private slots: |
49 | void slotGrab(); | 49 | void slotGrab(); |
50 | void slotScap(); | 50 | void slotScap(); |
51 | void savePixmap(); | 51 | void savePixmap(); |
52 | void performGrab(); | 52 | void performGrab(); |
53 | }; | 53 | }; |
54 | 54 | ||
55 | class ScreenshotApplet : public QWidget { | 55 | class ScreenshotApplet : public QWidget { |
56 | public: | 56 | public: |
57 | ScreenshotApplet( QWidget *parent = 0, const char *name=0 ); | 57 | ScreenshotApplet( QWidget *parent = 0, const char *name=0 ); |
58 | ~ScreenshotApplet(); | 58 | ~ScreenshotApplet(); |
59 | static int position(); | ||
59 | 60 | ||
60 | protected: | 61 | protected: |
61 | void mousePressEvent( QMouseEvent * ); | 62 | void mousePressEvent( QMouseEvent * ); |
62 | void paintEvent( QPaintEvent* ); | 63 | void paintEvent( QPaintEvent* ); |
63 | 64 | ||
64 | private: | 65 | private: |
65 | QPixmap m_icon; | 66 | QPixmap m_icon; |
66 | }; | 67 | }; |
67 | 68 | ||
68 | 69 | ||
69 | #endif // __SCREENSHOT_APPLET_H__ | 70 | #endif // __SCREENSHOT_APPLET_H__ |
70 | 71 | ||
diff --git a/core/applets/screenshotapplet/screenshotapplet.pro b/core/applets/screenshotapplet/screenshotapplet.pro index 45a5759..c7fcc3e 100644 --- a/core/applets/screenshotapplet/screenshotapplet.pro +++ b/core/applets/screenshotapplet/screenshotapplet.pro | |||
@@ -1,15 +1,13 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = screenshot.h inputDialog.h screenshotappletimpl.h | 3 | HEADERS = screenshot.h inputDialog.h |
4 | SOURCES = screenshot.cpp inputDialog.cpp screenshotappletimpl.cpp | 4 | SOURCES = screenshot.cpp inputDialog.cpp |
5 | TARGET = screenshotapplet | 5 | TARGET = screenshotapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | MOC_DIR=opieobj | ||
12 | OBJECTS_DIR=opieobj | ||
13 | 11 | ||
14 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
15 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.cpp b/core/applets/screenshotapplet/screenshotappletimpl.cpp deleted file mode 100644 index e99ecb0..0000000 --- a/core/applets/screenshotapplet/screenshotappletimpl.cpp +++ b/dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #include "screenshot.h" | ||
21 | #include "screenshotappletimpl.h" | ||
22 | |||
23 | |||
24 | ScreenshotAppletImpl::ScreenshotAppletImpl() | ||
25 | : screenshot(0) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | ScreenshotAppletImpl::~ScreenshotAppletImpl() | ||
30 | { | ||
31 | delete screenshot; | ||
32 | } | ||
33 | |||
34 | QWidget *ScreenshotAppletImpl::applet( QWidget *parent ) | ||
35 | { | ||
36 | if ( !screenshot ) | ||
37 | screenshot = new ScreenshotApplet( parent ); | ||
38 | return screenshot; | ||
39 | } | ||
40 | |||
41 | int ScreenshotAppletImpl::position() const | ||
42 | { | ||
43 | return 6; | ||
44 | } | ||
45 | |||
46 | QRESULT ScreenshotAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
47 | { | ||
48 | *iface = 0; | ||
49 | if ( uuid == IID_QUnknown ) | ||
50 | *iface = this; | ||
51 | else if ( uuid == IID_TaskbarApplet ) | ||
52 | *iface = this; | ||
53 | else | ||
54 | return QS_FALSE; | ||
55 | |||
56 | if ( *iface ) | ||
57 | (*iface)->addRef(); | ||
58 | return QS_OK; | ||
59 | } | ||
60 | |||
61 | Q_EXPORT_INTERFACE() | ||
62 | { | ||
63 | Q_CREATE_INSTANCE( ScreenshotAppletImpl ) | ||
64 | } | ||
65 | |||
66 | |||
diff --git a/core/applets/screenshotapplet/screenshotappletimpl.h b/core/applets/screenshotapplet/screenshotappletimpl.h deleted file mode 100644 index 988a34c..0000000 --- a/core/applets/screenshotapplet/screenshotappletimpl.h +++ b/dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #ifndef SCREENSHOTAPPLETIMPL_H | ||
21 | #define SCREENSHOTAPPLETIMPL_H | ||
22 | |||
23 | #include <qpe/taskbarappletinterface.h> | ||
24 | |||
25 | class ScreenshotApplet; | ||
26 | |||
27 | class ScreenshotAppletImpl : public TaskbarAppletInterface | ||
28 | { | ||
29 | public: | ||
30 | ScreenshotAppletImpl(); | ||
31 | virtual ~ScreenshotAppletImpl(); | ||
32 | |||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
34 | Q_REFCOUNT | ||
35 | |||
36 | virtual QWidget *applet( QWidget *parent ); | ||
37 | virtual int position() const; | ||
38 | |||
39 | private: | ||
40 | ScreenshotApplet *screenshot; | ||
41 | }; | ||
42 | |||
43 | #endif | ||
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index fe8ebfd..563d110 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -40,48 +40,49 @@ typedef struct _waveheader { | |||
40 | u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ | 40 | u_short bit_p_spl; /* 8, 12 or 16 bit (bitsPerSample) */ |
41 | 41 | ||
42 | u_long data_chunk; /* 'data' */ | 42 | u_long data_chunk; /* 'data' */ |
43 | 43 | ||
44 | u_long data_length;/* samplecount */ | 44 | u_long data_length;/* samplecount */ |
45 | } WaveHeader; | 45 | } WaveHeader; |
46 | 46 | ||
47 | #define RIFF 0x46464952 | 47 | #define RIFF 0x46464952 |
48 | #define WAVE 0x45564157 | 48 | #define WAVE 0x45564157 |
49 | #define FMT 0x20746D66 | 49 | #define FMT 0x20746D66 |
50 | #define DATA 0x61746164 | 50 | #define DATA 0x61746164 |
51 | #define PCM_CODE 1 | 51 | #define PCM_CODE 1 |
52 | #define WAVE_MONO 1 | 52 | #define WAVE_MONO 1 |
53 | #define WAVE_STEREO 2 | 53 | #define WAVE_STEREO 2 |
54 | 54 | ||
55 | struct adpcm_state encoder_state; | 55 | struct adpcm_state encoder_state; |
56 | //struct adpcm_state decoder_state; | 56 | //struct adpcm_state decoder_state; |
57 | 57 | ||
58 | #define WAVE_FORMAT_DVI_ADPCM (0x0011) | 58 | #define WAVE_FORMAT_DVI_ADPCM (0x0011) |
59 | #define WAVE_FORMAT_PCM (0x0001) | 59 | #define WAVE_FORMAT_PCM (0x0001) |
60 | 60 | ||
61 | 61 | ||
62 | #include "vmemo.h" | 62 | #include "vmemo.h" |
63 | 63 | ||
64 | #include <opie2/otaskbarapplet.h> | ||
64 | #include <qpe/qpeapplication.h> | 65 | #include <qpe/qpeapplication.h> |
65 | #include <qpe/config.h> | 66 | #include <qpe/config.h> |
66 | 67 | ||
67 | #include <qpainter.h> | 68 | #include <qpainter.h> |
68 | #include <qmessagebox.h> | 69 | #include <qmessagebox.h> |
69 | 70 | ||
70 | int seq = 0; | 71 | int seq = 0; |
71 | 72 | ||
72 | /* XPM */ | 73 | /* XPM */ |
73 | static char * vmemo_xpm[] = { | 74 | static char * vmemo_xpm[] = { |
74 | "16 16 102 2", | 75 | "16 16 102 2", |
75 | " c None", | 76 | " c None", |
76 | ". c #60636A", | 77 | ". c #60636A", |
77 | "+ c #6E6E72", | 78 | "+ c #6E6E72", |
78 | "@ c #68696E", | 79 | "@ c #68696E", |
79 | "# c #4D525C", | 80 | "# c #4D525C", |
80 | "$ c #6B6C70", | 81 | "$ c #6B6C70", |
81 | "% c #E3E3E8", | 82 | "% c #E3E3E8", |
82 | "& c #EEEEF2", | 83 | "& c #EEEEF2", |
83 | "* c #EAEAEF", | 84 | "* c #EAEAEF", |
84 | "= c #CACAD0", | 85 | "= c #CACAD0", |
85 | "- c #474A51", | 86 | "- c #474A51", |
86 | "; c #171819", | 87 | "; c #171819", |
87 | "> c #9B9B9F", | 88 | "> c #9B9B9F", |
@@ -216,48 +217,53 @@ VMemo::VMemo( QWidget *parent, const char *_name ) | |||
216 | this, SLOT(receive(const QCString&, const QByteArray&)) ); | 217 | this, SLOT(receive(const QCString&, const QByteArray&)) ); |
217 | 218 | ||
218 | if( toggleKey != -1 ) { | 219 | if( toggleKey != -1 ) { |
219 | // keyRegister(key, channel, message) | 220 | // keyRegister(key, channel, message) |
220 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); | 221 | QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)"); |
221 | // e << 4096; // Key_Escape | 222 | // e << 4096; // Key_Escape |
222 | // e << Key_F5; //4148 | 223 | // e << Key_F5; //4148 |
223 | e << toggleKey; | 224 | e << toggleKey; |
224 | e << QString("QPE/VMemo"); | 225 | e << QString("QPE/VMemo"); |
225 | e << QString("toggleRecord()"); | 226 | e << QString("toggleRecord()"); |
226 | } | 227 | } |
227 | if(toggleKey == 1) | 228 | if(toggleKey == 1) |
228 | usingIcon=TRUE; | 229 | usingIcon=TRUE; |
229 | else | 230 | else |
230 | usingIcon=FALSE; | 231 | usingIcon=FALSE; |
231 | if( vmCfg.readNumEntry("hideIcon",0) == 1) | 232 | if( vmCfg.readNumEntry("hideIcon",0) == 1) |
232 | hide(); | 233 | hide(); |
233 | recording = FALSE; | 234 | recording = FALSE; |
234 | // } | 235 | // } |
235 | } | 236 | } |
236 | 237 | ||
237 | VMemo::~VMemo() { | 238 | VMemo::~VMemo() { |
238 | } | 239 | } |
239 | 240 | ||
241 | int VMemo::position() | ||
242 | { | ||
243 | return 6; | ||
244 | } | ||
245 | |||
240 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { | 246 | void VMemo::receive( const QCString &msg, const QByteArray &data ) { |
241 | qDebug("receive"); | 247 | qDebug("receive"); |
242 | QDataStream stream( data, IO_ReadOnly ); | 248 | QDataStream stream( data, IO_ReadOnly ); |
243 | 249 | ||
244 | if (msg == "toggleRecord()") { | 250 | if (msg == "toggleRecord()") { |
245 | if (recording) { | 251 | if (recording) { |
246 | fromToggle = TRUE; | 252 | fromToggle = TRUE; |
247 | stopRecording(); | 253 | stopRecording(); |
248 | } else { | 254 | } else { |
249 | fromToggle = TRUE; | 255 | fromToggle = TRUE; |
250 | startRecording(); | 256 | startRecording(); |
251 | } | 257 | } |
252 | } | 258 | } |
253 | } | 259 | } |
254 | 260 | ||
255 | void VMemo::paintEvent( QPaintEvent* ) { | 261 | void VMemo::paintEvent( QPaintEvent* ) { |
256 | QPainter p(this); | 262 | QPainter p(this); |
257 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); | 263 | p.drawPixmap( 0, 1,( const char** ) vmemo_xpm ); |
258 | } | 264 | } |
259 | 265 | ||
260 | void VMemo::mousePressEvent( QMouseEvent * me) { | 266 | void VMemo::mousePressEvent( QMouseEvent * me) { |
261 | /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions | 267 | /* No mousePress/mouseRelease recording on the iPAQ. The REC button on the iPAQ calls these functions |
262 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ | 268 | mousePressEvent and mouseReleaseEvent with a NULL parameter. */ |
263 | 269 | ||
@@ -610,24 +616,30 @@ int VMemo::setToggleButton(int tog) { | |||
610 | return Key_F12; | 616 | return Key_F12; |
611 | break; | 617 | break; |
612 | case 5: | 618 | case 5: |
613 | return Key_F9; | 619 | return Key_F9; |
614 | break; | 620 | break; |
615 | case 6: | 621 | case 6: |
616 | return Key_F10; | 622 | return Key_F10; |
617 | break; | 623 | break; |
618 | case 7: | 624 | case 7: |
619 | return Key_F11; | 625 | return Key_F11; |
620 | break; | 626 | break; |
621 | case 8: | 627 | case 8: |
622 | return Key_F13; | 628 | return Key_F13; |
623 | break; | 629 | break; |
624 | }; | 630 | }; |
625 | } | 631 | } |
626 | return -1; | 632 | return -1; |
627 | } | 633 | } |
628 | 634 | ||
629 | void VMemo::timerBreak() { | 635 | void VMemo::timerBreak() { |
630 | //stop | 636 | //stop |
631 | stopRecording(); | 637 | stopRecording(); |
632 | QMessageBox::message("Vmemo","Vmemo recording has ended"); | 638 | QMessageBox::message("Vmemo","Vmemo recording has ended"); |
633 | } | 639 | } |
640 | |||
641 | Q_EXPORT_INTERFACE() | ||
642 | { | ||
643 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> ); | ||
644 | } | ||
645 | |||
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 31d0a25..1bd735f 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h | |||
@@ -11,48 +11,49 @@ | |||
11 | *********************************************************************************************/ | 11 | *********************************************************************************************/ |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * $Id$ | 14 | * $Id$ |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #ifndef __VMEMO_H__ | 17 | #ifndef __VMEMO_H__ |
18 | #define __VMEMO_H__ | 18 | #define __VMEMO_H__ |
19 | 19 | ||
20 | 20 | ||
21 | #include <qwidget.h> | 21 | #include <qwidget.h> |
22 | #include <qpixmap.h> | 22 | #include <qpixmap.h> |
23 | #include <qpe/applnk.h> | 23 | #include <qpe/applnk.h> |
24 | #include <qfile.h> | 24 | #include <qfile.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qlabel.h> | 26 | #include <qlabel.h> |
27 | #include <qtimer.h> | 27 | #include <qtimer.h> |
28 | 28 | ||
29 | class VMemo : public QWidget | 29 | class VMemo : public QWidget |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | public: | 32 | public: |
33 | VMemo( QWidget *parent, const char *name = NULL); | 33 | VMemo( QWidget *parent, const char *name = NULL); |
34 | ~VMemo(); | 34 | ~VMemo(); |
35 | static int position(); | ||
35 | QFile track; | 36 | QFile track; |
36 | int length; | 37 | int length; |
37 | QString fileName, errorMsg, date; | 38 | QString fileName, errorMsg, date; |
38 | QLabel* msgLabel; | 39 | QLabel* msgLabel; |
39 | QTimer *t_timer; | 40 | QTimer *t_timer; |
40 | bool usingIcon, useADPCM; | 41 | bool usingIcon, useADPCM; |
41 | public slots: | 42 | public slots: |
42 | bool record(); | 43 | bool record(); |
43 | void mousePressEvent( QMouseEvent * ); | 44 | void mousePressEvent( QMouseEvent * ); |
44 | void mouseReleaseEvent( QMouseEvent * ); | 45 | void mouseReleaseEvent( QMouseEvent * ); |
45 | void receive( const QCString &msg, const QByteArray &data ); | 46 | void receive( const QCString &msg, const QByteArray &data ); |
46 | bool startRecording(); | 47 | bool startRecording(); |
47 | void stopRecording(); | 48 | void stopRecording(); |
48 | void timerBreak(); | 49 | void timerBreak(); |
49 | private: | 50 | private: |
50 | bool useAlerts; | 51 | bool useAlerts; |
51 | void paintEvent( QPaintEvent* ); | 52 | void paintEvent( QPaintEvent* ); |
52 | int setToggleButton(int); | 53 | int setToggleButton(int); |
53 | int openDSP(); | 54 | int openDSP(); |
54 | int openWAV(const char *filename); | 55 | int openWAV(const char *filename); |
55 | bool fromToggle; | 56 | bool fromToggle; |
56 | QPixmap vmemoPixmap; | 57 | QPixmap vmemoPixmap; |
57 | QCopChannel *myChannel; | 58 | QCopChannel *myChannel; |
58 | bool systemZaurus; | 59 | bool systemZaurus; |
diff --git a/core/applets/vmemo/vmemo.pro b/core/applets/vmemo/vmemo.pro index f83a53f..2deedfd 100644 --- a/core/applets/vmemo/vmemo.pro +++ b/core/applets/vmemo/vmemo.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = vmemo.h vmemoimpl.h adpcm.h | 3 | HEADERS = vmemo.h adpcm.h |
4 | SOURCES = vmemo.cpp vmemoimpl.cpp adpcm.c | 4 | SOURCES = vmemo.cpp adpcm.c |
5 | TARGET = vmemoapplet | 5 | TARGET = vmemoapplet |
6 | DESTDIR =$(OPIEDIR)/plugins/applets | 6 | DESTDIR =$(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/vmemo/vmemoimpl.cpp b/core/applets/vmemo/vmemoimpl.cpp deleted file mode 100644 index 7779b83..0000000 --- a/core/applets/vmemo/vmemoimpl.cpp +++ b/dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /**************************************************************************************94x78** | ||
2 | ** | ||
3 | ** This file may be distributed and/or modified under the terms of the | ||
4 | ** GNU General Public License version 2 as published by the Free Software | ||
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
6 | ** packaging of this file. | ||
7 | ** | ||
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
10 | ** | ||
11 | *********************************************************************************************/ | ||
12 | |||
13 | /* | ||
14 | * $Id$ | ||
15 | */ | ||
16 | |||
17 | #include "vmemo.h" | ||
18 | #include "vmemoimpl.h" | ||
19 | |||
20 | |||
21 | VMemoAppletImpl::VMemoAppletImpl() | ||
22 | : vmemo(0) | ||
23 | { | ||
24 | } | ||
25 | |||
26 | VMemoAppletImpl::~VMemoAppletImpl() | ||
27 | { | ||
28 | delete vmemo; | ||
29 | } | ||
30 | |||
31 | QWidget *VMemoAppletImpl::applet( QWidget *parent ) | ||
32 | { | ||
33 | if ( !vmemo ) | ||
34 | vmemo = new VMemo( parent ); | ||
35 | return vmemo; | ||
36 | } | ||
37 | |||
38 | int VMemoAppletImpl::position() const | ||
39 | { | ||
40 | return 6; | ||
41 | } | ||
42 | |||
43 | QRESULT VMemoAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
44 | { | ||
45 | *iface = 0; | ||
46 | if ( uuid == IID_QUnknown ) | ||
47 | *iface = this; | ||
48 | else if ( uuid == IID_TaskbarApplet ) | ||
49 | *iface = this; | ||
50 | else | ||
51 | return QS_FALSE; | ||
52 | |||
53 | if ( *iface ) | ||
54 | (*iface)->addRef(); | ||
55 | return QS_OK; | ||
56 | } | ||
57 | |||
58 | Q_EXPORT_INTERFACE() | ||
59 | { | ||
60 | Q_CREATE_INSTANCE( VMemoAppletImpl ) | ||
61 | } | ||
diff --git a/core/applets/vmemo/vmemoimpl.h b/core/applets/vmemo/vmemoimpl.h deleted file mode 100644 index 985138b..0000000 --- a/core/applets/vmemo/vmemoimpl.h +++ b/dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /**************************************************************************************94x78** | ||
2 | ** | ||
3 | ** This file may be distributed and/or modified under the terms of the | ||
4 | ** GNU General Public License version 2 as published by the Free Software | ||
5 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
6 | ** packaging of this file. | ||
7 | ** | ||
8 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
10 | ** | ||
11 | *********************************************************************************************/ | ||
12 | |||
13 | /* | ||
14 | * $Id$ | ||
15 | */ | ||
16 | |||
17 | #ifndef __VMEMOIMPLAPPLETIMPL_H__ | ||
18 | #define __VMEMOIMPLAPPLETIMPL_H__ | ||
19 | |||
20 | #include <qpe/taskbarappletinterface.h> | ||
21 | |||
22 | class VMemo; | ||
23 | |||
24 | class VMemoAppletImpl : public TaskbarAppletInterface | ||
25 | { | ||
26 | public: | ||
27 | VMemoAppletImpl(); | ||
28 | virtual ~VMemoAppletImpl(); | ||
29 | |||
30 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
31 | Q_REFCOUNT | ||
32 | |||
33 | virtual QWidget *applet( QWidget *parent ); | ||
34 | virtual int position() const; | ||
35 | |||
36 | private: | ||
37 | VMemo *vmemo; | ||
38 | }; | ||
39 | |||
40 | #endif | ||
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index c736437..8fd88f6 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -1,68 +1,64 @@ | |||
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 <stdio.h> | ||
22 | |||
23 | #include "volume.h" | 21 | #include "volume.h" |
22 | #include "oledbox.h" | ||
24 | 23 | ||
24 | #include <opie2/odevice.h> | ||
25 | #include <opie2/otaskbarapplet.h> | ||
25 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
26 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
27 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
28 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | ||
29 | #include <qpe/qcopenvelope_qws.h> | 29 | #include <qpe/qcopenvelope_qws.h> |
30 | #endif | ||
31 | 30 | ||
32 | #include <qpainter.h> | 31 | #include <qpainter.h> |
33 | #include <qcheckbox.h> | 32 | #include <qcheckbox.h> |
34 | #include <qslider.h> | 33 | #include <qslider.h> |
35 | #include <qlayout.h> | 34 | #include <qlayout.h> |
36 | #include <qvbox.h> | 35 | #include <qvbox.h> |
37 | #include <qlabel.h> | 36 | #include <qlabel.h> |
38 | |||
39 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
40 | #include <qtimer.h> | 38 | #include <qtimer.h> |
41 | 39 | ||
42 | #include <opie/odevice.h> | 40 | #include <stdio.h> |
43 | |||
44 | #include "oledbox.h" | ||
45 | 41 | ||
46 | using namespace Opie; | 42 | using namespace Opie; |
47 | 43 | ||
48 | #define RATE_TIMER_INTERVAL 100 | 44 | #define RATE_TIMER_INTERVAL 100 |
49 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time | 45 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time |
50 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. | 46 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. |
51 | 47 | ||
52 | 48 | ||
53 | /* XPM */ | 49 | /* XPM */ |
54 | static const char * vol_xpm[] = { | 50 | static const char * vol_xpm[] = { |
55 | "20 20 3 1", | 51 | "20 20 3 1", |
56 | " c None", | 52 | " c None", |
57 | ". c #0000FF", | 53 | ". c #0000FF", |
58 | "+ c #000000", | 54 | "+ c #000000", |
59 | " ", | 55 | " ", |
60 | " . ", | 56 | " . ", |
61 | " . . . . ", | 57 | " . . . . ", |
62 | " . . . . . . ", | 58 | " . . . . . . ", |
63 | " . . . . . . . ", | 59 | " . . . . . . . ", |
64 | " . . ..... . . ", | 60 | " . . ..... . . ", |
65 | " . ... ..... ... ", | 61 | " . ... ..... ... ", |
66 | " ........... .... ", | 62 | " ........... .... ", |
67 | " ................. ", | 63 | " ................. ", |
68 | "++++++++++++++++++++", | 64 | "++++++++++++++++++++", |
@@ -716,64 +712,72 @@ void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd ) | |||
716 | } | 712 | } |
717 | #endif | 713 | #endif |
718 | } | 714 | } |
719 | 715 | ||
720 | //=========================================================================== | 716 | //=========================================================================== |
721 | 717 | ||
722 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) | 718 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) |
723 | : QWidget( parent, name ) | 719 | : QWidget( parent, name ) |
724 | { | 720 | { |
725 | setFixedWidth ( AppLnk::smallIconSize() ); | 721 | setFixedWidth ( AppLnk::smallIconSize() ); |
726 | setFixedHeight ( AppLnk::smallIconSize()+4 ); | 722 | setFixedHeight ( AppLnk::smallIconSize()+4 ); |
727 | 723 | ||
728 | m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" )); | 724 | m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" )); |
729 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); | 725 | m_dialog = new VolumeControl ( this, true, this, "volumecontrol" ); |
730 | 726 | ||
731 | connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool ))); | 727 | connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool ))); |
732 | connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool ))); | 728 | connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool ))); |
733 | } | 729 | } |
734 | 730 | ||
735 | VolumeApplet::~VolumeApplet() | 731 | VolumeApplet::~VolumeApplet() |
736 | { | 732 | { |
737 | delete m_pixmap; | 733 | delete m_pixmap; |
738 | } | 734 | } |
739 | 735 | ||
736 | int VolumeApplet::position() | ||
737 | { | ||
738 | return 6; | ||
739 | } | ||
740 | 740 | ||
741 | void VolumeApplet::mousePressEvent ( QMouseEvent * ) | 741 | void VolumeApplet::mousePressEvent ( QMouseEvent * ) |
742 | { | 742 | { |
743 | if ( m_dialog-> isVisible ( )) | 743 | if ( m_dialog-> isVisible ( )) |
744 | m_dialog-> hide ( ); | 744 | m_dialog-> hide ( ); |
745 | else | 745 | else |
746 | m_dialog-> show ( true ); | 746 | m_dialog-> show ( true ); |
747 | } | 747 | } |
748 | 748 | ||
749 | void VolumeApplet::redraw ( bool all ) | 749 | void VolumeApplet::redraw ( bool all ) |
750 | { | 750 | { |
751 | if ( all ) | 751 | if ( all ) |
752 | repaint ( true ); | 752 | repaint ( true ); |
753 | else | 753 | else |
754 | repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false ); | 754 | repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false ); |
755 | } | 755 | } |
756 | 756 | ||
757 | 757 | ||
758 | void VolumeApplet::paintEvent ( QPaintEvent * ) | 758 | void VolumeApplet::paintEvent ( QPaintEvent * ) |
759 | { | 759 | { |
760 | QPainter p ( this ); | 760 | QPainter p ( this ); |
761 | 761 | ||
762 | p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap ); | 762 | p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap ); |
763 | p. setPen ( darkGray ); | 763 | p. setPen ( darkGray ); |
764 | p. drawRect ( 1, height() - 4, width() - 2, 4 ); | 764 | p. drawRect ( 1, height() - 4, width() - 2, 4 ); |
765 | 765 | ||
766 | int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100; | 766 | int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100; |
767 | p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); | 767 | p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); |
768 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); | 768 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); |
769 | 769 | ||
770 | if ( m_dialog-> volMuted ( )) { | 770 | if ( m_dialog-> volMuted ( )) { |
771 | p. setPen ( red ); | 771 | p. setPen ( red ); |
772 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); | 772 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); |
773 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); | 773 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); |
774 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); | 774 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); |
775 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); | 775 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); |
776 | } | 776 | } |
777 | } | 777 | } |
778 | 778 | ||
779 | 779 | ||
780 | Q_EXPORT_INTERFACE() | ||
781 | { | ||
782 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> ); | ||
783 | } | ||
diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h index d2345b5..454a688 100644 --- a/core/applets/volumeapplet/volume.h +++ b/core/applets/volumeapplet/volume.h | |||
@@ -96,39 +96,40 @@ private: | |||
96 | QPushButton *upButton; | 96 | QPushButton *upButton; |
97 | QPushButton *downButton; | 97 | QPushButton *downButton; |
98 | QTimer *rateTimer; | 98 | QTimer *rateTimer; |
99 | 99 | ||
100 | int m_vol_percent; | 100 | int m_vol_percent; |
101 | int m_mic_percent; | 101 | int m_mic_percent; |
102 | int m_alarm_percent; | 102 | int m_alarm_percent; |
103 | int m_bass_percent; | 103 | int m_bass_percent; |
104 | int m_treble_percent; | 104 | int m_treble_percent; |
105 | bool m_vol_muted; | 105 | bool m_vol_muted; |
106 | bool m_mic_muted; | 106 | bool m_mic_muted; |
107 | bool m_snd_alarm; | 107 | bool m_snd_alarm; |
108 | bool m_snd_touch; | 108 | bool m_snd_touch; |
109 | bool m_snd_key; | 109 | bool m_snd_key; |
110 | 110 | ||
111 | VolumeApplet *m_icon; | 111 | VolumeApplet *m_icon; |
112 | }; | 112 | }; |
113 | 113 | ||
114 | class VolumeApplet : public QWidget { | 114 | class VolumeApplet : public QWidget { |
115 | Q_OBJECT | 115 | Q_OBJECT |
116 | 116 | ||
117 | public: | 117 | public: |
118 | VolumeApplet ( QWidget *parent = 0, const char *name=0 ); | 118 | VolumeApplet ( QWidget *parent = 0, const char *name=0 ); |
119 | ~VolumeApplet ( ); | 119 | ~VolumeApplet ( ); |
120 | static int position(); | ||
120 | 121 | ||
121 | void redraw ( bool all = true ); | 122 | void redraw ( bool all = true ); |
122 | 123 | ||
123 | protected: | 124 | protected: |
124 | virtual void mousePressEvent ( QMouseEvent * ); | 125 | virtual void mousePressEvent ( QMouseEvent * ); |
125 | virtual void paintEvent ( QPaintEvent* ); | 126 | virtual void paintEvent ( QPaintEvent* ); |
126 | 127 | ||
127 | private: | 128 | private: |
128 | QPixmap * m_pixmap; | 129 | QPixmap * m_pixmap; |
129 | VolumeControl *m_dialog; | 130 | VolumeControl *m_dialog; |
130 | }; | 131 | }; |
131 | 132 | ||
132 | 133 | ||
133 | #endif // __VOLUME_APPLET_H__ | 134 | #endif // __VOLUME_APPLET_H__ |
134 | 135 | ||
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index 92c6b0a..b14956e 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS= volume.h volumeappletimpl.h oledbox.h | 3 | HEADERS = volume.h oledbox.h |
4 | SOURCES= volume.cpp volumeappletimpl.cpp oledbox.cpp | 4 | SOURCES = volume.cpp oledbox.cpp |
5 | TARGET = volumeapplet | 5 | TARGET = volumeapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/volumeapplet/volumeappletimpl.cpp b/core/applets/volumeapplet/volumeappletimpl.cpp deleted file mode 100644 index 9c7dea3..0000000 --- a/core/applets/volumeapplet/volumeappletimpl.cpp +++ b/dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #include "volume.h" | ||
21 | #include "volumeappletimpl.h" | ||
22 | |||
23 | VolumeAppletImpl::VolumeAppletImpl() | ||
24 | : volume(0) | ||
25 | { | ||
26 | } | ||
27 | |||
28 | VolumeAppletImpl::~VolumeAppletImpl() | ||
29 | { | ||
30 | delete volume; | ||
31 | } | ||
32 | |||
33 | QWidget *VolumeAppletImpl::applet( QWidget *parent ) | ||
34 | { | ||
35 | if ( !volume ) | ||
36 | volume = new VolumeApplet( parent ); | ||
37 | return volume; | ||
38 | } | ||
39 | |||
40 | int VolumeAppletImpl::position() const | ||
41 | { | ||
42 | return 6; | ||
43 | } | ||
44 | |||
45 | QRESULT VolumeAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | ||
46 | { | ||
47 | *iface = 0; | ||
48 | if ( uuid == IID_QUnknown ) | ||
49 | *iface = this; | ||
50 | else if ( uuid == IID_TaskbarApplet ) | ||
51 | *iface = this; | ||
52 | else | ||
53 | return QS_FALSE; | ||
54 | |||
55 | if ( *iface ) | ||
56 | (*iface)->addRef(); | ||
57 | return QS_OK; | ||
58 | } | ||
59 | |||
60 | Q_EXPORT_INTERFACE() | ||
61 | { | ||
62 | Q_CREATE_INSTANCE( VolumeAppletImpl ) | ||
63 | } | ||
64 | |||
65 | |||
diff --git a/core/applets/volumeapplet/volumeappletimpl.h b/core/applets/volumeapplet/volumeappletimpl.h deleted file mode 100644 index a9221c6..0000000 --- a/core/applets/volumeapplet/volumeappletimpl.h +++ b/dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | /********************************************************************** | ||
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
3 | ** | ||
4 | ** This file is part of Qtopia Environment. | ||
5 | ** | ||
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 | ||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | ||
9 | ** packaging of this file. | ||
10 | ** | ||
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. | ||
13 | ** | ||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
15 | ** | ||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | ||
17 | ** not clear to you. | ||
18 | ** | ||
19 | **********************************************************************/ | ||
20 | #ifndef VOLUMEAPPLETIMPL_H | ||
21 | #define VOLUMEAPPLETIMPL_H | ||
22 | |||
23 | #include <qpe/taskbarappletinterface.h> | ||
24 | |||
25 | class VolumeApplet; | ||
26 | |||
27 | class VolumeAppletImpl : public TaskbarAppletInterface | ||
28 | { | ||
29 | public: | ||
30 | VolumeAppletImpl(); | ||
31 | virtual ~VolumeAppletImpl(); | ||
32 | |||
33 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | ||
34 | Q_REFCOUNT | ||
35 | |||
36 | virtual QWidget *applet( QWidget *parent ); | ||
37 | virtual int position() const; | ||
38 | |||
39 | private: | ||
40 | VolumeApplet *volume; | ||
41 | }; | ||
42 | |||
43 | #endif | ||