-rw-r--r-- | libopie/otabwidget.cpp | 20 | ||||
-rw-r--r-- | libopie/otabwidget.h | 7 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 2 |
4 files changed, 15 insertions, 16 deletions
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp index a1fd2c0..05aafd4 100644 --- a/libopie/otabwidget.cpp +++ b/libopie/otabwidget.cpp @@ -57,49 +57,49 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi } else { p = Top; } } widgetStack = new QWidgetStack( this, "widgetstack" ); widgetStack->setFrameStyle( QFrame::NoFrame ); widgetStack->setLineWidth( style().defaultFrameWidth() ); tabBarStack = new QWidgetStack( this, "tabbarstack" ); tabBar = new OTabBar( tabBarStack, "tabbar" ); tabBarStack->addWidget( tabBar, 0 ); connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) ); tabList = new QComboBox( false, tabBarStack, "tablist" ); tabBarStack->addWidget( tabList, 1 ); connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) ); setTabStyle( s ); setTabPosition( p ); - currentTab= 0x0; + currTab= 0x0; } OTabWidget::~OTabWidget() { } void OTabWidget::addTab( QWidget *child, const QString &icon, const QString &label ) { QPixmap iconset = loadSmooth( icon ); QTab *tab = new QTab(); if ( tabBarStyle == IconTab ) { tab->label = QString::null; } else { tab->label = label; } if ( tabBarStyle == IconTab || tabBarStyle == IconList ) { tab->iconset = new QIconSet( iconset ); } int tabid = tabBar->addTab( tab ); @@ -126,50 +126,50 @@ void OTabWidget::removePage( QWidget *childwidget ) { if ( childwidget ) { OTabInfo *tab = tabs.first(); while ( tab && tab->control() != childwidget ) { tab = tabs.next(); } if ( tab && tab->control() == childwidget ) { tabBar->setTabEnabled( tab->id(), FALSE ); tabBar->removeTab( tabBar->tab( tab->id() ) ); 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 ) + currTab = tabs.current(); + if ( !currTab ) { 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; @@ -229,49 +229,49 @@ void OTabWidget::setCurrentTab(int tabindex) { 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 ) + if ( tabinfo == currTab ) 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() ); @@ -314,96 +314,96 @@ void OTabWidget::slotTabBarSelected( int id ) } } 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( 14, 14 ) ); return pixmap; } void OTabWidget::selectTab( OTabInfo *tab ) { if ( tabBarStyle == IconTab ) { - if ( currentTab ) + if ( currTab ) { - tabBar->tab( currentTab->id() )->setText( QString::null ); + tabBar->tab( currTab->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; + currTab = 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() +int OTabWidget::currentTab() { - if ( currentTab ) + if ( currTab ) { - return currentTab->id(); + return currTab->id(); } return -1; } diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index 23fe774..bcd9a85 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h @@ -174,66 +174,65 @@ public: /** * @fn setCurrentTab( const QString &tabname ) * @brief Selects and brings to top the desired widget, by using label. * * @param tabname Text label for widget to select. */ void setCurrentTab( const QString & ); /** * @fn setCurrentTab( int ) * @brief Selects and brings to top the desired widget, by using id. * * @param tab id for widget to select. */ void setCurrentTab(int); /** * @fn sizeHint() * @brief Reimplemented for internal purposes. */ QSize sizeHint() const; /** - * @fn getCurrentTab( ) + * @fn currentTab( ) * @brief returns current tab id. */ - //FIXME TT coding style currentTab() -zecke - int getCurrentTab(); + int currentTab(); protected: /** * @fn resizeEvent( QResizeEvent * ) * @brief Reimplemented for internal purposes. */ void resizeEvent( QResizeEvent * ); private: OTabInfoList tabs; - OTabInfo *currentTab; + OTabInfo *currTab; TabStyle tabBarStyle; TabPosition tabBarPosition; QWidgetStack *tabBarStack; OTabBar *tabBar; QComboBox *tabList; QWidgetStack *widgetStack; /** * @fn loadSmooth( const QString &name ) * @brief Loads icon for widget. * * @param name Name of icon image file. */ QPixmap loadSmooth( const QString & ); /** * @fn selectTab( OTabInfo *tab ) * @brief Internal function to select desired widget. * * @param tab Pointer to data for widget. */ diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 1a5e131..41e83c7 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -326,49 +326,49 @@ void AdvancedFm::readConfig() { Config cfg("AdvancedFm"); } void AdvancedFm::writeConfig() { Config cfg("AdvancedFm"); } void AdvancedFm::currentPathComboChanged() { if(QDir( currentPathCombo->lineEdit()->text()).exists()) { CurrentDir()->setPath( currentPathCombo->lineEdit()->text() ); populateView(); } else { QMessageBox::message(tr("Note"),tr("That directory does not exist")); } } void AdvancedFm::fillCombo(const QString ¤tPath) { -// qDebug("%d",TabWidget->getCurrentTab()); +// qDebug("%d",TabWidget->currentTab()); if ( whichTab == 1) { currentPathCombo->lineEdit()->setText( currentPath); if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() ) { currentPathCombo->clear(); localDirPathStringList.prepend( currentPath ); currentPathCombo->insertStringList( localDirPathStringList,-1); } } else { currentPathCombo->lineEdit()->setText( currentPath); if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) { currentPathCombo->clear(); remoteDirPathStringList.prepend( currentPath ); currentPathCombo->insertStringList( remoteDirPathStringList,-1); } } } void AdvancedFm::currentPathComboActivated(const QString & currentPath) { diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index eac13f6..93203cd 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -687,49 +687,49 @@ void AdvancedFm::doBeam() for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { QString curFile = CurrentDir()->canonicalPath()+"/"+(*it); if( curFile.right(1) == "/") { curFile = curFile.left( curFile.length() -1); } Ir *file = new Ir(this, "IR"); connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished( Ir * ))); file->send( curFile, curFile ); } } } } void AdvancedFm::fileBeamFinished( Ir *) { QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); } void AdvancedFm::selectAll() { -// if (TabWidget->getCurrentTab() == 0) { +// if (TabWidget->currentTab() == 0) { QListView *thisView = CurrentView(); thisView->selectAll(true); thisView->setSelected( thisView->firstChild(),false); // } else { // Remote_View->selectAll(true); // Remote_View->setSelected( Remote_View->firstChild(),false); // } } void AdvancedFm::startProcess(const QString & cmd) { QStringList command; OProcess *process; process = new OProcess(); connect(process, SIGNAL(processExited(OProcess *)), this, SLOT( processEnded(OProcess *))); connect(process, SIGNAL( receivedStderr(OProcess *, char *, int)), this, SLOT( oprocessStderr(OProcess *, char *, int))); command << "/bin/sh"; command << "-c"; command << cmd.latin1(); *process << command; |