author | drw <drw> | 2005-04-24 21:32:37 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 21:32:37 (UTC) |
commit | 2391cfd9c79b87b3b00a4bb4a1d76981debb4486 (patch) (unidiff) | |
tree | 4ba271b1465881c0cce4ba5fd7a8c95bff5aca24 /core/applets/restartapplet2 | |
parent | ead2586272813b8cab8092773376c690cdf1b906 (diff) | |
download | opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.zip opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.gz opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/restartapplet2/opie-restartapplet2.control | 2 | ||||
-rw-r--r-- | core/applets/restartapplet2/restart.cpp | 40 | ||||
-rw-r--r-- | core/applets/restartapplet2/restartapplet.pro | 2 |
3 files changed, 5 insertions, 39 deletions
diff --git a/core/applets/restartapplet2/opie-restartapplet2.control b/core/applets/restartapplet2/opie-restartapplet2.control index cec3b19..9cc8dac 100644 --- a/core/applets/restartapplet2/opie-restartapplet2.control +++ b/core/applets/restartapplet2/opie-restartapplet2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-restartapplet2 | 1 | Package: opie-restartapplet2 |
2 | Files: plugins/applets/librestartapplet2.so* | 2 | Files: plugins/applets/librestartapplet2.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Restart Applet | 8 | Description: Restart Applet |
9 | A simple opie menu applet to restart the Opie environment | 9 | A simple opie menu applet to restart the Opie environment |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/core/applets/restartapplet2/restart.cpp b/core/applets/restartapplet2/restart.cpp index eda0005..42d814a 100644 --- a/core/applets/restartapplet2/restart.cpp +++ b/core/applets/restartapplet2/restart.cpp | |||
@@ -1,46 +1,16 @@ | |||
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" | 3 | #include "restart.h" |
4 | 4 | ||
5 | #include <opie2/oresource.h> | ||
6 | |||
5 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
6 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
7 | #include <qpe/resource.h> | ||
8 | #include <qpe/qcopenvelope_qws.h> | 9 | #include <qpe/qcopenvelope_qws.h> |
9 | 10 | ||
10 | /* XPM */ | ||
11 | static char *restart_xpm[] = { | ||
12 | "16 16 11 1", | ||
13 | " c None", | ||
14 | ". c #000000", | ||
15 | "+ c #DCDCDC", | ||
16 | "@ c #A0A0A0", | ||
17 | "# c #C3C3C3", | ||
18 | "$ c #808080", | ||
19 | "% c #FFA858", | ||
20 | "& c #FFDCA8", | ||
21 | "* c #FFFFC0", | ||
22 | "= c #FFFFFF", | ||
23 | "- c #585858", | ||
24 | " .. ", | ||
25 | " .. .++. .. ", | ||
26 | " .+@.@##@.@+. ", | ||
27 | " .@+$@%%@$+@. ", | ||
28 | " .$%%&%&%$. ", | ||
29 | " ..+@%&$$%&@+.. ", | ||
30 | ".+#@%&%@@&*%@#+.", | ||
31 | ".$@+$&*&&=*$+@$.", | ||
32 | " .--+$&*=&$+--. ", | ||
33 | " .$#++$$++#$. ", | ||
34 | " .@=$-$++$-$=@. ", | ||
35 | " .+@-..@@..-@+. ", | ||
36 | " ... .+=. ... ", | ||
37 | " .-$. ", | ||
38 | " .. ", | ||
39 | " "}; | ||
40 | |||
41 | RestartApplet::RestartApplet ( ) | 11 | RestartApplet::RestartApplet ( ) |
42 | : QObject ( 0, "RestartApplet" ) | 12 | : QObject ( 0, "RestartApplet" ) |
43 | { | 13 | { |
44 | } | 14 | } |
45 | 15 | ||
46 | RestartApplet::~RestartApplet ( ) | 16 | RestartApplet::~RestartApplet ( ) |
@@ -61,17 +31,13 @@ QString RestartApplet::text ( ) const | |||
61 | { | 31 | { |
62 | return tr( "Restart Opie" ); | 32 | return tr( "Restart Opie" ); |
63 | } | 33 | } |
64 | 34 | ||
65 | QIconSet RestartApplet::icon ( ) const | 35 | QIconSet RestartApplet::icon ( ) const |
66 | { | 36 | { |
67 | QPixmap pix; | 37 | QPixmap pix = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon ); |
68 | QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" ); | ||
69 | |||
70 | if ( !img. isNull ( )) | ||
71 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
72 | return pix; | 38 | return pix; |
73 | } | 39 | } |
74 | 40 | ||
75 | QPopupMenu *RestartApplet::popup ( QWidget * ) const | 41 | QPopupMenu *RestartApplet::popup ( QWidget * ) const |
76 | { | 42 | { |
77 | return 0; | 43 | return 0; |
diff --git a/core/applets/restartapplet2/restartapplet.pro b/core/applets/restartapplet2/restartapplet.pro index 60d34f2..d3c408d 100644 --- a/core/applets/restartapplet2/restartapplet.pro +++ b/core/applets/restartapplet2/restartapplet.pro | |||
@@ -3,13 +3,13 @@ CONFIG += qt plugin warn_on | |||
3 | HEADERS = restart.h | 3 | HEADERS = restart.h |
4 | SOURCES = restart.cpp | 4 | SOURCES = restart.cpp |
5 | TARGET = restartapplet2 | 5 | TARGET = restartapplet2 |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | MOC_DIR=opieobj | 11 | MOC_DIR=opieobj |
12 | OBJECTS_DIR=opieobj | 12 | OBJECTS_DIR=opieobj |
13 | 13 | ||
14 | 14 | ||
15 | 15 | ||