summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp34
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp18
2 files changed, 26 insertions, 26 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index fc6c3bf..d56e746 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -286,7 +286,6 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *, const QPoint& , int )
{
cancelRename();
}
-
}
break;
case 2:
@@ -367,17 +366,17 @@ QStringList AdvancedFm::getPath()
{
QStringList strList;
QListView *thisView=CurrentView();
- QList<QListViewItem> * getSelectedItems( QListView * thisView );
- QListViewItemIterator it( thisView );
- for ( ; it.current(); ++it )
- {
- if ( it.current()->isSelected() )
- {
- strList << it.current()->text(0);
+ QList<QListViewItem> * getSelectedItems( QListView * thisView );
+ QListViewItemIterator it( thisView );
+ for ( ; it.current(); ++it )
+ {
+ if ( it.current()->isSelected() )
+ {
+ strList << it.current()->text(0);
// qDebug(it.current()->text(0));
- }
- }
- return strList;
+ }
+ }
+ return strList;
}
void AdvancedFm::homeButtonPushed()
@@ -393,9 +392,8 @@ void AdvancedFm::docButtonPushed()
{
QString current = QPEApplication::documentDir();
chdir( current.latin1() );
-
- CurrentDir()->cd( current, TRUE);
- populateView();
+ CurrentDir()->cd( current, TRUE);
+ populateView();
update();
}
@@ -403,8 +401,8 @@ void AdvancedFm::SDButtonPushed()
{
QString current = "/mnt/card";// this can change so fix
chdir( current.latin1() );
- CurrentDir()->cd( current, TRUE);
- populateView();
+ CurrentDir()->cd( current, TRUE);
+ populateView();
update();
}
@@ -415,7 +413,6 @@ void AdvancedFm::CFButtonPushed()
current= "/mnt/cf"; //zaurus
else
current = "/mnt/hda"; //ipaq
-
chdir( current.latin1() );
CurrentDir()->cd( current, TRUE);
populateView();
@@ -787,7 +784,8 @@ void AdvancedFm::removeCustomDir()
//first remove list
if(list.grep(dir,true).isEmpty())
{
- QMessageBox::message("AdvancedFm",tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!"));
+ QMessageBox::message("AdvancedFm",
+ tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!!"));
}
else
{
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index c553017..062a013 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -55,19 +55,19 @@ void AdvancedFm::showMenuHidden()
{
if (b)
{
- currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
- currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
- fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
+ CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+ OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+ fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
// b=FALSE;
- }
+ }
else
{
- currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
- currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
- fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
+ CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+ OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+ fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
// b=TRUE;
- }
+ }
populateView();
// populateRemoteView();
// if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true");
@@ -79,6 +79,7 @@ void AdvancedFm::showHidden()
if (b)
{
CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+ OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
// fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
// b=FALSE;
@@ -86,6 +87,7 @@ void AdvancedFm::showHidden()
else
{
CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+s OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
// fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
// b=TRUE;
}