summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 21:32:37 (UTC)
committer drw <drw>2005-04-24 21:32:37 (UTC)
commit2391cfd9c79b87b3b00a4bb4a1d76981debb4486 (patch) (unidiff)
tree4ba271b1465881c0cce4ba5fd7a8c95bff5aca24
parentead2586272813b8cab8092773376c690cdf1b906 (diff)
downloadopie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.zip
opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.gz
opie-2391cfd9c79b87b3b00a4bb4a1d76981debb4486.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/restartapplet2/opie-restartapplet2.control2
-rw-r--r--core/applets/restartapplet2/restart.cpp42
-rw-r--r--core/applets/restartapplet2/restartapplet.pro2
-rw-r--r--core/applets/rotateapplet/rotate.cpp54
-rw-r--r--core/applets/vtapplet/opie-vtapplet.control2
-rw-r--r--core/applets/vtapplet/vt.cpp10
-rw-r--r--core/applets/vtapplet/vtapplet.pro2
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
@@ -1,10 +1,10 @@
1Package: opie-restartapplet2 1Package: opie-restartapplet2
2Files: plugins/applets/librestartapplet2.so* 2Files: plugins/applets/librestartapplet2.so*
3Priority: optional 3Priority: optional
4Section: opie/applets 4Section: opie/applets
5Maintainer: L.J. Potter <lpotter@trolltech.com> 5Maintainer: L.J. Potter <lpotter@trolltech.com>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: Restart Applet 8Description: Restart Applet
9 A simple opie menu applet to restart the Opie environment 9 A simple opie menu applet to restart the Opie environment
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $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,48 +1,18 @@
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 */
11static 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
41RestartApplet::RestartApplet ( ) 11RestartApplet::RestartApplet ( )
42 : QObject ( 0, "RestartApplet" ) 12 : QObject ( 0, "RestartApplet" )
43{ 13{
44} 14}
45 15
46RestartApplet::~RestartApplet ( ) 16RestartApplet::~RestartApplet ( )
47{ 17{
48} 18}
@@ -59,22 +29,18 @@ QString RestartApplet::name ( ) const
59 29
60QString RestartApplet::text ( ) const 30QString RestartApplet::text ( ) const
61{ 31{
62 return tr( "Restart Opie" ); 32 return tr( "Restart Opie" );
63} 33}
64 34
65QIconSet RestartApplet::icon ( ) const 35QIconSet 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" ); 38 return pix;
69
70 if ( !img. isNull ( ))
71 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
72 return pix;
73} 39}
74 40
75QPopupMenu *RestartApplet::popup ( QWidget * ) const 41QPopupMenu *RestartApplet::popup ( QWidget * ) const
76{ 42{
77 return 0; 43 return 0;
78} 44}
79 45
80void RestartApplet::activated ( ) 46void RestartApplet::activated ( )
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
@@ -1,17 +1,17 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin warn_on 2CONFIG += qt plugin warn_on
3HEADERS = restart.h 3HEADERS = restart.h
4SOURCES = restart.cpp 4SOURCES = restart.cpp
5TARGET = restartapplet2 5TARGET = restartapplet2
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10VERSION = 1.0.0 10VERSION = 1.0.0
11MOC_DIR=opieobj 11MOC_DIR=opieobj
12OBJECTS_DIR=opieobj 12OBJECTS_DIR=opieobj
13 13
14 14
15 15
16include( $(OPIEDIR)/include.pro ) 16include( $(OPIEDIR)/include.pro )
17target.path = $$prefix/plugins/applets 17target.path = $$prefix/plugins/applets
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,48 +1,51 @@
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,
28 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
29*/ 31*/
30 32
31#include "rotate.h" 33#include "rotate.h"
32 34
33/* OPIE */ 35/* OPIE */
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>
41using namespace Opie::Core; 44using namespace Opie::Core;
42 45
43/* STD */ 46/* STD */
44#include <time.h> 47#include <time.h>
45 48
46RotateApplet::RotateApplet() 49RotateApplet::RotateApplet()
47 :QObject( 0, "RotateApplet" ), m_flipped( false ) 50 :QObject( 0, "RotateApplet" ), m_flipped( false )
48{ 51{
@@ -134,20 +137,17 @@ QString RotateApplet::text() const
134QString RotateApplet::tr( const char* s, const char* p ) const 137QString RotateApplet::tr( const char* s, const char* p ) const
135{ 138{
136 return qApp->translate( "RotateApplet", s, p ); 139 return qApp->translate( "RotateApplet", s, p );
137} 140}
138*/ 141*/
139 142
140QIconSet RotateApplet::icon() const 143QIconSet 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}
148 148
149QPopupMenu* RotateApplet::popup(QWidget*) const 149QPopupMenu* RotateApplet::popup(QWidget*) const
150{ 150{
151 return 0; 151 return 0;
152} 152}
153 153
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
@@ -1,9 +1,9 @@
1Package: opie-vtapplet 1Package: opie-vtapplet
2Files: plugins/applets/libvtapplet.so* 2Files: plugins/applets/libvtapplet.so*
3Priority: optional 3Priority: optional
4Section: opie/applets 4Section: opie/applets
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Description: Switch to another virtual terminal 8Description: Switch to another virtual terminal
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $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
@@ -10,18 +10,20 @@
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 <opie2/oresource.h>
19
18#include <qpe/applnk.h> 20#include <qpe/applnk.h>
19#include <qpe/resource.h> 21
20using namespace Opie::Core; 22using namespace Opie::Core;
21 23
22/* QT */ 24/* QT */
23#include <qpopupmenu.h> 25#include <qpopupmenu.h>
24 26
25/* STD */ 27/* STD */
26#include <fcntl.h> 28#include <fcntl.h>
27#include <unistd.h> 29#include <unistd.h>
@@ -63,21 +65,17 @@ QString VTApplet::tr( const char* s ) const
63QString VTApplet::tr( const char* s, const char* p ) const 65QString VTApplet::tr( const char* s, const char* p ) const
64{ 66{
65 return qApp->translate( "VTApplet", s, p ); 67 return qApp->translate( "VTApplet", s, p );
66} 68}
67*/ 69*/
68 70
69QIconSet VTApplet::icon ( ) const 71QIconSet 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}
78 76
79QPopupMenu *VTApplet::popup ( QWidget* parent ) const 77QPopupMenu *VTApplet::popup ( QWidget* parent ) const
80{ 78{
81 odebug << "VTApplet::popup" << oendl; 79 odebug << "VTApplet::popup" << oendl;
82 80
83 struct vt_stat vtstat; 81 struct vt_stat vtstat;
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
@@ -1,13 +1,13 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3HEADERS = vt.h 3HEADERS = vt.h
4SOURCES = vt.cpp 4SOURCES = vt.cpp
5TARGET = vtapplet 5TARGET = vtapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )
13target.path = $$prefix/plugins/applets 13target.path = $$prefix/plugins/applets