author | llornkcor <llornkcor> | 2004-09-25 07:39:37 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 07:39:37 (UTC) |
commit | 946445e87ce74b8b28817ea63854054dbf165003 (patch) (unidiff) | |
tree | dba7e6837f362304eae498dcce25da5926381b33 /noncore | |
parent | b81695526ff68640b20fd4d1dfd6440bda35a520 (diff) | |
download | opie-946445e87ce74b8b28817ea63854054dbf165003.zip opie-946445e87ce74b8b28817ea63854054dbf165003.tar.gz opie-946445e87ce74b8b28817ea63854054dbf165003.tar.bz2 |
remove not needed bool
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 1 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 10 |
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 | |||
@@ -57,49 +57,48 @@ public: | |||
57 | static QString appName() { return QString::fromLatin1("advancedfm"); } | 57 | static QString appName() { return QString::fromLatin1("advancedfm"); } |
58 | AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0); | 58 | AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0); |
59 | ~AdvancedFm(); | 59 | ~AdvancedFm(); |
60 | protected: | 60 | protected: |
61 | 61 | ||
62 | Opie::Ui::OSplitter *TabWidget; | 62 | Opie::Ui::OSplitter *TabWidget; |
63 | QCopChannel * channel; | 63 | QCopChannel * channel; |
64 | QPixmap unknownXpm; | 64 | QPixmap unknownXpm; |
65 | int whichTab; | 65 | int whichTab; |
66 | // QTabWidget *TabWidget; | 66 | // QTabWidget *TabWidget; |
67 | QWidget *tab, *tab_2, *tab_3; | 67 | QWidget *tab, *tab_2, *tab_3; |
68 | QListView *Local_View, *Remote_View; | 68 | QListView *Local_View, *Remote_View; |
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 &); |
94 | QString dealWithSymName(const QString &); | 93 | QString dealWithSymName(const QString &); |
95 | QDir *CurrentDir(); | 94 | QDir *CurrentDir(); |
96 | QDir *OtherDir(); | 95 | QDir *OtherDir(); |
97 | QListView *CurrentView(); | 96 | QListView *CurrentView(); |
98 | QListView *OtherView(); | 97 | QListView *OtherView(); |
99 | void setOtherTabCurrent(); | 98 | void setOtherTabCurrent(); |
100 | void changeTo(const QString dir); | 99 | void changeTo(const QString dir); |
101 | 100 | ||
102 | //protected signals: | 101 | //protected signals: |
103 | // void newPath(QString); | 102 | // void newPath(QString); |
104 | 103 | ||
105 | protected slots: | 104 | protected slots: |
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 | |||
@@ -194,70 +194,60 @@ void AdvancedFm::init() { | |||
194 | 194 | ||
195 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); | 195 | /* tab_3 = new QWidget( TabWidget, "tab_3" ); |
196 | tabLayout_3 = new QGridLayout( tab_3 ); | 196 | tabLayout_3 = new QGridLayout( tab_3 ); |
197 | tabLayout_3->setSpacing( 2); | 197 | tabLayout_3->setSpacing( 2); |
198 | tabLayout_3->setMargin( 2); | 198 | tabLayout_3->setMargin( 2); |
199 | 199 | ||
200 | 200 | ||
201 | // OFileDialog fileDialog; | 201 | // OFileDialog fileDialog; |
202 | // fileDialog; | 202 | // fileDialog; |
203 | // fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy | 203 | // fileSelector = new FileSelector( "*",tab_3, "fileselector" , FALSE, FALSE); //buggy |
204 | // fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow"); | 204 | // fileDialog = new OFileDialog("bangalow", tab_3, 4, 2, "Bungalow"); |
205 | // OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/"); | 205 | // OFileSelector fileDialog = new OFileSelector( tab_3, 4, 2,"/"); |
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 | ||
246 | void AdvancedFm::initConnections() | 236 | void 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())); |
252 | connect(sdButton,SIGNAL(released()),this,SLOT(SDButtonPushed())); | 242 | connect(sdButton,SIGNAL(released()),this,SLOT(SDButtonPushed())); |
253 | connect(cdUpButton,SIGNAL(released()),this,SLOT(upDir())); | 243 | connect(cdUpButton,SIGNAL(released()),this,SLOT(upDir())); |
254 | connect(docButton,SIGNAL(released()),this,SLOT(docButtonPushed())); | 244 | connect(docButton,SIGNAL(released()),this,SLOT(docButtonPushed())); |
255 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed())); | 245 | connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed())); |
256 | connect(currentPathCombo,SIGNAL(activated(const QString&)),this,SLOT(changeTo(const QString&))); | 246 | connect(currentPathCombo,SIGNAL(activated(const QString&)),this,SLOT(changeTo(const QString&))); |
257 | 247 | ||
258 | connect(currentPathCombo->lineEdit(),SIGNAL(returnPressed()),this,SLOT(currentPathComboChanged())); | 248 | connect(currentPathCombo->lineEdit(),SIGNAL(returnPressed()),this,SLOT(currentPathComboChanged())); |
259 | 249 | ||
260 | connect(Local_View,SIGNAL(clicked(QListViewItem*)),this,SLOT( ListClicked(QListViewItem*))); | 250 | connect(Local_View,SIGNAL(clicked(QListViewItem*)),this,SLOT( ListClicked(QListViewItem*))); |
261 | 251 | ||
262 | connect(Local_View,SIGNAL(mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) ); | 252 | connect(Local_View,SIGNAL(mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),this,SLOT( ListPressed(int,QListViewItem*,const QPoint&,int)) ); |
263 | 253 | ||