summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-04-01 23:30:07 (UTC)
committer mickeyl <mickeyl>2005-04-01 23:30:07 (UTC)
commit8a1c307f9dfc26a31d42f29f29a5b1c048b99102 (patch) (unidiff)
tree8e8925baf6a77e01379264afb540f33a3c07bec7
parent88cc0cc17864de6e36bdeedaae6df0a5cc738c5a (diff)
downloadopie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.zip
opie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.tar.gz
opie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.tar.bz2
scale O-Menu-Applet pixmaps according to AppLnk::smallIconSize
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog3
-rw-r--r--core/applets/aboutapplet/about.cpp7
-rw-r--r--core/applets/homeapplet/home.cpp8
-rw-r--r--core/applets/homeapplet/home.h1
-rw-r--r--core/applets/logoutapplet/logout.cpp8
-rw-r--r--core/applets/logoutapplet/logout.h1
-rw-r--r--core/applets/restartapplet2/restart.cpp11
-rw-r--r--core/applets/rotateapplet/rotate.cpp6
-rw-r--r--core/applets/suspendapplet/suspend.cpp8
-rw-r--r--core/applets/suspendapplet/suspend.h1
-rw-r--r--core/applets/vtapplet/vt.cpp3
11 files changed, 30 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 378ebf8..967e68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 Fixed Bugs 3 Fixed Bugs
4 ---------- 4 ----------
5 * n.a.- scale O-Menu-Applets appropriately (mickeyl)
5 6
6 2005-03-25Opie 1.2.0 7 2005-03-25Opie 1.2.0
7 8
@@ -11,7 +12,7 @@
11 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) 12 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
12 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) 13 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
13 * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) 14 * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw)
14 * n.a - make qpeglobal.h include qglobal.h (zecke) 15 * n.a. - make qpeglobal.h include qglobal.h (zecke)
15 16
16 2005-03-20Opie 1.2.0-rc1 17 2005-03-20Opie 1.2.0-rc1
17 18
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,6 +1,7 @@
1#include "about.h" 1#include "about.h"
2#include "widget.h" 2#include "widget.h"
3 3
4#include <qpe/applnk.h>
4#include <qpe/qpeapplication.h> 5#include <qpe/qpeapplication.h>
5#include <qpe/resource.h> 6#include <qpe/resource.h>
6#include <qpe/qcopenvelope_qws.h> 7#include <qpe/qcopenvelope_qws.h>
@@ -41,13 +42,13 @@ QString AboutApplet::tr( const char* s, const char* p ) const
41 return qApp->translate( "AboutApplet", s, p ); 42 return qApp->translate( "AboutApplet", s, p );
42} 43}
43 44
44QIconSet AboutApplet::icon ( ) const 45QIconSet AboutApplet::icon() const
45{ 46{
46 QPixmap pix; 47 QPixmap pix;
47 QImage img = Resource::loadImage ( "logo/opielogo" ); 48 QImage img = Resource::loadImage ( "logo/opielogo" );
48 49
49 if ( !img. isNull ( ) ) 50 if ( !img.isNull() )
50 pix. convertFromImage ( img. smoothScale ( 14, 14 ) ); 51 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
51 return pix; 52 return pix;
52} 53}
53 54
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,11 +1,11 @@
1#include "home.h"
2
3#include <qpe/applnk.h>
1#include <qpe/resource.h> 4#include <qpe/resource.h>
2#include <qpe/qcopenvelope_qws.h> 5#include <qpe/qcopenvelope_qws.h>
3 6
4#include <qapplication.h> 7#include <qapplication.h>
5 8
6#include "home.h"
7
8
9HomeApplet::HomeApplet ( ) 9HomeApplet::HomeApplet ( )
10 : QObject ( 0, "HomeApplet" ) 10 : QObject ( 0, "HomeApplet" )
11{ 11{
@@ -46,7 +46,7 @@ QIconSet HomeApplet::icon ( ) const
46 QImage img = Resource::loadImage ( "home" ); 46 QImage img = Resource::loadImage ( "home" );
47 47
48 if ( !img. isNull ( )) 48 if ( !img. isNull ( ))
49 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 49 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
50 return pix; 50 return pix;
51} 51}
52 52
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
@@ -21,6 +21,7 @@
21#define __OPIE_HOME_APPLET_H__ 21#define __OPIE_HOME_APPLET_H__
22 22
23#include <qpe/menuappletinterface.h> 23#include <qpe/menuappletinterface.h>
24#include <qobject.h>
24 25
25class HomeApplet : public QObject, public MenuAppletInterface 26class HomeApplet : public QObject, public MenuAppletInterface
26{ 27{
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,3 +1,6 @@
1#include "logout.h"
2
3#include <qpe/applnk.h>
1#include <qpe/resource.h> 4#include <qpe/resource.h>
2#include <qpe/qcopenvelope_qws.h> 5#include <qpe/qcopenvelope_qws.h>
3 6
@@ -6,9 +9,6 @@
6 9
7#include <unistd.h> 10#include <unistd.h>
8 11
9#include "logout.h"
10
11
12LogoutApplet::LogoutApplet ( ) 12LogoutApplet::LogoutApplet ( )
13 : QObject ( 0, "LogoutApplet" ) 13 : QObject ( 0, "LogoutApplet" )
14{ 14{
@@ -49,7 +49,7 @@ QIconSet LogoutApplet::icon ( ) const
49 QImage img = Resource::loadImage ( "logout" ); 49 QImage img = Resource::loadImage ( "logout" );
50 50
51 if ( !img. isNull ( )) 51 if ( !img. isNull ( ))
52 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 52 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
53 return pix; 53 return pix;
54} 54}
55 55
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
@@ -21,6 +21,7 @@
21#define __OPIE_LOGOUT_APPLET_H__ 21#define __OPIE_LOGOUT_APPLET_H__
22 22
23#include <qpe/menuappletinterface.h> 23#include <qpe/menuappletinterface.h>
24#include <qobject.h>
24 25
25class LogoutApplet : public QObject, public MenuAppletInterface 26class LogoutApplet : public QObject, public MenuAppletInterface
26{ 27{
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,15 +1,12 @@
1// coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com> 1// coptright Mon 10-21-2002 01:14:03 by L. Potter <ljp@llornkcor.com>
2 2
3#include "restart.h"
4
5#include <qpe/applnk.h>
3#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
4#include <qpe/resource.h> 7#include <qpe/resource.h>
5#include <qpe/qcopenvelope_qws.h> 8#include <qpe/qcopenvelope_qws.h>
6 9
7#include "restart.h"
8
9// #include <stdlib.h>
10// #include <unistd.h>
11// #include <sys/stat.h>
12//#include <dirent.h>
13/* XPM */ 10/* XPM */
14static char *restart_xpm[] = { 11static char *restart_xpm[] = {
15"16 16 11 1", 12"16 16 11 1",
@@ -71,7 +68,7 @@ QIconSet RestartApplet::icon ( ) const
71 QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" ); 68 QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" );
72 69
73 if ( !img. isNull ( )) 70 if ( !img. isNull ( ))
74 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 71 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
75 return pix; 72 return pix;
76} 73}
77 74
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
@@ -33,14 +33,14 @@
33/* OPIE */ 33/* OPIE */
34#include <opie2/odebug.h> 34#include <opie2/odebug.h>
35#include <opie2/odevice.h> 35#include <opie2/odevice.h>
36#include <qpe/applnk.h>
36#include <qpe/config.h> 37#include <qpe/config.h>
37#include <qpe/power.h> 38#include <qpe/power.h>
38#include <qpe/qcopenvelope_qws.h> 39#include <qpe/qcopenvelope_qws.h>
39#include <qpe/resource.h> 40#include <qpe/resource.h>
40using namespace Opie::Core; 41using namespace Opie::Core;
41 42
42/* QT */ 43/* STD */
43
44#include <time.h> 44#include <time.h>
45 45
46RotateApplet::RotateApplet() 46RotateApplet::RotateApplet()
@@ -142,7 +142,7 @@ QIconSet RotateApplet::icon() const
142 QPixmap pix; 142 QPixmap pix;
143 QImage img = Resource::loadImage( "Rotation" ); 143 QImage img = Resource::loadImage( "Rotation" );
144 if ( !img.isNull() ) 144 if ( !img.isNull() )
145 pix.convertFromImage( img.smoothScale( 14, 14 ) ); 145 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
146 return pix; 146 return pix;
147} 147}
148 148
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,11 +1,11 @@
1#include "suspend.h"
2
3#include <qpe/applnk.h>
1#include <qpe/resource.h> 4#include <qpe/resource.h>
2#include <qpe/qcopenvelope_qws.h> 5#include <qpe/qcopenvelope_qws.h>
3 6
4#include <qapplication.h> 7#include <qapplication.h>
5 8
6#include "suspend.h"
7
8
9SuspendApplet::SuspendApplet ( ) 9SuspendApplet::SuspendApplet ( )
10 : QObject ( 0, "SuspendApplet" ) 10 : QObject ( 0, "SuspendApplet" )
11{ 11{
@@ -46,7 +46,7 @@ QIconSet SuspendApplet::icon ( ) const
46 QImage img = Resource::loadImage ( "suspend" ); 46 QImage img = Resource::loadImage ( "suspend" );
47 47
48 if ( !img. isNull ( )) 48 if ( !img. isNull ( ))
49 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 49 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
50 return pix; 50 return pix;
51} 51}
52 52
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
@@ -21,6 +21,7 @@
21#define __OPIE_SUSPEND_APPLET_H__ 21#define __OPIE_SUSPEND_APPLET_H__
22 22
23#include <qpe/menuappletinterface.h> 23#include <qpe/menuappletinterface.h>
24#include <qobject.h>
24 25
25class SuspendApplet : public QObject, public MenuAppletInterface 26class SuspendApplet : public QObject, public MenuAppletInterface
26{ 27{
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
@@ -15,6 +15,7 @@
15 15
16/* OPIE */ 16/* OPIE */
17#include <opie2/odebug.h> 17#include <opie2/odebug.h>
18#include <qpe/applnk.h>
18#include <qpe/resource.h> 19#include <qpe/resource.h>
19using namespace Opie::Core; 20using namespace Opie::Core;
20 21
@@ -71,7 +72,7 @@ QIconSet VTApplet::icon ( ) const
71 QImage img = Resource::loadImage ( "terminal" ); 72 QImage img = Resource::loadImage ( "terminal" );
72 73
73 if ( !img. isNull ( )) 74 if ( !img. isNull ( ))
74 pix. convertFromImage ( img. smoothScale ( 14, 14 )); 75 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
75 return pix; 76 return pix;
76} 77}
77 78