IDE-856 Combine ECL files to a MOD file using right click menu in the…

… repository Signed-off-by: dehilsterlexis <david.dehilster@lexisnexis.com>
hpcc-systems · May 31, 2019 · 8c32185 · 8c32185
1 parent 52791aa
commit 8c32185
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 3 deletions.
diff --git a/eclide/RepositoryFrame.h b/eclide/RepositoryFrame.h
@@ -33,6 +33,7 @@ struct ContextState
     bool CanMoveAttribute;
     bool CanDeleteAttribute;
     bool CanLabel;
+    bool CanCombine;
 };
 
 template<typename T>
@@ -106,6 +107,7 @@ class CRepositoryFrameT :	public CRepositorySlotImpl,
         m.EnableMenuItem(ID_REPOSITORY_MOVEATTRIBUTE, state.CanMoveAttribute ? MF_ENABLED : MF_GRAYED);
         m.EnableMenuItem(ID_REPOSITORY_COPYATTRIBUTE, state.CanMoveAttribute ? MF_ENABLED : MF_GRAYED);
         m.EnableMenuItem(ID_REPOSITORY_DELETEATTRIBUTE, state.CanDeleteAttribute ? MF_ENABLED : MF_GRAYED);
+        m.EnableMenuItem(ID_FILE_CREATEMODFILE, state.CanCombine ? MF_ENABLED : MF_GRAYED);
         m.EnableMenuItem(ID_REPOSITORY_LABEL, state.CanLabel ? MF_ENABLED : MF_GRAYED);
         m.EnableMenuItem(ID_REPOSITORY_REFRESH, MF_ENABLED);
 
@@ -316,6 +318,9 @@ class CRepositoryFrameT :	public CRepositorySlotImpl,
         case ID_CHANGETYPELOCAL_SALT:
             pT->m_view.DoChangeAttributeType(s.attrs[0].get(), s.attrs[0]->GetLabel(), ATTRIBUTE_TYPE_SALT);
             break;
+        case ID_FILE_CREATEMODFILE:
+            pT->m_view.DoCreateModFile(s.attrs);
+            break;
         default:
             if (pick >= ID_REPOSITORY_INVOKE + 100)
             {
@@ -380,6 +385,7 @@ class CRepositoryFrameT :	public CRepositorySlotImpl,
 
         state.CanOpen = s.attrs.size() > 0;
         state.CanOpenBuilder = s.attrs.size() > 0;
+        state.CanCombine = s.attrs.size() > 1;
         state.CanOpenInExplorer = (s.mods.size() + s.attrs.size() == 1);
         state.CanPrint = false;
         state.CanCopy = s.mods.size() == 0 && s.attrs.size() > 0;

diff --git a/en_us/en_us.rc b/en_us/en_us.rc
@@ -1728,6 +1728,7 @@ BEGIN
         MENUITEM "Copy File",                   ID_REPOSITORY_COPYATTRIBUTE
         MENUITEM "Move File",                   ID_REPOSITORY_MOVEATTRIBUTE
         MENUITEM "Delete File\tDel",            ID_REPOSITORY_DELETEATTRIBUTE
+        MENUITEM "Create Mod File",             ID_FILE_CREATEMODFILE
         MENUITEM SEPARATOR
         MENUITEM "Refresh",                     ID_REPOSITORY_REFRESH
         MENUITEM "Collapse All",                ID_REPOSITORY_COLLAPSEALL

diff --git a/en_us/resource.h b/en_us/resource.h
@@ -819,6 +819,7 @@
 #define ID_GO_GENERATE                  33112
 #define ID_REPOSITORY_COLLAPSEALL       33113
 #define ID_ECL_HELP                     33114
+#define ID_FILE_CREATEMODFILE           33115
 #define ATL_IDS_IDLEMESSAGE             0xE001
 #define ATL_IDS_SCSIZE                  0xEF00
 #define ATL_IDS_SCMOVE                  0xEF01
@@ -847,7 +848,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        61414
-#define _APS_NEXT_COMMAND_VALUE         33115
+#define _APS_NEXT_COMMAND_VALUE         33116
 #define _APS_NEXT_CONTROL_VALUE         543
 #define _APS_NEXT_SYMED_VALUE           61503
 #endif

diff --git a/wlib/AttrListDlg.cpp b/wlib/AttrListDlg.cpp
@@ -367,8 +367,6 @@ std::istream& safeGetline(std::istream& is, std::string& t)
 
 IModule * DoConfirmImportDlg(HWND hwndParent, const boost::filesystem::path & path)
 {
-#define IMPORT_MARKER _T("//Import:")
-#define COMMENT_MARKER _T("//Comment:")
 	std::ifstream ifs(path.c_str());
 	if (ifs) {
 		AttrVector attrs;

diff --git a/wlib/AttrListDlg.h b/wlib/AttrListDlg.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#define IMPORT_MARKER _T("//Import:")
+#define COMMENT_MARKER _T("//Comment:")
+
 #include "wlib.h"
 #include <Repository.h> 
 #include <Workspace.h> 

diff --git a/wlib/RepositoryView.h b/wlib/RepositoryView.h
@@ -10,6 +10,7 @@
 #include "utilDateTime.h"
 #include <ModuleHelper.h>
 #include "AttrListDlg.h"
+#include "ModFileRepository.h"
 
 template<typename T>
 class CRepositoryViewT
@@ -453,6 +454,27 @@ class CRepositoryViewT
             }
         }
     }
+    void DoCreateModFile(IAttributeVector & attrs)
+    {
+        static const TCHAR szFilter[] = _T("Mod Files(*.mod)\0*.mod\0All Files (*.*)\0*.*\0\0");
+        T* pT = static_cast<T*>(this);
+        CFileDialogEx wndFileDialog(FALSE, _T(".mod"), _T("Unamed.mod"), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, szFilter, pT->m_hWnd);
+        if (IDOK == wndFileDialog.DoModal())
+        {
+            CUnicodeFile file;
+            if (file.Create(wndFileDialog.GetPathName()))
+            {
+                for (IAttributeVector::iterator itr = attrs.begin(); itr != attrs.end(); ++itr)
+                {
+                    file.Write(IMPORT_MARKER);
+                    file.Write(itr->get()->GetQualifiedLabel(true));
+                    file.Write(_T("\n"));
+                    file.Write(itr->get()->GetText());
+                }
+                file.Close();
+            }
+        }
+    }
     bool Select(const TCHAR* label, bool bExpand=false)
     {
         return TreeNode::Select(label, m_Root, bExpand);