diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-06-02 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:59 +0300 |
commit | 829409452d85cd6dd9dfc9151f109d6e13a2bb1c (patch) | |
tree | e0acaea47044d167f35fa197584dee1bde41c329 /CPP/7zip/UI/FileManager/MyLoadMenu.cpp | |
parent | 8874e4fbc9faabdcff719b9b2ac8ebad4f282bbe (diff) |
9.04 beta
Diffstat (limited to 'CPP/7zip/UI/FileManager/MyLoadMenu.cpp')
-rwxr-xr-x | CPP/7zip/UI/FileManager/MyLoadMenu.cpp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/CPP/7zip/UI/FileManager/MyLoadMenu.cpp b/CPP/7zip/UI/FileManager/MyLoadMenu.cpp index c6f57f9e..f98325a0 100755 --- a/CPP/7zip/UI/FileManager/MyLoadMenu.cpp +++ b/CPP/7zip/UI/FileManager/MyLoadMenu.cpp @@ -1,23 +1,20 @@ -// MyLoadMenu +// MyLoadMenu.cpp #include "StdAfx.h" -#include "Common/StringConvert.h" - #include "Windows/Menu.h" -#include "Windows/Error.h" -#include "Windows/Clipboard.h" #include "../../PropID.h" -#include "resource.h" -#include "App.h" -#include "AboutDialog.h" #include "../Common/CompressCall.h" +#include "AboutDialog.h" +#include "App.h" #include "HelpUtils.h" #include "LangUtils.h" -#include "PluginInterface.h" +#include "RegistryUtils.h" + +#include "resource.h" static const UINT kOpenBookmarkMenuID = 730; static const UINT kSetBookmarkMenuID = 740; @@ -428,6 +425,9 @@ void LoadFileMenu(HMENU hMenu, int startPos, bool programMenu, CMenu destMenu; destMenu.Attach(hMenu); + + UString diffPath; + ReadRegDiff(diffPath); for (int i = 0; i < g_FileMenu.GetItemCount(); i++) { @@ -440,6 +440,10 @@ void LoadFileMenu(HMENU hMenu, int startPos, bool programMenu, if (!programMenu) if (item.wID == IDCLOSE) continue; + + if (item.wID == IDM_FILE_DIFF && diffPath.IsEmpty()) + continue; + bool isOneFsFile = (isFsFolder && numItems == 1 && allAreFiles); if ((item.wID == IDM_FILE_SPLIT || item.wID == IDM_FILE_COMBINE) && !isOneFsFile) item.fState |= MFS_DISABLED; @@ -522,6 +526,9 @@ bool ExecuteFileCommand(int id) case IDM_FILE_CRC: g_App.CalculateCrc(); break; + case IDM_FILE_DIFF: + g_App.DiffFiles(); + break; case IDM_FILE_SPLIT: g_App.Split(); break; |