summaryrefslogtreecommitdiff
authordrw <drw>2005-04-06 22:25:21 (UTC)
committer drw <drw>2005-04-06 22:25:21 (UTC)
commitcd1b15147d372d8786c855764d397553651c358d (patch) (unidiff)
tree643479f1a84698f79227d7c8243921eacc3fe818
parent678c792dd69e42a15d8ac5eaaa9228dfd413ed4c (diff)
downloadopie-cd1b15147d372d8786c855764d397553651c358d.zip
opie-cd1b15147d372d8786c855764d397553651c358d.tar.gz
opie-cd1b15147d372d8786c855764d397553651c358d.tar.bz2
Use OResource for loading images and fix headers
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/main.cpp43
-rw-r--r--core/pim/today/today.cpp44
-rw-r--r--core/pim/today/today.h41
-rw-r--r--core/pim/today/todaybase.cpp52
-rw-r--r--core/pim/today/todaybase.h40
-rw-r--r--core/pim/today/todayconfig.cpp47
-rw-r--r--core/pim/today/todayconfig.h40
7 files changed, 202 insertions, 105 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp
index d63bc30..44b845c 100644
--- a/core/pim/today/main.cpp
+++ b/core/pim/today/main.cpp
@@ -1,21 +1,32 @@
1/* 1/*
2 * main.cpp 2                 This file is part of the Opie Project
3 * 3
4 * --------------------- 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * 5 =.
6 * begin : Sun 10 17:20:00 CEST 2002 6 .=l.
7 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß 7           .>+-=
8 * email : max.reiss@gmx.de 8 _;:,     .>    :=|. This program is free software; you can
9 * 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
10 */ 29 */
11/***************************************************************************
12 * *
13 * This program is free software; you can redistribute it and/or modify *
14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. *
17 * *
18 ***************************************************************************/
19 30
20#include "today.h" 31#include "today.h"
21 32
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 3e895a4..67b23e1 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,27 +1,41 @@
1/* 1/*
2 * today.cpp 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002,2003,2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/***************************************************************************
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16 30
17#include "today.h" 31#include "today.h"
18 32
19#include <opie2/odebug.h> 33#include <opie2/odebug.h>
20#include <opie2/opluginloader.h> 34#include <opie2/opluginloader.h>
21#include <opie2/oconfig.h> 35#include <opie2/oconfig.h>
36#include <opie2/oresource.h>
22 37
23#include <qpe/qcopenvelope_qws.h> 38#include <qpe/qcopenvelope_qws.h>
24#include <qpe/resource.h>
25#include <qpe/qpeapplication.h> 39#include <qpe/qpeapplication.h>
26#include <qpe/contact.h> 40#include <qpe/contact.h>
27 41
@@ -218,7 +232,7 @@ void Today::loadPluginWidgets() {
218 plugin.guiBox = new QWidget( m_big_box ); 232 plugin.guiBox = new QWidget( m_big_box );
219 QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox ); 233 QHBoxLayout *boxLayout = new QHBoxLayout( plugin.guiBox );
220 QPixmap plugPix; 234 QPixmap plugPix;
221 plugPix.convertFromImage( Resource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 ); 235 plugPix.convertFromImage( Opie::Core::OResource::loadImage( plugin.guiPart->pixmapNameWidget() ).smoothScale( m_iconSize, m_iconSize ), 0 );
222 OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox ); 236 OClickableLabel* plugIcon = new OClickableLabel( plugin.guiBox );
223 plugIcon->setPixmap( plugPix ); 237 plugIcon->setPixmap( plugPix );
224 QWhatsThis::add 238 QWhatsThis::add
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 8dbe9aa..dd828ac 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -1,18 +1,33 @@
1/* 1/*
2 * today.h 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002,2003,2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/*************************************************************************** 30
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16#ifndef TODAY_H 31#ifndef TODAY_H
17#define TODAY_H 32#define TODAY_H
18 33
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index a89f454..931f45a 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,23 +1,38 @@
1/* 1/*
2 * todaybase.cpp 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/***************************************************************************
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16 30
17#include "todaybase.h" 31#include "todaybase.h"
18 32
33#include <opie2/oresource.h>
34
19#include <qpe/applnk.h> 35#include <qpe/applnk.h>
20#include <qpe/resource.h>
21 36
22#include <qvbox.h> 37#include <qvbox.h>
23#include <qwhatsthis.h> 38#include <qwhatsthis.h>
@@ -26,13 +41,12 @@ using namespace Opie::Ui;
26TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) 41TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
27 : QWidget( parent, name, WStyle_ContextHelp ) { 42 : QWidget( parent, name, WStyle_ContextHelp ) {
28 43
29 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo 44 QPixmap logo = Opie::Core::OResource::loadPixmap( "today/today_logo" ); // logo
30 QImage opiezillaimage = QImage( Resource::loadImage("logo/opielogo" ) ); 45 QImage opiezillaimage = QImage( Opie::Core::OResource::loadImage( "logo/opielogo" ) );
31 opiezillaimage = opiezillaimage.smoothScale( 45, 45 ); 46 opiezillaimage = opiezillaimage.smoothScale( 45, 45 );
32 QPixmap opiezilla; //the opiezilla 47 QPixmap opiezilla; //the opiezilla
33 opiezilla.convertFromImage( opiezillaimage ); 48 opiezilla.convertFromImage( opiezillaimage );
34 QPixmap config; 49 QPixmap config = Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon );
35 config.convertFromImage( Resource::loadImage( "SettingsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
36 50
37 layout = 0L; 51 layout = 0L;
38 52
@@ -81,7 +95,7 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags )
81 // Opiezilla 95 // Opiezilla
82 Opiezilla = new QLabel( Frame, "OpieZilla" ); 96 Opiezilla = new QLabel( Frame, "OpieZilla" );
83 Opiezilla->setPixmap( opiezilla ); 97 Opiezilla->setPixmap( opiezilla );
84 QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Reiß" ) ); 98 QWhatsThis::add( Opiezilla , tr( "Today by Maximilian Rei�" ) );
85 Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin ); 99 Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
86 100
87 101
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 6ee9bb2..5b34234 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -1,18 +1,32 @@
1/* 1/*
2 * todaybase.h 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/***************************************************************************
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16 30
17#ifndef TODAYBASE_H 31#ifndef TODAYBASE_H
18#define TODAYBASE_H 32#define TODAYBASE_H
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 864c708..04a16e1 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,26 +1,40 @@
1/* 1/*
2 * todayconfig.cpp 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/***************************************************************************
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16 30
17#include "todayconfig.h" 31#include "todayconfig.h"
18 32
19#include <opie2/oconfig.h> 33#include <opie2/oconfig.h>
20#include <opie2/opluginloader.h> 34#include <opie2/opluginloader.h>
35#include <opie2/oresource.h>
21#include <opie2/todayplugininterface.h> 36#include <opie2/todayplugininterface.h>
22 37
23#include <qpe/resource.h>
24#include <qpe/qcopenvelope_qws.h> 38#include <qpe/qcopenvelope_qws.h>
25#include <qpe/qpeapplication.h> 39#include <qpe/qpeapplication.h>
26 40
@@ -44,7 +58,8 @@ class ToolButton : public QToolButton {
44public: 58public:
45 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 59 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
46: QToolButton( parent, name ) { 60: QToolButton( parent, name ) {
47 setPixmap( Resource::loadPixmap( icon ) ); 61 setUsesBigPixmap( true );
62 setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) );
48 setAutoRaise( TRUE ); 63 setAutoRaise( TRUE );
49 setFocusPolicy( QWidget::NoFocus ); 64 setFocusPolicy( QWidget::NoFocus );
50 setToggleButton( t ); 65 setToggleButton( t );
@@ -242,7 +257,7 @@ void TodayConfig::pluginManagement( OPluginItem plugItem ) {
242 QCheckListItem *item = new QCheckListItem( m_appletListView, plugItem.name(), QCheckListItem::CheckBox ); 257 QCheckListItem *item = new QCheckListItem( m_appletListView, plugItem.name(), QCheckListItem::CheckBox );
243 258
244 TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface ); 259 TodayPluginInterface* iface = m_pluginLoader->load<TodayPluginInterface>( plugItem, IID_TodayPluginInterface );
245 QPixmap icon = Resource::loadPixmap( iface->guiPart()->pixmapNameWidget() ); 260 QPixmap icon = Opie::Core::OResource::loadPixmap( iface->guiPart()->pixmapNameWidget(), Opie::Core::OResource::SmallIcon );
246 if ( !icon.isNull() ) { 261 if ( !icon.isNull() ) {
247 item->setPixmap( 0, icon ); 262 item->setPixmap( 0, icon );
248 } 263 }
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 81120d3..d467996 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -1,18 +1,32 @@
1/* 1/*
2 * todayconfig.h 2                 This file is part of the Opie Project
3 * 3
4 * copyright : (c) 2002,2003, 2004 by Maximilian Reiß 4 Copyright (C) Maximilian Reiss <harlekin@handhelds.org>
5 * email : harlekin@handhelds.org 5 =.
6 * 6 .=l.
7           .>+-=
8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
20..}^=.=       =       ; Library General Public License for more
21++=   -.     .`     .: details.
22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA.
7 */ 29 */
8/***************************************************************************
9 * *
10 * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License as published by *
12 * the Free Software Foundation; either version 2 of the License, or *
13 * (at your option) any later version. *
14 * *
15 ***************************************************************************/
16 30
17#ifndef TODAYCONFIG_H 31#ifndef TODAYCONFIG_H
18#define TODAYCONFIG_H 32#define TODAYCONFIG_H