-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 4 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 11 |
3 files changed, 15 insertions, 14 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index 77dca49..91318f1 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -15,9 +15,9 @@ // #include <opie/ofileselector.h> // #include <opie/ofiledialog.h> -#include <opie/otabwidget.h> +#include <opie/osplitter.h> #include <qpe/filemanager.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> @@ -217,12 +217,12 @@ void AdvancedFm::rePopulate() qDebug("%d", tmpTab); for(int i =1; i < 3; i++) { - TabWidget->setCurrentTab(i - 1); + TabWidget->setCurrentWidget(i - 1); populateView(); } - TabWidget->setCurrentTab( tmpTab - 1); + TabWidget->setCurrentWidget( tmpTab - 1); } void AdvancedFm::ListClicked(QListViewItem *selectedItem) { @@ -275,15 +275,15 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) } void AdvancedFm::switchToLocalTab() { - TabWidget->setCurrentTab(0); + TabWidget->setCurrentWidget(0); Local_View->setFocus(); } void AdvancedFm::switchToRemoteTab() { - TabWidget->setCurrentTab(1); + TabWidget->setCurrentWidget(1); Remote_View->setFocus(); } void AdvancedFm::readConfig() @@ -861,11 +861,11 @@ QListView * AdvancedFm::OtherView() void AdvancedFm::setOtherTabCurrent() { if ( whichTab == 1) - TabWidget->setCurrentTab(1); + TabWidget->setCurrentWidget(1); else - TabWidget->setCurrentTab(0); + TabWidget->setCurrentWidget(0); } void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { qDebug("qcop message "+msg ); diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index 94d7bd7..5e2c769 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h @@ -29,9 +29,9 @@ #include <qpoint.h> #include <qtimer.h> #include <qpixmap.h> -class OTabWidget; +class OSplitter; class QVBoxLayout; class QHBoxLayout; class QGridLayout; class QComboBox; @@ -89,9 +89,9 @@ protected slots: void switchToRemoteTab(); protected: - OTabWidget *TabWidget; + OSplitter *TabWidget; QCopChannel * channel; QPixmap unknownXpm; int whichTab; // QTabWidget *TabWidget; diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 45dc0c4..463b202 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp @@ -10,9 +10,9 @@ * (at your option) any later version. * ***************************************************************************/ #include "advancedfm.h" -#include <opie/otabwidget.h> +#include <opie/osplitter.h> #include <qpe/storage.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> @@ -129,9 +129,9 @@ void AdvancedFm::init() { layout->addWidget( lineBox ); - TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); + TabWidget = new OSplitter( Horizontal, this, "TabWidget" ); // TabWidget = new QTabWidget( this, "TabWidget" ); layout->addWidget( TabWidget, 4 ); tab = new QWidget( TabWidget, "tab" ); @@ -152,9 +152,9 @@ void AdvancedFm::init() { QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); tabLayout->addWidget( Local_View, 0, 0 ); - TabWidget->addTab( tab,"advancedfm/smFileBrowser.png", tr("1")); + TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1")); // TabWidget->insertTab( tab, tr("1")); tab_2 = new QWidget( TabWidget, "tab_2" ); tabLayout_2 = new QGridLayout( tab_2 ); @@ -175,9 +175,10 @@ void AdvancedFm::init() { QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); tabLayout_2->addWidget( Remote_View, 0, 0 ); - TabWidget->addTab( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); + TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); + TabWidget->setSizeChange( 370 ); // TabWidget->insertTab( tab_2, tr( "2")); /* tab_3 = new QWidget( TabWidget, "tab_3" ); tabLayout_3 = new QGridLayout( tab_3 ); @@ -231,9 +232,9 @@ void AdvancedFm::init() { filterStr="*"; b=FALSE; showMenuHidden(); - TabWidget->setCurrentTab(0); + TabWidget->setCurrentWidget(0); } void AdvancedFm::initConnections() |