-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 19 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 3 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 5 |
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 | |||
@@ -73,12 +73,10 @@ AdvancedFm::AdvancedFm( ) | |||
73 | init(); | 73 | init(); |
74 | renameBox = 0; | 74 | renameBox = 0; |
75 | 75 | ||
76 | initConnections(); | 76 | initConnections(); |
77 | TabWidget->setCurrentTab(1); | 77 | whichTab=1; |
78 | populateView(); | 78 | rePopulate(); |
79 | TabWidget->setCurrentTab(0); | ||
80 | populateView(); | ||
81 | currentPathCombo->setFocus(); | 79 | currentPathCombo->setFocus(); |
82 | } | 80 | } |
83 | 81 | ||
84 | AdvancedFm::~AdvancedFm() { | 82 | AdvancedFm::~AdvancedFm() { |
@@ -116,9 +114,8 @@ void AdvancedFm::tabChanged(QWidget *w) | |||
116 | 114 | ||
117 | setCaption("AdvancedFm :: "+fs+" :: " | 115 | setCaption("AdvancedFm :: "+fs+" :: " |
118 | +checkDiskSpace( (const QString &) path )+ " kB free" ); | 116 | +checkDiskSpace( (const QString &) path )+ " kB free" ); |
119 | chdir( path.latin1()); | 117 | chdir( path.latin1()); |
120 | //2populateView(); | ||
121 | } | 118 | } |
122 | 119 | ||
123 | 120 | ||
124 | void AdvancedFm::populateView() | 121 | void AdvancedFm::populateView() |
@@ -242,8 +239,20 @@ void AdvancedFm::populateView() | |||
242 | thisView->setSorting( 3,FALSE); | 239 | thisView->setSorting( 3,FALSE); |
243 | fillCombo( (const QString &) path ); | 240 | fillCombo( (const QString &) path ); |
244 | } | 241 | } |
245 | 242 | ||
243 | void AdvancedFm::rePopulate() | ||
244 | { | ||
245 | int tmpTab = whichTab; | ||
246 | qDebug("%d", tmpTab); | ||
247 | |||
248 | for(int i =1; i < 3; i++) | ||
249 | { | ||
250 | TabWidget->setCurrentTab(i - 1); | ||
251 | populateView(); | ||
252 | } | ||
253 | TabWidget->setCurrentTab( tmpTab - 1); | ||
254 | } | ||
246 | 255 | ||
247 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) | 256 | void AdvancedFm::ListClicked(QListViewItem *selectedItem) |
248 | { | 257 | { |
249 | if(selectedItem) | 258 | if(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 | |||
@@ -63,8 +63,9 @@ protected slots: | |||
63 | void mkDir(); | 63 | void mkDir(); |
64 | void del(); | 64 | void del(); |
65 | void rn(); | 65 | void rn(); |
66 | void populateView(); | 66 | void populateView(); |
67 | void rePopulate(); | ||
67 | void showHidden(); | 68 | void showHidden(); |
68 | void showMenuHidden(); | 69 | void showMenuHidden(); |
69 | void writeConfig(); | 70 | void writeConfig(); |
70 | void readConfig(); | 71 | void readConfig(); |
@@ -119,9 +120,9 @@ protected: | |||
119 | void parsetab(const QString &fileName); | 120 | void parsetab(const QString &fileName); |
120 | QString checkDiskSpace(const QString &); | 121 | QString checkDiskSpace(const QString &); |
121 | QString dealWithSymName(const QString &); | 122 | QString dealWithSymName(const QString &); |
122 | QDir *CurrentDir(); | 123 | QDir *CurrentDir(); |
123 | QDir *OtherDir(); | 124 | QDir *OtherDir(); |
124 | QListView *CurrentView(); | 125 | QListView *CurrentView(); |
125 | QListView *OtherView(); | 126 | QListView *OtherView(); |
126 | void setOtherTabCurrent(); | 127 | void setOtherTabCurrent(); |
127 | 128 | ||
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 | |||
@@ -67,10 +67,9 @@ void AdvancedFm::showMenuHidden() | |||
67 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 67 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 68 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
69 | // b=TRUE; | 69 | // b=TRUE; |
70 | } | 70 | } |
71 | populateView(); | 71 | rePopulate(); |
72 | // populateRemoteView(); | ||
73 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); | 72 | // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); |
74 | if(b) b = false; else b = true; | 73 | if(b) b = false; else b = true; |
75 | } | 74 | } |
76 | 75 | ||
@@ -90,9 +89,9 @@ void AdvancedFm::showHidden() | |||
90 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 89 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
91 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 90 | // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
92 | // b=TRUE; | 91 | // b=TRUE; |
93 | } | 92 | } |
94 | populateView(); | 93 | rePopulate(); |
95 | } | 94 | } |
96 | 95 | ||
97 | QString AdvancedFm::dealWithSymName(const QString &fileName) | 96 | QString AdvancedFm::dealWithSymName(const QString &fileName) |
98 | { | 97 | { |