11 files changed, 30 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 378ebf8..967e68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,21 @@
         2005-??-??Opie 1.2.1
 
         Fixed Bugs
         ----------
+                * n.a.- scale O-Menu-Applets appropriately (mickeyl)
 
         2005-03-25Opie 1.2.0
 
         Fixed Bugs
         ----------
         * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
         * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
         * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
         * n.a.  - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
-        * n.a   - make qpeglobal.h include qglobal.h (zecke)
+        * n.a.   - make qpeglobal.h include qglobal.h (zecke)
 
         2005-03-20Opie 1.2.0-rc1
 
 
         New Features
         ------------
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp
index 1dbd4c4..ec214f3 100644
--- a/core/applets/aboutapplet/about.cpp
+++ b/core/applets/aboutapplet/about.cpp
@@ -1,9 +1,10 @@
 #include "about.h"
 #include "widget.h"
 
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qlabel.h>
 
@@ -38,19 +39,19 @@ QString AboutApplet::tr( const char* s ) const
 
 QString AboutApplet::tr( const char* s, const char* p ) const
 {
     return qApp->translate( "AboutApplet", s, p );
 }
 
-QIconSet AboutApplet::icon ( ) const
+QIconSet AboutApplet::icon() const
 {
     QPixmap pix;
     QImage img = Resource::loadImage ( "logo/opielogo" );
 
-    if ( !img. isNull ( ) )
-        pix. convertFromImage ( img. smoothScale ( 14, 14 ) );
+    if ( !img.isNull() )
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
 }
 
 QPopupMenu *AboutApplet::popup ( QWidget * ) const
 {
     return 0;
diff --git a/core/applets/homeapplet/home.cpp b/core/applets/homeapplet/home.cpp
index 8a930be..02d1265 100644
--- a/core/applets/homeapplet/home.cpp
+++ b/core/applets/homeapplet/home.cpp
@@ -1,14 +1,14 @@
+#include "home.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 
-#include "home.h"
-
-
 HomeApplet::HomeApplet ( )
         : QObject ( 0, "HomeApplet" )
 {
 }
 
 HomeApplet::~HomeApplet ( )
@@ -43,13 +43,13 @@ QString HomeApplet::tr( const char* s, const char* p ) const
 QIconSet HomeApplet::icon ( ) const
 {
         QPixmap pix;
         QImage img = Resource::loadImage ( "home" );
         
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
 }
 
 QPopupMenu *HomeApplet::popup ( QWidget * ) const
 {
         return 0;
diff --git a/core/applets/homeapplet/home.h b/core/applets/homeapplet/home.h
index 22ecd47..7f1f006 100644
--- a/core/applets/homeapplet/home.h
+++ b/core/applets/homeapplet/home.h
@@ -18,12 +18,13 @@
 **
 **********************************************************************/
 #ifndef __OPIE_HOME_APPLET_H__
 #define __OPIE_HOME_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class HomeApplet : public QObject, public MenuAppletInterface
 {
 public:
     HomeApplet ( );
     virtual ~HomeApplet ( );
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,17 +1,17 @@
+#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 ( )
@@ -46,13 +46,13 @@ QString LogoutApplet::tr( const char* s, const char* p ) const
 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;
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
@@ -18,12 +18,13 @@
 **
 **********************************************************************/
 #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 ( );
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp
index a169505..eda0005 100644
--- a/core/applets/restartapplet2/restart.cpp
+++ b/core/applets/restartapplet2/restart.cpp
@@ -1,18 +1,15 @@
 // coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com>
 
+#include "restart.h"
+
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include "restart.h"
-
-// #include <stdlib.h>
-// #include <unistd.h>
-// #include <sys/stat.h>
-//#include <dirent.h>
 /* XPM */
 static char *restart_xpm[] = {
 "16 16 11 1",
 "   c None",
 ".  c #000000",
 "+  c #DCDCDC",
@@ -68,13 +65,13 @@ QString RestartApplet::text ( ) const
 QIconSet RestartApplet::icon ( ) const
 {
   QPixmap pix;
   QImage img =  ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" );
   
   if ( !img. isNull ( ))
-    pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
   return pix;
 }
 
 QPopupMenu *RestartApplet::popup ( QWidget * ) const
 {
   return 0;
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index f23423d..d13c2c0 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -30,20 +30,20 @@
 
 #include "rotate.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
+#include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
 
-/* QT */
-
+/* STD */
 #include <time.h>
 
 RotateApplet::RotateApplet()
              :QObject( 0, "RotateApplet" ), m_flipped( false )
 {
 
@@ -139,13 +139,13 @@ QString RotateApplet::tr( const char* s, const char* p ) const
 
 QIconSet RotateApplet::icon() const
 {
     QPixmap pix;
     QImage img = Resource::loadImage( "Rotation" );
     if ( !img.isNull() )
-        pix.convertFromImage( img.smoothScale( 14, 14 ) );
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
 }
 
 QPopupMenu* RotateApplet::popup(QWidget*) const
 {
     return 0;
diff --git a/core/applets/suspendapplet/suspend.cpp b/core/applets/suspendapplet/suspend.cpp
index 0eb94cb..4fbd704 100644
--- a/core/applets/suspendapplet/suspend.cpp
+++ b/core/applets/suspendapplet/suspend.cpp
@@ -1,14 +1,14 @@
+#include "suspend.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qapplication.h>
 
-#include "suspend.h"
-
-
 SuspendApplet::SuspendApplet ( )
         : QObject ( 0, "SuspendApplet" )
 {
 }
 
 SuspendApplet::~SuspendApplet ( )
@@ -43,13 +43,13 @@ QString SuspendApplet::tr( const char* s, const char* p ) const
 QIconSet SuspendApplet::icon ( ) const
 {
         QPixmap pix;
         QImage img = Resource::loadImage ( "suspend" );
         
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
 }
 
 QPopupMenu *SuspendApplet::popup ( QWidget * ) const
 {
         return 0;
diff --git a/core/applets/suspendapplet/suspend.h b/core/applets/suspendapplet/suspend.h
index 8c54cde..c037adc 100644
--- a/core/applets/suspendapplet/suspend.h
+++ b/core/applets/suspendapplet/suspend.h
@@ -18,12 +18,13 @@
 **
 **********************************************************************/
 #ifndef __OPIE_SUSPEND_APPLET_H__
 #define __OPIE_SUSPEND_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class SuspendApplet : public QObject, public MenuAppletInterface
 {
 public:
     SuspendApplet ( );
     virtual ~SuspendApplet ( );
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp
index 7832ee0..ae89635 100644
--- a/core/applets/vtapplet/vt.cpp
+++ b/core/applets/vtapplet/vt.cpp
@@ -12,12 +12,13 @@
 **********************************************************************/
 
 #include "vt.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qpopupmenu.h>
 
@@ -68,13 +69,13 @@ QString VTApplet::tr( const char* s, const char* p ) const
 QIconSet VTApplet::icon ( ) const
 {
     QPixmap pix;
     QImage img = Resource::loadImage ( "terminal" );
 
     if ( !img. isNull ( ))
-        pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
 }
 
 QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 {
     odebug << "VTApplet::popup" << oendl;