author | zecke <zecke> | 2003-09-01 16:33:33 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-09-01 16:33:33 (UTC) |
commit | aa1be5c49b77368999f068222f5f4e1f0d1ace0d (patch) (unidiff) | |
tree | 63f4283d3e68e6b4c1d0a81dd306276813c1a0c8 /noncore/apps | |
parent | 4e7703b3055562d93dc2d993f47888a3538429d2 (diff) | |
download | opie-aa1be5c49b77368999f068222f5f4e1f0d1ace0d.zip opie-aa1be5c49b77368999f068222f5f4e1f0d1ace0d.tar.gz opie-aa1be5c49b77368999f068222f5f4e1f0d1ace0d.tar.bz2 |
port to OSplitter but QComboBox is a sucker
-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 | |||
@@ -13,13 +13,13 @@ | |||
13 | #include "advancedfm.h" | 13 | #include "advancedfm.h" |
14 | 14 | ||
15 | 15 | ||
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> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qpe/mimetype.h> | 25 | #include <qpe/mimetype.h> |
@@ -215,16 +215,16 @@ void AdvancedFm::rePopulate() | |||
215 | { | 215 | { |
216 | int tmpTab = whichTab; | 216 | int tmpTab = whichTab; |
217 | qDebug("%d", tmpTab); | 217 | qDebug("%d", tmpTab); |
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) |
228 | { | 228 | { |
229 | if(selectedItem) | 229 | if(selectedItem) |
230 | { | 230 | { |
@@ -273,19 +273,19 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int ) | |||
273 | break; | 273 | break; |
274 | }; | 274 | }; |
275 | } | 275 | } |
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 | ||
289 | void AdvancedFm::readConfig() | 289 | void AdvancedFm::readConfig() |
290 | { | 290 | { |
291 | Config cfg("AdvancedFm"); | 291 | Config cfg("AdvancedFm"); |
@@ -859,15 +859,15 @@ QListView * AdvancedFm::OtherView() | |||
859 | return Local_View; | 859 | return Local_View; |
860 | } | 860 | } |
861 | 861 | ||
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) { |
871 | qDebug("qcop message "+msg ); | 871 | qDebug("qcop message "+msg ); |
872 | QDataStream stream ( data, IO_ReadOnly ); | 872 | QDataStream stream ( data, IO_ReadOnly ); |
873 | if ( msg == "openDirectory(QString)" ) { | 873 | 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 @@ | |||
27 | #include <qdir.h> | 27 | #include <qdir.h> |
28 | #include <qstring.h> | 28 | #include <qstring.h> |
29 | #include <qpoint.h> | 29 | #include <qpoint.h> |
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; |
37 | class QComboBox; | 37 | class QComboBox; |
38 | class QListView; | 38 | class QListView; |
39 | class QListviewItem; | 39 | class QListviewItem; |
@@ -87,13 +87,13 @@ protected slots: | |||
87 | void mkSym(); | 87 | void mkSym(); |
88 | void switchToLocalTab(); | 88 | void switchToLocalTab(); |
89 | void switchToRemoteTab(); | 89 | void switchToRemoteTab(); |
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; |
97 | // QTabWidget *TabWidget; | 97 | // QTabWidget *TabWidget; |
98 | QWidget *tab, *tab_2, *tab_3; | 98 | QWidget *tab, *tab_2, *tab_3; |
99 | QListView *Local_View, *Remote_View; | 99 | 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 @@ | |||
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
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> |
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | #include <qpe/menubutton.h> | 19 | #include <qpe/menubutton.h> |
20 | 20 | ||
@@ -127,13 +127,13 @@ void AdvancedFm::init() { | |||
127 | currentPathCombo->setEditable(TRUE); | 127 | currentPathCombo->setEditable(TRUE); |
128 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 128 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
129 | 129 | ||
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 | ||
137 | tab = new QWidget( TabWidget, "tab" ); | 137 | tab = new QWidget( TabWidget, "tab" ); |
138 | tabLayout = new QGridLayout( tab ); | 138 | tabLayout = new QGridLayout( tab ); |
139 | tabLayout->setSpacing( 2); | 139 | tabLayout->setSpacing( 2); |
@@ -150,13 +150,13 @@ void AdvancedFm::init() { | |||
150 | Local_View->setSelectionMode(QListView::Extended); | 150 | Local_View->setSelectionMode(QListView::Extended); |
151 | 151 | ||
152 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 152 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
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" ); |
160 | tabLayout_2 = new QGridLayout( tab_2 ); | 160 | tabLayout_2 = new QGridLayout( tab_2 ); |
161 | tabLayout_2->setSpacing( 2); | 161 | tabLayout_2->setSpacing( 2); |
162 | tabLayout_2->setMargin( 2); | 162 | tabLayout_2->setMargin( 2); |
@@ -173,13 +173,14 @@ void AdvancedFm::init() { | |||
173 | 173 | ||
174 | 174 | ||
175 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 175 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
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" ); |
183 | tabLayout_3 = new QGridLayout( tab_3 ); | 184 | tabLayout_3 = new QGridLayout( tab_3 ); |
184 | tabLayout_3->setSpacing( 2); | 185 | tabLayout_3->setSpacing( 2); |
185 | tabLayout_3->setMargin( 2); | 186 | tabLayout_3->setMargin( 2); |
@@ -229,13 +230,13 @@ void AdvancedFm::init() { | |||
229 | 230 | ||
230 | // b = TRUE; | 231 | // b = TRUE; |
231 | 232 | ||
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 | ||
239 | void AdvancedFm::initConnections() | 240 | void AdvancedFm::initConnections() |
240 | { | 241 | { |
241 | 242 | ||