author | mickeyl <mickeyl> | 2005-04-01 23:30:07 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-04-01 23:30:07 (UTC) |
commit | 8a1c307f9dfc26a31d42f29f29a5b1c048b99102 (patch) (unidiff) | |
tree | 8e8925baf6a77e01379264afb540f33a3c07bec7 | |
parent | 88cc0cc17864de6e36bdeedaae6df0a5cc738c5a (diff) | |
download | opie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.zip opie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.tar.gz opie-8a1c307f9dfc26a31d42f29f29a5b1c048b99102.tar.bz2 |
scale O-Menu-Applet pixmaps according to AppLnk::smallIconSize
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | core/applets/aboutapplet/about.cpp | 3 | ||||
-rw-r--r-- | core/applets/homeapplet/home.cpp | 8 | ||||
-rw-r--r-- | core/applets/homeapplet/home.h | 1 | ||||
-rw-r--r-- | core/applets/logoutapplet/logout.cpp | 8 | ||||
-rw-r--r-- | core/applets/logoutapplet/logout.h | 1 | ||||
-rw-r--r-- | core/applets/restartapplet2/restart.cpp | 11 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 6 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspend.cpp | 8 | ||||
-rw-r--r-- | core/applets/suspendapplet/suspend.h | 1 | ||||
-rw-r--r-- | core/applets/vtapplet/vt.cpp | 3 |
11 files changed, 28 insertions, 25 deletions
@@ -1,22 +1,23 @@ | |||
1 | 2005-??-??Opie 1.2.1 | 1 | 2005-??-??Opie 1.2.1 |
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 | ||
8 | Fixed Bugs | 9 | Fixed Bugs |
9 | ---------- | 10 | ---------- |
10 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) | 11 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) |
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 | ||
18 | 19 | ||
19 | New Features | 20 | New Features |
20 | ------------ | 21 | ------------ |
21 | * Launcher: Support a static background pixmap (mickeyl) | 22 | * Launcher: Support a static background pixmap (mickeyl) |
22 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) | 23 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) |
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,11 +1,12 @@ | |||
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> |
7 | 8 | ||
8 | #include <qlabel.h> | 9 | #include <qlabel.h> |
9 | 10 | ||
10 | AboutApplet::AboutApplet ( ) | 11 | AboutApplet::AboutApplet ( ) |
11 | : QObject ( 0, "AboutApplet" ), m_ad( 0l ) | 12 | : QObject ( 0, "AboutApplet" ), m_ad( 0l ) |
@@ -42,17 +43,17 @@ QString AboutApplet::tr( const char* s, const char* p ) const | |||
42 | } | 43 | } |
43 | 44 | ||
44 | QIconSet AboutApplet::icon ( ) const | 45 | QIconSet 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 | ||
54 | QPopupMenu *AboutApplet::popup ( QWidget * ) const | 55 | QPopupMenu *AboutApplet::popup ( QWidget * ) const |
55 | { | 56 | { |
56 | return 0; | 57 | return 0; |
57 | } | 58 | } |
58 | 59 | ||
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,16 +1,16 @@ | |||
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 | |||
9 | HomeApplet::HomeApplet ( ) | 9 | HomeApplet::HomeApplet ( ) |
10 | : QObject ( 0, "HomeApplet" ) | 10 | : QObject ( 0, "HomeApplet" ) |
11 | { | 11 | { |
12 | } | 12 | } |
13 | 13 | ||
14 | HomeApplet::~HomeApplet ( ) | 14 | HomeApplet::~HomeApplet ( ) |
15 | { | 15 | { |
16 | } | 16 | } |
@@ -41,17 +41,17 @@ QString HomeApplet::tr( const char* s, const char* p ) const | |||
41 | } | 41 | } |
42 | 42 | ||
43 | QIconSet HomeApplet::icon ( ) const | 43 | QIconSet HomeApplet::icon ( ) const |
44 | { | 44 | { |
45 | QPixmap pix; | 45 | QPixmap pix; |
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 | ||
53 | QPopupMenu *HomeApplet::popup ( QWidget * ) const | 53 | QPopupMenu *HomeApplet::popup ( QWidget * ) const |
54 | { | 54 | { |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |
57 | 57 | ||
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 | |||
@@ -16,16 +16,17 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef __OPIE_HOME_APPLET_H__ | 20 | #ifndef __OPIE_HOME_APPLET_H__ |
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 | ||
25 | class HomeApplet : public QObject, public MenuAppletInterface | 26 | class HomeApplet : public QObject, public MenuAppletInterface |
26 | { | 27 | { |
27 | public: | 28 | public: |
28 | HomeApplet ( ); | 29 | HomeApplet ( ); |
29 | virtual ~HomeApplet ( ); | 30 | virtual ~HomeApplet ( ); |
30 | 31 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 32 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
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,19 +1,19 @@ | |||
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 | ||
4 | #include <qapplication.h> | 7 | #include <qapplication.h> |
5 | #include <qmessagebox.h> | 8 | #include <qmessagebox.h> |
6 | 9 | ||
7 | #include <unistd.h> | 10 | #include <unistd.h> |
8 | 11 | ||
9 | #include "logout.h" | ||
10 | |||
11 | |||
12 | LogoutApplet::LogoutApplet ( ) | 12 | LogoutApplet::LogoutApplet ( ) |
13 | : QObject ( 0, "LogoutApplet" ) | 13 | : QObject ( 0, "LogoutApplet" ) |
14 | { | 14 | { |
15 | } | 15 | } |
16 | 16 | ||
17 | LogoutApplet::~LogoutApplet ( ) | 17 | LogoutApplet::~LogoutApplet ( ) |
18 | { | 18 | { |
19 | } | 19 | } |
@@ -44,17 +44,17 @@ QString LogoutApplet::tr( const char* s, const char* p ) const | |||
44 | } | 44 | } |
45 | 45 | ||
46 | QIconSet LogoutApplet::icon ( ) const | 46 | QIconSet LogoutApplet::icon ( ) const |
47 | { | 47 | { |
48 | QPixmap pix; | 48 | QPixmap pix; |
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 | ||
56 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const | 56 | QPopupMenu *LogoutApplet::popup ( QWidget * ) const |
57 | { | 57 | { |
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
60 | 60 | ||
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 | |||
@@ -16,16 +16,17 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef __OPIE_LOGOUT_APPLET_H__ | 20 | #ifndef __OPIE_LOGOUT_APPLET_H__ |
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 | ||
25 | class LogoutApplet : public QObject, public MenuAppletInterface | 26 | class LogoutApplet : public QObject, public MenuAppletInterface |
26 | { | 27 | { |
27 | public: | 28 | public: |
28 | LogoutApplet ( ); | 29 | LogoutApplet ( ); |
29 | virtual ~LogoutApplet ( ); | 30 | virtual ~LogoutApplet ( ); |
30 | 31 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 32 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
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,20 +1,17 @@ | |||
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 */ |
14 | static char *restart_xpm[] = { | 11 | static char *restart_xpm[] = { |
15 | "16 16 11 1", | 12 | "16 16 11 1", |
16 | " c None", | 13 | " c None", |
17 | ". c #000000", | 14 | ". c #000000", |
18 | "+ c #DCDCDC", | 15 | "+ c #DCDCDC", |
19 | "@ c #A0A0A0", | 16 | "@ c #A0A0A0", |
20 | "# c #C3C3C3", | 17 | "# c #C3C3C3", |
@@ -66,17 +63,17 @@ QString RestartApplet::text ( ) const | |||
66 | } | 63 | } |
67 | 64 | ||
68 | QIconSet RestartApplet::icon ( ) const | 65 | QIconSet RestartApplet::icon ( ) const |
69 | { | 66 | { |
70 | QPixmap pix; | 67 | QPixmap pix; |
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 | ||
78 | QPopupMenu *RestartApplet::popup ( QWidget * ) const | 75 | QPopupMenu *RestartApplet::popup ( QWidget * ) const |
79 | { | 76 | { |
80 | return 0; | 77 | return 0; |
81 | } | 78 | } |
82 | 79 | ||
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 | |||
@@ -28,24 +28,24 @@ | |||
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "rotate.h" | 31 | #include "rotate.h" |
32 | 32 | ||
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> |
40 | using namespace Opie::Core; | 41 | using namespace Opie::Core; |
41 | 42 | ||
42 | /* QT */ | 43 | /* STD */ |
43 | |||
44 | #include <time.h> | 44 | #include <time.h> |
45 | 45 | ||
46 | RotateApplet::RotateApplet() | 46 | RotateApplet::RotateApplet() |
47 | :QObject( 0, "RotateApplet" ), m_flipped( false ) | 47 | :QObject( 0, "RotateApplet" ), m_flipped( false ) |
48 | { | 48 | { |
49 | 49 | ||
50 | #if !defined(QT_NO_COP) | 50 | #if !defined(QT_NO_COP) |
51 | QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); | 51 | QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); |
@@ -137,17 +137,17 @@ QString RotateApplet::tr( const char* s, const char* p ) const | |||
137 | } | 137 | } |
138 | */ | 138 | */ |
139 | 139 | ||
140 | QIconSet RotateApplet::icon() const | 140 | QIconSet RotateApplet::icon() const |
141 | { | 141 | { |
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 | ||
149 | QPopupMenu* RotateApplet::popup(QWidget*) const | 149 | QPopupMenu* RotateApplet::popup(QWidget*) const |
150 | { | 150 | { |
151 | return 0; | 151 | return 0; |
152 | } | 152 | } |
153 | 153 | ||
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,16 +1,16 @@ | |||
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 | |||
9 | SuspendApplet::SuspendApplet ( ) | 9 | SuspendApplet::SuspendApplet ( ) |
10 | : QObject ( 0, "SuspendApplet" ) | 10 | : QObject ( 0, "SuspendApplet" ) |
11 | { | 11 | { |
12 | } | 12 | } |
13 | 13 | ||
14 | SuspendApplet::~SuspendApplet ( ) | 14 | SuspendApplet::~SuspendApplet ( ) |
15 | { | 15 | { |
16 | } | 16 | } |
@@ -41,17 +41,17 @@ QString SuspendApplet::tr( const char* s, const char* p ) const | |||
41 | } | 41 | } |
42 | 42 | ||
43 | QIconSet SuspendApplet::icon ( ) const | 43 | QIconSet SuspendApplet::icon ( ) const |
44 | { | 44 | { |
45 | QPixmap pix; | 45 | QPixmap pix; |
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 | ||
53 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const | 53 | QPopupMenu *SuspendApplet::popup ( QWidget * ) const |
54 | { | 54 | { |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |
57 | 57 | ||
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 | |||
@@ -16,16 +16,17 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef __OPIE_SUSPEND_APPLET_H__ | 20 | #ifndef __OPIE_SUSPEND_APPLET_H__ |
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 | ||
25 | class SuspendApplet : public QObject, public MenuAppletInterface | 26 | class SuspendApplet : public QObject, public MenuAppletInterface |
26 | { | 27 | { |
27 | public: | 28 | public: |
28 | SuspendApplet ( ); | 29 | SuspendApplet ( ); |
29 | virtual ~SuspendApplet ( ); | 30 | virtual ~SuspendApplet ( ); |
30 | 31 | ||
31 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 32 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
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 | |||
@@ -10,16 +10,17 @@ | |||
10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
11 | ** | 11 | ** |
12 | **********************************************************************/ | 12 | **********************************************************************/ |
13 | 13 | ||
14 | #include "vt.h" | 14 | #include "vt.h" |
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> |
19 | using namespace Opie::Core; | 20 | using namespace Opie::Core; |
20 | 21 | ||
21 | /* QT */ | 22 | /* QT */ |
22 | #include <qpopupmenu.h> | 23 | #include <qpopupmenu.h> |
23 | 24 | ||
24 | /* STD */ | 25 | /* STD */ |
25 | #include <fcntl.h> | 26 | #include <fcntl.h> |
@@ -66,17 +67,17 @@ QString VTApplet::tr( const char* s, const char* p ) const | |||
66 | */ | 67 | */ |
67 | 68 | ||
68 | QIconSet VTApplet::icon ( ) const | 69 | QIconSet VTApplet::icon ( ) const |
69 | { | 70 | { |
70 | QPixmap pix; | 71 | QPixmap pix; |
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 | ||
78 | QPopupMenu *VTApplet::popup ( QWidget* parent ) const | 79 | QPopupMenu *VTApplet::popup ( QWidget* parent ) const |
79 | { | 80 | { |
80 | odebug << "VTApplet::popup" << oendl; | 81 | odebug << "VTApplet::popup" << oendl; |
81 | 82 | ||
82 | struct vt_stat vtstat; | 83 | struct vt_stat vtstat; |