Index: codestatexec.h
===================================================================
--- codestatexec.h    (revision 8065)
+++ codestatexec.h    (working copy)
@@ -15,23 +15,39 @@
 #include "language_def.h"
 
 class wxWindow;
+class wxProgressDialog;
 
 /** This class computes the statistics of the project's files and display them.
  *  @see CodeStat, CodeStatConfigDlg, CodeStatExecDlg, LanguageDef
  */
+
+class CodeStatCache;
+
 class CodeStatExecDlg : public wxScrollingDialog
 {
-    public:
-        CodeStatExecDlg(wxWindow* parent) : parent(parent){}
-        virtual ~CodeStatExecDlg();
-        int Execute(LanguageDef languages[NB_FILETYPES_MAX], int nb_languages);
-    private:
-      void EndModal(int retCode);
-      void CountLines(wxFileName filename, LanguageDef &language,
-                      long int &code_lines, long int &codecomments_lines,
-                      long int &comment_lines, long int &empty_lines, long int &total_lines);
-      void AnalyseLine(LanguageDef &language, wxString line, bool &comment, bool &code, bool &multi_line_comment);
-      wxWindow* parent;
+public:
+    CodeStatExecDlg(wxWindow* parent);
+    virtual ~CodeStatExecDlg();
+    int Execute(LanguageDef languages[NB_FILETYPES_MAX], int nb_languages);
+private:
+    void EndModal(int retCode);
+    void OnSelectProject(wxCommandEvent& evt);
+    void OnIdle(wxIdleEvent& evt);
+    void ParseProject(int index);
+    void DoParseProject(int index);
+    void DoParseWorkspace();
+    void UpdateProgress();
+    void ShowResults(int index);
+
+    wxWindow* m_parent;
+    wxChoice* m_choice;
+    wxProgressDialog* m_progress;
+    CodeStatCache* m_cache;
+    LanguageDef* m_languages;
+    int m_nb_languages;
+    int m_nb_files;
+    int m_current_file;
+    bool m_changed;
 };
 
 #endif // CODESTATEXEC_H
Index: resources/main_dialog.xrc
===================================================================
--- resources/main_dialog.xrc    (revision 8065)
+++ resources/main_dialog.xrc    (working copy)
@@ -1,199 +1,232 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc">
-  <object class="wxScrollingDialog" name="dlgCodeStatExec">
-    <title>Code Statistics</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxGridSizer">
-              <cols>2</cols>
-              <rows>2</rows>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Number of files:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="txt_num_files">
-                  <label>999999</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxALIGN_RIGHT</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Files skipped:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="txt_skipped_files">
-                  <label>999999</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxALIGN_RIGHT</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Files not found:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="txt_files_not_found">
-                  <label>999999</label>
-                  <style>wxALIGN_RIGHT</style>
-                </object>
-                <flag>wxALIGN_RIGHT</flag>
-              </object>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxGridSizer">
-              <cols>2</cols>
-              <rows>2</rows>
-              <object class="sizeritem">
-                <object class="wxGauge" name="Gauge_Code">
-                  <range>100</range>
-                  <size>-1,20</size>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>2</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="txt_Gauge_Code">
-                  <label>XXXX% Code only</label>
-                </object>
-                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxGauge" name="Gauge_Code_Comments">
-                  <ra
download for full patch...