-rw-r--r-- | noncore/applets/autorotateapplet/autorotate.cpp | 6 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 54 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 4 | ||||
-rw-r--r-- | noncore/applets/pyquicklaunch/pyquicklaunch.cpp | 6 | ||||
-rw-r--r-- | noncore/applets/zkbapplet/applet/zkbwidget.cpp | 8 |
5 files changed, 39 insertions, 39 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp index 34802fb..28b631b 100644 --- a/noncore/applets/autorotateapplet/autorotate.cpp +++ b/noncore/applets/autorotateapplet/autorotate.cpp | |||
@@ -15,9 +15,9 @@ | |||
15 | /* OPIE */ | 15 | /* OPIE */ |
16 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
17 | #include <opie2/otaskbarapplet.h> | 17 | #include <opie2/otaskbarapplet.h> |
18 | #include <opie2/oresource.h> | ||
18 | #include <qpe/applnk.h> | 19 | #include <qpe/applnk.h> |
19 | #include <qpe/config.h> | 20 | #include <qpe/config.h> |
20 | #include <qpe/resource.h> | ||
21 | using namespace Opie::Core; | 21 | using namespace Opie::Core; |
22 | 22 | ||
23 | /* QT */ | 23 | /* QT */ |
@@ -28,8 +28,8 @@ AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) | |||
28 | setFixedWidth( AppLnk::smallIconSize() ); | 28 | setFixedWidth( AppLnk::smallIconSize() ); |
29 | setFixedHeight( AppLnk::smallIconSize() ); | 29 | setFixedHeight( AppLnk::smallIconSize() ); |
30 | 30 | ||
31 | enabledPm.convertFromImage( Resource::loadImage("autorotate/rotate").smoothScale( height(), width() ) ); | 31 | enabledPm = Opie::Core::OResource::loadImage("autorotate/rotate", Opie::Core::OResource::SmallIcon); |
32 | disabledPm.convertFromImage( Resource::loadImage("autorotate/norotate").smoothScale( height(), width() ) ); | 32 | disabledPm = Opie::Core::OResource::loadImage("autorotate/norotate", Opie::Core::OResource::SmallIcon); |
33 | 33 | ||
34 | repaint(true); | 34 | repaint(true); |
35 | popupMenu = 0; | 35 | popupMenu = 0; |
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index bd6ca66..10c2b34 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp | |||
@@ -1,27 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | =. (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | 4 | =. (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
@@ -33,9 +33,10 @@ | |||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | #include <opie2/onetwork.h> | 35 | #include <opie2/onetwork.h> |
36 | #include <opie2/oresource.h> | ||
36 | #include <opie2/otaskbarapplet.h> | 37 | #include <opie2/otaskbarapplet.h> |
37 | #include <qpe/applnk.h> | 38 | #include <qpe/applnk.h> |
38 | #include <qpe/resource.h> | 39 | #include <qpe/qpeapplication.h> |
39 | using namespace Opie::Core; | 40 | using namespace Opie::Core; |
40 | using namespace Opie::Ui; | 41 | using namespace Opie::Ui; |
41 | using namespace Opie::Net; | 42 | using namespace Opie::Net; |
@@ -55,11 +56,10 @@ IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) | |||
55 | _iface = ONetwork::instance()->interface( name ); | 56 | _iface = ONetwork::instance()->interface( name ); |
56 | assert( _iface ); | 57 | assert( _iface ); |
57 | setToggleButton( true ); | 58 | setToggleButton( true ); |
58 | //setAutoRaise( true ); | 59 | setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); |
59 | setOnIconSet( QIconSet( Resource::loadPixmap( "up" ) ) ); | 60 | setOnIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ) ); |
60 | setOffIconSet( QIconSet( Resource::loadPixmap( "down" ) ) ); | 61 | setOffIconSet( QIconSet( Opie::Core::OResource::loadPixmap( "down", Opie::Core::OResource::SmallIcon ) ) ); |
61 | setOn( _iface->isUp() ); | 62 | setOn( _iface->isUp() ); |
62 | //setFixedWidth( 16 ); | ||
63 | connect( this, SIGNAL( clicked() ), this, SLOT( clicked() ) ); | 63 | connect( this, SIGNAL( clicked() ), this, SLOT( clicked() ) ); |
64 | } | 64 | } |
65 | 65 | ||
@@ -121,7 +121,7 @@ void NetworkAppletControl::build() | |||
121 | { | 121 | { |
122 | QHBoxLayout* h = new QHBoxLayout( l ); | 122 | QHBoxLayout* h = new QHBoxLayout( l ); |
123 | QLabel* symbol = new QLabel( this ); | 123 | QLabel* symbol = new QLabel( this ); |
124 | symbol->setPixmap( Resource::loadPixmap( guessDevice( it.current() ) ) ); | 124 | symbol->setPixmap( Opie::Core::OResource::loadPixmap( guessDevice( it.current() ), Opie::Core::OResource::SmallIcon ) ); |
125 | h->addWidget( symbol ); | 125 | h->addWidget( symbol ); |
126 | symbol->show(); | 126 | symbol->show(); |
127 | 127 | ||
@@ -215,7 +215,7 @@ NetworkApplet::NetworkApplet( QWidget *parent, const char *name ) | |||
215 | { | 215 | { |
216 | setFixedHeight( AppLnk::smallIconSize() ); | 216 | setFixedHeight( AppLnk::smallIconSize() ); |
217 | setFixedWidth( AppLnk::smallIconSize() ); | 217 | setFixedWidth( AppLnk::smallIconSize() ); |
218 | _pixmap.convertFromImage( Resource::loadImage( "networkapplet/network" ).smoothScale( height(), width() ) ); | 218 | _pixmap = Opie::Core::OResource::loadPixmap( "networkapplet/network", Opie::Core::OResource::SmallIcon ); |
219 | _control = new NetworkAppletControl( this, "control" ); | 219 | _control = new NetworkAppletControl( this, "control" ); |
220 | } | 220 | } |
221 | 221 | ||
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index d06672a..13f297e 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp | |||
@@ -18,13 +18,13 @@ | |||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/odebug.h> | 19 | #include <opie2/odebug.h> |
20 | #include <opie2/otaskbarapplet.h> | 20 | #include <opie2/otaskbarapplet.h> |
21 | #include <opie2/oresource.h> | ||
21 | #include <qpe/filemanager.h> | 22 | #include <qpe/filemanager.h> |
22 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/timestring.h> | 24 | #include <qpe/timestring.h> |
24 | #include <qpe/applnk.h> | 25 | #include <qpe/applnk.h> |
25 | #include <qpe/ir.h> | 26 | #include <qpe/ir.h> |
26 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
27 | #include <qpe/resource.h> | ||
28 | using namespace Opie::Core; | 28 | using namespace Opie::Core; |
29 | using namespace Opie::Ui; | 29 | using namespace Opie::Ui; |
30 | 30 | ||
@@ -432,7 +432,7 @@ NotesApplet::NotesApplet( QWidget *parent, const char *name ) | |||
432 | : QWidget( parent, name ) { | 432 | : QWidget( parent, name ) { |
433 | setFixedHeight( AppLnk::smallIconSize() ); | 433 | setFixedHeight( AppLnk::smallIconSize() ); |
434 | setFixedWidth( AppLnk::smallIconSize() ); | 434 | setFixedWidth( AppLnk::smallIconSize() ); |
435 | notesPixmap.convertFromImage( Resource::loadImage( "edit" ).smoothScale( height(), width() ) ); | 435 | notesPixmap = Opie::Core::OResource::loadImage( "edit", Opie::Core::OResource::SmallIcon ); |
436 | vc = new NotesControl; | 436 | vc = new NotesControl; |
437 | } | 437 | } |
438 | 438 | ||
diff --git a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp index bcd2f0d..45eda4e 100644 --- a/noncore/applets/pyquicklaunch/pyquicklaunch.cpp +++ b/noncore/applets/pyquicklaunch/pyquicklaunch.cpp | |||
@@ -16,10 +16,10 @@ | |||
16 | 16 | ||
17 | /* OPIE */ | 17 | /* OPIE */ |
18 | #include <opie2/odebug.h> | 18 | #include <opie2/odebug.h> |
19 | #include <opie2/oresource.h> | ||
19 | #include <opie2/otaskbarapplet.h> | 20 | #include <opie2/otaskbarapplet.h> |
20 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
21 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
22 | #include <qpe/resource.h> | ||
23 | using namespace Opie::Core; | 23 | using namespace Opie::Core; |
24 | 24 | ||
25 | /* QT */ | 25 | /* QT */ |
@@ -82,8 +82,8 @@ PyQuicklaunchApplet::PyQuicklaunchApplet( QWidget *parent, const char *name ) | |||
82 | setFixedWidth( 14 ); | 82 | setFixedWidth( 14 ); |
83 | status = new PyQuicklaunchControl( this, this, "Python Quicklaunch Status" ); | 83 | status = new PyQuicklaunchControl( this, this, "Python Quicklaunch Status" ); |
84 | 84 | ||
85 | _online = Resource::loadPixmap( "pyquicklaunch/online" ); | 85 | _online = Opie::Core::OResource::loadPixmap( "pyquicklaunch/online", Opie::Core::OResource::SmallIcon ); |
86 | _offline = Resource::loadPixmap( "pyquicklaunch/offline" ); | 86 | _offline = Opie::Core::OResource::loadPixmap( "pyquicklaunch/offline", Opie::Core::OResource::SmallIcon ); |
87 | 87 | ||
88 | _fifoName = QString().sprintf( "/tmp/mickeys-quicklauncher-%s", ::getpwuid( ::getuid() )->pw_name ); | 88 | _fifoName = QString().sprintf( "/tmp/mickeys-quicklauncher-%s", ::getpwuid( ::getuid() )->pw_name ); |
89 | odebug << "PyQuicklaunchApplet fifo name = '" << _fifoName << "'" << oendl; | 89 | odebug << "PyQuicklaunchApplet fifo name = '" << _fifoName << "'" << oendl; |
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp index 55c08b3..324ccdc 100644 --- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp | |||
@@ -1,18 +1,18 @@ | |||
1 | #include <opie2/otaskbarapplet.h> | 1 | #include <opie2/otaskbarapplet.h> |
2 | #include <opie2/okeyfilter.h> | 2 | #include <opie2/okeyfilter.h> |
3 | #include <opie2/oresource.h> | ||
3 | #include <qpe/qcopenvelope_qws.h> | 4 | #include <qpe/qcopenvelope_qws.h> |
4 | #include <qpe/applnk.h> | 5 | #include <qpe/applnk.h> |
5 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
6 | #include <qpe/resource.h> | 7 | //#include <stdio.h> |
7 | #include <stdio.h> | 8 | //#include <unistd.h> |
8 | #include <unistd.h> | ||
9 | #include "zkbwidget.h" | 9 | #include "zkbwidget.h" |
10 | #include "zkbcfg.h" | 10 | #include "zkbcfg.h" |
11 | 11 | ||
12 | using namespace Opie::Ui; | 12 | using namespace Opie::Ui; |
13 | 13 | ||
14 | ZkbWidget::ZkbWidget(QWidget* parent) | 14 | ZkbWidget::ZkbWidget(QWidget* parent) |
15 | :QLabel(parent),keymap(0),disabled(Resource::loadPixmap("zkb-disabled")) { | 15 | :QLabel(parent),keymap(0),disabled(Opie::Core::OResource::loadPixmap("zkb-disabled", Opie::Core::OResource::SmallIcon)) { |
16 | 16 | ||
17 | labels = new QPopupMenu(); | 17 | labels = new QPopupMenu(); |
18 | connect(labels, SIGNAL(activated(int)), this, | 18 | connect(labels, SIGNAL(activated(int)), this, |