Synchro with last uidesigner of fpGUI. Added HexView component.

fredvs · Dec 24, 2015 · fdf4d65 · fdf4d65
1 parent 6496fda
commit fdf4d65
Show file tree

Hide file tree

Showing 77 changed files with 1,361 additions and 425 deletions.
diff --git a/src/define.inc b/src/define.inc
@@ -5,4 +5,6 @@
 {.$DEFINE library} // uncomment it for building library (native and java)
 {.$DEFINE java}   // uncomment it for building java library
 
+// for integration into ideU
+{$DEFINE ideu} // uncomment it for building integration into ideU
 
diff --git a/src/designer_ext.lpi b/src/designer_ext.lpi
@@ -137,45 +137,45 @@ install:
       <Unit0>
         <Filename Value="designer_ext.pas"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="74"/>
-        <CursorPos X="67" Y="97"/>
+        <TopLine Value="15"/>
+        <CursorPos X="56" Y="102"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="frm_main_designer.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="763"/>
-        <CursorPos X="5" Y="903"/>
-        <UsageCount Value="100"/>
+        <TopLine Value="1410"/>
+        <CursorPos X="23" Y="1414"/>
+        <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="frm_vfdforms.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="4"/>
-        <TopLine Value="522"/>
-        <CursorPos X="2" Y="542"/>
-        <UsageCount Value="100"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="193"/>
+        <CursorPos X="3" Y="206"/>
+        <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="sak_fpg.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="7"/>
-        <TopLine Value="2635"/>
-        <CursorPos X="31" Y="2660"/>
-        <UsageCount Value="100"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="2636"/>
+        <CursorPos X="64" Y="2637"/>
+        <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="vfd_main.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="6"/>
-        <TopLine Value="174"/>
-        <CursorPos X="80" Y="174"/>
-        <UsageCount Value="28"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="752"/>
+        <CursorPos X="59" Y="763"/>
+        <UsageCount Value="30"/>
         <Loaded Value="True"/>
       </Unit4>
     </Units>
@@ -203,6 +203,10 @@ install:
       <SmallerCode Value="True"/>
     </CodeGeneration>
     <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+        <StripSymbols Value="True"/>
+      </Debugging>
       <LinkSmart Value="True"/>
       <Options>
         <Win32>

diff --git a/src/designer_ext.pas b/src/designer_ext.pas
@@ -88,8 +88,11 @@
     filedir := '';
      ordir := IncludeTrailingBackslash(ExtractFilePath(ParamStr(0)));
 
-    // ideu custom plugin => uncomment it for ideU integration
-   // ideuintegration := True;
+ {$ifdef ideu}
+  idetemp := gINI.ReadInteger('Options', 'IDE', 3)  ;
+ {$else}
+  idetemp := gINI.ReadInteger('Options', 'IDE', 0) ;
+ {$endif}
 
      if ((trim(ParamStr(1)) = 'showit') and (gINI.ReadBool('Options', 'RunOnlyOnce', True) = True)) then
     begin
@@ -105,7 +108,7 @@
     end
     else
      begin
-        if (gINI.ReadInteger('Options', 'IDE', 0) = 0) or ((gINI.ReadInteger('Options', 'IDE', 0) > 0) and
+        if (idetemp = 0) or ((idetemp > 0) and
         (isrunningIDE('typhon') = False) and (isrunningIDE('ideu') = False) and (isrunningIDE('ideU') = False) and (isrunningIDE('lazarus') = False)) then
       begin
         if gINI.ReadBool('Options', 'RunOnlyOnce', True) = True then
@@ -164,7 +167,7 @@
 
    dirsakit := gINI.ReadString('Options', 'SakitDir', ordir);
 
-    if (directoryexists(dirsakit))and (gINI.ReadBool('Options', 'EnableAssistive', false) = True)
+    if (directoryexists(dirsakit + directoryseparator +'sakit'))and (gINI.ReadBool('Options', 'EnableAssistive', false) = True)
      then SAKLoadlib(dirsakit);
 
     fpgApplication.ShowHint:=true;