author | llornkcor <llornkcor> | 2004-09-25 06:51:24 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-09-25 06:51:24 (UTC) |
commit | 3d4aef2df9828aedccf5d576ecbc8aad6621362e (patch) (side-by-side diff) | |
tree | 435f8e3b658ef45d8e95d29a305d20c62e01c24e /noncore | |
parent | 448e2835ff7b84162022b62f8570935739a167bb (diff) | |
download | opie-3d4aef2df9828aedccf5d576ecbc8aad6621362e.zip opie-3d4aef2df9828aedccf5d576ecbc8aad6621362e.tar.gz opie-3d4aef2df9828aedccf5d576ecbc8aad6621362e.tar.bz2 |
not hardcoded path
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 41 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 1 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 2 |
3 files changed, 7 insertions, 37 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index ec7a08a..f1be471 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -12,8 +12,11 @@ #define DEVELOPERS_VERSION #include "advancedfm.h" #include <opie2/odebug.h> + +#include <opie2/ostorageinfo.h> + #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/mimetype.h> #include <qpe/applnk.h> @@ -209,26 +212,11 @@ void AdvancedFm::rePopulate() { // qDebug("repopulate views"); populateView(); setOtherTabCurrent(); populateView(); - -// int tmpTab = whichTab; -// // odebug << "" << tmpTab << "" << oendl; - -// for(int i =1; i < 3; i++) { -// TabWidget->setCurrentWidget(i - 1); -// populateView(); -// } -// TabWidget->setCurrentWidget( tmpTab - 1); } void AdvancedFm::ListClicked(QListViewItem *selectedItem) { -// if ( TabWidget->currentWidget() == tab) -// qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local"); -// else -// qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote"); - - if(selectedItem) { QString strItem=selectedItem->text(0); // owarn << strItem << oendl; QString strSize=selectedItem->text(1); @@ -276,9 +264,8 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in void AdvancedFm::refreshCurrentTab() { populateView(); // if ( TabWidget->currentWidget() == tab) { - } void AdvancedFm::switchToLocalTab() { TabWidget->setCurrentWidget(0); @@ -351,16 +338,15 @@ void AdvancedFm::docButtonPushed() { changeTo(QPEApplication::documentDir()); } void AdvancedFm::SDButtonPushed() { - changeTo("/mnt/card");// this can change so fix + Opie::Core::OStorageInfo info; + changeTo(info.sdPath()); } void AdvancedFm::CFButtonPushed() { - if(zaurusDevice) - changeTo("/mnt/cf"); //zaurus - else - changeTo("/mnt/hda"); //ipaq + Opie::Core::OStorageInfo info; + changeTo(info.cfPath()); } void AdvancedFm::QPEButtonPushed() { changeTo(QPEApplication::qpeDir()); @@ -769,24 +755,11 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) { } void AdvancedFm::setDocument(const QString &file) { changeTo( file); - } -void AdvancedFm::findFile(const QString &fileName) { - QFileInfo fi(fileName); - QListView *thisView = CurrentView(); - QListViewItemIterator it( thisView ); - for ( ; it.current(); ++it ) { - if(it.current()->text(0) == fi.fileName()) { - it.current()->setSelected(true); - thisView->ensureItemVisible(it.current()); - } - } -} - void AdvancedFm::slotSwitchMenu(int item) { Q_UNUSED(item); // qDebug( "Switch %d",item); // viewMenu->setItemChecked(item, true); diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index 6f7eb96..42f3bc6 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h @@ -176,9 +176,8 @@ private: void customDirsToMenu(); void addCustomDir(); void removeCustomDir(); void navigateToSelected(); - void findFile(const QString &); private slots: void processEnded(Opie::Core::OProcess *); void oprocessStderr(Opie::Core::OProcess *, char *, int); diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index 1047c5a..9be0ceb 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp @@ -55,10 +55,8 @@ void AdvancedFm::init() { cdUpButton->setPixmap(Resource::loadPixmap("up")); cdUpButton->setAutoRaise( true ); menuBar->insertItem( cdUpButton ); - - qpeDirButton= new QToolButton( 0,"QPEButton"); qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton"); qpeDirButton->setAutoRaise( true ); menuBar->insertItem( qpeDirButton ); |