summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-05 00:23:51 (UTC)
committer mickeyl <mickeyl>2004-01-05 00:23:51 (UTC)
commit667cdc3c4c05f465244de26580be8808a0eb2b0e (patch) (unidiff)
tree8de51859120e9278cb20166c69d358f019f05f34
parent8b0be84aaf5da9b43ab6935c1939bf77caf0aa02 (diff)
downloadopie-667cdc3c4c05f465244de26580be8808a0eb2b0e.zip
opie-667cdc3c4c05f465244de26580be8808a0eb2b0e.tar.gz
opie-667cdc3c4c05f465244de26580be8808a0eb2b0e.tar.bz2
use smallIconSize, not hardcoded 14
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 1b8c085..3a9a5ec 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -18,32 +18,33 @@
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 29
30*/ 30*/
31 31
32#include "otabwidget.h" 32#include "otabwidget.h"
33 33
34#include <qpe/applnk.h>
34#include <qpe/config.h> 35#include <qpe/config.h>
35#include <qpe/resource.h> 36#include <qpe/resource.h>
36#include <opie/otabbar.h> 37#include <opie/otabbar.h>
37 38
38#include <qcombobox.h> 39#include <qcombobox.h>
39#include <qwidgetstack.h> 40#include <qwidgetstack.h>
40 41
41OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p ) 42OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPosition p )
42 : QWidget( parent, name ) 43 : QWidget( parent, name )
43{ 44{
44 if ( s == Global ) 45 if ( s == Global )
45 { 46 {
46 Config config( "qpe" ); 47 Config config( "qpe" );
47 config.setGroup( "Appearance" ); 48 config.setGroup( "Appearance" );
48 s = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab ); 49 s = ( TabStyle ) config.readNumEntry( "TabStyle", (int) IconTab );
49 if ( s <= Global || s > IconList) 50 if ( s <= Global || s > IconList)
@@ -313,36 +314,35 @@ void OTabWidget::slotTabBarSelected( int id )
313 { 314 {
314 selectTab( newtab ); 315 selectTab( newtab );
315 } 316 }
316} 317}
317 318
318void OTabWidget::slotTabListSelected( int index ) 319void OTabWidget::slotTabListSelected( int index )
319{ 320{
320 OTabInfo *newtab = tabs.at( index ); 321 OTabInfo *newtab = tabs.at( index );
321 if ( newtab ) 322 if ( newtab )
322 { 323 {
323 selectTab( newtab ); 324 selectTab( newtab );
324 } 325 }
325} 326}
326 327
327QPixmap OTabWidget::loadSmooth( const QString &name ) 328QPixmap OTabWidget::loadSmooth( const QString &name )
328{ 329{
329 QImage image = Resource::loadImage( name ); 330 QPixmap p;
330 QPixmap pixmap; 331 p.convertFromImage( Resource::loadImage( name ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
331 pixmap.convertFromImage( image.smoothScale( 14, 14 ) ); 332 return p;
332 return pixmap;
333} 333}
334 334
335void OTabWidget::selectTab( OTabInfo *tab ) 335void OTabWidget::selectTab( OTabInfo *tab )
336{ 336{
337 if ( tabBarStyle == IconTab ) 337 if ( tabBarStyle == IconTab )
338 { 338 {
339 if ( currTab ) 339 if ( currTab )
340 { 340 {
341 tabBar->tab( currTab->id() )->setText( QString::null ); 341 tabBar->tab( currTab->id() )->setText( QString::null );
342 setUpLayout(); 342 setUpLayout();
343 } 343 }
344 tabBar->tab( tab->id() )->setText( tab->label() ); 344 tabBar->tab( tab->id() )->setText( tab->label() );
345 tabBar->setCurrentTab( tab->id() ); 345 tabBar->setCurrentTab( tab->id() );
346 setUpLayout(); 346 setUpLayout();
347 tabBar->update(); 347 tabBar->update();
348 } 348 }