summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/rotateapplet/rotate.cpp6
-rw-r--r--core/applets/rotateapplet/rotate.h1
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
@@ -20,102 +20,102 @@
 -.   .:....=;==+<; You should have received a copy of the GNU
  -_. . .   )=.  = Library General Public License along with
    --        :-= this library; see the file COPYING.LIB.
If not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include "rotate.h"
RotateApplet::RotateApplet ( )
: QObject ( 0, "RotateApplet" ), ref ( 0 )
{
m_native = true;
- m_startupRot = QPEApplication::defaultRotation();
}
RotateApplet::~RotateApplet ( )
{
}
int RotateApplet::position ( ) const
{
return 2;
}
QString RotateApplet::name ( ) const
{
return tr( "Rotate shortcut" );
}
QString RotateApplet::text ( ) const
{
return tr( "Rotate" );
}
QString RotateApplet::tr( const char* s ) const
{
return qApp->translate( "RotateApplet", s, 0 );
}
QString RotateApplet::tr( const char* s, const char* p ) const
{
return qApp->translate( "RotateApplet", s, p );
}
QIconSet RotateApplet::icon ( ) const
{
QPixmap pix;
QImage img = Resource::loadImage ( "Rotation" );
if ( !img. isNull ( ))
pix. convertFromImage ( img. smoothScale ( 14, 14 ));
return pix;
}
QPopupMenu *RotateApplet::popup ( QWidget * ) const
{
return 0;
}
void RotateApplet::activated ( )
{
+ int currentRotation = QPEApplication::defaultRotation();
int newRotation;
if ( m_native == true ) {
- newRotation = m_startupRot + 90;
+ newRotation = currentRotation + 90;
} else {
- newRotation = m_startupRot;
+ newRotation = currentRotation - 90;
}
QCopEnvelope env( "QPE/System", "setCurrentRotation(int)" );
env << newRotation;
QCopEnvelope env2( "QPE/System", "setDefaultRotation(int)" );
env2 << newRotation;
m_native = !m_native;
}
QRESULT RotateApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
{
*iface = 0;
if ( uuid == IID_QUnknown )
*iface = this;
else if ( uuid == IID_MenuApplet )
*iface = this;
if ( *iface )
(*iface)-> addRef ( );
return QS_OK;
}
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
@@ -34,29 +34,28 @@
#include <qpe/menuappletinterface.h>
class RotateApplet : public QObject, public MenuAppletInterface
{
public:
RotateApplet ( );
virtual ~RotateApplet ( );
QRESULT queryInterface( const QUuid&, QUnknownInterface** );
Q_REFCOUNT
virtual int position() const;
virtual QString name ( ) const;
virtual QIconSet icon ( ) const;
virtual QString text ( ) const;
virtual QString tr( const char* ) const;
virtual QString tr( const char*, const char* ) const;
virtual QPopupMenu *popup ( QWidget *parent ) const;
virtual void activated ( );
private:
bool m_native;
- int m_startupRot;
ulong ref;
};
#endif