From 0380dd734498fb49a79f03a1681e1174dc0c961a Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 22 Nov 2011 21:15:14 +0000
Subject: [PATCH] cody: moved unit dictionary menu item to src edit

git-svn-id: trunk@33700 -
---
 .../codetools/ide/codyidentifiersdlg.pas      |  2 +-
 components/codetools/ide/codyregistration.pas | 35 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/components/codetools/ide/codyidentifiersdlg.pas b/components/codetools/ide/codyidentifiersdlg.pas
index c2a0cc5269..0210bc5030 100644
--- a/components/codetools/ide/codyidentifiersdlg.pas
+++ b/components/codetools/ide/codyidentifiersdlg.pas
@@ -344,7 +344,7 @@ end;
 
 function TCodyUnitDictionary.GetFilename: string;
 begin
-  Result:=AppendPathDelim(LazarusIDE.GetPrimaryConfigPath)+'codyunitdictionary.gz';
+  Result:=AppendPathDelim(LazarusIDE.GetPrimaryConfigPath)+'codyunitdictionary.txt';
 end;
 
 function TCodyUnitDictionary.StartLoadSaveThread: boolean;
diff --git a/components/codetools/ide/codyregistration.pas b/components/codetools/ide/codyregistration.pas
index e395fe134b..18380247f1 100644
--- a/components/codetools/ide/codyregistration.pas
+++ b/components/codetools/ide/codyregistration.pas
@@ -77,6 +77,15 @@ begin
     raise Exception.Create('cody: command category '+CommandCategoryViewName+' not found');
 
 
+  // Project menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+  // show ppu list of project
+  PPUListCommand:=RegisterIDECommand(CmdCatProjectMenu, 'ShowPPUList',
+    crsShowUsedPpuFiles,
+    CleanIDEShortCut,CleanIDEShortCut,nil,@ShowPPUList);
+  RegisterIDEMenuCommand(itmProjectWindowSection,'PPUList',crsShowUsedPpuFiles,
+    nil,nil,PPUListCommand);
+
   // Source menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
   // insert file at cursor
@@ -86,13 +95,6 @@ begin
   RegisterIDEMenuCommand(SrcEditSubMenuSource,'InsertFileAtCursor',
     crsInsertFileAtCursor,nil,nil,InsertFileAtCursorCommand);
 
-  // show ppu list of project
-  PPUListCommand:=RegisterIDECommand(CmdCatProjectMenu, 'ShowPPUList',
-    crsShowUsedPpuFiles,
-    CleanIDEShortCut,CleanIDEShortCut,nil,@ShowPPUList);
-  RegisterIDEMenuCommand(itmProjectWindowSection,'PPUList',crsShowUsedPpuFiles,
-    nil,nil,PPUListCommand);
-
   // add call inherited
   AddCallInheritedCommand:=RegisterIDECommand(CmdCatCodeTools, 'AddCallInherited',
     crsAddCallInherited,
@@ -107,6 +109,14 @@ begin
   RegisterIDEMenuCommand(SrcEditSubMenuRefactor, 'DeclareVariable',
     crsDeclareVariable2, nil, nil, DeclareVariableCommand);
 
+  // Show unit / identifier dictionary
+  InitUnitDictionary;
+  ShowIdentifierDictionaryCommand:=RegisterIDECommand(CmdCatCodeTools, 'ShowUnitDictionary',
+    crsShowUnitIdentifierDictionary,
+    CleanIDEShortCut,CleanIDEShortCut,nil,@ShowUnitDictionaryDialog);
+  RegisterIDEMenuCommand(SrcEditSubMenuSource, 'ShowIdentifierDictionary',
+    crsShowUnitIdentifierDictionary, nil, nil, ShowIdentifierDictionaryCommand);
+
 
   // Refactor menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -153,14 +163,6 @@ begin
   RegisterIDEMenuCommand(itmViewIDEInternalsWindows, 'ShowCodeNodeInfo',
     crsShowCodeToolsNodeInfo, nil, nil, ShowCodeNodeInfoCommand);
 
-  // Show unit / identifier dictionary
-  InitUnitDictionary;
-  ShowIdentifierDictionaryCommand:=RegisterIDECommand(CmdCatCodeTools, 'ShowUnitDictionary',
-    crsShowUnitIdentifierDictionary,
-    CleanIDEShortCut,CleanIDEShortCut,nil,@ShowUnitDictionaryDialog);
-  RegisterIDEMenuCommand(itmViewIDEInternalsWindows, 'ShowIdentifierDictionary',
-    crsShowUnitIdentifierDictionary, nil, nil, ShowIdentifierDictionaryCommand);
-
   // View menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   ViewCodyWindowCommand:=RegisterIDECommand(CmdCatView, 'Cody',
     'Cody', CleanIDEShortCut, CleanIDEShortCut, nil, @ShowCodyWindow);
@@ -170,7 +172,6 @@ begin
    .Visible:=false
   {$ENDIF};
 
-
   // Components - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   TVIconRes:=LazarusResources.Find('TTreeView');
   LazarusResources.Add(TCodyTreeView.ClassName,TVIconRes.ValueType,TVIconRes.Value);
@@ -180,7 +181,7 @@ begin
   CodyWindowCreator:=IDEWindowCreators.Add(CodyWindowName,@CreateCodyWindow,nil,
     '80%','50%','+18%','+25%','CodeExplorer',alBottom);
 
-  // Options
+  // Options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   CodyMiscOptionID:=RegisterIDEOptionsEditor(GroupCodetools,
       TCodyMiscOptionsFrame,CodyMiscOptionID)^.Index;
   CodyOptions.Apply;