author | harlekin <harlekin> | 2003-03-25 23:06:12 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-25 23:06:12 (UTC) |
commit | aca404f0c049c5b1bace7e842e7e64b987f04616 (patch) (unidiff) | |
tree | 31c0722de0784b8e5c83d2fd5a93d39cb96f13a5 /core | |
parent | 8ee32661cc5086c2cc34c4587de9649cd290579d (diff) | |
download | opie-aca404f0c049c5b1bace7e842e7e64b987f04616.zip opie-aca404f0c049c5b1bace7e842e7e64b987f04616.tar.gz opie-aca404f0c049c5b1bace7e842e7e64b987f04616.tar.bz2 |
better interaction with the rotate app
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 6 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index 8f323d6..653c61f 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -32,25 +32,24 @@ | |||
32 | 32 | ||
33 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
34 | #include <qiconset.h> | 34 | #include <qiconset.h> |
35 | #include <qpopupmenu.h> | 35 | #include <qpopupmenu.h> |
36 | 36 | ||
37 | #include "rotate.h" | 37 | #include "rotate.h" |
38 | 38 | ||
39 | 39 | ||
40 | RotateApplet::RotateApplet ( ) | 40 | RotateApplet::RotateApplet ( ) |
41 | : QObject ( 0, "RotateApplet" ), ref ( 0 ) | 41 | : QObject ( 0, "RotateApplet" ), ref ( 0 ) |
42 | { | 42 | { |
43 | m_native = true; | 43 | m_native = true; |
44 | m_startupRot = QPEApplication::defaultRotation(); | ||
45 | } | 44 | } |
46 | 45 | ||
47 | RotateApplet::~RotateApplet ( ) | 46 | RotateApplet::~RotateApplet ( ) |
48 | { | 47 | { |
49 | } | 48 | } |
50 | 49 | ||
51 | int RotateApplet::position ( ) const | 50 | int RotateApplet::position ( ) const |
52 | { | 51 | { |
53 | return 2; | 52 | return 2; |
54 | } | 53 | } |
55 | 54 | ||
56 | QString RotateApplet::name ( ) const | 55 | QString RotateApplet::name ( ) const |
@@ -81,29 +80,30 @@ QIconSet RotateApplet::icon ( ) const | |||
81 | if ( !img. isNull ( )) | 80 | if ( !img. isNull ( )) |
82 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); | 81 | pix. convertFromImage ( img. smoothScale ( 14, 14 )); |
83 | return pix; | 82 | return pix; |
84 | } | 83 | } |
85 | 84 | ||
86 | QPopupMenu *RotateApplet::popup ( QWidget * ) const | 85 | QPopupMenu *RotateApplet::popup ( QWidget * ) const |
87 | { | 86 | { |
88 | return 0; | 87 | return 0; |
89 | } | 88 | } |
90 | 89 | ||
91 | void RotateApplet::activated ( ) | 90 | void RotateApplet::activated ( ) |
92 | { | 91 | { |
92 | int currentRotation = QPEApplication::defaultRotation(); | ||
93 | int newRotation; | 93 | int newRotation; |
94 | if ( m_native == true ) { | 94 | if ( m_native == true ) { |
95 | newRotation = m_startupRot + 90; | 95 | newRotation = currentRotation + 90; |
96 | } else { | 96 | } else { |
97 | newRotation = m_startupRot; | 97 | newRotation = currentRotation - 90; |
98 | } | 98 | } |
99 | QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); | 99 | QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" ); |
100 | env << newRotation; | 100 | env << newRotation; |
101 | QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" ); | 101 | QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" ); |
102 | env2 << newRotation; | 102 | env2 << newRotation; |
103 | 103 | ||
104 | m_native = !m_native; | 104 | m_native = !m_native; |
105 | 105 | ||
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 109 | QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h index 11e2ec9..c4087f9 100644 --- a/core/applets/rotateapplet/rotate.h +++ b/core/applets/rotateapplet/rotate.h | |||
@@ -46,17 +46,16 @@ public: | |||
46 | 46 | ||
47 | virtual QString name ( ) const; | 47 | virtual QString name ( ) const; |
48 | virtual QIconSet icon ( ) const; | 48 | virtual QIconSet icon ( ) const; |
49 | virtual QString text ( ) const; | 49 | virtual QString text ( ) const; |
50 | virtual QString tr( const char* ) const; | 50 | virtual QString tr( const char* ) const; |
51 | virtual QString tr( const char*, const char* ) const; | 51 | virtual QString tr( const char*, const char* ) const; |
52 | virtual QPopupMenu *popup ( QWidget *parent ) const; | 52 | virtual QPopupMenu *popup ( QWidget *parent ) const; |
53 | 53 | ||
54 | virtual void activated ( ); | 54 | virtual void activated ( ); |
55 | 55 | ||
56 | private: | 56 | private: |
57 | bool m_native; | 57 | bool m_native; |
58 | int m_startupRot; | ||
59 | ulong ref; | 58 | ulong ref; |
60 | }; | 59 | }; |
61 | 60 | ||
62 | #endif | 61 | #endif |