-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 | |||
@@ -16,7 +16,7 @@ | |||
16 | // #include <opie/ofileselector.h> | 16 | // #include <opie/ofileselector.h> |
17 | // #include <opie/ofiledialog.h> | 17 | // #include <opie/ofiledialog.h> |
18 | 18 | ||
19 | #include <opie/otabwidget.h> | 19 | #include <opie/osplitter.h> |
20 | 20 | ||
21 | #include <qpe/filemanager.h> | 21 | #include <qpe/filemanager.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
@@ -218,10 +218,10 @@ void AdvancedFm::rePopulate() | |||
218 | 218 | ||
219 | for(int i =1; i < 3; i++) | 219 | for(int i =1; i < 3; i++) |
220 | { | 220 | { |
221 | TabWidget->setCurrentTab(i - 1); | 221 | TabWidget->setCurrentWidget(i - 1); |
222 | populateView(); | 222 | populateView(); |
223 | } | 223 | } |
224 | TabWidget->setCurrentTab( tmpTab - 1); | 224 | TabWidget->setCurrentWidget( tmpTab - 1); |
225 | } | 225 | } |
226 | 226 | ||
227 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) | 227 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) |
@@ -276,13 +276,13 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) | |||
276 | 276 | ||
277 | void AdvancedFm::switchToLocalTab() | 277 | void AdvancedFm::switchToLocalTab() |
278 | { | 278 | { |
279 | TabWidget->setCurrentTab(0); | 279 | TabWidget->setCurrentWidget(0); |
280 | Local_View->setFocus(); | 280 | Local_View->setFocus(); |
281 | } | 281 | } |
282 | 282 | ||
283 | void AdvancedFm::switchToRemoteTab() | 283 | void AdvancedFm::switchToRemoteTab() |
284 | { | 284 | { |
285 | TabWidget->setCurrentTab(1); | 285 | TabWidget->setCurrentWidget(1); |
286 | Remote_View->setFocus(); | 286 | Remote_View->setFocus(); |
287 | } | 287 | } |
288 | 288 | ||
@@ -862,9 +862,9 @@ QListView * AdvancedFm::OtherView() | |||
862 | void AdvancedFm::setOtherTabCurrent() | 862 | void AdvancedFm::setOtherTabCurrent() |
863 | { | 863 | { |
864 | if ( whichTab == 1) | 864 | if ( whichTab == 1) |
865 | TabWidget->setCurrentTab(1); | 865 | TabWidget->setCurrentWidget(1); |
866 | else | 866 | else |
867 | TabWidget->setCurrentTab(0); | 867 | TabWidget->setCurrentWidget(0); |
868 | } | 868 | } |
869 | 869 | ||
870 | void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { | 870 | void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { |
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 | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qpixmap.h> | 31 | #include <qpixmap.h> |
32 | 32 | ||
33 | class OTabWidget; | 33 | class OSplitter; |
34 | class QVBoxLayout; | 34 | class QVBoxLayout; |
35 | class QHBoxLayout; | 35 | class QHBoxLayout; |
36 | class QGridLayout; | 36 | class QGridLayout; |
@@ -90,7 +90,7 @@ protected slots: | |||
90 | 90 | ||
91 | protected: | 91 | protected: |
92 | 92 | ||
93 | OTabWidget *TabWidget; | 93 | OSplitter *TabWidget; |
94 | QCopChannel * channel; | 94 | QCopChannel * channel; |
95 | QPixmap unknownXpm; | 95 | QPixmap unknownXpm; |
96 | int whichTab; | 96 | int whichTab; |
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 | |||
@@ -11,7 +11,7 @@ | |||
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | 13 | ||
14 | #include <opie/otabwidget.h> | 14 | #include <opie/osplitter.h> |
15 | #include <qpe/storage.h> | 15 | #include <qpe/storage.h> |
16 | 16 | ||
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
@@ -130,7 +130,7 @@ void AdvancedFm::init() { | |||
130 | layout->addWidget( lineBox ); | 130 | layout->addWidget( lineBox ); |
131 | 131 | ||
132 | 132 | ||
133 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); | 133 | TabWidget = new OSplitter( Horizontal, this, "TabWidget" ); |
134 | // TabWidget = new QTabWidget( this, "TabWidget" ); | 134 | // TabWidget = new QTabWidget( this, "TabWidget" ); |
135 | layout->addWidget( TabWidget, 4 ); | 135 | layout->addWidget( TabWidget, 4 ); |
136 | 136 | ||
@@ -153,7 +153,7 @@ void AdvancedFm::init() { | |||
153 | 153 | ||
154 | tabLayout->addWidget( Local_View, 0, 0 ); | 154 | tabLayout->addWidget( Local_View, 0, 0 ); |
155 | 155 | ||
156 | TabWidget->addTab( tab,"advancedfm/smFileBrowser.png", tr("1")); | 156 | TabWidget->addWidget( tab,"advancedfm/smFileBrowser.png", tr("1")); |
157 | // TabWidget->insertTab( tab, tr("1")); | 157 | // TabWidget->insertTab( tab, tr("1")); |
158 | 158 | ||
159 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 159 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
@@ -176,7 +176,8 @@ void AdvancedFm::init() { | |||
176 | 176 | ||
177 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 177 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
178 | 178 | ||
179 | TabWidget->addTab( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); | 179 | TabWidget->addWidget( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); |
180 | TabWidget->setSizeChange( 370 ); | ||
180 | // TabWidget->insertTab( tab_2, tr( "2")); | 181 | // TabWidget->insertTab( tab_2, tr( "2")); |
181 | 182 | ||
182 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); | 183 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); |
@@ -232,7 +233,7 @@ void AdvancedFm::init() { | |||
232 | filterStr="*"; | 233 | filterStr="*"; |
233 | b=FALSE; | 234 | b=FALSE; |
234 | showMenuHidden(); | 235 | showMenuHidden(); |
235 | TabWidget->setCurrentTab(0); | 236 | TabWidget->setCurrentWidget(0); |
236 | 237 | ||
237 | } | 238 | } |
238 | 239 | ||