1 files changed, 47 insertions, 8 deletions

diff --git a/CPP/7zip/UI/FileManager/App.h b/CPP/7zip/UI/FileManager/App.h
index 2af63b47..c775cc2e 100755..100644
--- a/CPP/7zip/UI/FileManager/App.h
+++ b/CPP/7zip/UI/FileManager/App.h
@@ -3,8 +3,8 @@
 #ifndef __APP_H
 #define __APP_H
 
-#include "Windows/Control/CommandBar.h"
-#include "Windows/Control/ImageList.h"
+#include "../../../Windows/Control/CommandBar.h"
+#include "../../../Windows/Control/ImageList.h"
 
 #include "AppState.h"
 #include "Panel.h"
@@ -18,11 +18,15 @@ const int kNumPanelsMax = 2;
 
 extern bool g_IsSmallScreen;
 
+const int kMenuCmdID_Plugin_Start = 1000; // must be large them context menu IDs
+const int kMenuCmdID_Toolbar_Start = 1500;
+
 enum
 {
-  kAddCommand = kToolbarStartID,
-  kExtractCommand,
-  kTestCommand
+  kMenuCmdID_Toolbar_Add = kMenuCmdID_Toolbar_Start,
+  kMenuCmdID_Toolbar_Extract,
+  kMenuCmdID_Toolbar_Test,
+  kMenuCmdID_Toolbar_End
 };
 
 class CPanelCallbackImp: public CPanelCallback
@@ -106,6 +110,7 @@ class CApp
 public:
   NWindows::CWindow _window;
   bool ShowSystemMenu;
+  // bool ShowDeletedFiles;
   int NumPanels;
   int LastFocusedPanel;
 
@@ -129,7 +134,15 @@ public:
   CDropTarget *_dropTargetSpec;
   CMyComPtr<IDropTarget> _dropTarget;
 
-  CApp(): _window(0), NumPanels(2), LastFocusedPanel(0) {}
+  UString LangString_N_SELECTED_ITEMS;
+  
+  void ReloadLang();
+
+  CApp(): _window(0), NumPanels(2), LastFocusedPanel(0),
+    AutoRefresh_Mode(true)
+  {
+    SetPanels_AutoRefresh_Mode();
+  }
 
   void CreateDragTarget()
   {
@@ -177,17 +190,21 @@ public:
   void OpenItem() { GetFocusedPanel().OpenSelectedItems(true); }
   void OpenItemInside() { GetFocusedPanel().OpenFocusedItemAsInternal(); }
   void OpenItemOutside() { GetFocusedPanel().OpenSelectedItems(false); }
-  void EditItem() { GetFocusedPanel().EditItem(); }
+  void EditItem(bool useEditor) { GetFocusedPanel().EditItem(useEditor); }
   void Rename() { GetFocusedPanel().RenameFile(); }
   void CopyTo() { OnCopy(false, false, GetFocusedPanelIndex()); }
   void MoveTo() { OnCopy(true, false, GetFocusedPanelIndex()); }
   void Delete(bool toRecycleBin) { GetFocusedPanel().DeleteItems(toRecycleBin); }
-  void CalculateCrc();
+  void CalculateCrc(const UString &methodName);
   void DiffFiles();
   void Split();
   void Combine();
   void Properties() { GetFocusedPanel().Properties(); }
   void Comment() { GetFocusedPanel().ChangeComment(); }
+  
+  #ifndef UNDER_CE
+  void Link();
+  #endif
 
   void CreateFolder() { GetFocusedPanel().CreateFolder(); }
   void CreateFile() { GetFocusedPanel().CreateFile(); }
@@ -241,8 +258,30 @@ public:
   void SetListSettings();
   void SetShowSystemMenu();
   HRESULT SwitchOnOffOnePanel();
+  
   bool GetFlatMode() { return Panels[LastFocusedPanel].GetFlatMode(); }
+  // bool Get_ShowNtfsStrems_Mode() { return Panels[LastFocusedPanel].Get_ShowNtfsStrems_Mode(); }
+  
   void ChangeFlatMode() { Panels[LastFocusedPanel].ChangeFlatMode(); }
+  // void Change_ShowNtfsStrems_Mode() { Panels[LastFocusedPanel].Change_ShowNtfsStrems_Mode(); }
+  // void Change_ShowDeleted() { ShowDeletedFiles = !ShowDeletedFiles; }
+
+  bool AutoRefresh_Mode;
+  bool Get_AutoRefresh_Mode()
+  {
+    // return Panels[LastFocusedPanel].Get_ShowNtfsStrems_Mode();
+    return AutoRefresh_Mode;
+  }
+  void Change_AutoRefresh_Mode()
+  {
+    AutoRefresh_Mode = !AutoRefresh_Mode;
+    SetPanels_AutoRefresh_Mode();
+  }
+  void SetPanels_AutoRefresh_Mode()
+  {
+    for (int i = 0; i < kNumPanelsMax; i++)
+      Panels[i].Set_AutoRefresh_Mode(AutoRefresh_Mode);
+  }
 
   void OpenBookmark(int index) { GetFocusedPanel().OpenBookmark(index); }
   void SetBookmark(int index) { GetFocusedPanel().SetBookmark(index); }