scale O-Menu-Applet pixmaps according to AppLnk::smallIconSize

2 files changed, 5 insertions, 4 deletions

diff --git a/core/applets/logoutapplet/logout.cpp b/core/applets/logoutapplet/logout.cpp
index 0ac0067..0f36f16 100644
--- a/core/applets/logoutapplet/logout.cpp
+++ b/core/applets/logoutapplet/logout.cpp
@@ -1,76 +1,76 @@
+#include "logout.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 #include <qmessagebox.h>
 
 #include <unistd.h>
 
-#include "logout.h"
-
-
 LogoutApplet::LogoutApplet ( )
         : QObject ( 0, "LogoutApplet" )
 {
 }
 
 LogoutApplet::~LogoutApplet ( )
 {
 }
 
 int LogoutApplet::position ( ) const
 {
     return 0;
 }
 
 QString LogoutApplet::name ( ) const
 {
         return tr( "Logout shortcut" );
 }
 
 QString LogoutApplet::text ( ) const
 {
         return tr( "Logout" );
 }
 
 QString LogoutApplet::tr( const char* s ) const
 {
     return qApp->translate( "LogoutApplet", s, 0 );
 }
 
 QString LogoutApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "LogoutApplet", s, p );
 }
 
 QIconSet LogoutApplet::icon ( ) const
 {
         QPixmap pix;
         QImage img = Resource::loadImage ( "logout" );
 
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
 }
 
 QPopupMenu *LogoutApplet::popup ( QWidget * ) const
 {
         return 0;
 }
 
 // This is a workaround for a Qt bug
 // clipboard applet has to stop its poll timer, or Qt/E
 // will hang on quit() right before it emits aboutToQuit()
 
 class HackApplication : public QApplication {
 public:
         HackApplication ( ) : QApplication ( dummy, 0 )
         {
         }
 
         void emit_about_to_quit ( )
         {
                 emit aboutToQuit ( );
         }
 
         int dummy;
diff --git a/core/applets/logoutapplet/logout.h b/core/applets/logoutapplet/logout.h
index a991f65..3c17278 100644
--- a/core/applets/logoutapplet/logout.h
+++ b/core/applets/logoutapplet/logout.h
@@ -1,47 +1,48 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __OPIE_LOGOUT_APPLET_H__
 #define __OPIE_LOGOUT_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class LogoutApplet : public QObject, public MenuAppletInterface
 {
 public:
     LogoutApplet ( );
     virtual ~LogoutApplet ( );
 
     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 ( );
 
 };
 
 #endif