-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 25 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.h | 16 |
2 files changed, 36 insertions, 5 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index b490626..04270f1 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -36,46 +36,68 @@ | |||
36 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
37 | 37 | ||
38 | #include "rotate.h" | 38 | #include "rotate.h" |
39 | 39 | ||
40 | 40 | ||
41 | RotateApplet::RotateApplet ( ) | 41 | RotateApplet::RotateApplet ( ) |
42 | : QObject ( 0, "RotateApplet" ), ref ( 0 ), m_flipped( false ) | 42 | : QObject ( 0, "RotateApplet" ), ref ( 0 ), m_flipped( false ) |
43 | { | 43 | { |
44 | |||
45 | #if defined(Q_WS_QWS) | ||
46 | #if !defined(QT_NO_COP) | ||
47 | QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); | ||
48 | connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ), | ||
49 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); | ||
50 | #endif | ||
51 | #endif | ||
52 | |||
44 | } | 53 | } |
45 | 54 | ||
46 | RotateApplet::~RotateApplet ( ) | 55 | RotateApplet::~RotateApplet ( ) |
47 | { | 56 | { |
48 | } | 57 | } |
49 | 58 | ||
59 | |||
60 | /** | ||
61 | * Qcop receive method. | ||
62 | */ | ||
63 | void RotateApplet::channelReceived( const QCString &msg, const QByteArray & data ) { | ||
64 | QDataStream stream( data, IO_ReadOnly ); | ||
65 | if ( msg == "flip()" ) { | ||
66 | activated ( ); | ||
67 | } | ||
68 | } | ||
69 | |||
70 | |||
50 | int RotateApplet::position ( ) const | 71 | int RotateApplet::position ( ) const |
51 | { | 72 | { |
52 | return 3; | 73 | return 3; |
53 | } | 74 | } |
54 | 75 | ||
55 | QString RotateApplet::name ( ) const | 76 | QString RotateApplet::name ( ) const |
56 | { | 77 | { |
57 | return tr( "Rotate shortcut" ); | 78 | return tr( "Rotate shortcut" ); |
58 | } | 79 | } |
59 | 80 | ||
60 | QString RotateApplet::text ( ) const | 81 | QString RotateApplet::text ( ) const |
61 | { | 82 | { |
62 | return tr( "Rotate" ); | 83 | return tr( "Rotate" ); |
63 | } | 84 | } |
64 | 85 | ||
65 | QString RotateApplet::tr( const char* s ) const | 86 | /*QString RotateApplet::tr( const char* s ) const |
66 | { | 87 | { |
67 | return qApp->translate( "RotateApplet", s, 0 ); | 88 | return qApp->translate( "RotateApplet", s, 0 ); |
68 | } | 89 | } |
69 | 90 | ||
70 | QString RotateApplet::tr( const char* s, const char* p ) const | 91 | QString RotateApplet::tr( const char* s, const char* p ) const |
71 | { | 92 | { |
72 | return qApp->translate( "RotateApplet", s, p ); | 93 | return qApp->translate( "RotateApplet", s, p ); |
73 | } | 94 | } |
95 | */ | ||
74 | 96 | ||
75 | QIconSet RotateApplet::icon ( ) const | 97 | QIconSet RotateApplet::icon ( ) const |
76 | { | 98 | { |
77 | QPixmap pix; | 99 | QPixmap pix; |
78 | QImage img = Resource::loadImage ( "Rotation" ); | 100 | QImage img = Resource::loadImage ( "Rotation" ); |
79 | 101 | ||
80 | if ( !img. isNull ( )) | 102 | if ( !img. isNull ( )) |
81 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 103 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
@@ -84,16 +106,17 @@ QIconSet RotateApplet::icon ( ) const | |||
84 | 106 | ||
85 | QPopupMenu *RotateApplet::popup ( QWidget * ) const | 107 | QPopupMenu *RotateApplet::popup ( QWidget * ) const |
86 | { | 108 | { |
87 | return 0; | 109 | return 0; |
88 | } | 110 | } |
89 | 111 | ||
90 | void RotateApplet::activated ( ) | 112 | void RotateApplet::activated ( ) |
91 | { | 113 | { |
114 | |||
92 | int defaultRotation = QPEApplication::defaultRotation(); | 115 | int defaultRotation = QPEApplication::defaultRotation(); |
93 | 116 | ||
94 | int newRotation; | 117 | int newRotation; |
95 | 118 | ||
96 | Config cfg( "qpe" ); | 119 | Config cfg( "qpe" ); |
97 | cfg.setGroup( "Appearance" ); | 120 | cfg.setGroup( "Appearance" ); |
98 | 121 | ||
99 | // 0 -> 90° clockwise, 1 -> 90° counterclockwise | 122 | // 0 -> 90° clockwise, 1 -> 90° counterclockwise |
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h index 57f9040..5ac7768 100644 --- a/core/applets/rotateapplet/rotate.h +++ b/core/applets/rotateapplet/rotate.h | |||
@@ -27,35 +27,43 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | 30 | ||
31 | #ifndef __OPIE_ROTATE_APPLET_H__ | 31 | #ifndef __OPIE_ROTATE_APPLET_H__ |
32 | #define __OPIE_ROTATE_APPLET_H__ | 32 | #define __OPIE_ROTATE_APPLET_H__ |
33 | 33 | ||
34 | #include <qpe/menuappletinterface.h> | 34 | #include <qpe/menuappletinterface.h> |
35 | #include <qobject.h> | ||
35 | 36 | ||
36 | class RotateApplet : public QObject, public MenuAppletInterface | 37 | class RotateApplet : public QObject, public MenuAppletInterface |
37 | { | 38 | { |
39 | |||
40 | Q_OBJECT | ||
41 | |||
38 | public: | 42 | public: |
39 | RotateApplet ( ); | 43 | RotateApplet ( ); |
40 | virtual ~RotateApplet ( ); | 44 | virtual ~RotateApplet ( ); |
41 | 45 | ||
42 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 46 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
43 | Q_REFCOUNT | 47 | Q_REFCOUNT |
44 | 48 | ||
45 | virtual int position() const; | 49 | virtual int position() const; |
46 | 50 | ||
47 | virtual QString name ( ) const; | 51 | virtual QString name ( ) const; |
48 | virtual QIconSet icon ( ) const; | 52 | virtual QIconSet icon ( ) const; |
49 | virtual QString text ( ) const; | 53 | virtual QString text ( ) const; |
50 | virtual QString tr( const char* ) const; | 54 | /* virtual QString tr( const char* ) const; |
51 | virtual QString tr( const char*, const char* ) const; | 55 | virtual QString tr( const char*, const char* ) const; |
56 | */ | ||
52 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 57 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
53 | 58 | virtual void activated ( ); | |
54 | virtual void activated ( ); | 59 | |
60 | private slots: | ||
61 | void channelReceived( const QCString &msg, const QByteArray & data ); | ||
55 | 62 | ||
56 | private: | 63 | private: |
57 | bool m_flipped; | ||
58 | ulong ref; | 64 | ulong ref; |
65 | bool m_flipped; | ||
66 | |||
59 | }; | 67 | }; |
60 | 68 | ||
61 | #endif | 69 | #endif |