*** empty log message ***

svn path=/trunk/Framestein/; revision=193

5 files changed, 30 insertions, 5 deletions

diff --git a/Source/README.txt b/Source/README.txt
index 4037c52..dd13ea8 100644
--- a/Source/README.txt
+++ b/Source/README.txt
@@ -15,7 +15,7 @@ http://turbo.gamedev.net/delphix.asp
 - Install TScanDir in Filez.pas (in this directory).
 
 
-- Correct your Search path and compile!
+- Correct your Search path and compile Framestein.dpr!
 
 
 - Framestein needs ijl15.dll (included in Framestein-directory) to load/save jpegs
@@ -24,7 +24,6 @@ http://turbo.gamedev.net/delphix.asp
 
 --- note to versions >= 0.27 ---
 
-
 The photoshop filter host functionality is based on commercial code from http://www.case2000.com.
 Due to my modifications the original component won't compile with Framestein and
 I don't have the permission to release my modified version.
@@ -34,3 +33,11 @@ the implementation in pshostunit.pas.
 
 I'm planning a .dll of my version of the component to rid of this problem.
 Mail me for info.
+
+
+--- versions > 0.31:
+
+Framestein.dpr is the Delphi-project to use. FramesteinLib.dpr is an experimental
+project to compile Framestein as a Pure Data library, loaded with the -lib-parameter.
+This seems to give a better response, but still crashes when quitting Pd, so no binary
+is yet distributed.
diff --git a/Source/configureunit.dfm b/Source/configureunit.dfm
index f171463..a3baf5f 100644
--- a/Source/configureunit.dfm
+++ b/Source/configureunit.dfm
@@ -21,12 +21,13 @@ object configure: Tconfigure
     Top = 0
     Width = 427
     Height = 275
-    ActivePage = TSFolders
+    ActivePage = TSConnections
     Align = alClient
     TabOrder = 0
     object TSFolders: TTabSheet
       Caption = 'Folders'
       ImageIndex = 2
+      TabVisible = False
       object Label6: TLabel
         Left = 16
         Top = 36
diff --git a/Source/configureunit.pas b/Source/configureunit.pas
index b4a1dab..321efc5 100644
--- a/Source/configureunit.pas
+++ b/Source/configureunit.pas
@@ -67,12 +67,14 @@ begin
   main.FSPort := StrToInt(EditFsPort.Text);
   main.EnableFSConns := CBEnableFSConns.Checked;
   main.DockMain := CBDockMain.Checked;
+{$IFDEF FSDLL}
   if main.FSFolder <> EditFSFolder.Text then begin
     main.FSFolder := EditFSFolder.Text;
     main.Plugins.Clear;
     main.Plugins.ReLoad;
     main.SearchPath.Add(main.FSFolder);
   end;
+{$ENDIF}
 
   try
     if Reg.OpenKey('\Software\Framestein', True) then begin
@@ -82,7 +84,9 @@ begin
       Reg.WriteInteger('FSPort', main.FSPort);
       Reg.WriteBool('EnableFSConns', main.EnableFSConns);
       Reg.WriteBool('DockMain', main.DockMain);
+{$IFDEF FSDLL}
       Reg.WriteString('FSFolder', main.FSFolder);
+{$ENDIF}
     end;
   except
   end;
@@ -113,6 +117,14 @@ end;
 
 procedure Tconfigure.Execute;
 begin
+{$IFDEF FSDLL}
+  TSFolders.TabVisible := True;
+  TSFolders.Visible := True;
+{$ELSE}
+  TSFolders.TabVisible := False;
+  TSFolders.Visible := False;
+{$ENDIF}
+
   // load values from main
   EditPdHost.Text := main.PdHost;
   if EditPdHost.Text='' then EditPdHost.Text:='localhost';
diff --git a/Source/fsframeunit.pas b/Source/fsframeunit.pas
index 449d8fc..ccaafbf 100644
--- a/Source/fsframeunit.pas
+++ b/Source/fsframeunit.pas
@@ -601,6 +601,9 @@ begin
       end;

     end;

   end else

+  if s1='UNDOCK' then begin

+    MiUndock.Click;

+  end else

   if s1='SHOW' then begin

     Self.Top := prevtop;

     if not prevmute and MiMute.Checked then

diff --git a/Source/mainunit.pas b/Source/mainunit.pas
index 8a4a495..797b125 100644
--- a/Source/mainunit.pas
+++ b/Source/mainunit.pas
@@ -112,9 +112,9 @@ type
 

 const

 {$IFDEF FSDLL}

-  STARTMSG = 'FramesteinLib 0.32 DLL TEST 1 running...';

+  STARTMSG = 'FramesteinLib 0.32 DLL running...';

 {$ELSE}

-  STARTMSG = 'Framestein 0.32 dev running...';

+  STARTMSG = 'Framestein 0.32 running...';

 {$ENDIF}

   MCAPTION = 'Framestein 0.32';

   SocketBufferSize = 100000;

@@ -495,9 +495,11 @@ begin
       FSPort := Reg.ReadInteger('FSPort');

       EnableFSConns := Reg.ReadBool('EnableFSConns');

       DockMain := Reg.ReadBool('DockMain');

+{$IFDEF FSDLL}

       FSFolder := Reg.ReadString('FSFolder');

       if FSFolder='' then

         FSFolder := ExtractFilePath(Application.Exename);

+{$ENDIF}

     end;

   except

     RunConfig := True;