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
@@ -3,4 +3,5 @@
         Fixed Bugs
         ----------
+                * n.a.- scale O-Menu-Applets appropriately (mickeyl)
 
         2005-03-25Opie 1.2.0
@@ -12,5 +13,5 @@
         * #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
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
@@ -2,4 +2,5 @@
 #include "widget.h"
 
+#include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
@@ -42,11 +43,11 @@ QString AboutApplet::tr( const char* s, const char* p ) const
 }
 
-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;
 }
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,2 +1,5 @@
+#include "home.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -4,7 +7,4 @@
 #include <qapplication.h>
 
-#include "home.h"
-
-
 HomeApplet::HomeApplet ( )
         : QObject ( 0, "HomeApplet" )
@@ -47,5 +47,5 @@ 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
@@ -22,4 +22,5 @@
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class HomeApplet : public QObject, public MenuAppletInterface
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,2 +1,5 @@
+#include "logout.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -7,7 +10,4 @@
 #include <unistd.h>
 
-#include "logout.h"
-
-
 LogoutApplet::LogoutApplet ( )
         : QObject ( 0, "LogoutApplet" )
@@ -50,5 +50,5 @@ 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
@@ -22,4 +22,5 @@
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class LogoutApplet : public QObject, public MenuAppletInterface
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,14 +1,11 @@
 // 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[] = {
@@ -72,5 +69,5 @@ 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
@@ -34,4 +34,5 @@
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
+#include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
@@ -40,6 +41,5 @@
 using namespace Opie::Core;
 
-/* QT */
-
+/* STD */
 #include <time.h>
 
@@ -143,5 +143,5 @@ QIconSet RotateApplet::icon() const
     QImage img = Resource::loadImage( "Rotation" );
     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,2 +1,5 @@
+#include "suspend.h"
+
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
@@ -4,7 +7,4 @@
 #include <qapplication.h>
 
-#include "suspend.h"
-
-
 SuspendApplet::SuspendApplet ( )
         : QObject ( 0, "SuspendApplet" )
@@ -47,5 +47,5 @@ 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
@@ -22,4 +22,5 @@
 
 #include <qpe/menuappletinterface.h>
+#include <qobject.h>
 
 class SuspendApplet : public QObject, public MenuAppletInterface
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
@@ -16,4 +16,5 @@
 /* OPIE */
 #include <opie2/odebug.h>
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
@@ -72,5 +73,5 @@ QIconSet VTApplet::icon ( ) const
 
     if ( !img. isNull ( ))
-        pix. convertFromImage ( img. smoothScale ( 14, 14 ));
+        pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
     return pix;
 }