author | drw <drw> | 2005-04-24 20:40:30 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 20:40:30 (UTC) |
commit | 4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b (patch) (unidiff) | |
tree | d2c087c0623b6e6a0f7750069b7fc6ceea042d1a /core/applets/aboutapplet/about.cpp | |
parent | 01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (diff) | |
download | opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.zip opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.gz opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.bz2 |
Resource -> OResource
Diffstat (limited to 'core/applets/aboutapplet/about.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/aboutapplet/about.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp index ec214f3..accfdd6 100644 --- a/core/applets/aboutapplet/about.cpp +++ b/core/applets/aboutapplet/about.cpp | |||
@@ -1,18 +1,19 @@ | |||
1 | #include "about.h" | 1 | #include "about.h" |
2 | #include "widget.h" | 2 | #include "widget.h" |
3 | 3 | ||
4 | #include <opie2/oresource.h> | ||
5 | |||
4 | #include <qpe/applnk.h> | 6 | #include <qpe/applnk.h> |
5 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
6 | #include <qpe/resource.h> | ||
7 | #include <qpe/qcopenvelope_qws.h> | 8 | #include <qpe/qcopenvelope_qws.h> |
8 | 9 | ||
9 | #include <qlabel.h> | 10 | #include <qlabel.h> |
10 | 11 | ||
11 | AboutApplet::AboutApplet ( ) | 12 | AboutApplet::AboutApplet ( ) |
12 | : QObject ( 0, "AboutApplet" ), m_ad( 0l ) | 13 | : QObject ( 0, "AboutApplet" ), m_ad( 0l ) |
13 | {} | 14 | {} |
14 | 15 | ||
15 | AboutApplet::~AboutApplet ( ) | 16 | AboutApplet::~AboutApplet ( ) |
16 | { | 17 | { |
17 | delete m_ad; | 18 | delete m_ad; |
18 | } | 19 | } |
@@ -35,29 +36,25 @@ QString AboutApplet::text ( ) const | |||
35 | QString AboutApplet::tr( const char* s ) const | 36 | QString AboutApplet::tr( const char* s ) const |
36 | { | 37 | { |
37 | return qApp->translate( "AboutApplet", s, 0 ); | 38 | return qApp->translate( "AboutApplet", s, 0 ); |
38 | } | 39 | } |
39 | 40 | ||
40 | QString AboutApplet::tr( const char* s, const char* p ) const | 41 | QString AboutApplet::tr( const char* s, const char* p ) const |
41 | { | 42 | { |
42 | return qApp->translate( "AboutApplet", s, p ); | 43 | return qApp->translate( "AboutApplet", s, p ); |
43 | } | 44 | } |
44 | 45 | ||
45 | QIconSet AboutApplet::icon() const | 46 | QIconSet AboutApplet::icon() const |
46 | { | 47 | { |
47 | QPixmap pix; | 48 | QPixmap pix = Opie::Core::OResource::loadPixmap ( "logo/opielogo", Opie::Core::OResource::SmallIcon ); |
48 | QImage img = Resource::loadImage ( "logo/opielogo" ); | ||
49 | |||
50 | if ( !img.isNull() ) | ||
51 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
52 | return pix; | 49 | return pix; |
53 | } | 50 | } |
54 | 51 | ||
55 | QPopupMenu *AboutApplet::popup ( QWidget * ) const | 52 | QPopupMenu *AboutApplet::popup ( QWidget * ) const |
56 | { | 53 | { |
57 | return 0; | 54 | return 0; |
58 | } | 55 | } |
59 | 56 | ||
60 | void AboutApplet::activated() | 57 | void AboutApplet::activated() |
61 | { | 58 | { |
62 | if ( !m_ad ) | 59 | if ( !m_ad ) |
63 | m_ad = new AboutWidget( 0, "aboutDialog" ); | 60 | m_ad = new AboutWidget( 0, "aboutDialog" ); |