summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.h1
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp10
2 files changed, 0 insertions, 11 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 42f3bc6..c25bce2 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -69,25 +69,24 @@ protected:
69 69
70 QLineEdit *currentPathEdit; 70 QLineEdit *currentPathEdit;
71 QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/; 71 QPopupMenu *fileMenu, *localMenu, *remoteMenu, *viewMenu /*, *customDirMenu*/;
72 QToolButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton; 72 QToolButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
73// QPushButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton; 73// QPushButton *homeButton, *docButton, *cdUpButton, *sdButton, *cfButton, *qpeDirButton;
74 QDir currentDir, currentRemoteDir; 74 QDir currentDir, currentRemoteDir;
75 QComboBox *currentPathCombo; 75 QComboBox *currentPathCombo;
76 QString filterStr, s_addBookmark, s_removeBookmark; 76 QString filterStr, s_addBookmark, s_removeBookmark;
77 QListViewItem * item; 77 QListViewItem * item;
78 bool b; 78 bool b;
79 QStringList fileSystemTypeList, fsList; 79 QStringList fileSystemTypeList, fsList;
80 int currentServerConfig; 80 int currentServerConfig;
81 bool zaurusDevice;
82 QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3; 81 QGridLayout *tabLayout, *tabLayout_2, *tabLayout_3;
83 QStringList remoteDirPathStringList, localDirPathStringList; 82 QStringList remoteDirPathStringList, localDirPathStringList;
84 QLineEdit *renameBox; 83 QLineEdit *renameBox;
85 84
86 void init(); 85 void init();
87 void initConnections(); 86 void initConnections();
88 void keyReleaseEvent( QKeyEvent *); 87 void keyReleaseEvent( QKeyEvent *);
89 void keyPressEvent( QKeyEvent *); 88 void keyPressEvent( QKeyEvent *);
90 QString getFileSystemType(const QString &); 89 QString getFileSystemType(const QString &);
91 QString getDiskSpace(const QString &); 90 QString getDiskSpace(const QString &);
92 void parsetab(const QString &fileName); 91 void parsetab(const QString &fileName);
93 QString checkDiskSpace(const QString &); 92 QString checkDiskSpace(const QString &);
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index eaf4f79..3664c75 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -206,46 +206,36 @@ void AdvancedFm::init() {
206 206
207 QListView *fileTree; 207 QListView *fileTree;
208 fileTree = new QListView( tab_3, "tree" ); 208 fileTree = new QListView( tab_3, "tree" );
209 209
210 210
211 tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 ); 211 tabLayout_3->addMultiCellWidget( fileTree, 0, 0, 0, 3 );
212 212
213 TabWidget->insertTab( tab_3, tr( "Remote" ) ); 213 TabWidget->insertTab( tab_3, tr( "Remote" ) );
214 */ 214 */
215 215
216 /////////////// 216 ///////////////
217 217
218 if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
219 zaurusDevice=TRUE;
220 else
221 zaurusDevice=FALSE;
222
223
224 if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) { 218 if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
225 odebug << "not have sd" << oendl;
226 sdButton->hide(); 219 sdButton->hide();
227 } 220 }
228 if( !StorageInfo::hasCf() ) { 221 if( !StorageInfo::hasCf() ) {
229 odebug << "not have cf" << oendl;
230 cfButton->hide(); 222 cfButton->hide();
231 } 223 }
232 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 224 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
233 currentDir.setPath( QDir::currentDirPath()); 225 currentDir.setPath( QDir::currentDirPath());
234 226
235 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); 227 currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
236 currentRemoteDir.setPath( QDir::currentDirPath()); 228 currentRemoteDir.setPath( QDir::currentDirPath());
237 229
238 // b = TRUE;
239
240 filterStr="*"; 230 filterStr="*";
241 showMenuHidden(); 231 showMenuHidden();
242 TabWidget->setCurrentWidget(0); 232 TabWidget->setCurrentWidget(0);
243 233
244} 234}
245 235
246void AdvancedFm::initConnections() 236void AdvancedFm::initConnections()
247{ 237{
248 238
249 connect(qApp,SIGNAL(aboutToQuit()),this,SLOT(cleanUp())); 239 connect(qApp,SIGNAL(aboutToQuit()),this,SLOT(cleanUp()));
250 connect(qpeDirButton,SIGNAL(released()),this,SLOT(QPEButtonPushed())); 240 connect(qpeDirButton,SIGNAL(released()),this,SLOT(QPEButtonPushed()));
251 connect(cfButton,SIGNAL(released()),this,SLOT(CFButtonPushed())); 241 connect(cfButton,SIGNAL(released()),this,SLOT(CFButtonPushed()));