summaryrefslogtreecommitdiff
path: root/libopie2/opieui
Unidiff
Diffstat (limited to 'libopie2/opieui') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/fileselector/ofileselector.cpp81
-rw-r--r--libopie2/opieui/fileselector/ofileselector.h46
-rw-r--r--libopie2/opieui/otabwidget.cpp66
-rw-r--r--libopie2/opieui/otabwidget.h52
-rw-r--r--libopie2/opieui/owait.cpp50
-rw-r--r--libopie2/opieui/owait.h47
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,49 +1,50 @@
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>
@@ -331,53 +332,46 @@ OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& st
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) ) );
@@ -636,13 +630,13 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
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 )
@@ -650,13 +644,14 @@ void OFileViewFileListView::addFile( QFileInfo* info, bool symlink )
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}
@@ -667,18 +662,18 @@ void OFileViewFileListView::addDir( QFileInfo* info, bool symlink )
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(),
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,32 +1,34 @@
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
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,44 +1,44 @@
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
44using namespace Opie::Ui; 44using namespace Opie::Ui;
@@ -94,24 +94,24 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab
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 );
@@ -177,13 +177,13 @@ void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QStri
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 );
@@ -295,13 +295,13 @@ void OTabWidget::setTabStyle( TabStyle s )
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 );
@@ -315,13 +315,14 @@ void OTabWidget::setTabStyle( TabStyle s )
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
@@ -362,19 +363,12 @@ 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
368QPixmap 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
375void OTabWidget::selectTab( OTabInfo *tab ) 369void 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 )
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,34 +1,34 @@
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 */
@@ -228,20 +228,12 @@ private:
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 * );
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,41 +1,43 @@
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
41using namespace Opie::Ui; 43using namespace Opie::Ui;
@@ -62,13 +64,13 @@ OWait::OWait( QWidget *parent, const char* msg, bool dispIcon )
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 );
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,34 +1,34 @@
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 */
@@ -42,14 +42,13 @@ namespace Opie {
42namespace Ui { 42namespace 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 */
50class OWait : public QDialog 49class 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 );