| -rw-r--r-- | core/applets/restartapplet2/opie-restartapplet2.control | 2 | ||||
| -rw-r--r-- | core/applets/restartapplet2/restart.cpp | 42 | ||||
| -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, 39 insertions, 75 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 @@ -6,3 +6,3 @@ Maintainer: L.J. Potter <lpotter@trolltech.com> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Restart Applet 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 @@ -4,38 +4,8 @@ +#include <opie2/oresource.h> + #include <qpe/applnk.h> #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> -/* XPM */ -static char *restart_xpm[] = { -"16 16 11 1", -" c None", -". c #000000", -"+ c #DCDCDC", -"@ c #A0A0A0", -"# c #C3C3C3", -"$ c #808080", -"% c #FFA858", -"& c #FFDCA8", -"* c #FFFFC0", -"= c #FFFFFF", -"- c #585858", -" .. ", -" .. .++. .. ", -" .+@.@##@.@+. ", -" .@+$@%%@$+@. ", -" .$%%&%&%$. ", -" ..+@%&$$%&@+.. ", -".+#@%&%@@&*%@#+.", -".$@+$&*&&=*$+@$.", -" .--+$&*=&$+--. ", -" .$#++$$++#$. ", -" .@=$-$++$-$=@. ", -" .+@-..@@..-@+. ", -" ... .+=. ... ", -" .-$. ", -" .. ", -" "}; - RestartApplet::RestartApplet ( ) @@ -66,8 +36,4 @@ QIconSet RestartApplet::icon ( ) const { - QPixmap pix; - QImage img = ( const char** ) restart_xpm ;//Resource::loadImage ( "Run" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); - return pix; + QPixmap pix = Opie::Core::OResource::loadPixmap( "exec", Opie::Core::OResource::SmallIcon ); + return pix; } 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 @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 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,26 +1,28 @@ /* - This file is part of the OPIE Project + Â Â Â Â Â Â Â Â This file is part of the Opie Project + Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> Copyright (C) 2003 Greg Gilbert <ggilbert@treke.net> - =. Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> - .=l. - .>+-= - _;:, .> :=|. This library is free software; you can -.> < , > . <= redistribute it and/or modify it under -:=1 )Y*s>-.-- : the terms of the GNU Library General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=| MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>: PARTICULAR PURPOSE. See the GNU -..}^=.= = ; Library General Public License for more -++= -. . .: details. - : = ...= . :.=- - -. .:....=;==+<; You should have received a copy of the GNU - -_. . . )=. = Library General Public License along with - -- :-= this library; see the file COPYING.LIB. + Copyright (C) 2004 Michael Lauer <mickey@Vanille.de> + =. + .=l. +Â Â Â Â Â Â .>+-= +Â _;:, Â Â .> Â Â :=|. This program is free software; you can +.> <`_, Â > Â . Â <= redistribute it and/or modify it under + :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public +.="- .-=="i, Â Â .._ License as published by the Free Software +Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, +Â Â Â ._= =} Â Â Â : or (at your option) any later version. +Â Â .%`+i> Â Â Â _;_. +Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that +Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; + : .. Â Â .:, Â Â . . . without even the implied warranty of +Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A +Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU +..}^=.= Â Â Â = Â Â Â ; Library General Public License for more +++= Â -. Â Â .` Â Â .: details. + : Â Â = Â ...= . :.=- +Â -. Â .:....=;==+<; You should have received a copy of the GNU +Â -_. . . Â )=. Â = Library General Public License along with +Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, @@ -35,2 +37,4 @@ #include <opie2/odevice.h> +#include <opie2/oresource.h> + #include <qpe/applnk.h> @@ -39,3 +43,2 @@ #include <qpe/qcopenvelope_qws.h> -#include <qpe/resource.h> using namespace Opie::Core; @@ -141,6 +144,3 @@ QIconSet RotateApplet::icon() const { - QPixmap pix; - QImage img = Resource::loadImage( "Rotation" ); - if ( !img.isNull() ) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap( "Rotation", Opie::Core::OResource::SmallIcon ); return pix; 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 @@ -6,3 +6,3 @@ Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Switch to another virtual terminal 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 @@ -17,4 +17,6 @@ #include <opie2/odebug.h> +#include <opie2/oresource.h> + #include <qpe/applnk.h> -#include <qpe/resource.h> + using namespace Opie::Core; @@ -70,7 +72,3 @@ QIconSet VTApplet::icon ( ) const { - QPixmap pix; - QImage img = Resource::loadImage ( "terminal" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); return pix; 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 @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 |