author | mickeyl <mickeyl> | 2003-04-13 00:52:15 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-13 00:52:15 (UTC) |
commit | 789046e40be9cbd91f22ebee67898ee1d6cc473a (patch) (side-by-side diff) | |
tree | 5ada2d271c9a92e42abc08f35d9e5b3d85c1a5f3 /libopie/otabwidget.cpp | |
parent | e26dcc6893559ab0fab52c22b79226b40656ad3d (diff) | |
download | opie-789046e40be9cbd91f22ebee67898ee1d6cc473a.zip opie-789046e40be9cbd91f22ebee67898ee1d6cc473a.tar.gz opie-789046e40be9cbd91f22ebee67898ee1d6cc473a.tar.bz2 |
<tadaa>Change tab icon size to 14x14</tadaa>. Now most of our new icons
are no longer looking fuzzy because of scaling them up from 14x14 to 16x16
-rw-r--r-- | libopie/otabwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index 99bf067..a1fd2c0 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp @@ -138,272 +138,272 @@ void OTabWidget::removePage( QWidget *childwidget ) int i = 0; while ( i < tabList->count() && tabList->text( i ) != tab->label() ) { i++; } if ( tabList->text( i ) == tab->label() ) { tabList->removeItem( i ); } widgetStack->removeWidget( childwidget ); tabs.remove( tab ); delete tab; currentTab = tabs.current(); if ( !currentTab ) { widgetStack->setFrameStyle( QFrame::NoFrame ); } setUpLayout(); } } } void OTabWidget::changeTab( QWidget *widget, const QString &iconset, const QString &label) { OTabInfo *currtab = tabs.first(); while ( currtab && currtab->control() != widget ) { currtab = tabs.next(); } if ( currtab && currtab->control() == widget ) { QTab *tab = tabBar->tab( currtab->id() ); QPixmap icon( loadSmooth( iconset ) ); tab->setText( label ); if ( tabBarStyle == IconTab ) tab->setIconSet( icon ); int i = 0; while ( i < tabList->count() && tabList->text( i ) != currtab->label() ) { i++; } if ( i < tabList->count() && tabList->text( i ) == currtab->label() ) { if ( tabBarStyle == IconTab || tabBarStyle == IconList ) { tabList->changeItem( icon, label, i ); } else { tabList->changeItem( label, i ); } } currtab->setLabel( label ); currtab->setIcon( iconset ); } setUpLayout(); } void OTabWidget::setCurrentTab( QWidget *childwidget ) { OTabInfo *currtab = tabs.first(); while ( currtab && currtab->control() != childwidget ) { currtab = tabs.next(); } if ( currtab && currtab->control() == childwidget ) { selectTab( currtab ); } } void OTabWidget::setCurrentTab( const QString &tabname ) { OTabInfo *newtab = tabs.first(); while ( newtab && newtab->label() != tabname ) { newtab = tabs.next(); } if ( newtab && newtab->label() == tabname ) { selectTab( newtab ); } } void OTabWidget::setCurrentTab(int tabindex) { OTabInfo *newtab = tabs.first(); while ( newtab && newtab->id() != tabindex ) { newtab = tabs.next(); } if ( newtab && newtab->id() == tabindex ) { selectTab( newtab ); } } OTabWidget::TabStyle OTabWidget::tabStyle() const { return tabBarStyle; } void OTabWidget::setTabStyle( TabStyle s ) { tabBarStyle = s; if ( tabBarStyle == TextTab || tabBarStyle == IconTab ) { QTab *currtab; for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) { currtab = tabBar->tab( tabinfo->id() ); if ( tabBarStyle == IconTab ) { currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); if ( tabinfo == currentTab ) currtab->setText( tabinfo->label() ); else currtab->setText( QString::null ); } else { currtab->iconset = 0x0; currtab->setText( tabinfo->label() ); } } tabBarStack->raiseWidget( tabBar ); } else if ( tabBarStyle == TextList || tabBarStyle == IconList ) { tabList->clear(); for ( OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() ) { if ( tabBarStyle == IconList ) { tabList->insertItem( loadSmooth( tabinfo->icon() ), tabinfo->label() ); } else { tabList->insertItem( tabinfo->label() ); } } tabBarStack->raiseWidget( tabList ); } setUpLayout(); } OTabWidget::TabPosition OTabWidget::tabPosition() const { return tabBarPosition; } void OTabWidget::setTabPosition( TabPosition p ) { tabBarPosition = p; if ( tabBarPosition == Top ) { tabBar->setShape( QTabBar::RoundedAbove ); } else { tabBar->setShape( QTabBar::RoundedBelow ); } setUpLayout(); } void OTabWidget::slotTabBarSelected( int id ) { OTabInfo *newtab = tabs.first(); while ( newtab && newtab->id() != id ) { newtab = tabs.next(); } if ( newtab && newtab->id() == id ) { selectTab( newtab ); } } void OTabWidget::slotTabListSelected( int index ) { OTabInfo *newtab = tabs.at( index ); if ( newtab ) { selectTab( newtab ); } } QPixmap OTabWidget::loadSmooth( const QString &name ) { QImage image = Resource::loadImage( name ); QPixmap pixmap; - pixmap.convertFromImage( image.smoothScale( 16, 16 ) ); + pixmap.convertFromImage( image.smoothScale( 14, 14 ) ); return pixmap; } void OTabWidget::selectTab( OTabInfo *tab ) { if ( tabBarStyle == IconTab ) { if ( currentTab ) { tabBar->tab( currentTab->id() )->setText( QString::null ); setUpLayout(); } tabBar->tab( tab->id() )->setText( tab->label() ); tabBar->setCurrentTab( tab->id() ); setUpLayout(); tabBar->update(); } else { tabBar->setCurrentTab( tab->id() ); } widgetStack->raiseWidget( tab->control() ); emit currentChanged( tab->control() ); currentTab = tab; } void OTabWidget::setUpLayout() { tabBar->layoutTabs(); QSize t( tabBarStack->sizeHint() ); if ( tabBarStyle == IconTab ) { if ( t.width() > width() ) t.setWidth( width() ); } else { t.setWidth( width() ); } int lw = widgetStack->lineWidth(); if ( tabBarPosition == Bottom ) { tabBarStack->setGeometry( QMAX(0, lw-2), height() - t.height() - lw, t.width(), t.height() ); widgetStack->setGeometry( 0, 0, width(), height()-t.height()+QMAX(0, lw-2) ); } else { tabBarStack->setGeometry( QMAX(0, lw-2), 0, t.width(), t.height() ); widgetStack->setGeometry( 0, t.height()-lw, width(), height()-t.height()+QMAX( 0, lw-2 ) ); } if ( autoMask() ) updateMask(); } QSize OTabWidget::sizeHint() const { QSize s( widgetStack->sizeHint() ); QSize t( tabBarStack->sizeHint() ); return QSize( QMAX( s.width(), t.width() ), s.height() + t.height() ); } void OTabWidget::resizeEvent( QResizeEvent * ) { setUpLayout(); } int OTabWidget::getCurrentTab() { if ( currentTab ) { return currentTab->id(); } return -1; } |