Diffstat (limited to 'libopie2/opieui/otabwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opieui/otabwidget.cpp | 66 |
1 files changed, 30 insertions, 36 deletions
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,42 +1,42 @@ | |||
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> |
@@ -96,9 +96,9 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
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 | ||
@@ -107,9 +107,9 @@ void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &lab | |||
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 | ||
@@ -179,9 +179,9 @@ void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QStri | |||
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) |
@@ -297,9 +297,9 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
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 | ||
@@ -317,9 +317,10 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
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 | } |
@@ -364,15 +365,8 @@ void OTabWidget::slotTabListSelected( int 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 | { |