author | drw <drw> | 2005-04-05 22:38:32 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-05 22:38:32 (UTC) |
commit | 0f7b159f0a4972b6ffdc292f5eb4d2169c7fa75d (patch) (unidiff) | |
tree | 27fb276e59b1eab586d029feaf21f45ddf1cb96a | |
parent | 327e938f58125a52482b9a6543dd1aa4243bb5d3 (diff) | |
download | opie-0f7b159f0a4972b6ffdc292f5eb4d2169c7fa75d.zip opie-0f7b159f0a4972b6ffdc292f5eb4d2169c7fa75d.tar.gz opie-0f7b159f0a4972b6ffdc292f5eb4d2169c7fa75d.tar.bz2 |
Use OResource for loading images
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.cpp | 81 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.h | 46 | ||||
-rw-r--r-- | libopie2/opieui/otabwidget.cpp | 66 | ||||
-rw-r--r-- | libopie2/opieui/otabwidget.h | 50 | ||||
-rw-r--r-- | libopie2/opieui/owait.cpp | 50 | ||||
-rw-r--r-- | libopie2/opieui/owait.h | 47 |
6 files changed, 162 insertions, 178 deletions
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp index 8b53038..f3e7501 100644 --- a/libopie2/opieui/fileselector/ofileselector.cpp +++ b/libopie2/opieui/fileselector/ofileselector.cpp | |||
@@ -1,24 +1,26 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | =. This file is part of the OPIE Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
4 | .=l. Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org> | 3 | |
5 | .>+-= | 4 | Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org> |
6 | _;:, .> :=|. This library is free software; you can | 5 | =. |
7 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .=l. |
8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | Â Â Â Â Â Â .>+-= |
9 | .="- .-=="i, .._ License as published by the Free Software | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
11 | ._= =} : or (at your option) any later version. | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
12 | .%`+i> _;_. | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
13 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
15 | : .. .:, . . . without even the implied warranty of | 14 | Â Â .%`+i> Â Â Â _;_. |
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
18 | ..}^=.= = ; Library General Public License for more | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
19 | ++= -. .` .: details. | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | : = ...= . :.=- | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
21 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
22 | -_. . . )=. = Library General Public License along with | 21 | ++= Â -. Â Â .` Â Â .: details. |
23 | -- :-=` this library; see the file COPYING.LIB. | 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. | ||
24 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -26,3 +28,2 @@ | |||
26 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
27 | |||
28 | */ | 29 | */ |
@@ -37,4 +38,5 @@ | |||
37 | /* OPIE */ | 38 | /* OPIE */ |
38 | #include <opie2/ofileselector.h> | ||
39 | #include <opie2/odebug.h> | 39 | #include <opie2/odebug.h> |
40 | #include <opie2/ofileselector.h> | ||
41 | #include <opie2/oresource.h> | ||
40 | 42 | ||
@@ -42,3 +44,2 @@ | |||
42 | #include <qpe/mimetype.h> | 44 | #include <qpe/mimetype.h> |
43 | #include <qpe/resource.h> | ||
44 | #include <qpe/storage.h> | 45 | #include <qpe/storage.h> |
@@ -336,7 +337,5 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
336 | 337 | ||
337 | QPixmap pic; | ||
338 | QToolButton *btn = new QToolButton( box ); | 338 | QToolButton *btn = new QToolButton( box ); |
339 | btn->setUsesBigPixmap( true ); | 339 | btn->setUsesBigPixmap( true ); |
340 | pic.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 340 | btn->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) ); |
341 | btn->setPixmap( pic ); | ||
342 | connect(btn, SIGNAL(clicked() ), | 341 | connect(btn, SIGNAL(clicked() ), |
@@ -346,4 +345,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
346 | btn->setUsesBigPixmap( true ); | 345 | btn->setUsesBigPixmap( true ); |
347 | pic.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 346 | btn->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) ); |
348 | btn->setPixmap( pic ); | ||
349 | connect(btn, SIGNAL(clicked() ), | 347 | connect(btn, SIGNAL(clicked() ), |
@@ -353,4 +351,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
353 | btn->setUsesBigPixmap( true ); | 351 | btn->setUsesBigPixmap( true ); |
354 | pic.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 352 | btn->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) ); |
355 | btn->setPixmap( pic ); | ||
356 | connect(btn, SIGNAL(clicked() ), | 353 | connect(btn, SIGNAL(clicked() ), |
@@ -360,4 +357,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
360 | m_btnNew->setUsesBigPixmap( true ); | 357 | m_btnNew->setUsesBigPixmap( true ); |
361 | pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 358 | m_btnNew->setPixmap( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ) ); |
362 | m_btnNew->setPixmap( pic ); | ||
363 | connect(m_btnNew, SIGNAL(clicked() ), | 359 | connect(m_btnNew, SIGNAL(clicked() ), |
@@ -368,4 +364,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
368 | m_btnClose->setUsesBigPixmap( true ); | 364 | m_btnClose->setUsesBigPixmap( true ); |
369 | pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 365 | m_btnClose->setPixmap( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) ); |
370 | m_btnClose->setPixmap( pic ); | ||
371 | connect(m_btnClose, SIGNAL(clicked() ), | 366 | connect(m_btnClose, SIGNAL(clicked() ), |
@@ -375,4 +370,3 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
375 | btn->setUsesBigPixmap( true ); | 370 | btn->setUsesBigPixmap( true ); |
376 | pic.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | 371 | btn->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) ); |
377 | btn->setPixmap( pic ); | ||
378 | 372 | ||
@@ -641,3 +635,3 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) | |||
641 | QWMatrix matrix; | 635 | QWMatrix matrix; |
642 | QPixmap pixer(Resource::loadPixmap("UnknownDocument") ); | 636 | QPixmap pixer( Opie::Core::OResource::loadPixmap( "UnknownDocument" ) ); |
643 | matrix.scale( .4, .4 ); | 637 | matrix.scale( .4, .4 ); |
@@ -655,3 +649,4 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) | |||
655 | { | 649 | { |
656 | locked = true; pix = Resource::loadPixmap("locked"); | 650 | locked = true; |
651 | pix = Opie::Core::OResource::loadPixmap( "locked" ); | ||
657 | } | 652 | } |
@@ -672,8 +667,8 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) | |||
672 | if ( symlink ) | 667 | if ( symlink ) |
673 | pix = Resource::loadPixmap( "opie/symlink" ); | 668 | pix = Opie::Core::OResource::loadPixmap( "opie/symlink" ); |
674 | else | 669 | else |
675 | pix = Resource::loadPixmap( "lockedfolder" ); | 670 | pix = Opie::Core::OResource::loadPixmap( "lockedfolder" ); |
676 | } | 671 | } |
677 | else | 672 | else |
678 | pix = symlink ? Resource::loadPixmap( "opie/symlink") : Resource::loadPixmap("folder"); | 673 | pix = symlink ? Opie::Core::OResource::loadPixmap( "opie/symlink" ) : Opie::Core::OResource::loadPixmap( "folder" ); |
679 | 674 | ||
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h index d166afd..f32e3ed 100644 --- a/libopie2/opieui/fileselector/ofileselector.h +++ b/libopie2/opieui/fileselector/ofileselector.h | |||
@@ -1,23 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | .=l. Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org> | 3 | |
4 | .>+-= | 4 | Copyright (C) 2002,2003 Holger Freyther <zecke@handhelds.org> |
5 | _;:, .> :=|. This library is free software; you can | 5 | =. |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .=l. |
7 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | Â Â Â Â Â Â .>+-= |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
10 | ._= =} : or (at your option) any later version. | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
11 | .%`+i> _;_. | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
14 | : .. .:, . . . without even the implied warranty of | 14 | Â Â .%`+i> Â Â Â _;_. |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
17 | ..}^=.= = ; Library General Public License for more | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
18 | ++= -. .` .: details. | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | : = ...= . :.=- | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
21 | -_. . . )=. = Library General Public License along with | 21 | ++= Â -. Â Â .` Â Â .: details. |
22 | -- :-=` this library; see the file COPYING.LIB. | 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. | ||
23 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -25,3 +28,2 @@ | |||
25 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
26 | |||
27 | */ | 29 | */ |
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp index 8d7806c..7333f5e 100644 --- a/libopie2/opieui/otabwidget.cpp +++ b/libopie2/opieui/otabwidget.cpp | |||
@@ -1,26 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002, 2005 Dan Williams <drw@handhelds.org> | 4 | Copyright (C) 2002, 2005 Dan Williams <drw@handhelds.org> |
5 | =. | 5 | =. |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | Â Â Â Â Â Â .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | Â Â .%`+i> Â Â Â _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= Â -. Â Â .` Â Â .: details. |
22 | : = ...= . :.=- | 22 | : Â Â = Â ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | Â -_. . . Â )=. Â = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -28,3 +28,2 @@ _;:, .> :=|. This program is free software; you can | |||
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | |||
30 | */ | 29 | */ |
@@ -34,6 +33,7 @@ _;:, .> :=|. This program is free software; you can | |||
34 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/oresource.h> | ||
35 | #include <opie2/otabbar.h> | ||
36 | |||
35 | #include <qpe/applnk.h> | 37 | #include <qpe/applnk.h> |
36 | #include <qpe/config.h> | 38 | #include <qpe/config.h> |
37 | #include <qpe/resource.h> | ||
38 | #include <opie2/otabbar.h> | ||
39 | 39 | ||
@@ -99,3 +99,3 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
99 | tab->label = QString::null; | 99 | tab->label = QString::null; |
100 | tab->iconset = new QIconSet( loadSmooth( icon ) ); | 100 | tab->iconset = new QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ); |
101 | } | 101 | } |
@@ -110,3 +110,3 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
110 | if ( m_tabBarStyle == IconList ) | 110 | if ( m_tabBarStyle == IconList ) |
111 | m_tabList->insertItem( loadSmooth( icon ), label, -1 ); | 111 | m_tabList->insertItem( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ), label, -1 ); |
112 | else | 112 | else |
@@ -182,3 +182,3 @@ void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QStri | |||
182 | { | 182 | { |
183 | QPixmap icon( loadSmooth( iconset ) ); | 183 | QPixmap icon( Opie::Core::OResource::loadPixmap( iconset, Opie::Core::OResource::SmallIcon ) ); |
184 | 184 | ||
@@ -300,3 +300,3 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
300 | tab->label = QString::null; | 300 | tab->label = QString::null; |
301 | tab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); | 301 | tab->iconset = new QIconSet( Opie::Core::OResource::loadPixmap( tabinfo->icon(), Opie::Core::OResource::SmallIcon ) ); |
302 | } | 302 | } |
@@ -320,3 +320,4 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
320 | if ( m_tabBarStyle == IconList ) | 320 | if ( m_tabBarStyle == IconList ) |
321 | m_tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() ); | 321 | m_tabList->insertItem( Opie::Core::OResource::loadPixmap( tabinfo->icon(), Opie::Core::OResource::SmallIcon ), |
322 | tabinfo->label() ); | ||
322 | else | 323 | else |
@@ -367,9 +368,2 @@ void OTabWidget::slotTabListSelected( int index ) | |||
367 | 368 | ||
368 | QPixmap OTabWidget::loadSmooth( const QString &name ) | ||
369 | { | ||
370 | QPixmap p; | ||
371 | p.convertFromImage( Resource::loadImage( name ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
372 | return p; | ||
373 | } | ||
374 | |||
375 | void OTabWidget::selectTab( OTabInfo *tab ) | 369 | void OTabWidget::selectTab( OTabInfo *tab ) |
diff --git a/libopie2/opieui/otabwidget.h b/libopie2/opieui/otabwidget.h index e925592..3af8fac 100644 --- a/libopie2/opieui/otabwidget.h +++ b/libopie2/opieui/otabwidget.h | |||
@@ -1,3 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | |||
3 | Copyright (C) 2002, 2005 Dan Williams <drw@handhelds.org> | 4 | Copyright (C) 2002, 2005 Dan Williams <drw@handhelds.org> |
@@ -5,21 +6,21 @@ | |||
5 | .=l. | 6 | .=l. |
6 | .>+-= | 7 | Â Â Â Â Â Â .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
13 | .%`+i> _;_. | 14 | Â Â .%`+i> Â Â Â _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
20 | ++= -. .` .: details. | 21 | ++= Â -. Â Â .` Â Â .: details. |
21 | : = ...= . :.=- | 22 | : Â Â = Â ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 24 | Â -_. . . Â )=. Â = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -27,3 +28,2 @@ _;:, .> :=|. This program is free software; you can | |||
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
@@ -233,10 +233,2 @@ private: | |||
233 | /** | 233 | /** |
234 | * @fn loadSmooth( const QString &name ) | ||
235 | * @brief Loads icon for widget. | ||
236 | * | ||
237 | * @param name Name of icon image file. | ||
238 | */ | ||
239 | QPixmap loadSmooth( const QString & ); | ||
240 | |||
241 | /** | ||
242 | * @fn selectTab( OTabInfo *tab ) | 234 | * @fn selectTab( OTabInfo *tab ) |
diff --git a/libopie2/opieui/owait.cpp b/libopie2/opieui/owait.cpp index ec1f25a..5f89ad2 100644 --- a/libopie2/opieui/owait.cpp +++ b/libopie2/opieui/owait.cpp | |||
@@ -1,25 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | 3 | |
4 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | ||
4 | =. | 5 | =. |
5 | .=l. | 6 | .=l. |
6 | .>+-= | 7 | Â Â Â Â Â Â .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
13 | .%`+i> _;_. | 14 | Â Â .%`+i> Â Â Â _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 17 | Â Â : .. Â Â .:, Â Â . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
20 | ++= -. .` .: details. | 21 | ++= Â -. Â Â .` Â Â .: details. |
21 | : = ...= . :.=- | 22 | Â : Â Â = Â ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 24 | Â -_. . . Â )=. Â = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -27,3 +28,2 @@ | |||
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
@@ -33,4 +33,6 @@ | |||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie2/oresource.h> | ||
35 | |||
36 | |||
34 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
35 | #include <qpe/resource.h> | ||
36 | 38 | ||
@@ -67,3 +69,3 @@ OWait::OWait( QWidget *parent, const char* msg, bool dispIcon ) | |||
67 | 69 | ||
68 | m_pix = Resource::loadPixmap( "BigBusy" ); | 70 | m_pix = Opie::Core::OResource::loadPixmap( "BigBusy" ); |
69 | m_aniSize = m_pix.height(); | 71 | m_aniSize = m_pix.height(); |
diff --git a/libopie2/opieui/owait.h b/libopie2/opieui/owait.h index 03c33e4..0036bb1 100644 --- a/libopie2/opieui/owait.h +++ b/libopie2/opieui/owait.h | |||
@@ -1,25 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | 3 | |
4 | Copyright (C) 2003 Maximilian Reiss <harlekin@handhelds.org> | ||
4 | =. | 5 | =. |
5 | .=l. | 6 | .=l. |
6 | .>+-= | 7 | Â Â Â Â Â Â .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
13 | .%`+i> _;_. | 14 | Â Â .%`+i> Â Â Â _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
20 | ++= -. .` .: details. | 21 | ++= Â -. Â Â .` Â Â .: details. |
21 | : = ...= . :.=- | 22 | : Â Â = Â ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 24 | Â -_. . . Â )=. Â = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
@@ -27,3 +28,2 @@ | |||
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
@@ -47,4 +47,3 @@ namespace Ui { | |||
47 | * @see QDialog | 47 | * @see QDialog |
48 | * @author Maximilian Reiß | 48 | * @author Maximilian Rei� */ |
49 | */ | ||
50 | class OWait : public QDialog | 49 | class OWait : public QDialog |