summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp14
-rw-r--r--noncore/apps/advancedfm/advancedfm.h4
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp11
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
@@ -13,13 +13,13 @@
#include "advancedfm.h"
// #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>
#include <qpe/config.h>
#include <qpe/mimetype.h>
@@ -215,16 +215,16 @@ void AdvancedFm::rePopulate()
{
int tmpTab = whichTab;
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)
{
if(selectedItem)
{
@@ -273,19 +273,19 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int )
break;
};
}
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()
{
Config cfg("AdvancedFm");
@@ -859,15 +859,15 @@ QListView * AdvancedFm::OtherView()
return Local_View;
}
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 );
QDataStream stream ( data, IO_ReadOnly );
if ( msg == "openDirectory(QString)" ) {
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
@@ -27,13 +27,13 @@
#include <qdir.h>
#include <qstring.h>
#include <qpoint.h>
#include <qtimer.h>
#include <qpixmap.h>
-class OTabWidget;
+class OSplitter;
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QComboBox;
class QListView;
class QListviewItem;
@@ -87,13 +87,13 @@ protected slots:
void mkSym();
void switchToLocalTab();
void switchToRemoteTab();
protected:
- OTabWidget *TabWidget;
+ OSplitter *TabWidget;
QCopChannel * channel;
QPixmap unknownXpm;
int whichTab;
// QTabWidget *TabWidget;
QWidget *tab, *tab_2, *tab_3;
QListView *Local_View, *Remote_View;
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
@@ -8,13 +8,13 @@
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (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>
#include <qpe/menubutton.h>
@@ -127,13 +127,13 @@ void AdvancedFm::init() {
currentPathCombo->setEditable(TRUE);
currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
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" );
tabLayout = new QGridLayout( tab );
tabLayout->setSpacing( 2);
@@ -150,13 +150,13 @@ void AdvancedFm::init() {
Local_View->setSelectionMode(QListView::Extended);
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 );
tabLayout_2->setSpacing( 2);
tabLayout_2->setMargin( 2);
@@ -173,13 +173,14 @@ 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 );
tabLayout_3->setSpacing( 2);
tabLayout_3->setMargin( 2);
@@ -229,13 +230,13 @@ void AdvancedFm::init() {
// b = TRUE;
filterStr="*";
b=FALSE;
showMenuHidden();
- TabWidget->setCurrentTab(0);
+ TabWidget->setCurrentWidget(0);
}
void AdvancedFm::initConnections()
{