summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp19
-rw-r--r--noncore/apps/advancedfm/advancedfm.h3
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp5
3 files changed, 18 insertions, 9 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d56e746..bb7f346 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -74,10 +74,8 @@ AdvancedFm::AdvancedFm( )
renameBox = 0;
initConnections();
- TabWidget->setCurrentTab(1);
- populateView();
- TabWidget->setCurrentTab(0);
- populateView();
+ whichTab=1;
+ rePopulate();
currentPathCombo->setFocus();
}
@@ -117,7 +115,6 @@ void AdvancedFm::tabChanged(QWidget *w)
setCaption("AdvancedFm :: "+fs+" :: "
+checkDiskSpace( (const QString &) path )+ " kB free" );
chdir( path.latin1());
-//2 populateView();
}
@@ -243,6 +240,18 @@ void AdvancedFm::populateView()
fillCombo( (const QString &) path );
}
+void AdvancedFm::rePopulate()
+{
+ int tmpTab = whichTab;
+ qDebug("%d", tmpTab);
+
+ for(int i =1; i < 3; i++)
+ {
+ TabWidget->setCurrentTab(i - 1);
+ populateView();
+ }
+ TabWidget->setCurrentTab( tmpTab - 1);
+}
void AdvancedFm::ListClicked(QListViewItem *selectedItem)
{
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 024ab29..3250a66 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -64,6 +64,7 @@ protected slots:
void del();
void rn();
void populateView();
+ void rePopulate();
void showHidden();
void showMenuHidden();
void writeConfig();
@@ -120,7 +121,7 @@ protected:
QString checkDiskSpace(const QString &);
QString dealWithSymName(const QString &);
QDir *CurrentDir();
- QDir *OtherDir();
+ QDir *OtherDir();
QListView *CurrentView();
QListView *OtherView();
void setOtherTabCurrent();
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index f46503c..a82d69a 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -68,8 +68,7 @@ void AdvancedFm::showMenuHidden()
fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
// b=TRUE;
}
- populateView();
-// populateRemoteView();
+ rePopulate();
// if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true");
if(b) b = false; else b = true;
}
@@ -91,7 +90,7 @@ void AdvancedFm::showHidden()
// fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
// b=TRUE;
}
- populateView();
+ rePopulate();
}
QString AdvancedFm::dealWithSymName(const QString &fileName)