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 | |
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 | ||||
-rw-r--r-- | core/applets/rotateapplet/rotate.cpp | 54 | ||||
-rw-r--r-- | core/applets/vtapplet/opie-vtapplet.control | 2 | ||||
-rw-r--r-- | core/applets/vtapplet/vt.cpp | 10 | ||||
-rw-r--r-- | core/applets/vtapplet/vtapplet.pro | 2 |
7 files changed, 38 insertions, 74 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 | |||
@@ -5,5 +5,5 @@ 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 |
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 | |||
@@ -3,40 +3,10 @@ | |||
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" ) |
@@ -65,9 +35,5 @@ QString RestartApplet::text ( ) const | |||
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 | } |
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 | |||
@@ -7,5 +7,5 @@ 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 |
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index d13c2c0..9abbde8 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -1,27 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the OPIE Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | |||
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | 4 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> |
4 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> | 5 | Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> |
5 | =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> | 6 | Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> |
6 | .=l. | 7 | =. |
7 | .>+-= | 8 | .=l. |
8 | _;:, .> :=|. This library is free software; you can | 9 | Â Â Â Â Â Â .>+-= |
9 | .> <, > . <= redistribute it and/or modify it under | 10 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
10 | :=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
11 | .="- .-=="i, .._ License as published by the Free Software | 12 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | .="- .-=="i, Â Â .._ License as published by the Free Software |
13 | ._= =} : or (at your option) any later version. | 14 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
14 | .%+i> _;_. | 15 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
15 | .i_,=:_. -<s. This library is distributed in the hope that | 16 | Â Â .%`+i> Â Â Â _;_. |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
17 | : .. .:, . . . without even the implied warranty of | 18 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
18 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 19 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
19 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 20 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | ..}^=.= = ; Library General Public License for more | 21 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ++= -. . .: details. | 22 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
22 | : = ...= . :.=- | 23 | ++= Â -. Â Â .` Â Â .: details. |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | : Â Â = Â ...= . :.=- |
24 | -_. . . )=. = Library General Public License along with | 25 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
25 | -- :-= this library; see the file COPYING.LIB. | 26 | Â -_. . . Â )=. Â = Library General Public License along with |
27 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. | ||
26 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
@@ -34,9 +36,10 @@ | |||
34 | #include <opie2/odebug.h> | 36 | #include <opie2/odebug.h> |
35 | #include <opie2/odevice.h> | 37 | #include <opie2/odevice.h> |
38 | #include <opie2/oresource.h> | ||
39 | |||
36 | #include <qpe/applnk.h> | 40 | #include <qpe/applnk.h> |
37 | #include <qpe/config.h> | 41 | #include <qpe/config.h> |
38 | #include <qpe/power.h> | 42 | #include <qpe/power.h> |
39 | #include <qpe/qcopenvelope_qws.h> | 43 | #include <qpe/qcopenvelope_qws.h> |
40 | #include <qpe/resource.h> | ||
41 | using namespace Opie::Core; | 44 | using namespace Opie::Core; |
42 | 45 | ||
@@ -140,8 +143,5 @@ QString RotateApplet::tr( const char* s, const char* p ) const | |||
140 | QIconSet RotateApplet::icon() const | 143 | QIconSet RotateApplet::icon() const |
141 | { | 144 | { |
142 | QPixmap pix; | 145 | QPixmap pix = Opie::Core::OResource::loadPixmap( "Rotation", Opie::Core::OResource::SmallIcon ); |
143 | QImage img = Resource::loadImage( "Rotation" ); | ||
144 | if ( !img.isNull() ) | ||
145 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
146 | return pix; | 146 | return pix; |
147 | } | 147 | } |
diff --git a/core/applets/vtapplet/opie-vtapplet.control b/core/applets/vtapplet/opie-vtapplet.control index a1662f1..ae504a9 100644 --- a/core/applets/vtapplet/opie-vtapplet.control +++ b/core/applets/vtapplet/opie-vtapplet.control | |||
@@ -5,5 +5,5 @@ Section: opie/applets | |||
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Switch to another virtual terminal | 8 | Description: Switch to another virtual terminal |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index ae89635..0d4e657 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp | |||
@@ -16,6 +16,8 @@ | |||
16 | /* OPIE */ | 16 | /* OPIE */ |
17 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
18 | #include <opie2/oresource.h> | ||
19 | |||
18 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
19 | #include <qpe/resource.h> | 21 | |
20 | using namespace Opie::Core; | 22 | using namespace Opie::Core; |
21 | 23 | ||
@@ -69,9 +71,5 @@ QString VTApplet::tr( const char* s, const char* p ) const | |||
69 | QIconSet VTApplet::icon ( ) const | 71 | QIconSet VTApplet::icon ( ) const |
70 | { | 72 | { |
71 | QPixmap pix; | 73 | QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); |
72 | QImage img = Resource::loadImage ( "terminal" ); | ||
73 | |||
74 | if ( !img. isNull ( )) | ||
75 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
76 | return pix; | 74 | return pix; |
77 | } | 75 | } |
diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro index 6c4873c..912af58 100644 --- a/core/applets/vtapplet/vtapplet.pro +++ b/core/applets/vtapplet/vtapplet.pro | |||
@@ -7,5 +7,5 @@ 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 | 11 | ||