summaryrefslogtreecommitdiff
authordrw <drw>2005-05-24 22:29:46 (UTC)
committer drw <drw>2005-05-24 22:29:46 (UTC)
commit3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59 (patch) (unidiff)
tree2573d5c8bdad9d95eede843615a5baa1a45bbc95
parenta2542a161d15feface21954afcd26f9ec51f131f (diff)
downloadopie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.zip
opie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.tar.gz
opie-3a7dd5b0904cdea71d486ffdea8bfd1aedb0af59.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/autorotateapplet/autorotate.cpp6
-rw-r--r--noncore/applets/networkapplet/networkapplet.cpp54
-rw-r--r--noncore/applets/notesapplet/notes.cpp4
-rw-r--r--noncore/applets/pyquicklaunch/pyquicklaunch.cpp6
-rw-r--r--noncore/applets/zkbapplet/applet/zkbwidget.cpp8
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
@@ -1,56 +1,56 @@
1/* 1/*
2 * copyright : (c) 2003 by Greg Gilbert 2 * copyright : (c) 2003 by Greg Gilbert
3 * email : greg@treke.net 3 * email : greg@treke.net
4 * based on the cardmon applet by Max Reiss 4 * based on the cardmon applet by Max Reiss
5 * * 5 * *
6 * This program is free software; you can redistribute it and/or modify * 6 * This program is free software; you can redistribute it and/or modify *
7 * it under the terms of the GNU General Public License as published by * 7 * it under the terms of the GNU General Public License as published by *
8 * the Free Software Foundation; either version 2 of the License, or * 8 * the Free Software Foundation; either version 2 of the License, or *
9 * (at your option) any later version. * 9 * (at your option) any later version. *
10 * * 10 * *
11 *************************************************************************/ 11 *************************************************************************/
12 12
13#include "autorotate.h" 13#include "autorotate.h"
14 14
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>
21using namespace Opie::Core; 21using namespace Opie::Core;
22 22
23/* QT */ 23/* QT */
24#include <qpainter.h> 24#include <qpainter.h>
25 25
26AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) 26AutoRotate::AutoRotate(QWidget * parent):QWidget(parent)
27{ 27{
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;
36 show(); 36 show();
37} 37}
38 38
39AutoRotate::~AutoRotate() 39AutoRotate::~AutoRotate()
40{ 40{
41 if (popupMenu) { 41 if (popupMenu) {
42 delete popupMenu; 42 delete popupMenu;
43 } 43 }
44} 44}
45 45
46int AutoRotate::position() 46int AutoRotate::position()
47{ 47{
48 return 7; 48 return 7;
49} 49}
50 50
51void AutoRotate::mousePressEvent(QMouseEvent *) 51void AutoRotate::mousePressEvent(QMouseEvent *)
52{ 52{
53 QPopupMenu *menu = new QPopupMenu(this); 53 QPopupMenu *menu = new QPopupMenu(this);
54 menu->insertItem( isRotateEnabled()? "Disable Rotation" : "Enable Rotation" ,1 ); 54 menu->insertItem( isRotateEnabled()? "Disable Rotation" : "Enable Rotation" ,1 );
55 55
56 QPoint p = mapToGlobal(QPoint(0, 0)); 56 QPoint p = mapToGlobal(QPoint(0, 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,86 +1,86 @@
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.
28 28
29*/ 29*/
30 30
31#include "networkapplet.h" 31#include "networkapplet.h"
32 32
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>
39using namespace Opie::Core; 40using namespace Opie::Core;
40using namespace Opie::Ui; 41using namespace Opie::Ui;
41using namespace Opie::Net; 42using namespace Opie::Net;
42 43
43/* QT */ 44/* QT */
44#include <qpainter.h> 45#include <qpainter.h>
45#include <qlabel.h> 46#include <qlabel.h>
46#include <qlayout.h> 47#include <qlayout.h>
47#include <qobjectlist.h> 48#include <qobjectlist.h>
48 49
49/* STD */ 50/* STD */
50#include <assert.h> 51#include <assert.h>
51 52
52IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) 53IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
53 :QToolButton( parent, name ) 54 :QToolButton( parent, name )
54{ 55{
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
66 66
67IfaceUpDownButton::~IfaceUpDownButton() 67IfaceUpDownButton::~IfaceUpDownButton()
68{ 68{
69} 69}
70 70
71 71
72void IfaceUpDownButton::clicked() 72void IfaceUpDownButton::clicked()
73{ 73{
74 _iface->setUp( isOn() ); 74 _iface->setUp( isOn() );
75 setOn( _iface->isUp() ); // it might not have worked... 75 setOn( _iface->isUp() ); // it might not have worked...
76 repaint(); 76 repaint();
77} 77}
78 78
79 79
80IfaceIPAddress::IfaceIPAddress( QWidget* parent, const char* name ) 80IfaceIPAddress::IfaceIPAddress( QWidget* parent, const char* name )
81 :QLineEdit( parent, name ) 81 :QLineEdit( parent, name )
82{ 82{
83 setFont( QFont( "fixed" ) ); 83 setFont( QFont( "fixed" ) );
84 _iface = ONetwork::instance()->interface( name ); 84 _iface = ONetwork::instance()->interface( name );
85 setFixedWidth( 105 ); 85 setFixedWidth( 105 );
86 setText( _iface->ipV4Address().toString() ); 86 setText( _iface->ipV4Address().toString() );
@@ -100,49 +100,49 @@ void IfaceIPAddress::returnPressed()
100 QHostAddress mask; 100 QHostAddress mask;
101 mask.setAddress( _iface->ipV4Netmask().toString() ); // setIPV4Address destroys the netmask... 101 mask.setAddress( _iface->ipV4Netmask().toString() ); // setIPV4Address destroys the netmask...
102 _iface->setIPV4Address( a ); 102 _iface->setIPV4Address( a );
103 _iface->setIPV4Netmask( mask ); // recover the old netmask 103 _iface->setIPV4Netmask( mask ); // recover the old netmask
104 setText( _iface->ipV4Address().toString() ); 104 setText( _iface->ipV4Address().toString() );
105 repaint(); 105 repaint();
106} 106}
107 107
108 108
109NetworkAppletControl::NetworkAppletControl( OTaskbarApplet* parent, const char* name ) 109NetworkAppletControl::NetworkAppletControl( OTaskbarApplet* parent, const char* name )
110 :QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), l(0) 110 :QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), l(0)
111{ 111{
112 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 112 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
113 l = new QVBoxLayout( this, 4, 2 ); 113 l = new QVBoxLayout( this, 4, 2 );
114} 114}
115 115
116 116
117void NetworkAppletControl::build() 117void NetworkAppletControl::build()
118{ 118{
119 ONetwork::InterfaceIterator it = ONetwork::instance()->iterator(); 119 ONetwork::InterfaceIterator it = ONetwork::instance()->iterator();
120 while ( it.current() ) 120 while ( it.current() )
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
128 QLabel* name = new QLabel( it.current()->name(), this ); 128 QLabel* name = new QLabel( it.current()->name(), this );
129 name->setFixedWidth( 35 ); 129 name->setFixedWidth( 35 );
130 h->addWidget( name ); 130 h->addWidget( name );
131 name->show(); 131 name->show();
132 132
133 IfaceIPAddress* ip = new IfaceIPAddress( this, it.current()->name() ); 133 IfaceIPAddress* ip = new IfaceIPAddress( this, it.current()->name() );
134 h->addWidget( ip ); 134 h->addWidget( ip );
135 ip->show(); 135 ip->show();
136 136
137 IfaceUpDownButton* tb = new IfaceUpDownButton( this, it.current()->name() ); 137 IfaceUpDownButton* tb = new IfaceUpDownButton( this, it.current()->name() );
138 tb->show(); 138 tb->show();
139 139
140 h->addWidget( tb ); 140 h->addWidget( tb );
141 141
142 ++it; 142 ++it;
143 } 143 }
144} 144}
145 145
146 146
147NetworkAppletControl::~NetworkAppletControl() 147NetworkAppletControl::~NetworkAppletControl()
148{ 148{
@@ -194,49 +194,49 @@ void NetworkAppletControl::hideEvent( QHideEvent* e )
194 194
195 list = const_cast<QObjectList*>( children() ); 195 list = const_cast<QObjectList*>( children() );
196 if ( list ) 196 if ( list )
197 owarn << "D'oh! We still have " << list->count() << " children..." << oendl; 197 owarn << "D'oh! We still have " << list->count() << " children..." << oendl;
198 198
199 // renew layout 199 // renew layout
200 l = new QVBoxLayout( this, 4, 2 ); 200 l = new QVBoxLayout( this, 4, 2 );
201 resize( 0, 0 ); 201 resize( 0, 0 );
202} 202}
203 203
204 204
205QSize NetworkAppletControl::sizeHint() const 205QSize NetworkAppletControl::sizeHint() const
206{ 206{
207 ONetwork::instance()->synchronize(); // rebuild interface database 207 ONetwork::instance()->synchronize(); // rebuild interface database
208 odebug << "sizeHint (#ifaces=" << ONetwork::instance()->count() << ")" << oendl; 208 odebug << "sizeHint (#ifaces=" << ONetwork::instance()->count() << ")" << oendl;
209 return QSize( 14+35+105+14 + 8, ONetwork::instance()->count() * 26 ); 209 return QSize( 14+35+105+14 + 8, ONetwork::instance()->count() * 26 );
210} 210}
211 211
212 212
213NetworkApplet::NetworkApplet( QWidget *parent, const char *name ) 213NetworkApplet::NetworkApplet( QWidget *parent, const char *name )
214 :OTaskbarApplet( parent, name ) 214 :OTaskbarApplet( parent, 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
222 222
223NetworkApplet::~NetworkApplet() 223NetworkApplet::~NetworkApplet()
224{ 224{
225} 225}
226 226
227 227
228int NetworkApplet::position() 228int NetworkApplet::position()
229{ 229{
230 return 4; 230 return 4;
231} 231}
232 232
233 233
234void NetworkApplet::paintEvent( QPaintEvent* ) 234void NetworkApplet::paintEvent( QPaintEvent* )
235{ 235{
236 QPainter p(this); 236 QPainter p(this);
237 p.drawPixmap(0, 2, _pixmap ); 237 p.drawPixmap(0, 2, _pixmap );
238} 238}
239 239
240 240
241void NetworkApplet::mousePressEvent( QMouseEvent* ) 241void NetworkApplet::mousePressEvent( QMouseEvent* )
242{ 242{
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
@@ -1,51 +1,51 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org> 2** Copyright (C) 2002 L.J. Potter <llornkcor@handhelds.org>
3 3
4** All rights reserved. 4** All rights reserved.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "notes.h" 16#include "notes.h"
17 17
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>
28using namespace Opie::Core; 28using namespace Opie::Core;
29using namespace Opie::Ui; 29using namespace Opie::Ui;
30 30
31/* QT */ 31/* QT */
32#include <qmultilineedit.h> 32#include <qmultilineedit.h>
33#include <qlistbox.h> 33#include <qlistbox.h>
34#include <qpopupmenu.h> 34#include <qpopupmenu.h>
35#include <qmessagebox.h> 35#include <qmessagebox.h>
36#include <qapplication.h> 36#include <qapplication.h>
37#include <qdir.h> 37#include <qdir.h>
38#include <qfile.h> 38#include <qfile.h>
39#include <qpoint.h> 39#include <qpoint.h>
40#include <qpushbutton.h> 40#include <qpushbutton.h>
41#include <qpainter.h> 41#include <qpainter.h>
42#include <qlayout.h> 42#include <qlayout.h>
43#include <qframe.h> 43#include <qframe.h>
44#include <qpixmap.h> 44#include <qpixmap.h>
45#include <qstring.h> 45#include <qstring.h>
46#include <qstringlist.h> 46#include <qstringlist.h>
47#include <qtimer.h> 47#include <qtimer.h>
48 48
49/* STD */ 49/* STD */
50#include <stdlib.h> 50#include <stdlib.h>
51 51
@@ -411,49 +411,49 @@ void NotesControl::slotSearch() {
411// QString text; 411// QString text;
412 412
413// // Copy text from the clipboard (paste) 413// // Copy text from the clipboard (paste)
414// text = cb->text(); 414// text = cb->text();
415// } 415// }
416// if(e->key() == Key_X) { //cut 416// if(e->key() == Key_X) { //cut
417// } 417// }
418// if(e->key() == Key_V) { //paste 418// if(e->key() == Key_V) { //paste
419// QClipboard *cb = QApplication::clipboard(); 419// QClipboard *cb = QApplication::clipboard();
420// QString text; 420// QString text;
421// //view 421// //view
422// cb->setText(); 422// cb->setText();
423// } 423// }
424// break; 424// break;
425// }; 425// };
426// QWidget::keyReleaseEvent(e); 426// QWidget::keyReleaseEvent(e);
427// } 427// }
428 428
429//=========================================================================== 429//===========================================================================
430 430
431NotesApplet::NotesApplet( QWidget *parent, const char *name ) 431NotesApplet::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
439NotesApplet::~NotesApplet() { 439NotesApplet::~NotesApplet() {
440 delete vc; 440 delete vc;
441} 441}
442 442
443int NotesApplet::position() 443int NotesApplet::position()
444{ 444{
445 return 6; 445 return 6;
446} 446}
447 447
448void NotesApplet::mousePressEvent( QMouseEvent *) { 448void NotesApplet::mousePressEvent( QMouseEvent *) {
449 if( !vc->isHidden()) { 449 if( !vc->isHidden()) {
450 vc->doPopulate=false; 450 vc->doPopulate=false;
451 vc->save(); 451 vc->save();
452 vc->close(); 452 vc->close();
453 } else { 453 } else {
454// vc = new NotesControl; 454// vc = new NotesControl;
455// QPoint curPos = mapToGlobal( rect().topLeft() ); 455// QPoint curPos = mapToGlobal( rect().topLeft() );
456 if(vc->showMax) { 456 if(vc->showMax) {
457 odebug << "show max" << oendl; 457 odebug << "show max" << oendl;
458 vc->showMaximized(); 458 vc->showMaximized();
459 } else { 459 } else {
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
@@ -1,46 +1,46 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2004 Michael 'Mickey' Lauer <mickey@vanille.de> 2** Copyright (C) 2004 Michael 'Mickey' Lauer <mickey@vanille.de>
3** All rights reserved. 3** All rights reserved.
4** 4**
5** This file may be distributed and/or modified under the terms of the 5** This file may be distributed and/or modified under the terms of the
6** GNU General Public License version 2 as published by the Free Software 6** GNU General Public License version 2 as published by the Free Software
7** Foundation and appearing in the file LICENSE.GPL included in the 7** Foundation and appearing in the file LICENSE.GPL included in the
8** packaging of this file. 8** packaging of this file.
9** 9**
10** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 10** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 11** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
12** 12**
13**********************************************************************/ 13**********************************************************************/
14 14
15#include "pyquicklaunch.h" 15#include "pyquicklaunch.h"
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>
23using namespace Opie::Core; 23using namespace Opie::Core;
24 24
25/* QT */ 25/* QT */
26#include <qcopchannel_qws.h> 26#include <qcopchannel_qws.h>
27#include <qpainter.h> 27#include <qpainter.h>
28#include <qframe.h> 28#include <qframe.h>
29#include <qfile.h> 29#include <qfile.h>
30#include <qtimer.h> 30#include <qtimer.h>
31 31
32/* STD */ 32/* STD */
33#include <pwd.h> 33#include <pwd.h>
34#include <sys/types.h> 34#include <sys/types.h>
35#include <unistd.h> 35#include <unistd.h>
36 36
37PyQuicklaunchControl::PyQuicklaunchControl( PyQuicklaunchApplet *applet, QWidget *parent, const char *name ) 37PyQuicklaunchControl::PyQuicklaunchControl( PyQuicklaunchApplet *applet, QWidget *parent, const char *name )
38 : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) 38 : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
39{ 39{
40 40
41 setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); 41 setFrameStyle( QFrame::PopupPanel | QFrame::Raised );
42 setFixedSize( sizeHint() ); 42 setFixedSize( sizeHint() );
43 setFocusPolicy( QWidget::NoFocus ); 43 setFocusPolicy( QWidget::NoFocus );
44} 44}
45 45
46 46
@@ -61,50 +61,50 @@ void PyQuicklaunchControl::show( bool )
61void PyQuicklaunchControl::readConfig() 61void PyQuicklaunchControl::readConfig()
62{ 62{
63 Config cfg( "qpe" ); 63 Config cfg( "qpe" );
64 cfg.setGroup( "PyQuicklaunch" ); 64 cfg.setGroup( "PyQuicklaunch" );
65 65
66 // ... 66 // ...
67} 67}
68 68
69void PyQuicklaunchControl::writeConfigEntry( const char *entry, int val ) 69void PyQuicklaunchControl::writeConfigEntry( const char *entry, int val )
70{ 70{
71 Config cfg( "qpe" ); 71 Config cfg( "qpe" );
72 cfg.setGroup( "PyQuicklaunch" ); 72 cfg.setGroup( "PyQuicklaunch" );
73 cfg.writeEntry( entry, val ); 73 cfg.writeEntry( entry, val );
74} 74}
75 75
76//=========================================================================== 76//===========================================================================
77 77
78PyQuicklaunchApplet::PyQuicklaunchApplet( QWidget *parent, const char *name ) 78PyQuicklaunchApplet::PyQuicklaunchApplet( QWidget *parent, const char *name )
79 : QWidget( parent, name ), online( false ) 79 : QWidget( parent, name ), online( false )
80{ 80{
81 setFixedHeight( 18 ); 81 setFixedHeight( 18 );
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;
90 _fifo.setName( _fifoName ); 90 _fifo.setName( _fifoName );
91 91
92 _control = new QCopChannel( "QPE/PyLauncher", parent, "PyLauncher QCop Control Channel" ); 92 _control = new QCopChannel( "QPE/PyLauncher", parent, "PyLauncher QCop Control Channel" );
93 connect( _control, SIGNAL(received(const QCString&,const QByteArray&)), 93 connect( _control, SIGNAL(received(const QCString&,const QByteArray&)),
94 this, SLOT(receivedMessage(const QCString&,const QByteArray&) ) ); 94 this, SLOT(receivedMessage(const QCString&,const QByteArray&) ) );
95 95
96} 96}
97 97
98 98
99PyQuicklaunchApplet::~PyQuicklaunchApplet() 99PyQuicklaunchApplet::~PyQuicklaunchApplet()
100{ 100{
101} 101}
102 102
103 103
104void PyQuicklaunchApplet::receivedMessage( const QCString& msg, const QByteArray& data ) 104void PyQuicklaunchApplet::receivedMessage( const QCString& msg, const QByteArray& data )
105{ 105{
106 odebug << "receivedMessage = '" << msg << "' " << oendl; 106 odebug << "receivedMessage = '" << msg << "' " << oendl;
107 107
108 if ( msg == "setOnline()" ) 108 if ( msg == "setOnline()" )
109 { 109 {
110 online = true; 110 online = true;
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,39 +1,39 @@
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
12using namespace Opie::Ui; 12using namespace Opie::Ui;
13 13
14ZkbWidget::ZkbWidget(QWidget* parent) 14ZkbWidget::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,
19 SLOT(labelChanged(int))); 19 SLOT(labelChanged(int)));
20 20
21 loadKeymap(); 21 loadKeymap();
22 22
23 channel = new QCopChannel("QPE/zkb", this); 23 channel = new QCopChannel("QPE/zkb", this);
24 connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), 24 connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
25 this, SLOT(signalReceived(const QCString&,const QByteArray&))); 25 this, SLOT(signalReceived(const QCString&,const QByteArray&)));
26 setFixedWidth ( AppLnk::smallIconSize() ); 26 setFixedWidth ( AppLnk::smallIconSize() );
27 setFixedHeight ( AppLnk::smallIconSize() ); 27 setFixedHeight ( AppLnk::smallIconSize() );
28} 28}
29 29
30ZkbWidget::~ZkbWidget() 30ZkbWidget::~ZkbWidget()
31{ 31{
32 delete keymap; 32 delete keymap;
33 keymap = 0; 33 keymap = 0;
34} 34}
35 35
36int ZkbWidget::position() 36int ZkbWidget::position()
37{ 37{
38 return 8; 38 return 8;
39} 39}