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

11 files changed, 30 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 378ebf8..967e68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,2 +4,3 @@
         ----------
+                * n.a.- scale O-Menu-Applets appropriately (mickeyl)
 
@@ -13,3 +14,3 @@
         * 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)
 
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
@@ -3,2 +3,3 @@
 
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
@@ -43,3 +44,3 @@ QString AboutApplet::tr( const char* s, const char* p ) const
 
-QIconSet AboutApplet::icon ( ) const
+QIconSet AboutApplet::icon() const
 {
@@ -48,4 +49,4 @@ QIconSet AboutApplet::icon ( ) const
 
-    if ( !img. isNull ( ) )
-        pix. convertFromImage ( img. smoothScale ( 14, 14 ) );
+    if ( !img.isNull() )
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
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 +1,4 @@
+#include "home.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
@@ -5,5 +8,2 @@
 
-#include "home.h"
-
-
 HomeApplet::HomeApplet ( )
@@ -48,3 +48,3 @@ QIconSet HomeApplet::icon ( ) const
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
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
@@ -23,2 +23,3 @@
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
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 +1,4 @@
+#include "logout.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
@@ -8,5 +11,2 @@
 
-#include "logout.h"
-
-
 LogoutApplet::LogoutApplet ( )
@@ -51,3 +51,3 @@ QIconSet LogoutApplet::icon ( ) const
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
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
@@ -23,2 +23,3 @@
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
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
@@ -2,2 +2,5 @@
 
+#include "restart.h"
+
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
@@ -6,8 +9,2 @@
 
-#include "restart.h"
-
-// #include <stdlib.h>
-// #include <unistd.h>
-// #include <sys/stat.h>
-//#include <dirent.h>
 /* XPM */
@@ -73,3 +70,3 @@ QIconSet RestartApplet::icon ( ) const
   if ( !img. isNull ( ))
-    pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
   return pix;
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
@@ -35,2 +35,3 @@
 #include <opie2/odevice.h>
+#include <qpe/applnk.h>
 #include <qpe/config.h>
@@ -41,4 +42,3 @@ using namespace Opie::Core;
 
-/* QT */
-
+/* STD */
 #include <time.h>
@@ -144,3 +144,3 @@ QIconSet RotateApplet::icon() const
     if ( !img.isNull() )
-        pix.convertFromImage( img.smoothScale( 14, 14 ) );
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
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 +1,4 @@
+#include "suspend.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
@@ -5,5 +8,2 @@
 
-#include "suspend.h"
-
-
 SuspendApplet::SuspendApplet ( )
@@ -48,3 +48,3 @@ QIconSet SuspendApplet::icon ( ) const
         if ( !img. isNull ( ))
-                pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
         return pix;
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
@@ -23,2 +23,3 @@
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
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
@@ -17,2 +17,3 @@
 #include <opie2/odebug.h>
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
@@ -73,3 +74,3 @@ QIconSet VTApplet::icon ( ) const
     if ( !img. isNull ( ))
-        pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;