docview: removed second constants unit - we only need one

6 files changed, 39 insertions, 70 deletions

diff --git a/docview/src/HelpTopic.pas b/docview/src/HelpTopic.pas
index 5a8245a7..a9b981f1 100644
--- a/docview/src/HelpTopic.pas
+++ b/docview/src/HelpTopic.pas
@@ -231,7 +231,7 @@ implementation
 
 uses
   SysUtils
-  ,NewViewConstantsUnit
+  ,dvConstants
   ,nvUtilities
   ,ACLStringUtility
   ,SettingsUnit
diff --git a/docview/src/NewViewConstantsUnit.pas b/docview/src/NewViewConstantsUnit.pas
deleted file mode 100644
index 2aed1cd0..00000000
--- a/docview/src/NewViewConstantsUnit.pas
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    fpGUI  -  Free Pascal GUI Toolkit
-
-    Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this
-    distribution, for details of the copyright.
-
-    See the file COPYING.modifiedLGPL, included in this distribution,
-    for details about redistributing fpGUI.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-    Description:
-      Common used constants for DocView
-}
-unit NewViewConstantsUnit;
-
-{$mode objfpc}{$H+}
-
-interface
-
-const
-  PARAM_LINK_NOTE = 'note';
-  PARAM_LINK_PROGRAM = 'program';
-  PARAM_LINK_URL = 'url';
-  PARAM_LINK_EXTERNAL = 'external';
-
-  PRGM_EXPLORER = 'explore'; // web explorer
-  PRGM_NETSCAPE = 'netscape';
-  PRGM_MOZILLA = 'mozilla';
-  PRGM_FIREFOX = 'firefox';
-
-
-implementation
-
-end.
diff --git a/docview/src/docview.lpi b/docview/src/docview.lpi
index 30c8e7ff..a9faf321 100644
--- a/docview/src/docview.lpi
+++ b/docview/src/docview.lpi
@@ -31,7 +31,7 @@
         <PackageName Value="fpgui_toolkit"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="36">
+    <Units Count="35">
       <Unit0>
         <Filename Value="docview.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -132,80 +132,75 @@
         <UnitName Value="HelpWindowDimensions"/>
       </Unit19>
       <Unit20>
-        <Filename Value="NewViewConstantsUnit.pas"/>
+        <Filename Value="SettingsUnit.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="NewViewConstantsUnit"/>
+        <UnitName Value="SettingsUnit"/>
       </Unit20>
       <Unit21>
-        <Filename Value="SettingsUnit.pas"/>
+        <Filename Value="dvconstants.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="SettingsUnit"/>
+        <UnitName Value="dvConstants"/>
       </Unit21>
       <Unit22>
-        <Filename Value="dvconstants.pas"/>
+        <Filename Value="dvHelpers.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="dvConstants"/>
+        <UnitName Value="dvHelpers"/>
       </Unit22>
       <Unit23>
-        <Filename Value="dvHelpers.pas"/>
+        <Filename Value="HelpWindow.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="dvHelpers"/>
+        <UnitName Value="HelpWindow"/>
       </Unit23>
       <Unit24>
-        <Filename Value="HelpWindow.pas"/>
+        <Filename Value="../TODO.txt"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="HelpWindow"/>
       </Unit24>
       <Unit25>
-        <Filename Value="../TODO.txt"/>
+        <Filename Value="frm_configuration.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="frm_configuration"/>
       </Unit25>
       <Unit26>
-        <Filename Value="frm_configuration.pas"/>
+        <Filename Value="arrows.inc"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="frm_configuration"/>
       </Unit26>
       <Unit27>
-        <Filename Value="arrows.inc"/>
+        <Filename Value="HelpBitmap.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="HelpBitmap"/>
       </Unit27>
       <Unit28>
-        <Filename Value="HelpBitmap.pas"/>
+        <Filename Value="missing.inc"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="HelpBitmap"/>
       </Unit28>
       <Unit29>
-        <Filename Value="missing.inc"/>
+        <Filename Value="frm_text.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="frm_text"/>
       </Unit29>
       <Unit30>
-        <Filename Value="frm_text.pas"/>
+        <Filename Value="docview.rc"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="frm_text"/>
       </Unit30>
       <Unit31>
-        <Filename Value="docview.rc"/>
+        <Filename Value="../docs/docview.ipf"/>
         <IsPartOfProject Value="True"/>
       </Unit31>
       <Unit32>
-        <Filename Value="../docs/docview.ipf"/>
-        <IsPartOfProject Value="True"/>
-      </Unit32>
-      <Unit33>
         <Filename Value="frm_note.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="frm_note"/>
-      </Unit33>
-      <Unit34>
+      </Unit32>
+      <Unit33>
         <Filename Value="HelpNote.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="HelpNote"/>
-      </Unit34>
-      <Unit35>
+      </Unit33>
+      <Unit34>
         <Filename Value="HelpBookmark.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="HelpBookmark"/>
-      </Unit35>
+      </Unit34>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/docview/src/docview.lpr b/docview/src/docview.lpr
index e49aa4c3..17f53a71 100644
--- a/docview/src/docview.lpr
+++ b/docview/src/docview.lpr
@@ -9,7 +9,7 @@ uses
   {$ENDIF}{$ENDIF}
   Classes, fpg_main, frm_main, IPFEscapeCodes, HelpTopic, CompareWordUnit, SearchTable,
   TextSearchQuery, nvUtilities, HelpFile, SearchUnit, fpg_cmdlineparams,
-  IPFFileFormatUnit, HelpWindowDimensions, NewViewConstantsUnit, SettingsUnit,
+  IPFFileFormatUnit, HelpWindowDimensions, SettingsUnit,
   RichTextStyleUnit, CanvasFontManager, ACLStringUtility, RichTextDocumentUnit,
   RichTextView, RichTextLayoutUnit, RichTextDisplayUnit, dvconstants, dvHelpers,
   frm_configuration, HelpBitmap, frm_text, frm_note, HelpNote, HelpBookmark;
diff --git a/docview/src/dvconstants.pas b/docview/src/dvconstants.pas
index 9e0073be..cbff4ad7 100644
--- a/docview/src/dvconstants.pas
+++ b/docview/src/dvconstants.pas
@@ -60,6 +60,18 @@ const
   hcConfigGeneralTab               = 510;
   hcConfigFontsColorTab            = 520;
 
+const
+  PARAM_LINK_NOTE = 'note';
+  PARAM_LINK_PROGRAM = 'program';
+  PARAM_LINK_URL = 'url';
+  PARAM_LINK_EXTERNAL = 'external';
+
+  PRGM_EXPLORER = 'explore'; // web explorer
+  PRGM_NETSCAPE = 'netscape';
+  PRGM_MOZILLA = 'mozilla';
+  PRGM_FIREFOX = 'firefox';
+
+
 
 implementation
 
diff --git a/docview/src/frm_main.pas b/docview/src/frm_main.pas
index 6427efd5..6ec71335 100644
--- a/docview/src/frm_main.pas
+++ b/docview/src/frm_main.pas
@@ -265,7 +265,6 @@ uses
   ,frm_configuration
   ,frm_text
   ,frm_note
-  ,NewViewConstantsUnit
   ,CanvasFontManager
   ,HelpNote
   ,RichTextDocumentUnit