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 | 52 | ||||
-rw-r--r-- | libopie2/opieui/owait.cpp | 50 | ||||
-rw-r--r-- | libopie2/opieui/owait.h | 47 |
6 files changed, 163 insertions, 179 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,55 +1,56 @@ | |||
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, |
25 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
26 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
27 | |||
28 | */ | 29 | */ |
29 | 30 | ||
30 | /* hacky but we need to get FileSelector::filter */ | 31 | /* hacky but we need to get FileSelector::filter */ |
31 | #define private public | 32 | #define private public |
32 | #include <qpe/fileselector.h> | 33 | #include <qpe/fileselector.h> |
33 | #undef private | 34 | #undef private |
34 | 35 | ||
35 | #include "ofileselector_p.h" | 36 | #include "ofileselector_p.h" |
36 | 37 | ||
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 | ||
41 | #include <qpe/qpeapplication.h> | 43 | #include <qpe/qpeapplication.h> |
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> |
45 | 46 | ||
46 | /* QT */ | 47 | /* QT */ |
47 | #include <qcombobox.h> | 48 | #include <qcombobox.h> |
48 | #include <qdir.h> | 49 | #include <qdir.h> |
49 | #include <qhbox.h> | 50 | #include <qhbox.h> |
50 | #include <qheader.h> | 51 | #include <qheader.h> |
51 | #include <qlabel.h> | 52 | #include <qlabel.h> |
52 | #include <qlayout.h> | 53 | #include <qlayout.h> |
53 | #include <qlineedit.h> | 54 | #include <qlineedit.h> |
54 | #include <qlistview.h> | 55 | #include <qlistview.h> |
55 | #include <qpopupmenu.h> | 56 | #include <qpopupmenu.h> |
@@ -325,65 +326,58 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st | |||
325 | * One Button For Up | 326 | * One Button For Up |
326 | * Home | 327 | * Home |
327 | * Doc | 328 | * Doc |
328 | * And a dropdown menu with FileSystems | 329 | * And a dropdown menu with FileSystems |
329 | * FUTURE: one to change dir with lineedit | 330 | * FUTURE: one to change dir with lineedit |
330 | * Bookmarks | 331 | * Bookmarks |
331 | * Create Dir | 332 | * Create Dir |
332 | */ | 333 | */ |
333 | QHBox* box = new QHBox(this ); | 334 | QHBox* box = new QHBox(this ); |
334 | box->setBackgroundMode( PaletteButton ); | 335 | box->setBackgroundMode( PaletteButton ); |
335 | box->setSpacing( 0 ); | 336 | box->setSpacing( 0 ); |
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() ), |
343 | this, SLOT( cdUP() ) ); | 342 | this, SLOT( cdUP() ) ); |
344 | 343 | ||
345 | btn = new QToolButton( box ); | 344 | btn = new QToolButton( box ); |
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() ), |
350 | this, SLOT( cdHome() ) ); | 348 | this, SLOT( cdHome() ) ); |
351 | 349 | ||
352 | btn = new QToolButton( box ); | 350 | btn = new QToolButton( box ); |
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() ), |
357 | this, SLOT(cdDoc() ) ); | 354 | this, SLOT(cdDoc() ) ); |
358 | 355 | ||
359 | m_btnNew = new QToolButton( box ); | 356 | m_btnNew = new QToolButton( box ); |
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() ), |
364 | this, SLOT(slotNew() ) ); | 360 | this, SLOT(slotNew() ) ); |
365 | 361 | ||
366 | 362 | ||
367 | m_btnClose = new QToolButton( box ); | 363 | m_btnClose = new QToolButton( box ); |
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() ), |
372 | selector(), SIGNAL(closeMe() ) ); | 367 | selector(), SIGNAL(closeMe() ) ); |
373 | 368 | ||
374 | btn = new QToolButton( box ); | 369 | btn = new QToolButton( box ); |
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 | ||
379 | m_fsButton = btn; | 373 | m_fsButton = btn; |
380 | /* let's fill device parts */ | 374 | /* let's fill device parts */ |
381 | QPopupMenu* pop = new QPopupMenu(this); | 375 | QPopupMenu* pop = new QPopupMenu(this); |
382 | connect(pop, SIGNAL( activated(int) ), | 376 | connect(pop, SIGNAL( activated(int) ), |
383 | this, SLOT(slotFSActivated(int) ) ); | 377 | this, SLOT(slotFSActivated(int) ) ); |
384 | 378 | ||
385 | StorageInfo storage; | 379 | StorageInfo storage; |
386 | const QList<FileSystem> &fs = storage.fileSystems(); | 380 | const QList<FileSystem> &fs = storage.fileSystems(); |
387 | QListIterator<FileSystem> it(fs); | 381 | QListIterator<FileSystem> it(fs); |
388 | for ( ; it.current(); ++it ) | 382 | for ( ; it.current(); ++it ) |
389 | { | 383 | { |
@@ -630,61 +624,62 @@ void OFileViewFileListView::slotClicked(int button , QListViewItem* item, const | |||
630 | 624 | ||
631 | void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) | 625 | void OFileViewFileListView::addFile( QFileInfo* info, bool symlink ) |
632 | { | 626 | { |
633 | MimeType type( info->absFilePath() ); | 627 | MimeType type( info->absFilePath() ); |
634 | if (!compliesMime( type.id() ) ) | 628 | if (!compliesMime( type.id() ) ) |
635 | return; | 629 | return; |
636 | 630 | ||
637 | QPixmap pix = type.pixmap(); | 631 | QPixmap pix = type.pixmap(); |
638 | QString dir, name; bool locked; | 632 | QString dir, name; bool locked; |
639 | if ( pix.isNull() ) | 633 | if ( pix.isNull() ) |
640 | { | 634 | { |
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 ); |
644 | pix = pixer.xForm( matrix ); | 638 | pix = pixer.xForm( matrix ); |
645 | } | 639 | } |
646 | dir = info->dirPath( true ); | 640 | dir = info->dirPath( true ); |
647 | locked = false; | 641 | locked = false; |
648 | if ( symlink ) | 642 | if ( symlink ) |
649 | name = info->fileName() + " -> " + createNewPath(info->dirPath(),info->readLink()); | 643 | name = info->fileName() + " -> " + createNewPath(info->dirPath(),info->readLink()); |
650 | else | 644 | else |
651 | { | 645 | { |
652 | name = info->fileName(); | 646 | name = info->fileName(); |
653 | if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) || | 647 | if ( ( (selector()->mode() == OFileSelector::Open)&& !info->isReadable() ) || |
654 | ( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) ) | 648 | ( (selector()->mode() == OFileSelector::Save)&& !info->isWritable() ) ) |
655 | { | 649 | { |
656 | locked = true; pix = Resource::loadPixmap("locked"); | 650 | locked = true; |
651 | pix = Opie::Core::OResource::loadPixmap( "locked" ); | ||
657 | } | 652 | } |
658 | } | 653 | } |
659 | (void)new OFileSelectorItem( m_view, pix, name, | 654 | (void)new OFileSelectorItem( m_view, pix, name, |
660 | info->lastModified().toString(), QString::number( info->size() ), | 655 | info->lastModified().toString(), QString::number( info->size() ), |
661 | dir, locked ); | 656 | dir, locked ); |
662 | } | 657 | } |
663 | 658 | ||
664 | void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) | 659 | void OFileViewFileListView::addDir( QFileInfo* info, bool symlink ) |
665 | { | 660 | { |
666 | bool locked = false; QString name; QPixmap pix; | 661 | bool locked = false; QString name; QPixmap pix; |
667 | 662 | ||
668 | if ( ( ( selector()->mode() == OFileSelector::Open ) && !info->isReadable() ) || | 663 | if ( ( ( selector()->mode() == OFileSelector::Open ) && !info->isReadable() ) || |
669 | ( ( selector()->mode() == OFileSelector::Save ) && !info->isWritable() ) ) | 664 | ( ( selector()->mode() == OFileSelector::Save ) && !info->isWritable() ) ) |
670 | { | 665 | { |
671 | locked = true; | 666 | locked = true; |
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 | ||
680 | name = symlink ? info->fileName() + " -> " + createNewPath(info->dirPath(true),info->readLink()) : | 675 | name = symlink ? info->fileName() + " -> " + createNewPath(info->dirPath(true),info->readLink()) : |
681 | info->fileName(); | 676 | info->fileName(); |
682 | 677 | ||
683 | (void)new OFileSelectorItem( m_view, pix, name, | 678 | (void)new OFileSelectorItem( m_view, pix, name, |
684 | info->lastModified().toString(), | 679 | info->lastModified().toString(), |
685 | QString::number( info->size() ), | 680 | QString::number( info->size() ), |
686 | info->dirPath( true ), locked, true ); | 681 | info->dirPath( true ), locked, true ); |
687 | 682 | ||
688 | 683 | ||
689 | } | 684 | } |
690 | 685 | ||
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,38 +1,40 @@ | |||
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, |
24 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
26 | |||
27 | */ | 29 | */ |
28 | 30 | ||
29 | /* | 31 | /* |
30 | This is based on code and ideas of | 32 | This is based on code and ideas of |
31 | L. J. Potter ljp@llornkcor.com | 33 | L. J. Potter ljp@llornkcor.com |
32 | Thanks a lot | 34 | Thanks a lot |
33 | */ | 35 | */ |
34 | 36 | ||
35 | #ifndef OFILESELECTOR_H | 37 | #ifndef OFILESELECTOR_H |
36 | #define OFILESELECTOR_H | 38 | #define OFILESELECTOR_H |
37 | 39 | ||
38 | /* OPIE */ | 40 | /* OPIE */ |
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,50 +1,50 @@ | |||
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, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | |||
30 | */ | 29 | */ |
31 | 30 | ||
32 | #include <opie2/otabwidget.h> | 31 | #include <opie2/otabwidget.h> |
33 | 32 | ||
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 | ||
40 | /* QT */ | 40 | /* QT */ |
41 | #include <qcombobox.h> | 41 | #include <qcombobox.h> |
42 | #include <qwidgetstack.h> | 42 | #include <qwidgetstack.h> |
43 | 43 | ||
44 | using namespace Opie::Ui; | 44 | using namespace Opie::Ui; |
45 | 45 | ||
46 | OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) | 46 | OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) |
47 | : QWidget( parent, name ) | 47 | : QWidget( parent, name ) |
48 | , m_currTab( 0l ) | 48 | , m_currTab( 0l ) |
49 | , m_tabBarStyle( Global ) | 49 | , m_tabBarStyle( Global ) |
50 | , m_tabBarPosition( Top ) | 50 | , m_tabBarPosition( Top ) |
@@ -88,36 +88,36 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
88 | { | 88 | { |
89 | int tabid = -1; | 89 | int tabid = -1; |
90 | 90 | ||
91 | if ( m_usingTabs ) | 91 | if ( m_usingTabs ) |
92 | { | 92 | { |
93 | // Create new tab in tab bar | 93 | // Create new tab in tab bar |
94 | QTab *tab = new QTab(); | 94 | QTab *tab = new QTab(); |
95 | 95 | ||
96 | // Set label (and icon if necessary) | 96 | // Set label (and icon if necessary) |
97 | if ( m_tabBarStyle == IconTab ) | 97 | if ( m_tabBarStyle == IconTab ) |
98 | { | 98 | { |
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 | } |
102 | else | 102 | else |
103 | tab->label = label; | 103 | tab->label = label; |
104 | 104 | ||
105 | tabid = m_tabBar->addTab( tab ); | 105 | tabid = m_tabBar->addTab( tab ); |
106 | } | 106 | } |
107 | else | 107 | else |
108 | { | 108 | { |
109 | // Insert entry (with icon if necessary) into drop down list | 109 | // Insert entry (with icon if necessary) into drop down list |
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 |
113 | m_tabList->insertItem( label ); | 113 | m_tabList->insertItem( label ); |
114 | } | 114 | } |
115 | 115 | ||
116 | // Add widget to stack | 116 | // Add widget to stack |
117 | m_widgetStack->addWidget( child, tabid ); | 117 | m_widgetStack->addWidget( child, tabid ); |
118 | m_widgetStack->raiseWidget( child ); | 118 | m_widgetStack->raiseWidget( child ); |
119 | m_widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); | 119 | m_widgetStack->setFrameStyle( QFrame::StyledPanel | QFrame::Raised ); |
120 | 120 | ||
121 | // Keep track of tab information | 121 | // Keep track of tab information |
122 | OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); | 122 | OTabInfo *tabinfo = new OTabInfo( tabid, child, icon, label ); |
123 | m_tabs.append( tabinfo ); | 123 | m_tabs.append( tabinfo ); |
@@ -171,25 +171,25 @@ void OTabWidget::removePage( QWidget *childwidget ) | |||
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
174 | void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label) | 174 | void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label) |
175 | { | 175 | { |
176 | // Find tab information for desired widget | 176 | // Find tab information for desired widget |
177 | OTabInfo *currtab = m_tabs.first(); | 177 | OTabInfo *currtab = m_tabs.first(); |
178 | while ( currtab && currtab->control() != widget ) | 178 | while ( currtab && currtab->control() != widget ) |
179 | currtab = m_tabs.next(); | 179 | currtab = m_tabs.next(); |
180 | 180 | ||
181 | if ( currtab && currtab->control() == widget ) | 181 | if ( currtab && currtab->control() == widget ) |
182 | { | 182 | { |
183 | QPixmap icon( loadSmooth( iconset ) ); | 183 | QPixmap icon( Opie::Core::OResource::loadPixmap( iconset, Opie::Core::OResource::SmallIcon ) ); |
184 | 184 | ||
185 | if ( m_usingTabs ) | 185 | if ( m_usingTabs ) |
186 | { | 186 | { |
187 | // Update tab label and icon (if necessary) | 187 | // Update tab label and icon (if necessary) |
188 | QTab *tab = m_tabBar->tab( currtab->id() ); | 188 | QTab *tab = m_tabBar->tab( currtab->id() ); |
189 | tab->setText( label ); | 189 | tab->setText( label ); |
190 | if ( m_tabBarStyle == IconTab ) | 190 | if ( m_tabBarStyle == IconTab ) |
191 | tab->setIconSet( icon ); | 191 | tab->setIconSet( icon ); |
192 | } | 192 | } |
193 | else | 193 | else |
194 | { | 194 | { |
195 | // Update entry label and icon (if necessary) | 195 | // Update entry label and icon (if necessary) |
@@ -289,45 +289,46 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
289 | connect( m_tabBar, SIGNAL(selected(int)), this, SLOT(slotTabBarSelected(int)) ); | 289 | connect( m_tabBar, SIGNAL(selected(int)), this, SLOT(slotTabBarSelected(int)) ); |
290 | 290 | ||
291 | // Add all current tabs to tab bar | 291 | // Add all current tabs to tab bar |
292 | for ( OTabInfo *tabinfo = m_tabs.first(); tabinfo; tabinfo = m_tabs.next() ) | 292 | for ( OTabInfo *tabinfo = m_tabs.first(); tabinfo; tabinfo = m_tabs.next() ) |
293 | { | 293 | { |
294 | // Create new tab in tab bar | 294 | // Create new tab in tab bar |
295 | QTab *tab = new QTab(); | 295 | QTab *tab = new QTab(); |
296 | 296 | ||
297 | // Set label (and icon if necessary) | 297 | // Set label (and icon if necessary) |
298 | if ( m_tabBarStyle == IconTab ) | 298 | if ( m_tabBarStyle == IconTab ) |
299 | { | 299 | { |
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 | } |
303 | else | 303 | else |
304 | tab->label = tabinfo->label(); | 304 | tab->label = tabinfo->label(); |
305 | 305 | ||
306 | // Add tab and save its Id | 306 | // Add tab and save its Id |
307 | int tabid = m_tabBar->addTab( tab ); | 307 | int tabid = m_tabBar->addTab( tab ); |
308 | tabinfo->setId( tabid ); | 308 | tabinfo->setId( tabid ); |
309 | } | 309 | } |
310 | } | 310 | } |
311 | else | 311 | else |
312 | { | 312 | { |
313 | // Create new drop down list selector | 313 | // Create new drop down list selector |
314 | m_tabList = new QComboBox( false, this ); | 314 | m_tabList = new QComboBox( false, this ); |
315 | connect( m_tabList, SIGNAL(activated(int)), this, SLOT(slotTabListSelected(int)) ); | 315 | connect( m_tabList, SIGNAL(activated(int)), this, SLOT(slotTabListSelected(int)) ); |
316 | 316 | ||
317 | // Add all current tabs to drop down list | 317 | // Add all current tabs to drop down list |
318 | for ( OTabInfo *tabinfo = m_tabs.first(); tabinfo; tabinfo = m_tabs.next() ) | 318 | for ( OTabInfo *tabinfo = m_tabs.first(); tabinfo; tabinfo = m_tabs.next() ) |
319 | { | 319 | { |
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 |
323 | m_tabList->insertItem( tabinfo->label() ); | 324 | m_tabList->insertItem( tabinfo->label() ); |
324 | } | 325 | } |
325 | } | 326 | } |
326 | 327 | ||
327 | // Redraw widget | 328 | // Redraw widget |
328 | setUpLayout(); | 329 | setUpLayout(); |
329 | } | 330 | } |
330 | 331 | ||
331 | OTabWidget::TabPosition OTabWidget::tabPosition() const | 332 | OTabWidget::TabPosition OTabWidget::tabPosition() const |
332 | { | 333 | { |
333 | return m_tabBarPosition; | 334 | return m_tabBarPosition; |
@@ -356,31 +357,24 @@ void OTabWidget::slotTabBarSelected( int id ) | |||
356 | 357 | ||
357 | if ( newtab && newtab->id() == id ) | 358 | if ( newtab && newtab->id() == id ) |
358 | selectTab( newtab ); | 359 | selectTab( newtab ); |
359 | } | 360 | } |
360 | 361 | ||
361 | void OTabWidget::slotTabListSelected( int index ) | 362 | void OTabWidget::slotTabListSelected( int index ) |
362 | { | 363 | { |
363 | OTabInfo *newtab = m_tabs.at( index ); | 364 | OTabInfo *newtab = m_tabs.at( index ); |
364 | if ( newtab ) | 365 | if ( newtab ) |
365 | selectTab( newtab ); | 366 | selectTab( newtab ); |
366 | } | 367 | } |
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 ) |
376 | { | 370 | { |
377 | if ( m_tabBarStyle == IconTab ) | 371 | if ( m_tabBarStyle == IconTab ) |
378 | { | 372 | { |
379 | // Remove text label from currently selected tab | 373 | // Remove text label from currently selected tab |
380 | if ( m_currTab ) | 374 | if ( m_currTab ) |
381 | { | 375 | { |
382 | m_tabBar->tab( m_currTab->id() )->setText( QString::null ); | 376 | m_tabBar->tab( m_currTab->id() )->setText( QString::null ); |
383 | //setUpLayout(); | 377 | //setUpLayout(); |
384 | } | 378 | } |
385 | 379 | ||
386 | // Set text label for newly selected tab | 380 | // Set text label for newly selected 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,40 +1,40 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | Copyright (C) 2002, 2005 Dan Williams <drw@handhelds.org> | 3 | |
4 | Copyright (C) 2002, 2005 Dan Williams <drw@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, |
26 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef OTABWIDGET_H | 31 | #ifndef OTABWIDGET_H |
32 | #define OTABWIDGET_H | 32 | #define OTABWIDGET_H |
33 | 33 | ||
34 | /* OPIE */ | 34 | /* OPIE */ |
35 | #include <opie2/otabinfo.h> | 35 | #include <opie2/otabinfo.h> |
36 | 36 | ||
37 | /* QT */ | 37 | /* QT */ |
38 | #include <qwidget.h> | 38 | #include <qwidget.h> |
39 | #include <qlist.h> | 39 | #include <qlist.h> |
40 | 40 | ||
@@ -222,32 +222,24 @@ private: | |||
222 | bool m_usingTabs; // Indicates whether style is either TextTab or IconTab | 222 | bool m_usingTabs; // Indicates whether style is either TextTab or IconTab |
223 | // (saves from having to always check for these 2 values) | 223 | // (saves from having to always check for these 2 values) |
224 | 224 | ||
225 | // UI components | 225 | // UI components |
226 | OTabBar *m_tabBar; | 226 | OTabBar *m_tabBar; |
227 | QComboBox *m_tabList; | 227 | QComboBox *m_tabList; |
228 | QWidgetStack *m_widgetStack; | 228 | QWidgetStack *m_widgetStack; |
229 | 229 | ||
230 | class Private; | 230 | class Private; |
231 | Private* d; | 231 | Private* d; |
232 | 232 | ||
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 ) |
243 | * @brief Internal function to select desired widget. | 235 | * @brief Internal function to select desired widget. |
244 | * | 236 | * |
245 | * @param tab Pointer to data for widget. | 237 | * @param tab Pointer to data for widget. |
246 | */ | 238 | */ |
247 | void selectTab( OTabInfo * ); | 239 | void selectTab( OTabInfo * ); |
248 | 240 | ||
249 | /** | 241 | /** |
250 | * @fn setUpLayout() | 242 | * @fn setUpLayout() |
251 | * @brief Internal function to adjust layout. | 243 | * @brief Internal function to adjust layout. |
252 | */ | 244 | */ |
253 | void setUpLayout(); | 245 | void setUpLayout(); |
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,47 +1,49 @@ | |||
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, |
26 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "owait.h" | 31 | #include "owait.h" |
32 | 32 | ||
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 | ||
37 | /* QT */ | 39 | /* QT */ |
38 | #include <qlayout.h> | 40 | #include <qlayout.h> |
39 | #include <qpainter.h> | 41 | #include <qpainter.h> |
40 | 42 | ||
41 | using namespace Opie::Ui; | 43 | using namespace Opie::Ui; |
42 | 44 | ||
43 | static int frame = 0; | 45 | static int frame = 0; |
44 | 46 | ||
45 | /** | 47 | /** |
46 | * This will construct a modal dialog. | 48 | * This will construct a modal dialog. |
47 | * | 49 | * |
@@ -56,25 +58,25 @@ OWait::OWait( QWidget *parent, const char* msg, bool dispIcon ) | |||
56 | { | 58 | { |
57 | 59 | ||
58 | Q_UNUSED( dispIcon ) | 60 | Q_UNUSED( dispIcon ) |
59 | 61 | ||
60 | QHBoxLayout * hbox = new QHBoxLayout( this ); | 62 | QHBoxLayout * hbox = new QHBoxLayout( this ); |
61 | 63 | ||
62 | m_lb = new QLabel( this ); | 64 | m_lb = new QLabel( this ); |
63 | m_lb->setBackgroundMode ( NoBackground ); | 65 | m_lb->setBackgroundMode ( NoBackground ); |
64 | 66 | ||
65 | hbox->addWidget( m_lb ); | 67 | hbox->addWidget( m_lb ); |
66 | hbox->activate(); | 68 | hbox->activate(); |
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(); |
70 | resize( m_aniSize, m_aniSize ); | 72 | resize( m_aniSize, m_aniSize ); |
71 | 73 | ||
72 | m_timerLength = 10; | 74 | m_timerLength = 10; |
73 | 75 | ||
74 | m_waitTimer = new QTimer( this ); | 76 | m_waitTimer = new QTimer( this ); |
75 | connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) ); | 77 | connect( m_waitTimer, SIGNAL( timeout() ), this, SLOT( hide() ) ); |
76 | } | 78 | } |
77 | 79 | ||
78 | void OWait::timerEvent( QTimerEvent * ) | 80 | void OWait::timerEvent( QTimerEvent * ) |
79 | { | 81 | { |
80 | frame = ( ++frame ) % 4; | 82 | frame = ( ++frame ) % 4; |
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,61 +1,60 @@ | |||
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, |
26 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #ifndef OWAIT_H | 31 | #ifndef OWAIT_H |
32 | #define OWAIT_H | 32 | #define OWAIT_H |
33 | 33 | ||
34 | /* QT */ | 34 | /* QT */ |
35 | #include <qdialog.h> | 35 | #include <qdialog.h> |
36 | #include <qlabel.h> | 36 | #include <qlabel.h> |
37 | #include <qpixmap.h> | 37 | #include <qpixmap.h> |
38 | #include <qtimer.h> | 38 | #include <qtimer.h> |
39 | 39 | ||
40 | 40 | ||
41 | namespace Opie { | 41 | namespace Opie { |
42 | namespace Ui { | 42 | namespace Ui { |
43 | /** | 43 | /** |
44 | * This class displays a animated waiting icon in the middle of the screen. | 44 | * This class displays a animated waiting icon in the middle of the screen. |
45 | * | 45 | * |
46 | * @short modal hour glass dialog | 46 | * @short modal hour glass dialog |
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 |
51 | { | 50 | { |
52 | Q_OBJECT | 51 | Q_OBJECT |
53 | 52 | ||
54 | public: | 53 | public: |
55 | OWait( QWidget *parent = 0, const char* name = 0, bool dispIcon = TRUE ); | 54 | OWait( QWidget *parent = 0, const char* name = 0, bool dispIcon = TRUE ); |
56 | ~OWait(); | 55 | ~OWait(); |
57 | 56 | ||
58 | /** | 57 | /** |
59 | * reimplemented for control reasons | 58 | * reimplemented for control reasons |
60 | */ | 59 | */ |
61 | void show(); | 60 | void show(); |