Diffstat (limited to 'noncore/apps/advancedfm/advancedfmData.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 619a7a9..7188640 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -8,24 +8,24 @@ | |||
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 <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
15 | #include <qpe/qpemenubar.h> | 16 | #include <qpe/qpemenubar.h> |
16 | #include <qpe/qpetoolbar.h> | 17 | #include <qpe/qpetoolbar.h> |
17 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
18 | 19 | ||
19 | #include <qlayout.h> | 20 | #include <qlayout.h> |
20 | #include <qpixmap.h> | 21 | #include <qpixmap.h> |
21 | #include <qcombobox.h> | 22 | #include <qcombobox.h> |
22 | #include <qpopupmenu.h> | 23 | #include <qpopupmenu.h> |
23 | #include <qtabwidget.h> | 24 | #include <qtabwidget.h> |
24 | #include <qtoolbutton.h> | 25 | #include <qtoolbutton.h> |
25 | #include <qtabwidget.h> | ||
26 | #include <qlineedit.h> | 26 | #include <qlineedit.h> |
27 | #include <qlistview.h> | 27 | #include <qlistview.h> |
28 | 28 | ||
29 | #include <sys/utsname.h> | 29 | #include <sys/utsname.h> |
30 | 30 | ||
31 | 31 | ||
@@ -105,13 +105,14 @@ void AdvancedFm::init() { | |||
105 | 105 | ||
106 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); | 106 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); |
107 | 107 | ||
108 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7); | 108 | layout->addMultiCellWidget( currentPathCombo, 1, 1, 0, 7); |
109 | 109 | ||
110 | 110 | ||
111 | TabWidget = new QTabWidget( this, "TabWidget" ); | 111 | TabWidget = new OTabWidget( this, "TabWidget",/* OTabWidget::Global | */OTabWidget::IconTab); |
112 | // TabWidget = new QTabWidget( this, "TabWidget" ); | ||
112 | layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7); | 113 | layout->addMultiCellWidget( TabWidget, 2, 2, 0, 7); |
113 | 114 | ||
114 | tab = new QWidget( TabWidget, "tab" ); | 115 | tab = new QWidget( TabWidget, "tab" ); |
115 | tabLayout = new QGridLayout( tab ); | 116 | tabLayout = new QGridLayout( tab ); |
116 | tabLayout->setSpacing( 2); | 117 | tabLayout->setSpacing( 2); |
117 | tabLayout->setMargin( 2); | 118 | tabLayout->setMargin( 2); |
@@ -127,13 +128,14 @@ void AdvancedFm::init() { | |||
127 | Local_View->setSelectionMode(QListView::Extended); | 128 | Local_View->setSelectionMode(QListView::Extended); |
128 | 129 | ||
129 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 130 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
130 | 131 | ||
131 | tabLayout->addWidget( Local_View, 0, 0 ); | 132 | tabLayout->addWidget( Local_View, 0, 0 ); |
132 | 133 | ||
133 | TabWidget->insertTab( tab, tr("1")); | 134 | TabWidget->addTab( tab,"advancedfm/smFileBrowser.png", tr("1")); |
135 | // TabWidget->insertTab( tab, tr("1")); | ||
134 | 136 | ||
135 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 137 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
136 | tabLayout_2 = new QGridLayout( tab_2 ); | 138 | tabLayout_2 = new QGridLayout( tab_2 ); |
137 | tabLayout_2->setSpacing( 2); | 139 | tabLayout_2->setSpacing( 2); |
138 | tabLayout_2->setMargin( 2); | 140 | tabLayout_2->setMargin( 2); |
139 | 141 | ||
@@ -149,14 +151,14 @@ void AdvancedFm::init() { | |||
149 | 151 | ||
150 | 152 | ||
151 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 153 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
152 | 154 | ||
153 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 155 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
154 | 156 | ||
155 | 157 | TabWidget->addTab( tab_2, "advancedfm/smFileBrowser.png",tr( "2")); | |
156 | TabWidget->insertTab( tab_2, tr( "2")); | 158 | // TabWidget->insertTab( tab_2, tr( "2")); |
157 | 159 | ||
158 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); | 160 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); |
159 | tabLayout_3 = new QGridLayout( tab_3 ); | 161 | tabLayout_3 = new QGridLayout( tab_3 ); |
160 | tabLayout_3->setSpacing( 2); | 162 | tabLayout_3->setSpacing( 2); |
161 | tabLayout_3->setMargin( 2); | 163 | tabLayout_3->setMargin( 2); |
162 | 164 | ||
@@ -196,13 +198,13 @@ void AdvancedFm::init() { | |||
196 | currentRemoteDir.setPath( QDir::currentDirPath()); | 198 | currentRemoteDir.setPath( QDir::currentDirPath()); |
197 | 199 | ||
198 | b = TRUE; | 200 | b = TRUE; |
199 | 201 | ||
200 | filterStr="*"; | 202 | filterStr="*"; |
201 | b=FALSE; | 203 | b=FALSE; |
202 | 204 | TabWidget->setCurrentTab(0); | |
203 | 205 | ||
204 | } | 206 | } |
205 | 207 | ||
206 | void AdvancedFm::initConnections() { | 208 | void AdvancedFm::initConnections() { |
207 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 209 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
208 | connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) ); | 210 | connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) ); |